Merge branch 'master' into branch-1.6

8 files changed, 84 insertions, 4 deletions

diff --git a/doc/Makefile b/doc/Makefile
index ed06006a..31bc08d8 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,6 +3,7 @@
 #
 
 RELNOTES_INC=\
+	release-notes-1.6.4.inc \
 	release-notes-1.6.3.inc \
 	release-notes-1.6.2.inc \
 	release-notes-1.6.1.inc \
diff --git a/doc/altusmetrum-docinfo.xml b/doc/altusmetrum-docinfo.xml
index 5473dd66..1b8ff68d 100644
--- a/doc/altusmetrum-docinfo.xml
+++ b/doc/altusmetrum-docinfo.xml
@@ -47,6 +47,14 @@
 <revhistory>
   <?dbhtml filename="altusmetrum-revhistory.html"?>
   <revision>
+    <revnumber>1.6.4</revnumber>
+    <date>10 May 2016</date>
+    <revremark>
+      Minor release fixing TeleBT v1.0 flow control and a few minor
+      application bugs.
+    </revremark>
+  </revision>
+  <revision>
     <revnumber>1.6.3</revnumber>
     <date>21 April 2016</date>
     <revremark>
diff --git a/doc/release-notes-1.6.4.inc b/doc/release-notes-1.6.4.inc
new file mode 100644
index 00000000..f976a69d
--- /dev/null
+++ b/doc/release-notes-1.6.4.inc
@@ -0,0 +1,42 @@
+= Release Notes for Version 1.6.4
+:toc!:
+:doctype: article
+
+	Version 1.6.4 fixes a bluetooth communication problem with
+	TeleBT v1.0 devices, along with some altosui and altosdroid
+	minor nits. It also now ships firmware for some newer devices.
+
+	== AltOS
+
+	AltOS fixes:
+
+	* Fix hardware flow control on TeleBT v1.0. Hardware RTS/CTS
+	  doesn't seem to work, switch from using the hardware to
+	  driving these pins with software.
+
+	* Fix ARM USB drivers to deal with OS restarts. Needed to
+	  reset all USB-related state when the USB bus is reset. These
+	  fixes affect all STM32L, STM32F0 and LPC11U14 based devices.
+
+	== AltosUI, TeleGPS and AltosDroid Applications
+
+	AltosUI, TeleGPS and AltosDroid New Features:
+
+	* Automatically switch from meters or feet to kilometers or
+          miles for distance units.
+
+	* Add Monitor Idle mode to TeleGPS application.
+
+	AltosUI, TeleGPS and AltosDroid Fixes:
+
+	* Abort map preloading when the preload map dialog is closed.
+
+	* In AltosDroid, Don't reconnect to last device if the user
+          had disconnected it the last time the application was
+          active.
+
+	== Documentation
+
+	* Mention TeleMega v2.0 in hardware specs table.
+
+	* Document TeleGPS RF output in telegps manual.
diff --git a/doc/release-notes.inc b/doc/release-notes.inc
index 35ffa0d1..6ac90cfd 100644
--- a/doc/release-notes.inc
+++ b/doc/release-notes.inc
@@ -2,6 +2,11 @@
 == Release Notes
 
 	:leveloffset: 2
+	include::release-notes-1.6.4.raw[]
+
+	<<<<
+
+	:leveloffset: 2
 	include::release-notes-1.6.3.raw[]
 
 	<<<<
diff --git a/doc/specs.inc b/doc/specs.inc
index a6c7b69a..c335b081 100644
--- a/doc/specs.inc
+++ b/doc/specs.inc
@@ -79,6 +79,15 @@
 	|8MB
 	|40mW
 	|3.7V
+
+	|TeleMega v2.0
+	|MS5607 30km (100k')
+	|MMA6555 102g
+	|uBlox Max-7Q
+	|MPU6000 HMC5883
+	|8MB
+	|40mW
+	|3.7V
 	endif::telemega[]
 
 	ifdef::easymega[]
diff --git a/doc/telegps-docinfo.xml b/doc/telegps-docinfo.xml
index 4ba3f73c..1ef088fe 100644
--- a/doc/telegps-docinfo.xml
+++ b/doc/telegps-docinfo.xml
@@ -38,6 +38,14 @@
 <revhistory>
   <?dbhtml filename="telegps-revhistory.html"?>
   <revision>
+    <revnumber>1.6.4</revnumber>
+    <date>10 May 2016</date>
+    <revremark>
+      Minor release fixing TeleBT v1.0 flow control and a few minor
+      application bugs.
+    </revremark>
+  </revision>
+  <revision>
     <revnumber>1.6.1</revnumber>
     <date>15 July 2015</date>
     <revremark>
diff --git a/doc/telegps-specs.inc b/doc/telegps-specs.inc
index 6ff8c76f..417a9708 100644
--- a/doc/telegps-specs.inc
+++ b/doc/telegps-specs.inc
@@ -5,6 +5,11 @@
       
 		TeleGPS uses the u-Blox Max-7Q GPS receiver.
       
+	=== 70cm Transmitter
+
+		TeleGPS uses a TI CC115L transmitter. This radio
+		produces 10mW of RF output.
+
 	=== Micro-controller
       
 		TeleGPS uses an NXP LPC11U14 micro-controller. This
diff --git a/doc/usage.inc b/doc/usage.inc
index 25fdd6d3..29587b7e 100644
--- a/doc/usage.inc
+++ b/doc/usage.inc
@@ -167,13 +167,15 @@
 		 signals, but no record of the flight will be
 		 stored in on-board flash.
 
+		ifdef::easymega,telemega[]
 		|Additional Igniters
 		|four very short beeps
 		|Continuity indication for the four additional pyro
-		|channels on TeleMega and EasyMega. One high tone for
-		|no continuity, one low tone for continuity. These are
-		|produced after the continuity indicators for the two
-		|primary igniter channels.
+		 channels on TeleMega and EasyMega. One high tone for
+		 no continuity, one low tone for continuity. These are
+		 produced after the continuity indicators for the two
+		 primary igniter channels.
+		endif::easymega,telemega[]
 
 		|====