From abdfbc8a2229d2727a74da7f68a482794d618eb3 Mon Sep 17 00:00:00 2001
From: Michael Ossmann <mike@ossmann.com>
Date: Thu, 1 Sep 2016 00:06:57 -0600
Subject: [PATCH 096/111] Neapolitan: barrel jack and USB power sources that
 override USB power on main board

---
 hardware/neapolitan/mcu.sch              | 278 +++++++++++++++++++++----------
 hardware/neapolitan/neapolitan-cache.lib |  43 +++++
 hardware/neapolitan/neapolitan.kicad_pcb |   5 +-
 3 files changed, 233 insertions(+), 93 deletions(-)

diff --git a/hardware/neapolitan/mcu.sch b/hardware/neapolitan/mcu.sch
index 6bc1a8a..e7b9cda 100644
--- a/hardware/neapolitan/mcu.sch
+++ b/hardware/neapolitan/mcu.sch
@@ -365,42 +365,42 @@ B1AUX13
 $Comp
 L FILTER FB1
 U 1 1 4F766F5E
-P 1950 3750
-F 0 "FB1" H 1950 3900 60  0000 C CNN
-F 1 "FILTER" H 1950 3650 60  0000 C CNN
-F 2 "hackrf:GSG-0805" H 1950 3750 60  0001 C CNN
-F 3 "" H 1950 3750 60  0001 C CNN
-F 4 "Murata" H 1950 3750 60  0001 C CNN "Manufacturer"
-F 5 "BLM21PG221SN1D" H 1950 3750 60  0001 C CNN "Part Number"
-F 6 "FERRITE CHIP 220 OHM 2000MA 0805" H 1950 3750 60  0001 C CNN "Description"
-	1    1950 3750
+P 2100 3650
+F 0 "FB1" H 2100 3800 60  0000 C CNN
+F 1 "FILTER" H 2100 3550 60  0000 C CNN
+F 2 "hackrf:GSG-0805" H 2100 3650 60  0001 C CNN
+F 3 "" H 2100 3650 60  0001 C CNN
+F 4 "Murata" H 2100 3650 60  0001 C CNN "Manufacturer"
+F 5 "BLM21PG221SN1D" H 2100 3650 60  0001 C CNN "Part Number"
+F 6 "FERRITE CHIP 220 OHM 2000MA 0805" H 2100 3650 60  0001 C CNN "Description"
+	1    2100 3650
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR0243
 U 1 1 4F766C2C
-P 2400 4200
+P 2550 3350
 AR Path="/4F766C2C" Ref="#PWR0243"  Part="1" 
 AR Path="/5037043E/4F766C2C" Ref="#PWR0168"  Part="1" 
-F 0 "#PWR0168" H 2400 4200 30  0001 C CNN
-F 1 "GND" H 2400 4130 30  0001 C CNN
-F 2 "" H 2400 4200 60  0001 C CNN
-F 3 "" H 2400 4200 60  0001 C CNN
-	1    2400 4200
+F 0 "#PWR0168" H 2550 3350 30  0001 C CNN
+F 1 "GND" H 2550 3280 30  0001 C CNN
+F 2 "" H 2550 3350 60  0001 C CNN
+F 3 "" H 2550 3350 60  0001 C CNN
+	1    2550 3350
 	1    0    0    -1  
 $EndComp
 $Comp
 L GSG-USB-MICRO-B-SHIELDED J1
 U 1 1 4F766BDF
-P 1050 3450
-F 0 "J1" H 1050 3750 60  0000 C CNN
-F 1 "USB-MICRO-B" V 1500 3450 60  0000 C CNN
-F 2 "hackrf:GSG-USB-MICROB-FCI-10103592-EXT" H 1050 3450 60  0001 C CNN
-F 3 "" H 1050 3450 60  0001 C CNN
-F 4 "FCI" H 1050 3450 60  0001 C CNN "Manufacturer"
-F 5 "10103592-0001LF" H 1050 3450 60  0001 C CNN "Part Number"
-F 6 "CONN RCPT REV MICRO USB TYPE B" H 1050 3450 60  0001 C CNN "Description"
-	1    1050 3450
+P 1400 3450
+F 0 "J1" H 1400 3750 60  0000 C CNN
+F 1 "USB-MICRO-B" V 1850 3450 60  0000 C CNN
+F 2 "hackrf:GSG-USB-MICROB-FCI-10103592-EXT" H 1400 3450 60  0001 C CNN
+F 3 "" H 1400 3450 60  0001 C CNN
+F 4 "FCI" H 1400 3450 60  0001 C CNN "Manufacturer"
+F 5 "10103592-0001LF" H 1400 3450 60  0001 C CNN "Part Number"
+F 6 "CONN RCPT REV MICRO USB TYPE B" H 1400 3450 60  0001 C CNN "Description"
+	1    1400 3450
 	-1   0    0    1   
 $EndComp
 $Comp
