Merge branch 'branch-1.6' into debian

4 files changed, 55 insertions, 0 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 707a4428..e6fb95ab 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,6 +3,7 @@
 #
 
 RELNOTES_INC=\
+	release-notes-1.6.8.inc \
 	release-notes-1.6.5.inc \
 	release-notes-1.6.4.inc \
 	release-notes-1.6.3.inc \
diff --git a/doc/altusmetrum-docinfo.xml b/doc/altusmetrum-docinfo.xml
index fbd14c5a..e1f4eb62 100644
--- a/doc/altusmetrum-docinfo.xml
+++ b/doc/altusmetrum-docinfo.xml
@@ -47,6 +47,16 @@
 <revhistory>
   <?dbhtml filename="altusmetrum-revhistory.html"?>
   <revision>
+    <revnumber>1.6.8</revnumber>
+    <date>4 Sep 2016</date>
+    <revremark>
+      Minor release fixing another TeleMega and TeleMetrum v2.0 bug
+      which could result in loss of data logging and telemetry in
+      flight. Also fixed an AltosUI bug which would hide some pad
+      status values and never show them again.
+    </revremark>
+  </revision>
+  <revision>
     <revnumber>1.6.5</revnumber>
     <date>8 Jul 2016</date>
     <revremark>
diff --git a/doc/release-notes-1.6.8.inc b/doc/release-notes-1.6.8.inc
new file mode 100644
index 00000000..8e37fe69
--- /dev/null
+++ b/doc/release-notes-1.6.8.inc
@@ -0,0 +1,40 @@
+= Release Notes for Version 1.6.8
+:toc!:
+:doctype: article
+
+	Version 1.6.8 fixes a TeleMega and TeleMetrum v2.0 bug where
+	the device could stop logging data and transmitting
+	telemetry in flight. All TeleMega v1.0, v2.0 and TeleMetrum
+	v2.0 users should update their flight firmware.
+
+	== AltOS
+
+	AltOS fixes:
+
+	* Fix STM32L DMA driver to work around STM32L SoC DMA priority
+          issue t lock-up in the logging or radio code, either of
+          which could stop data logging and telemetry.
+
+	* Avoid having TeleBT battery status values smash telemetry
+          packet data by holding a lock during both operations.
+
+	* Don't start reporting 'flight 0' when the log fills in
+	  flight.
+
+	AltOS changes:
+	
+	* Flash LEDS on all products briefly during power up so that
+          they can be tested during production.
+
+	== AltosUI, TeleGPS and AltosDroid Applications
+
+	AltosUI fixes:
+
+	* Re-enable go/no-go entries after they've been disabled due
+          to lack of data. If telemetry information is delayed when
+          the Ui starts up, sometimes important fields would get
+          disabled to never re-appear.
+
+	* Deal with ground station failure better during Configure
+          Ground Station operation by cleaning up pending operations.
+
diff --git a/doc/release-notes.inc b/doc/release-notes.inc
index b8b34e7b..7cd075f6 100644
--- a/doc/release-notes.inc
+++ b/doc/release-notes.inc
@@ -2,6 +2,10 @@
 == Release Notes
 
 	:leveloffset: 2
+	include::release-notes-1.6.8.raw[]
+
+	<<<<
+	:leveloffset: 2
 	include::release-notes-1.6.5.raw[]
 
 	<<<<