From 2c1ab416728c942ddf176f881f025840ada6bf93 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 5 Sep 2016 22:25:07 -0600 Subject: Fix release note html to remove xml bits Signed-off-by: Keith Packard --- doc/Makefile | 1 + doc/fix-html | 4 ++++ 2 files changed, 5 insertions(+) create mode 100755 doc/fix-html (limited to 'doc') diff --git a/doc/Makefile b/doc/Makefile index e6fb95ab..96b23fc6 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -237,6 +237,7 @@ DOC=$(HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET) .raw.pdf: a2x --verbose -a docinfo -f pdf --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(FOP_STYLE) --fop --fop-opts="-c $(FOP_XCONF)" $*.raw a2x --verbose -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 .pdf.html: @touch $@ diff --git a/doc/fix-html b/doc/fix-html new file mode 100755 index 00000000..d8751e4d --- /dev/null +++ b/doc/fix-html @@ -0,0 +1,4 @@ +#!/bin/sh +sed -i \ +-e 's/<[?]xml [^>]*>//' \ +-e 's/]*>//' "$@" -- cgit v1.2.3 From b5a42665d7811707b6bd4a67d7d8e6532daa29e4 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 1 Mar 2017 13:53:36 -0800 Subject: Add initial TeleMini v3 docs Uses pictures of the prototype. Signed-off-by: Keith Packard --- doc/Makefile | 16 +++++-- doc/telemini-outline.txt | 9 ---- doc/telemini-v1-outline.txt | 10 +++++ doc/telemini-v1.svg | 31 +++++++++++++ doc/telemini-v3-outline.txt | 10 +++++ doc/telemini-v3.jpg | Bin 0 -> 500350 bytes doc/telemini-v3.svg | 33 ++++++++++++++ doc/telemini.inc | 105 ++++++++++++++++++++++++++++++++++++++++++++ doc/telemini.svg | 31 ------------- 9 files changed, 201 insertions(+), 44 deletions(-) delete mode 100644 doc/telemini-outline.txt create mode 100644 doc/telemini-v1-outline.txt create mode 100644 doc/telemini-v1.svg create mode 100644 doc/telemini-v3-outline.txt create mode 100644 doc/telemini-v3.jpg create mode 100644 doc/telemini-v3.svg create mode 100644 doc/telemini.inc delete mode 100644 doc/telemini.svg (limited to 'doc') diff --git a/doc/Makefile b/doc/Makefile index 96b23fc6..7c268efe 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -86,8 +86,10 @@ IMAGES=\ telemetrum.svg \ telemetrum-v1.1-thside.jpg \ telemetrum-v2.0-th.jpg \ - telemini.svg \ + telemini-v1.svg \ telemini-v1-top.jpg \ + telemini-v3.svg \ + telemini-v3.jpg \ altusmetrum-oneline.svg \ telegps-oneline.svg \ micropeak-oneline.svg @@ -107,7 +109,7 @@ INC_FILES=\ getting-started.inc \ usage.inc \ telemetrum.inc \ - telemini-v1.0.inc \ + telemini.inc \ easymini-device.inc \ telemega.inc \ easymega.inc \ @@ -162,7 +164,8 @@ OUTLINE_TXT_FILES=\ easymini-outline.txt \ telemega-outline.txt \ telemetrum-outline.txt \ - telemini-outline.txt + telemini-v1-outline.txt \ + telemini-v3-outline.txt OUTLINE_RAW_FILES=$(OUTLINE_TXT_FILES:.txt=.raw) @@ -172,7 +175,8 @@ SVG=\ easymini.svg \ telemega.svg \ telemetrum.svg \ - telemini.svg \ + telemini-v1.svg \ + telemini-v3.svg \ easymega.svg RELNOTES_PDF=$(RELNOTES_INC:.inc=.pdf) @@ -261,6 +265,10 @@ micropeak.pdf micropeak.html: micropeak-docinfo.xml $(MICROPEAK_RAW_FILES) $(IMA easymini.pdf easymini.html: easymini-docinfo.xml $(EASYMINI_RAW_FILES) $(IMAGES) +telemini-v1-outline.pdf: telemini-v1-outline.txt telemini-v1.svg + +telemini-v3-outline.pdf: telemini-v3-outline.txt telemini-v3.svg + install: all publish: $(DOC) $(FONTS) diff --git a/doc/telemini-outline.txt b/doc/telemini-outline.txt deleted file mode 100644 index 1992adf0..00000000 --- a/doc/telemini-outline.txt +++ /dev/null @@ -1,9 +0,0 @@ -= TeleMini Outline and Hole Pattern -:doctype: article - - This image, when printed, provides a precise template for the - mounting holes in TeleMini. TeleMini has overall dimensions of - 0.500 x 1.500 inches, and the mounting holes are sized for use - with 2-56 or M2 screws. - - image::telemini.svg[align="center"] diff --git a/doc/telemini-v1-outline.txt b/doc/telemini-v1-outline.txt new file mode 100644 index 00000000..bce3f651 --- /dev/null +++ b/doc/telemini-v1-outline.txt @@ -0,0 +1,10 @@ += TeleMini v1 Outline and Hole Pattern +:doctype: article + + 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 + with 2-56 or M2 screws. The holes are located 0.100 inches + from the edge of the board in both directions. + + image::telemini-v1.svg[align="center"] diff --git a/doc/telemini-v1.svg b/doc/telemini-v1.svg new file mode 100644 index 00000000..b2e21e3d --- /dev/null +++ b/doc/telemini-v1.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + TeleMini + + UP + + + \ No newline at end of file diff --git a/doc/telemini-v3-outline.txt b/doc/telemini-v3-outline.txt new file mode 100644 index 00000000..bb26ed6e --- /dev/null +++ b/doc/telemini-v3-outline.txt @@ -0,0 +1,10 @@ += TeleMini v3 Outline and Hole Pattern +:doctype: article + + 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 + with 2-56 or M2 screws. The holes are located 0.085 inches + from the edge of the board in both directions. + + image::telemini-v3.svg[align="center"] diff --git a/doc/telemini-v3.jpg b/doc/telemini-v3.jpg new file mode 100644 index 00000000..b71a1674 Binary files /dev/null and b/doc/telemini-v3.jpg differ diff --git a/doc/telemini-v3.svg b/doc/telemini-v3.svg new file mode 100644 index 00000000..12e2e7d1 --- /dev/null +++ b/doc/telemini-v3.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + TeleMini v2 + + UP + + + diff --git a/doc/telemini.inc b/doc/telemini.inc new file mode 100644 index 00000000..ec613ddd --- /dev/null +++ b/doc/telemini.inc @@ -0,0 +1,105 @@ +== TeleMini + + .TeleMini v3 Board + image::telemini-v3.jpg[width="5.5in"] + + 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 + a tube that small in diameter may require some creativity in + mounting and wiring to succeed! Since there is no + accelerometer, TeleMini can be mounted in any convenient + orientation. The default ¼ wave UHF wire antenna attached to + the center of one end of the board is about 7 inches long. Screw + terminals for the power switch are located in the + middle of the board. Screw terminals for the e-matches for + apogee and main ejection charges depart from the other end of + the board, meaning an ideal “simple” avionics bay for TeleMini + should have at least 9 inches of interior length. + + === TeleMini v3 Screw Terminals + + TeleMini v3 has four screw terminals on the end of the + board opposite the telemetry antenna. Two are for the apogee + and two are for main igniter circuits. Another two + screw terminals are located in the middle of the board + for the power switch. Using the + picture above and starting from the top for the pyro terminals + and from the left for the power switch terminals, the + connections are as follows: + + .TeleMini v3 Screw Terminals + [options="header",grid="all",cols="2,3,10"] + |==== + |Terminal #|Terminal Name|Description + + |1 + |Apogee - + |Apogee pyro channel connection to pyro circuit + + |2 + |Apogee + + |Apogee pyro channel common connection to battery + + + |3 + |Main - + |Main pyro channel connection to pyro circuit + + |4 + |Main + + |Main pyro channel common connection to battery + + + |Left + |Switch Output + |Switch connection to flight computer + + |Right + |Switch Input + |Switch connection to positive battery terminal + |==== + + === Using a Separate Pyro Battery with TeleMini v3 + + As described above, using an external pyro battery involves + connecting the negative battery terminal to the flight + computer ground, connecting the positive battery terminal to + one of the igniter leads and connecting the other igniter + lead to the per-channel pyro circuit connection. Because + there is no solid ground connection to use on TeleMini, this + is not recommended. + + The only available ground connection on TeleMini v3 are + the two mounting holes next to the telemetry + antenna. Somehow connect a small piece of wire to one of + those holes and hook it to the negative pyro battery terminal. + + Connecting the positive battery terminal to the pyro + charges must be done separate from TeleMini v3, by soldering + them together or using some other connector. + + The other lead from each pyro charge is then inserted into + the appropriate per-pyro channel screw terminal (terminal 3 for the + Main charge, terminal 1 for the Apogee charge). + + === Using an Active Switch with TeleMini v3 + + As explained above, an external active switch requires three + connections, one to the positive battery terminal, one to + the flight computer positive input and one to ground. Again, + because TeleMini doesn't have any good ground connection, + this is not recommended. + + The positive battery terminal is available on the Right + power switch wire, the positive flight computer input is on + the left power switch wire. Hook a lead to either of the + mounting holes for a ground connection. + + === TeleMini v1 + + TeleMini v1 is the earlier version of this product. It + has a lower-power radio, less storage, no beeper and + soldered-in wires instead of screw terminals for the + power switch. + + .TeleMini v1 Board + image::telemini-v1-top.jpg[width="5.5in"] + diff --git a/doc/telemini.svg b/doc/telemini.svg deleted file mode 100644 index b2e21e3d..00000000 --- a/doc/telemini.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - TeleMini - - UP - - - \ No newline at end of file -- cgit v1.2.3 From 59aaac44e3e164b326518b324b52d115fbb76fca Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 1 Mar 2017 14:01:59 -0800 Subject: telemini outline svg had wrong version number --- doc/telemini-v3.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/telemini-v3.svg b/doc/telemini-v3.svg index 12e2e7d1..8835a2b2 100644 --- a/doc/telemini-v3.svg +++ b/doc/telemini-v3.svg @@ -25,7 +25,7 @@ - TeleMini v2 + TeleMini v3 UP -- cgit v1.2.3 From 190cdaa5cb18e78caeeaaaaed6a9d304e939eb6b Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 5 Mar 2017 22:42:37 -0800 Subject: doc: Rename telemini doc file from telemini-v1.0.inc to telemini.inc This file now contains information on both TeleMini versions. Signed-off-by: Keith Packard --- doc/altusmetrum.txt | 2 +- doc/telemini-v1.0.inc | 93 --------------------------------------------------- 2 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 doc/telemini-v1.0.inc (limited to 'doc') diff --git a/doc/altusmetrum.txt b/doc/altusmetrum.txt index 15fc28fc..48211eb8 100644 --- a/doc/altusmetrum.txt +++ b/doc/altusmetrum.txt @@ -22,7 +22,7 @@ include::telemetrum.raw[] - include::telemini-v1.0.raw[] + include::telemini.raw[] include::easymini-device.raw[] diff --git a/doc/telemini-v1.0.inc b/doc/telemini-v1.0.inc deleted file mode 100644 index e0d674f6..00000000 --- a/doc/telemini-v1.0.inc +++ /dev/null @@ -1,93 +0,0 @@ -== TeleMini v1.0 - - .TeleMini v1.0 Board - image::telemini-v1-top.jpg[width="5.5in"] - - TeleMini v1.0 is ½ inches by 1½ inches. It was - designed to fit inside an 18mm air-frame tube, but using it in - a tube that small in diameter may require some creativity in - mounting and wiring to succeed! Since there is no - accelerometer, TeleMini can be mounted in any convenient - orientation. The default ¼ wave UHF wire antenna attached to - the center of one end of the board is about 7 inches long. Two - wires for the power switch are connected to holes in the - middle of the board. Screw terminals for the e-matches for - apogee and main ejection charges depart from the other end of - the board, meaning an ideal “simple” avionics bay for TeleMini - should have at least 9 inches of interior length. - - === TeleMini v1.0 Screw Terminals - - TeleMini v1.0 has four screw terminals on the end of the - board opposite the telemetry antenna. Two are for the apogee - and two are for main igniter circuits. There are also wires - soldered to the board for the power switch. Using the - picture above and starting from the top for the terminals - and from the left for the power switch wires, the - connections are as follows: - - .TeleMini v1.0 Screw Terminals - [options="header",grid="all",cols="2,3,10"] - |==== - |Terminal #|Terminal Name|Description - - |1 - |Apogee - - |Apogee pyro channel connection to pyro circuit - - |2 - |Apogee + - |Apogee pyro channel common connection to battery + - - |3 - |Main - - |Main pyro channel connection to pyro circuit - - |4 - |Main + - |Main pyro channel common connection to battery + - - |Left - |Switch Output - |Switch connection to flight computer - - |Right - |Switch Input - |Switch connection to positive battery terminal - |==== - - === Using a Separate Pyro Battery with TeleMini v1.0 - - As described above, using an external pyro battery involves - connecting the negative battery terminal to the flight - computer ground, connecting the positive battery terminal to - one of the igniter leads and connecting the other igniter - lead to the per-channel pyro circuit connection. Because - there is no solid ground connection to use on TeleMini, this - is not recommended. - - The only available ground connection on TeleMini v1.0 are - the two mounting holes next to the telemetry - antenna. Somehow connect a small piece of wire to one of - those holes and hook it to the negative pyro battery terminal. - - Connecting the positive battery terminal to the pyro - charges must be done separate from TeleMini v1.0, by soldering - them together or using some other connector. - - The other lead from each pyro charge is then inserted into - the appropriate per-pyro channel screw terminal (terminal 3 for the - Main charge, terminal 1 for the Apogee charge). - - === Using an Active Switch with TeleMini v1.0 - - As explained above, an external active switch requires three - connections, one to the positive battery terminal, one to - the flight computer positive input and one to ground. Again, - because TeleMini doesn't have any good ground connection, - this is not recommended. - - The positive battery terminal is available on the Right - power switch wire, the positive flight computer input is on - the left power switch wire. Hook a lead to either of the - mounting holes for a ground connection. -- cgit v1.2.3 From 8978687dc2ae90e4005a8f7d598940b7df6a4359 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 21 Apr 2017 18:08:25 -0700 Subject: doc: Update TeleMini v3 photos to production unit Replace prototype photos Signed-off-by: Keith Packard --- doc/Makefile | 3 ++- doc/telemini-v3.0-bottom.jpg | Bin 0 -> 1088645 bytes doc/telemini-v3.0-top.jpg | Bin 0 -> 331722 bytes doc/telemini-v3.jpg | Bin 500350 -> 0 bytes doc/telemini.inc | 3 ++- 5 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 doc/telemini-v3.0-bottom.jpg create mode 100644 doc/telemini-v3.0-top.jpg delete mode 100644 doc/telemini-v3.jpg (limited to 'doc') diff --git a/doc/Makefile b/doc/Makefile index 7c268efe..40afbf6a 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -89,7 +89,8 @@ IMAGES=\ telemini-v1.svg \ telemini-v1-top.jpg \ telemini-v3.svg \ - telemini-v3.jpg \ + telemini-v3.0-top.jpg \ + telemini-v3.0-bottom.jpg \ altusmetrum-oneline.svg \ telegps-oneline.svg \ micropeak-oneline.svg diff --git a/doc/telemini-v3.0-bottom.jpg b/doc/telemini-v3.0-bottom.jpg new file mode 100644 index 00000000..e4e4744b Binary files /dev/null and b/doc/telemini-v3.0-bottom.jpg differ diff --git a/doc/telemini-v3.0-top.jpg b/doc/telemini-v3.0-top.jpg new file mode 100644 index 00000000..1539902d Binary files /dev/null and b/doc/telemini-v3.0-top.jpg differ diff --git a/doc/telemini-v3.jpg b/doc/telemini-v3.jpg deleted file mode 100644 index b71a1674..00000000 Binary files a/doc/telemini-v3.jpg and /dev/null differ diff --git a/doc/telemini.inc b/doc/telemini.inc index ec613ddd..b40582a2 100644 --- a/doc/telemini.inc +++ b/doc/telemini.inc @@ -1,7 +1,8 @@ == TeleMini .TeleMini v3 Board - image::telemini-v3.jpg[width="5.5in"] + image::telemini-v3.0-top.jpg[width="5.5in"] + image::telemini-v3.0-bottom.jpg[width="5.5in"] 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 -- cgit v1.2.3 From eb1c2bf5244840049c0a58e0ceecfcd9f5c290dd Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 21 Apr 2017 22:24:00 -0700 Subject: doc: Finish updates for v1.7 Scrub all TeleMini references and make sure they're fixed for v3. No 'emergency' mode yet. No reflashing yet. Add v1.7 release notes. Signed-off-by: Keith Packard --- doc/Makefile | 1 + doc/altosdroid.inc | 2 +- doc/altosui.inc | 4 ++-- doc/altusmetrum-docinfo.xml | 7 +++++++ doc/flight-data-recording.inc | 3 ++- doc/installation.inc | 1 - doc/intro.inc | 6 +++--- doc/release-notes-1.7.inc | 25 +++++++++++++++++++++++++ doc/release-notes.inc | 4 ++++ doc/specs.inc | 8 ++++++++ doc/system-operation.inc | 17 ++++++++++------- doc/telemetry.txt | 41 ++++++++++++++++++++++++++++++++++++++--- doc/updating-firmware.inc | 22 +++++++++++----------- 13 files changed, 112 insertions(+), 29 deletions(-) create mode 100644 doc/release-notes-1.7.inc (limited to 'doc') diff --git a/doc/Makefile b/doc/Makefile index 40afbf6a..0d01279f 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -3,6 +3,7 @@ # RELNOTES_INC=\ + release-notes-1.7.inc \ release-notes-1.6.8.inc \ release-notes-1.6.5.inc \ release-notes-1.6.4.inc \ diff --git a/doc/altosdroid.inc b/doc/altosdroid.inc index faaa13f9..dce81c3b 100644 --- a/doc/altosdroid.inc +++ b/doc/altosdroid.inc @@ -224,7 +224,7 @@ flights, there may not be any space left. TeleMetrum and TeleMega can store multiple flights, depending on the configured maximum flight log size. TeleGPS logs - data continuously. TeleMini stores only a single + data continuously. TeleMini v1.0 stores only a single flight, so it will need to be downloaded and erased after each flight to capture data. This only affects on-board flight logging; the altimeter will still diff --git a/doc/altosui.inc b/doc/altosui.inc index 76a24d91..88e7a035 100644 --- a/doc/altosui.inc +++ b/doc/altosui.inc @@ -592,8 +592,8 @@ This reprograms Altus Metrum devices with new firmware. ifdef::telemetrum,telemini[] - TeleMetrum v1.x, TeleDongle v0.2, TeleMini - and TeleBT are all reprogrammed by using another + TeleMetrum v1.x, TeleDongle v0.2, TeleMini v1.0 + and TeleBT v1.0 are all reprogrammed by using another similar unit as a programming dongle (pair programming). endif::telemetrum,telemini[] diff --git a/doc/altusmetrum-docinfo.xml b/doc/altusmetrum-docinfo.xml index e1f4eb62..6214cfd8 100644 --- a/doc/altusmetrum-docinfo.xml +++ b/doc/altusmetrum-docinfo.xml @@ -46,6 +46,13 @@ + + 1.7 + 21 Apr 2017 + + Add support for TeleMini in firmware, AltosUI and AltosDroid + + 1.6.8 4 Sep 2016 diff --git a/doc/flight-data-recording.inc b/doc/flight-data-recording.inc index 32e44840..39228908 100644 --- a/doc/flight-data-recording.inc +++ b/doc/flight-data-recording.inc @@ -25,6 +25,7 @@ endif::telemetrum[] ifdef::telemini[] |TeleMini v1.0 |2 |5kB |4 + |TeleMini v3.0 |16 |512kB |5 endif::telemini[] ifdef::easymini[] |EasyMini |16 |1MB |10 @@ -44,7 +45,7 @@ Configuration data is also stored in the flash memory on ifdef::telemetrum[TeleMetrum v1.x,] - ifdef::telemini[TeleMini and] + ifdef::telemini[TeleMini v3.0 and] ifdef::easymini[EasyMini.] This consumes 64kB of flash space. This configuration space is not available diff --git a/doc/installation.inc b/doc/installation.inc index d390551e..273b435b 100644 --- a/doc/installation.inc +++ b/doc/installation.inc @@ -6,7 +6,6 @@ apogee and main ejection charges. All Altus Metrum products are designed for use with single-cell batteries with 3.7 volts nominal. - ifdef::telemini[TeleMini v2.0 and] EasyMini may also be used with other batteries as long as they supply between 4 and 12 volts. diff --git a/doc/intro.inc b/doc/intro.inc index 28daa41a..6b0cd318 100644 --- a/doc/intro.inc +++ b/doc/intro.inc @@ -17,9 +17,9 @@ Our second device was TeleMini, a dual deploy altimeter with radio telemetry and radio direction finding. The first version of this device was only 13mm by 38mm (½ inch by 1½ inches) and - could fit easily in an 18mm air-frame. The latest version, v2.0, - includes a beeper, USB data download and extended on-board - flight logging, along with an improved barometric sensor. + could fit easily in an 18mm air-frame. The latest version, v3.0, + includes a beeper, higher power radio, extended on-board + flight logging and an improved barometric sensor. TeleMega is our most sophisticated device, including six pyro channels (four of which are fully programmable), integrated GPS, diff --git a/doc/release-notes-1.7.inc b/doc/release-notes-1.7.inc new file mode 100644 index 00000000..f2da71f3 --- /dev/null +++ b/doc/release-notes-1.7.inc @@ -0,0 +1,25 @@ += Release Notes for Version 1.7 +:toc!: +:doctype: article + + Version 1.7 includes support for our new TeleMini v3.0 + flight computer and bug fixes in in the flight software for all our boards + and ground station interfaces. + + == AltOS + + AltOS New Features + + * Add support for TeleMini v3.0 boards. + + AltOS Fixes + + * Fix interrupt priorities on STM32L processors. Run timer + interrupt at lowest priority so that device interrupts get + serviced first. + + == AltosUI and TeleGPS Applications + + AltosUI New Features + + * Add support for TeleMini v3.0 hardware diff --git a/doc/release-notes.inc b/doc/release-notes.inc index 7cd075f6..86ce95d3 100644 --- a/doc/release-notes.inc +++ b/doc/release-notes.inc @@ -1,6 +1,10 @@ [appendix] == Release Notes + :leveloffset: 2 + include::release-notes-1.7.raw[] + + <<<< :leveloffset: 2 include::release-notes-1.6.8.raw[] diff --git a/doc/specs.inc b/doc/specs.inc index c335b081..f09d6fc9 100644 --- a/doc/specs.inc +++ b/doc/specs.inc @@ -57,6 +57,14 @@ |10mW |3.7V + |TeleMini v3.0 + |MS5607 30km (100k') + |- + |- + |- + |512kB + |40mW + |3.7V endif::telemini[] ifdef::easymini[] diff --git a/doc/system-operation.inc b/doc/system-operation.inc index e68b2acb..67b7e693 100644 --- a/doc/system-operation.inc +++ b/doc/system-operation.inc @@ -25,8 +25,9 @@ is selected if the board is connected via USB to a computer, otherwise the board enters “flight” mode. ifdef::telemini[] - TeleMini v1.0 - selects “idle” mode if it receives a command packet within the + TeleMini + selects “idle” mode if receives a command packet is + received within the first five seconds of operation. endif::telemini[] @@ -60,7 +61,7 @@ mode for requests sent via TeleDongle. Commands can be issued in idle mode over either USB or the radio link equivalently. - ifdef::telemini[TeleMini v1.0 only has the radio link.] + ifdef::telemini[TeleMini only have the radio link.] endif::radio[] Idle mode is useful for configuring the altimeter, for extracting data from the on-board storage chip after @@ -97,11 +98,13 @@ endif::telemetrum,telemega,easymega[] ifdef::telemini[] - TeleMini v1.0 is configured solely via the radio link. Of course, that + TeleMini are configured solely via the radio link. Of course, that means you need to know the TeleMini radio configuration values or you won't be able to communicate with it. For situations - when you don't have the radio configuration values, TeleMini v1.0 - offers an 'emergency recovery' mode. In this mode, TeleMini is + when you don't have the radio configuration values, + TeleMini v1.0 + offers an 'emergency recovery' mode. In this mode, + TeleMini v1.0 is configured as follows: @@ -154,7 +157,7 @@ Any operation which can be performed with a flight computer can either be done with the device directly connected to the computer via the USB cable, or through the radio - link. TeleMini v1.0 doesn't provide a USB connector and so it is + link. TeleMini don't provide a USB connector and so it is always communicated with over radio. Select the appropriate TeleDongle device when the list of devices is presented and AltosUI will interact with an altimeter over the radio link. diff --git a/doc/telemetry.txt b/doc/telemetry.txt index 36d2edba..d7399b6a 100644 --- a/doc/telemetry.txt +++ b/doc/telemetry.txt @@ -44,18 +44,18 @@ which device has transmitted the packet, when it was transmitted and what the rest of the packet contains. - === TeleMetrum v1.x, TeleMini and TeleNano Sensor Data + === TeleMetrum v1.x, TeleMini v1.0 and TeleNano Sensor Data .Sensor Packet Type [options="border",cols="1,3"] |==== |Type |Description |0x01 |TeleMetrum v1.x Sensor Data - |0x02 |TeleMini Sensor Data + |0x02 |TeleMini v1.0 Sensor Data |0x03 |TeleNano Sensor Data |==== - TeleMetrum v1.x, TeleMini and TeleNano share this same + TeleMetrum v1.x, TeleMini v1.0 and TeleNano share this same packet format for sensor data. Each uses a distinct packet type so that the receiver knows which data values are valid and which are undefined. @@ -213,6 +213,41 @@ |32 |==== + === TeleMini v3.0 Sensor Data + + .Sensor Packet Type + [options="border",cols="1,3"] + |==== + |Type |Description + |0x11 |TeleMini v3.0 Sensor Data + |==== + + TeleMini v3.0 uses this + packet format for sensor data. + + Sensor Data packets are transmitted once per second on + the ground, 10 times per second during ascent and once + per second during descent and landing + + .Sensor Packet Contents + [options="border",cols="2,3,3,9"] + |==== + |Offset |Data Type |Name |Description + |5 |uint8_t |state |Flight state + |6 |int16_t |v_batt |battery voltage + |8 |int16_t |sense_a |apogee continuity sense + |10 |int16_t |sense_m |main continuity sense + |12 |int32_t |pres |pressure sensor (Pa * 10) + |16 |int16_t |temp |temperature sensor (°C * 100) + |18 |int16_t |acceleration |m/s² * 16 + |20 |int16_t |speed |m/s * 16 + |22 |int16_t |height |m + |24 |int16_t |ground_pres |Average barometer reading on ground + |28 |pad[4] |pad bytes | + |32 + |==== + + === Configuration Data .Configuration Packet Type diff --git a/doc/updating-firmware.inc b/doc/updating-firmware.inc index 11ea1283..91aa58f2 100644 --- a/doc/updating-firmware.inc +++ b/doc/updating-firmware.inc @@ -11,7 +11,7 @@ programmed directly over their USB connectors (self programming). ifdef::telemega[] - TeleMetrum v1, TeleMini and TeleDongle v0.2 are + TeleMetrum v1, TeleMini v1.0 and TeleDongle v0.2 are all programmed by using another device as a programmer (pair programming). It's important to recognize which kind of devices you have before trying to reprogram them. @@ -228,10 +228,10 @@ If something goes wrong, give it another try. - ==== Updating TeleMini Firmware + ==== Updating TeleMini v1.0 Firmware You'll need a special 'programming cable' to - reprogram the TeleMini. You can make your own + reprogram the TeleMini v1.0. You can make your own using an 8-pin MicroMaTch connector on one end and a set of four pins on the other. @@ -242,19 +242,19 @@ . Plug the 8-pin end of the programming cable to the matching connector on the TeleDongle v0.2 or TeleBT v1.0, and the 4-pins into the - holes in the TeleMini circuit board. Note + holes in the TeleMini v1.0 circuit board. Note that the MicroMaTch connector has an alignment pin that goes through a hole in the PC board when you have the cable oriented correctly, and that pin 1 on the - TeleMini board is marked with a square pad + TeleMini v1.0 board is marked with a square pad while the other pins have round pads. - . Attach a battery to the TeleMini board. + . Attach a battery to the TeleMini v1.0 board. . Plug the TeleDongle v0.2 or TeleBT v1.0 into your computer's USB port, and power up the - TeleMini + TeleMini v1.0 . Run AltosUI, and select 'Flash Image' from the File menu. @@ -264,7 +264,7 @@ programming device. . Select the image you want put on the - TeleMini, which should have a name in the + TeleMini v1.0, which should have a name in the form telemini-v1.0-1.0.0.ihx. It should be visible in the default directory, if not you may have to poke around your system to find @@ -276,10 +276,10 @@ you'll need to change them. . Hit the 'OK' button and the software should - proceed to flash the TeleMini with new + proceed to flash the TeleMini v1.0 with new firmware, showing a progress bar. - . Confirm that the TeleMini board seems to + . Confirm that the TeleMini v1.0 board seems to have updated OK, which you can do by configuring it over the radio link through the TeleDongle, or letting it come up in @@ -290,7 +290,7 @@ ==== Updating TeleDongle v0.2 Firmware Updating TeleDongle v0.2 firmware is just like - updating TeleMetrum v1.x or TeleMini firmware, but you + updating TeleMetrum v1.x or TeleMini v1.0 firmware, but you use either a TeleMetrum v1.x, TeleDongle v0.2 or TeleBT v1.0 as the programmer. -- cgit v1.2.3 From c57a5c018e4bd0a0033c8759132a648977bf45f7 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 24 Apr 2017 15:59:23 -0700 Subject: doc: Errors in the TeleMini v3.0 updates found by Bdale Signed-off-by: Keith Packard --- doc/altusmetrum-docinfo.xml | 2 +- doc/system-operation.inc | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/altusmetrum-docinfo.xml b/doc/altusmetrum-docinfo.xml index 6214cfd8..65519bb2 100644 --- a/doc/altusmetrum-docinfo.xml +++ b/doc/altusmetrum-docinfo.xml @@ -50,7 +50,7 @@ 1.7 21 Apr 2017 - Add support for TeleMini in firmware, AltosUI and AltosDroid + Add support for TeleMini v3.0 in firmware, AltosUI and AltosDroid diff --git a/doc/system-operation.inc b/doc/system-operation.inc index 67b7e693..17dfdf89 100644 --- a/doc/system-operation.inc +++ b/doc/system-operation.inc @@ -26,8 +26,8 @@ otherwise the board enters “flight” mode. ifdef::telemini[] TeleMini - selects “idle” mode if receives a command packet is - received within the + selects “idle” mode if it receives a command packet + within the first five seconds of operation. endif::telemini[] @@ -61,7 +61,7 @@ mode for requests sent via TeleDongle. Commands can be issued in idle mode over either USB or the radio link equivalently. - ifdef::telemini[TeleMini only have the radio link.] + ifdef::telemini[TeleMini only has the radio link.] endif::radio[] Idle mode is useful for configuring the altimeter, for extracting data from the on-board storage chip after @@ -98,7 +98,7 @@ endif::telemetrum,telemega,easymega[] ifdef::telemini[] - TeleMini are configured solely via the radio link. Of course, that + TeleMini is configured solely via the radio link. Of course, that means you need to know the TeleMini radio configuration values or you won't be able to communicate with it. For situations when you don't have the radio configuration values, @@ -157,7 +157,7 @@ Any operation which can be performed with a flight computer can either be done with the device directly connected to the computer via the USB cable, or through the radio - link. TeleMini don't provide a USB connector and so it is + link. TeleMini doesn't provide a USB connector and so it is always communicated with over radio. Select the appropriate TeleDongle device when the list of devices is presented and AltosUI will interact with an altimeter over the radio link. -- cgit v1.2.3 From 5914231bfe8220a92dde17901b952e919a40d568 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Mon, 24 Apr 2017 17:18:10 -0600 Subject: update copyright year in docs --- doc/altusmetrum-docinfo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/altusmetrum-docinfo.xml b/doc/altusmetrum-docinfo.xml index 65519bb2..2475b5f1 100644 --- a/doc/altusmetrum-docinfo.xml +++ b/doc/altusmetrum-docinfo.xml @@ -18,7 +18,7 @@ Towns - 2016 + 2017 Bdale Garbee and Keith Packard -- cgit v1.2.3