diff options
| author | Keith Packard <keithp@keithp.com> | 2013-01-16 10:39:40 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-01-16 10:39:40 -0800 |
| commit | 456120d201d72c89576a0c8d69b2fcba44169507 (patch) | |
| tree | a84d994358f8018ab7fa2298607d48828f525f35 /src | |
| parent | f24c4219de9563cf0ef24b763ce54d961c182696 (diff) | |
| parent | 994ff76a064dcbd3113db771cd9cd9591fd68dea (diff) | |
Merge branch 'master' into telescience-v0.2
Diffstat (limited to 'src')
| -rw-r--r-- | src/megametrum-v0.1/stlink-pins | 8 |
1 files changed, 4 insertions, 4 deletions
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 |