Added support for standard ARM JTAG programmers, as well

as continuing miniprog3 SWD support.

diff --git a/hardware/gerber/scsi2sd.GBL b/hardware/gerber/scsi2sd.GBL
index 5d445fdd34c5eabf8eb0e184ea46781a9f551d95..9775f915a69d8b83d283570047febe59b5cbc0c0 100644 (file)
--- a/hardware/gerber/scsi2sd.GBL
+++ b/hardware/gerber/scsi2sd.GBL
@@ -1,7 +1,7 @@
 G04 start of page 3 for group 1 idx 1 *\r
 G04 Title: (unknown), solder *\r
 G04 Creator: pcb 20110918 *\r
-G04 CreationDate: Thu 03 Oct 2013 10:13:16 GMT UTC *\r
+G04 CreationDate: Wed 09 Oct 2013 12:59:36 GMT UTC *\r
 G04 For: michael *\r
 G04 Format: Gerber/RS-274X *\r
 G04 PCB-Dimensions: 386000 393500 *\r

diff --git a/hardware/gerber/scsi2sd.GBO b/hardware/gerber/scsi2sd.GBO
index db4a706d2b0cc5b620c5b032592f006b010be8e1..8330c6b8660117c1e3217af1d4a0a6d8541ccde7 100644 (file)
--- a/hardware/gerber/scsi2sd.GBO
+++ b/hardware/gerber/scsi2sd.GBO
@@ -1,7 +1,7 @@
 G04 start of page 14 for group -4078 idx -4078 *\r
 G04 Title: (unknown), bottomsilk *\r
 G04 Creator: pcb 20110918 *\r
-G04 CreationDate: Thu 03 Oct 2013 10:13:16 GMT UTC *\r
+G04 CreationDate: Wed 09 Oct 2013 12:59:36 GMT UTC *\r
 G04 For: michael *\r
 G04 Format: Gerber/RS-274X *\r
 G04 PCB-Dimensions: 386000 393500 *\r

diff --git a/hardware/gerber/scsi2sd.GBS b/hardware/gerber/scsi2sd.GBS
index af6756892cec03f5e900ab5a5bdaf58e7bda13e3..eb6245c131373be48c667726ea71ae3a6861552f 100644 (file)
--- a/hardware/gerber/scsi2sd.GBS
+++ b/hardware/gerber/scsi2sd.GBS
@@ -1,7 +1,7 @@
 G04 start of page 12 for group -4062 idx -4062 *\r
 G04 Title: (unknown), soldermask *\r
 G04 Creator: pcb 20110918 *\r
-G04 CreationDate: Thu 03 Oct 2013 10:13:16 GMT UTC *\r
+G04 CreationDate: Wed 09 Oct 2013 12:59:36 GMT UTC *\r
 G04 For: michael *\r
 G04 Format: Gerber/RS-274X *\r
 G04 PCB-Dimensions: 386000 393500 *\r

diff --git a/hardware/gerber/scsi2sd.GML b/hardware/gerber/scsi2sd.GML
index 33b48cd45cde22382e74868661b2b60b865198da..fbdd7aea7eefdeb5b2cc78fbe19fb7456aaeffe6 100644 (file)
--- a/hardware/gerber/scsi2sd.GML
+++ b/hardware/gerber/scsi2sd.GML
@@ -1,7 +1,7 @@
 G04 start of page 4 for group 2 idx 2 *\r
 G04 Title: (unknown), outline *\r
 G04 Creator: pcb 20110918 *\r
-G04 CreationDate: Thu 03 Oct 2013 10:13:16 GMT UTC *\r
+G04 CreationDate: Wed 09 Oct 2013 12:59:36 GMT UTC *\r
 G04 For: michael *\r
 G04 Format: Gerber/RS-274X *\r
 G04 PCB-Dimensions: 386000 393500 *\r

diff --git a/hardware/gerber/scsi2sd.GTL b/hardware/gerber/scsi2sd.GTL
index 384bbb509faaa430f095e6bbf5ed41e36f4767bb..9166bb929b92ed39736d35b4e213e1afbb29c5d7 100644 (file)
--- a/hardware/gerber/scsi2sd.GTL
+++ b/hardware/gerber/scsi2sd.GTL
@@ -1,7 +1,7 @@
 G04 start of page 2 for group 0 idx 0 *\r
 G04 Title: (unknown), component *\r
 G04 Creator: pcb 20110918 *\r
-G04 CreationDate: Thu 03 Oct 2013 10:13:16 GMT UTC *\r
+G04 CreationDate: Wed 09 Oct 2013 12:59:36 GMT UTC *\r
 G04 For: michael *\r
 G04 Format: Gerber/RS-274X *\r
 G04 PCB-Dimensions: 386000 393500 *\r
@@ -32973,6 +32973,7 @@ Y177051D01*
 X36196Y177000D01*\r
 X36212Y176796D01*\r
 X36212Y176796D01*\r
+X36212Y176796D01*\r
 X36260Y176597D01*\r
 X36338Y176408D01*\r
 X36379Y176342D01*\r
@@ -32989,6 +32990,7 @@ X103719Y109027D01*
 X103908Y108949D01*\r
 X104107Y108901D01*\r
 X104107Y108901D01*\r
+X104107Y108901D01*\r
 X104311Y108885D01*\r
 X104362Y108889D01*\r
 X110448D01*\r
