From: Bdale Garbee Date: Sat, 12 Jan 2013 17:57:22 +0000 (-0700) Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos X-Git-Tag: 1.1.9.3~8 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=670034eef48d63cdaec8d271fa93da984ffe2ea9;hp=d374d6be7eb040457f4df6c38b5d057f26ee741c 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