hw: switch to ics43434

1 files changed, 185 insertions, 346 deletions

diff --git a/hw/mcu.kicad_sch b/hw/mcu.kicad_sch
index 6a14ec5..ad3ca8f 100644
--- a/hw/mcu.kicad_sch
+++ b/hw/mcu.kicad_sch
@@ -1014,127 +1014,6 @@
 				)
 			)
 		)
-		(symbol "Device:NetTie_2"
-			(pin_numbers hide)
-			(pin_names
-				(offset 0) hide)
-			(exclude_from_sim no)
-			(in_bom no)
-			(on_board yes)
-			(property "Reference" "NT"
-				(at 0 1.27 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-				)
-			)
-			(property "Value" "NetTie_2"
-				(at 0 -1.27 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-				)
-			)
-			(property "Footprint" ""
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Datasheet" "~"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "Description" "Net tie, 2 pins"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_keywords" "net tie short"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(property "ki_fp_filters" "Net*Tie*"
-				(at 0 0 0)
-				(effects
-					(font
-						(size 1.27 1.27)
-					)
-					(hide yes)
-				)
-			)
-			(symbol "NetTie_2_0_1"
-				(polyline
-					(pts
-						(xy -1.27 0) (xy 1.27 0)
-					)
-					(stroke
-						(width 0.254)
-						(type default)
-					)
-					(fill
-						(type none)
-					)
-				)
-			)
-			(symbol "NetTie_2_1_1"
-				(pin passive line
-					(at -2.54 0 0)
-					(length 2.54)
-					(name "1"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "1"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-				(pin passive line
-					(at 2.54 0 180)
-					(length 2.54)
-					(name "2"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-					(number "2"
-						(effects
-							(font
-								(size 1.27 1.27)
-							)
-						)
-					)
-				)
-			)
-		)
 		(symbol "Device:R_US"
 			(pin_numbers hide)
 			(pin_names
@@ -3257,10 +3136,6 @@
 		(uuid "fd78901f-cca0-4fc3-a808-186c4316e0d3")
 	)
 	(no_connect
-		(at 168.275 106.68)
-		(uuid "03a34023-c99d-45c4-bbd8-0d59dc2a8fb7")
-	)
-	(no_connect
 		(at 168.275 96.52)
 		(uuid "1d7ebfb4-a148-468e-8586-5953f18f66f5")
 	)
@@ -3575,7 +3450,7 @@
 	)
 	(wire
 		(pts
-			(xy 153.67 173.99) (xy 153.67 181.61)
+			(xy 156.845 173.99) (xy 156.845 181.61)
 		)
 		(stroke
 			(width 0)
@@ -3705,7 +3580,17 @@
 	)
 	(wire
 		(pts
-			(xy 143.51 173.99) (xy 143.51 181.61)
+			(xy 169.545 106.68) (xy 168.275 106.68)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "3f79985d-1b2c-4a92-87ed-6cf86a698744")
+	)
+	(wire
+		(pts
+			(xy 146.685 173.99) (xy 146.685 181.61)
 		)
 		(stroke
 			(width 0)
@@ -3775,6 +3660,16 @@
 	)
 	(wire
 		(pts
+			(xy 131.445 173.99) (xy 131.445 181.61)
+		)
+		(stroke
+			(width 0)
+			(type default)
+		)
+		(uuid "54c290a4-fe8d-4363-acb0-4e5ece88f5d9")
+	)
+	(wire
+		(pts
 			(xy 169.545 43.18) (xy 168.275 43.18)
 		)
 		(stroke
@@ -3915,7 +3810,7 @@
 	)
 	(wire
 		(pts
-			(xy 185.42 173.99) (xy 185.42 181.61)
+			(xy 188.595 173.99) (xy 188.595 181.61)
 		)
 		(stroke
 			(width 0)
@@ -3965,33 +3860,33 @@
 	)
 	(wire
 		(pts
-			(xy 61.595 133.985) (xy 61.595 139.065)
+			(xy 146.05 147.955) (xy 152.4 147.955)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "8e3cb967-7185-4e7b-93e6-a9d2fd099d1f")
+		(uuid "8ad70c9f-8b7d-42ee-a4ef-e58ca64e1044")
 	)
 	(wire
 		(pts
-			(xy 126.365 173.99) (xy 126.365 181.61)
+			(xy 61.595 133.985) (xy 61.595 139.065)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "8f5349e4-17a4-400b-b827-0e63ed3bcba1")
+		(uuid "8e3cb967-7185-4e7b-93e6-a9d2fd099d1f")
 	)
 	(wire
 		(pts
-			(xy 152.4 147.955) (xy 144.78 147.955)
+			(xy 126.365 173.99) (xy 126.365 181.61)
 		)
 		(stroke
 			(width 0)
 			(type default)
 		)
-		(uuid "8f8f673f-5845-4af2-81f2-9b84fe5e0133")
+		(uuid "8f5349e4-17a4-400b-b827-0e63ed3bcba1")
 	)
 	(bus
 		(pts
@@ -4045,7 +3940,7 @@
 	)
 	(wire
 		(pts
-			(xy 180.34 173.99) (xy 180.34 181.61)
+			(xy 183.515 173.99) (xy 183.515 181.61)
 		)
 		(stroke
 			(width 0)
@@ -4145,7 +4040,7 @@
 	)
 	(wire
 		(pts
-			(xy 148.59 173.99) (xy 148.59 181.61)
+			(xy 151.765 173.99) (xy 151.765 181.61)
 		)
 		(stroke
 			(width 0)
@@ -4165,17 +4060,7 @@
 	)
 	(wire
 		(pts
-			(xy 139.7 147.955) (xy 137.795 147.955)
-		)
-		(stroke
-			(width 0)
-			(type default)
-		)
-		(uuid "af70c41d-2af5-47c8-967d-47a4af59c33b")
-	)
-	(wire
-		(pts
-			(xy 190.5 173.99) (xy 190.5 181.61)
+			(xy 193.675 173.99) (xy 193.675 181.61)
 		)
 		(stroke
 			(width 0)
@@ -4185,7 +4070,7 @@
 	)
 	(wire
 		(pts
-			(xy 175.26 173.99) (xy 175.26 181.61)
+			(xy 178.435 173.99) (xy 178.435 181.61)
 		)
 		(stroke
 			(width 0)
@@ -4305,7 +4190,7 @@
 	)
 	(wire
 		(pts
-			(xy 158.75 173.99) (xy 158.75 181.61)
+			(xy 161.925 173.99) (xy 161.925 181.61)
 		)
 		(stroke
 			(width 0)
@@ -4324,8 +4209,8 @@
 		(uuid "fc49c1c8-0051-48da-8237-4f936ae14481")
 	)
 	(rectangle
-		(start 168.91 156.845)
-		(end 194.945 184.785)
+		(start 172.085 156.845)
+		(end 198.12 184.785)
 		(stroke
 			(width 0)
 			(type default)
@@ -4336,8 +4221,8 @@
 		(uuid 2cbfae4a-78cb-40dc-8351-3d17c1867c13)
 	)
 	(rectangle
-		(start 137.16 156.845)
-		(end 165.1 184.785)
+		(start 140.335 156.845)
+		(end 168.275 184.785)
 		(stroke
 			(width 0)
 			(type default)
@@ -4457,7 +4342,7 @@
 	)
 	(rectangle
 		(start 116.205 156.845)
-		(end 132.715 184.785)
+		(end 136.525 184.785)
 		(stroke
 			(width 0)
 			(type default)
@@ -4513,7 +4398,7 @@
 	)
 	(text "lsm spi testpoints"
 		(exclude_from_sim no)
-		(at 168.91 155.575 0)
+		(at 172.085 155.575 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -4568,7 +4453,7 @@
 	)
 	(text "sd spi testpoints"
 		(exclude_from_sim no)
-		(at 137.16 155.575 0)
+		(at 140.335 155.575 0)
 		(effects
 			(font
 				(size 1.27 1.27)
@@ -4709,6 +4594,17 @@
 		)
 		(uuid "1143444c-1785-4663-b131-f760b9f8f28a")
 	)
+	(label "WS"
+		(at 169.545 106.68 0)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left)
+		)
+		(uuid "12450f18-0a27-4638-9d64-c3788cac7aa2")
+	)
 	(label "STATUS_OTHER"
 		(at 169.545 48.26 0)
 		(fields_autoplaced yes)
@@ -4787,7 +4683,7 @@
 		(uuid "2726ac66-282e-4eb5-b989-cbc99ff573dd")
 	)
 	(label "SD.MOSI"
-		(at 143.51 181.61 90)
+		(at 146.685 181.61 90)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -4830,6 +4726,17 @@
 		)
 		(uuid "3380ed00-f737-4909-a1f4-2cfc33f403eb")
 	)
+	(label "WS"
+		(at 131.445 181.61 90)
+		(fields_autoplaced yes)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+			(justify left bottom)
+		)
+		(uuid "39d28d13-1bef-4fcf-9619-66dc1d1f96b9")
+	)
 	(label "QSPI_SD_{2}"
 		(at 117.475 71.12 180)
 		(fields_autoplaced yes)
@@ -4842,7 +4749,7 @@
 		(uuid "3c9f016e-f8e7-4368-877b-7d46872fba6e")
 	)
 	(label "LSM.~{CS}"
-		(at 175.26 181.61 90)
+		(at 178.435 181.61 90)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -4875,7 +4782,7 @@
 		(uuid "439f6210-0b9a-42ff-b88d-7406feae5212")
 	)
 	(label "LSM.MOSI"
-		(at 180.34 181.61 90)
+		(at 183.515 181.61 90)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -4974,7 +4881,7 @@
 		(uuid "5ba43cbf-2d47-4793-9931-8d818c2bd901")
 	)
 	(label "LSM.MISO"
-		(at 185.42 181.61 90)
+		(at 188.595 181.61 90)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -5106,7 +5013,7 @@
 		(uuid "7eb9c6ff-5122-46fe-86e3-431ad9d1ca59")
 	)
 	(label "LSM.SCK"
-		(at 190.5 181.61 90)
+		(at 193.675 181.61 90)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -5227,7 +5134,7 @@
 		(uuid "ab1bfbce-cadb-4803-a297-72a30729ab2a")
 	)
 	(label "SD.SCK"
-		(at 153.67 181.61 90)
+		(at 156.845 181.61 90)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -5260,7 +5167,7 @@
 		(uuid "b50e2172-912a-468f-8d05-9fc79c6f6ad6")
 	)
 	(label "SD.MISO"
-		(at 148.59 181.61 90)
+		(at 151.765 181.61 90)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -5315,7 +5222,7 @@
 		(uuid "c8efc70f-726a-4943-b5ac-b440dbfdeb1e")
 	)
 	(label "SD.~{CS}"
-		(at 158.75 181.61 90)
+		(at 161.925 181.61 90)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -5671,7 +5578,7 @@
 	)
 	(symbol
 		(lib_id "Connector:TestPoint")
-		(at 158.75 173.99 0)
+		(at 161.925 173.99 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom no)
@@ -5679,7 +5586,7 @@
 		(dnp no)
 		(uuid "04b3872d-9af8-44ef-87f5-0de33dff2347")
 		(property "Reference" "TP11"
-			(at 157.734 168.656 90)
+			(at 160.909 168.656 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5688,7 +5595,7 @@
 			)
 		)
 		(property "Value" "TestPoint"
-			(at 159.766 168.656 90)
+			(at 162.941 168.656 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5697,7 +5604,7 @@
 			)
 		)
 		(property "Footprint" "TestPoint:TestPoint_Pad_D0.75mm"
-			(at 163.83 173.99 0)
+			(at 167.005 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5706,7 +5613,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 163.83 173.99 0)
+			(at 167.005 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5715,7 +5622,7 @@
 			)
 		)
 		(property "Description" "test point"
-			(at 158.75 173.99 0)
+			(at 161.925 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5821,7 +5728,7 @@
 	)
 	(symbol
 		(lib_id "Connector:TestPoint")
-		(at 190.5 173.99 0)
+		(at 193.675 173.99 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom no)
@@ -5829,7 +5736,7 @@
 		(dnp no)
 		(uuid "0a1bd8d4-6251-4ca6-a474-e3df322d8f52")
 		(property "Reference" "TP17"
-			(at 189.484 168.656 90)
+			(at 192.659 168.656 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5838,7 +5745,7 @@
 			)
 		)
 		(property "Value" "TestPoint"
-			(at 191.516 168.656 90)
+			(at 194.691 168.656 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5847,7 +5754,7 @@
 			)
 		)
 		(property "Footprint" "TestPoint:TestPoint_Pad_D0.75mm"
-			(at 195.58 173.99 0)
+			(at 198.755 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5856,7 +5763,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 195.58 173.99 0)
+			(at 198.755 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -5865,7 +5772,7 @@
 			)
 		)
 		(property "Description" "test point"
-			(at 190.5 173.99 0)
+			(at 193.675 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6499,7 +6406,7 @@
 	)
 	(symbol
 		(lib_id "Connector:TestPoint")
-		(at 153.67 173.99 0)
+		(at 156.845 173.99 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom no)
@@ -6507,7 +6414,7 @@
 		(dnp no)
 		(uuid "1a56c14b-86d7-4cdd-8853-01230e3860f3")
 		(property "Reference" "TP9"
-			(at 152.654 168.656 90)
+			(at 155.829 168.656 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6516,7 +6423,7 @@
 			)
 		)
 		(property "Value" "TestPoint"
-			(at 154.686 168.656 90)
+			(at 157.861 168.656 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6525,7 +6432,7 @@
 			)
 		)
 		(property "Footprint" "TestPoint:TestPoint_Pad_D0.75mm"
-			(at 158.75 173.99 0)
+			(at 161.925 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6534,7 +6441,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 158.75 173.99 0)
+			(at 161.925 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6543,7 +6450,7 @@
 			)
 		)
 		(property "Description" "test point"
-			(at 153.67 173.99 0)
+			(at 156.845 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6789,7 +6696,7 @@
 	)
 	(symbol
 		(lib_id "Connector:TestPoint")
-		(at 185.42 173.99 0)
+		(at 188.595 173.99 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom no)
@@ -6797,7 +6704,7 @@
 		(dnp no)
 		(uuid "2e160231-2ac8-442f-a78a-307f60150844")
 		(property "Reference" "TP16"
-			(at 184.404 168.656 90)
+			(at 187.579 168.656 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6806,7 +6713,7 @@
 			)
 		)
 		(property "Value" "TestPoint"
-			(at 186.436 168.656 90)
+			(at 189.611 168.656 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6815,7 +6722,7 @@
 			)
 		)
 		(property "Footprint" "TestPoint:TestPoint_Pad_D0.75mm"
-			(at 190.5 173.99 0)
+			(at 193.675 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6824,7 +6731,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 190.5 173.99 0)
+			(at 193.675 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -6833,7 +6740,7 @@
 			)
 		)
 		(property "Description" "test point"
-			(at 185.42 173.99 0)
+			(at 188.595 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -8312,72 +8219,6 @@
 		)
 	)
 	(symbol
-		(lib_id "power:+3V3")
-		(at 137.795 147.955 90)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(uuid "6244a47e-99a9-4950-996b-12118162ceac")
-		(property "Reference" "#PWR062"
-			(at 141.605 147.955 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Value" "+3V3"
-			(at 134.62 147.955 90)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(justify left)
-			)
-		)
-		(property "Footprint" ""
-			(at 137.795 147.955 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" ""
-			(at 137.795 147.955 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Power symbol creates a global label with name \"+3V3\""
-			(at 137.795 147.955 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "52575bbf-bb71-4f6c-aacc-b65451594b10")
-		)
-		(instances
-			(project "ocularium"
-				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/3d7259a5-6f85-4a01-8434-622bdcc29333"
-					(reference "#PWR062")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
 		(lib_id "power:+1V1")
 		(at 137.795 33.655 0)
 		(unit 1)
@@ -10496,7 +10337,7 @@
 	)
 	(symbol
 		(lib_id "Connector:TestPoint")
-		(at 175.26 173.99 0)
+		(at 178.435 173.99 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom no)
@@ -10504,7 +10345,7 @@
 		(dnp no)
 		(uuid "b292acb9-65e3-46f4-9b85-51d50b9e45d8")
 		(property "Reference" "TP10"
-			(at 174.244 168.656 90)
+			(at 177.419 168.656 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -10513,7 +10354,7 @@
 			)
 		)
 		(property "Value" "TestPoint"
-			(at 176.276 168.656 90)
+			(at 179.451 168.656 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -10522,7 +10363,7 @@
 			)
 		)
 		(property "Footprint" "TestPoint:TestPoint_Pad_D0.75mm"
-			(at 180.34 173.99 0)
+			(at 183.515 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -10531,7 +10372,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 180.34 173.99 0)
+			(at 183.515 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -10540,7 +10381,7 @@
 			)
 		)
 		(property "Description" "test point"
-			(at 175.26 173.99 0)
+			(at 178.435 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11158,7 +10999,7 @@
 	)
 	(symbol
 		(lib_id "Connector:TestPoint")
-		(at 180.34 173.99 0)
+		(at 183.515 173.99 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom no)
@@ -11166,7 +11007,7 @@
 		(dnp no)
 		(uuid "bf63e60d-6373-4a26-947b-78840a5cfc8c")
 		(property "Reference" "TP15"
-			(at 179.324 168.656 90)
+			(at 182.499 168.656 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11175,7 +11016,7 @@
 			)
 		)
 		(property "Value" "TestPoint"
-			(at 181.356 168.656 90)
+			(at 184.531 168.656 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11184,7 +11025,7 @@
 			)
 		)
 		(property "Footprint" "TestPoint:TestPoint_Pad_D0.75mm"
-			(at 185.42 173.99 0)
+			(at 188.595 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11193,7 +11034,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 185.42 173.99 0)
+			(at 188.595 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11202,7 +11043,7 @@
 			)
 		)
 		(property "Description" "test point"
-			(at 180.34 173.99 0)
+			(at 183.515 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11552,7 +11393,7 @@
 	)
 	(symbol
 		(lib_id "Connector:TestPoint")
-		(at 148.59 173.99 0)
+		(at 151.765 173.99 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom no)
@@ -11560,7 +11401,7 @@
 		(dnp no)
 		(uuid "c723110f-e60e-4a99-8f55-526e639b6a61")
 		(property "Reference" "TP8"
-			(at 147.574 168.656 90)
+			(at 150.749 168.656 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11569,7 +11410,7 @@
 			)
 		)
 		(property "Value" "TestPoint"
-			(at 149.606 168.656 90)
+			(at 152.781 168.656 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11578,7 +11419,7 @@
 			)
 		)
 		(property "Footprint" "TestPoint:TestPoint_Pad_D0.75mm"
-			(at 153.67 173.99 0)
+			(at 156.845 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11587,7 +11428,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 153.67 173.99 0)
+			(at 156.845 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11596,7 +11437,7 @@
 			)
 		)
 		(property "Description" "test point"
-			(at 148.59 173.99 0)
+			(at 151.765 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11815,76 +11656,8 @@
 		)
 	)
 	(symbol
-		(lib_id "Device:NetTie_2")
-		(at 142.24 147.955 0)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom no)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "cb68c8e4-d2db-4f6d-a777-97ecf6497e4f")
-		(property "Reference" "NT1"
-			(at 142.24 143.51 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Value" "NetTie_2"
-			(at 142.24 146.05 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Footprint" "NetTie:NetTie-2_SMD_Pad0.5mm"
-			(at 142.24 147.955 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 142.24 147.955 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Net tie, 2 pins"
-			(at 142.24 147.955 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "cd963148-ffc8-413f-bd1c-1d0efc78c342")
-		)
-		(pin "2"
-			(uuid "75c22a64-1736-4fec-9d32-f3e41e3b00e2")
-		)
-		(instances
-			(project ""
-				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/3d7259a5-6f85-4a01-8434-622bdcc29333"
-					(reference "NT1")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
 		(lib_id "Connector:TestPoint")
-		(at 143.51 173.99 0)
+		(at 146.685 173.99 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom no)
@@ -11892,7 +11665,7 @@
 		(dnp no)
 		(uuid "ccc8fbc0-ecd6-4eeb-886f-4db5fcdad0b6")
 		(property "Reference" "TP7"
-			(at 142.494 168.656 90)
+			(at 145.669 168.656 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11901,7 +11674,7 @@
 			)
 		)
 		(property "Value" "TestPoint"
-			(at 144.526 168.656 90)
+			(at 147.701 168.656 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11910,7 +11683,7 @@
 			)
 		)
 		(property "Footprint" "TestPoint:TestPoint_Pad_D0.75mm"
-			(at 148.59 173.99 0)
+			(at 151.765 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11919,7 +11692,7 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 148.59 173.99 0)
+			(at 151.765 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -11928,7 +11701,7 @@
 			)
 		)
 		(property "Description" "test point"
-			(at 143.51 173.99 0)
+			(at 146.685 173.99 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -12525,6 +12298,72 @@
 		)
 	)
 	(symbol
+		(lib_id "Connector:TestPoint")
+		(at 131.445 173.99 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom no)
+		(on_board yes)
+		(dnp no)
+		(uuid "e1653e1f-cd1c-4862-b5aa-94ebfb9bf1b5")
+		(property "Reference" "TP2"
+			(at 130.429 168.656 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Value" "TestPoint"
+			(at 132.461 168.656 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" "TestPoint:TestPoint_Pad_D0.75mm"
+			(at 136.525 173.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 136.525 173.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "test point"
+			(at 131.445 173.99 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "70918148-8a97-42e6-847e-3ecaf1b93031")
+		)
+		(instances
+			(project "ocularium"
+				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/3d7259a5-6f85-4a01-8434-622bdcc29333"
+					(reference "TP2")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
 		(lib_id "Device:R_US")
 		(at 214.63 162.56 0)
 		(unit 1)