Correct TP1 and add TP2

Power.sch

@@ -1109,7 +1109,7 @@ F 8 "" H -150 1050 50  0001 C CNN "SPURL"
 	0    1    1    0   
 $EndComp
 $Comp
-L Connector:GS2 JP1
+L mmdvm_hs_dual_hat-rescue:GS2-Connector JP1
 U 1 1 5A9B5613
 P 7800 4100
 F 0 "JP1" H 7800 3950 50  0000 C CNN

mmdvm_hs_dual_hat-cache.lib

@@ -1,24 +1,6 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# Connector:GS2
-#
-DEF Connector:GS2 J 0 40 N N 1 F N
-F0 "J" 100 150 50 H V C CNN
-F1 "Connector:GS2" 100 -149 50 H V C CNN
-F2 "Connectors:GS2" 74 0 50 V I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- GS*
-$ENDFPLIST
-DRAW
-P 4 0 1 0 -40 -10 -40 -100 40 -100 40 -10 F
-P 4 0 1 0 -40 10 -40 100 40 100 40 10 F
-X G1 1 0 200 100 D 50 50 1 1 P
-X G2 2 0 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # adf7021:ADF7021
 #
 DEF adf7021:ADF7021 U 0 40 Y Y 1 F N
@@ -80,19 +62,6 @@ X VDD4 9 -1000 -250 200 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# conn:TEST_1P
-#
-DEF conn:TEST_1P W 0 30 N N 1 F N
-F0 "W" 0 270 50 H V C CNN
-F1 "conn:TEST_1P" 0 200 50 H V C CNN
-F2 "" 200 0 50 H V C CNN
-F3 "" 200 0 50 H V C CNN
-DRAW
-C 0 130 30 0 1 0 N
-X 1 1 0 0 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # mmdvm_hs_dual_hat-rescue:C-device-mmdvm_hs_dual_hat-rescue
 #
 DEF mmdvm_hs_dual_hat-rescue:C-device-mmdvm_hs_dual_hat-rescue C 0 10 N Y 1 F N
@@ -233,6 +202,24 @@ X 2 2 150 0 50 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# mmdvm_hs_dual_hat-rescue:GS2-Connector
+#
+DEF mmdvm_hs_dual_hat-rescue:GS2-Connector J 0 40 N N 1 F N
+F0 "J" 100 150 50 H V C CNN
+F1 "mmdvm_hs_dual_hat-rescue:GS2-Connector" 100 -149 50 H V C CNN
+F2 "Connectors:GS2" 74 0 50 V I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ GS*
+$ENDFPLIST
+DRAW
+P 4 0 1 0 -40 -10 -40 -100 40 -100 40 -10 F
+P 4 0 1 0 -40 10 -40 100 40 100 40 10 F
+X G1 1 0 200 100 D 50 50 1 1 P
+X G2 2 0 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # mmdvm_hs_dual_hat-rescue:L-device-mmdvm_hs_dual_hat-rescue
 #
 DEF mmdvm_hs_dual_hat-rescue:L-device-mmdvm_hs_dual_hat-rescue L 0 40 N N 1 F N
@@ -424,6 +411,19 @@ X VCC 4 -700 150 300 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# mmdvm_hs_dual_hat-rescue:TEST_1P-conn
+#
+DEF mmdvm_hs_dual_hat-rescue:TEST_1P-conn W 0 30 N N 1 F N
+F0 "W" 0 270 50 H V C CNN
+F1 "mmdvm_hs_dual_hat-rescue:TEST_1P-conn" 0 200 50 H V C CNN
+F2 "" 200 0 50 H V C CNN
+F3 "" 200 0 50 H V C CNN
+DRAW
+C 0 130 30 0 1 0 N
+X 1 1 0 0 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # mmdvm_hs_dual_hat-rescue:USB_OTG-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue
 #
 DEF mmdvm_hs_dual_hat-rescue:USB_OTG-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue P 0 40 Y Y 1 F N

mmdvm_hs_dual_hat-rescue.lib

