Merge branch 'master' of http://192.168.1.18/gogs/remy/GPS_Moto

# Conflicts:
#	EDA/GPS.sch

EDA/GPS.sch

@@ -699,171 +699,207 @@ Di1
 $Comp
 L global:LED D1
 U 1 1 60F5A95A
+<<<<<<< HEAD
 P 12750 6050
 F 0 "D1" V 12796 5942 50  0000 R CNN
 F 1 "LED" V 12705 5942 50  0000 R CNN
 F 2 "LED:0805" H 12750 6050 50  0001 C CNN
 F 3 "" H 12750 6050 50  0000 C CNN
 	1    12750 6050
+=======
+P 12850 5700
+F 0 "D2" V 12896 5592 50  0000 R CNN
+F 1 "LED" V 12805 5592 50  0000 R CNN
+F 2 "LED:0805" H 12850 5700 50  0001 C CNN
+F 3 "" H 12850 5700 50  0000 C CNN
+	1    12850 5700
+>>>>>>> 129a67c264fb45df9a3583865c841417e2892f9d
 	0    -1   -1   0   
 $EndComp
 $Comp
 L global:NPN_2222A Q7
 U 1 1 60F5A961
-P 13800 5550
-F 0 "Q7" H 13931 5648 60  0000 L CNN
-F 1 "NPN_2222A" H 13931 5542 60  0000 L CNN
-F 2 "U:SOT23-3" H 14200 5900 60  0001 C CNN
-F 3 "" H 13700 5550 60  0001 C CNN
-F 4 "2550" H 13931 5444 50  0000 L CNN "Partkeepr"
-	1    13800 5550
+P 13900 5200
+F 0 "Q7" H 14031 5298 60  0000 L CNN
+F 1 "NPN_2222A" H 14031 5192 60  0000 L CNN
+F 2 "U:SOT23-3" H 14300 5550 60  0001 C CNN
+F 3 "" H 13800 5200 60  0001 C CNN
+F 4 "2550" H 14031 5094 50  0000 L CNN "Partkeepr"
+	1    13900 5200
 	1    0    0    -1  
 $EndComp
 $Comp
 L global:R R5
 U 1 1 60F5A967
-P 12750 6400
-F 0 "R5" H 12820 6446 50  0000 L CNN
-F 1 "R" H 12820 6355 50  0000 L CNN
-F 2 "R:0805" V 12680 6400 50  0001 C CNN
-F 3 "" H 12750 6400 50  0000 C CNN
-	1    12750 6400
+P 12850 6050
+F 0 "R5" H 12920 6096 50  0000 L CNN
+F 1 "R" H 12920 6005 50  0000 L CNN
+F 2 "R:0805" V 12780 6050 50  0001 C CNN
+F 3 "" H 12850 6050 50  0000 C CNN
+	1    12850 6050
 	1    0    0    -1  
 $EndComp
 $Comp
 L global:NPN_2222A Q2
 U 1 1 60F5A96E
-P 12700 6850
-F 0 "Q2" H 12831 6948 60  0000 L CNN
-F 1 "NPN" H 12850 6850 60  0000 L CNN
-F 2 "U:SOT23-3" H 13100 7200 60  0001 C CNN
-F 3 "" H 12600 6850 60  0001 C CNN
-F 4 "2550" H 12831 6744 50  0000 L CNN "Partkeepr"
-	1    12700 6850
+P 12800 6500
+F 0 "Q2" H 12931 6598 60  0000 L CNN
+F 1 "NPN" H 12950 6500 60  0000 L CNN
+F 2 "U:SOT23-3" H 13200 6850 60  0001 C CNN
+F 3 "" H 12700 6500 60  0001 C CNN
+F 4 "2550" H 12931 6394 50  0000 L CNN "Partkeepr"
+	1    12800 6500
 	1    0    0    -1  
 $EndComp
 $Comp
 L global:LED D2
 U 1 1 60F5A974
+<<<<<<< HEAD
 P 13500 6050
 F 0 "D2" V 13546 5942 50  0000 R CNN
 F 1 "LED" V 13455 5942 50  0000 R CNN
 F 2 "LED:0805" H 13500 6050 50  0001 C CNN
 F 3 "" H 13500 6050 50  0000 C CNN
 	1    13500 6050
