From: Keith Packard <keithp@keithp.com>
Date: Wed, 16 Jan 2013 18:39:40 +0000 (-0800)
Subject: Merge branch 'master' into telescience-v0.2
X-Git-Tag: altosdroid_v1.2-1~105^2~2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=456120d201d72c89576a0c8d69b2fcba44169507;hp=f24c4219de9563cf0ef24b763ce54d961c182696

Merge branch 'master' into telescience-v0.2
---

diff --git a/doc/altusmetrum.xsl b/doc/altusmetrum.xsl
index e7ab353b..55f02e26 100644
--- a/doc/altusmetrum.xsl
+++ b/doc/altusmetrum.xsl
@@ -769,6 +769,15 @@ NAR #88757, TRA #12200
             incorrect data from being reported.
           </para>
         </listitem>
+        <listitem>
+          <para>
+            The age of the displayed data, in seconds since the last 
+	    successfully received telemetry packet.  In normal operation
+	    this will stay in the low single digits.  If the number starts
+	    counting up, then you are no longer receiving data over the radio
+	    link from the flight computer.
+          </para>
+        </listitem>
       </itemizedlist>
       <para>
         Finally, the largest portion of the window contains a set of
@@ -2590,13 +2599,13 @@ NAR #88757, TRA #12200
   <appendix
       xmlns:xi="http://www.w3.org/2001/XInclude">
     <title>Release Notes</title>
-    <xi:include	href="release-notes-1.1.1.xsl"  xpointer="xpointer(/article/*)"/>
-    <xi:include	href="release-notes-1.1.xsl"  xpointer="xpointer(/article/*)"/>
-    <xi:include	href="release-notes-1.0.1.xsl"  xpointer="xpointer(/article/*)"/>
-    <xi:include	href="release-notes-0.9.2.xsl"  xpointer="xpointer(/article/*)"/>
-    <xi:include	href="release-notes-0.9.xsl"  xpointer="xpointer(/article/*)"/>
-    <xi:include	href="release-notes-0.8.xsl"  xpointer="xpointer(/article/*)"/>
-    <xi:include	href="release-notes-0.7.1.xsl"  xpointer="xpointer(/article/*)"/>
+    <simplesect><title>Version 1.1.1</title><xi:include	href="release-notes-1.1.1.xsl"  xpointer="xpointer(/article/*)"/></simplesect>
+    <simplesect><title>Version 1.1</title><xi:include	href="release-notes-1.1.xsl"  xpointer="xpointer(/article/*)"/></simplesect>
+    <simplesect><title>Version 1.0.1</title><xi:include	href="release-notes-1.0.1.xsl"  xpointer="xpointer(/article/*)"/></simplesect>
+    <simplesect><title>Version 0.9.2</title><xi:include	href="release-notes-0.9.2.xsl"  xpointer="xpointer(/article/*)"/></simplesect>
+    <simplesect><title>Version 0.9</title><xi:include	href="release-notes-0.9.xsl"  xpointer="xpointer(/article/*)"/></simplesect>
+    <simplesect><title>Version 0.8</title><xi:include	href="release-notes-0.8.xsl"  xpointer="xpointer(/article/*)"/></simplesect>
+    <simplesect><title>Version 0.7.1</title><xi:include	href="release-notes-0.7.1.xsl"  xpointer="xpointer(/article/*)"/></simplesect>
   </appendix>
 </book>
 
diff --git a/src/megametrum-v0.1/stlink-pins b/src/megametrum-v0.1/stlink-pins
index e6094372..3bd16d0b 100644
--- a/src/megametrum-v0.1/stlink-pins
+++ b/src/megametrum-v0.1/stlink-pins
@@ -1,4 +1,4 @@
-	ST discovery card pins
+ST discovery card pins
 
 1	AIN-1
 2	JTCK
@@ -7,7 +7,7 @@
 5	NRST
 6	SWO
 
-MM misc connector
+MegaMetrum v0.1 misc connector
 
 1	GND
 2	reset_n
@@ -28,13 +28,13 @@ MM misc connector
 
 For debugging:
 
-	ST	MM
+	ST	MM v0.1
 JTCK	2	9
 GND	3	7
 JTMS	4	8
 NRST	5	2
 
-TL debug connector:
+Altus Metrum STM32L standard debug connector (4 pin MicoMaTch):
 
 	TL	ST
 GND	1	3