summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2018-10-25 16:50:17 -0700
committerKeith Packard <keithp@keithp.com>2018-10-25 16:51:17 -0700
commit6d80b89c0bd82133dd5c93df8604f562ac49c19a (patch)
treeac4adf27e9af2ed97a6319ae213fd15c8b03d971
parentcf3e524e50a6fae2862efb404c9918b74438e9c9 (diff)
doc: Switch to asciidoctor to format docs
asciidoc and a2x are no longer actively maintained and Debian policy encourages people to move away from them to asciidoctor. Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--doc/.gitignore1
-rw-r--r--doc/Makefile.am93
-rw-r--r--doc/altos.txt8
-rw-r--r--doc/altosui.inc50
-rw-r--r--doc/altusmetrum-theme.yml61
-rw-r--r--doc/altusmetrum.txt54
-rw-r--r--doc/am-notoc.css334
-rw-r--r--doc/am.css237
-rw-r--r--doc/companion.txt9
-rw-r--r--doc/config-device.inc4
-rw-r--r--doc/easymega-outline.txt3
-rw-r--r--doc/easymega.inc2
-rw-r--r--doc/easymini-device.inc2
-rw-r--r--doc/easymini-outline.txt3
-rw-r--r--doc/easymini-release-notes.inc26
-rw-r--r--doc/easymini.txt41
-rw-r--r--doc/header.inc13
-rw-r--r--doc/load-maps.inc2
-rw-r--r--doc/map-loading.txt8
-rw-r--r--doc/micropeak-oneline.svg190
-rw-r--r--doc/micropeak.txt38
-rw-r--r--doc/release-head.inc7
-rw-r--r--doc/release-notes-0.7.1.inc2
-rw-r--r--doc/release-notes-0.8.inc2
-rw-r--r--doc/release-notes-0.9.2.inc2
-rw-r--r--doc/release-notes-0.9.inc2
-rw-r--r--doc/release-notes-1.0.1.inc2
-rw-r--r--doc/release-notes-1.1.1.inc2
-rw-r--r--doc/release-notes-1.1.inc2
-rw-r--r--doc/release-notes-1.2.1.inc2
-rw-r--r--doc/release-notes-1.2.inc2
-rw-r--r--doc/release-notes-1.3.1.inc2
-rw-r--r--doc/release-notes-1.3.2.inc2
-rw-r--r--doc/release-notes-1.3.inc2
-rw-r--r--doc/release-notes-1.4.1.inc2
-rw-r--r--doc/release-notes-1.4.2.inc2
-rw-r--r--doc/release-notes-1.4.inc2
-rw-r--r--doc/release-notes-1.5.inc2
-rw-r--r--doc/release-notes-1.6.1.inc2
-rw-r--r--doc/release-notes-1.6.2.inc2
-rw-r--r--doc/release-notes-1.6.3.inc2
-rw-r--r--doc/release-notes-1.6.4.inc2
-rw-r--r--doc/release-notes-1.6.5.inc2
-rw-r--r--doc/release-notes-1.6.8.inc2
-rw-r--r--doc/release-notes-1.6.inc2
-rw-r--r--doc/release-notes-1.7.inc2
-rw-r--r--doc/release-notes-1.8.1.inc2
-rw-r--r--doc/release-notes-1.8.2.inc2
-rw-r--r--doc/release-notes-1.8.3.inc3
-rw-r--r--doc/release-notes-1.8.4.inc2
-rw-r--r--doc/release-notes-1.8.5.inc2
-rw-r--r--doc/release-notes-1.8.6.inc2
-rw-r--r--doc/release-notes-1.8.7.inc2
-rw-r--r--doc/release-notes-1.8.inc2
-rw-r--r--doc/release-notes.inc64
-rw-r--r--doc/specs.inc16
-rw-r--r--doc/system-operation.inc2
-rw-r--r--doc/telegps-application.inc30
-rw-r--r--doc/telegps-outline.txt3
-rw-r--r--doc/telegps-release-notes.inc38
-rw-r--r--doc/telegps-system-operation.inc2
-rw-r--r--doc/telegps.txt32
-rw-r--r--doc/telemega-outline.txt3
-rw-r--r--doc/telemega.inc2
-rw-r--r--doc/telemetrum-outline.txt3
-rw-r--r--doc/telemetrum.inc8
-rw-r--r--doc/telemetry.txt11
-rw-r--r--doc/telemini-v1-outline.txt4
-rw-r--r--doc/telemini-v3-outline.txt3
-rw-r--r--doc/telemini.inc6
-rw-r--r--doc/updating-firmware.inc4
-rw-r--r--doc/using-am-products.inc2
72 files changed, 960 insertions, 524 deletions
diff --git a/doc/.gitignore b/doc/.gitignore
index 06ad43eb..27a951c4 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -2,6 +2,7 @@
*.pdf
*.fo
*.raw
+*.adoc
titlepage.templates.xsl
fop-cfg.xml
map-loading.svg
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 450053f1..b5839bea 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,15 @@
#
-# http://docbook.sourceforge.net/release/xsl/current/README
+# Copyright © 2018 Keith Packard <keithp@keithp.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
#
if FAKETIME
@@ -115,9 +125,11 @@ COMMON_INC_FILES=\
config-ui.inc \
load-maps.inc \
aprs-operation.inc \
- handling.inc
+ handling.inc \
+ release-head.inc
INC_FILES=\
+ header.inc \
dedication.inc \
intro.inc \
getting-started.inc \
@@ -140,7 +152,7 @@ INC_FILES=\
release-notes.inc \
$(RELNOTES_INC)
-RAW_FILES=$(TXT_FILES:.txt=.raw) $(INC_FILES:.inc=.raw)
+ADOC_FILES=$(TXT_FILES:.txt=.adoc) $(INC_FILES:.inc=.adoc)
TELEGPS_INC_FILES=\
telegps-dedication.inc \
@@ -156,14 +168,14 @@ TELEGPS_INC_FILES=\
TELEGPS_TXT_FILES=\
telegps.txt
-TELEGPS_RAW_FILES=$(TELEGPS_TXT_FILES:.txt=.raw) $(TELEGPS_INC_FILES:.inc=.raw)
+TELEGPS_ADOC_FILES=$(TELEGPS_TXT_FILES:.txt=.adoc) $(TELEGPS_INC_FILES:.inc=.adoc)
MICROPEAK_TXT_FILES=\
micropeak.txt
MICROPEAK_INC_FILES=
-MICROPEAK_RAW_FILES=$(MICROPEAK_TXT_FILES:.txt=.raw) $(MICROPEAK_INC_FILES:.inc=.raw)
+MICROPEAK_ADOC_FILES=$(MICROPEAK_TXT_FILES:.txt=.adoc) $(MICROPEAK_INC_FILES:.inc=.adoc)
EASYMINI_TXT_FILES=\
easymini.txt
@@ -171,7 +183,7 @@ EASYMINI_TXT_FILES=\
EASYMINI_INC_FILES=$(INC_FILES) easymini-release-notes.inc
-EASYMINI_RAW_FILES=$(EASYMINI_TXT_FILES:.txt=.raw) $(EASYMINI_INC_FILES:.inc=.raw)
+EASYMINI_ADOC_FILES=$(EASYMINI_TXT_FILES:.txt=.adoc) $(EASYMINI_INC_FILES:.inc=.adoc)
OUTLINE_TXT_FILES=\
easymega-outline.txt \
@@ -182,7 +194,7 @@ OUTLINE_TXT_FILES=\
telemini-v3-outline.txt \
telegps-outline.txt
-OUTLINE_RAW_FILES=$(OUTLINE_TXT_FILES:.txt=.raw)
+OUTLINE_ADOC_FILES=$(OUTLINE_TXT_FILES:.txt=.adoc)
OUTLINE_PDF_FILES=$(OUTLINE_TXT_FILES:.txt=.pdf)
@@ -202,7 +214,7 @@ ONEFILE_TXT_FILES=\
telemetry.txt \
map-loading.txt
-ONEFILE_RAW_FILES=$(ONEFILE_TXT_FILES:.txt=.raw)
+ONEFILE_ADOC_FILES=$(ONEFILE_TXT_FILES:.txt=.adoc)
ONEFILE_PDF_FILES=$(ONEFILE_TXT_FILES:.txt=.pdf)
ONEFILE_HTML_FILES=$(ONEFILE_TXT_FILES:.txt=.html)
@@ -212,22 +224,12 @@ PUBLISH_HTML=altusmetrum.html micropeak.html telegps.html easymini.html $(ONEFIL
HTML=$(PUBLISH_HTML) $(RELNOTES_HTML)
-HTML_REVHISTORY=\
- altusmetrum-revhistory.html \
- micropeak-revhistory.html \
- telegps-revhistory.html \
- easymini-revhistory.html
-
PDF=altusmetrum.pdf micropeak.pdf telegps.pdf easymini.pdf $(ONEFILE_PDF_FILES) \
$(OUTLINE_PDF_FILES)
MAP_DOT_FILES=map-loading.dot
MAP_SVG_FILES=$(MAP_DOT_FILES:.dot=.svg)
-FOP_STYLE=am-fo.xsl
-HTML_STYLE=am-html.xsl
-COMMON_STYLE=common.xsl
-FOP_XCONF=fop.xconf
-STYLESHEET=am.css
+STYLESHEET=am.css am-notoc.css
FONTS=\
fonts/DejaVuSansMono-BoldOblique.ttf \
@@ -241,56 +243,41 @@ FONTS=\
fonts/OpenSans-Semibold.ttf \
fonts/OpenSans-SemiboldItalic.ttf
-TEMPLATES_TMPL=titlepage.templates.tmpl
-
-TEMPLATES_XSL=$(TEMPLATES_TMPL:.tmpl=.xsl)
-
-PDF_CONFIG_FILES=$(FOP_STYLE) $(COMMON_STYLE) $(FOP_XCONF) $(TEMPLATES_XSL)
-HTML_CONFIG_FILES=$(HTML_STYLE) $(COMMON_STYLE) $(TEMPLATES_XSL)
+PDF_CONFIG_FILES=altusmetrum-theme.yml
+HTML_CONFIG_FILES=
-PUBLISH_DOC=$(PUBLISH_HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET)
+PUBLISH_DOC=$(PUBLISH_HTML) $(PDF) $(IMAGES) $(MAP_SVG_FILES) $(STYLESHEET)
-DOC=$(HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET)
+DOC=$(HTML) $(PDF) $(IMAGES) $(MAP_SVG_FILES) $(STYLESHEET)
-SUFFIXES = .dot .svg .tmpl .xsl .inc .txt .raw .pdf .html
+SUFFIXES = .dot .svg .inc .txt .adoc .pdf .html
.dot.svg:
dot -Tsvg -o$@ $*.dot
-.txt.raw:
+.txt.adoc:
sed -e 's/^[ ]*//' -e 's/^\\//' $*.txt > $@
-.inc.raw:
+.inc.adoc:
sed -e 's/^[ ]*//' -e 's/^\\//' $*.inc > $@
-.raw.html:
- a2x -a docinfo -f xhtml --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(HTML_STYLE) --stylesheet=$(STYLESHEET) $*.raw
- case $* in release-notes*) ./fix-html $*.html ;; esac
- $(FAKETIME) a2x -a docinfo -f pdf --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(FOP_STYLE) --fop --fop-opts="-c $(FOP_XCONF)" $*.raw
+.adoc.html:
+ asciidoctor -b html5 $*.adoc
-.html.pdf:
- echo $@
-
-.tmpl.xsl:
- xsltproc --output $@ /usr/share/xml/docbook/stylesheet/docbook-xsl/template/titlepage.xsl $*.tmpl
+.adoc.pdf:
+ asciidoctor-pdf $*.adoc
all: $(HTML) $(PDF)
-map-loading.raw: $(MAP_SVG_FILES)
-
-altusmetrum-revhistory.html: altusmetrum.html
-
-micropeak-revhistory.html: micropeak.html
-
-telegps-revhistory.html: telegps.html
+map-loading.adoc: $(MAP_SVG_FILES)
-altusmetrum.pdf altusmetrum.html: altusmetrum-docinfo.xml $(RAW_FILES) $(IMAGES)
+altusmetrum.pdf altusmetrum.html: altusmetrum-docinfo.xml $(ADOC_FILES) $(IMAGES)
-telegps.html telegps.pdf: telegps-docinfo.xml $(TELEGPS_RAW_FILES) $(IMAGES)
+telegps.html telegps.pdf: telegps-docinfo.xml $(TELEGPS_ADOC_FILES) $(IMAGES)
-micropeak.pdf micropeak.html: micropeak-docinfo.xml $(MICROPEAK_RAW_FILES) $(IMAGES)
+micropeak.pdf micropeak.html: micropeak-docinfo.xml $(MICROPEAK_ADOC_FILES) $(IMAGES)
-easymini.pdf easymini.html: easymini-docinfo.xml $(EASYMINI_RAW_FILES) $(IMAGES)
+easymini.pdf easymini.html: easymini-docinfo.xml $(EASYMINI_ADOC_FILES) $(IMAGES)
telemini-v1-outline.pdf: telemini-v1-outline.txt telemini-v1.svg
@@ -311,12 +298,12 @@ publish: $(PUBLISH_DOC) $(FONTS)
git commit -F - $(WEB_ROOT)/altusmetrum/AltOS/doc/* $(WEB_ROOT)/altusmetrum/AltOS/doc/fonts/* ; \
git push)
-publish-keithp: am.html $(PUBLISH_DOC) $(FONTS)
- scp -p am.html $(PUBLISH_DOC) keithp.com:~keithp/public_html/altos
+publish-keithp: am.html $(DOC) $(FONTS)
+ scp -p am.html $(DOC) keithp.com:~keithp/public_html/altos
scp -p $(FONTS) keithp.com:~keithp/public_html/altos/fonts
clean:
- rm -f am.html $(HTML) $(HTML_REVHISTORY) $(PDF) $(TEMPLATES_XSL) $(RAW_FILES) $(TELEGPS_RAW_FILES) $(MICROPEAK_RAW_FILES)
+ rm -f am.html $(HTML) $(PDF) $(ADOC_FILES) $(TELEGPS_ADOC_FILES) $(MICROPEAK_ADOC_FILES)
distclean: clean
rm -f $(HTML) $(PDF)
diff --git a/doc/altos.txt b/doc/altos.txt
index f2b1ee59..9d12f12b 100644
--- a/doc/altos.txt
+++ b/doc/altos.txt
@@ -1,7 +1,15 @@
= AltOS
+Keith Packard <keithp@keithp.com>
:doctype: book
:toc:
+:stylesheet: am.css
+:linkcss:
:numbered:
+:pdf-stylesdir: .
+:pdf-style: altusmetrum
+:pdf-fontsdir: fonts
+
+ include::header.adoc[]
== Overview
diff --git a/doc/altosui.inc b/doc/altosui.inc
index adce6f27..44f77aca 100644
--- a/doc/altosui.inc
+++ b/doc/altosui.inc
@@ -1,7 +1,7 @@
== AltosUI
.AltosUI Main Window
- image::altosui.png[width="4.6in"]
+ image::altosui.png[width=450]
The AltosUI program provides a graphical user interface for
interacting with the Altus Metrum product family. AltosUI can
@@ -12,10 +12,8 @@
the tasks provided from the top-level toolbar.
ifdef::radio[]
+
=== Monitor Flight
- ////
- <subtitle>Receive, Record and Display Telemetry Data</subtitle>
- ////
Selecting this item brings up a dialog box listing all
of the connected TeleDongle devices. When you choose
@@ -24,7 +22,7 @@
device.
.Device Selection Dialog
- image::device-selection.png[width="3.1in"]
+ image::device-selection.png[width=300]
All telemetry data received are automatically recorded
in suitable log files. The name of the files includes
@@ -84,7 +82,7 @@
==== Launch Pad
.Monitor Flight Launch Pad View
- image::launch-pad.png[width="5.5in"]
+ image::launch-pad.png[width=400]
The 'Launch Pad' tab shows information used to decide when the
rocket is ready for flight. The first elements include red/green
@@ -146,7 +144,7 @@
==== Ascent
.Monitor Flight Ascent View
- image::ascent.png[width="5.5in"]
+ image::ascent.png[width=400]
This tab is shown during Boost, Fast and Coast
phases. The information displayed here helps monitor the
@@ -170,7 +168,7 @@
==== Descent
.Monitor Flight Descent View
- image::descent.png[width="5.5in"]
+ image::descent.png[width=400]
Once the rocket has reached apogee and (we hope)
activated the apogee charge, attention switches to
@@ -209,7 +207,7 @@
==== Landed
.Monitor Flight Landed View
- image::landed.png[width="5.5in"]
+ image::landed.png[width=400]
Once the rocket is on the ground, attention switches
to recovery. While the radio signal is often lost once
@@ -246,7 +244,7 @@
==== Table
.Monitor Flight Table View
- image::table.png[width="5.5in"]
+ image::table.png[width=400]
The table view shows all of the data available from the
flight computer. Probably the most useful data on
@@ -257,7 +255,7 @@
==== Site Map
.Monitor Flight Site Map View
- image::site-map.png[width="5.5in"]
+ image::site-map.png[width=400]
When the TeleMetrum has a GPS fix, the Site Map tab
will map the rocket's position to make it easier for
@@ -291,7 +289,7 @@
==== Igniter
.Monitor Flight Additional Igniter View
- image::ignitor.png[width="5.5in"]
+ image::ignitor.png[width=400]
TeleMega includes four additional programmable pyro
channels. The Ignitor tab shows whether each of them has
@@ -299,6 +297,7 @@
voltage measured here will be close to the pyro battery
voltage. A value greater than 3.2V is required for a 'GO'
status.
+
endif::radio[]
@@ -375,7 +374,7 @@
==== Flight Graph
.Flight Data Graph
- image::graph.png[width="5.5in"]
+ image::graph.png[width=400]
By default, the graph contains acceleration (blue),
velocity (green) and altitude (red).
@@ -392,7 +391,7 @@
==== Configure Graph
.Flight Graph Configuration
- image::graph-configure.png[width="5.5in"]
+ image::graph-configure.png[width=400]
This selects which graph elements to show, and, at the
very bottom. It also lets you configure how
@@ -420,7 +419,7 @@
==== Flight Statistics
.Flight Statistics
- image::graph-stats.png[width="5.5in"]
+ image::graph-stats.png[width=400]
Shows overall data computed from the flight.
@@ -428,7 +427,7 @@
==== Map
.Flight Map
- image::graph-map.png[width="5.5in"]
+ image::graph-map.png[width=400]
Shows a satellite image of the flight area overlaid
with the path of the flight. The red concentric
@@ -481,7 +480,7 @@
=== Configure Altimeter
.Altimeter Configuration
- image::configure-altimeter.png[width="3.6in"]
+ image::configure-altimeter.png[width=350]
ifdef::radio[]
Select this button and then select either an altimeter or
@@ -523,24 +522,25 @@
The rest of the dialog contains the parameters to be configured.
- include::config-device.raw[]
+ include::config-device.adoc[]
=== Configure AltosUI
.Configure AltosUI Dialog
- image::configure-altosui.png[width="2.4in"]
+ image::configure-altosui.png[width=230]
This button presents a dialog so that you can
configure the AltosUI global settings.
- include::config-ui.raw[]
+ include::config-ui.adoc[]
ifdef::radio[]
+
=== Configure Groundstation
.Configure Groundstation Dialog
- image::configure-groundstation.png[width="3.1in"]
+ image::configure-groundstation.png[width=300]
Select this button and then select a TeleDongle or
TeleBT Device from the list provided.
@@ -631,7 +631,7 @@
=== Fire Igniter
.Fire Igniter Window
- image::fire-igniter.png[width="1.2in"]
+ image::fire-igniter.png[width=120]
This activates the igniter circuits in the flight
computer to help test recovery systems
@@ -663,7 +663,7 @@
=== Scan Channels
.Scan Channels Window
- image::scan-channels.png[width="3.2in"]
+ image::scan-channels.png[width=300]
This listens for telemetry packets on all of the
configured frequencies, displaying information about
@@ -675,14 +675,14 @@
endif::radio[]
ifdef::gps[]
- include::load-maps.raw[]
+ include::load-maps.adoc[]
endif::gps[]
ifdef::radio[]
=== Monitor Idle
.Monitor Idle Window
- image::monitor-idle.png[width="5.2in"]
+ image::monitor-idle.png[width=500]
This brings up a dialog similar to the Monitor Flight
UI, except it works with the altimeter in “idle” mode
diff --git a/doc/altusmetrum-theme.yml b/doc/altusmetrum-theme.yml
new file mode 100644
index 00000000..f13fa597
--- /dev/null
+++ b/doc/altusmetrum-theme.yml
@@ -0,0 +1,61 @@
+base:
+ font_family: Open Sans Light
+heading:
+ font_color: #78079a
+ font_size: 17
+font:
+ catalog:
+ Open Sans Light:
+ normal: OpenSans-Light.ttf
+ italic: OpenSans-LightItalic.ttf
+ bold: OpenSans-Semibold.ttf
+ bold_italic: OpenSans-SemiboldItalic.ttf
+ DejaVu Sans Mono:
+ normal: DejaVuSansMono.ttf
+ italic: DejaVuSansMono-Oblique.ttf
+ bold: DejaVuSansMono-Bold.ttf
+ bold_italic: DejaVuSansMono-BoldOblique.ttf
+title_page:
+ align: right
+ logo:
+ top: 10%
+ title:
+ top: 75%
+ font_size: $heading_h1_font_size
+ font_color: #000000
+ font_style: bold
+ line_height: 0.9
+ subtitle:
+ font_size: $heading_h3_font_size
+ font_style: bold_italic
+ line_height: 1
+ authors:
+ margin_top: $base_font_size * 1.25
+ font_size: $base_font_size * 1.5
+ font_color: #000000
+ revision:
+ margin_top: $base_font_size * 1.25
+admonition_label:
+ font_color: #c70909
+ font_style: bold
+ font_size: $heading_h2_font_size
+page:
+ background_color: ffffff
+ layout: portrait
+ margin: [0.5in, 0.67in, 0.75in, 0.67in]
+ size: letter
+footer:
+ height: 0.5in
+ border_color: #78079a
+ recto:
+ left:
+ content: '{page-number}'
+ right:
+ content: '© 2018 Bdale Garbee and Keith Packard. Creative Commons ShareAlike 3.0 License'
+ verso:
+ left:
+ content: $footer_recto_right_content
+ right:
+ content: '{page-number}'
+literal:
+ font_family: DejaVu Sans Mono
diff --git a/doc/altusmetrum.txt b/doc/altusmetrum.txt
index 48211eb8..798301d2 100644
--- a/doc/altusmetrum.txt
+++ b/doc/altusmetrum.txt
@@ -1,6 +1,15 @@
-= The Altus Metrum System
+= The Altus Metrum System: An Owner's Manual for Altus Metrum Rocketry Electronics
+Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>; Bob Finch; Anthony Towns
+:title-logo-image: image:../themes/background.png[]
+:revnumber: v1.8.7
+:revdate: 8 Oct 2018
+:revremark: Include TeleMega v3.0 firmware in release. Fix TeleBT v4.0 RF calibration to factory value when reflashing. Fix map images. Fix Mac OS X support.
+:copyright: Bdale Garbee and Keith Packard 2018
:doctype: book
:numbered:
+:stylesheet: am.css
+:linkcss:
+:toc:
:altusmetrum: 1
:radio: 1
:gps: 1
@@ -11,41 +20,46 @@
:easymega: 1
:telegps: 1
:application: AltosUI
+:pdf-stylesdir: .
+:pdf-style: altusmetrum
+:pdf-fontsdir: fonts
- include::dedication.raw[]
+ include::header.adoc[]
- include::intro.raw[]
+ include::dedication.adoc[]
- include::getting-started.raw[]
+ include::intro.adoc[]
- include::usage.raw[]
+ include::getting-started.adoc[]
- include::telemetrum.raw[]
+ include::usage.adoc[]
- include::telemini.raw[]
+ include::telemetrum.adoc[]
- include::easymini-device.raw[]
+ include::telemini.adoc[]
- include::telemega.raw[]
+ include::easymini-device.adoc[]
- include::easymega.raw[]
+ include::telemega.adoc[]
- include::installation.raw[]
+ include::easymega.adoc[]
- include::using-am-products.raw[]
+ include::installation.adoc[]
- include::altosui.raw[]
+ include::using-am-products.adoc[]
- include::altosdroid.raw[]
+ include::altosui.adoc[]
- include::system-operation.raw[]
+ include::altosdroid.adoc[]
- include::handling.raw[]
+ include::system-operation.adoc[]
- include::updating-firmware.raw[]
+ include::handling.adoc[]
- include::flight-data-recording.raw[]
+ include::updating-firmware.adoc[]
- include::specs.raw[]
+ include::flight-data-recording.adoc[]
- include::release-notes.raw[]
+ include::specs.adoc[]
+
+ include::release-notes.adoc[]
diff --git a/doc/am-notoc.css b/doc/am-notoc.css
new file mode 100644
index 00000000..6999d478
--- /dev/null
+++ b/doc/am-notoc.css
@@ -0,0 +1,334 @@
+/*
+ CSS stylesheet for XHTML produced by DocBook XSL stylesheets.
+*/
+
+@font-face {
+ font-family: 'Open Sans';
+ src: url('fonts/OpenSans-Regular.ttf');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ src: url('fonts/OpenSans-Italic.ttf');
+ font-weight: normal;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ src: url('fonts/OpenSans-Semibold.ttf');
+ font-weight: bold;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ src: url('fonts/OpenSans-SemiboldItalic.ttf');
+ font-weight: bold;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'DejaVu Sans Mono';
+ src: url('fonts/DejaVuSansMono.ttf');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'DejaVu Sans Mono';
+ src: url('fonts/DejaVuSansMono-Oblique.ttf');
+ font-weight: normal;
+ font-style: oblique;
+}
+
+@font-face {
+ font-family: 'DejaVu Sans Mono';
+ src: url('fonts/DejaVuSansMono-Bold.ttf');
+ font-weight: bold;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'DejaVu Sans Mono';
+ src: url('fonts/DejaVuSansMono-BoldOblique.ttf');
+ font-weight: bold;
+ font-style: oblique;
+}
+
+body {
+ font-family: "Open Sans",sans-serif;
+ font-size: 12pt;
+ margin: 2em 5em 2em 5em;
+}
+
+code, pre {
+ font-family: "DejaVu Sans Mono", monospace;
+}
+
+span.strong {
+ font-weight: bold;
+}
+
+body blockquote {
+ margin-top: .75em;
+ line-height: 1.5;
+ margin-bottom: .75em;
+}
+
+a:link {
+ color: #78079a;
+}
+
+a:visited {
+ color: #78079a;
+}
+
+h1, h2, h3, h4, h5, h6
+{
+ color: #78079a;
+ font-family: "Open Sans",sans-serif;
+}
+
+div.toc {
+ display:none;
+}
+
+div.details {
+ padding-top: 1em;
+ padding-left: 3em;
+}
+
+span.author {
+ font-weight: bold;
+ color: #78079a;
+}
+
+span.email {
+ font-size: 10pt;
+}
+
+span#revnumber {
+ font-size: 8pt;
+}
+
+span#revdate {
+ font-size: 8pt;
+}
+
+span#revremark {
+ font-size: 8pt;
+}
+
+div#footer {
+ border-top: 2px solid #808080;
+}
+
+body h1 {
+ margin: .0em 0 0 -4%;
+ line-height: 1.3;
+ border-bottom: 2px solid #808080;
+}
+
+body h2 {
+ margin: 0.5em 0 0 -4%;
+ line-height: 1.3;
+ border-bottom: 2px solid #808080;
+}
+
+body h3 {
+ margin: .8em 0 0 -3%;
+ line-height: 1.3;
+}
+
+body h4 {
+ margin: .8em 0 0 -3%;
+ line-height: 1.3;
+}
+
+body h5 {
+ margin: .8em 0 0 -2%;
+ line-height: 1.3;
+}
+
+body h6 {
+ margin: .8em 0 0 -1%;
+ line-height: 1.3;
+}
+
+body hr {
+ border: none; /* Broken on IE6 */
+}
+
+body td {
+ line-height: 1.2
+}
+
+body th {
+ line-height: 1.2;
+}
+
+ol {
+ line-height: 1.2;
+}
+
+ul, body dir, body menu {
+ line-height: 1.2;
+}
+
+body h1, body h2, body h3, body h4, body h5, body h6 {
+ margin-left: 0
+}
+
+body pre {
+ margin: 0.5em 10% 0.5em 1em;
+ line-height: 1.0;
+}
+
+tt.literal, code.literal {
+}
+
+.programlisting, .screen {
+ border: 1px solid #808080;
+ background: #f4f4f4;
+ margin: 0.5em 10% 0.5em 0;
+ padding: 0.5em 1em;
+}
+
+div.sidebar {
+ background: #ffffee;
+ margin: 1.0em 10% 0.5em 0;
+ padding: 0.5em 1em;
+ border: 1px solid #808080;
+}
+div.sidebar * { padding: 0; }
+div.sidebar div { margin: 0; }
+div.sidebar p.title {
+ margin-top: 0.5em;
+ margin-bottom: 0.2em;
+}
+
+div.bibliomixed {
+ margin: 0.5em 5% 0.5em 1em;
+}
+
+div.glossary dt {
+ font-weight: bold;
+}
+div.glossary dd p {
+ margin-top: 0.2em;
+}
+
+dl {
+ margin: .8em 0;
+ line-height: 1.2;
+}
+
+dt {
+ margin-top: 0.5em;
+}
+
+dt span.term {
+ font-weight: bold;
+}
+
+div.variablelist dd p {
+ margin-top: 0;
+}
+
+div.itemizedlist li, div.orderedlist li {
+ margin-left: -0.8em;
+ margin-top: 0.5em;
+}
+
+ul, ol {
+ list-style-position: outside;
+}
+
+div.sidebar ul, div.sidebar ol {
+ margin-left: 2.8em;
+}
+
+div.itemizedlist p.title,
+div.orderedlist p.title,
+div.variablelist p.title
+{
+ margin-bottom: -0.8em;
+}
+
+div.revhistory {
+ border-style: none;
+}
+
+div.revhistory table, div.revhistory th, div.revhistory td {
+ border-collapse: collapse;
+ border: 1px solid #808080;
+ padding: 0.25em;
+}
+
+div.revhistory th {
+ color: black;
+}
+
+/* Keep TOC and index lines close together. */
+div.toc dl, div.toc dt
+{
+ line-height: normal;
+ margin-top: 0;
+ margin-bottom: 0;
+}
+
+div.admonitionblock {
+ margin-top: 2em;
+ margin-bottom: 2em;
+ margin-left: 2em;
+ margin-right: 2em;
+}
+
+div.admonitionblock div {
+ margin-left: 0em;
+ margin-right: 1em;
+}
+
+div.admonitionblock div.title {
+ color: #c70909;
+ font-style: bold;
+ font-size: 24pt;
+}
+
+div#content table.tableblock {
+ border-style: solid;
+ border-width: 1px;
+ border-collapse: collapse;
+}
+
+div#content table.tableblock td,th {
+ border-right-style: solid;
+ border-right-width: 1px;
+}
+
+div#content table.tableblock tbody p {
+ margin-top: 0.25em;
+ margin-bottom: 0.25em;
+ margin-left: 0.25em;
+ margin-right: 0.25em;
+}
+
+div#content table.tableblock tbody tr:nth-child(odd) {
+ background: #cccccc;
+}
+
+div.imageblock{
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
+
+div.imageblock img {
+ margin-bottom: 0.5em;
+}
+
+@media print {
+ div.navheader, div.navfooter { display: none; }
+}
diff --git a/doc/am.css b/doc/am.css
index 393ef81b..56daface 100644
--- a/doc/am.css
+++ b/doc/am.css
@@ -61,6 +61,7 @@
body {
font-family: "Open Sans",sans-serif;
font-size: 12pt;
+ margin: 0;
}
code, pre {
@@ -77,15 +78,6 @@ body blockquote {
margin-bottom: .75em;
}
-html body {
- margin: 1em 5% 1em 5%;
- line-height: 1.2;
-}
-
-body div {
- margin: 0;
-}
-
a:link {
color: #78079a;
}
@@ -100,33 +92,11 @@ h1, h2, h3, h4, h5, h6
font-family: "Open Sans",sans-serif;
}
-div.revhistory table {
- width: 50%;
- border-width: 1px;
-}
-
-div titlepage {
- margin-top: 100px;
- border-top: 2px;
-}
-
-div.warning h1, div.warning h2, div.warning h3, div.warning h4, div.warning h5, div.warning h6 {
- color: #ff2020;
-}
-
-div.warning p, div.note p, div.error p {
- margin-left: 5%;
- margin-left: 5%;
-}
-
-h3.corpauthor img {
- position: fixed;
- left: 0px;
- top: 0px;
- width: 410px;
- height: 90px;
- border-right: 2px solid #808080;
- border-bottom: 2px solid #808080;
+div#content, div#header, div#footer {
+ margin-left: 440px;
+ margin-right: 2em;
+ margin-top: 2em;
+ margin-bottom: 2em;
}
div.toc {
@@ -145,17 +115,16 @@ div.toc {
overflow: auto;
}
-div.toc p,
-div.list-of-figures p,
-div.list-of-tables p,
-div.list-of-examples p,
-div.toc a
-{
- color: black;
-}
-
-div.toc p {
- color: black;
+div#logo img {
+ position: fixed;
+ left: 0px;
+ top: 0px;
+ width: 410px;
+ height: 92px;
+ margin-top: 0px;
+ margin-bottom: 0px;
+ border-right: 2px solid #808080;
+ border-bottom: 2px solid #808080;
}
div.toc a:link {
@@ -174,42 +143,34 @@ div.toc a:active {
text-decoration: underline;
}
-div.book {
- margin-left: 25em;
+div.details {
+ padding-top: 1em;
+ padding-left: 3em;
}
-div.list-of-figures {
- display: none;
+span.author {
+ font-weight: bold;
+ color: #78079a;
}
-div.list-of-tables {
- display: none;
+span.email {
+ font-size: 10pt;
}
-div.figure p {
- text-align: center;
-}
-div.figure img {
- display: block;
- margin: auto;
+span#revnumber {
+ font-size: 8pt;
}
-div.table p.title {
- text-align: center;
+span#revdate {
+ font-size: 8pt;
}
-div.table-contents table {
- margin-left: auto;
- margin-right: auto;
+span#revremark {
+ font-size: 8pt;
}
-div.example p.title,
-div.sidebar p.title
-{
- font-weight: normal;
- color: #78079a;
- font-family: "Open Sans",sans-serif;
- margin-bottom: 0.2em;
+div#footer {
+ border-top: 2px solid #808080;
}
body h1 {
@@ -232,7 +193,6 @@ body h3 {
body h4 {
margin: .8em 0 0 -3%;
line-height: 1.3;
- border-top: 2px solid #808080;
}
body h5 {
@@ -248,25 +208,6 @@ body h6 {
body hr {
border: none; /* Broken on IE6 */
}
-div.footnotes hr {
- border: 1px solid #808080;
-}
-
-div.navheader th, div.navheader td, div.navfooter td {
- font-family: "Open Sans",sans-serif;
- font-size: 12pt;
- font-weight: normal;
- color: #78079a;
-}
-div.navheader img, div.navfooter img {
- border-style: none;
-}
-div.navheader a, div.navfooter a {
- font-weight: normal;
-}
-div.navfooter hr {
- border: 1px solid #808080;
-}
body td {
line-height: 1.2
@@ -284,11 +225,6 @@ ul, body dir, body menu {
line-height: 1.2;
}
-html {
- margin: 0;
- padding: 0;
-}
-
body h1, body h2, body h3, body h4, body h5, body h6 {
margin-left: 0
}
@@ -384,93 +320,62 @@ div.revhistory th {
}
/* Keep TOC and index lines close together. */
-div.toc dl, div.toc dt,
-div.list-of-figures dl, div.list-of-figures dt,
-div.list-of-tables dl, div.list-of-tables dt,
-div.indexdiv dl, div.indexdiv dt
+div.toc dl, div.toc dt
{
line-height: normal;
margin-top: 0;
margin-bottom: 0;
}
-/*
- Table styling does not work because of overriding attributes in
- generated HTML.
-*/
-div.table-contents p,
-div.informaltable p
-{
- margin: 0px;
+div.admonitionblock {
+ margin-top: 2em;
+ margin-bottom: 2em;
+ margin-left: 2em;
+ margin-right: 2em;
}
-div.table thead, div.table tfoot,
-div.informaltable thead, div.informaltable tfoot
-{
- font-weight: bold;
+div.admonitionblock div {
+ margin-left: 0em;
+ margin-right: 1em;
+}
+
+div.admonitionblock div.title {
+ color: #c70909;
+ font-style: bold;
+ font-size: 24pt;
+}
+
+div#content table.tableblock {
+ border-style: solid;
+ border-width: 1px;
+ border-collapse: collapse;
}
-div.mediaobject img {
- margin-bottom: 0.8em;
+div#content table.tableblock td,th {
+ border-right-style: solid;
+ border-right-width: 1px;
}
-div.figure p.title,
-div.table p.title
-{
- margin-top: 1em;
- margin-bottom: 0.4em;
+
+div#content table.tableblock tbody p {
+ margin-top: 0.25em;
+ margin-bottom: 0.25em;
+ margin-left: 0.25em;
+ margin-right: 0.25em;
}
-div.calloutlist p
-{
- margin-top: 0em;
- margin-bottom: 0.4em;
+div#content table.tableblock tbody tr:nth-child(odd) {
+ background: #cccccc;
+}
+
+div.imageblock{
+ margin-top: 1em;
+ margin-bottom: 1em;
}
-a img {
- border-style: none;
+div.imageblock img {
+ margin-bottom: 0.5em;
}
@media print {
div.navheader, div.navfooter { display: none; }
}
-
-span.aqua { color: aqua; }
-span.black { color: black; }
-span.blue { color: blue; }
-span.fuchsia { color: fuchsia; }
-span.gray { color: gray; }
-span.green { color: green; }
-span.lime { color: lime; }
-span.maroon { color: maroon; }
-span.navy { color: navy; }
-span.olive { color: olive; }
-span.purple { color: purple; }
-span.red { color: red; }
-span.silver { color: silver; }
-span.teal { color: teal; }
-span.white { color: white; }
-span.yellow { color: yellow; }
-
-span.aqua-background { background: aqua; }
-span.black-background { background: black; }
-span.blue-background { background: blue; }
-span.fuchsia-background { background: fuchsia; }
-span.gray-background { background: gray; }
-span.green-background { background: green; }
-span.lime-background { background: lime; }
-span.maroon-background { background: maroon; }
-span.navy-background { background: navy; }
-span.olive-background { background: olive; }
-span.purple-background { background: purple; }
-span.red-background { background: red; }
-span.silver-background { background: silver; }
-span.teal-background { background: teal; }
-span.white-background { background: white; }
-span.yellow-background { background: yellow; }
-
-span.big { font-size: 2em; }
-span.small { font-size: 0.6em; }
-
-span.underline { text-decoration: underline; }
-span.overline { text-decoration: overline; }
-span.line-through { text-decoration: line-through; }
diff --git a/doc/companion.txt b/doc/companion.txt
index 75ffa228..256ffad7 100644
--- a/doc/companion.txt
+++ b/doc/companion.txt
@@ -1,7 +1,16 @@
= AltOS Companion Port
+Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>
:doctype: article
+:copyright: Bdale Garbee and Keith Packard 2018
+:stylesheet: am.css
+:linkcss:
+:pdf-stylesdir: .
+:pdf-style: altusmetrum
+:pdf-fontsdir: fonts
:toc:
+ include::header.adoc[]
+
== Companion Port
Many Altus Metrum products come with an eight pin Micro MaTch
diff --git a/doc/config-device.inc b/doc/config-device.inc
index 0ca6afff..144b1e8f 100644
--- a/doc/config-device.inc
+++ b/doc/config-device.inc
@@ -233,7 +233,7 @@ ifdef::telemega,easymega[]
==== Configure Pyro Channels
.Additional Pyro Channel Configuration
- image::configure-pyro.png[width="5.5in"]
+ image::configure-pyro.png[width=400]
This opens a separate window to configure the
additional pyro channels available on TeleMega
@@ -262,6 +262,6 @@ ifdef::telemega,easymega[]
configuration by pressing the 'Save' button in
the main Configure Flight Computer window.
- include::pyro-channels.raw[]
+ include::pyro-channels.adoc[]
endif::telemega,easymega[]
diff --git a/doc/easymega-outline.txt b/doc/easymega-outline.txt
index f5ca982c..d6daf09c 100644
--- a/doc/easymega-outline.txt
+++ b/doc/easymega-outline.txt
@@ -1,6 +1,7 @@
-= EasyMega Outline and Hole Pattern
+:notitle:
:doctype: article
+== EasyMega Outline and Hole Pattern
This image, when printed, provides a precise template for the
mounting holes in EasyMega. EasyMega has overall dimensions of
1.250 x 2.250 inches, and the mounting holes are sized for use
diff --git a/doc/easymega.inc b/doc/easymega.inc
index c126004b..a948aaae 100644
--- a/doc/easymega.inc
+++ b/doc/easymega.inc
@@ -1,7 +1,7 @@
== EasyMega
.EasyMega Board
- image::easymega-v1.0-top.jpg[width="4.5in"]
+ image::easymega-v1.0-top.jpg[width=430]
EasyMega is a 1¼ inch by 2¼ inch circuit board. It was
designed to easily fit in a 38mm coupler. Like TeleMetrum,
diff --git a/doc/easymini-device.inc b/doc/easymini-device.inc
index fb2b6098..82ea959c 100644
--- a/doc/easymini-device.inc
+++ b/doc/easymini-device.inc
@@ -1,7 +1,7 @@
== EasyMini
.EasyMini Board
- image::easymini-top.jpg[width="5.5in"]
+ image::easymini-top.jpg[width=400]
EasyMini is built on a 0.8 inch by 1½ inch circuit board. It's
designed to fit in a 24mm coupler tube.
diff --git a/doc/easymini-outline.txt b/doc/easymini-outline.txt
index e031b5ee..c4b1baa5 100644
--- a/doc/easymini-outline.txt
+++ b/doc/easymini-outline.txt
@@ -1,6 +1,7 @@
-= EasyMini Outline and Hole Pattern
+:notitle:
:doctype: article
+== EasyMini Outline and Hole Pattern
This image, when printed, provides a precise template for the
mounting holes in EasyMini. EasyMini has overall dimensions
of 0.800 x 1.500 inches, and the mounting holes are sized for
diff --git a/doc/easymini-release-notes.inc b/doc/easymini-release-notes.inc
index 425236ef..67ba0f4d 100644
--- a/doc/easymini-release-notes.inc
+++ b/doc/easymini-release-notes.inc
@@ -1,53 +1,53 @@
[appendix]
== Release Notes
:leveloffset: 2
- include::release-notes-1.8.6.raw[]
+ include::release-notes-1.8.6.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.5.raw[]
+ include::release-notes-1.8.5.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.4.raw[]
+ include::release-notes-1.8.4.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.3.raw[]
+ include::release-notes-1.8.3.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.2.raw[]
+ include::release-notes-1.8.2.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.1.raw[]
+ include::release-notes-1.8.1.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.raw[]
+ include::release-notes-1.8.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.7.raw[]
+ include::release-notes-1.7.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.8.raw[]
+ include::release-notes-1.6.8.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.5.raw[]
+ include::release-notes-1.6.5.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.4.raw[]
+ include::release-notes-1.6.4.adoc[]
:leveloffset: 2
- include::release-notes-1.6.3.raw[]
+ include::release-notes-1.6.3.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.2.raw[]
+ include::release-notes-1.6.2.adoc[]
:leveloffset: 0
diff --git a/doc/easymini.txt b/doc/easymini.txt
index 1a75b929..e3d3fae8 100644
--- a/doc/easymini.txt
+++ b/doc/easymini.txt
@@ -1,34 +1,47 @@
= EasyMini Owner's Manual
+Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>
+:title-logo-image: image:../themes/background.png[]
+:revnumber: v1.8.7
+:revdate: 8 Oct 2018
+:copyright: Bdale Garbee and Keith Packard 2018
:doctype: book
:numbered:
+:toc:
+:stylesheet: am.css
+:linkcss:
:altusmetrum: 1
:easymini: 1
:application: AltosUI
+:pdf-stylesdir: .
+:pdf-style: altusmetrum
+:pdf-fontsdir: fonts
- include::dedication.raw[]
+ include::header.adoc[]
- include::intro.raw[]
+ include::dedication.adoc[]
- include::getting-started.raw[]
+ include::intro.adoc[]
- include::usage.raw[]
+ include::getting-started.adoc[]
- include::easymini-device.raw[]
+ include::usage.adoc[]
- include::installation.raw[]
+ include::easymini-device.adoc[]
- include::using-am-products.raw[]
+ include::installation.adoc[]
- include::altosui.raw[]
+ include::using-am-products.adoc[]
- include::system-operation.raw[]
+ include::altosui.adoc[]
- include::handling.raw[]
+ include::system-operation.adoc[]
- include::updating-firmware.raw[]
+ include::handling.adoc[]
- include::flight-data-recording.raw[]
+ include::updating-firmware.adoc[]
- include::specs.raw[]
+ include::flight-data-recording.adoc[]
- include::easymini-release-notes.raw[]
+ include::specs.adoc[]
+
+ include::easymini-release-notes.adoc[]
diff --git a/doc/header.inc b/doc/header.inc
new file mode 100644
index 00000000..6bc616f5
--- /dev/null
+++ b/doc/header.inc
@@ -0,0 +1,13 @@
+ifndef::backend-pdf[]
+[#logo]
+[link=https://altusmetrum.org]
+image::altusmetrum-oneline.svg[Altus Metrum]
+endif::[]
+
+[license]
+== License
+
+Copyright © 2018 Bdale Garbee and Keith Packard
+
+This document is released under the terms of the link:http://creativecommons.org/licenses/by-sa/3.0/[Creative Commons ShareAlike 3.0 License]
+
diff --git a/doc/load-maps.inc b/doc/load-maps.inc
index ccab4795..520fb364 100644
--- a/doc/load-maps.inc
+++ b/doc/load-maps.inc
@@ -1,7 +1,7 @@
=== Load Maps
.Load Maps Window
- image::load-maps.png[width="5.2in"]
+ image::load-maps.png[width=500]
Before heading out to a new launch site, you can use
this to load satellite images in case you don't have
diff --git a/doc/map-loading.txt b/doc/map-loading.txt
index 1b39dd6b..f8328176 100644
--- a/doc/map-loading.txt
+++ b/doc/map-loading.txt
@@ -1,5 +1,13 @@
= Loading Map Tiles from Google Maps
+Keith Packard <keithp@keithp.com>
+:title-logo-image: image:load-maps.png[]
+:copyright: Keith Packard 2018
:doctype: article
+:stylesheet: am-notoc.css
+:linkcss:
+:pdf-stylesdir: .
+:pdf-style: altusmetrum
+:pdf-fontsdir: fonts
== The Google Maps Problem
diff --git a/doc/micropeak-oneline.svg b/doc/micropeak-oneline.svg
index 4b695827..b892b24d 100644
--- a/doc/micropeak-oneline.svg
+++ b/doc/micropeak-oneline.svg
@@ -10,15 +10,45 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="444"
- height="98"
+ width="320"
+ height="63"
id="svg2"
version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="micropeak-oneline.svg">
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="micropeak-oneline-font.svg">
<defs
id="defs4">
<linearGradient
+ id="linearGradient4151">
+ <stop
+ id="stop4153"
+ offset="0"
+ style="stop-color:#da7000;stop-opacity:1;" />
+ <stop
+ style="stop-color:#a63852;stop-opacity:1;"
+ offset="0.15000001"
+ id="stop4159" />
+ <stop
+ style="stop-color:#7200a4;stop-opacity:1;"
+ offset="1"
+ id="stop4157" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4141">
+ <stop
+ style="stop-color:#7200a4;stop-opacity:1;"
+ offset="0"
+ id="stop4143" />
+ <stop
+ id="stop4149"
+ offset="0.5"
+ style="stop-color:#7200a4;stop-opacity:0.49803922;" />
+ <stop
+ style="stop-color:#7200a4;stop-opacity:0;"
+ offset="1"
+ id="stop4145" />
+ </linearGradient>
+ <linearGradient
id="linearGradient5343">
<stop
style="stop-color:#7200a4;stop-opacity:1;"
@@ -52,7 +82,7 @@
style="overflow:visible">
<path
id="path3780"
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
inkscape:connector-curvature="0" />
@@ -80,7 +110,7 @@
style="overflow:visible">
<path
id="path3768"
- d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
transform="matrix(-0.8,0,0,-0.8,-10,0)"
inkscape:connector-curvature="0" />
@@ -108,7 +138,17 @@
x2="280.61411"
y2="275.90405"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.9246394,0,0,1.9246394,-200.29778,-270.16721)" />
+ gradientTransform="matrix(1.58566,0,0,1.58566,-141.69631,-171.10662)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4151"
+ id="linearGradient4147"
+ x1="320.71625"
+ y1="261.24799"
+ x2="561.98907"
+ y2="261.24799"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.98765434,0,0,0.98765434,6.9381316,3.6077944)" />
</defs>
<sodipodi:namedview
id="base"
@@ -117,16 +157,16 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="2.8852983"
- inkscape:cx="243.9235"
- inkscape:cy="27.872251"
+ inkscape:zoom="2.040214"
+ inkscape:cx="63.523011"
+ inkscape:cy="51.339868"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1871"
inkscape:window-height="1383"
- inkscape:window-x="119"
- inkscape:window-y="125"
+ inkscape:window-x="0"
+ inkscape:window-y="160"
inkscape:window-maximized="0"
fit-margin-top="0"
fit-margin-left="0"
@@ -148,92 +188,78 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(-241.93841,-205.0196)">
+ transform="translate(-241.9891,-229.23188)">
<g
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:30.79423141px;line-height:125%;font-family:'Minion Pro';-inkscape-font-specification:'Minion Pro';letter-spacing:0px;word-spacing:0px;fill:#7200a4;fill-opacity:1;stroke:none"
- id="text2985"
- transform="translate(23.408014,-22.546654)" />
+ style="font-size:57.89221573px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#7200a4;fill-opacity:1;stroke:none;font-family:ITC Benguiat Gothic Std;-inkscape-font-specification:ITC Benguiat Gothic Std Medium"
+ id="text2985">
+ <path
+ d="m 266.5354,253.96513 c 0,-1.73676 -0.63682,-3.01039 -2.54726,-3.01039 -1.91044,0 -2.54726,1.27363 -2.54726,3.01039 l 0,13.95203 c 0,4.63137 -3.29986,8.22069 -7.75755,8.22069 -4.92084,0 -6.59972,-3.0104 -6.59972,-8.1628 l 0,-14.00992 c 0,-1.73676 -0.63681,-3.01039 -2.54725,-3.01039 -1.91044,0 -2.54726,1.27363 -2.54726,3.01039 l 0,35.25636 c 0,1.73677 0.63682,3.0104 2.54726,3.0104 1.91044,0 2.54725,-1.27363 2.54725,-3.0104 l 0,-9.89957 c 1.27363,0.98417 3.35775,1.56309 5.73133,1.56309 3.7051,0 7.12075,-1.27363 9.08908,-4.80505 l 0.11579,0.11578 0,2.02623 c 0,1.38941 0.86838,2.31569 2.25779,2.31569 1.38941,0 2.2578,-0.92628 2.2578,-2.31569 l 0,-24.25684"
+ style="line-height:125%;fill:#7200a4;font-family:ITC Benguiat Gothic Std;-inkscape-font-specification:ITC Benguiat Gothic Std Medium"
+ id="path4162" />
+ </g>
<path
- style="fill:none;stroke:url(#linearGradient5349);stroke-width:5.58145428;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:none"
- d="m 294.21061,289.33175 c 5.85134,-0.46986 8.28205,-5.13748 10.35972,-10.71262 3.23453,-8.67942 7.06755,-30.54218 16.59477,-39.56149 7.82712,-7.40985 15.82735,-6.67187 15.82735,-6.67187"
+ style="fill:none;stroke:url(#linearGradient5349);stroke-width:4.59841394;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:none"
+ d="m 265.7162,289.84993 c 4.82076,-0.38711 6.82338,-4.23263 8.53511,-8.82584 2.66483,-7.15075 5.82277,-25.16291 13.67197,-32.59367 6.44857,-6.10479 13.03975,-5.49679 13.03975,-5.49679"
id="path2991"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cssc" />
<path
sodipodi:type="star"
- style="fill:none;stroke:#da7000;stroke-width:2.11710358;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:none;stroke:#da7000;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path5341"
sodipodi:sides="5"
- sodipodi:cx="337.23586"
- sodipodi:cy="232.26813"
- sodipodi:r1="13.956471"
- sodipodi:r2="6.9782352"
+ sodipodi:cx="279.29056"
+ sodipodi:cy="261.05426"
+ sodipodi:r1="7.2514729"
+ sodipodi:r2="3.6257365"
sodipodi:arg1="1.0731354"
sodipodi:arg2="1.7014539"
inkscape:flatsided="false"
inkscape:rounded="0"
inkscape:randomized="0"
- d="m 343.89829,244.5317 -7.57159,-5.34482 -8.69538,3.20724 2.74347,-8.85265 -5.73728,-7.27871 9.26715,-0.12642 5.14955,-7.70573 2.98393,8.77452 8.91988,2.51631 -7.42297,5.54937 z"
- inkscape:transform-center-x="-0.56191834"
- inkscape:transform-center-y="-0.78695059" />
+ d="m 282.7522,267.42614 -3.93403,-2.77705 -4.51792,1.66641 1.42544,-4.59964 -2.98096,-3.78185 4.815,-0.0657 2.67559,-4.00372 1.55039,4.55904 4.63457,1.30742 -3.85681,2.88333 z"
+ inkscape:transform-center-x="-0.46292579"
+ inkscape:transform-center-y="-0.64836539"
+ transform="matrix(1.58566,0,0,1.58566,-141.69632,-171.10662)" />
<g
- id="g4212"
- style="fill:#78079a;fill-opacity:1">
+ style="font-size:54.73445892px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4147);fill-opacity:1;stroke:none;font-family:ITC Benguiat Gothic Std;-inkscape-font-specification:ITC Benguiat Gothic Std Medium"
+ id="text5351">
+ <path
+ d="m 339.95106,263.95674 c 3.3388,0 8.26491,-10.67322 9.46907,-13.30048 l 0.10947,0 c 1.64203,8.97645 1.86097,18.06238 1.86097,26.54622 0,2.13464 0.60208,3.3388 2.40831,3.3388 1.64203,0 2.40832,-1.31363 2.40832,-3.3388 0,-7.44388 -1.4231,-23.6453 -2.90093,-30.37763 -0.38314,-1.86097 -1.36836,-4.26929 -3.1746,-4.26929 -3.06512,0 -4.32402,7.17023 -10.18061,15.38039 -5.85658,-8.21016 -7.11548,-15.38039 -10.1806,-15.38039 -1.80624,0 -2.79146,2.40832 -3.1746,4.26929 -1.47783,6.73233 -2.90093,22.93375 -2.90093,30.37763 0,2.02517 0.76628,3.3388 2.40832,3.3388 1.80623,0 2.40831,-1.20416 2.40831,-3.3388 0,-8.48384 0.21894,-17.56977 1.80624,-26.54622 l 0.10947,0 c 1.25889,2.62726 6.185,13.30048 9.52379,13.30048"
+ style=""
+ id="path4165" />
+ <path
+ d="m 368.22997,255.25396 c 0,-1.64203 -0.60209,-2.84619 -2.40832,-2.84619 -1.80624,0 -2.40832,1.20416 -2.40832,2.84619 l 0,22.44113 c 0,1.64203 0.60208,2.84619 2.40832,2.84619 1.80623,0 2.40832,-1.20416 2.40832,-2.84619 l 0,-22.44113 m -2.40832,-12.20579 c -1.7515,0 -2.57252,1.53257 -2.57252,3.1746 0,1.64203 0.82102,3.1746 2.57252,3.1746 1.7515,0 2.57252,-1.53257 2.57252,-3.1746 0,-1.64203 -0.82102,-3.1746 -2.57252,-3.1746"
+ style=""
+ id="path4167" />
+ <path
+ d="m 391.19962,275.88885 c -6.67759,0 -11.98684,-4.15983 -11.98684,-11.49424 0,-5.0903 2.79146,-7.66282 9.57853,-7.66282 l 6.23973,0 c 1.47782,0 2.46305,-0.65682 2.46305,-2.07991 0,-1.4231 -0.98523,-2.07991 -2.46305,-2.07991 l -9.30486,0 c -7.17021,0 -11.65844,5.03558 -11.65844,11.65844 0,9.96166 8.26491,16.14667 15.70879,16.14667 l 6.5134,0 c 1.53256,0 2.62725,-0.71155 2.62725,-2.24412 0,-1.53256 -1.09469,-2.24411 -2.62725,-2.24411 l -5.09031,0"
+ style=""
+ id="path4169" />
+ <path
+ d="m 403.02227,277.69509 c 0,1.64203 0.60208,2.84619 2.40831,2.84619 1.80624,0 2.40832,-1.20416 2.40832,-2.84619 l 0,-14.50463 c 0,-4.26929 3.39354,-6.45867 7.38915,-6.45867 1.7515,0 2.46305,-0.82102 2.46305,-2.35358 0,-1.5873 -1.03995,-2.13465 -2.84619,-2.13465 -3.503,0 -5.85659,1.31363 -6.89654,4.7619 l -0.10947,0 0,-1.5873 c 0,-1.64203 -0.60208,-2.84619 -2.40832,-2.84619 -1.80623,0 -2.40831,1.20416 -2.40831,2.84619 l 0,22.27693"
+ style=""
+ id="path4171" />
+ <path
+ d="m 431.7801,276.54566 c -4.98083,0 -8.31964,-4.7619 -8.31964,-10.07114 0,-5.30923 3.33881,-10.07114 8.31964,-10.07114 5.03556,0 8.37437,4.76191 8.37437,10.07114 0,5.30924 -3.33881,10.07114 -8.37437,10.07114 m 0,4.15982 c 7.44388,0 13.191,-6.185 13.191,-14.28569 0,-7.55335 -5.74712,-14.17623 -13.191,-14.17623 -7.44388,0 -13.13627,6.62288 -13.13627,14.17623 0,8.10069 5.69239,14.28569 13.13627,14.28569"
+ style=""
+ id="path4173" />
+ <path
+ d="m 456.22673,263.84727 c 6.73233,-2.40832 21.18224,-5.03558 21.18224,-14.6141 0,-4.37875 -3.50301,-6.5134 -7.82703,-6.5134 l -15.92773,0 c -1.69677,0 -2.24411,1.09469 -2.24411,2.62725 l 0,32.34807 c 0,1.69676 0.76628,2.84619 2.40831,2.84619 1.64204,0 2.40832,-1.14943 2.40832,-2.84619 l 0,-13.84782 m 12.47946,-16.63928 c 1.9157,0 3.3388,0.65682 3.3388,2.79146 0,4.9261 -10.29009,6.62287 -15.81826,8.92172 l 0,-11.71318 12.47946,0"
+ style=""
+ id="path4175" />
+ <path
+ d="m 485.16159,263.08099 c 0.71154,-3.50301 3.22934,-6.67761 8.48384,-6.67761 4.43348,0 7.22495,2.8462 7.44388,6.67761 l -15.92772,0 m 18.06237,3.72194 c 2.62725,0 2.68199,-0.60208 2.68199,-2.90093 0,-6.89653 -5.41872,-11.65844 -12.20579,-11.65844 -8.15542,0 -13.90255,5.58293 -13.90255,13.79309 0,9.63325 6.07553,14.34043 13.30047,14.34043 l 10.50902,0 c 1.47783,0 2.46305,-0.65682 2.46305,-2.07991 0,-1.4231 -0.98522,-2.07991 -2.46305,-2.07991 l -10.39955,0 c -4.48822,0 -8.64804,-3.06514 -8.2649,-9.41433 l 18.28131,0"
+ style=""
+ id="path4177" />
+ <path
+ d="m 527.28745,270.52487 c 0,4.7619 -2.68199,6.45867 -7.22495,6.45867 -4.10508,0 -6.45867,-1.47783 -6.45867,-4.7619 0,-5.14503 7.38916,-6.6776 13.68362,-6.6776 l 0,4.98083 m -4.43349,-13.46467 c 3.3388,0 4.43349,0.76628 4.43349,3.11986 l 0,1.64203 c -7.06074,0.43788 -18.50025,1.0947 -18.50025,10.61849 0,5.19977 4.4335,8.2649 10.50902,8.2649 3.72194,0 5.47345,-0.98522 8.31964,-3.11986 0,1.7515 0.71155,2.79146 2.24411,2.79146 1.53256,0 2.24411,-1.03996 2.24411,-2.79146 l 0,-15.16145 c 0,-4.87136 -1.31363,-9.8522 -8.53857,-9.8522 l -10.12588,0 c -1.5873,0 -2.62725,0.71155 -2.62725,2.24411 0,1.53257 1.03995,2.24412 2.62725,2.24412 l 9.41433,0"
+ style=""
+ id="path4179" />
<path
- inkscape:connector-curvature="0"
- id="path4233"
- style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:69.28701782px;line-height:125%;font-family:'ITC Benguiat Gothic Std';-inkscape-font-specification:'ITC Benguiat Gothic Std Medium';letter-spacing:0px;word-spacing:0px;fill:#78079a;fill-opacity:1;stroke:none;text-align:start;writing-mode:lr-tb;text-anchor:start"
- d="m 271.3161,268.77261 c 0,-2.07861 -0.76216,-3.60293 -3.04863,-3.60293 -2.28647,0 -3.04863,1.52432 -3.04863,3.60293 l 0,16.69817 c 0,5.54296 -3.94936,9.83875 -9.28446,9.83875 -5.88939,0 -7.89872,-3.60292 -7.89872,-9.76946 l 0,-16.76746 c 0,-2.07861 -0.76215,-3.60293 -3.04862,-3.60293 -2.28648,0 -3.04863,1.52432 -3.04863,3.60293 l 0,42.19579 c 0,2.07861 0.76215,3.60293 3.04863,3.60293 2.28647,0 3.04862,-1.52432 3.04862,-3.60293 l 0,-11.84808 c 1.52432,1.17788 4.01865,1.87075 6.85942,1.87075 4.43437,0 8.5223,-1.52431 10.87806,-5.75082 l 0.13857,0.13857 0,2.42505 c 0,1.66289 1.03931,2.77148 2.7022,2.77148 1.66289,0 2.70219,-1.10859 2.70219,-2.77148 l 0,-29.03126 z"
- transform="translate(23.40801,-22.54665)" />
- <g
- style="fill:#78079a;fill-opacity:1"
- id="g4200">
- <path
- style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:medium;line-height:125%;font-family:'ITC Benguiat Gothic Std';-inkscape-font-specification:'ITC Benguiat Gothic Std Medium';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#78079a;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0"
- id="path4236"
- d="m 380.37736,256.92285 c 4.28006,0 10.5949,-13.68217 12.13853,-17.05008 l 0.14033,0 c 2.10495,11.50705 2.38561,23.15443 2.38561,34.02999 0,2.73644 0.77182,4.28007 3.08726,4.28007 2.10495,0 3.08726,-1.68396 3.08726,-4.28007 0,-9.54243 -1.82429,-30.31125 -3.71875,-38.94154 -0.49115,-2.38561 -1.75412,-5.47287 -4.06956,-5.47287 -3.92924,0 -5.54303,9.19161 -13.05068,19.71635 -7.50765,-10.52474 -9.12145,-19.71635 -13.05068,-19.71635 -2.31545,0 -3.57842,3.08726 -4.06957,5.47287 -1.89445,8.63029 -3.71874,29.39911 -3.71874,38.94154 0,2.59611 0.98231,4.28007 3.08726,4.28007 2.31544,0 3.08725,-1.54363 3.08725,-4.28007 0,-10.87556 0.28066,-22.52294 2.31545,-34.02999 l 0.14033,0 c 1.61379,3.36791 7.92864,17.05008 12.2087,17.05008 z" />
- <path
- style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:medium;line-height:125%;font-family:'ITC Benguiat Gothic Std';-inkscape-font-specification:'ITC Benguiat Gothic Std Medium';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#78079a;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0"
- id="path4238"
- d="m 416.62852,245.76662 c 0,-2.10495 -0.77182,-3.64858 -3.08726,-3.64858 -2.31544,0 -3.08726,1.54363 -3.08726,3.64858 l 0,28.76763 c 0,2.10495 0.77182,3.64858 3.08726,3.64858 2.31544,0 3.08726,-1.54363 3.08726,-3.64858 l 0,-28.76763 z m -3.08726,-15.64678 c -2.24528,0 -3.29775,1.96462 -3.29775,4.06956 0,2.10495 1.05247,4.06957 3.29775,4.06957 2.24528,0 3.29775,-1.96462 3.29775,-4.06957 0,-2.10494 -1.05247,-4.06956 -3.29775,-4.06956 z" />
- <path
- style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:medium;line-height:125%;font-family:'ITC Benguiat Gothic Std';-inkscape-font-specification:'ITC Benguiat Gothic Std Medium';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#78079a;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0"
- id="path4240"
- d="m 446.07368,272.21881 c -8.56013,0 -15.36613,-5.33254 -15.36613,-14.73464 0,-6.52534 3.57842,-9.8231 12.27887,-9.8231 l 7.9988,0 c 1.89446,0 3.15743,-0.84197 3.15743,-2.66626 0,-1.82429 -1.26297,-2.66627 -3.15743,-2.66627 l -11.92804,0 c -9.19161,0 -14.94513,6.45517 -14.94513,14.94513 0,12.77002 10.59491,20.69866 20.13734,20.69866 l 8.34963,0 c 1.96462,0 3.36791,-0.91214 3.36791,-2.87676 0,-1.96462 -1.40329,-2.87676 -3.36791,-2.87676 l -6.52534,0 z" />
- <path
- style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:medium;line-height:125%;font-family:'ITC Benguiat Gothic Std';-inkscape-font-specification:'ITC Benguiat Gothic Std Medium';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#78079a;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0"
- id="path4242"
- d="m 461.22931,274.53425 c 0,2.10495 0.77181,3.64858 3.08725,3.64858 2.31545,0 3.08726,-1.54363 3.08726,-3.64858 l 0,-18.59371 c 0,-5.47287 4.35023,-8.27947 9.47227,-8.27947 2.24528,0 3.15742,-1.05247 3.15742,-3.01709 0,-2.03478 -1.33313,-2.73643 -3.64858,-2.73643 -4.49055,0 -7.50764,1.68396 -8.84078,6.10435 l -0.14033,0 0,-2.03478 c 0,-2.10495 -0.77181,-3.64858 -3.08726,-3.64858 -2.31544,0 -3.08725,1.54363 -3.08725,3.64858 l 0,28.55713 z" />
- <path
- style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:medium;line-height:125%;font-family:'ITC Benguiat Gothic Std';-inkscape-font-specification:'ITC Benguiat Gothic Std Medium';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#78079a;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0"
- id="path4244"
- d="m 498.09441,273.06079 c -6.38501,0 -10.66507,-6.10435 -10.66507,-12.91035 0,-6.806 4.28006,-12.91036 10.66507,-12.91036 6.45518,0 10.73524,6.10436 10.73524,12.91036 0,6.806 -4.28006,12.91035 -10.73524,12.91035 z m 0,5.33253 c 9.54243,0 16.90975,-7.92864 16.90975,-18.31305 0,-9.68276 -7.36732,-18.17272 -16.90975,-18.17272 -9.54243,0 -16.83959,8.48996 -16.83959,18.17272 0,10.38441 7.29716,18.31305 16.83959,18.31305 z" />
- <path
- style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:medium;line-height:125%;font-family:'ITC Benguiat Gothic Std';-inkscape-font-specification:'ITC Benguiat Gothic Std Medium';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#78079a;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0"
- id="path4246"
- d="m 529.43293,256.78252 c 8.63029,-3.08726 27.15383,-6.45518 27.15383,-18.73404 0,-5.6132 -4.49055,-8.34963 -10.03358,-8.34963 l -20.418,0 c -2.17512,0 -2.87677,1.4033 -2.87677,3.36792 l 0,41.46748 c 0,2.17511 0.98231,3.64858 3.08726,3.64858 2.10495,0 3.08726,-1.47347 3.08726,-3.64858 l 0,-17.75173 z m 15.99761,-21.33015 c 2.45577,0 4.28006,0.84198 4.28006,3.57842 0,6.31484 -13.19101,8.48995 -20.27767,11.43688 l 0,-15.0153 15.99761,0 z" />
- <path
- style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:medium;line-height:125%;font-family:'ITC Benguiat Gothic Std';-inkscape-font-specification:'ITC Benguiat Gothic Std Medium';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#78079a;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0"
- id="path4248"
- d="m 566.52497,255.80021 c 0.91214,-4.49056 4.13973,-8.56013 10.87556,-8.56013 5.68336,0 9.26178,3.64858 9.54244,8.56013 l -20.418,0 z m 23.15443,4.77121 c 3.36792,0 3.43808,-0.77181 3.43808,-3.71874 0,-8.84078 -6.94633,-14.94513 -15.64678,-14.94513 -10.45458,0 -17.8219,7.15682 -17.8219,17.68157 0,12.34903 7.78831,18.38321 17.05008,18.38321 l 13.47167,0 c 1.89446,0 3.15743,-0.84198 3.15743,-2.66627 0,-1.82428 -1.26297,-2.66626 -3.15743,-2.66626 l -13.33134,0 c -5.75352,0 -11.08606,-3.92924 -10.5949,-12.06838 l 23.43509,0 z" />
- <path
- style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:medium;line-height:125%;font-family:'ITC Benguiat Gothic Std';-inkscape-font-specification:'ITC Benguiat Gothic Std Medium';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#78079a;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0"
- id="path4250"
- d="m 620.52676,265.34264 c 0,6.10435 -3.43809,8.27947 -9.26178,8.27947 -5.26237,0 -8.27946,-1.89446 -8.27946,-6.10436 0,-6.5955 9.47227,-8.56012 17.54124,-8.56012 l 0,6.38501 z m -5.68336,-17.26058 c 4.28006,0 5.68336,0.98231 5.68336,3.99941 l 0,2.10494 c -9.05128,0.56132 -23.71576,1.4033 -23.71576,13.612 0,6.66567 5.68336,10.59491 13.47167,10.59491 4.77122,0 7.0165,-1.26297 10.66508,-3.9994 0,2.24528 0.91214,3.57841 2.87676,3.57841 1.96462,0 2.87676,-1.33313 2.87676,-3.57841 l 0,-19.43569 c 0,-6.24468 -1.68396,-12.62969 -10.94573,-12.62969 l -12.98052,0 c -2.03478,0 -3.36791,0.91214 -3.36791,2.87676 0,1.96462 1.33313,2.87676 3.36791,2.87676 l 12.06838,0 z" />
- <path
- style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:medium;line-height:125%;font-family:'ITC Benguiat Gothic Std';-inkscape-font-specification:'ITC Benguiat Gothic Std Medium';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#78079a;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0"
- id="path4252"
- d="m 635.47191,274.53425 c 0,2.10495 0.77181,3.64858 3.08725,3.64858 2.31545,0 3.08726,-1.54363 3.08726,-3.64858 l 0,-17.19041 c 11.71755,1.61379 15.50645,5.33253 17.19041,17.26057 0.28066,1.96462 0.56132,3.57842 3.0171,3.57842 2.03478,0 3.15742,-1.05248 3.15742,-3.29776 0,-7.9988 -4.13973,-17.19041 -12.27887,-19.64618 l 0,-0.14033 c 3.92924,-1.33313 9.6126,-5.89386 9.6126,-10.45458 0,-1.54363 -1.05247,-2.8066 -2.24528,-2.8066 -2.31544,0 -2.8066,1.6138 -5.05187,4.77122 -2.52594,3.71874 -7.29716,6.24468 -11.92805,6.24468 l -1.47346,0 0,-19.71635 c 0,-2.10495 -0.77181,-3.64858 -3.08726,-3.64858 -2.31544,0 -3.08725,1.54363 -3.08725,3.64858 l 0,41.39732 z" />
- </g>
+ d="m 538.94589,277.69509 c 0,1.64203 0.60208,2.84619 2.40832,2.84619 1.80623,0 2.40832,-1.20416 2.40832,-2.84619 l 0,-13.40995 c 9.14064,1.2589 12.09631,4.15983 13.40994,13.46468 0.21894,1.53256 0.43788,2.79146 2.35358,2.79146 1.5873,0 2.46305,-0.82102 2.46305,-2.57252 0,-6.23972 -3.22934,-13.40995 -9.57853,-15.32565 l 0,-0.10947 c 3.06513,-1.03995 7.49862,-4.5977 7.49862,-8.15543 0,-1.20416 -0.82102,-2.18938 -1.7515,-2.18938 -1.80624,0 -2.18938,1.25889 -3.94088,3.72194 -1.97044,2.90093 -5.69239,4.87137 -9.30486,4.87137 l -1.14942,0 0,-15.38038 c 0,-1.64204 -0.60209,-2.8462 -2.40832,-2.8462 -1.80624,0 -2.40832,1.20416 -2.40832,2.8462 l 0,32.29333"
+ style=""
+ id="path4181" />
</g>
</g>
</svg>
diff --git a/doc/micropeak.txt b/doc/micropeak.txt
index d5036a00..9569194e 100644
--- a/doc/micropeak.txt
+++ b/doc/micropeak.txt
@@ -1,6 +1,18 @@
= MicroPeak Owner's Manual
+Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>
+:revnumber: v1.8.7
+:revdate: 8 Oct 2018
+:copyright: Bdale Garbee and Keith Packard 2018
+:stylesheet: am.css
+:linkcss:
+:toc:
:doctype: book
:numbered:
+:pdf-stylesdir: .
+:pdf-style: altusmetrum
+:pdf-fontsdir: fonts
+
+ include::header.adoc[]
[dedication]
== Acknowledgements
@@ -32,7 +44,7 @@
positive (+) terminal facing away from the circuit board.
.MicroPeak and Battery
- image::micropeak-back.jpg[width="4.5in"]
+ image::micropeak-back.jpg[width=430]
Install MicroPeak in your rocket::
@@ -87,7 +99,7 @@
== The MicroPeak USB adapter
.MicroPeak USB Adapter
- image::MicroPeakUSB-2.0.jpg[width="4.5in",align="center"]
+ image::MicroPeakUSB-2.0.jpg[width=430,align="center"]
MicroPeak stores barometric pressure information for the first
48 seconds of the flight in on-board non-volatile memory. The
@@ -112,25 +124,25 @@
* Start the MicroPeak application.
- image::micropeak-nofont.svg[width="0.5in",align="center"]
+ image::micropeak-nofont.svg[width=50,align="center"]
* Click on the Download button at the top of the
window.
.MicroPeak Application
- image::micropeak-app.png[width="4.5in",align="center"]
+ image::micropeak-app.png[width=430,align="center"]
* Select from the listed devices. There will probably
be only one.
.MicroPeak Device Dialog
- image::micropeak-device-dialog.png[width="2.3in",align="center"]
+ image::micropeak-device-dialog.png[width=220,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",align="center"]
+ image::micropeak-download.png[width=200,align="center"]
* The MicroPeak USB adapter has a small
phototransistor under the hole in the center of the
@@ -142,7 +154,7 @@
MicroPeak board itself.
.MicroPeak Downloading
- image::MicroPeakUSB-2.0-inuse.jpg[width="4.5in",align="center"]
+ image::MicroPeakUSB-2.0-inuse.jpg[width=430,align="center"]
* After the maximum flight height is reported,
MicroPeak will pause for a few seconds, blink the
@@ -154,7 +166,7 @@
MicroPeak board and try again.
.MicroPeak Save Dialog
- image::micropeak-save-dialog.png[width="2.3in",align="center"]
+ image::micropeak-save-dialog.png[width=220,align="center"]
* Once the data are saved, a graph will be displayed
with height, speed and acceleration values computed
@@ -194,7 +206,7 @@
==== MicroPeak Graphs
.MicroPeak Graph
- image::micropeak-graph.png[width="4.5in",align="center"]
+ image::micropeak-graph.png[width=430,align="center"]
Under the Graph tab, the height, speed and acceleration values
are displayed together. You can zoom in on the graph by
@@ -205,7 +217,7 @@
==== MicroPeak Flight Statistics
.MicroPeak Flight Statistics
- image::micropeak-statistics.png[width="4.5in",align="center"]
+ image::micropeak-statistics.png[width=430,align="center"]
The Statistics tab presents overall data from
the flight. Note that the Maximum height value
@@ -220,7 +232,7 @@
==== Raw Flight Data
.MicroPeak Raw Flight Data
- image::micropeak-raw-data.png[width="4.5in",align="center"]
+ image::micropeak-raw-data.png[width=430,align="center"]
A table consisting of the both the raw barometric pressure
data and values computed from that for each recorded time.
@@ -228,7 +240,7 @@
==== Configuring the Graph
.MicroPeak Graph Configuration
- image::micropeak-graph-configure.png[width="4.5in",align="center"]
+ image::micropeak-graph-configure.png[width=430,align="center"]
This selects which graph elements to show, and lets you
switch between metric and imperial units
@@ -236,7 +248,7 @@
=== Setting MicroPeak Preferences
.MicroPeak Preferences
- image::micropeak-preferences.png[width="1.8in",align="center"]
+ image::micropeak-preferences.png[width=170,align="center"]
The MicroPeak application has a few user settings which are
configured through the Preferences dialog, which can be
diff --git a/doc/release-head.inc b/doc/release-head.inc
new file mode 100644
index 00000000..0dbdfc2b
--- /dev/null
+++ b/doc/release-head.inc
@@ -0,0 +1,7 @@
+:toc!:
+:doctype: article
+:stylesheet: am-notoc.css
+:linkcss:
+:pdf-stylesdir: .
+:pdf-style: altusmetrum
+:pdf-fontsdir: fonts
diff --git a/doc/release-notes-0.7.1.inc b/doc/release-notes-0.7.1.inc
index 8ce49f0a..c253e812 100644
--- a/doc/release-notes-0.7.1.inc
+++ b/doc/release-notes-0.7.1.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 0.7.1
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 0.7.1 is the first release containing our new
diff --git a/doc/release-notes-0.8.inc b/doc/release-notes-0.8.inc
index 38230593..3ff70c90 100644
--- a/doc/release-notes-0.8.inc
+++ b/doc/release-notes-0.8.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 0.8
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 0.8 offers a major upgrade in the AltosUI
diff --git a/doc/release-notes-0.9.2.inc b/doc/release-notes-0.9.2.inc
index b7c55bb2..9c373c2f 100644
--- a/doc/release-notes-0.9.2.inc
+++ b/doc/release-notes-0.9.2.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 0.9.2
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 0.9.2 is an AltosUI bug-fix release, with no firmware
diff --git a/doc/release-notes-0.9.inc b/doc/release-notes-0.9.inc
index 0ee7ea51..a42a18d8 100644
--- a/doc/release-notes-0.9.inc
+++ b/doc/release-notes-0.9.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 0.9
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 0.9 adds a few new firmware features and accompanying
diff --git a/doc/release-notes-1.0.1.inc b/doc/release-notes-1.0.1.inc
index 067727e9..fac31d7f 100644
--- a/doc/release-notes-1.0.1.inc
+++ b/doc/release-notes-1.0.1.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.0.1
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.0.1 is a major release, adding support for the
diff --git a/doc/release-notes-1.1.1.inc b/doc/release-notes-1.1.1.inc
index 2e61bfec..2cc30aa8 100644
--- a/doc/release-notes-1.1.1.inc
+++ b/doc/release-notes-1.1.1.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.1
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.1.1 is a bug-fix release. It fixes a couple of bugs
diff --git a/doc/release-notes-1.1.inc b/doc/release-notes-1.1.inc
index b3ea066d..f7283ce4 100644
--- a/doc/release-notes-1.1.inc
+++ b/doc/release-notes-1.1.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.1
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.1 is a minor release. It provides a few new features
diff --git a/doc/release-notes-1.2.1.inc b/doc/release-notes-1.2.1.inc
index 18c5d7e2..f60b8e74 100644
--- a/doc/release-notes-1.2.1.inc
+++ b/doc/release-notes-1.2.1.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.2.1
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.2.1 is a minor release. It adds support for TeleBT and
diff --git a/doc/release-notes-1.2.inc b/doc/release-notes-1.2.inc
index 42afad04..f0c2615a 100644
--- a/doc/release-notes-1.2.inc
+++ b/doc/release-notes-1.2.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.2
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.2 is a major release. It adds support for MicroPeak
diff --git a/doc/release-notes-1.3.1.inc b/doc/release-notes-1.3.1.inc
index ff9c8e52..dc9eac87 100644
--- a/doc/release-notes-1.3.1.inc
+++ b/doc/release-notes-1.3.1.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.3.1
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.3.1 is a minor release. It improves support for
diff --git a/doc/release-notes-1.3.2.inc b/doc/release-notes-1.3.2.inc
index dae5dd99..7e0f57d6 100644
--- a/doc/release-notes-1.3.2.inc
+++ b/doc/release-notes-1.3.2.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.3.2
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.3.2 is a minor release. It includes small bug fixes for
diff --git a/doc/release-notes-1.3.inc b/doc/release-notes-1.3.inc
index ceb677a1..b53354ac 100644
--- a/doc/release-notes-1.3.inc
+++ b/doc/release-notes-1.3.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.3
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.3 is a major release. It adds support for TeleMega,
diff --git a/doc/release-notes-1.4.1.inc b/doc/release-notes-1.4.1.inc
index 5e3e831e..0d9c5350 100644
--- a/doc/release-notes-1.4.1.inc
+++ b/doc/release-notes-1.4.1.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.4.1
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.4.1 is a minor release. It fixes install issues on
diff --git a/doc/release-notes-1.4.2.inc b/doc/release-notes-1.4.2.inc
index ded6b408..059b8b95 100644
--- a/doc/release-notes-1.4.2.inc
+++ b/doc/release-notes-1.4.2.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.4.2
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.4.2 is a minor release. It fixes Java-related install issues on
diff --git a/doc/release-notes-1.4.inc b/doc/release-notes-1.4.inc
index f4ab9ad2..163aee0c 100644
--- a/doc/release-notes-1.4.inc
+++ b/doc/release-notes-1.4.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.4
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.4 is a major release. It includes support for our new
diff --git a/doc/release-notes-1.5.inc b/doc/release-notes-1.5.inc
index 8d72c0e0..67cf1721 100644
--- a/doc/release-notes-1.5.inc
+++ b/doc/release-notes-1.5.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.5
-:toc!:
+include::release-head.adoc[]
Version 1.5 is a major release. It includes support for our new
EasyMega product, new features and bug fixes in in the flight
diff --git a/doc/release-notes-1.6.1.inc b/doc/release-notes-1.6.1.inc
index 1e03ed4f..8fb90570 100644
--- a/doc/release-notes-1.6.1.inc
+++ b/doc/release-notes-1.6.1.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.6.1
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.6.1 includes support for our updated TeleBT v3.0
diff --git a/doc/release-notes-1.6.2.inc b/doc/release-notes-1.6.2.inc
index 990eb48f..95466bf7 100644
--- a/doc/release-notes-1.6.2.inc
+++ b/doc/release-notes-1.6.2.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.6.2
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.6.2 includes support for our updated TeleMega v2.0
diff --git a/doc/release-notes-1.6.3.inc b/doc/release-notes-1.6.3.inc
index 6aa77042..97946db7 100644
--- a/doc/release-notes-1.6.3.inc
+++ b/doc/release-notes-1.6.3.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.6.3
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.6.3 adds idle mode to AltosDroid and has bug fixes
diff --git a/doc/release-notes-1.6.4.inc b/doc/release-notes-1.6.4.inc
index f976a69d..f0c7a59d 100644
--- a/doc/release-notes-1.6.4.inc
+++ b/doc/release-notes-1.6.4.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.6.4
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.6.4 fixes a bluetooth communication problem with
diff --git a/doc/release-notes-1.6.5.inc b/doc/release-notes-1.6.5.inc
index 9f3ae281..538c4db3 100644
--- a/doc/release-notes-1.6.5.inc
+++ b/doc/release-notes-1.6.5.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.6.5
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.6.5 fixes a TeleMega and TeleMetrum v2.0 bug where
diff --git a/doc/release-notes-1.6.8.inc b/doc/release-notes-1.6.8.inc
index 8e37fe69..7b122425 100644
--- a/doc/release-notes-1.6.8.inc
+++ b/doc/release-notes-1.6.8.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.6.8
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.6.8 fixes a TeleMega and TeleMetrum v2.0 bug where
diff --git a/doc/release-notes-1.6.inc b/doc/release-notes-1.6.inc
index 0908dfaf..adbded52 100644
--- a/doc/release-notes-1.6.inc
+++ b/doc/release-notes-1.6.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.6
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.6 includes support for our updated TeleDongle v3.0
diff --git a/doc/release-notes-1.7.inc b/doc/release-notes-1.7.inc
index f2da71f3..b6ed7881 100644
--- a/doc/release-notes-1.7.inc
+++ b/doc/release-notes-1.7.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.7
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.7 includes support for our new TeleMini v3.0
diff --git a/doc/release-notes-1.8.1.inc b/doc/release-notes-1.8.1.inc
index d9e4a2d9..dc02b3a1 100644
--- a/doc/release-notes-1.8.1.inc
+++ b/doc/release-notes-1.8.1.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.8.1
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.8.1 includes an important bug fix for Apogee Lockout
diff --git a/doc/release-notes-1.8.2.inc b/doc/release-notes-1.8.2.inc
index 2923ec11..cbc77bba 100644
--- a/doc/release-notes-1.8.2.inc
+++ b/doc/release-notes-1.8.2.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.8.2
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.8.2 includes support for TeleGPS version 2.0 along
diff --git a/doc/release-notes-1.8.3.inc b/doc/release-notes-1.8.3.inc
index 4bc879ad..ef056f01 100644
--- a/doc/release-notes-1.8.3.inc
+++ b/doc/release-notes-1.8.3.inc
@@ -1,6 +1,5 @@
= Release Notes for Version 1.8.3
-:toc!:
-:doctype: article
+include::release-head.adoc[]
Version 1.8.3 includes support for TeleMega version 3.0 along
with two important flight computer fixes. This version also
diff --git a/doc/release-notes-1.8.4.inc b/doc/release-notes-1.8.4.inc
index f8cb4f11..9a8657b3 100644
--- a/doc/release-notes-1.8.4.inc
+++ b/doc/release-notes-1.8.4.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.8.4
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.8.4 includes support for EasyMini version 2.0
diff --git a/doc/release-notes-1.8.5.inc b/doc/release-notes-1.8.5.inc
index 5b940efd..07d911c1 100644
--- a/doc/release-notes-1.8.5.inc
+++ b/doc/release-notes-1.8.5.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.8.5
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.8.5 includes fixes to the ground software support
diff --git a/doc/release-notes-1.8.6.inc b/doc/release-notes-1.8.6.inc
index 1467977c..5c066b80 100644
--- a/doc/release-notes-1.8.6.inc
+++ b/doc/release-notes-1.8.6.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.8.6
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.8.6
diff --git a/doc/release-notes-1.8.7.inc b/doc/release-notes-1.8.7.inc
index f8b7b103..2e387adb 100644
--- a/doc/release-notes-1.8.7.inc
+++ b/doc/release-notes-1.8.7.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.8.7
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.8.7
diff --git a/doc/release-notes-1.8.inc b/doc/release-notes-1.8.inc
index 0255c16b..0c97abb4 100644
--- a/doc/release-notes-1.8.inc
+++ b/doc/release-notes-1.8.inc
@@ -1,5 +1,5 @@
= Release Notes for Version 1.8
-:toc!:
+include::release-head.adoc[]
:doctype: article
Version 1.8 includes support for our new TeleBT v4.0 ground
diff --git a/doc/release-notes.inc b/doc/release-notes.inc
index 1183fd12..a1dc6720 100644
--- a/doc/release-notes.inc
+++ b/doc/release-notes.inc
@@ -1,131 +1,131 @@
[appendix]
== Release Notes
:leveloffset: 2
- include::release-notes-1.8.7.raw[]
+ include::release-notes-1.8.7.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.6.raw[]
+ include::release-notes-1.8.6.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.5.raw[]
+ include::release-notes-1.8.5.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.4.raw[]
+ include::release-notes-1.8.4.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.3.raw[]
+ include::release-notes-1.8.3.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.2.raw[]
+ include::release-notes-1.8.2.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.1.raw[]
+ include::release-notes-1.8.1.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.raw[]
+ include::release-notes-1.8.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.7.raw[]
+ include::release-notes-1.7.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.8.raw[]
+ include::release-notes-1.6.8.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.5.raw[]
+ include::release-notes-1.6.5.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.4.raw[]
+ include::release-notes-1.6.4.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.3.raw[]
+ include::release-notes-1.6.3.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.2.raw[]
+ include::release-notes-1.6.2.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.1.raw[]
+ include::release-notes-1.6.1.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.raw[]
+ include::release-notes-1.6.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.5.raw[]
+ include::release-notes-1.5.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.4.2.raw[]
+ include::release-notes-1.4.2.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.4.1.raw[]
+ include::release-notes-1.4.1.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.4.raw[]
+ include::release-notes-1.4.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.3.2.raw[]
+ include::release-notes-1.3.2.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.3.1.raw[]
+ include::release-notes-1.3.1.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.3.raw[]
+ include::release-notes-1.3.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.2.1.raw[]
+ include::release-notes-1.2.1.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.2.raw[]
+ include::release-notes-1.2.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.1.1.raw[]
+ include::release-notes-1.1.1.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.1.raw[]
+ include::release-notes-1.1.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.0.1.raw[]
+ include::release-notes-1.0.1.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-0.9.2.raw[]
+ include::release-notes-0.9.2.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-0.9.raw[]
+ include::release-notes-0.9.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-0.8.raw[]
+ include::release-notes-0.8.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-0.7.1.raw[]
+ include::release-notes-0.7.1.adoc[]
:leveloffset: 0
diff --git a/doc/specs.inc b/doc/specs.inc
index 1b7ea74b..89c21307 100644
--- a/doc/specs.inc
+++ b/doc/specs.inc
@@ -6,7 +6,7 @@
.Altus Metrum Flight Computer Electronics
[options="header"]
- |================================
+ |===
|Device | Barometer | Z-axis accel | GPS | 3D sensors | Storage | RF Output | Battery
ifdef::telemetrum[]
@@ -45,8 +45,8 @@
|8MB
|40mW
|3.7V
- endif::telemetrum[]
+ endif::telemetrum[]
ifdef::telemini[]
|TeleMini v1.0
|MP3H6115 10km (33k')
@@ -65,8 +65,8 @@
|512kB
|40mW
|3.7V
- endif::telemini[]
+ endif::telemini[]
ifdef::easymini[]
|EasyMini v1.0
|MS5607 30km (100k')
@@ -85,8 +85,8 @@
|1MB
|-
|3.7-12V
- endif::easymini[]
+ endif::easymini[]
ifdef::telemega[]
|TeleMega v1.0
|MS5607 30km (100k')
@@ -114,8 +114,8 @@
|8MB
|40mW
|3.7V
- endif::telemega[]
+ endif::telemega[]
ifdef::easymega[]
|EasyMega v1.0
|MS5607 30km (100k')
@@ -127,12 +127,12 @@
|3.7V
endif::easymega[]
- |==============================
+ |===
<<<<
.Altus Metrum Flight Computer Mechanical Components
[options="header",grid="all"]
- |==============================
+ |===
|Device|Connectors|Screw Terminals|Width|Length|Tube Size
ifdef::telemetrum[]
@@ -187,4 +187,4 @@
|38mm coupler
endif::easymega[]
- |====================================
+ |===
diff --git a/doc/system-operation.inc b/doc/system-operation.inc
index 17dfdf89..1e130976 100644
--- a/doc/system-operation.inc
+++ b/doc/system-operation.inc
@@ -297,7 +297,7 @@
ifdef::gps+radio[]
:aprsdevices: TeleMetrum v2.0 and TeleMega
:configure_section: _configure_altimeter
- include::aprs-operation.raw[]
+ include::aprs-operation.adoc[]
endif::gps+radio[]
=== Configurable Parameters
diff --git a/doc/telegps-application.inc b/doc/telegps-application.inc
index 3e6b385e..668595be 100644
--- a/doc/telegps-application.inc
+++ b/doc/telegps-application.inc
@@ -65,7 +65,7 @@
the device.
.TeleGPS Map View
- image::telegps-map.png[width="5.5in"]
+ image::telegps-map.png[width=400]
The map's default scale is approximately 3m
(10ft) per pixel. The map can be dragged using
@@ -99,7 +99,7 @@
received from TeleGPS.
.TeleGPS Location View
- image::telegps-location.png[width="5.5in"]
+ image::telegps-location.png[width=400]
==== Status
@@ -108,7 +108,7 @@
received telemetry from it.
.TeleGPS Status View
- image::telegps-status.png[width="5.5in"]
+ image::telegps-status.png[width=400]
==== Table
@@ -116,7 +116,7 @@
the GPS receiver
.TeleGPS Information Table
- image::telegps-table.png[width="5.5in"]
+ image::telegps-table.png[width=400]
=== TeleGPS Menus
@@ -164,12 +164,12 @@
==== Data Graph
.TeleGPS Graph
- image::telegps-graph-graph.png[width="5.5in"]
+ image::telegps-graph-graph.png[width=400]
==== Graph Configuration
.TeleGPS Graph Configuration
- image::telegps-graph-configure.png[width="5.5in"]
+ image::telegps-graph-configure.png[width=400]
This selects which graph elements to show, and, at the
bottom, lets you switch between metric and imperial
@@ -178,14 +178,14 @@
==== Statistics
.TeleGPS Statistics
- image::telegps-graph-stats.png[width="5.5in"]
+ image::telegps-graph-stats.png[width=400]
Shows overall data computed from the flight.
==== Map
.TeleGPS Map
- image::telegps-graph-map.png[width="6in"]
+ image::telegps-graph-map.png[width=450]
Shows a map of the area overlaid with the GPS track. As with
the telemetry monitoring window, you can select the style
@@ -233,14 +233,14 @@
within that application. With this, you can use Google Earth to
see the whole path in 3D.
- include::load-maps.raw[]
+ include::load-maps.adoc[]
=== Preferences
.TeleGPS Preferences Window
- image::telegps-preferences.png[width="2.4in"]
+ image::telegps-preferences.png[width=230]
- include::config-ui.raw[]
+ include::config-ui.adoc[]
=== Close
@@ -260,7 +260,7 @@
received by the selected TeleDongle device.
.Device Selection Dialog
- image::device-selection.png[width="3.1in"]
+ image::device-selection.png[width=300]
=== Disconnect
@@ -270,7 +270,7 @@
=== Scan Channels
.Radio Scanning Dialog
- image::telegps-scan.png[width="3.1in"]
+ image::telegps-scan.png[width=300]
Scans the configured set of frequencies looking for
telemetry signals. A list of all of the discovered
@@ -306,7 +306,7 @@
=== Configure Device
.TeleGPS Configuration Dialog
- image::telegps-configure.png[width="3.6in"]
+ image::telegps-configure.png[width=350]
Select this button and then select any connected TeleGPS
device from the list provided.
@@ -342,7 +342,7 @@
The rest of the dialog contains the parameters to be configured.
- include::config-device.raw[]
+ include::config-device.adoc[]
=== Flash Device
diff --git a/doc/telegps-outline.txt b/doc/telegps-outline.txt
index bd1495be..ca10d124 100644
--- a/doc/telegps-outline.txt
+++ b/doc/telegps-outline.txt
@@ -1,6 +1,7 @@
-= TeleGPS Outline and Hole Pattern
+:notitle:
:doctype: article
+== TeleGPS Outline and Hole Pattern
This image, when printed, provides a precise template for the
mounting holes in TeleGPS. TeleGPS has overall dimensions
of 1.000 x 1.500 inches, and the mounting holes are sized for
diff --git a/doc/telegps-release-notes.inc b/doc/telegps-release-notes.inc
index 9c1353f8..ec1135cb 100644
--- a/doc/telegps-release-notes.inc
+++ b/doc/telegps-release-notes.inc
@@ -2,75 +2,75 @@
== Release Notes
:leveloffset: 2
- include::release-notes-1.8.6.raw[]
+ include::release-notes-1.8.6.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.5.raw[]
+ include::release-notes-1.8.5.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.4.raw[]
+ include::release-notes-1.8.4.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.3.raw[]
+ include::release-notes-1.8.3.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.2.raw[]
+ include::release-notes-1.8.2.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.1.raw[]
+ include::release-notes-1.8.1.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.8.raw[]
+ include::release-notes-1.8.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.7.raw[]
+ include::release-notes-1.7.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.8.raw[]
+ include::release-notes-1.6.8.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.5.raw[]
+ include::release-notes-1.6.5.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.4.raw[]
+ include::release-notes-1.6.4.adoc[]
:leveloffset: 2
- include::release-notes-1.6.3.raw[]
+ include::release-notes-1.6.3.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.2.raw[]
+ include::release-notes-1.6.2.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.1.raw[]
+ include::release-notes-1.6.1.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.6.raw[]
+ include::release-notes-1.6.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.5.raw[]
+ include::release-notes-1.5.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.4.2.raw[]
+ include::release-notes-1.4.2.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.4.1.raw[]
+ include::release-notes-1.4.1.adoc[]
<<<<
:leveloffset: 2
- include::release-notes-1.4.raw[]
+ include::release-notes-1.4.adoc[]
diff --git a/doc/telegps-system-operation.inc b/doc/telegps-system-operation.inc
index c9fce7f0..e788bc7c 100644
--- a/doc/telegps-system-operation.inc
+++ b/doc/telegps-system-operation.inc
@@ -21,7 +21,7 @@
:aprsdevices: TeleGPS
:configure_section: _configure_device
- include::aprs-operation.raw[]
+ include::aprs-operation.adoc[]
=== Configurable Parameters
diff --git a/doc/telegps.txt b/doc/telegps.txt
index 47eafe37..8b558dbd 100644
--- a/doc/telegps.txt
+++ b/doc/telegps.txt
@@ -1,25 +1,39 @@
= TeleGPS Owner's Manual
+Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>
+:title-logo-image: image:../themes/background.png[]
+:revnumber: v1.8.7
+:revdate: 8 Oct 2018
+:revremark: Fix TeleBT v4.0 RF calibration to factory value when reflashing. Fix map images. Fix Mac OS X support.
+:copyright: Bdale Garbee and Keith Packard 2018
+:stylesheet: am.css
+:linkcss:
+:toc:
:doctype: book
:numbered:
:telegps: 1
:radio: 1
:gps: 1
:application: TeleGPS
+:pdf-stylesdir: .
+:pdf-style: altusmetrum
+:pdf-fontsdir: fonts
- include::telegps-dedication.raw[]
+ include::header.adoc[]
- include::telegps-quick-start.raw[]
+ include::telegps-dedication.adoc[]
- include::telegps-using.raw[]
+ include::telegps-quick-start.adoc[]
- include::telegps-application.raw[]
+ include::telegps-using.adoc[]
- include::telegps-system-operation.raw[]
+ include::telegps-application.adoc[]
- include::handling.raw[]
+ include::telegps-system-operation.adoc[]
- include::telegps-specs.raw[]
+ include::handling.adoc[]
- include::telegps-updating-firmware.raw[]
+ include::telegps-specs.adoc[]
- include::telegps-release-notes.raw[]
+ include::telegps-updating-firmware.adoc[]
+
+ include::telegps-release-notes.adoc[]
diff --git a/doc/telemega-outline.txt b/doc/telemega-outline.txt
index 1af91894..7b1d9269 100644
--- a/doc/telemega-outline.txt
+++ b/doc/telemega-outline.txt
@@ -1,6 +1,7 @@
-= TeleMega Outline and Hole Pattern
+:notitle:
:doctype: article
+== TeleMega Outline and Hole Pattern
This image, when printed, provides a precise template for the
mounting holes in TeleMega. TeleMega has overall dimensions of
1.250 x 3.250 inches, and the mounting holes are sized for use
diff --git a/doc/telemega.inc b/doc/telemega.inc
index 55f77bc4..0975172f 100644
--- a/doc/telemega.inc
+++ b/doc/telemega.inc
@@ -1,7 +1,7 @@
== TeleMega
.TeleMega Board
- image::telemega-v1.0-top.jpg[width="5.5in"]
+ image::telemega-v1.0-top.jpg[width=400]
TeleMega is a 1¼ inch by 3¼ inch circuit board. It was
designed to easily fit in a 38mm coupler. Like TeleMetrum,
diff --git a/doc/telemetrum-outline.txt b/doc/telemetrum-outline.txt
index ab6871f9..f37fed74 100644
--- a/doc/telemetrum-outline.txt
+++ b/doc/telemetrum-outline.txt
@@ -1,6 +1,7 @@
-= TeleMetrum Outline and Hole Pattern
+:notitle:
:doctype: article
+== TeleMetrum Outline and Hole Pattern
This image, when printed, provides a precise template for the
mounting holes in TeleMetrum. TeleMetrum has overall dimensions of
1.000 x 2.750 inches, and the mounting holes are sized for use
diff --git a/doc/telemetrum.inc b/doc/telemetrum.inc
index 7c9dadb5..35aec6cc 100644
--- a/doc/telemetrum.inc
+++ b/doc/telemetrum.inc
@@ -1,10 +1,10 @@
== TeleMetrum
.TeleMetrum v2 Board
- image::telemetrum-v2.0-th.jpg[width="5.5in"]
+ image::telemetrum-v2.0-th.jpg[width=400]
.TeleMetrum v1 Board
- image::telemetrum-v1.1-thside.jpg[width="5.5in"]
+ image::telemetrum-v1.1-thside.jpg[width=400]
TeleMetrum is a 1 inch by 2¾ inch circuit board. It was designed to
fit inside coupler for 29mm air-frame tubing, but using it in a tube that
@@ -39,7 +39,7 @@
.TeleMetrum Screw Terminals
[options="header",grid="all",cols="2,3,10"]
- |=========================
+ |===
|Terminal #|Terminal Name|Description
|1 |Switch Output |Switch connection to flight computer
|2 |Switch Input |Switch connection to positive battery terminal
@@ -47,7 +47,7 @@
|4 |Main - |Main pyro channel connection to pyro circuit
|5 |Apogee + |Apogee pyro channel common connection to battery +
|6 |Apogee - |Apogee pyro channel connection to pyro circuit
- |========================
+ |===
=== Using a Separate Pyro Battery with TeleMetrum
diff --git a/doc/telemetry.txt b/doc/telemetry.txt
index d7399b6a..ae9c7f9f 100644
--- a/doc/telemetry.txt
+++ b/doc/telemetry.txt
@@ -1,7 +1,18 @@
= AltOS Telemetry
+Keith Packard <keithp@keithp.com>; Bdale Garbee <bdale@gag.com>
+:revnumber: v1.8.7
+:revdate: 8 Oct 2018
+:copyright: Bdale Garbee and Keith Packard 2018
+:stylesheet: am.css
+:linkcss:
:doctype: article
:toc:
:numbered:
+:pdf-stylesdir: .
+:pdf-style: altusmetrum
+:pdf-fontsdir: fonts
+
+ include::header.adoc[]
== Packet Format Design
diff --git a/doc/telemini-v1-outline.txt b/doc/telemini-v1-outline.txt
index bce3f651..e331cf8d 100644
--- a/doc/telemini-v1-outline.txt
+++ b/doc/telemini-v1-outline.txt
@@ -1,6 +1,8 @@
-= TeleMini v1 Outline and Hole Pattern
+:notitle:
:doctype: article
+== TeleMini v1 Outline and Hole Pattern
+
This image, when printed, provides a precise template for the
mounting holes in TeleMini. TeleMini v1 has overall dimensions of
0.500 x 1.500 inches, and the mounting holes are sized for use
diff --git a/doc/telemini-v3-outline.txt b/doc/telemini-v3-outline.txt
index bb26ed6e..57a738eb 100644
--- a/doc/telemini-v3-outline.txt
+++ b/doc/telemini-v3-outline.txt
@@ -1,6 +1,7 @@
-= TeleMini v3 Outline and Hole Pattern
+:notitle:
:doctype: article
+== TeleMini v3 Outline and Hole Pattern
This image, when printed, provides a precise template for the
mounting holes in TeleMini v3. TeleMini v3 has overall dimensions of
0.500 x 1.670 inches, and the mounting holes are sized for use
diff --git a/doc/telemini.inc b/doc/telemini.inc
index 08893dfb..b7b26a8a 100644
--- a/doc/telemini.inc
+++ b/doc/telemini.inc
@@ -1,8 +1,8 @@
== TeleMini
.TeleMini v3 Board
- image::telemini-v3.0-top.jpg[width="5.5in"]
- image::telemini-v3.0-bottom.jpg[width="5.5in"]
+ image::telemini-v3.0-top.jpg[width=400]
+ image::telemini-v3.0-bottom.jpg[width=400]
TeleMini v3 is 0.5 inches by 1.67 inches. It was
designed to fit inside an 18mm air-frame tube, but using it in
@@ -152,5 +152,5 @@
power switch.
.TeleMini v1 Board
- image::telemini-v1-top.jpg[width="5.5in"]
+ image::telemini-v1-top.jpg[width=400]
diff --git a/doc/updating-firmware.inc b/doc/updating-firmware.inc
index d2883829..ee2f5e9a 100644
--- a/doc/updating-firmware.inc
+++ b/doc/updating-firmware.inc
@@ -27,10 +27,14 @@
http://www.altusmetrum.org/AltOS/
ifdef::telemega[]
+
=== Updating TeleMega, TeleMetrum v2, EasyMega, EasyMini or TeleDongle v3 Firmware
+
endif::telemega[]
ifndef::telemega[]
+
=== Updating EasyMini Firmware
+
endif::telemega[]
Self-programmable devices are reprogrammed by
diff --git a/doc/using-am-products.inc b/doc/using-am-products.inc
index 1969529f..1c1ff10e 100644
--- a/doc/using-am-products.inc
+++ b/doc/using-am-products.inc
@@ -1,12 +1,14 @@
== Using Altus Metrum Products
ifdef::radio[]
+
=== Being Legal
In the US, you need an
link:http://www.altusmetrum.org/Radio/[amateur radio license]
or other authorization to legally operate the radio
transmitters that are part of our products.
+
endif::radio[]