+=======
+P 13600 5700
+F 0 "D4" V 13646 5592 50  0000 R CNN
+F 1 "LED" V 13555 5592 50  0000 R CNN
+F 2 "LED:0805" H 13600 5700 50  0001 C CNN
+F 3 "" H 13600 5700 50  0000 C CNN
+	1    13600 5700
+>>>>>>> 129a67c264fb45df9a3583865c841417e2892f9d
 	0    -1   -1   0   
 $EndComp
 $Comp
 L global:R R7
 U 1 1 60F5A97A
-P 13500 6400
-F 0 "R7" H 13570 6446 50  0000 L CNN
-F 1 "R" H 13570 6355 50  0000 L CNN
-F 2 "R:0805" V 13430 6400 50  0001 C CNN
-F 3 "" H 13500 6400 50  0000 C CNN
-	1    13500 6400
+P 13600 6050
+F 0 "R7" H 13670 6096 50  0000 L CNN
+F 1 "R" H 13670 6005 50  0000 L CNN
+F 2 "R:0805" V 13530 6050 50  0001 C CNN
+F 3 "" H 13600 6050 50  0000 C CNN
+	1    13600 6050
 	1    0    0    -1  
 $EndComp
 $Comp
 L global:NPN_2222A Q4
 U 1 1 60F5A981
-P 13450 6850
-F 0 "Q4" H 13580 6948 60  0000 L CNN
-F 1 "NPN" H 13580 6842 60  0000 L CNN
-F 2 "U:SOT23-3" H 13850 7200 60  0001 C CNN
-F 3 "" H 13350 6850 60  0001 C CNN
-F 4 "2550" H 13580 6744 50  0000 L CNN "Partkeepr"
-	1    13450 6850
+P 13550 6500
+F 0 "Q4" H 13680 6598 60  0000 L CNN
+F 1 "NPN" H 13680 6492 60  0000 L CNN
+F 2 "U:SOT23-3" H 13950 6850 60  0001 C CNN
+F 3 "" H 13450 6500 60  0001 C CNN
+F 4 "2550" H 13680 6394 50  0000 L CNN "Partkeepr"
+	1    13550 6500
 	1    0    0    -1  
 $EndComp
-Text Label 13150 6850 2    50   ~ 0
+Text Label 13250 6500 2    50   ~ 0
 J2
 $Comp
 L global:LED D3
 U 1 1 60F5A988
+<<<<<<< HEAD
 P 14250 6050
 F 0 "D3" V 14296 5942 50  0000 R CNN
 F 1 "LED" V 14205 5942 50  0000 R CNN
 F 2 "LED:0805" H 14250 6050 50  0001 C CNN
 F 3 "" H 14250 6050 50  0000 C CNN
 	1    14250 6050
+=======
+P 14350 5700
+F 0 "D6" V 14396 5592 50  0000 R CNN
+F 1 "LED" V 14305 5592 50  0000 R CNN
+F 2 "LED:0805" H 14350 5700 50  0001 C CNN
+F 3 "" H 14350 5700 50  0000 C CNN
+	1    14350 5700
+>>>>>>> 129a67c264fb45df9a3583865c841417e2892f9d
 	0    -1   -1   0   
 $EndComp
 $Comp
 L global:R R11
 U 1 1 60F5A98E
-P 14250 6400
-F 0 "R11" H 14320 6446 50  0000 L CNN
-F 1 "R" H 14320 6355 50  0000 L CNN
-F 2 "R:0805" V 14180 6400 50  0001 C CNN
-F 3 "" H 14250 6400 50  0000 C CNN
-	1    14250 6400
+P 14350 6050
+F 0 "R11" H 14420 6096 50  0000 L CNN
+F 1 "R" H 14420 6005 50  0000 L CNN
+F 2 "R:0805" V 14280 6050 50  0001 C CNN
+F 3 "" H 14350 6050 50  0000 C CNN
+	1    14350 6050
 	1    0    0    -1  
 $EndComp
 $Comp
 L global:NPN_2222A Q10
 U 1 1 60F5A995
-P 14200 6850
-F 0 "Q10" H 14330 6948 60  0000 L CNN
-F 1 "NPN" H 14330 6842 60  0000 L CNN
-F 2 "U:SOT23-3" H 14600 7200 60  0001 C CNN
-F 3 "" H 14100 6850 60  0001 C CNN
-F 4 "2550" H 14330 6744 50  0000 L CNN "Partkeepr"
-	1    14200 6850
+P 14300 6500
+F 0 "Q10" H 14430 6598 60  0000 L CNN
+F 1 "NPN" H 14430 6492 60  0000 L CNN
+F 2 "U:SOT23-3" H 14700 6850 60  0001 C CNN
+F 3 "" H 14200 6500 60  0001 C CNN
+F 4 "2550" H 14430 6394 50  0000 L CNN "Partkeepr"
+	1    14300 6500
 	1    0    0    -1  
 $EndComp