@@ -40648,13 +40650,17 @@ X129944D01*
 X144252Y106252D02*X139000Y101000D01*\r
 X129944D02*X129894Y100950D01*\r
 X159941Y102315D02*X146815D01*\r
+X159941Y100347D02*X149347D01*\r
 X129944Y106000D02*X129894Y105950D01*\r
 X139000Y101000D02*X129944D01*\r
 X146815Y102315D02*X140500Y96000D01*\r
 X129944D01*\r
-X129894Y95950D01*\r
+X149347Y100347D02*X140000Y91000D01*\r
+X129944D01*\r
+Y96000D02*X129894Y95950D01*\r
 X140000Y86000D02*X129944D01*\r
 X129894Y85950D01*\r
+X129944Y91000D02*X129894Y90950D01*\r
 X113894Y105950D02*X102550D01*\r
 X102500Y106000D01*\r
 X113894Y100950D02*X104550D01*\r

diff --git a/hardware/gerber/scsi2sd.GTO b/hardware/gerber/scsi2sd.GTO
index 49458a19c5eb87ec77883b73265a058f9baa92a8..445feb141181264a51ca07ec279cbe6eba85e170 100644 (file)
--- a/hardware/gerber/scsi2sd.GTO
+++ b/hardware/gerber/scsi2sd.GTO
@@ -1,7 +1,7 @@
 G04 start of page 13 for group -4079 idx -4079 *\r
 G04 Title: (unknown), topsilk *\r
 G04 Creator: pcb 20110918 *\r
-G04 CreationDate: Thu 03 Oct 2013 10:13:16 GMT UTC *\r
+G04 CreationDate: Wed 09 Oct 2013 12:59:36 GMT UTC *\r
 G04 For: michael *\r
 G04 Format: Gerber/RS-274X *\r
 G04 PCB-Dimensions: 386000 393500 *\r
@@ -39,7 +39,46 @@ Y298500D02*Y393000D01*
 Y263000D02*X17500D01*\r
 Y298500D02*X500D01*\r
 Y393000D02*X385500D01*\r
-G54D154*X344500Y156500D02*X345000Y157000D01*\r
+G54D154*X114500Y336600D02*X114900Y337000D01*\r
+Y335000D01*\r
+X114500D02*X115250D01*\r
+X41000Y296000D02*X43000D01*\r
+X42000D02*Y292000D01*\r
+X44200Y294200D02*X45700D01*\r
+X44200Y292000D02*X46200D01*\r
+X44200Y296000D02*Y292000D01*\r
+Y296000D02*X46200D01*\r
+X47400D02*X49400D01*\r
+X49900Y295500D01*\r
+Y294500D01*\r
+X49400Y294000D02*X49900Y294500D01*\r
+X47900Y294000D02*X49400D01*\r
+X47900Y296000D02*Y292000D01*\r
+X48700Y294000D02*X49900Y292000D01*\r
+X51100Y296000D02*Y292000D01*\r
+Y296000D02*X52600Y294000D01*\r
+X54100Y296000D01*\r
+Y292000D01*\r
+X55800Y296000D02*Y292000D01*\r
+X55300Y296000D02*X57300D01*\r
+X57800Y295500D01*\r
+Y294500D01*\r
+X57300Y294000D02*X57800Y294500D01*\r
+X55800Y294000D02*X57300D01*\r
+X59000Y296000D02*Y294000D01*\r
+X59500Y292000D01*\r
+X60500Y294000D01*\r
+X61500Y292000D01*\r
+X62000Y294000D01*\r
+Y296000D02*Y294000D01*\r
+X63200Y296000D02*X65200D01*\r
+X65700Y295500D01*\r
+Y294500D01*\r
+X65200Y294000D02*X65700Y294500D01*\r
+X63700Y294000D02*X65200D01*\r
+X63700Y296000D02*Y292000D01*\r
+X64500Y294000D02*X65700Y292000D01*\r
+X344500Y156500D02*X345000Y157000D01*\r
 X346000D01*\r
 X346500Y156500D01*\r
 X346000Y153000D02*X346500Y153500D01*\r
@@ -97,164 +136,6 @@ X349600Y265000D02*X350600D01*
 X349100Y265500D02*X349600Y265000D01*\r
 X352300Y269000D02*X353300Y265000D01*\r
 X354300Y269000D01*\r