@@ -690,16 +690,16 @@ GCK0
 $Comp
 L CONN_2 P80
 U 1 1 528064FC
-P 1250 2700
-F 0 "P80" V 1200 2700 40  0000 C CNN
-F 1 "SHIELD" V 1300 2700 40  0000 C CNN
-F 2 "hackrf:GSG-HEADER-NOMARK-1x2" H 1250 2700 60  0001 C CNN
-F 3 "" H 1250 2700 60  0001 C CNN
-F 4 "DNP" H 1250 2500 60  0000 C CNN "Note"
-	1    1250 2700
+P 1600 2700
+F 0 "P80" V 1550 2700 40  0000 C CNN
+F 1 "SHIELD" V 1650 2700 40  0000 C CNN
+F 2 "hackrf:GSG-HEADER-NOMARK-1x2" H 1600 2700 60  0001 C CNN
+F 3 "" H 1600 2700 60  0001 C CNN
+F 4 "DNP" H 1600 2500 60  0000 C CNN "Note"
+	1    1600 2700
 	1    0    0    -1  
 $EndComp
-Text Label 800  2600 3    40   ~ 0
+Text Label 1150 2600 3    40   ~ 0
 USB_SHIELD
 $Comp
 L GND #PWR0298
@@ -744,42 +744,42 @@ BANK2F3M12
 $Comp
 L R R35
 U 1 1 5294026C
-P 1050 1900
+P 1400 1900
 AR Path="/5294026C" Ref="R35"  Part="1" 
 AR Path="/5037043E/5294026C" Ref="R35"  Part="1" 
-F 0 "R35" V 1130 1900 50  0000 C CNN
-F 1 "DNP" V 1050 1900 50  0000 C CNN
-F 2 "hackrf:GSG-0805" H 1050 1900 60  0001 C CNN
-F 3 "" H 1050 1900 60  0000 C CNN
-F 4 "DNP" V 950 1900 60  0000 C CNN "Note"
-	1    1050 1900
+F 0 "R35" V 1480 1900 50  0000 C CNN
+F 1 "DNP" V 1400 1900 50  0000 C CNN
+F 2 "hackrf:GSG-0805" H 1400 1900 60  0001 C CNN
+F 3 "" H 1400 1900 60  0000 C CNN
+F 4 "DNP" V 1300 1900 60  0000 C CNN "Note"
+	1    1400 1900
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C C155
 U 1 1 5294027B
-P 1050 2250
+P 1400 2250
 AR Path="/5294027B" Ref="C155"  Part="1" 
 AR Path="/5037043E/5294027B" Ref="C155"  Part="1" 
-F 0 "C155" H 1100 2350 50  0000 L CNN
-F 1 "DNP" H 1100 2150 50  0000 L CNN
-F 2 "hackrf:GSG-0805" H 1050 2250 60  0001 C CNN
-F 3 "" H 1050 2250 60  0000 C CNN
-F 4 "DNP" V 900 2200 60  0000 C CNN "Note"
-	1    1050 2250
+F 0 "C155" H 1450 2350 50  0000 L CNN
+F 1 "DNP" H 1450 2150 50  0000 L CNN
+F 2 "hackrf:GSG-0805" H 1400 2250 60  0001 C CNN
+F 3 "" H 1400 2250 60  0000 C CNN
+F 4 "DNP" V 1250 2200 60  0000 C CNN "Note"
+	1    1400 2250
 	0    -1   -1   0   
 $EndComp
 $Comp
 L GND #PWR0302
 U 1 1 529402E0
-P 1300 1800
+P 1650 1800
 AR Path="/529402E0" Ref="#PWR0302"  Part="1" 
 AR Path="/5037043E/529402E0" Ref="#PWR0183"  Part="1" 