@@ -141,6 +141,24 @@ X 2 2 150 0 50 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# GS2-Connector
+#
+DEF GS2-Connector J 0 40 N N 1 F N
+F0 "J" 100 150 50 H V C CNN
+F1 "GS2-Connector" 100 -149 50 H V C CNN
+F2 "Connectors:GS2" 74 0 50 V I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ GS*
+$ENDFPLIST
+DRAW
+P 4 0 1 0 -40 -10 -40 -100 40 -100 40 -10 F
+P 4 0 1 0 -40 10 -40 100 40 100 40 10 F
+X G1 1 0 200 100 D 50 50 1 1 P
+X G2 2 0 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Jumper-device
 #
 DEF Jumper-device JP 0 30 Y N 1 F N
@@ -348,6 +366,19 @@ X VCC 4 -700 150 300 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# TEST_1P-conn
+#
+DEF TEST_1P-conn W 0 30 N N 1 F N
+F0 "W" 0 270 50 H V C CNN
+F1 "TEST_1P-conn" 0 200 50 H V C CNN
+F2 "" 200 0 50 H V C CNN
+F3 "" 200 0 50 H V C CNN
+DRAW
+C 0 130 30 0 1 0 N
+X 1 1 0 0 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # USB_OTG-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue
 #
 DEF USB_OTG-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue P 0 40 Y Y 1 F N

mmdvm_hs_dual_hat.bak

@@ -2339,7 +2339,7 @@ U 1 1 5AAA77D4
 P 1550 4850
 F 0 "W1" H 1608 5015 50  0000 L CNN
 F 1 "TEST_1P" H 1608 4924 50  0000 L CNN
-F 2 "Connectors_TestPoints:Test_Point_THTPad_1.0x1.0mm_Drill0.5mm" H 1608 4833 50  0000 L CNN
+F 2 "Connectors_TestPoints:Test_Point_Pad_1.0x1.0mm" H 1608 4833 50  0000 L CNN
 F 3 "" H 1750 4850 50  0000 C CNN
 	1    1550 4850
 	1    0    0    -1  

mmdvm_hs_dual_hat.sch

@@ -2314,8 +2314,6 @@ Text GLabel 1450 4500 0    60   Input ~ 0
 SWD_TP2
 Wire Wire Line
 	1450 4500 1550 4500
-Wire Notes Line
-	900  4250 2200 4250
 Text GLabel 5250 6250 2    49   Output ~ 0
 SWD_TP1
 Wire Wire Line
@@ -2326,15 +2324,10 @@ Wire Wire Line
 	1450 4850 1550 4850
 Wire Notes Line
 	2200 5000 900  5000
-Wire Notes Line
-	2200 4250 2200 5000
-Wire Notes Line
-	900  4250 900  5000
-NoConn ~ 1550 4500
-Text Notes 1450 4350 0    60   ~ 0
+Text Notes 1450 4250 0    60   ~ 0
 future testpoint
 $Comp
-L conn:TEST_1P W1
+L mmdvm_hs_dual_hat-rescue:TEST_1P-conn W1
 U 1 1 5AAA77D4
 P 1550 4850
 F 0 "W1" H 1608 5015 50  0000 L CNN
@@ -2344,4 +2337,21 @@ F 3 "" H 1750 4850 50  0000 C CNN
 	1    1550 4850
 	1    0    0    -1  
 $EndComp
+$Comp
+L mmdvm_hs_dual_hat-rescue:TEST_1P-conn W2
+U 1 1 5A9EA804
+P 1550 4500
+F 0 "W2" H 1608 4665 50  0000 L CNN
+F 1 "TEST_1P" H 1608 4574 50  0000 L CNN
+F 2 "Connectors_TestPoints:Test_Point_Pad_1.0x1.0mm" H 1608 4483 50  0000 L CNN
+F 3 "" H 1750 4500 50  0000 C CNN
+	1    1550 4500
+	1    0    0    -1  
+$EndComp
+Wire Notes Line
+	2200 4150 900  4150
+Wire Notes Line
+	2200 4150 2200 5000
+Wire Notes Line
+	900  4150 900  5000
 $EndSCHEMATC