-X114500Y336600D02*X114900Y337000D01*\r
-Y335000D01*\r
-X114500D02*X115250D01*\r
-X41000Y296000D02*X43000D01*\r
-X42000D02*Y292000D01*\r
-X44200Y294200D02*X45700D01*\r
-X44200Y292000D02*X46200D01*\r
-X44200Y296000D02*Y292000D01*\r
-Y296000D02*X46200D01*\r
-X47400D02*X49400D01*\r
-X49900Y295500D01*\r
-Y294500D01*\r
-X49400Y294000D02*X49900Y294500D01*\r
-X47900Y294000D02*X49400D01*\r
-X47900Y296000D02*Y292000D01*\r
-X48700Y294000D02*X49900Y292000D01*\r
-X51100Y296000D02*Y292000D01*\r
-Y296000D02*X52600Y294000D01*\r
-X54100Y296000D01*\r
-Y292000D01*\r
-X55800Y296000D02*Y292000D01*\r
-X55300Y296000D02*X57300D01*\r
-X57800Y295500D01*\r
-Y294500D01*\r
-X57300Y294000D02*X57800Y294500D01*\r
-X55800Y294000D02*X57300D01*\r
-X59000Y296000D02*Y294000D01*\r
-X59500Y292000D01*\r
-X60500Y294000D01*\r
-X61500Y292000D01*\r
-X62000Y294000D01*\r
-Y296000D02*Y294000D01*\r
-X63200Y296000D02*X65200D01*\r
-X65700Y295500D01*\r
-Y294500D01*\r
-X65200Y294000D02*X65700Y294500D01*\r
-X63700Y294000D02*X65200D01*\r
-X63700Y296000D02*Y292000D01*\r
-X64500Y294000D02*X65700Y292000D01*\r
-X103500Y114500D02*X105500D01*\r
-X103500D02*Y112500D01*\r
-X104000Y113000D01*\r
-X105000D01*\r
-X105500Y112500D01*\r
-Y111000D01*\r
-X105000Y110500D02*X105500Y111000D01*\r
-X104000Y110500D02*X105000D01*\r
-X103500Y111000D02*X104000Y110500D01*\r
-X106700Y114500D02*X107700Y110500D01*\r
-X108700Y114500D01*\r
-X138000Y107000D02*X138250Y106750D01*\r
-X137250Y107000D02*X138000D01*\r
-X137000Y106750D02*X137250Y107000D01*\r
-X137000Y106750D02*Y106250D01*\r
-X137250Y106000D01*\r
-X138000D01*\r
-X138250Y105750D01*\r
-Y105250D01*\r
-X138000Y105000D02*X138250Y105250D01*\r
-X137250Y105000D02*X138000D01*\r
-X137000Y105250D02*X137250Y105000D01*\r
-X138850Y107000D02*Y106000D01*\r
-X139100Y105000D01*\r
-X139600Y106000D01*\r
-X140100Y105000D01*\r
-X140350Y106000D01*\r
-Y107000D02*Y106000D01*\r
-X141200Y107000D02*Y105000D01*\r
-X141850Y107000D02*X142200Y106650D01*\r
-Y105350D01*\r
-X141850Y105000D02*X142200Y105350D01*\r
-X140950Y105000D02*X141850D01*\r
-X140950Y107000D02*X141850D01*\r
-X142800D02*X143300D01*\r
-X143050D02*Y105000D01*\r
-X142800D02*X143300D01*\r
-X143900Y106750D02*Y105250D01*\r
-Y106750D02*X144150Y107000D01*\r
-X144650D01*\r
-X144900Y106750D01*\r
-Y105250D01*\r
-X144650Y105000D02*X144900Y105250D01*\r
-X144150Y105000D02*X144650D01*\r
-X143900Y105250D02*X144150Y105000D01*\r
-X138000Y102000D02*X138250Y101750D01*\r
-X137250Y102000D02*X138000D01*\r
-X137000Y101750D02*X137250Y102000D01*\r
-X137000Y101750D02*Y101250D01*\r
-X137250Y101000D01*\r
-X138000D01*\r
-X138250Y100750D01*\r
-Y100250D01*\r
-X138000Y100000D02*X138250Y100250D01*\r
-X137250Y100000D02*X138000D01*\r
-X137000Y100250D02*X137250Y100000D01*\r
-X138850Y102000D02*Y101000D01*\r
-X139100Y100000D01*\r
-X139600Y101000D01*\r
-X140100Y100000D01*\r
-X140350Y101000D01*\r
-Y102000D02*Y101000D01*\r
-X141200Y102000D02*Y100000D01*\r
-X141850Y102000D02*X142200Y101650D01*\r
-Y100350D01*\r
-X141850Y100000D02*X142200Y100350D01*\r
-X140950Y100000D02*X141850D01*\r
-X140950Y102000D02*X141850D01*\r
-X143150Y100000D02*X143800D01*\r
-X142800Y100350D02*X143150Y100000D01*\r
-X142800Y101650D02*Y100350D01*\r
-Y101650D02*X143150Y102000D01*\r
-X143800D01*\r
-X144400D02*Y100000D01*\r
-Y101000D02*X145400Y102000D01*\r
-X144400Y101000D02*X145400Y100000D01*\r
-X138000Y84500D02*X139250Y86500D01*\r
-X138000D02*X139250Y84500D01*\r
-X139850Y86500D02*X140850D01*\r
-X141100Y86250D01*\r
-Y85750D01*\r
-X140850Y85500D02*X141100Y85750D01*\r
-X140100Y85500D02*X140850D01*\r
-X140100Y86500D02*Y84500D01*\r
-X140500Y85500D02*X141100Y84500D01*\r
-X141700Y85600D02*X142450D01*\r
-X141700Y84500D02*X142700D01*\r
-X141700Y86500D02*Y84500D01*\r
-Y86500D02*X142700D01*\r
-X144300D02*X144550Y86250D01*\r
-X143550Y86500D02*X144300D01*\r
-X143300Y86250D02*X143550Y86500D01*\r
-X143300Y86250D02*Y85750D01*\r
-X143550Y85500D01*\r
-X144300D01*\r
-X144550Y85250D01*\r
-Y84750D01*\r
-X144300Y84500D02*X144550Y84750D01*\r
-X143550Y84500D02*X144300D01*\r
-X143300Y84750D02*X143550Y84500D01*\r
-X138500Y96500D02*X138750Y96250D01*\r
-X137750Y96500D02*X138500D01*\r
-X137500Y96250D02*X137750Y96500D01*\r
-X137500Y96250D02*Y95750D01*\r
-X137750Y95500D01*\r
-X138500D01*\r
-X138750Y95250D01*\r
-Y94750D01*\r
-X138500Y94500D02*X138750Y94750D01*\r
-X137750Y94500D02*X138500D01*\r
-X137500Y94750D02*X137750Y94500D01*\r
-X139350Y96500D02*Y95500D01*\r
-X139600Y94500D01*\r
-X140100Y95500D01*\r
-X140600Y94500D01*\r
-X140850Y95500D01*\r
-Y96500D02*Y95500D01*\r
-X141450Y96500D02*X141950Y94500D01*\r
-X142450Y96500D01*\r
 X172500Y32500D02*X173000Y33000D01*\r
 X173500D01*\r
 X174000Y32500D01*\r
