From 17068606b52aa3eae20ee53b7a8d65acfcb83a23 Mon Sep 17 00:00:00 2001
From: t3hcatpaw <t3hcatpaw@gmail.com>
Date: Thu, 24 Aug 2017 12:17:57 +0200
Subject: [PATCH 1/5] Add Cortex Debug Connector

Added ARM's standard Cortex-M Debug Header (http://infocenter.arm.com/help/topic/com.arm.doc.faqs/attached/13634/cortex_debug_connectors.pdf)
---
 library/Connector.dcm |  6 ++++++
 library/Connector.lib | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/library/Connector.dcm b/library/Connector.dcm
index baab8f8f..ff55995f 100644
--- a/library/Connector.dcm
+++ b/library/Connector.dcm
@@ -2006,6 +2006,12 @@ D Connector Europe, 60 contacts, ranges A,B,C,D
 K connector
 $ENDCMP
 #
+$CMP Conn_ARM_Cortex-Debug
+D Cortex Debug Connector, standard ARM Cortex-M SWD and JTAG interface
+K Cortex Debug Connector ARM SWD JTAG
+F http://infocenter.arm.com/help/topic/com.arm.doc.faqs/attached/13634/cortex_debug_connectors.pdf
+$ENDCMP
+#
 $CMP Conn_ARM_JTAG_SWD_20
 D Standard IDC20 Male Connector, ARM legacy JTAG and SWD interface
 K IDC20 Male Connector ARM JTAG SWD
diff --git a/library/Connector.lib b/library/Connector.lib
index 66319fd5..33806eda 100644
--- a/library/Connector.lib
+++ b/library/Connector.lib
@@ -29443,6 +29443,40 @@ X 15D D15 -500 -2950 300 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Conn_ARM_Cortex-Debug
+#
+DEF Conn_ARM_Cortex-Debug J 0 40 Y Y 1 F N
+F0 "J" -100 650 50 H V R CNN
+F1 "Conn_ARM_Cortex-Debug" -100 550 50 H V R BNN
+F2 "Pin_Headers:Pin_Header_Straight_2x05_Pitch1.27mm_SMD" 50 -550 50 H I L TNN
+F3 "" -350 -1250 50 V I C CNN
+$FPLIST
+ Pin_Header*2x???Pitch1.27mm*
+ Tag-Connect*IDC*
+$ENDFPLIST
+DRAW
+S -400 500 400 -500 0 1 10 f
+S -110 -500 -90 -460 0 1 0 N
+S -10 -500 10 -460 0 1 0 N
+S -10 500 10 460 0 1 0 N
+S 360 90 400 110 0 1 0 N
+S 400 -110 360 -90 0 1 0 N
+S 400 -10 360 10 0 1 0 N
+S 400 310 360 290 0 1 0 N
+S 360 -210 400 -190 1 1 0 N
+X VCC 1 0 600 100 D 50 50 1 1 W
+X SWDIO/TMS 2 500 0 100 L 50 50 1 1 P
+X GND 3 0 -600 100 U 50 50 1 1 W
+X SWDCLK/TCK 4 500 100 100 L 50 50 1 1 P
+X GND 5 0 -600 100 U 50 50 1 1 P N
+X SWO/TDO 6 500 -100 100 L 50 50 1 1 P
+X KEY 7 -400 0 100 R 50 50 1 1 N N
+X NC/TDI 8 500 -200 100 L 50 50 1 1 P
+X GNDDetect 9 -100 -600 100 U 50 50 1 1 I
+X ~RESET~ 10 500 300 100 L 50 50 1 1 O
+ENDDRAW
+ENDDEF
+#
 # Conn_ARM_JTAG_SWD_20
 #
 DEF Conn_ARM_JTAG_SWD_20 J 0 40 Y Y 1 F N

From ee079ed7878b7ec80dbf34c588cdec7b2da17539 Mon Sep 17 00:00:00 2001
From: t3hcatpaw <t3hcatpaw@gmail.com>
Date: Thu, 24 Aug 2017 12:30:28 +0200
Subject: [PATCH 2/5] Fix FP filters

Fixed FP filters: Replaced underscore and minus with question marks
---
 library/Connector.lib | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Connector.lib b/library/Connector.lib
index 33806eda..be1087b0 100644
--- a/library/Connector.lib
+++ b/library/Connector.lib
@@ -29451,8 +29451,8 @@ F1 "Conn_ARM_Cortex-Debug" -100 550 50 H V R BNN
 F2 "Pin_Headers:Pin_Header_Straight_2x05_Pitch1.27mm_SMD" 50 -550 50 H I L TNN
 F3 "" -350 -1250 50 V I C CNN
 $FPLIST
- Pin_Header*2x???Pitch1.27mm*
- Tag-Connect*IDC*
+ Pin?Header*2x???Pitch1.27mm*
+ Tag?Connect*IDC*
 $ENDFPLIST
 DRAW
 S -400 500 400 -500 0 1 10 f

From 94e99efdb40caf8918dcb73fa104d93dcefbf570 Mon Sep 17 00:00:00 2001
From: t3hcatpaw <t3hcatpaw@gmail.com>
Date: Thu, 24 Aug 2017 15:14:25 +0200
Subject: [PATCH 3/5] Fix pin types, FP filters

- Changed pin types to reflect debugger
- Changed FP filters to match all kinds of IDC and pin headers
---
 library/Connector.lib | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/library/Connector.lib b/library/Connector.lib
index be1087b0..6029b838 100644
--- a/library/Connector.lib
+++ b/library/Connector.lib
@@ -29451,7 +29451,8 @@ F1 "Conn_ARM_Cortex-Debug" -100 550 50 H V R BNN
 F2 "Pin_Headers:Pin_Header_Straight_2x05_Pitch1.27mm_SMD" 50 -550 50 H I L TNN
 F3 "" -350 -1250 50 V I C CNN
 $FPLIST