-F 0 "#PWR0183" H 1300 1800 30  0001 C CNN
-F 1 "GND" H 1300 1730 30  0001 C CNN
-F 2 "" H 1300 1800 60  0000 C CNN
-F 3 "" H 1300 1800 60  0000 C CNN
-	1    1300 1800
+F 0 "#PWR0183" H 1650 1800 30  0001 C CNN
+F 1 "GND" H 1650 1730 30  0001 C CNN
+F 2 "" H 1650 1800 60  0000 C CNN
+F 3 "" H 1650 1800 60  0000 C CNN
+	1    1650 1800
 	-1   0    0    1   
 $EndComp
 $Comp
@@ -833,17 +833,54 @@ $EndComp
 $Comp
 L FILTER FB3
 U 1 1 52EA190B
-P 1950 4100
-F 0 "FB3" H 1950 4250 60  0000 C CNN
-F 1 "FILTER" H 1950 4000 60  0000 C CNN
-F 2 "hackrf:GSG-0805" H 1950 4100 60  0001 C CNN
-F 3 "" H 1950 4100 60  0001 C CNN
-F 4 "Murata" H 1950 4100 60  0001 C CNN "Manufacturer"
-F 5 "BLM21PG221SN1D" H 1950 4100 60  0001 C CNN "Part Number"
-F 6 "FERRITE CHIP 220 OHM 2000MA 0805" H 1950 4100 60  0001 C CNN "Description"
-	1    1950 4100
+P 2100 3250
+F 0 "FB3" H 2100 3400 60  0000 C CNN
+F 1 "FILTER" H 2100 3150 60  0000 C CNN
+F 2 "hackrf:GSG-0805" H 2100 3250 60  0001 C CNN
+F 3 "" H 2100 3250 60  0001 C CNN
+F 4 "Murata" H 2100 3250 60  0001 C CNN "Manufacturer"
+F 5 "BLM21PG221SN1D" H 2100 3250 60  0001 C CNN "Part Number"
+F 6 "FERRITE CHIP 220 OHM 2000MA 0805" H 2100 3250 60  0001 C CNN "Description"
+	1    2100 3250
 	1    0    0    -1  
 $EndComp
+Text Label 2750 8450 0    40   ~ 0
+VBUSCTRL
+NoConn ~ 1650 3350
+NoConn ~ 1650 3450
+NoConn ~ 1650 3550
+$Comp
+L D_Schottky D?
+U 1 1 57CA7813
+P 2550 3900
+F 0 "D?" H 2550 4000 50  0000 C CNN
+F 1 "D" H 2550 3800 50  0000 C CNN
+F 2 "" H 2550 3900 60  0000 C CNN
+F 3 "" H 2550 3900 60  0000 C CNN
+F 4 "NXP" H 2550 3900 60  0001 C CNN "Manufacturer"
+F 5 "PMEG3050EP,115" H 2550 3900 60  0001 C CNN "Part Number"
+F 6 "DIODE SCHOTTKY 30V 5A SOD128" H 2550 3900 60  0001 C CNN "Description"
+	1    2550 3900
+	0    -1   -1   0   
+$EndComp
+Text Label 2550 4800 1    40   ~ 0
+VIN
+$Comp
+L R R?
+U 1 1 57CA8054
+P 2800 4150
+F 0 "R?" V 2880 4150 50  0000 C CNN
+F 1 "470" V 2800 4150 50  0000 C CNN
+F 2 "hackrf:GSG-0402" H 2800 4150 60  0001 C CNN
+F 3 "" H 2800 4150 60  0001 C CNN
+F 4 "Stackpole" H 2800 4150 60  0001 C CNN "Manufacturer"
+F 5 "RMCF0402JT470R" H 2800 4150 60  0001 C CNN "Part Number"
+F 6 "RES TF 1/16W 470 OHM 5% 0402" H 2800 4150 60  0001 C CNN "Description"
+	1    2800 4150
+	0    -1   -1   0   
+$EndComp
+Text Label 3250 4150 2    40   ~ 0
+VBUSCTRL
 Wire Wire Line
 	2200 6750 2200 6850
 Wire Wire Line
@@ -965,11 +1002,7 @@ Wire Wire Line
 Wire Wire Line
 	10000 3400 9700 3400
 Wire Wire Line
-	1600 3750 1400 3750
-Wire Wire Line
-	1400 3750 1400 3650
-Wire Wire Line
-	1400 3650 1300 3650
+	1750 3650 1650 3650
 Wire Wire Line
 	5950 7750 5950 7450
 Wire Wire Line