@@ -589,6 +470,176 @@ X75500Y77500D02*Y76000D01*
 Y77500D02*X76000Y78000D01*\r
 X77000D01*\r
 X75000D02*X75500Y77500D01*\r
+X138000Y107000D02*X138250Y106750D01*\r
+X137250Y107000D02*X138000D01*\r
+X137000Y106750D02*X137250Y107000D01*\r
+X137000Y106750D02*Y106250D01*\r
+X137250Y106000D01*\r
+X138000D01*\r
+X138250Y105750D01*\r
+Y105250D01*\r
+X138000Y105000D02*X138250Y105250D01*\r
+X137250Y105000D02*X138000D01*\r
+X137000Y105250D02*X137250Y105000D01*\r
+X138850Y107000D02*Y106000D01*\r
+X139100Y105000D01*\r
+X139600Y106000D01*\r
+X140100Y105000D01*\r
+X140350Y106000D01*\r
+Y107000D02*Y106000D01*\r
+X141200Y107000D02*Y105000D01*\r
+X141850Y107000D02*X142200Y106650D01*\r
+Y105350D01*\r
+X141850Y105000D02*X142200Y105350D01*\r
+X140950Y105000D02*X141850D01*\r
+X140950Y107000D02*X141850D01*\r
+X142800D02*X143300D01*\r
+X143050D02*Y105000D01*\r
+X142800D02*X143300D01*\r
+X143900Y106750D02*Y105250D01*\r
+Y106750D02*X144150Y107000D01*\r
+X144650D01*\r
+X144900Y106750D01*\r
+Y105250D01*\r
+X144650Y105000D02*X144900Y105250D01*\r
+X144150Y105000D02*X144650D01*\r
+X143900Y105250D02*X144150Y105000D01*\r
+X138000Y102000D02*X138250Y101750D01*\r
+X137250Y102000D02*X138000D01*\r
+X137000Y101750D02*X137250Y102000D01*\r
+X137000Y101750D02*Y101250D01*\r
+X137250Y101000D01*\r
+X138000D01*\r
+X138250Y100750D01*\r
+Y100250D01*\r
+X138000Y100000D02*X138250Y100250D01*\r
+X137250Y100000D02*X138000D01*\r
+X137000Y100250D02*X137250Y100000D01*\r
+X138850Y102000D02*Y101000D01*\r
+X139100Y100000D01*\r
+X139600Y101000D01*\r
+X140100Y100000D01*\r
+X140350Y101000D01*\r
+Y102000D02*Y101000D01*\r
+X141200Y102000D02*Y100000D01*\r
+X141850Y102000D02*X142200Y101650D01*\r
+Y100350D01*\r
+X141850Y100000D02*X142200Y100350D01*\r
+X140950Y100000D02*X141850D01*\r
+X140950Y102000D02*X141850D01*\r
+X143150Y100000D02*X143800D01*\r
+X142800Y100350D02*X143150Y100000D01*\r
+X142800Y101650D02*Y100350D01*\r
+Y101650D02*X143150Y102000D01*\r
+X143800D01*\r
+X144400D02*Y100000D01*\r
+Y101000D02*X145400Y102000D01*\r
+X144400Y101000D02*X145400Y100000D01*\r
+X138000Y84500D02*X139250Y86500D01*\r
+X138000D02*X139250Y84500D01*\r
+X139850Y86500D02*X140850D01*\r
+X141100Y86250D01*\r
+Y85750D01*\r
+X140850Y85500D02*X141100Y85750D01*\r
+X140100Y85500D02*X140850D01*\r
+X140100Y86500D02*Y84500D01*\r
+X140500Y85500D02*X141100Y84500D01*\r
+X141700Y85600D02*X142450D01*\r
+X141700Y84500D02*X142700D01*\r
+X141700Y86500D02*Y84500D01*\r
+Y86500D02*X142700D01*\r
+X144300D02*X144550Y86250D01*\r
+X143550Y86500D02*X144300D01*\r
+X143300Y86250D02*X143550Y86500D01*\r
+X143300Y86250D02*Y85750D01*\r
+X143550Y85500D01*\r
+X144300D01*\r
+X144550Y85250D01*\r
+Y84750D01*\r
+X144300Y84500D02*X144550Y84750D01*\r
+X143550Y84500D02*X144300D01*\r
+X143300Y84750D02*X143550Y84500D01*\r
+X138500Y96500D02*X138750Y96250D01*\r
+X137750Y96500D02*X138500D01*\r
+X137500Y96250D02*X137750Y96500D01*\r
+X137500Y96250D02*Y95750D01*\r
+X137750Y95500D01*\r
+X138500D01*\r
+X138750Y95250D01*\r
+Y94750D01*\r
+X138500Y94500D02*X138750Y94750D01*\r
+X137750Y94500D02*X138500D01*\r
+X137500Y94750D02*X137750Y94500D01*\r
+X139350Y96500D02*Y95500D01*\r
+X139600Y94500D01*\r
+X140100Y95500D01*\r
+X140600Y94500D01*\r
+X140850Y95500D01*\r
+Y96500D02*Y95500D01*\r
+X141450Y96500D02*X141950Y94500D01*\r
+X142450Y96500D01*\r
+X108500Y116200D02*X109300Y117000D01*\r
+Y113000D01*\r
+X108500D02*X110000D01*\r
+X109200Y124500D02*X110000D01*\r
+Y121000D01*\r
+X109500Y120500D02*X110000Y121000D01*\r
+X109000Y120500D02*X109500D01*\r
+X108500Y121000D02*X109000Y120500D01*\r
+X108500Y121500D02*Y121000D01*\r
+X111200Y124500D02*X113200D01*\r
+X112200D02*Y120500D01*\r
+X114400Y123500D02*Y120500D01*\r
+Y123500D02*X115100Y124500D01*\r
+X116200D01*\r
+X116900Y123500D01*\r
+Y120500D01*\r
+X114400Y122500D02*X116900D01*\r
+X120100Y124500D02*X120600Y124000D01*\r
+X118600Y124500D02*X120100D01*\r
+X118100Y124000D02*X118600Y124500D01*\r
+X118100Y124000D02*Y121000D01*\r
+X118600Y120500D01*\r
+X120100D01*\r
+X120600Y121000D01*\r
+Y122000D02*Y121000D01*\r
+X120100Y122500D02*X120600Y122000D01*\r
+X119100Y122500D02*X120100D01*\r
+X121800Y121000D02*X124800Y124000D01*\r
+X128000Y124500D02*X128500Y124000D01*\r
+X126500Y124500D02*X128000D01*\r
+X126000Y124000D02*X126500Y124500D01*\r
+X126000Y124000D02*Y123000D01*\r
+X126500Y122500D01*\r
+X128000D01*\r
+X128500Y122000D01*\r
+Y121000D01*\r
+X128000Y120500D02*X128500Y121000D01*\r
+X126500Y120500D02*X128000D01*\r
+X126000Y121000D02*X126500Y120500D01*\r
+X129700Y124500D02*Y122500D01*\r
+X130200Y120500D01*\r
+X131200Y122500D01*\r
+X132200Y120500D01*\r
+X132700Y122500D01*\r
+Y124500D02*Y122500D01*\r
+X134400Y124500D02*Y120500D01*\r
+X135700Y124500D02*X136400Y123800D01*\r
+Y121200D01*\r
+X135700Y120500D02*X136400Y121200D01*\r
+X133900Y120500D02*X135700D01*\r
+X133900Y124500D02*X135700D01*\r
+X94500Y108500D02*X96500D01*\r
+X94500D02*Y106500D01*\r
+X95000Y107000D01*\r
+X96000D01*\r
+X96500Y106500D01*\r
+Y105000D01*\r
+X96000Y104500D02*X96500Y105000D01*\r
+X95000Y104500D02*X96000D01*\r
+X94500Y105000D02*X95000Y104500D01*\r
+X97700Y108500D02*X98700Y104500D01*\r
+X99700Y108500D01*\r
 G54D152*X359800Y330900D02*Y322100D01*\r
 X375200D01*\r
 Y330900D02*Y322100D01*\r
