test points -> 1mm header, 25mm mounting holes, draft board relayout

1 files changed, 696 insertions, 181 deletions

diff --git a/power.kicad_sch b/power.kicad_sch
index 304dc1c..b3e7e37 100644
--- a/power.kicad_sch
+++ b/power.kicad_sch
@@ -5,23 +5,22 @@
 	(uuid "f1cb1634-8a40-4d44-8c8b-96256b1bc2a1")
 	(paper "A4")
 	(lib_symbols
-		(symbol "Connector:TestPoint"
-			(pin_numbers hide)
+		(symbol "Connector_Generic:Conn_02x02_Odd_Even"
 			(pin_names
-				(offset 0.762) hide)
+				(offset 1.016) hide)
 			(exclude_from_sim no)
 			(in_bom yes)
 			(on_board yes)
-			(property "Reference" "TP"
-				(at 0 6.858 0)
+			(property "Reference" "J"
+				(at 1.27 2.54 0)
 				(effects
 					(font
 						(size 1.27 1.27)
 					)
 				)
 			)
-			(property "Value" "TestPoint"
-				(at 0 5.08 0)
+			(property "Value" "Conn_02x02_Odd_Even"
+				(at 1.27 -5.08 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -29,7 +28,7 @@
 				)
 			)
 			(property "Footprint" ""
-				(at 5.08 0 0)
+				(at 0 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -38,7 +37,7 @@
 				)
 			)
 			(property "Datasheet" "~"
-				(at 5.08 0 0)
+				(at 0 0 0)
 				(effects
 					(font
 						(size 1.27 1.27)
@@ -46,7 +45,7 @@
 					(hide yes)
 				)
 			)
-			(property "Description" "test point"
+			(property "Description" "Generic connector, double row, 02x02, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)"
 				(at 0 0 0)
 				(effects
 					(font
@@ -55,7 +54,7 @@
 					(hide yes)
 				)
 			)
-			(property "ki_keywords" "test point tp"
+			(property "ki_keywords" "connector"
 				(at 0 0 0)
 				(effects
 					(font
@@ -64,7 +63,7 @@
 					(hide yes)
 				)
 			)
-			(property "ki_fp_filters" "Pin* Test*"
+			(property "ki_fp_filters" "Connector*:*_2x??_*"
 				(at 0 0 0)
 				(effects
 					(font
@@ -73,24 +72,66 @@
 					(hide yes)
 				)
 			)
-			(symbol "TestPoint_0_1"
-				(circle
-					(center 0 3.302)
-					(radius 0.762)
+			(symbol "Conn_02x02_Odd_Even_1_1"
+				(rectangle
+					(start -1.27 -2.413)
+					(end 0 -2.667)
 					(stroke
-						(width 0)
+						(width 0.1524)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(rectangle
+					(start -1.27 0.127)
+					(end 0 -0.127)
+					(stroke
+						(width 0.1524)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(rectangle
+					(start -1.27 1.27)
+					(end 3.81 -3.81)
+					(stroke
+						(width 0.254)
+						(type default)
+					)
+					(fill
+						(type background)
+					)
+				)
+				(rectangle
+					(start 3.81 -2.413)
+					(end 2.54 -2.667)
+					(stroke
+						(width 0.1524)
+						(type default)
+					)
+					(fill
+						(type none)
+					)
+				)
+				(rectangle
+					(start 3.81 0.127)
+					(end 2.54 -0.127)
+					(stroke
+						(width 0.1524)
 						(type default)
 					)
 					(fill
 						(type none)
 					)
 				)
-			)
-			(symbol "TestPoint_1_1"
 				(pin passive line
-					(at 0 0 90)
-					(length 2.54)
-					(name "1"
+					(at -5.08 0 0)
+					(length 3.81)
+					(name "Pin_1"
 						(effects
 							(font
 								(size 1.27 1.27)
@@ -105,6 +146,60 @@
 						)
 					)
 				)
+				(pin passive line
+					(at 7.62 0 180)
+					(length 3.81)
+					(name "Pin_2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "2"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at -5.08 -2.54 0)
+					(length 3.81)
+					(name "Pin_3"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "3"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
+				(pin passive line
+					(at 7.62 -2.54 180)
+					(length 3.81)
+					(name "Pin_4"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+					(number "4"
+						(effects
+							(font
+								(size 1.27 1.27)
+							)
+						)
+					)
+				)
 			)
 		)
 		(symbol "Device:Battery"
@@ -2384,6 +2479,73 @@
 		)
 	)
 	(symbol
+		(lib_id "power:GND")
+		(at 250.19 111.76 270)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "0249b502-7c5d-4ecd-8f64-eaf05c1dcc6c")
+		(property "Reference" "#PWR051"
+			(at 243.84 111.76 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 246.38 111.7599 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(property "Footprint" ""
+			(at 250.19 111.76 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 250.19 111.76 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 250.19 111.76 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "c359da7d-4923-4c82-b874-06cced371af6")
+		)
+		(instances
+			(project "okm"
+				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/8d043209-9840-493a-a9a2-77fbefbf7130"
+					(reference "#PWR051")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
 		(lib_id "power:+5V")
 		(at 119.38 86.36 0)
 		(unit 1)
@@ -2653,6 +2815,147 @@
 		)
 	)
 	(symbol
+		(lib_id "power:GND")
+		(at 262.89 97.79 90)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "11ba8726-18a0-4337-83d4-5bdcd1561df9")
+		(property "Reference" "#PWR031"
+			(at 269.24 97.79 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 266.7 97.7899 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(property "Footprint" ""
+			(at 262.89 97.79 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 262.89 97.79 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 262.89 97.79 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "decaf004-d446-4c1a-8320-7690e191509c")
+		)
+		(instances
+			(project "okm"
+				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/8d043209-9840-493a-a9a2-77fbefbf7130"
+					(reference "#PWR031")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Connector_Generic:Conn_02x02_Odd_Even")
+		(at 255.27 95.25 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "11cfe355-d430-40c7-a5ba-7c1a595a70e9")
+		(property "Reference" "J6"
+			(at 256.54 88.9 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "TP_POWER"
+			(at 256.54 91.44 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" "Connector_PinHeader_1.00mm:PinHeader_2x02_P1.00mm_Vertical"
+			(at 255.27 95.25 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 255.27 95.25 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Generic connector, double row, 02x02, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)"
+			(at 255.27 95.25 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "3"
+			(uuid "f5bdc1cc-73a1-4017-8abb-175c0b911c4a")
+		)
+		(pin "4"
+			(uuid "3bf7d683-8255-4fbf-ba8d-b72ba765b6d7")
+		)
+		(pin "1"
+			(uuid "4654eb0d-c12a-4262-8e33-ef703a8526bd")
+		)
+		(pin "2"
+			(uuid "08c26f76-2fd8-4aee-b9cc-f6d48d09b8c2")
+		)
+		(instances
+			(project "okm"
+				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/8d043209-9840-493a-a9a2-77fbefbf7130"
+					(reference "J6")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
 		(lib_id "Device:Battery")
 		(at 195.58 100.33 0)
 		(unit 1)
@@ -2858,25 +3161,26 @@
 		)
 	)
 	(symbol
-		(lib_id "Connector:TestPoint")
-		(at 243.84 97.79 0)
+		(lib_id "power:+3V3")
+		(at 250.19 97.79 90)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "2bedf4e6-3d14-4ff5-b843-5b69aca35dcf")
-		(property "Reference" "TP5"
-			(at 243.84 92.964 90)
+		(fields_autoplaced yes)
+		(uuid "1f7d7694-7577-4b6e-967c-78eb4e7b3ab7")
+		(property "Reference" "#PWR032"
+			(at 254 97.79 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
+				(hide yes)
 			)
 		)
-		(property "Value" "GND"
-			(at 243.84 88.138 90)
+		(property "Value" "+3V3"
+			(at 246.38 97.7899 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2884,8 +3188,73 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "TestPoint:TestPoint_Loop_D2.50mm_Drill1.0mm"
-			(at 248.92 97.79 0)
+		(property "Footprint" ""
+			(at 250.19 97.79 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 250.19 97.79 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"+3V3\""
+			(at 250.19 97.79 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "d790f773-9aee-4851-b3ef-9def06993552")
+		)
+		(instances
+			(project "okm"
+				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/8d043209-9840-493a-a9a2-77fbefbf7130"
+					(reference "#PWR032")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "Connector_Generic:Conn_02x02_Odd_Even")
+		(at 255.27 111.76 0)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "32b81554-ffea-4569-a88d-2f5a564f5117")
+		(property "Reference" "J7"
+			(at 256.54 105.41 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "TP_GND"
+			(at 256.54 107.95 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" "Connector_PinHeader_1.00mm:PinHeader_2x02_P1.00mm_Vertical"
+			(at 255.27 111.76 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2894,7 +3263,56 @@
 			)
 		)
 		(property "Datasheet" "~"
-			(at 248.92 97.79 0)
+			(at 255.27 111.76 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Generic connector, double row, 02x02, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)"
+			(at 255.27 111.76 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "3"
+			(uuid "3e86bcb2-d1ac-4084-9549-0ae4dd938dc9")
+		)
+		(pin "4"
+			(uuid "444f0f47-dc7a-434a-9c76-9464d92530e3")
+		)
+		(pin "1"
+			(uuid "d2d93955-012e-4158-8ad2-37cfeb723429")
+		)
+		(pin "2"
+			(uuid "17cd7c6e-f6de-41ed-9ae6-e2d5058557b7")
+		)
+		(instances
+			(project "okm"
+				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/8d043209-9840-493a-a9a2-77fbefbf7130"
+					(reference "J7")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "power:+3V0")
+		(at 250.19 95.25 90)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "4af89115-4c9e-4903-bfcd-a084762d325f")
+		(property "Reference" "#PWR037"
+			(at 254 95.25 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2902,8 +3320,35 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "test point"
-			(at 243.84 97.79 0)
+		(property "Value" "VBAT"
+			(at 246.38 95.2499 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify left)
+			)
+		)
+		(property "Footprint" ""
+			(at 250.19 95.25 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 250.19 95.25 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"+3V0\""
+			(at 250.19 95.25 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -2912,12 +3357,12 @@
 			)
 		)
 		(pin "1"
-			(uuid "f3a3ff84-4e49-451a-941f-060d176d6ccc")
+			(uuid "29532877-c8b7-464f-a5f7-2129bf82fbf5")
 		)
 		(instances
 			(project "okm"
 				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/8d043209-9840-493a-a9a2-77fbefbf7130"
-					(reference "TP5")
+					(reference "#PWR037")
 					(unit 1)
 				)
 			)
@@ -3127,6 +3572,73 @@
 	)
 	(symbol
 		(lib_id "power:GND")
+		(at 262.89 111.76 90)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "81991bb4-0675-4a5f-b278-cb1bd44702d7")
+		(property "Reference" "#PWR049"
+			(at 269.24 111.76 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 266.7 111.7599 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(property "Footprint" ""
+			(at 262.89 111.76 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 262.89 111.76 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 262.89 111.76 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "b550009a-72a2-443e-8152-49326fe89347")
+		)
+		(instances
+			(project "okm"
+				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/8d043209-9840-493a-a9a2-77fbefbf7130"
+					(reference "#PWR049")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
+		(lib_id "power:GND")
 		(at 195.58 114.3 0)
 		(unit 1)
 		(exclude_from_sim no)
@@ -3426,72 +3938,6 @@
 		)
 	)
 	(symbol
-		(lib_id "power:+3V3")
-		(at 238.76 97.79 180)
-		(unit 1)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "9467e6de-2564-4c48-b9c5-99a94fa733ac")
-		(property "Reference" "#PWR032"
-			(at 238.76 93.98 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Value" "+3V3"
-			(at 238.76 102.87 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Footprint" ""
-			(at 238.76 97.79 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" ""
-			(at 238.76 97.79 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Power symbol creates a global label with name \"+3V3\""
-			(at 238.76 97.79 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(pin "1"
-			(uuid "3819710f-e8fd-46b5-aed2-b37ebec17087")
-		)
-		(instances
-			(project "okm"
-				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/8d043209-9840-493a-a9a2-77fbefbf7130"
-					(reference "#PWR032")
-					(unit 1)
-				)
-			)
-		)
-	)
-	(symbol
 		(lib_id "power:GND")
 		(at 135.89 114.3 0)
 		(unit 1)
@@ -3768,16 +4214,16 @@
 	)
 	(symbol
 		(lib_id "power:GND")
-		(at 243.84 97.79 0)
+		(at 121.92 93.98 270)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
 		(fields_autoplaced yes)
-		(uuid "b28504b8-7376-4f6f-a5e9-d13d0df2b197")
-		(property "Reference" "#PWR031"
-			(at 243.84 104.14 0)
+		(uuid "b8312a2e-ee91-4c8f-8b58-8b905784a20e")
+		(property "Reference" "#PWR05"
+			(at 115.57 93.98 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3786,15 +4232,16 @@
 			)
 		)
 		(property "Value" "GND"
-			(at 243.84 102.87 0)
+			(at 118.11 93.9799 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify right)
 			)
 		)
 		(property "Footprint" ""
-			(at 243.84 97.79 0)
+			(at 121.92 93.98 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3803,7 +4250,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 243.84 97.79 0)
+			(at 121.92 93.98 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3812,7 +4259,7 @@
 			)
 		)
 		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-			(at 243.84 97.79 0)
+			(at 121.92 93.98 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3821,29 +4268,29 @@
 			)
 		)
 		(pin "1"
-			(uuid "b2f870b6-7beb-40bb-a31d-a8e4e02bbf88")
+			(uuid "f8beabd1-24c6-4cdd-a895-a799e3cd9062")
 		)
 		(instances
 			(project "okm"
 				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/8d043209-9840-493a-a9a2-77fbefbf7130"
-					(reference "#PWR031")
+					(reference "#PWR05")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "power:GND")
-		(at 121.92 93.98 270)
+		(lib_id "power:+3V0")
+		(at 195.58 91.44 0)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
 		(fields_autoplaced yes)
-		(uuid "b8312a2e-ee91-4c8f-8b58-8b905784a20e")
-		(property "Reference" "#PWR05"
-			(at 115.57 93.98 0)
+		(uuid "d20117aa-a65f-487c-914c-f53244b61427")
+		(property "Reference" "#PWR06"
+			(at 195.58 95.25 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3851,17 +4298,16 @@
 				(hide yes)
 			)
 		)
-		(property "Value" "GND"
-			(at 118.11 93.9799 90)
+		(property "Value" "VBAT"
+			(at 195.58 86.36 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify right)
 			)
 		)
 		(property "Footprint" ""
-			(at 121.92 93.98 0)
+			(at 195.58 91.44 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3870,7 +4316,7 @@
 			)
 		)
 		(property "Datasheet" ""
-			(at 121.92 93.98 0)
+			(at 195.58 91.44 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3878,8 +4324,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
-			(at 121.92 93.98 0)
+		(property "Description" "Power symbol creates a global label with name \"+3V0\""
+			(at 195.58 91.44 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3888,46 +4334,47 @@
 			)
 		)
 		(pin "1"
-			(uuid "f8beabd1-24c6-4cdd-a895-a799e3cd9062")
+			(uuid "293c3137-d0e0-4bce-98f1-249c1f5df8d9")
 		)
 		(instances
 			(project "okm"
 				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/8d043209-9840-493a-a9a2-77fbefbf7130"
-					(reference "#PWR05")
+					(reference "#PWR06")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "power:+3V0")
-		(at 195.58 91.44 0)
+		(lib_id "Device:R_US")
+		(at 127 105.41 0)
+		(mirror y)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(fields_autoplaced yes)
-		(uuid "d20117aa-a65f-487c-914c-f53244b61427")
-		(property "Reference" "#PWR06"
-			(at 195.58 95.25 0)
+		(uuid "d4602608-7fe8-4210-b1f4-726682da614d")
+		(property "Reference" "R6"
+			(at 124.46 104.1399 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(hide yes)
+				(justify left)
 			)
 		)
-		(property "Value" "VBAT"
-			(at 195.58 86.36 0)
+		(property "Value" "18k"
+			(at 124.46 106.6799 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
+				(justify left)
 			)
 		)
-		(property "Footprint" ""
-			(at 195.58 91.44 0)
+		(property "Footprint" "Resistor_SMD:R_0201_0603Metric"
+			(at 125.984 105.664 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3935,8 +4382,8 @@
 				(hide yes)
 			)
 		)
-		(property "Datasheet" ""
-			(at 195.58 91.44 0)
+		(property "Datasheet" "~"
+			(at 127 105.41 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3944,8 +4391,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Power symbol creates a global label with name \"+3V0\""
-			(at 195.58 91.44 0)
+		(property "Description" "Resistor, US symbol"
+			(at 127 105.41 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3954,37 +4401,41 @@
 			)
 		)
 		(pin "1"
-			(uuid "293c3137-d0e0-4bce-98f1-249c1f5df8d9")
+			(uuid "9d0d347d-04f5-426b-a5f6-3283807fccb6")
+		)
+		(pin "2"
+			(uuid "664f7332-3423-4b31-8a0a-05d8a61bc869")
 		)
 		(instances
 			(project "okm"
 				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/8d043209-9840-493a-a9a2-77fbefbf7130"
-					(reference "#PWR06")
+					(reference "R6")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Connector:TestPoint")
-		(at 238.76 97.79 0)
+		(lib_id "power:+5V")
+		(at 262.89 95.25 270)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "d2d32c3d-73a1-46c2-8652-4c3943f720a6")
-		(property "Reference" "TP4"
-			(at 238.76 92.964 90)
+		(fields_autoplaced yes)
+		(uuid "d6d3fae5-db69-4daa-a848-78ca4d8006bc")
+		(property "Reference" "#PWR036"
+			(at 259.08 95.25 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
+				(hide yes)
 			)
 		)
-		(property "Value" "3V3"
-			(at 238.76 87.884 90)
+		(property "Value" "+VUSB"
+			(at 266.7 95.2499 90)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -3992,8 +4443,8 @@
 				(justify left)
 			)
 		)
-		(property "Footprint" "TestPoint:TestPoint_Pad_D1.0mm"
-			(at 243.84 97.79 0)
+		(property "Footprint" ""
+			(at 262.89 95.25 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4001,8 +4452,8 @@
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "~"
-			(at 243.84 97.79 0)
+		(property "Datasheet" ""
+			(at 262.89 95.25 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4010,8 +4461,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "test point"
-			(at 238.76 97.79 0)
+		(property "Description" "Power symbol creates a global label with name \"+5V\""
+			(at 262.89 95.25 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4020,47 +4471,47 @@
 			)
 		)
 		(pin "1"
-			(uuid "5ecdec7b-620b-4d2a-8757-c40552bfd5d7")
+			(uuid "b87618d8-b306-43ea-9ac7-24a47063a935")
 		)
 		(instances
 			(project "okm"
 				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/8d043209-9840-493a-a9a2-77fbefbf7130"
-					(reference "TP4")
+					(reference "#PWR036")
 					(unit 1)
 				)
 			)
 		)
 	)
 	(symbol
-		(lib_id "Device:R_US")
-		(at 127 105.41 0)
-		(mirror y)
+		(lib_id "power:GND")
+		(at 250.19 114.3 270)
 		(unit 1)
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
 		(dnp no)
-		(uuid "d4602608-7fe8-4210-b1f4-726682da614d")
-		(property "Reference" "R6"
-			(at 124.46 104.1399 0)
+		(fields_autoplaced yes)
+		(uuid "dd320259-5d2b-4fd7-b416-a0791ec00784")
+		(property "Reference" "#PWR050"
+			(at 243.84 114.3 0)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
+				(hide yes)
 			)
 		)
-		(property "Value" "18k"
-			(at 124.46 106.6799 0)
+		(property "Value" "GND"
+			(at 246.38 114.2999 90)
 			(effects
 				(font
 					(size 1.27 1.27)
 				)
-				(justify left)
+				(justify right)
 			)
 		)
-		(property "Footprint" "Resistor_SMD:R_0201_0603Metric"
-			(at 125.984 105.664 90)
+		(property "Footprint" ""
+			(at 250.19 114.3 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4068,8 +4519,8 @@
 				(hide yes)
 			)
 		)
-		(property "Datasheet" "~"
-			(at 127 105.41 0)
+		(property "Datasheet" ""
+			(at 250.19 114.3 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4077,8 +4528,8 @@
 				(hide yes)
 			)
 		)
-		(property "Description" "Resistor, US symbol"
-			(at 127 105.41 0)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 250.19 114.3 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4087,15 +4538,12 @@
 			)
 		)
 		(pin "1"
-			(uuid "9d0d347d-04f5-426b-a5f6-3283807fccb6")
-		)
-		(pin "2"
-			(uuid "664f7332-3423-4b31-8a0a-05d8a61bc869")
+			(uuid "d55d0761-a90f-49b5-ac9a-5734f88824ff")
 		)
 		(instances
 			(project "okm"
 				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/8d043209-9840-493a-a9a2-77fbefbf7130"
-					(reference "R6")
+					(reference "#PWR050")
 					(unit 1)
 				)
 			)
@@ -4370,6 +4818,73 @@
 		)
 	)
 	(symbol
+		(lib_id "power:GND")
+		(at 262.89 114.3 90)
+		(unit 1)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(dnp no)
+		(fields_autoplaced yes)
+		(uuid "f0997e01-78d1-46a2-9a56-8772ddff8f40")
+		(property "Reference" "#PWR052"
+			(at 269.24 114.3 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Value" "GND"
+			(at 266.7 114.2999 90)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(justify right)
+			)
+		)
+		(property "Footprint" ""
+			(at 262.89 114.3 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" ""
+			(at 262.89 114.3 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Power symbol creates a global label with name \"GND\" , ground"
+			(at 262.89 114.3 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(pin "1"
+			(uuid "fe055166-ccd3-4999-a352-be05a813c81c")
+		)
+		(instances
+			(project "okm"
+				(path "/705566ec-a23d-4313-8d6d-05f2a6d488ba/8d043209-9840-493a-a9a2-77fbefbf7130"
+					(reference "#PWR052")
+					(unit 1)
+				)
+			)
+		)
+	)
+	(symbol
 		(lib_id "Device:R_US")
 		(at 86.36 97.79 0)
 		(mirror y)