@@ -1115,12 +1148,12 @@ Wire Wire Line
 Wire Wire Line
 	7000 10150 7400 10150
 Wire Wire Line
-	800  1900 800  3000
+	1150 1900 1150 3000
 Wire Wire Line
-	800  2800 900  2800
+	1150 2800 1250 2800
 Wire Wire Line
-	800  2600 900  2600
-Connection ~ 800  2800
+	1150 2600 1250 2600
+Connection ~ 1150 2800
 Wire Wire Line
 	10000 7450 9700 7450
 Wire Wire Line
@@ -1128,33 +1161,100 @@ Wire Wire Line
 Wire Wire Line
 	7000 9650 7400 9650
 Wire Wire Line
-	1300 1800 1300 2250
+	1650 1800 1650 2250
 Wire Wire Line
-	1200 1900 1300 1900
-Connection ~ 1300 1900
+	1550 1900 1650 1900
+Connection ~ 1650 1900
 Wire Wire Line
-	900  1900 800  1900
-Connection ~ 800  2600
+	1250 1900 1150 1900
+Connection ~ 1150 2600
 Wire Wire Line
-	800  2250 900  2250
-Connection ~ 800  2250
+	1150 2250 1250 2250
+Connection ~ 1150 2250
 Wire Wire Line
-	2300 4100 2400 4100
+	2450 3250 2550 3250
 Wire Wire Line
-	2400 4100 2400 4200
+	2550 3250 2550 3350
 Wire Wire Line
-	1300 3250 1500 3250
+	1650 2250 1550 2250
 Wire Wire Line
-	1500 3250 1500 4100
+	8350 7450 8350 7750
 Wire Wire Line
-	1500 4100 1600 4100
-Text Label 2750 8450 0    40   ~ 0
-VBUSCTRL
+	1750 3250 1650 3250
 Wire Wire Line
-	1300 2250 1200 2250
-NoConn ~ 1300 3350
-NoConn ~ 1300 3450
-NoConn ~ 1300 3550
+	2550 4050 2550 4350
 Wire Wire Line
-	8350 7450 8350 7750
+	2450 3650 2550 3650
+Wire Wire Line
+	2550 3650 2550 3750
+Wire Wire Line
+	3250 4150 2950 4150
+Wire Wire Line
+	2550 4150 2650 4150
+Connection ~ 2550 4150
+Wire Wire Line
+	2550 4800 2550 4650
+$Comp
+L BARREL_JACK CON?
+U 1 1 57CB0AF2
+P 1350 4350
+F 0 "CON?" H 1350 4600 60  0000 C CNN
+F 1 "BARREL_JACK" H 1350 4150 60  0000 C CNN
+F 2 "" H 1350 4350 60  0000 C CNN
+F 3 "" H 1350 4350 60  0000 C CNN
+F 4 "CUI" H 1350 4350 60  0001 C CNN "Manufacturer"
+F 5 "PJ-102AH" H 1350 4350 60  0001 C CNN "Part Number"
+F 6 "CONN PWR JACK 2.0X5.5MM HIGH CUR " H 1350 4350 60  0001 C CNN "Description"
+	1    1350 4350
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 57CB49E4
+P 1750 4550
+F 0 "#PWR?" H 1750 4550 30  0001 C CNN
+F 1 "GND" H 1750 4480 30  0001 C CNN
+F 2 "" H 1750 4550 60  0001 C CNN
+F 3 "" H 1750 4550 60  0001 C CNN
+	1    1750 4550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1650 4450 1750 4450
+Wire Wire Line
+	1750 4450 1750 4550
+NoConn ~ 1650 4350
+$Comp
+L D_Schottky D?
+U 1 1 57CB4E5A
+P 2550 4500
+F 0 "D?" H 2550 4600 50  0000 C CNN
+F 1 "D" H 2550 4400 50  0000 C CNN
+F 2 "" H 2550 4500 60  0000 C CNN
+F 3 "" H 2550 4500 60  0000 C CNN
+F 4 "NXP" H 2550 4500 60  0001 C CNN "Manufacturer"
+F 5 "PMEG3050EP,115" H 2550 4500 60  0001 C CNN "Part Number"
+F 6 "DIODE SCHOTTKY 30V 5A SOD128" H 2550 4500 60  0001 C CNN "Description"
+	1    2550 4500
+	0    -1   -1   0   
+$EndComp
+$Comp
+L D_Schottky D?
+U 1 1 57CB4ECD
+P 2300 4250
+F 0 "D?" H 2300 4350 50  0000 C CNN
+F 1 "D" H 2300 4150 50  0000 C CNN
+F 2 "" H 2300 4250 60  0000 C CNN
+F 3 "" H 2300 4250 60  0000 C CNN
+F 4 "NXP" H 2300 4250 60  0001 C CNN "Manufacturer"
+F 5 "PMEG3050EP,115" H 2300 4250 60  0001 C CNN "Part Number"
+F 6 "DIODE SCHOTTKY 30V 5A SOD128" H 2300 4250 60  0001 C CNN "Description"
+	1    2300 4250
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	2450 4250 2550 4250
+Connection ~ 2550 4250
+Wire Wire Line
+	1650 4250 2150 4250
 $EndSCHEMATC