@@ -1406,15 +1457,15 @@ X139700D01*
 X140900Y162600D02*X142900Y165100D01*\r
 X140900Y162600D02*X143400D01*\r
 X142900Y165100D02*Y161100D01*\r
-X120200Y125800D02*X121000D01*\r
-Y122300D01*\r
-X120500Y121800D02*X121000Y122300D01*\r
-X120000Y121800D02*X120500D01*\r
-X119500Y122300D02*X120000Y121800D01*\r
-X119500Y122800D02*Y122300D01*\r
-X122200Y123300D02*X124200Y125800D01*\r
-X122200Y123300D02*X124700D01*\r
-X124200Y125800D02*Y121800D01*\r
+X132700Y117300D02*X133500D01*\r
+Y113800D01*\r
+X133000Y113300D02*X133500Y113800D01*\r
+X132500Y113300D02*X133000D01*\r
+X132000Y113800D02*X132500Y113300D01*\r
+X132000Y114300D02*Y113800D01*\r
+X134700Y114800D02*X136700Y117300D01*\r
+X134700Y114800D02*X137200D01*\r
+X136700Y117300D02*Y113300D01*\r
 X229202Y87035D02*X230502D01*\r
 X228502Y87735D02*X229202Y87035D01*\r
 X228502Y90335D02*Y87735D01*\r

diff --git a/hardware/gerber/scsi2sd.GTP b/hardware/gerber/scsi2sd.GTP
index 46d454c26c799af02904da14fa10369b7735fefd..23912aa7c454dbb0fd8b8999d6268042757834bf 100644 (file)
--- a/hardware/gerber/scsi2sd.GTP
+++ b/hardware/gerber/scsi2sd.GTP
@@ -1,7 +1,7 @@
 G04 start of page 15 for group -4015 idx -4015 *\r
 G04 Title: (unknown), toppaste *\r
 G04 Creator: pcb 20110918 *\r
