Merge branch 'branch-1.7' into debian

23 files changed, 215 insertions, 61 deletions

diff --git a/doc/Makefile b/doc/Makefile
index e6fb95ab..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 \
@@ -86,8 +87,11 @@ 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.0-top.jpg \
+	telemini-v3.0-bottom.jpg \
 	altusmetrum-oneline.svg \
 	telegps-oneline.svg \
 	micropeak-oneline.svg
@@ -107,7 +111,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 +166,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 +177,8 @@ SVG=\
 	easymini.svg \
 	telemega.svg \
 	telemetrum.svg \
-	telemini.svg \
+	telemini-v1.svg \
+	telemini-v3.svg \
 	easymega.svg
 
 RELNOTES_PDF=$(RELNOTES_INC:.inc=.pdf)
@@ -237,6 +243,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 $@
@@ -260,6 +267,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/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..2475b5f1 100644
--- a/doc/altusmetrum-docinfo.xml
+++ b/doc/altusmetrum-docinfo.xml
@@ -18,7 +18,7 @@
   <surname>Towns</surname>
 </author>
 <copyright>
-  <year>2016</year>
+  <year>2017</year>
   <holder>Bdale Garbee and Keith Packard</holder>
 </copyright>
 <mediaobject>
@@ -47,6 +47,13 @@
 <revhistory>
   <?dbhtml filename="altusmetrum-revhistory.html"?>
   <revision>
+    <revnumber>1.7</revnumber>
+    <date>21 Apr 2017</date>
+    <revremark>
+      Add support for TeleMini v3.0 in firmware, AltosUI and AltosDroid
+    </revremark>
+  </revision>
+  <revision>
     <revnumber>1.6.8</revnumber>
     <date>4 Sep 2016</date>
     <revremark>
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/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/<!DOCTYPE [^>]*>//' "$@"
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
@@ -2,6 +2,10 @@
 == 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..17dfdf89 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 it receives a command packet
+		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 has 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 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, 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 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.
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/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.svg b/doc/telemini-v1.svg
index b2e21e3d..b2e21e3d 100644
--- a/doc/telemini.svg
+++ b/doc/telemini-v1.svg
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.0-bottom.jpg b/doc/telemini-v3.0-bottom.jpg
new file mode 100644
index 00000000..e4e4744b
--- /dev/null
+++ b/doc/telemini-v3.0-bottom.jpg
diff --git a/doc/telemini-v3.0-top.jpg b/doc/telemini-v3.0-top.jpg
new file mode 100644
index 00000000..1539902d
--- /dev/null
+++ b/doc/telemini-v3.0-top.jpg
diff --git a/doc/telemini-v3.svg b/doc/telemini-v3.svg
new file mode 100644
index 00000000..8835a2b2
--- /dev/null
+++ b/doc/telemini-v3.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<svg
+       xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="1.92in"
+   height=".75in"
+   viewBox="0 0 192 75"
+   preserveaspectratio="none"
+   id="svg2"
+   version="1.1">
+  <g transform="translate(12.5,12.5)"
+     style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linejoin:miter;font-size:20">
+    <!-- outline -->
+    <rect width="167" height="50" x="0" y="0"/>
+    <!-- holes -->
+    <path d="M8.5,8.5 m-5,0 a5,5,0,1,0,10,0 a5,5,0,1,0,-10,0 l10,0 m-5,-5 l0,10"/>
+    <path d="M8.5,41.5 m-5,0 a5,5,0,1,0,10,0 a5,5,0,1,0,-10,0 l10,0 m-5,-5 l0,10"/>
+    <path d="M158.5,8.5 m-5,0 a5,5,0,1,0,10,0 a5,5,0,1,0,-10,0 l10,0 m-5,-5 l0,10"/>
+    <path d="M158.5,41.5 m-5,0 a5,5,0,1,0,10,0 a5,5,0,1,0,-10,0 l10,0 m-5,-5 l0,10"/>
+    <!-- arrow -->
+    <path d="M25,25 l100,0"/>
+    <path style="fill:#000000;stroke:none" d="M125,20 l10,5 l-10,5 z"/>
+    <!-- label -->
+    <text x="75" y="20" style="fill:#000000;stroke:none" text-anchor="middle">TeleMini v3</text>
+    <g transform="rotate(90)" style="font-size:14">
+      <text x="25" y="-143" style="fill:#000000;stroke:none" text-anchor="middle">UP</text>
+    </g>
+  </g>
+</svg>
diff --git a/doc/telemini-v1.0.inc b/doc/telemini.inc
index e0d674f6..b40582a2 100644
--- a/doc/telemini-v1.0.inc
+++ b/doc/telemini.inc
@@ -1,32 +1,34 @@
-== TeleMini v1.0
+== TeleMini
 
-	.TeleMini v1.0 Board
-	image::telemini-v1-top.jpg[width="5.5in"]
+	.TeleMini v3 Board
+	image::telemini-v3.0-top.jpg[width="5.5in"]
+	image::telemini-v3.0-bottom.jpg[width="5.5in"]
 
-	TeleMini v1.0 is ½ inches by 1½ inches.  It was
+	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. Two
-	wires for the power switch are connected to holes in the
+	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 v1.0 Screw Terminals
+      	=== TeleMini v3 Screw Terminals
 
-		TeleMini v1.0 has four screw terminals on the end of the
+		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. 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
+		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 v1.0 Screw Terminals
+		.TeleMini v3 Screw Terminals
 		[options="header",grid="all",cols="2,3,10"]
 		|====
 		|Terminal #|Terminal Name|Description
@@ -56,7 +58,7 @@
 		|Switch connection to positive battery terminal
 		|====
 
-      	=== Using a Separate Pyro Battery with TeleMini v1.0
+      	=== 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
@@ -66,20 +68,20 @@
 		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 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 v1.0, by soldering
+		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 v1.0
+      	=== 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
@@ -91,3 +93,14 @@
 		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/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.