- Pin?Header*2x???Pitch1.27mm*
+ Pin?Header*
+ IDC?Header*
  Tag?Connect*IDC*
 $ENDFPLIST
 DRAW
@@ -29465,13 +29466,13 @@ S 400 -10 360 10 0 1 0 N
 S 400 310 360 290 0 1 0 N
 S 360 -210 400 -190 1 1 0 N
 X VCC 1 0 600 100 D 50 50 1 1 W
-X SWDIO/TMS 2 500 0 100 L 50 50 1 1 P
+X SWDIO/TMS 2 500 0 100 L 50 50 1 1 B
 X GND 3 0 -600 100 U 50 50 1 1 W
-X SWDCLK/TCK 4 500 100 100 L 50 50 1 1 P
+X SWDCLK/TCK 4 500 100 100 L 50 50 1 1 O
 X GND 5 0 -600 100 U 50 50 1 1 P N
-X SWO/TDO 6 500 -100 100 L 50 50 1 1 P
+X SWO/TDO 6 500 -100 100 L 50 50 1 1 I
 X KEY 7 -400 0 100 R 50 50 1 1 N N
-X NC/TDI 8 500 -200 100 L 50 50 1 1 P
+X NC/TDI 8 500 -200 100 L 50 50 1 1 O
 X GNDDetect 9 -100 -600 100 U 50 50 1 1 I
 X ~RESET~ 10 500 300 100 L 50 50 1 1 O
 ENDDRAW

From 7f58bb3c81da7f30533cd5fbc23a0ebfba0f3491 Mon Sep 17 00:00:00 2001
From: t3hcatpaw <t3hcatpaw@gmail.com>
Date: Thu, 24 Aug 2017 16:56:25 +0200
Subject: [PATCH 4/5] Fix FP filters, change pin type

- Reduced specific filters to more generic ones
- Changed nRESET to open-collector
---
 library/Connector.lib | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/library/Connector.lib b/library/Connector.lib
index 6029b838..1f33bfcd 100644
--- a/library/Connector.lib
+++ b/library/Connector.lib
@@ -29452,8 +29452,7 @@ F2 "Pin_Headers:Pin_Header_Straight_2x05_Pitch1.27mm_SMD" 50 -550 50 H I L TNN
 F3 "" -350 -1250 50 V I C CNN
 $FPLIST
  Pin?Header*
- IDC?Header*
- Tag?Connect*IDC*
+ *IDC*
 $ENDFPLIST
 DRAW
 S -400 500 400 -500 0 1 10 f
@@ -29474,7 +29473,7 @@ X SWO/TDO 6 500 -100 100 L 50 50 1 1 I
 X KEY 7 -400 0 100 R 50 50 1 1 N N
 X NC/TDI 8 500 -200 100 L 50 50 1 1 O
 X GNDDetect 9 -100 -600 100 U 50 50 1 1 I
-X ~RESET~ 10 500 300 100 L 50 50 1 1 O
+X ~RESET~ 10 500 300 100 L 50 50 1 1 C
 ENDDRAW
 ENDDEF
 #

From 049b7b3df2f124091c8b1cf00af3e26311509454 Mon Sep 17 00:00:00 2001
From: t3hcatpaw <t3hcatpaw@gmail.com>
Date: Sun, 29 Oct 2017 18:35:19 +0100
Subject: [PATCH 5/5] Rename Cortex Debug Connector, add FP filter

- Renamed Cortex Debug Connector from `Conn_ARM_Cortex-Debug` to `CMP Conn_ARM_JTAG_SWD_10`
- Added FP filter `Conn*:*_2x*` for KiCad v5
---
 library/Connector.dcm | 2 +-
 library/Connector.lib | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/library/Connector.dcm b/library/Connector.dcm
index ff55995f..c1f45f25 100644
--- a/library/Connector.dcm
+++ b/library/Connector.dcm
@@ -2006,7 +2006,7 @@ D Connector Europe, 60 contacts, ranges A,B,C,D
 K connector
 $ENDCMP
 #
-$CMP Conn_ARM_Cortex-Debug
+$CMP Conn_ARM_JTAG_SWD_10
 D Cortex Debug Connector, standard ARM Cortex-M SWD and JTAG interface
 K Cortex Debug Connector ARM SWD JTAG
 F http://infocenter.arm.com/help/topic/com.arm.doc.faqs/attached/13634/cortex_debug_connectors.pdf
diff --git a/library/Connector.lib b/library/Connector.lib
index 1f33bfcd..ad1bd1ea 100644
--- a/library/Connector.lib
+++ b/library/Connector.lib
@@ -29443,16 +29443,17 @@ X 15D D15 -500 -2950 300 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Conn_ARM_Cortex-Debug
+# Conn_ARM_JTAG_SWD_10
 #
-DEF Conn_ARM_Cortex-Debug J 0 40 Y Y 1 F N
+DEF Conn_ARM_JTAG_SWD_10 J 0 40 Y Y 1 F N
 F0 "J" -100 650 50 H V R CNN
-F1 "Conn_ARM_Cortex-Debug" -100 550 50 H V R BNN
+F1 "Conn_ARM_JTAG_SWD_10" -100 550 50 H V R BNN
 F2 "Pin_Headers:Pin_Header_Straight_2x05_Pitch1.27mm_SMD" 50 -550 50 H I L TNN
 F3 "" -350 -1250 50 V I C CNN
 $FPLIST
  Pin?Header*
  *IDC*
+ Conn*:*_2x*
 $ENDFPLIST
 DRAW
 S -400 500 400 -500 0 1 10 f