-G04 CreationDate: Thu 03 Oct 2013 10:13:16 GMT UTC *\r
+G04 CreationDate: Wed 09 Oct 2013 12:59:36 GMT UTC *\r
 G04 For: michael *\r
 G04 Format: Gerber/RS-274X *\r
 G04 PCB-Dimensions: 386000 393500 *\r

diff --git a/hardware/gerber/scsi2sd.GTS b/hardware/gerber/scsi2sd.GTS
index 4e04a67ece2cf8ae8573d421502e60c4adbb1739..85c69618d4bf0dbe3b4973b9e8d3523a33f028af 100644 (file)
--- a/hardware/gerber/scsi2sd.GTS
+++ b/hardware/gerber/scsi2sd.GTS
@@ -1,7 +1,7 @@
 G04 start of page 11 for group -4063 idx -4063 *\r
 G04 Title: (unknown), componentmask *\r
 G04 Creator: pcb 20110918 *\r
-G04 CreationDate: Thu 03 Oct 2013 10:13:16 GMT UTC *\r
+G04 CreationDate: Wed 09 Oct 2013 12:59:36 GMT UTC *\r
 G04 For: michael *\r
 G04 Format: Gerber/RS-274X *\r
 G04 PCB-Dimensions: 386000 393500 *\r

diff --git a/hardware/scsi2sd.cmd b/hardware/scsi2sd.cmd
index 61165e2683f418ec84eb72a25b9c40c1d4acb93c..b3118690dfe159c56a2582a6554f26a20c40abde 100644 (file)
--- a/hardware/scsi2sd.cmd
+++ b/hardware/scsi2sd.cmd
@@ -189,12 +189,12 @@ ChangePinName(U1, 29, P12[6])
 ChangePinName(U1, 28, P1[7])
 ChangePinName(U1, 27, P1[6])
 ChangePinName(U1, 26, VDDIO1)
-ChangePinName(U1, 25, P1[5])
-ChangePinName(U1, 24, P1[4])
-ChangePinName(U1, 23, "SWV,P1[3]")
+ChangePinName(U1, 25, "NTRST,P1[5]")
+ChangePinName(U1, 24, "TDI,P1[4]")
+ChangePinName(U1, 23, "SWV,TDO,P1[3]")
 ChangePinName(U1, 22, P1[2])
-ChangePinName(U1, 21, "SWDCK,P1[1]")
-ChangePinName(U1, 20, "SWDIO,P1[0]")
+ChangePinName(U1, 21, "SWDCK,TCK,P1[1]")
+ChangePinName(U1, 20, "SWDIO,TMS,P1[0]")
 ChangePinName(U1, 19, P5[3])
 ChangePinName(U1, 18, P5[2])
 ChangePinName(U1, 17, P5[1])

diff --git a/hardware/scsi2sd.net b/hardware/scsi2sd.net
index a77931adcd3cdb751c45be9393e66d8cc9f5979f..6bcf5329cbeb5cec567adf173937771a4103c0e0 100644 (file)
--- a/hardware/scsi2sd.net
+++ b/hardware/scsi2sd.net
@@ -1,17 +1,16 @@
-unnamed_net28  R5-1 J5-2 
-unnamed_net27  R4-1 J5-3 
-unnamed_net26  J5-4 
-unnamed_net25  D3-2 F2-2 
-unnamed_net24  J5-1 F2-1 
-unnamed_net23  D1-2 J3-1 
+unnamed_net27  R5-1 J5-2 
+unnamed_net26  R4-1 J5-3 
+unnamed_net25  J5-4 
+unnamed_net24  D3-2 F2-2 
+unnamed_net23  J5-1 F2-1 
+unnamed_net22  D1-2 J3-1 
 drive_5V       F1-2 D2-2 J3-2 
-unnamed_net22  R1-1 R2-1 C14-2 C7-2 U2-2 
-unnamed_net21  U1-55 
-unnamed_net20  U1-42 
-unnamed_net19  R5-2 U1-36 
-unnamed_net18  R4-2 U1-35 
-unnamed_net17  U1-25 
-unnamed_net16  U1-24 
+unnamed_net21  R1-1 R2-1 C14-2 C7-2 U2-2 
+unnamed_net20  U1-55 
+unnamed_net19  U1-42 
+unnamed_net18  R5-2 U1-36 
+unnamed_net17  R4-2 U1-35 
+unnamed_net16  U1-25 
 unnamed_net15  U1-22 
 unnamed_net14  U1-11 
 SD_DAT2        J6-1 U1-49 R12-1 
@@ -26,7 +25,7 @@ unnamed_net12 U1-63 C27-2
 unnamed_net11  U1-68 LED1-2 
 unnamed_net10  R3-1 LED1-1 
 unnamed_net9   U1-23 J4-6 
-unnamed_net8   J4-8 
+unnamed_net8   U1-24 J4-8 
 unnamed_net7   U1-15 J4-10 
 unnamed_net6   U1-21 J4-4 
 unnamed_net5   U1-20 J4-2 

