schematic: use generic header for swd

1 files changed, 395 insertions, 508 deletions

diff --git a/hw/can_gauge_interface.kicad_sch b/hw/can_gauge_interface.kicad_sch
index 1d9dd08..adef3e0 100644
--- a/hw/can_gauge_interface.kicad_sch
+++ b/hw/can_gauge_interface.kicad_sch
@@ -745,7 +745,7 @@
 			)
 			(embedded_fonts no)
 		)
-		(symbol "Connector:Conn_01x05_Socket"
+		(symbol "Connector:Conn_01x05_Pin"
 			(pin_names
 				(offset 1.016)
 				(hide yes)
@@ -761,7 +761,7 @@
 					)
 				)
 			)
-			(property "Value" "Conn_01x05_Socket"
+			(property "Value" "Conn_01x05_Pin"
 				(at 0 -7.62 0)
 				(effects
 					(font
@@ -822,71 +822,66 @@
 					(hide yes)
 				)
 			)
-			(symbol "Conn_01x05_Socket_1_1"
-				(polyline
-					(pts
-						(xy -1.27 5.08) (xy -0.508 5.08)
-					)
+			(symbol "Conn_01x05_Pin_1_1"
+				(rectangle
+					(start 0.8636 5.207)
+					(end 0 4.953)
 					(stroke
 						(width 0.1524)
 						(type default)
 					)
 					(fill
-						(type none)
+						(type outline)
 					)
 				)
-				(polyline
-					(pts
-						(xy -1.27 2.54) (xy -0.508 2.54)
-					)
+				(rectangle
+					(start 0.8636 2.667)
+					(end 0 2.413)
 					(stroke
 						(width 0.1524)
 						(type default)
 					)
 					(fill
-						(type none)
+						(type outline)
 					)
 				)
-				(polyline
-					(pts
-						(xy -1.27 0) (xy -0.508 0)
-					)
+				(rectangle
+					(start 0.8636 0.127)
+					(end 0 -0.127)
 					(stroke
 						(width 0.1524)
 						(type default)
 					)
 					(fill
-						(type none)
+						(type outline)
 					)
 				)
-				(polyline
-					(pts
-						(xy -1.27 -2.54) (xy -0.508 -2.54)
-					)
+				(rectangle
+					(start 0.8636 -2.413)
+					(end 0 -2.667)
 					(stroke
 						(width 0.1524)
 						(type default)
 					)
 					(fill
-						(type none)
+						(type outline)
 					)
 				)
-				(polyline
-					(pts
-						(xy -1.27 -5.08) (xy -0.508 -5.08)
-					)
+				(rectangle
+					(start 0.8636 -4.953)
+					(end 0 -5.207)
 					(stroke
 						(width 0.1524)
 						(type default)
 					)
 					(fill
-						(type none)
+						(type outline)
 					)
 				)
-				(arc
-					(start 0 4.572)
-					(mid -0.5058 5.08)
-					(end 0 5.588)
+				(polyline
+					(pts
+						(xy 1.27 5.08) (xy 0.8636 5.08)
+					)
 					(stroke
 						(width 0.1524)
 						(type default)
@@ -895,10 +890,10 @@
 						(type none)
 					)
 				)
-				(arc
-					(start 0 2.032)
-					(mid -0.5058 2.54)
-					(end 0 3.048)
+				(polyline
+					(pts
+						(xy 1.27 2.54) (xy 0.8636 2.54)
+					)
 					(stroke
 						(width 0.1524)
 						(type default)
@@ -907,10 +902,10 @@
 						(type none)
 					)
 				)
-				(arc
-					(start 0 -0.508)
-					(mid -0.5058 0)
-					(end 0 0.508)
+				(polyline
+					(pts
+						(xy 1.27 0) (xy 0.8636 0)
+					)
 					(stroke
 						(width 0.1524)
 						(type default)
@@ -919,10 +914,10 @@
 						(type none)
 					)
 				)
-				(arc
-					(start 0 -3.048)
-					(mid -0.5058 -2.54)
-					(end 0 -2.032)
+				(polyline
+					(pts
+						(xy 1.27 -2.54) (xy 0.8636 -2.54)
+					)
 					(stroke
 						(width 0.1524)
 						(type default)
@@ -931,10 +926,10 @@
 						(type none)
 					)
 				)
-				(arc
-					(start 0 -5.588)
-					(mid -0.5058 -5.08)
-					(end 0 -4.572)
+				(polyline
+					(pts
+						(xy 1.27 -5.08) (xy 0.8636 -5.08)
+					)
 					(stroke
 						(width 0.1524)
 						(type default)
@@ -944,7 +939,7 @@
 					)
 				)
 				(pin passive line
-					(at -5.08 5.08 0)
+					(at 5.08 5.08 180)
 					(length 3.81)
 					(name "Pin_1"
 						(effects
@@ -962,7 +957,7 @@
 					)
 				)
 				(pin passive line
-					(at -5.08 2.54 0)
+					(at 5.08 2.54 180)
 					(length 3.81)
 					(name "Pin_2"
 						(effects
@@ -980,7 +975,7 @@
 					)
 				)
 				(pin passive line
-					(at -5.08 0 0)
+					(at 5.08 0 180)
 					(length 3.81)
 					(name "Pin_3"
 						(effects
@@ -998,7 +993,7 @@
 					)
 				)
 				(pin passive line
-					(at -5.08 -2.54 0)
+					(at 5.08 -2.54 180)
 					(length 3.81)
 					(name "Pin_4"
 						(effects
@@ -1016,7 +1011,7 @@
 					)
 				)
 				(pin passive line
-					(at -5.08 -5.08 0)
+					(at 5.08 -5.08 180)
 					(length 3.81)
 					(name "Pin_5"
 						(effects
@@ -1036,29 +1031,28 @@
 			)
 			(embedded_fonts no)
 		)
-		(symbol "Connector:Conn_ARM_JTAG_SWD_10"
+		(symbol "Connector:Conn_01x05_Socket"
 			(pin_names
 				(offset 1.016)
+				(hide yes)
 			)
 			(exclude_from_sim no)
 			(in_bom yes)
 			(on_board yes)
 			(property "Reference" "J"
-				(at -2.54 16.51 0)
+				(at 0 7.62 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
-					(justify right)
 				)
 			)
-			(property "Value" "Conn_ARM_JTAG_SWD_10"
-				(at -2.54 13.97 0)
+			(property "Value" "Conn_01x05_Socket"
+				(at 0 -7.62 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
-					(justify right bottom)
 				)
 			)
 			(property "Footprint" ""
@@ -1070,8 +1064,8 @@
 					(hide yes)
 				)
 			)
-			(property "Datasheet" "http://infocenter.arm.com/help/topic/com.arm.doc.ddi0314h/DDI0314H_coresight_components_trm.pdf"
-				(at -8.89 -31.75 90)
+			(property "Datasheet" "~"
+				(at 0 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -1079,7 +1073,7 @@
 					(hide yes)
 				)
 			)
-			(property "Description" "Cortex Debug Connector, standard ARM Cortex-M SWD and JTAG interface"
+			(property "Description" "Generic connector, single row, 01x05, script generated"
 				(at 0 0 0)
 				(effects
 					(font
@@ -1088,7 +1082,15 @@
 					(hide yes)
 				)
 			)
-			(property "ki_keywords" "Cortex Debug Connector ARM SWD JTAG"
+			(property "ki_locked" ""
+				(at 0 0 0)
+				(effects
+					(font
+						(size 1.27 1.27)
+					)
+				)
+			)
+			(property "ki_keywords" "connector"
 				(at 0 0 0)
 				(effects
 					(font
@@ -1097,7 +1099,7 @@
 					(hide yes)
 				)
 			)
-			(property "ki_fp_filters" "PinHeader?2x05?P1.27mm*"
+			(property "ki_fp_filters" "Connector*:*_1x??_*"
 				(at 0 0 0)
 				(effects
 					(font
@@ -1106,149 +1108,131 @@
 					(hide yes)
 				)
 			)
-			(symbol "Conn_ARM_JTAG_SWD_10_0_1"
-				(rectangle
-					(start -10.16 12.7)
-					(end 10.16 -12.7)
+			(symbol "Conn_01x05_Socket_1_1"
+				(polyline
+					(pts
+						(xy -1.27 5.08) (xy -0.508 5.08)
+					)
 					(stroke
-						(width 0.254)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
-						(type background)
+						(type none)
 					)
 				)
-				(rectangle
-					(start -2.794 -12.7)
-					(end -2.286 -11.684)
+				(polyline
+					(pts
+						(xy -1.27 2.54) (xy -0.508 2.54)
+					)
 					(stroke
-						(width 0)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
 						(type none)
 					)
 				)
-				(rectangle
-					(start -0.254 12.7)
-					(end 0.254 11.684)
+				(polyline
+					(pts
+						(xy -1.27 0) (xy -0.508 0)
+					)
 					(stroke
-						(width 0)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
 						(type none)
 					)
 				)
-				(rectangle
-					(start -0.254 -12.7)
-					(end 0.254 -11.684)
+				(polyline
+					(pts
+						(xy -1.27 -2.54) (xy -0.508 -2.54)
+					)
 					(stroke
-						(width 0)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
 						(type none)
 					)
 				)
-				(rectangle
-					(start 9.144 2.286)
-					(end 10.16 2.794)
+				(polyline
+					(pts
+						(xy -1.27 -5.08) (xy -0.508 -5.08)
+					)
 					(stroke
-						(width 0)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
 						(type none)
 					)
 				)
-				(rectangle
-					(start 10.16 7.874)
-					(end 9.144 7.366)
+				(arc
+					(start 0 4.572)
+					(mid -0.5058 5.08)
+					(end 0 5.588)
 					(stroke
-						(width 0)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
 						(type none)
 					)
 				)
-				(rectangle
-					(start 10.16 -0.254)
-					(end 9.144 0.254)
+				(arc
+					(start 0 2.032)
+					(mid -0.5058 2.54)
+					(end 0 3.048)
 					(stroke
-						(width 0)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
 						(type none)
 					)
 				)
-				(rectangle
-					(start 10.16 -2.794)
-					(end 9.144 -2.286)
+				(arc
+					(start 0 -0.508)
+					(mid -0.5058 0)
+					(end 0 0.508)
 					(stroke
-						(width 0)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
 						(type none)
 					)
 				)
-			)
-			(symbol "Conn_ARM_JTAG_SWD_10_1_1"
-				(rectangle
-					(start 9.144 -5.334)
-					(end 10.16 -4.826)
+				(arc
+					(start 0 -3.048)
+					(mid -0.5058 -2.54)
+					(end 0 -2.032)
 					(stroke
-						(width 0)
+						(width 0.1524)
 						(type default)
 					)
 					(fill
 						(type none)
 					)
 				)
-				(pin no_connect line
-					(at -10.16 0 0)
-					(length 2.54)
-					(hide yes)
-					(name "KEY"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
+				(arc
+					(start 0 -5.588)
+					(mid -0.5058 -5.08)
+					(end 0 -4.572)
+					(stroke
+						(width 0.1524)
+						(type default)
 					)
-					(number "7"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
+					(fill
+						(type none)
 					)
 				)
 				(pin passive line
-					(at -2.54 -15.24 90)
-					(length 2.54)
-					(name "GNDDetect"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "9"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-				(pin power_in line
-					(at 0 15.24 270)
-					(length 2.54)
-					(name "VTref"
+					(at -5.08 5.08 0)
+					(length 3.81)
+					(name "Pin_1"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -1263,36 +1247,17 @@
 						)
 					)
 				)
-				(pin power_in line
-					(at 0 -15.24 90)
-					(length 2.54)
-					(name "GND"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "3"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
 				(pin passive line
-					(at 0 -15.24 90)
-					(length 2.54)
-					(hide yes)
-					(name "GND"
+					(at -5.08 2.54 0)
+					(length 3.81)
+					(name "Pin_2"
 						(effects
 							(font
 								(size 1.27 1.27)
 							)
 						)
 					)
-					(number "5"
+					(number "2"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -1300,17 +1265,17 @@
 						)
 					)
 				)
-				(pin open_collector line
-					(at 12.7 7.62 180)
-					(length 2.54)
-					(name "~{RESET}"
+				(pin passive line
+					(at -5.08 0 0)
+					(length 3.81)
+					(name "Pin_3"
 						(effects
 							(font
 								(size 1.27 1.27)
 							)
 						)
 					)
-					(number "10"
+					(number "3"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -1318,10 +1283,10 @@
 						)
 					)
 				)
-				(pin output line
-					(at 12.7 2.54 180)
-					(length 2.54)
-					(name "SWCLK/TCK"
+				(pin passive line
+					(at -5.08 -2.54 0)
+					(length 3.81)
+					(name "Pin_4"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -1336,53 +1301,17 @@
 						)
 					)
 				)
-				(pin bidirectional line
-					(at 12.7 0 180)
-					(length 2.54)
-					(name "SWDIO/TMS"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "2"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-				(pin input line
-					(at 12.7 -2.54 180)
-					(length 2.54)
-					(name "SWO/TDO"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "6"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-				(pin output line
-					(at 12.7 -5.08 180)
-					(length 2.54)
-					(name "NC/TDI"
+				(pin passive line
+					(at -5.08 -5.08 0)
+					(length 3.81)
+					(name "Pin_5"
 						(effects
 							(font
 								(size 1.27 1.27)
 							)
 						)
 					)
-					(number "8"
+					(number "5"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -5893,7 +5822,7 @@
 	)
 	(rectangle
 		(start 215.9 165.1)
-		(end 266.7 228.6)
+		(end 266.7 215.9)
 		(stroke
 			(width 0)
 			(type dash)
@@ -6171,22 +6100,22 @@
 		(uuid "01e0ef71-1776-4080-b61d-9b123dec05da")
 	)
 	(junction
-		(at 34.29 138.43)
+		(at 266.7 81.28)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "05569a55-69fa-4764-967f-3f66823301e8")
+		(uuid "01f9cc3c-ec21-403a-af65-78cc3c9f29bb")
 	)
 	(junction
-		(at 317.5 226.06)
+		(at 34.29 138.43)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "072dbcb1-8456-4663-b83a-2b68bd414f59")
+		(uuid "05569a55-69fa-4764-967f-3f66823301e8")
 	)
 	(junction
-		(at 266.7 78.74)
+		(at 317.5 226.06)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "083b7d65-2f1e-4531-a925-61c85a1f4092")
+		(uuid "072dbcb1-8456-4663-b83a-2b68bd414f59")
 	)
 	(junction
 		(at 133.35 50.8)
@@ -6267,6 +6196,12 @@
 		(uuid "38356205-bb69-49cc-9ba7-416f210ab596")
 	)
 	(junction
+		(at 260.35 78.74)
+		(diameter 0)
+		(color 0 0 0 0)
+		(uuid "3bd5223b-0fc5-4e73-a05b-07f90a6324df")
+	)
+	(junction
 		(at 82.55 101.6)
 		(diameter 0)
 		(color 0 0 0 0)
@@ -6399,12 +6334,6 @@
 		(uuid "93ae9b2d-f485-4b65-9ad4-624a167318cd")
 	)
 	(junction
-		(at 260.35 81.28)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "ae7cf3eb-963d-4f95-8323-2471ad38bfc9")
-	)
-	(junction
 		(at 120.65 50.8)
 		(diameter 0)
 		(color 0 0 0 0)
@@ -6465,7 +6394,7 @@
 		(uuid "dbd679cd-139f-4efe-bd50-dbbb699c49dc")
 	)
 	(junction
-		(at 260.35 58.42)
+		(at 260.35 67.31)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "dc397092-371c-40c9-a444-d2a0676e1840")
@@ -6489,28 +6418,22 @@
 		(uuid "eb642b17-eb76-49e9-aa69-7e8f11ba8c7e")
 	)
 	(junction
-		(at 241.3 219.71)
-		(diameter 0)
-		(color 0 0 0 0)
-		(uuid "ec941d5f-6347-4a57-8b19-3c7050c35324")
-	)
-	(junction
 		(at 43.18 149.86)
 		(diameter 0)
 		(color 0 0 0 0)
 		(uuid "ed574e0b-4d5f-442a-b9cf-8b748c1bee36")
 	)
 	(junction
-		(at 241.3 184.15)
+		(at 154.94 158.75)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "ef822832-bd6d-4235-a54d-c48c4a99fcaf")
+		(uuid "f1c64f4a-dfbf-46dc-b4d0-3558156fc2d6")
 	)
 	(junction
-		(at 154.94 158.75)
+		(at 241.3 184.15)
 		(diameter 0)
 		(color 0 0 0 0)
-		(uuid "f1c64f4a-dfbf-46dc-b4d0-3558156fc2d6")
+		(uuid "f68db7b1-d6de-4b5d-a9ed-d1078f06c371")
 	)
 	(junction
 		(at 133.35 45.72)
@@ -6527,10 +6450,6 @@
 		(uuid "1ed191ce-4b0f-46a0-a07b-375d0f7a32f9")
 	)
 	(no_connect
-		(at 254 205.74)
-		(uuid "2bb1197b-32bd-4d7b-9976-6943e327ebc7")
-	)
-	(no_connect
 		(at 285.75 127)
 		(uuid "2fcb21c4-7047-498a-bf52-b15de3b42643")
 	)
@@ -6547,10 +6466,6 @@
 		(uuid "4017dc1a-4676-4539-945b-728f6fb86ba3")
 	)
 	(no_connect
-		(at 254 208.28)
-		(uuid "4dfd039a-121f-4fe0-abc5-b3339b969fb0")
-	)
-	(no_connect
 		(at 285.75 109.22)
 		(uuid "576080da-ce6f-40a9-987a-f4c04a95bf8e")
 	)
@@ -6700,16 +6615,6 @@
 	)
 	(wire
 		(pts
-			(xy 238.76 219.71) (xy 241.3 219.71)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "03348bf7-418e-490b-86d2-a8c30aa16f00")
-	)
-	(wire
-		(pts
 			(xy 50.8 203.2) (xy 50.8 200.66)
 		)
 		(stroke
@@ -6770,6 +6675,16 @@
 	)
 	(wire
 		(pts
+			(xy 260.35 78.74) (xy 285.75 78.74)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "0dd03ce2-6819-44f2-8998-8b2da4881dce")
+	)
+	(wire
+		(pts
 			(xy 165.1 140.97) (xy 175.26 140.97)
 		)
 		(stroke
@@ -6830,6 +6745,16 @@
 	)
 	(wire
 		(pts
+			(xy 241.3 184.15) (xy 241.3 177.8)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "183aa895-5820-447b-8f4a-a50d40fcaee6")
+	)
+	(wire
+		(pts
 			(xy 50.8 228.6) (xy 50.8 226.06)
 		)
 		(stroke
@@ -6890,6 +6815,16 @@
 	)
 	(wire
 		(pts
+			(xy 241.3 184.15) (xy 243.84 184.15)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "1ead6c5b-bda0-47db-950d-74f752dc2a98")
+	)
+	(wire
+		(pts
 			(xy 133.35 50.8) (xy 133.35 63.5)
 		)
 		(stroke
@@ -6980,23 +6915,23 @@
 	)
 	(wire
 		(pts
-			(xy 38.1 50.8) (xy 38.1 53.34)
+			(xy 241.3 191.77) (xy 241.3 184.15)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "25e1d9f3-4f38-4399-9028-533400df3a9b")
+		(uuid "251d9e53-74fa-4e81-8514-e94f85512f6c")
 	)
 	(wire
 		(pts
-			(xy 238.76 218.44) (xy 238.76 219.71)
+			(xy 38.1 50.8) (xy 38.1 53.34)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "26ce8b8b-e1f4-4b60-8081-f3ecffd55162")
+		(uuid "25e1d9f3-4f38-4399-9028-533400df3a9b")
 	)
 	(wire
 		(pts
@@ -7030,16 +6965,6 @@
 	)
 	(wire
 		(pts
-			(xy 251.46 184.15) (xy 254 184.15)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "2a369676-d7c9-4496-bb0c-329a498d1d37")
-	)
-	(wire
-		(pts
 			(xy 132.08 177.8) (xy 133.35 177.8)
 		)
 		(stroke
@@ -7180,7 +7105,7 @@
 	)
 	(wire
 		(pts
-			(xy 266.7 58.42) (xy 266.7 59.69)
+			(xy 266.7 67.31) (xy 266.7 68.58)
 		)
 		(stroke
 			(width 0)
@@ -7200,26 +7125,6 @@
 	)
 	(wire
 		(pts
-			(xy 254 81.28) (xy 260.35 81.28)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "3d024f2e-9959-457a-bc37-6bff4bdd99aa")
-	)
-	(wire
-		(pts
-			(xy 254 78.74) (xy 266.7 78.74)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "3d42782b-7678-470c-ad43-17b317ffb867")
-	)
-	(wire
-		(pts
 			(xy 82.55 101.6) (xy 95.25 101.6)
 		)
 		(stroke
@@ -7420,7 +7325,7 @@
 	)
 	(wire
 		(pts
-			(xy 260.35 58.42) (xy 260.35 59.69)
+			(xy 260.35 67.31) (xy 260.35 68.58)
 		)
 		(stroke
 			(width 0)
@@ -7460,16 +7365,6 @@
 	)
 	(wire
 		(pts
-			(xy 241.3 218.44) (xy 241.3 219.71)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "573ba82a-3bdd-4f79-a50a-333df27ed214")
-	)
-	(wire
-		(pts
 			(xy 184.15 217.17) (xy 184.15 215.9)
 		)
 		(stroke
@@ -7490,16 +7385,6 @@
 	)
 	(wire
 		(pts
-			(xy 266.7 67.31) (xy 266.7 78.74)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "587f05b3-c1d6-4370-a882-580adddb8b42")
-	)
-	(wire
-		(pts
 			(xy 193.04 140.97) (xy 194.31 140.97)
 		)
 		(stroke
@@ -7550,7 +7435,7 @@
 	)
 	(wire
 		(pts
-			(xy 266.7 78.74) (xy 285.75 78.74)
+			(xy 254 78.74) (xy 260.35 78.74)
 		)
 		(stroke
 			(width 0)
@@ -7570,6 +7455,16 @@
 	)
 	(wire
 		(pts
+			(xy 251.46 184.15) (xy 254 184.15)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "5e4a00a8-9fae-483e-baf2-560dc91c1db2")
+	)
+	(wire
+		(pts
 			(xy 43.18 142.24) (xy 43.18 144.78)
 		)
 		(stroke
@@ -7730,7 +7625,7 @@
 	)
 	(wire
 		(pts
-			(xy 260.35 81.28) (xy 285.75 81.28)
+			(xy 254 81.28) (xy 266.7 81.28)
 		)
 		(stroke
 			(width 0)
@@ -7810,16 +7705,6 @@
 	)
 	(wire
 		(pts
-			(xy 241.3 184.15) (xy 243.84 184.15)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "772e7c33-19f7-45a3-89c2-7e3820e98a2f")
-	)
-	(wire
-		(pts
 			(xy 43.18 149.86) (xy 43.18 151.13)
 		)
 		(stroke
@@ -7850,7 +7735,7 @@
 	)
 	(wire
 		(pts
-			(xy 260.35 57.15) (xy 260.35 58.42)
+			(xy 260.35 66.04) (xy 260.35 67.31)
 		)
 		(stroke
 			(width 0)
@@ -7890,6 +7775,16 @@
 	)
 	(wire
 		(pts
+			(xy 233.68 201.93) (xy 241.3 201.93)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "81a76530-de69-4f5b-96b1-7d9366624be2")
+	)
+	(wire
+		(pts
 			(xy 165.1 82.55) (xy 165.1 88.9)
 		)
 		(stroke
@@ -8010,7 +7905,7 @@
 	)
 	(wire
 		(pts
-			(xy 260.35 58.42) (xy 266.7 58.42)
+			(xy 260.35 67.31) (xy 266.7 67.31)
 		)
 		(stroke
 			(width 0)
@@ -8080,6 +7975,16 @@
 	)
 	(wire
 		(pts
+			(xy 266.7 81.28) (xy 285.75 81.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "97d3782d-5d58-48fe-92f8-52ace16b44ea")
+	)
+	(wire
+		(pts
 			(xy 154.94 182.88) (xy 154.94 184.15)
 		)
 		(stroke
@@ -8180,16 +8085,6 @@
 	)
 	(wire
 		(pts
-			(xy 241.3 184.15) (xy 241.3 187.96)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "a40d8600-d841-4bf6-8310-3d040c70ac4e")
-	)
-	(wire
-		(pts
 			(xy 132.08 175.26) (xy 133.35 175.26)
 		)
 		(stroke
@@ -8430,16 +8325,6 @@
 	)
 	(wire
 		(pts
-			(xy 260.35 67.31) (xy 260.35 81.28)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "baf80e8c-58e2-4b07-a0d3-0a58cbdc44ce")
-	)
-	(wire
-		(pts
 			(xy 55.88 205.74) (xy 55.88 203.2)
 		)
 		(stroke
@@ -8630,6 +8515,16 @@
 	)
 	(wire
 		(pts
+			(xy 241.3 201.93) (xy 241.3 204.47)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "cf83505d-2a3b-43d2-ba4d-ba06581e10c7")
+	)
+	(wire
+		(pts
 			(xy 177.8 100.33) (xy 165.1 100.33)
 		)
 		(stroke
@@ -8660,6 +8555,26 @@
 	)
 	(wire
 		(pts
+			(xy 254 184.15) (xy 254 185.42)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "d1d02131-c020-4efa-97b6-d5716bfdd178")
+	)
+	(wire
+		(pts
+			(xy 266.7 76.2) (xy 266.7 81.28)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "d1e58cfa-5b8d-4d39-af0b-4d08370fa51c")
+	)
+	(wire
+		(pts
 			(xy 152.4 184.15) (xy 132.08 184.15)
 		)
 		(stroke
@@ -8680,6 +8595,16 @@
 	)
 	(wire
 		(pts
+			(xy 233.68 191.77) (xy 241.3 191.77)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "d4c2e8b8-56ce-4951-9dde-29695af8e18c")
+	)
+	(wire
+		(pts
 			(xy 184.15 228.6) (xy 184.15 217.17)
 		)
 		(stroke
@@ -8790,16 +8715,6 @@
 	)
 	(wire
 		(pts
-			(xy 241.3 219.71) (xy 241.3 220.98)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "dbb4b94b-d8bd-4323-a7d7-d21333b678a7")
-	)
-	(wire
-		(pts
 			(xy 139.7 140.97) (xy 127 140.97)
 		)
 		(stroke
@@ -8810,16 +8725,6 @@
 	)
 	(wire
 		(pts
-			(xy 254 184.15) (xy 254 185.42)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "ddbfdf6d-a390-4a30-acfc-da02b96360fa")
-	)
-	(wire
-		(pts
 			(xy 43.18 213.36) (xy 50.8 213.36)
 		)
 		(stroke
@@ -8840,16 +8745,6 @@
 	)
 	(wire
 		(pts
-			(xy 241.3 177.8) (xy 241.3 184.15)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "e2249b72-6cd9-41fa-95e8-eb885b08d36b")
-	)
-	(wire
-		(pts
 			(xy 127 151.13) (xy 139.7 151.13)
 		)
 		(stroke
@@ -8910,6 +8805,16 @@
 	)
 	(wire
 		(pts
+			(xy 260.35 76.2) (xy 260.35 78.74)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "eaea0aba-28c4-4ac9-93ce-b2b2a126fc3e")
+	)
+	(wire
+		(pts
 			(xy 38.1 50.8) (xy 50.8 50.8)
 		)
 		(stroke
@@ -9104,7 +9009,7 @@
 	)
 	(global_label "SWCLK"
 		(shape output)
-		(at 254 200.66 0)
+		(at 233.68 196.85 0)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -9114,7 +9019,7 @@
 		)
 		(uuid "22d7725d-441a-4e38-9722-85d3cd8df416")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 263.2142 200.66 0)
+			(at 242.8942 196.85 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9610,7 +9515,7 @@
 	)
 	(global_label "SWDIO"
 		(shape bidirectional)
-		(at 254 203.2 0)
+		(at 233.68 194.31 0)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -9620,7 +9525,7 @@
 		)
 		(uuid "a404702a-0ce0-4320-9a67-ce37344508c2")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 263.9627 203.2 0)
+			(at 243.6427 194.31 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -9764,7 +9669,7 @@
 	)
 	(global_label "NRST"
 		(shape tri_state)
-		(at 254 195.58 0)
+		(at 233.68 199.39 0)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -9774,7 +9679,7 @@
 		)
 		(uuid "ce3d67ab-bd15-4fe9-a244-2ec7bcde71b0")
 		(property "Intersheetrefs" "${INTERSHEET_REFS}"
-			(at 262.8741 195.58 0)
+			(at 242.5541 199.39 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12060,7 +11965,7 @@
 	)
 	(symbol
 		(lib_id "Device:R_US")
-		(at 260.35 63.5 0)
+		(at 260.35 72.39 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -12068,7 +11973,7 @@
 		(dnp no)
 		(uuid "3432cbdd-5cac-4d94-842a-1fbbe8636e27")
 		(property "Reference" "R4"
-			(at 261.874 62.23 0)
+			(at 261.874 71.12 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12077,7 +11982,7 @@
 			)
 		)
 		(property "Value" "4k7"
-			(at 261.874 64.77 0)
+			(at 261.874 73.66 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12086,7 +11991,7 @@
 			)
 		)
 		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
-			(at 261.366 63.754 90)
+			(at 261.366 72.644 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12095,7 +12000,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 260.35 63.5 0)
+			(at 260.35 72.39 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12104,7 +12009,7 @@
 			)
 		)
 		(property "Description" "Resistor, US symbol"
-			(at 260.35 63.5 0)
+			(at 260.35 72.39 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12359,7 +12264,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 267.716 96.774 90)
 			(effects
 				(font
@@ -12470,7 +12375,7 @@
 	)
 	(symbol
 		(lib_id "power:GND")
-		(at 241.3 220.98 0)
+		(at 241.3 204.47 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -12479,7 +12384,7 @@
 		(fields_autoplaced yes)
 		(uuid "43e7c356-e16b-4502-a040-e9c37b995630")
 		(property "Reference" "#PWR0139"
-			(at 241.3 227.33 0)
+			(at 241.3 210.82 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12488,7 +12393,7 @@
 			)
 		)
 		(property "Value" "GND"
-			(at 241.3 226.06 0)
+			(at 241.3 209.55 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12497,7 +12402,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 241.3 220.98 0)
+			(at 241.3 204.47 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12506,7 +12411,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 241.3 220.98 0)
+			(at 241.3 204.47 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12515,7 +12420,7 @@
 			)
 		)
 		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-			(at 241.3 220.98 0)
+			(at 241.3 204.47 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12963,8 +12868,85 @@
 		)
 	)
 	(symbol
+		(lib_id "Connector:Conn_01x05_Pin")
+		(at 228.6 196.85 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "4a6b94a6-028f-4144-8069-72d444562d19")
+		(property "Reference" "J8"
+			(at 229.235 186.69 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "SWD"
+			(at 229.235 189.23 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" ""
+			(at 228.6 196.85 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 228.6 196.85 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Generic connector, single row, 01x05, script generated"
+			(at 228.6 196.85 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "b6663c86-7d34-4da5-a6f5-f9d65f598529")
+		)
+		(pin "3"
+			(uuid "c5e2cf3e-53f9-4d28-9a05-86f6906b7ee1")
+		)
+		(pin "4"
+			(uuid "b1a6b127-8d20-48db-8cb9-621e25bc5a56")
+		)
+		(pin "5"
+			(uuid "5e53e2b6-bff8-4c1d-9b87-5d48e187981c")
+		)
+		(pin "2"
+			(uuid "4636bf9e-b969-4e74-b017-23bbcd4d2114")
+		)
+		(instances
+			(project ""
+				(path "/11aaed46-be21-4424-b899-cb4c1a8c3e5f"
+					(reference "J8")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
 		(lib_id "power:+3.3V")
-		(at 260.35 57.15 0)
+		(at 260.35 66.04 0)
 		(mirror y)
 		(unit 1)
 		(exclude_from_sim no)
@@ -12973,7 +12955,7 @@
 		(dnp no)
 		(uuid "4be83e5b-79a1-466b-8bd0-546bfd0d84ff")
 		(property "Reference" "#PWR07"
-			(at 260.35 60.96 0)
+			(at 260.35 69.85 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12982,7 +12964,7 @@
 			)
 		)
 		(property "Value" "+3.3V"
-			(at 260.35 53.34 0)
+			(at 260.35 62.23 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12990,7 +12972,7 @@
 			)
 		)
 		(property "Footprint" ""
-			(at 260.35 57.15 0)
+			(at 260.35 66.04 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12999,7 +12981,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 260.35 57.15 0)
+			(at 260.35 66.04 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -13008,7 +12990,7 @@
 			)
 		)
 		(property "Description" "Power symbol creates a global label with name \"+3.3V\""
-			(at 260.35 57.15 0)
+			(at 260.35 66.04 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -13574,7 +13556,7 @@
 	)
 	(symbol
 		(lib_id "Device:R_US")
-		(at 266.7 63.5 0)
+		(at 266.7 72.39 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -13582,7 +13564,7 @@
 		(dnp no)
 		(uuid "5cbcd3dc-4d34-491f-8304-70c24cea9351")
 		(property "Reference" "R5"
-			(at 268.224 62.23 0)
+			(at 268.224 71.12 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -13591,7 +13573,7 @@
 			)
 		)
 		(property "Value" "4k7"
-			(at 268.224 64.77 0)
+			(at 268.224 73.66 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -13600,7 +13582,7 @@
 			)
 		)
 		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
-			(at 267.716 63.754 90)
+			(at 267.716 72.644 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -13609,7 +13591,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 266.7 63.5 0)
+			(at 266.7 72.39 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -13618,7 +13600,7 @@
 			)
 		)
 		(property "Description" "Resistor, US symbol"
-			(at 266.7 63.5 0)
+			(at 266.7 72.39 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -13789,10 +13771,9 @@
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
 		(uuid "63630dcb-5a33-4a03-8c73-d7f7dcc49676")
 		(property "Reference" "R12"
-			(at 370.84 82.5499 0)
+			(at 370.332 82.55 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -13800,8 +13781,8 @@
 				(justify left)
 			)
 		)
-		(property "Value" "R_US"
-			(at 370.84 85.0899 0)
+		(property "Value" "10k"
+			(at 370.332 85.09 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -13809,7 +13790,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Resistor_SMD:R_0603_1608Metric"
 			(at 369.316 84.074 90)
 			(effects
 				(font
@@ -14204,100 +14185,6 @@
 		)
 	)
 	(symbol
-		(lib_id "Connector:Conn_ARM_JTAG_SWD_10")
-		(at 241.3 203.2 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "76c91561-fb53-49b4-aaf2-fbaf21222aff")
-		(property "Reference" "J8"
-			(at 229.87 201.9299 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify right)
-			)
-		)
-		(property "Value" "SWD"
-			(at 229.87 204.4699 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify right)
-			)
-		)
-		(property "Footprint" ""
-			(at 241.3 203.2 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "http://infocenter.arm.com/help/topic/com.arm.doc.ddi0314h/DDI0314H_coresight_components_trm.pdf"
-			(at 232.41 234.95 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Cortex Debug Connector, standard ARM Cortex-M SWD and JTAG interface"
-			(at 241.3 203.2 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "5"
-			(uuid "e45dc236-4035-407b-b366-4b892ffbb029")
-		)
-		(pin "8"
-			(uuid "2964d248-1161-44d7-88cc-8f3769a5f1a5")
-		)
-		(pin "1"
-			(uuid "b7699bb8-e9a2-4e6a-b412-c2de944c9a87")
-		)
-		(pin "2"
-			(uuid "3be4c689-ccf1-4591-8b92-3cfe70c7ca3f")
-		)
-		(pin "3"
-			(uuid "ea51eb72-164c-466c-ab61-ad00bc8e2d62")
-		)
-		(pin "4"
-			(uuid "da03d414-6df6-4b01-89ad-9de2f6abd260")
-		)
-		(pin "10"
-			(uuid "39cead49-6dcb-45dd-99d9-23408ef017dd")
-		)
-		(pin "7"
-			(uuid "046188bb-b9d9-4d55-9edd-030ac3bdcd23")
-		)
-		(pin "9"
-			(uuid "995307e6-16a8-4ab6-9374-99727a157b05")
-		)
-		(pin "6"
-			(uuid "fccbb3ac-c728-4593-9fb5-00db6996c80a")
-		)
-		(instances
-			(project ""
-				(path "/11aaed46-be21-4424-b899-cb4c1a8c3e5f"
-					(reference "J8")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
 		(lib_id "Device:C")
 		(at 304.8 38.1 0)
 		(unit 1)
@@ -16665,7 +16552,7 @@
 				)
 			)
 		)
-		(property "Footprint" ""
+		(property "Footprint" "Capacitor_SMD:C_0402_1005Metric"
 			(at 251.46 183.1848 0)
 			(effects
 				(font
@@ -16932,7 +16819,7 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "LQFP48_STM"
+		(property "Footprint" "footprints:LQFP48_STM"
 			(at 285.75 55.88 0)
 			(effects
 				(font