-Text Label 13900 6850 2    50   ~ 0
+Text Label 14000 6500 2    50   ~ 0
 J3
 $Comp
 L global:LED D4
 U 1 1 60F5A99C
+<<<<<<< HEAD
 P 15050 6050
 F 0 "D4" V 15096 5942 50  0000 R CNN
 F 1 "LED" V 15005 5942 50  0000 R CNN
 F 2 "LED:0805" H 15050 6050 50  0001 C CNN
 F 3 "" H 15050 6050 50  0000 C CNN
 	1    15050 6050
+=======
+P 15150 5700
+F 0 "D8" V 15196 5592 50  0000 R CNN
+F 1 "LED" V 15105 5592 50  0000 R CNN
+F 2 "LED:0805" H 15150 5700 50  0001 C CNN
+F 3 "" H 15150 5700 50  0000 C CNN
+	1    15150 5700
+>>>>>>> 129a67c264fb45df9a3583865c841417e2892f9d
 	0    -1   -1   0   
 $EndComp
 $Comp
 L global:R R13
 U 1 1 60F5A9A2
-P 15050 6400
-F 0 "R13" H 15120 6446 50  0000 L CNN
-F 1 "R" H 15120 6355 50  0000 L CNN
-F 2 "R:0805" V 14980 6400 50  0001 C CNN
-F 3 "" H 15050 6400 50  0000 C CNN
-	1    15050 6400
+P 15150 6050
+F 0 "R13" H 15220 6096 50  0000 L CNN
+F 1 "R" H 15220 6005 50  0000 L CNN
+F 2 "R:0805" V 15080 6050 50  0001 C CNN
+F 3 "" H 15150 6050 50  0000 C CNN
+	1    15150 6050
 	1    0    0    -1  
 $EndComp
 $Comp
 L global:NPN_2222A Q12
 U 1 1 60F5A9A9
-P 15000 6850
-F 0 "Q12" H 15130 6948 60  0000 L CNN
-F 1 "NPN" H 15130 6842 60  0000 L CNN
-F 2 "U:SOT23-3" H 15400 7200 60  0001 C CNN
-F 3 "" H 14900 6850 60  0001 C CNN
-F 4 "2550" H 15130 6744 50  0000 L CNN "Partkeepr"
-	1    15000 6850
+P 15100 6500
+F 0 "Q12" H 15230 6598 60  0000 L CNN
+F 1 "NPN" H 15230 6492 60  0000 L CNN
+F 2 "U:SOT23-3" H 15500 6850 60  0001 C CNN
+F 3 "" H 15000 6500 60  0001 C CNN
+F 4 "2550" H 15230 6394 50  0000 L CNN "Partkeepr"
+	1    15100 6500
 	1    0    0    -1  
 $EndComp
-Text Label 14700 6850 2    50   ~ 0
+Text Label 14800 6500 2    50   ~ 0
 J4
-Connection ~ 13500 5850
+Connection ~ 13600 5500
 Wire Wire Line
-	13500 5850 12750 5850
-Text Label 12400 6850 2    50   ~ 0
+	13600 5500 12850 5500
+Text Label 12500 6500 2    50   ~ 0
 J1
-Connection ~ 14250 5850
+Connection ~ 14350 5500
 Wire Wire Line
-	14250 5850 15050 5850
-Connection ~ 13850 5850
+	14350 5500 15150 5500
+Connection ~ 13950 5500
 Wire Wire Line
-	13850 5850 13500 5850
+	13950 5500 13600 5500
 Wire Wire Line
-	13850 5850 14250 5850
-Text Label 13500 5550 2    50   ~ 0
+	13950 5500 14350 5500
+Text Label 13600 5200 2    50   ~ 0
 C1
 $Comp
 L global:LED D5
@@ -1264,23 +1300,41 @@ $EndComp
 $Comp
 L GPS-rescue:GND-power #PWR0112
 U 1 1 60E33141