diff --git a/hardware/scsi2sd.pcb b/hardware/scsi2sd.pcb
index d40ed13ef7e4fc54ab7fec162d289e8e8a4ca293..1763744d5524ecf844e691a15dae3051b944789e 100644 (file)
--- a/hardware/scsi2sd.pcb
+++ b/hardware/scsi2sd.pcb
@@ -6,7 +6,7 @@ FileVersion[20070407]
 PCB["" 386000 393500]
 
 Grid[500.0 0 0 1]
-Cursor[4000 234000 0.000000]
+Cursor[85500 251000 0.000000]
 PolyArea[200000000.000000]
 Thermal[0.500000]
 DRC[600 100 600 600 1200 600]
@@ -1668,7 +1668,7 @@ Element["" "wurth-microsd" "J6" "unknown" 245000 355000 22500 -33000 0 100 ""]
 
        )
 
-Element["" "FTSH-105-01-L-DV-K" "J4" "unknown" 134300 287000 -14800 -20300 0 100 ""]
+Element["" "FTSH-105-01-L-DV-K" "J4" "unknown" 134300 287000 -2300 -11800 0 100 ""]
 (
        Pad[-8456 20550 -356 20550 2900 2400 4100 "10" "10" "edge2"]
        Pad[-8456 15550 -356 15550 2900 2400 4100 "8" "8" "edge2"]
@@ -2605,6 +2605,10 @@ Layer(1 "component")
        Line[358000 60500 358000 49000 1000 1600 "clearline"]
        Line[358000 49000 358500 48500 1000 1600 "clearline"]
        Line[311500 107000 299500 107000 1000 1600 "clearline"]
+       Line[159941 293153 149347 293153 1000 1600 "clearline"]
+       Line[149347 293153 140000 302500 1000 1600 "clearline"]
+       Line[140000 302500 129944 302500 1000 1600 "clearline"]
+       Line[129944 302500 129894 302550 1000 1600 "clearline"]
        Polygon("clearpoly")
        (
                [227000 233000] [216500 233000] [216500 188000] [227000 188000] 
@@ -3294,7 +3298,7 @@ Layer(10 "silk")
        Line[17500 95000 500 95000 1000 1600 "clearline"]
        Line[500 95000 500 500 1000 1600 "clearline"]
        Line[500 500 385500 500 1000 1600 "clearline"]
-       Text[103500 278000 0 100 "5V" "clearline"]
+       Text[94500 284000 0 100 "5V" "clearline"]
        Text[137000 286000 0 50 "SWDIO" "clearline"]
        Text[137000 291000 0 50 "SWDCK" "clearline"]
        Text[138000 306500 0 50 "XRES" "clearline"]
@@ -3307,6 +3311,8 @@ Layer(10 "silk")
        Text[29000 312500 0 100 "Michael McMaster" "clearline"]
        Text[340500 123500 0 100 "2.85V" "clearline"]
        Text[172500 357500 0 100 "~ 500mA" "clearline"]
+       Text[108500 275500 0 100 "1" "clearline"]
+       Text[108500 268000 0 100 "JTAG/SWD" "clearline"]
        Polygon("clearpoly")
        (
                [307500 152500] [310000 152500] [310000 161000] [307500 161000] 
@@ -3772,6 +3778,7 @@ NetList()
        Net("unnamed_net8" "(unknown)")
        (
                Connect("J4-8")
+               Connect("U1-24")
        )
        Net("unnamed_net9" "(unknown)")
        (
@@ -3808,32 +3815,28 @@ NetList()
                Connect("U1-22")
        )
        Net("unnamed_net16" "(unknown)")
-       (
-               Connect("U1-24")
-       )
-       Net("unnamed_net17" "(unknown)")
        (
                Connect("U1-25")
        )
-       Net("unnamed_net18" "(unknown)")
+       Net("unnamed_net17" "(unknown)")
        (
                Connect("R4-2")
                Connect("U1-35")
        )
-       Net("unnamed_net19" "(unknown)")
+       Net("unnamed_net18" "(unknown)")
        (
                Connect("R5-2")
                Connect("U1-36")
        )
-       Net("unnamed_net20" "(unknown)")
+       Net("unnamed_net19" "(unknown)")
        (
                Connect("U1-42")
        )
-       Net("unnamed_net21" "(unknown)")
+       Net("unnamed_net20" "(unknown)")
        (
                Connect("U1-55")
        )
-       Net("unnamed_net22" "(unknown)")
+       Net("unnamed_net21" "(unknown)")
        (
                Connect("C7-2")
                Connect("C14-2")
@@ -3841,31 +3844,31 @@ NetList()
                Connect("R2-1")
                Connect("U2-2")
        )
-       Net("unnamed_net23" "(unknown)")
+       Net("unnamed_net22" "(unknown)")
        (
                Connect("D1-2")
                Connect("J3-1")
        )
-       Net("unnamed_net24" "(unknown)")
+       Net("unnamed_net23" "(unknown)")
        (
                Connect("F2-1")
                Connect("J5-1")
        )
-       Net("unnamed_net25" "(unknown)")
+       Net("unnamed_net24" "(unknown)")
        (
                Connect("D3-2")
                Connect("F2-2")
        )
-       Net("unnamed_net26" "(unknown)")
+       Net("unnamed_net25" "(unknown)")
        (
                Connect("J5-4")
        )
-       Net("unnamed_net27" "(unknown)")
+       Net("unnamed_net26" "(unknown)")
        (
                Connect("J5-3")
                Connect("R4-1")
        )
-       Net("unnamed_net28" "(unknown)")
+       Net("unnamed_net27" "(unknown)")
        (
                Connect("J5-2")
                Connect("R5-1")

diff --git a/hardware/scsi2sd.sch b/hardware/scsi2sd.sch
index 1457b8f888b7d8a437a6068a9c1d4d1bf1fac24d..edb46d8e93d6b5c61caf39bc8679549a33da82c9 100644 (file)
--- a/hardware/scsi2sd.sch
+++ b/hardware/scsi2sd.sch
@@ -756,13 +756,6 @@ footprint=FTSH-105-01-L-DV-K
 N 44100 39300 45600 39300 2
 N 45600 39300 45600 44200 2
 N 45600 44200 46200 44200 2
-C 44100 39600 1 0 0 nc-right-1.sym
-{
-T 44200 40100 5 10 0 0 0 0 1
-value=NoConnection
-T 44200 40300 5 10 0 0 0 0 1
-device=DRC_Directive
-}
 N 44100 40100 44700 40100 4
 N 44700 40100 44700 38600 4
 N 44700 38600 46200 38600 4
@@ -2066,13 +2059,6 @@ refdes=J3
 T 35300 45300 5 10 0 0 0 0 1
 footprint=HEADER2_2
 }
-C 46200 38000 1 180 0 nc-right-1.sym
-{
-T 46100 37500 5 10 0 0 180 0 1
-value=NoConnection
-T 46100 37300 5 10 0 0 180 0 1
-device=DRC_Directive
-}
 C 46200 37300 1 180 0 nc-right-1.sym
 {
 T 46100 36800 5 10 0 0 180 0 1
@@ -2456,3 +2442,6 @@ T 68800 35700 5 10 0 0 0 0 1
 footprint=wurth-microsd
 }
 C 65100 37800 1 90 0 gnd-1.sym
+N 44100 39700 44400 39700 4
+N 44400 39700 44400 37900 4
+N 44400 37900 46200 37900 4

diff --git a/hardware/symbols/CY8C53.sym b/hardware/symbols/CY8C53.sym
index e3e85103401c736ac1b86334a8b0531145e55510..4bfd79c142734399e22fc7234cc88ce03c22a813 100644 (file)
--- a/hardware/symbols/CY8C53.sym
+++ b/hardware/symbols/CY8C53.sym
@@ -215,7 +215,7 @@ pinnumber=20
 T 300 4550 5 8 0 1 0 8 1
 pinseq=20
 T 450 4600 9 8 1 1 0 0 1
-pinlabel=SWDIO,P1[0]
+pinlabel=SWDIO,TMS,P1[0]
 T 450 4600 5 8 0 1 0 2 1
 pintype=io
 }
@@ -226,7 +226,7 @@ pinnumber=21
 T 300 3850 5 8 0 1 0 8 1
 pinseq=21
 T 450 3900 9 8 1 1 0 0 1
-pinlabel=SWDCK,P1[1]
+pinlabel=SWDCK,TCK,P1[1]
 T 450 3900 5 8 0 1 0 2 1
 pintype=io
 }
@@ -248,7 +248,7 @@ pinnumber=23
 T 300 2450 5 8 0 1 0 8 1
 pinseq=23
 T 450 2500 9 8 1 1 0 0 1
-pinlabel=SWV,P1[3]
+pinlabel=SWV,TDO,P1[3]
 T 450 2500 5 8 0 1 0 2 1
 pintype=io
 }