diff --git a/hardware/neapolitan/neapolitan-cache.lib b/hardware/neapolitan/neapolitan-cache.lib
index c7d9d76..787a743 100644
--- a/hardware/neapolitan/neapolitan-cache.lib
+++ b/hardware/neapolitan/neapolitan-cache.lib
@@ -59,6 +59,27 @@ X PR2 4 -300 -50 100 R 60 60 1 1 P
 ENDDRAW
 ENDDEF
 #
+# BARREL_JACK
+#
+DEF BARREL_JACK CON 0 40 Y Y 1 F N
+F0 "CON" 0 250 60 H V C CNN
+F1 "BARREL_JACK" 0 -200 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+A -300 99 49 -900 1788 0 1 0 N -300 50 -350 100
+A -300 101 49 900 -1788 0 1 0 N -300 150 -350 100
+S 100 150 0 50 0 1 0 N
+P 2 0 1 0  -300 50  0 50 N
+P 2 0 1 0  0 150  -300 150 N
+P 3 0 1 0  100 0  -50 0  -50 -100 N
+P 5 0 1 0  100 -100  -150 -100  -200 -50  -250 -100  -350 -100 N
+X ~ 1 300 100 200 L 50 50 1 1 P
+X ~ 2 300 -100 200 L 50 50 1 1 P
+X ~ 3 300 0 200 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # C
 #
 DEF C C 0 10 N Y 1 F N
@@ -260,6 +281,28 @@ X ~ 16 400 -350 300 L 60 60 1 1 P I
 ENDDRAW
 ENDDEF
 #
+# D_Schottky
+#
+DEF D_Schottky D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D_Schottky" 0 -100 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ D-Pak_TO252AA
+ Diode_*
+ *SingleDiode
+ *SingleDiode*
+ *_Diode_*
+$ENDFPLIST
+DRAW
+P 3 0 1 0  50 50  -50 0  50 -50 F
+P 6 0 1 8  -75 25  -75 50  -50 50  -50 -50  -25 -50  -25 -25 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # FIL-DEA
 #
 DEF FIL-DEA U 0 40 Y Y 1 F N
diff --git a/hardware/neapolitan/neapolitan.kicad_pcb b/hardware/neapolitan/neapolitan.kicad_pcb
index 780ec36..22acd94 100644
--- a/hardware/neapolitan/neapolitan.kicad_pcb
+++ b/hardware/neapolitan/neapolitan.kicad_pcb
@@ -5,7 +5,7 @@
     (no_connects 2)
     (area 57.669958 17.0375 275.101601 176.1916)
     (thickness 1.6002)
-    (drawings 75)
+    (drawings 74)
     (tracks 1821)
     (zones 0)
     (modules 250)
@@ -6231,9 +6231,6 @@
   (gr_arc (start 176 104) (end 176 100) (angle 90) (layer Edge.Cuts) (width 0.381))
   (gr_arc (start 64 171) (end 64 175) (angle 90) (layer Edge.Cuts) (width 0.381))
   (gr_arc (start 64 104) (end 60 104) (angle 90) (layer Edge.Cuts) (width 0.381))
-  (gr_text 1V8 (at 65.08 130.804 90) (layer F.SilkS)
-    (effects (font (size 1.016 0.762) (thickness 0.1905)))
-  )
   (gr_text 3V3 (at 65.08 117.85 90) (layer F.SilkS)
     (effects (font (size 1.016 0.762) (thickness 0.1905)))
   )
-- 
2.1.4