+<<<<<<< HEAD
 P 12750 7150
 F 0 "#PWR0112" H 12750 6900 50  0001 C CNN
 F 1 "GND" H 12755 6977 50  0000 C CNN
 F 2 "" H 12750 7150 50  0001 C CNN
 F 3 "" H 12750 7150 50  0001 C CNN
 	1    12750 7150
+=======
+P 12850 6800
+F 0 "#PWR?" H 12850 6550 50  0001 C CNN
+F 1 "GND" H 12855 6627 50  0000 C CNN
+F 2 "" H 12850 6800 50  0001 C CNN
+F 3 "" H 12850 6800 50  0001 C CNN
+	1    12850 6800
+>>>>>>> 129a67c264fb45df9a3583865c841417e2892f9d
 	1    0    0    -1  
 $EndComp
 $Comp
 L GPS-rescue:3.3V-power #PWR0113
 U 1 1 60E353C6
+<<<<<<< HEAD
 P 13850 5250
 F 0 "#PWR0113" H 13850 5100 50  0001 C CNN
 F 1 "3.3V" H 13865 5423 50  0000 C CNN
 F 2 "" H 13850 5250 50  0001 C CNN
 F 3 "" H 13850 5250 50  0001 C CNN
 	1    13850 5250
+=======
+P 13950 4900
+F 0 "#PWR?" H 13950 4750 50  0001 C CNN
+F 1 "3.3V" H 13965 5073 50  0000 C CNN
+F 2 "" H 13950 4900 50  0001 C CNN
+F 3 "" H 13950 4900 50  0001 C CNN
+	1    13950 4900
+>>>>>>> 129a67c264fb45df9a3583865c841417e2892f9d
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1297,34 +1351,61 @@ $EndComp
 $Comp
 L GPS-rescue:GND-power #PWR0115
 U 1 1 60E4A23E
+<<<<<<< HEAD
 P 13500 7150
 F 0 "#PWR0115" H 13500 6900 50  0001 C CNN
 F 1 "GND" H 13505 6977 50  0000 C CNN
 F 2 "" H 13500 7150 50  0001 C CNN
 F 3 "" H 13500 7150 50  0001 C CNN
 	1    13500 7150
+=======
+P 13600 6800
+F 0 "#PWR?" H 13600 6550 50  0001 C CNN
+F 1 "GND" H 13605 6627 50  0000 C CNN
+F 2 "" H 13600 6800 50  0001 C CNN
+F 3 "" H 13600 6800 50  0001 C CNN
+	1    13600 6800
+>>>>>>> 129a67c264fb45df9a3583865c841417e2892f9d
 	1    0    0    -1  
 $EndComp
 $Comp
 L GPS-rescue:GND-power #PWR0116
 U 1 1 60E4A64D
+<<<<<<< HEAD
 P 14250 7150
 F 0 "#PWR0116" H 14250 6900 50  0001 C CNN
 F 1 "GND" H 14255 6977 50  0000 C CNN
 F 2 "" H 14250 7150 50  0001 C CNN
 F 3 "" H 14250 7150 50  0001 C CNN
 	1    14250 7150
+=======
+P 14350 6800
+F 0 "#PWR?" H 14350 6550 50  0001 C CNN
+F 1 "GND" H 14355 6627 50  0000 C CNN
+F 2 "" H 14350 6800 50  0001 C CNN
+F 3 "" H 14350 6800 50  0001 C CNN
+	1    14350 6800
+>>>>>>> 129a67c264fb45df9a3583865c841417e2892f9d
 	1    0    0    -1  
 $EndComp
 $Comp
 L GPS-rescue:GND-power #PWR0117
 U 1 1 60E4AA84
+<<<<<<< HEAD
 P 15050 7150
 F 0 "#PWR0117" H 15050 6900 50  0001 C CNN
 F 1 "GND" H 15055 6977 50  0000 C CNN
 F 2 "" H 15050 7150 50  0001 C CNN
 F 3 "" H 15050 7150 50  0001 C CNN
 	1    15050 7150
+=======
+P 15150 6800
+F 0 "#PWR?" H 15150 6550 50  0001 C CNN
+F 1 "GND" H 15155 6627 50  0000 C CNN
+F 2 "" H 15150 6800 50  0001 C CNN
+F 3 "" H 15150 6800 50  0001 C CNN
+	1    15150 6800
+>>>>>>> 129a67c264fb45df9a3583865c841417e2892f9d
 	1    0    0    -1  
 $EndComp
 $Comp