@@ -259,7 +259,7 @@ pinnumber=24
 T 300 1750 5 8 0 1 0 8 1
 pinseq=24
 T 450 1800 9 8 1 1 0 0 1
-pinlabel=P1[4]
+pinlabel=TDI,P1[4]
 T 450 1800 5 8 0 1 0 2 1
 pintype=io
 }
@@ -270,7 +270,7 @@ pinnumber=25
 T 300 1050 5 8 0 1 0 8 1
 pinseq=25
 T 450 1100 9 8 1 1 0 0 1
-pinlabel=P1[5]
+pinlabel=NTRST,P1[5]
 T 450 1100 5 8 0 1 0 2 1
 pintype=io
 }

diff --git a/hardware/symbols/CY8C53.tragesym b/hardware/symbols/CY8C53.tragesym
index f8d49158b7f8ee852f29240f39a6ad78ec3eadf4..c97edc0e86c5405e22f9ab4ada6ffb01d1458dd8 100644 (file)
--- a/hardware/symbols/CY8C53.tragesym
+++ b/hardware/symbols/CY8C53.tragesym
@@ -76,12 +76,12 @@ numslots=0
 17             io      line    l               P5[1]
 18             io      line    l               P5[2]
 19             io      line    l               P5[3]
-20             io      line    l               SWDIO,P1[0]
-21             io      line    l               SWDCK,P1[1]
+20             io      line    l               SWDIO,TMS,P1[0]
+21             io      line    l               SWDCK,TCK,P1[1]
 22             io      line    l               P1[2]
-23             io      line    l               SWV,P1[3]
-24             io      line    l               P1[4]
-25             io      line    l               P1[5]
+23             io      line    l               SWV,TDO,P1[3]
+24             io      line    l               TDI,P1[4]
+25             io      line    l               NTRST,P1[5]
 
 
 26             pwr     line    b               VDDIO1