From: Bdale Garbee <bdale@gag.com>
Date: Wed, 9 Jan 2013 05:12:17 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 1.1.9.3~9
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=8c5ebaf88b459b09924753a8077393a7b0639133;hp=d7d259c7b3eedcc1c185d2b7e3c33e829bd7ce96

Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
---

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