temp commit for merge

1 files changed, 1013 insertions, 853 deletions

diff --git a/hw/rvPhone/rvPhone.sch b/hw/rvPhone/rvPhone.sch
index 016e219..7268901 100644
--- a/hw/rvPhone/rvPhone.sch
+++ b/hw/rvPhone/rvPhone.sch
@@ -41,7 +41,7 @@ U 1 1 5B734556
 P 6900 1150
 F 0 "L2" V 6850 1150 50  0000 C CNN
 F 1 "2.2uH" V 6975 1150 50  0000 C CNN
-F 2 "footprints:L_Coilcraft_LPS3015" H 6900 1150 50  0001 C CNN
+F 2 "footprints:Coilcraft-LPS3015" H 6900 1150 50  0001 C CNN
 F 3 "" H 6900 1150 50  0001 C CNN
 	1    6900 1150
 	0    -1   -1   0   
@@ -376,7 +376,7 @@ U 1 1 5BF9199B
 P 6200 2250
 F 0 "L3" V 6150 2250 50  0000 C CNN
 F 1 "1uH" V 6275 2250 50  0000 C CNN
-F 2 "footprints:L_Coilcraft_XAL40" H 6200 2250 50  0001 C CNN
+F 2 "footprints:Coilcraft-XAL40" H 6200 2250 50  0001 C CNN
 F 3 "" H 6200 2250 50  0001 C CNN
 	1    6200 2250
 	0    -1   -1   0   
@@ -461,30 +461,30 @@ F 3 "" H 6950 10450 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:R R28
+L Device:R R32
 U 1 1 5C131584
-P 14950 7100
-F 0 "R28" V 15030 7100 50  0000 C CNN
-F 1 "50K" V 14950 7100 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 14880 7100 50  0001 C CNN
-F 3 "" H 14950 7100 50  0001 C CNN
-	1    14950 7100
+P 15350 8100
+F 0 "R32" V 15430 8100 50  0000 C CNN
+F 1 "50K" V 15350 8100 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 15280 8100 50  0001 C CNN
+F 3 "" H 15350 8100 50  0001 C CNN
+	1    15350 8100
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR068
 U 1 1 5C135874
-P 15050 7700
-F 0 "#PWR068" H 15050 7450 50  0001 C CNN
-F 1 "GND" H 15050 7550 50  0000 C CNN
-F 2 "" H 15050 7700 50  0001 C CNN
-F 3 "" H 15050 7700 50  0001 C CNN
-	1    15050 7700
+P 15450 8700
+F 0 "#PWR068" H 15450 8450 50  0001 C CNN
+F 1 "GND" H 15450 8550 50  0000 C CNN
+F 2 "" H 15450 8700 50  0001 C CNN
+F 3 "" H 15450 8700 50  0001 C CNN
+	1    15450 8700
 	1    0    0    -1  
 $EndComp
-Text Label 14250 8450 0    60   ~ 0
+Text Label 14650 9450 0    60   ~ 0
 SPK_L-
-Text Label 14250 8350 0    60   ~ 0
+Text Label 14650 9350 0    60   ~ 0
 SPK_L+
 $Comp
 L Device:R R22
@@ -498,14 +498,14 @@ F 3 "" H 6950 10650 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L Device:R R29
+L Device:R R33
 U 1 1 5C41CE83
-P 15050 7500
-F 0 "R29" V 15130 7500 50  0000 C CNN
-F 1 "50K" V 15050 7500 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 14980 7500 50  0001 C CNN
-F 3 "" H 15050 7500 50  0001 C CNN
-	1    15050 7500
+P 15450 8500
+F 0 "R33" V 15530 8500 50  0000 C CNN
+F 1 "50K" V 15450 8500 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 15380 8500 50  0001 C CNN
+F 3 "" H 15450 8500 50  0001 C CNN
+	1    15450 8500
 	1    0    0    -1  
 $EndComp
 NoConn ~ 2800 1450
@@ -539,7 +539,7 @@ Wire Wire Line
 	7150 1250 6650 1250
 Connection ~ 7150 1150
 Wire Wire Line
-	7150 1650 7150 1750
+	7150 1650 7150 1700
 Connection ~ 7150 1250
 Wire Wire Line
 	6650 1450 6750 1450
@@ -686,11 +686,11 @@ Wire Wire Line
 Wire Wire Line
 	7100 10050 7150 10050
 Wire Wire Line
-	14950 6950 14950 6900
+	15350 7950 15350 7900
 Wire Wire Line
-	14250 8350 14700 8350
+	14650 9350 15100 9350
 Wire Wire Line
-	14250 8450 14700 8450
+	14650 9450 15100 9450
 Wire Wire Line
 	3800 2850 4350 2850
 Wire Wire Line
@@ -725,7 +725,7 @@ Connection ~ 6750 2750
 Wire Wire Line
 	7100 10250 7150 10250
 Wire Wire Line
-	15050 7700 15050 7650
+	15450 8700 15450 8650
 $Comp
 L Device:R R5
 U 1 1 5C4B7E26
@@ -905,7 +905,7 @@ Wire Wire Line
 Wire Wire Line
 	7150 1150 7150 1250
 Wire Wire Line
-	7150 1150 7500 1150
+	7150 1150 7450 1150
 Wire Wire Line
 	7150 1250 7150 1350
 Wire Wire Line
@@ -978,7 +978,7 @@ U 1 1 5CB8DC66
 P 850 1400
 F 0 "J1" H 700 1850 50  0000 C CNN
 F 1 "USB_OTG" H 800 1750 50  0000 C CNN
-F 2 "footprints:USB_Micro-B" H 1000 1350 50  0001 C CNN
+F 2 "footprints:GCT_MicroUSB-USB3080" H 1000 1350 50  0001 C CNN
 F 3 "~" H 1000 1350 50  0001 C CNN
 	1    850  1400
 	1    0    0    -1  
@@ -1224,152 +1224,152 @@ U 61A17BF3
 F0 "exp" 60
 F1 "exp.sch" 60
 $EndSheet
-Text Label 13050 7300 0    60   ~ 0
+Text Label 13450 8300 0    60   ~ 0
 SPK_GAIN
 Wire Wire Line
-	13050 7300 14050 7300
+	13450 8300 14450 8300
 Wire Wire Line
-	13050 7400 14050 7400
+	13450 8400 14450 8400
 $Comp
 L Device:C C41
 U 1 1 60140109
-P 13750 7000
-F 0 "C41" H 13750 7100 50  0000 L CNN
-F 1 "0.1uF" H 13750 6900 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 13788 6850 50  0001 C CNN
-F 3 "~" H 13750 7000 50  0001 C CNN
-	1    13750 7000
+P 14150 8000
+F 0 "C41" H 14150 8100 50  0000 L CNN
+F 1 "0.1uF" H 14150 7900 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 14188 7850 50  0001 C CNN
+F 3 "~" H 14150 8000 50  0001 C CNN
+	1    14150 8000
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	13750 6750 13750 6800
+	14150 7750 14150 7800
 Wire Wire Line
-	14050 7100 14000 7100
+	14450 8100 14400 8100
 Wire Wire Line
-	14000 7100 14000 6800
+	14400 8100 14400 7800
 Wire Wire Line
-	14000 6800 13750 6800
-Connection ~ 13750 6800
+	14400 7800 14150 7800
+Connection ~ 14150 7800
 Wire Wire Line
-	13750 6800 13750 6850
+	14150 7800 14150 7850
 Wire Wire Line
-	13750 7150 13750 7600
+	14150 8150 14150 8600
 $Comp
 L power:GND #PWR0110
 U 1 1 601D8171
-P 13750 7700
-F 0 "#PWR0110" H 13750 7450 50  0001 C CNN
-F 1 "GND" H 13755 7527 50  0000 C CNN
-F 2 "" H 13750 7700 50  0001 C CNN
-F 3 "" H 13750 7700 50  0001 C CNN
-	1    13750 7700
+P 14150 8700
+F 0 "#PWR0110" H 14150 8450 50  0001 C CNN
+F 1 "GND" H 14155 8527 50  0000 C CNN
+F 2 "" H 14150 8700 50  0001 C CNN
+F 3 "" H 14150 8700 50  0001 C CNN
+	1    14150 8700
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	14050 7600 13750 7600
-Connection ~ 13750 7600
+	14450 8600 14150 8600
+Connection ~ 14150 8600
 Wire Wire Line
-	13750 7600 13750 7700
+	14150 8600 14150 8700
 $Comp
 L myPower:+VSYS #PWR0138
 U 1 1 600358F1
-P 13750 6750
-F 0 "#PWR0138" H 13750 6600 50  0001 C CNN
-F 1 "+VSYS" H 13750 6890 50  0000 C CNN
-F 2 "" H 13750 6750 50  0001 C CNN
-F 3 "" H 13750 6750 50  0001 C CNN
-	1    13750 6750
+P 14150 7750
+F 0 "#PWR0138" H 14150 7600 50  0001 C CNN
+F 1 "+VSYS" H 14150 7890 50  0000 C CNN
+F 2 "" H 14150 7750 50  0001 C CNN
+F 3 "" H 14150 7750 50  0001 C CNN
+	1    14150 7750
 	1    0    0    -1  
 $EndComp
-Text Label 14250 8650 0    60   ~ 0
+Text Label 14650 9650 0    60   ~ 0
 SPK_R-
-Text Label 14250 8550 0    60   ~ 0
+Text Label 14650 9550 0    60   ~ 0
 SPK_R+
 Wire Wire Line
-	14250 8550 14700 8550
+	14650 9550 15100 9550
 Wire Wire Line
-	14250 8650 14700 8650
+	14650 9650 15100 9650
 $Comp
 L Device:C C40
 U 1 1 634A5955
-P 10250 7100
-F 0 "C40" H 10300 7200 50  0000 L CNN
-F 1 "0.1uF" H 10300 7000 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 10288 6950 50  0001 C CNN
-F 3 "~" H 10250 7100 50  0001 C CNN
-	1    10250 7100
+P 10650 8100
+F 0 "C40" H 10700 8200 50  0000 L CNN
+F 1 "0.1uF" H 10700 8000 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 10688 7950 50  0001 C CNN
+F 3 "~" H 10650 8100 50  0001 C CNN
+	1    10650 8100
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10550 6900 10250 6900
+	10950 7900 10650 7900
 Wire Wire Line
-	10250 6900 10250 6950
+	10650 7900 10650 7950
 Wire Wire Line
-	10250 6900 10250 6850
-Connection ~ 10250 6900
+	10650 7900 10650 7850
+Connection ~ 10650 7900
 $Comp
 L power:+3.3V #PWR0140
 U 1 1 636A32DB
-P 10250 6850
-F 0 "#PWR0140" H 10250 6700 50  0001 C CNN
-F 1 "+3.3V" H 10265 7023 50  0000 C CNN
-F 2 "" H 10250 6850 50  0001 C CNN
-F 3 "" H 10250 6850 50  0001 C CNN
-	1    10250 6850
+P 10650 7850
+F 0 "#PWR0140" H 10650 7700 50  0001 C CNN
+F 1 "+3.3V" H 10665 8023 50  0000 C CNN
+F 2 "" H 10650 7850 50  0001 C CNN
+F 3 "" H 10650 7850 50  0001 C CNN
+	1    10650 7850
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10250 7250 10250 7500
+	10650 8250 10650 8500
 Wire Wire Line
-	10250 7500 10600 7500
+	10650 8500 11000 8500
 $Comp
 L power:GND #PWR0141
 U 1 1 63949457
-P 10250 7550
-F 0 "#PWR0141" H 10250 7300 50  0001 C CNN
-F 1 "GND" H 10255 7377 50  0000 C CNN
-F 2 "" H 10250 7550 50  0001 C CNN
-F 3 "" H 10250 7550 50  0001 C CNN
-	1    10250 7550
+P 10650 8550
+F 0 "#PWR0141" H 10650 8300 50  0001 C CNN
+F 1 "GND" H 10655 8377 50  0000 C CNN
+F 2 "" H 10650 8550 50  0001 C CNN
+F 3 "" H 10650 8550 50  0001 C CNN
+	1    10650 8550
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10600 7100 10550 7100
+	11000 8100 10950 8100
 Wire Wire Line
-	10550 7100 10550 6900
+	10950 8100 10950 7900
 Wire Wire Line
-	10250 7550 10250 7500
-Connection ~ 10250 7500
+	10650 8550 10650 8500
+Connection ~ 10650 8500
 $Comp
-L Device:R R27
+L Device:R R30
 U 1 1 61D66A90
-P 10000 7100
-F 0 "R27" V 9900 7050 50  0000 L CNN
-F 1 "100K" V 10000 7000 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 7100 50  0001 C CNN
-F 3 "~" H 10000 7100 50  0001 C CNN
-	1    10000 7100
+P 10400 8100
+F 0 "R30" V 10300 8050 50  0000 L CNN
+F 1 "100K" V 10400 8000 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 10330 8100 50  0001 C CNN
+F 3 "~" H 10400 8100 50  0001 C CNN
+	1    10400 8100
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	10000 6900 10250 6900
+	10400 7900 10650 7900
 Wire Wire Line
-	10000 7300 10600 7300
+	10400 8300 11000 8300
 $Comp
-L 74xx:74HC00 U8
+L 74xx-ep:74HC00 U8
 U 3 1 5DD40F28
-P 12750 7400
-F 0 "U8" H 12750 7725 50  0000 C CNN
-F 1 "74HC00" H 12750 7634 50  0000 C CNN
-F 2 "footprints:74HC00BQ115" H 12750 7400 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74hc00" H 12750 7400 50  0001 C CNN
-	3    12750 7400
+P 13150 8400
+F 0 "U8" H 13150 8725 50  0000 C CNN
+F 1 "74HC00" H 13150 8634 50  0000 C CNN
+F 2 "footprints:DHVQFN-14_2.5x3.0mm_P0.5mm_EP1.0x1.5mm" H 13150 8400 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74hc00" H 13150 8400 50  0001 C CNN
+	3    13150 8400
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10000 7250 10000 7300
+	10400 8250 10400 8300
 Wire Wire Line
-	10000 6950 10000 6900
+	10400 7950 10400 7900
 Text GLabel 3400 10650 2    55   BiDi ~ 0
 TMUX.GPIO1
 Wire Wire Line
@@ -1378,27 +1378,27 @@ Text GLabel 5600 10050 0    55   BiDi ~ 0
 TMUX.GPIO0
 Wire Wire Line
 	5600 10050 5650 10050
-Text GLabel 12350 7500 0    55   BiDi ~ 0
+Text GLabel 12650 8500 0    55   BiDi ~ 0
 BT81X.GPIO2
 Wire Wire Line
-	12350 7500 12450 7500
+	12650 8500 12750 8500
 Wire Wire Line
-	14850 7300 15050 7300
+	15250 8300 15450 8300
 Wire Wire Line
-	15050 7300 15050 7350
+	15450 8300 15450 8350
 Wire Wire Line
-	14850 7400 14950 7400
+	15250 8400 15350 8400
 Wire Wire Line
-	14950 7400 14950 7250
+	15350 8400 15350 8250
 $Comp
 L myPower:+VSYS #PWR0143
 U 1 1 69EC976C
-P 14950 6900
-F 0 "#PWR0143" H 14950 6750 50  0001 C CNN
-F 1 "+VSYS" H 14950 7040 50  0000 C CNN
-F 2 "" H 14950 6900 50  0001 C CNN
-F 3 "" H 14950 6900 50  0001 C CNN
-	1    14950 6900
+P 15350 7900
+F 0 "#PWR0143" H 15350 7750 50  0001 C CNN
+F 1 "+VSYS" H 15350 8040 50  0000 C CNN
+F 2 "" H 15350 7900 50  0001 C CNN
+F 3 "" H 15350 7900 50  0001 C CNN
+	1    15350 7900
 	1    0    0    -1  
 $EndComp
 $Sheet
@@ -1408,11 +1408,11 @@ F0 "disp" 60
 F1 "disp.sch" 60
 $EndSheet
 Wire Wire Line
-	11600 7300 12450 7300
+	12000 8300 12850 8300
 Wire Wire Line
-	9450 7300 10000 7300
-Connection ~ 10000 7300
-Text Label 9450 7300 0    60   ~ 0
+	9850 8300 10400 8300
+Connection ~ 10400 8300
+Text Label 9850 8300 0    60   ~ 0
 HP_DET
 $Comp
 L tps:TPS62293 U2
@@ -1447,9 +1447,9 @@ F 3 "" H 2300 10100 60  0001 C CNN
 	1    2300 10100
 	1    0    0    -1  
 $EndComp
-Text Label 13050 7400 0    60   ~ 0
+Text Label 13450 8400 0    60   ~ 0
 SPK_GAIN_SEL
-Text Label 11800 7300 0    60   ~ 0
+Text Label 12200 8300 0    60   ~ 0
 HP_SWITCH
 Text GLabel 5600 10250 0    55   BiDi ~ 0
 TMUX.GPIO1
@@ -1469,23 +1469,23 @@ Wire Wire Line
 $Comp
 L sn74:SN74LVC1G3157DCK U15
 U 1 1 5FE56889
-P 14450 7350
-F 0 "U15" H 14450 7700 60  0000 C CNN
-F 1 "SN74LVC1G3157DCK" H 14450 7000 60  0000 C CNN
-F 2 "Package_TO_SOT_SMD:Texas_R-PDSO-G6" H 14450 7350 50  0001 C CNN
-F 3 "" H 14450 7350 50  0001 C CNN
-	1    14450 7350
+P 14850 8350
+F 0 "U15" H 14850 8700 60  0000 C CNN
+F 1 "SN74LVC1G3157DCK" H 14850 8000 60  0000 C CNN
+F 2 "Package_TO_SOT_SMD:Texas_R-PDSO-G6" H 14850 8350 50  0001 C CNN
+F 3 "" H 14850 8350 50  0001 C CNN
+	1    14850 8350
 	1    0    0    -1  
 $EndComp
 $Comp
 L sn74:SN74LVC1G04DCK U14
 U 1 1 5FEACE73
-P 11100 7300
-F 0 "U14" H 11100 7600 60  0000 C CNN
-F 1 "SN74LVC1G04DCK" H 11100 7000 60  0000 C CNN
-F 2 "footprints:Texas_R-PDSO-G5" H 11100 7300 50  0001 C CNN
-F 3 "" H 11100 7300 50  0001 C CNN
-	1    11100 7300
+P 11500 8300
+F 0 "U14" H 11500 8600 60  0000 C CNN
+F 1 "SN74LVC1G04DCK" H 11500 8000 60  0000 C CNN
+F 2 "footprints:Texas_R-PDSO-G5" H 11500 8300 50  0001 C CNN
+F 3 "" H 11500 8300 50  0001 C CNN
+	1    11500 8300
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
@@ -1534,12 +1534,12 @@ BQ_PMID
 $Comp
 L Connector_Generic:Conn_01x04 J5
 U 1 1 603C4198
-P 14900 8450
-F 0 "J5" H 14850 8650 50  0000 L CNN
-F 1 "SPEAKER" H 14650 8150 50  0000 L CNN
-F 2 "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" H 14900 8450 50  0001 C CNN
-F 3 "~" H 14900 8450 50  0001 C CNN
-	1    14900 8450
+P 15300 9450
+F 0 "J5" H 15250 9650 50  0000 L CNN
+F 1 "SPEAKER" H 15050 9150 50  0000 L CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" H 15300 9450 50  0001 C CNN
+F 3 "~" H 15300 9450 50  0001 C CNN
+	1    15300 9450
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
@@ -1573,14 +1573,9 @@ F 3 "" H 1200 1900 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	750  1800 750  1850
-Wire Wire Line
-	750  1850 850  1850
-Wire Wire Line
 	1200 1850 1200 1900
 Wire Wire Line
 	850  1800 850  1850
-Connection ~ 850  1850
 Wire Wire Line
 	850  1850 1200 1850
 Wire Wire Line
@@ -1603,1074 +1598,1000 @@ Wire Wire Line
 	1150 1500 1250 1500
 Wire Wire Line
 	1150 1400 1250 1400
-Text Label 750  2850 0    55   ~ 0
+Text Label 800  3300 0    55   ~ 0
 BQ_PMID
 Wire Wire Line
-	1150 2950 1250 2950
+	1200 3400 1300 3400
 Wire Wire Line
-	1150 3050 1150 2950
+	1200 3500 1200 3400
 $Comp
 L power:GND #PWR03
 U 1 1 6004C514
-P 1150 3050
-F 0 "#PWR03" H 1150 2800 50  0001 C CNN
-F 1 "GND" H 1155 2877 50  0000 C CNN
-F 2 "" H 1150 3050 50  0001 C CNN
-F 3 "" H 1150 3050 50  0001 C CNN
-	1    1150 3050
+P 1200 3500
+F 0 "#PWR03" H 1200 3250 50  0001 C CNN
+F 1 "GND" H 1205 3327 50  0000 C CNN
+F 2 "" H 1200 3500 50  0001 C CNN
+F 3 "" H 1200 3500 50  0001 C CNN
+	1    1200 3500
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	1250 2850 750  2850
+	1300 3300 800  3300
 $Comp
 L Connector_Generic:Conn_01x02 J3
 U 1 1 5FFEAFB1
-P 1450 2850
-F 0 "J3" H 1400 2950 50  0000 L CNN
-F 1 "+5V" H 1350 2650 50  0000 L CNN
-F 2 "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" H 1450 2850 50  0001 C CNN
-F 3 "~" H 1450 2850 50  0001 C CNN
-	1    1450 2850
+P 1500 3300
+F 0 "J3" H 1450 3400 50  0000 L CNN
+F 1 "+5V" H 1400 3100 50  0000 L CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" H 1500 3300 50  0001 C CNN
+F 3 "~" H 1500 3300 50  0001 C CNN
+	1    1500 3300
 	1    0    0    -1  
 $EndComp
-Connection ~ 1550 5850
+Connection ~ 1400 5850
 Wire Wire Line
-	1550 5900 1550 5850
+	1400 5900 1400 5850
 Wire Wire Line
-	1550 5850 1850 5850
+	1400 5850 1800 5850
 Wire Wire Line
-	2850 5750 3200 5750
+	2800 5750 3250 5750
 Wire Wire Line
-	1550 5350 1550 5850
-Connection ~ 1800 5050
+	1400 5350 1400 5850
+Connection ~ 1650 5050
 Wire Wire Line
-	1800 5550 1800 5050
+	1650 5550 1650 5050
 Wire Wire Line
-	1850 5550 1800 5550
+	1800 5550 1650 5550
 Wire Wire Line
-	1550 5050 1800 5050
-Connection ~ 1550 5050
+	1400 5050 1650 5050
+Connection ~ 1400 5050
 Wire Wire Line
-	1550 5150 1550 5050
+	1400 5150 1400 5050
 Wire Wire Line
-	1800 5050 1800 5000
+	1650 5050 1650 5000
 Wire Wire Line
-	1350 5050 1550 5050
+	1200 5050 1400 5050
 Wire Wire Line
-	1350 5100 1350 5050
-Text Label 2950 5650 0    55   ~ 0
+	1200 5100 1200 5050
+Text Label 3000 5650 0    55   ~ 0
 RESET
 Wire Wire Line
-	1250 5750 1850 5750
-Text GLabel 1250 5750 0    55   Input ~ 0
+	1100 5750 1800 5750
+Text GLabel 1100 5750 0    55   Input ~ 0
 WAKE
-Text Label 3200 5750 2    55   ~ 0
+Text Label 3250 5750 2    55   ~ 0
 BQ_QON
 Wire Wire Line
-	1350 5650 1850 5650
-Connection ~ 1350 5650
+	1200 5650 1800 5650
+Connection ~ 1200 5650
 Wire Wire Line
-	1350 5400 1350 5650
+	1200 5400 1200 5650
 $Comp
 L power:+3.3V #PWR0126
 U 1 1 603991C8
-P 1800 5000
-F 0 "#PWR0126" H 1800 4850 50  0001 C CNN
-F 1 "+3.3V" H 1815 5173 50  0000 C CNN
-F 2 "" H 1800 5000 50  0001 C CNN
-F 3 "" H 1800 5000 50  0001 C CNN
-	1    1800 5000
+P 1650 5000
+F 0 "#PWR0126" H 1650 4850 50  0001 C CNN
+F 1 "+3.3V" H 1665 5173 50  0000 C CNN
+F 2 "" H 1650 5000 50  0001 C CNN
+F 3 "" H 1650 5000 50  0001 C CNN
+	1    1650 5000
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0125
 U 1 1 60397DC5
-P 1550 5900
-F 0 "#PWR0125" H 1550 5650 50  0001 C CNN
-F 1 "GND" H 1555 5727 50  0000 C CNN
-F 2 "" H 1550 5900 50  0001 C CNN
-F 3 "" H 1550 5900 50  0001 C CNN
-	1    1550 5900
+P 1400 5900
+F 0 "#PWR0125" H 1400 5650 50  0001 C CNN
+F 1 "GND" H 1405 5727 50  0000 C CNN
+F 2 "" H 1400 5900 50  0001 C CNN
+F 3 "" H 1400 5900 50  0001 C CNN
+	1    1400 5900
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R7
 U 1 1 6033C803
-P 1350 5250
-F 0 "R7" V 1450 5250 50  0000 C CNN
-F 1 "100K" V 1350 5250 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1280 5250 50  0001 C CNN
-F 3 "~" H 1350 5250 50  0001 C CNN
-	1    1350 5250
+P 1200 5250
+F 0 "R7" V 1300 5250 50  0000 C CNN
+F 1 "100K" V 1200 5250 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 1130 5250 50  0001 C CNN
+F 3 "~" H 1200 5250 50  0001 C CNN
+	1    1200 5250
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C45
 U 1 1 60336FA3
-P 1550 5250
-F 0 "C45" H 1550 5350 50  0000 L CNN
-F 1 "0.1uF" H 1550 5150 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 1550 5250 50  0001 C CNN
-F 3 "~" H 1550 5250 50  0001 C CNN
-	1    1550 5250
+P 1400 5250
+F 0 "C45" H 1400 5350 50  0000 L CNN
+F 1 "0.1uF" H 1400 5150 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 1400 5250 50  0001 C CNN
+F 3 "~" H 1400 5250 50  0001 C CNN
+	1    1400 5250
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	1250 5650 1350 5650
+	1100 5650 1200 5650
 $Comp
 L sn74:SN74LVC2G07DCK U16
 U 1 1 601DCF05
-P 2350 5700
-F 0 "U16" H 2350 5950 60  0000 C CNN
-F 1 "SN74LVC2G07DCK" H 2350 5450 60  0000 C CNN
-F 2 "Package_TO_SOT_SMD:Texas_R-PDSO-G6" H 2405 5650 60  0001 C CNN
-F 3 "" H 2405 5650 60  0000 C CNN
-	1    2350 5700
+P 2300 5700
+F 0 "U16" H 2300 5950 60  0000 C CNN
+F 1 "SN74LVC2G07DCK" H 2300 5450 60  0000 C CNN
+F 2 "Package_TO_SOT_SMD:Texas_R-PDSO-G6" H 2355 5650 60  0001 C CNN
+F 3 "" H 2355 5650 60  0000 C CNN
+	1    2300 5700
 	1    0    0    -1  
 $EndComp
 $Comp
 L sit:SiT1533 X1
 U 1 1 616DC275
-P 5050 4600
-F 0 "X1" H 5050 4750 60  0000 C CNN
-F 1 "SiT1533" H 5050 4450 60  0000 C CNN
-F 2 "footprints:SiT1533" H 5200 4600 60  0001 C CNN
-F 3 "" H 5200 4600 60  0001 C CNN
-	1    5050 4600
+P 5150 4600
+F 0 "X1" H 5150 4750 60  0000 C CNN
+F 1 "SiT1533" H 5150 4450 60  0000 C CNN
+F 2 "footprints:SiT1533" H 5300 4600 60  0001 C CNN
+F 3 "" H 5300 4600 60  0001 C CNN
+	1    5150 4600
 	-1   0    0    -1  
 $EndComp
 $Comp
 L issi:IS25LP128-JKLE U5
 U 1 1 615D9E36
-P 7700 7400
-F 0 "U5" H 7700 7800 50  0000 C CNN
-F 1 "IS25LP128-JKLE" H 7700 7000 50  0000 C CNN
-F 2 "Package_SON:WSON-8-1EP_6x5mm_P1.27mm_EP3.4x4mm" H 8750 6900 50  0001 C CNN
-F 3 "" H 7850 7300 50  0001 C CNN
-	1    7700 7400
+P 7800 7400
+F 0 "U5" H 7800 7800 50  0000 C CNN
+F 1 "IS25LP128-JKLE" H 7800 7000 50  0000 C CNN
+F 2 "Package_SON:WSON-8-1EP_6x5mm_P1.27mm_EP3.4x4mm" H 8850 6900 50  0001 C CNN
+F 3 "" H 7950 7300 50  0001 C CNN
+	1    7800 7400
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	8400 7550 8400 7650
-Connection ~ 8400 7550
+	8500 7550 8500 7650
+Connection ~ 8500 7550
 Wire Wire Line
-	8300 7550 8400 7550
+	8400 7550 8500 7550
 Wire Wire Line
-	3100 8400 3100 8650
+	3200 8400 3200 8650
 Wire Wire Line
-	6450 7550 7100 7550
-Connection ~ 6450 7550
+	6550 7550 7200 7550
+Connection ~ 6550 7550
 Wire Wire Line
-	6450 4850 6450 7550
+	6550 4850 6550 7550
 Wire Wire Line
-	6200 7550 6450 7550
+	6300 7550 6550 7550
 Wire Wire Line
-	6250 7650 7100 7650
-Connection ~ 6250 7650
+	6350 7650 7200 7650
+Connection ~ 6350 7650
 Wire Wire Line
-	6250 4850 6250 7650
+	6350 4850 6350 7650
 Wire Wire Line
-	6200 7650 6250 7650
-Text Label 3950 4650 0    55   ~ 0
+	6300 7650 6350 7650
+Text Label 4050 4650 0    55   ~ 0
 PSD_LFALTCLK
-Text Label 6650 7650 0    55   ~ 0
+Text Label 6750 7650 0    55   ~ 0
 QSPI_CS
-Text Label 6650 7550 0    55   ~ 0
+Text Label 6750 7550 0    55   ~ 0
 QSPI_DQ_3
-Text Label 6650 7450 0    55   ~ 0
+Text Label 6750 7450 0    55   ~ 0
 QSPI_DQ_2
-Text Label 6650 7350 0    55   ~ 0
+Text Label 6750 7350 0    55   ~ 0
 QSPI_DQ_1
-Text Label 6650 7250 0    55   ~ 0
+Text Label 6750 7250 0    55   ~ 0
 QSPI_DQ_0
-Text Label 6650 7150 0    55   ~ 0
+Text Label 6750 7150 0    55   ~ 0
 QSPI_CLK
-Text Label 3700 7650 0    55   ~ 0
+Text Label 3800 7650 0    55   ~ 0
 PLL_AVDD
-Text Label 3700 7950 0    55   ~ 0
+Text Label 3800 7950 0    55   ~ 0
 PLL_AVSS
-Connection ~ 3150 7950
+Connection ~ 3250 7950
 Wire Wire Line
-	2800 7950 3150 7950
+	2900 7950 3250 7950
 Wire Wire Line
-	2800 7900 2800 7950
-Connection ~ 2800 7650
+	2900 7900 2900 7950
+Connection ~ 2900 7650
 Wire Wire Line
-	2800 7700 2800 7650
+	2900 7700 2900 7650
 Wire Wire Line
-	3150 7650 4050 7650
+	3250 7650 4150 7650
 Wire Wire Line
-	3150 7950 4050 7950
-Text Label 3700 8150 0    55   ~ 0
+	3250 7950 4150 7950
+Text Label 3800 8150 0    55   ~ 0
 XTAL_XO
-Text Label 3700 8050 0    55   ~ 0
+Text Label 3800 8050 0    55   ~ 0
 XTAL_XI
 Wire Wire Line
-	6250 4500 6250 4550
-Connection ~ 6250 4500
+	6350 4500 6350 4550
+Connection ~ 6350 4500
 Wire Wire Line
-	6450 4500 6250 4500
+	6550 4500 6350 4500
 Wire Wire Line
-	6450 4550 6450 4500
+	6550 4550 6550 4500
 $Comp
 L Device:R R9
 U 1 1 5D8879B2
-P 6450 4700
-F 0 "R9" V 6550 4700 50  0000 C CNN
-F 1 "100K" V 6450 4600 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 6380 4700 50  0001 C CNN
-F 3 "~" H 6450 4700 50  0001 C CNN
-	1    6450 4700
+P 6550 4700
+F 0 "R9" V 6650 4700 50  0000 C CNN
+F 1 "100K" V 6550 4600 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 6480 4700 50  0001 C CNN
+F 3 "~" H 6550 4700 50  0001 C CNN
+	1    6550 4700
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3550 7150 3950 7150
-Connection ~ 3550 7150
+	3650 7150 4050 7150
+Connection ~ 3650 7150
 Wire Wire Line
-	3550 7200 3550 7150
+	3650 7200 3650 7150
 Wire Wire Line
-	3150 7150 3550 7150
-Connection ~ 3150 7150
+	3250 7150 3650 7150
+Connection ~ 3250 7150
 Wire Wire Line
-	3150 7200 3150 7150
-Connection ~ 2800 7150
+	3250 7200 3250 7150
+Connection ~ 2900 7150
 Wire Wire Line
-	2800 7150 3150 7150
+	2900 7150 3250 7150
 $Comp
 L Device:C_Small C19
 U 1 1 5BE30780
-P 3150 7300
-F 0 "C19" H 3242 7346 50  0000 L CNN
-F 1 "0.1uF" H 3242 7255 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 3150 7300 50  0001 C CNN
-F 3 "" H 3150 7300 50  0001 C CNN
-	1    3150 7300
+P 3250 7300
+F 0 "C19" H 3342 7346 50  0000 L CNN
+F 1 "0.1uF" H 3342 7255 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 3250 7300 50  0001 C CNN
+F 3 "" H 3250 7300 50  0001 C CNN
+	1    3250 7300
 	1    0    0    -1  
 $EndComp
-Connection ~ 3150 7650
+Connection ~ 3250 7650
 Wire Wire Line
-	2800 7650 3150 7650
+	2900 7650 3250 7650
 Wire Wire Line
-	2800 7500 2800 7650
+	2900 7500 2900 7650
 Wire Wire Line
-	2800 7200 2800 7150
+	2900 7200 2900 7150
 Wire Wire Line
-	2600 7150 2800 7150
+	2700 7150 2900 7150
 Wire Wire Line
-	3950 7050 3950 7150
+	4050 7050 4050 7150
 Wire Wire Line
-	4050 7050 3950 7050
-Connection ~ 3950 7150
-Connection ~ 3950 6750
+	4150 7050 4050 7050
+Connection ~ 4050 7150
+Connection ~ 4050 6750
 Wire Wire Line
-	3950 6850 3950 6750
+	4050 6850 4050 6750
 Wire Wire Line
-	4050 6850 3950 6850
-Connection ~ 3950 6650
+	4150 6850 4050 6850
+Connection ~ 4050 6650
 Wire Wire Line
-	3950 6750 3950 6650
+	4050 6750 4050 6650
 Wire Wire Line
-	4050 6750 3950 6750
+	4150 6750 4050 6750
 Wire Wire Line
-	3550 6450 3950 6450
-Connection ~ 3550 6450
+	3650 6450 4050 6450
+Connection ~ 3650 6450
 Wire Wire Line
-	3500 4450 3500 4350
+	3900 4500 3900 4400
 $Comp
 L power:+3V3 #PWR0159
 U 1 1 60640014
-P 2700 4350
-F 0 "#PWR0159" H 2700 4200 50  0001 C CNN
-F 1 "+3V3" H 2715 4523 50  0000 C CNN
-F 2 "" H 2700 4350 50  0001 C CNN
-F 3 "" H 2700 4350 50  0001 C CNN
-	1    2700 4350
+P 2800 4400
+F 0 "#PWR0159" H 2800 4250 50  0001 C CNN
+F 1 "+3V3" H 2815 4573 50  0000 C CNN
+F 2 "" H 2800 4400 50  0001 C CNN
+F 3 "" H 2800 4400 50  0001 C CNN
+	1    2800 4400
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:+3V3 #PWR0158
 U 1 1 6063EB30
-P 3500 4350
-F 0 "#PWR0158" H 3500 4200 50  0001 C CNN
-F 1 "+3V3" H 3515 4523 50  0000 C CNN
-F 2 "" H 3500 4350 50  0001 C CNN
-F 3 "" H 3500 4350 50  0001 C CNN
-	1    3500 4350
+P 3900 4400
+F 0 "#PWR0158" H 3900 4250 50  0001 C CNN
+F 1 "+3V3" H 3915 4573 50  0000 C CNN
+F 2 "" H 3900 4400 50  0001 C CNN
+F 3 "" H 3900 4400 50  0001 C CNN
+	1    3900 4400
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:+3V3 #PWR0157
 U 1 1 6063D65E
-P 5650 4300
-F 0 "#PWR0157" H 5650 4150 50  0001 C CNN
-F 1 "+3V3" H 5665 4473 50  0000 C CNN
-F 2 "" H 5650 4300 50  0001 C CNN
-F 3 "" H 5650 4300 50  0001 C CNN
-	1    5650 4300
+P 5750 4300
+F 0 "#PWR0157" H 5750 4150 50  0001 C CNN
+F 1 "+3V3" H 5765 4473 50  0000 C CNN
+F 2 "" H 5750 4300 50  0001 C CNN
+F 3 "" H 5750 4300 50  0001 C CNN
+	1    5750 4300
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	2850 5650 2900 5650
-Wire Wire Line
-	3550 5550 3750 5550
 $Comp
 L power:+3V3 #PWR0156
 U 1 1 6042449B
-P 7150 8150
-F 0 "#PWR0156" H 7150 8000 50  0001 C CNN
-F 1 "+3V3" H 7165 8323 50  0000 C CNN
-F 2 "" H 7150 8150 50  0001 C CNN
-F 3 "" H 7150 8150 50  0001 C CNN
-	1    7150 8150
+P 7250 8150
+F 0 "#PWR0156" H 7250 8000 50  0001 C CNN
+F 1 "+3V3" H 7265 8323 50  0000 C CNN
+F 2 "" H 7250 8150 50  0001 C CNN
+F 3 "" H 7250 8150 50  0001 C CNN
+	1    7250 8150
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:+1V8 #PWR0101
 U 1 1 60422F3A
-P 6700 8150
-F 0 "#PWR0101" H 6700 8000 50  0001 C CNN
-F 1 "+1V8" H 6715 8323 50  0000 C CNN
-F 2 "" H 6700 8150 50  0001 C CNN
-F 3 "" H 6700 8150 50  0001 C CNN
-	1    6700 8150
+P 6800 8150
+F 0 "#PWR0101" H 6800 8000 50  0001 C CNN
+F 1 "+1V8" H 6815 8323 50  0000 C CNN
+F 2 "" H 6800 8150 50  0001 C CNN
+F 3 "" H 6800 8150 50  0001 C CNN
+	1    6800 8150
 	1    0    0    -1  
 $EndComp
 $Comp
 L Switch:SW_Push SW2
 U 1 1 5CC4AF43
-P 3250 4800
-F 0 "SW2" H 3350 4900 50  0000 C CNN
-F 1 "WAKE" H 3250 4700 50  0000 C CNN
-F 2 "footprints:Panasonic_EVPAE" H 3250 5000 50  0001 C CNN
-F 3 "~" H 3250 5000 50  0001 C CNN
-	1    3250 4800
-	-1   0    0    -1  
+P 3650 4850
+F 0 "SW2" H 3550 4950 50  0000 C CNN
+F 1 "WAKE" H 3650 4750 50  0000 C CNN
+F 2 "footprints:Panasonic_EVPAE" H 3650 5050 50  0001 C CNN
+F 3 "~" H 3650 5050 50  0001 C CNN
+	1    3650 4850
+	1    0    0    -1  
 $EndComp
 $Comp
 L Switch:SW_Push SW1
 U 1 1 5CC47B7B
-P 2450 4800
-F 0 "SW1" H 2350 4900 50  0000 C CNN
-F 1 "RESET" H 2450 4700 50  0000 C CNN
-F 2 "Button_Switch_SMD:SW_SPST_PTS810" H 2450 5000 50  0001 C CNN
-F 3 "~" H 2450 5000 50  0001 C CNN
-	1    2450 4800
+P 2550 4850
+F 0 "SW1" H 2450 4950 50  0000 C CNN
+F 1 "RESET" H 2550 4750 50  0000 C CNN
+F 2 "Button_Switch_SMD:SW_SPST_PTS810" H 2550 5050 50  0001 C CNN
+F 3 "~" H 2550 5050 50  0001 C CNN
+	1    2550 4850
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	8400 7150 8400 7250
-Wire Wire Line
-	5650 4350 5650 4550
-Wire Wire Line
-	5800 4650 5800 4700
-Wire Wire Line
-	2900 5650 4050 5650
-Wire Wire Line
-	3050 5050 3050 5100
-Wire Wire Line
-	2250 5050 2250 5100
-Wire Wire Line
-	3750 5550 4050 5550
-Wire Wire Line
-	3500 4800 3750 4800
-Wire Wire Line
-	3500 4800 3500 4850
+	8500 7150 8500 7250
 Wire Wire Line
-	8400 7650 8400 7750
+	5750 4350 5750 4550
 Wire Wire Line
-	2700 4800 2900 4800
+	5900 4650 5900 4700
 Wire Wire Line
-	2700 4800 2700 4850
+	8500 7650 8500 7750
 Wire Wire Line
-	3150 6450 3550 6450
+	3250 6450 3650 6450
 Wire Wire Line
-	2750 6450 3150 6450
+	2850 6450 3250 6450
 Wire Wire Line
-	2350 6450 2750 6450
+	2450 6450 2850 6450
 Wire Wire Line
-	3950 7150 3950 7250
+	4050 7150 4050 7250
 Wire Wire Line
-	3950 6550 3950 6650
+	4050 6550 4050 6650
 Wire Wire Line
-	3950 6450 3950 6550
+	4050 6450 4050 6550
 Wire Wire Line
-	3950 6450 4050 6450
+	4050 6450 4150 6450
 Wire Wire Line
-	3400 8300 3400 8350
+	3500 8300 3500 8350
 Wire Wire Line
-	2800 8300 2800 8350
+	2900 8300 2900 8350
 Wire Wire Line
-	6250 4450 6250 4500
+	6350 4450 6350 4500
 $Comp
 L power:+3.3V #PWR097
 U 1 1 5C98ECA9
-P 6250 4450
-F 0 "#PWR097" H 6250 4300 50  0001 C CNN
-F 1 "+3.3V" H 6250 4590 50  0000 C CNN
-F 2 "" H 6250 4450 50  0001 C CNN
-F 3 "" H 6250 4450 50  0001 C CNN
-	1    6250 4450
+P 6350 4450
+F 0 "#PWR097" H 6350 4300 50  0001 C CNN
+F 1 "+3.3V" H 6350 4590 50  0000 C CNN
+F 2 "" H 6350 4450 50  0001 C CNN
+F 3 "" H 6350 4450 50  0001 C CNN
+	1    6350 4450
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R8
 U 1 1 5C98E0E3
-P 6250 4700
-F 0 "R8" V 6350 4700 50  0000 C CNN
-F 1 "100K" V 6250 4700 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 6180 4700 50  0001 C CNN
-F 3 "" H 6250 4700 50  0001 C CNN
-	1    6250 4700
+P 6350 4700
+F 0 "R8" V 6450 4700 50  0000 C CNN
+F 1 "100K" V 6350 4700 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 6280 4700 50  0001 C CNN
+F 3 "" H 6350 4700 50  0001 C CNN
+	1    6350 4700
 	1    0    0    -1  
 $EndComp
-Connection ~ 8400 7150
+Connection ~ 8500 7150
 Wire Wire Line
-	8400 7050 8400 7150
+	8500 7050 8500 7150
 Wire Wire Line
-	8300 7150 8400 7150
+	8400 7150 8500 7150
 Wire Wire Line
-	2700 4450 2700 4350
-Connection ~ 5650 4350
+	2800 4500 2800 4400
+Connection ~ 5750 4350
 Wire Wire Line
-	5800 4350 5650 4350
+	5900 4350 5750 4350
 Wire Wire Line
-	5800 4400 5800 4350
+	5900 4400 5900 4350
 Wire Wire Line
-	5650 4300 5650 4350
+	5750 4300 5750 4350
 Wire Wire Line
-	5650 4550 5600 4550
+	5750 4550 5700 4550
 Wire Wire Line
-	3950 4650 4500 4650
+	4050 4650 4600 4650
 Wire Wire Line
-	3950 5150 3950 4650
+	4050 5150 4050 4650
 Wire Wire Line
-	4050 5150 3950 5150
-Connection ~ 5800 4650
+	4150 5150 4050 5150
+Connection ~ 5900 4650
 Wire Wire Line
-	5800 4600 5800 4650
+	5900 4600 5900 4650
 Wire Wire Line
-	5600 4650 5800 4650
-Connection ~ 2900 5650
+	5700 4650 5900 4650
+Connection ~ 8500 7650
 Wire Wire Line
-	2900 4800 2900 5650
-Connection ~ 3050 5050
+	4150 6350 4050 6350
 Wire Wire Line
-	3050 4800 3050 5050
+	4000 6150 4150 6150
 Wire Wire Line
-	3500 5050 3050 5050
+	4000 6050 4150 6050
 Wire Wire Line
-	2650 4800 2700 4800
-Connection ~ 2250 5050
+	4000 5950 4150 5950
 Wire Wire Line
-	2700 5050 2250 5050
-Connection ~ 3750 5550
+	4000 5850 4150 5850
 Wire Wire Line
-	3750 4800 3750 5550
-Connection ~ 3500 4800
+	6300 6950 6750 6950
 Wire Wire Line
-	3450 4800 3500 4800
-Connection ~ 8400 7650
+	6300 6850 6750 6850
 Wire Wire Line
-	3850 5250 3850 5350
+	6300 6750 6750 6750
 Wire Wire Line
-	4050 5250 3850 5250
-Connection ~ 2700 4800
+	6300 6650 6750 6650
 Wire Wire Line
-	2700 4750 2700 4800
+	6300 6550 6750 6550
 Wire Wire Line
-	2250 4800 2250 5050
+	6300 6450 6750 6450
 Wire Wire Line
-	4050 6350 3950 6350
+	6300 6350 6750 6350
 Wire Wire Line
-	3600 6150 4050 6150
+	6300 6250 6750 6250
 Wire Wire Line
-	3600 6050 4050 6050
+	6300 6150 6750 6150
 Wire Wire Line
-	3600 5950 4050 5950
+	6300 6050 6750 6050
 Wire Wire Line
-	3600 5850 4050 5850
+	6300 5950 6750 5950
 Wire Wire Line
-	6200 6950 6650 6950
+	6300 5850 6750 5850
 Wire Wire Line
-	6200 6850 6650 6850
+	6300 5750 6750 5750
 Wire Wire Line
-	6200 6750 6650 6750
+	6300 5650 6750 5650
 Wire Wire Line
-	6200 6650 6650 6650
+	6300 5550 6750 5550
 Wire Wire Line
-	6200 6550 6650 6550
+	6300 5450 6750 5450
 Wire Wire Line
-	6200 6450 6650 6450
+	6300 5350 6750 5350
 Wire Wire Line
-	6200 6350 6650 6350
+	6300 5250 6750 5250
 Wire Wire Line
-	6200 6250 6650 6250
+	6300 5150 6750 5150
 Wire Wire Line
-	6200 6150 6650 6150
+	8500 7450 8500 7550
 Wire Wire Line
-	6200 6050 6650 6050
+	8400 7650 8500 7650
 Wire Wire Line
-	6200 5950 6650 5950
+	6300 7450 7200 7450
 Wire Wire Line
-	6200 5850 6650 5850
+	6300 7350 7200 7350
 Wire Wire Line
-	6200 5750 6650 5750
+	6300 7250 7200 7250
 Wire Wire Line
-	6200 5650 6650 5650
+	6300 7150 7200 7150
 Wire Wire Line
-	6200 5550 6650 5550
+	6400 8150 6400 8250
 Wire Wire Line
-	6200 5450 6650 5450
+	6300 8150 6400 8150
 Wire Wire Line
-	6200 5350 6650 5350
+	3650 6450 3650 6500
 Wire Wire Line
-	6200 5250 6650 5250
+	4050 6350 4050 6450
+Connection ~ 3250 6450
 Wire Wire Line
-	6200 5150 6650 5150
+	3250 6450 3250 6500
+Connection ~ 2850 6450
 Wire Wire Line
-	8400 7450 8400 7550
+	2850 6450 2850 6500
+Connection ~ 2450 6450
 Wire Wire Line
-	8300 7650 8400 7650
+	2450 6500 2450 6450
 Wire Wire Line
-	6200 7450 7100 7450
+	3250 7650 3250 7700
 Wire Wire Line
-	6200 7350 7100 7350
+	3250 7900 3250 7950
 Wire Wire Line
-	6200 7250 7100 7250
+	4050 7250 4150 7250
 Wire Wire Line
-	6200 7150 7100 7150
+	4050 7150 4150 7150
+Connection ~ 4050 6550
 Wire Wire Line
-	6300 8150 6300 8250
+	4050 6650 4150 6650
+Connection ~ 4050 6450
 Wire Wire Line
-	6200 8150 6300 8150
+	4050 6550 4150 6550
 Wire Wire Line
-	3550 6450 3550 6500
+	2350 6450 2450 6450
 Wire Wire Line
-	3950 6350 3950 6450
-Connection ~ 3150 6450
+	3500 8550 3500 8650
 Wire Wire Line
-	3150 6450 3150 6500
-Connection ~ 2750 6450
+	2900 8550 2900 8650
+Connection ~ 3500 8300
+Connection ~ 2900 8300
 Wire Wire Line
-	2750 6450 2750 6500
-Connection ~ 2350 6450
+	3500 8150 4150 8150
 Wire Wire Line
-	2350 6500 2350 6450
+	3500 8150 3500 8300
 Wire Wire Line
-	3150 7650 3150 7700
+	3300 8300 3500 8300
 Wire Wire Line
-	3150 7900 3150 7950
+	2900 8050 4150 8050
 Wire Wire Line
-	3950 7250 4050 7250
+	2900 8050 2900 8300
 Wire Wire Line
-	3950 7150 4050 7150
-Connection ~ 3950 6550
-Wire Wire Line
-	3950 6650 4050 6650
-Connection ~ 3950 6450
-Wire Wire Line
-	3950 6550 4050 6550
-Wire Wire Line
-	2250 6450 2350 6450
-Wire Wire Line
-	3400 8550 3400 8650
-Wire Wire Line
-	2800 8550 2800 8650
-Connection ~ 3400 8300
-Connection ~ 2800 8300
-Wire Wire Line
-	3400 8150 4050 8150
-Wire Wire Line
-	3400 8150 3400 8300
-Wire Wire Line
-	3200 8300 3400 8300
-Wire Wire Line
-	2800 8050 4050 8050
-Wire Wire Line
-	2800 8050 2800 8300
-Wire Wire Line
-	3000 8300 2800 8300
-Wire Wire Line
-	3500 4750 3500 4800
+	3100 8300 2900 8300
 $Comp
 L Device:C_Small C13
 U 1 1 5BE30796
-P 2700 4950
-F 0 "C13" H 2700 5050 50  0000 L CNN
-F 1 "10nF" H 2700 4850 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 2700 4950 50  0001 C CNN
-F 3 "" H 2700 4950 50  0001 C CNN
-	1    2700 4950
+P 2900 5100
+F 0 "C13" H 2900 5200 50  0000 L CNN
+F 1 "10nF" H 2900 5000 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 2900 5100 50  0001 C CNN
+F 3 "" H 2900 5100 50  0001 C CNN
+	1    2900 5100
 	1    0    0    -1  
 $EndComp
-Text GLabel 3550 5550 0    55   Input ~ 0
+Text GLabel 3650 5550 0    55   Input ~ 0
 WAKE
 $Comp
 L power:GND #PWR049
 U 1 1 5BE307A0
-P 5800 4700
-F 0 "#PWR049" H 5800 4450 50  0001 C CNN
-F 1 "GND" H 5800 4550 50  0000 C CNN
-F 2 "" H 5800 4700 50  0001 C CNN
-F 3 "" H 5800 4700 50  0001 C CNN
-	1    5800 4700
+P 5900 4700
+F 0 "#PWR049" H 5900 4450 50  0001 C CNN
+F 1 "GND" H 5900 4550 50  0000 C CNN
+F 2 "" H 5900 4700 50  0001 C CNN
+F 3 "" H 5900 4700 50  0001 C CNN
+	1    5900 4700
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C12
 U 1 1 5BE3079E
-P 5800 4500
-F 0 "C12" H 5900 4550 50  0000 L CNN
-F 1 "0.1uF" H 5900 4450 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 5800 4500 50  0001 C CNN
-F 3 "" H 5800 4500 50  0001 C CNN
-	1    5800 4500
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GND #PWR047
-U 1 1 5BE3079C
-P 3850 5350
-F 0 "#PWR047" H 3850 5100 50  0001 C CNN
-F 1 "GND" H 3850 5200 50  0000 C CNN
-F 2 "" H 3850 5350 50  0001 C CNN
-F 3 "" H 3850 5350 50  0001 C CNN
-	1    3850 5350
+P 5900 4500
+F 0 "C12" H 6000 4550 50  0000 L CNN
+F 1 "0.1uF" H 6000 4450 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 5900 4500 50  0001 C CNN
+F 3 "" H 5900 4500 50  0001 C CNN
+	1    5900 4500
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR046
 U 1 1 5BE3079B
-P 6700 8350
-F 0 "#PWR046" H 6700 8100 50  0001 C CNN
-F 1 "GND" H 6700 8200 50  0000 C CNN
-F 2 "" H 6700 8350 50  0001 C CNN
-F 3 "" H 6700 8350 50  0001 C CNN
-	1    6700 8350
+P 6800 8350
+F 0 "#PWR046" H 6800 8100 50  0001 C CNN
+F 1 "GND" H 6800 8200 50  0000 C CNN
+F 2 "" H 6800 8350 50  0001 C CNN
+F 3 "" H 6800 8350 50  0001 C CNN
+	1    6800 8350
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C21
 U 1 1 5BE3079A
-P 6700 8250
-F 0 "C21" H 6800 8300 50  0000 L CNN
-F 1 "10uF" H 6800 8200 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 6700 8250 50  0001 C CNN
-F 3 "" H 6700 8250 50  0001 C CNN
-	1    6700 8250
+P 6800 8250
+F 0 "C21" H 6900 8300 50  0000 L CNN
+F 1 "10uF" H 6900 8200 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 6800 8250 50  0001 C CNN
+F 3 "" H 6800 8250 50  0001 C CNN
+	1    6800 8250
 	1    0    0    -1  
 $EndComp
-NoConn ~ 4050 5450
-NoConn ~ 4050 5350
 $Comp
 L Device:R R11
 U 1 1 5BE30798
-P 3500 4600
-F 0 "R11" V 3400 4600 50  0000 C CNN
-F 1 "100K" V 3500 4600 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 3430 4600 50  0001 C CNN
-F 3 "" H 3500 4600 50  0001 C CNN
-	1    3500 4600
+P 3900 4650
+F 0 "R11" V 3800 4650 50  0000 C CNN
+F 1 "100K" V 3900 4650 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 3830 4650 50  0001 C CNN
+F 3 "" H 3900 4650 50  0001 C CNN
+	1    3900 4650
 	-1   0    0    1   
 $EndComp
-Text GLabel 1250 5650 0    55   Input ~ 0
+Text GLabel 1100 5650 0    55   Input ~ 0
 JTAG_TRST_N
 $Comp
 L Device:R R10
 U 1 1 5BE30792
-P 2700 4600
-F 0 "R10" V 2600 4600 50  0000 C CNN
-F 1 "100K" V 2700 4600 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2630 4600 50  0001 C CNN
-F 3 "" H 2700 4600 50  0001 C CNN
-	1    2700 4600
+P 2800 4650
+F 0 "R10" V 2700 4650 50  0000 C CNN
+F 1 "100K" V 2800 4650 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 4650 50  0001 C CNN
+F 3 "" H 2800 4650 50  0001 C CNN
+	1    2800 4650
 	-1   0    0    1   
 $EndComp
 $Comp
 L power:GND #PWR041
 U 1 1 5BE30790
-P 2250 5100
-F 0 "#PWR041" H 2250 4850 50  0001 C CNN
-F 1 "GND" H 2255 4927 50  0000 C CNN
-F 2 "" H 2250 5100 50  0001 C CNN
-F 3 "" H 2250 5100 50  0001 C CNN
-	1    2250 5100
+P 2300 4900
+F 0 "#PWR041" H 2300 4650 50  0001 C CNN
+F 1 "GND" H 2305 4727 50  0000 C CNN
+F 2 "" H 2300 4900 50  0001 C CNN
+F 3 "" H 2300 4900 50  0001 C CNN
+	1    2300 4900
 	1    0    0    -1  
 $EndComp
-Text GLabel 3600 6150 0    55   Input ~ 0
+Text GLabel 4000 6150 0    55   Input ~ 0
 JTAG_TDI
-Text GLabel 3600 6050 0    55   Input ~ 0
+Text GLabel 4000 6050 0    55   Input ~ 0
 JTAG_TMS
-Text GLabel 3600 5950 0    55   Output ~ 0
+Text GLabel 4000 5950 0    55   Output ~ 0
 JTAG_TDO
-Text GLabel 3600 5850 0    55   Input ~ 0
+Text GLabel 4000 5850 0    55   Input ~ 0
 JTAG_TCK
-Text GLabel 6650 6950 2    55   BiDi ~ 0
+Text GLabel 6750 6950 2    55   BiDi ~ 0
 GPIO_0
-Text GLabel 6650 6850 2    55   Output ~ 0
+Text GLabel 6750 6850 2    55   Output ~ 0
 PWM0.1
-Text GLabel 6650 6750 2    55   Output ~ 0
+Text GLabel 6750 6750 2    55   Output ~ 0
 SPI1.SS0
-Text GLabel 6650 6650 2    55   Output ~ 0
+Text GLabel 6750 6650 2    55   Output ~ 0
 SPI1.MOSI
-Text GLabel 6650 6550 2    55   Input ~ 0
+Text GLabel 6750 6550 2    55   Input ~ 0
 SPI1.MISO
-Text GLabel 6650 6450 2    55   Output ~ 0
+Text GLabel 6750 6450 2    55   Output ~ 0
 SPI1.SCK
-Text GLabel 6650 6350 2    55   Output ~ 0
+Text GLabel 6750 6350 2    55   Output ~ 0
 SPI1.SS2
-Text GLabel 6650 6250 2    55   Output ~ 0
+Text GLabel 6750 6250 2    55   Output ~ 0
 SPI1.SS3
-Text GLabel 6650 6150 2    55   Output ~ 0
+Text GLabel 6750 6150 2    55   Output ~ 0
 PWM2.1
-Text GLabel 6650 6050 2    55   BiDi ~ 0
+Text GLabel 6750 6050 2    55   BiDi ~ 0
 GPIO_12
-Text GLabel 6650 5950 2    55   BiDi ~ 0
+Text GLabel 6750 5950 2    55   BiDi ~ 0
 GPIO_13
-Text GLabel 6650 5850 2    55   Input ~ 0
+Text GLabel 6750 5850 2    55   Input ~ 0
 UART0.RXD
-Text GLabel 6650 5750 2    55   Output ~ 0
+Text GLabel 6750 5750 2    55   Output ~ 0
 UART0.TXD
-Text GLabel 6650 5650 2    55   BiDi ~ 0
+Text GLabel 6750 5650 2    55   BiDi ~ 0
 GPIO_18
-Text GLabel 6650 5550 2    55   Output ~ 0
+Text GLabel 6750 5550 2    55   Output ~ 0
 PWM1.1
-Text GLabel 6650 5450 2    55   BiDi ~ 0
+Text GLabel 6750 5450 2    55   BiDi ~ 0
 GPIO_20
-Text GLabel 6650 5350 2    55   Output ~ 0
+Text GLabel 6750 5350 2    55   Output ~ 0
 PWM1.2
-Text GLabel 6650 5250 2    55   BiDi ~ 0
+Text GLabel 6750 5250 2    55   BiDi ~ 0
 GPIO_22
-Text GLabel 6650 5150 2    55   BiDi ~ 0
+Text GLabel 6750 5150 2    55   BiDi ~ 0
 GPIO_23
 $Comp
 L power:GND #PWR040
 U 1 1 5BE3078C
-P 8400 7750
-F 0 "#PWR040" H 8400 7500 50  0001 C CNN
-F 1 "GND" H 8405 7577 50  0000 C CNN
-F 2 "" H 8400 7750 50  0001 C CNN
-F 3 "" H 8400 7750 50  0001 C CNN
-	1    8400 7750
+P 8500 7750
+F 0 "#PWR040" H 8500 7500 50  0001 C CNN
+F 1 "GND" H 8505 7577 50  0000 C CNN
+F 2 "" H 8500 7750 50  0001 C CNN
+F 3 "" H 8500 7750 50  0001 C CNN
+	1    8500 7750
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:+3V3 #PWR039
 U 1 1 5BE3078B
-P 8400 7050
-F 0 "#PWR039" H 8400 6900 50  0001 C CNN
-F 1 "+3V3" V 8415 7178 50  0000 L CNN
-F 2 "" H 8400 7050 50  0001 C CNN
-F 3 "" H 8400 7050 50  0001 C CNN
-	1    8400 7050
+P 8500 7050
+F 0 "#PWR039" H 8500 6900 50  0001 C CNN
+F 1 "+3V3" V 8515 7178 50  0000 L CNN
+F 2 "" H 8500 7050 50  0001 C CNN
+F 3 "" H 8500 7050 50  0001 C CNN
+	1    8500 7050
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C27
 U 1 1 5BE3078A
-P 8400 7350
-F 0 "C27" H 8450 7450 50  0000 L CNN
-F 1 "0.1uF" H 8450 7250 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 8400 7350 50  0001 C CNN
-F 3 "" H 8400 7350 50  0001 C CNN
-	1    8400 7350
+P 8500 7350
+F 0 "C27" H 8550 7450 50  0000 L CNN
+F 1 "0.1uF" H 8550 7250 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 8500 7350 50  0001 C CNN
+F 3 "" H 8500 7350 50  0001 C CNN
+	1    8500 7350
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR038
 U 1 1 5BE30788
-P 6300 8250
-F 0 "#PWR038" H 6300 8000 50  0001 C CNN
-F 1 "GND" H 6305 8077 50  0000 C CNN
-F 2 "" H 6300 8250 50  0001 C CNN
-F 3 "" H 6300 8250 50  0001 C CNN
-	1    6300 8250
+P 6400 8250
+F 0 "#PWR038" H 6400 8000 50  0001 C CNN
+F 1 "GND" H 6405 8077 50  0000 C CNN
+F 2 "" H 6400 8250 50  0001 C CNN
+F 3 "" H 6400 8250 50  0001 C CNN
+	1    6400 8250
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR037
 U 1 1 5BE30787
-P 7150 8350
-F 0 "#PWR037" H 7150 8100 50  0001 C CNN
-F 1 "GND" H 7155 8177 50  0000 C CNN
-F 2 "" H 7150 8350 50  0001 C CNN
-F 3 "" H 7150 8350 50  0001 C CNN
-	1    7150 8350
+P 7250 8350
+F 0 "#PWR037" H 7250 8100 50  0001 C CNN
+F 1 "GND" H 7255 8177 50  0000 C CNN
+F 2 "" H 7250 8350 50  0001 C CNN
+F 3 "" H 7250 8350 50  0001 C CNN
+	1    7250 8350
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C22
 U 1 1 5BE30786
-P 7150 8250
-F 0 "C22" H 7242 8296 50  0000 L CNN
-F 1 "10uF" H 7242 8205 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 7150 8250 50  0001 C CNN
-F 3 "" H 7150 8250 50  0001 C CNN
-	1    7150 8250
+P 7250 8250
+F 0 "C22" H 7342 8296 50  0000 L CNN
+F 1 "10uF" H 7342 8205 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 7250 8250 50  0001 C CNN
+F 3 "" H 7250 8250 50  0001 C CNN
+	1    7250 8250
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR036
 U 1 1 5BE30785
-P 3550 7400
-F 0 "#PWR036" H 3550 7150 50  0001 C CNN
-F 1 "GND" H 3555 7227 50  0000 C CNN
-F 2 "" H 3550 7400 50  0001 C CNN
-F 3 "" H 3550 7400 50  0001 C CNN
-	1    3550 7400
+P 3650 7400
+F 0 "#PWR036" H 3650 7150 50  0001 C CNN
+F 1 "GND" H 3655 7227 50  0000 C CNN
+F 2 "" H 3650 7400 50  0001 C CNN
+F 3 "" H 3650 7400 50  0001 C CNN
+	1    3650 7400
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR035
 U 1 1 5BE30784
-P 3150 7400
-F 0 "#PWR035" H 3150 7150 50  0001 C CNN
-F 1 "GND" H 3155 7227 50  0000 C CNN
-F 2 "" H 3150 7400 50  0001 C CNN
-F 3 "" H 3150 7400 50  0001 C CNN
-	1    3150 7400
+P 3250 7400
+F 0 "#PWR035" H 3250 7150 50  0001 C CNN
+F 1 "GND" H 3255 7227 50  0000 C CNN
+F 2 "" H 3250 7400 50  0001 C CNN
+F 3 "" H 3250 7400 50  0001 C CNN
+	1    3250 7400
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR034
 U 1 1 5BE30783
-P 3550 6700
-F 0 "#PWR034" H 3550 6450 50  0001 C CNN
-F 1 "GND" H 3555 6527 50  0000 C CNN
-F 2 "" H 3550 6700 50  0001 C CNN
-F 3 "" H 3550 6700 50  0001 C CNN
-	1    3550 6700
+P 3650 6700
+F 0 "#PWR034" H 3650 6450 50  0001 C CNN
+F 1 "GND" H 3655 6527 50  0000 C CNN
+F 2 "" H 3650 6700 50  0001 C CNN
+F 3 "" H 3650 6700 50  0001 C CNN
+	1    3650 6700
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C18
 U 1 1 5BE30782
-P 3550 6600
-F 0 "C18" H 3642 6646 50  0000 L CNN
-F 1 "0.1uF" H 3642 6555 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 3550 6600 50  0001 C CNN
-F 3 "" H 3550 6600 50  0001 C CNN
-	1    3550 6600
+P 3650 6600
+F 0 "C18" H 3742 6646 50  0000 L CNN
+F 1 "0.1uF" H 3742 6555 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 3650 6600 50  0001 C CNN
+F 3 "" H 3650 6600 50  0001 C CNN
+	1    3650 6600
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C20
 U 1 1 5BE30781
-P 3550 7300
-F 0 "C20" H 3642 7346 50  0000 L CNN
-F 1 "0.1uF" H 3642 7255 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 3550 7300 50  0001 C CNN
-F 3 "" H 3550 7300 50  0001 C CNN
-	1    3550 7300
+P 3650 7300
+F 0 "C20" H 3742 7346 50  0000 L CNN
+F 1 "0.1uF" H 3742 7255 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 3650 7300 50  0001 C CNN
+F 3 "" H 3650 7300 50  0001 C CNN
+	1    3650 7300
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R12
 U 1 1 5BE3077F
-P 2800 7350
-F 0 "R12" V 2900 7350 50  0000 C CNN
-F 1 "100R" V 2800 7350 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 7350 50  0001 C CNN
-F 3 "" H 2800 7350 50  0001 C CNN
-	1    2800 7350
+P 2900 7350
+F 0 "R12" V 3000 7350 50  0000 C CNN
+F 1 "100R" V 2900 7350 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 2830 7350 50  0001 C CNN
+F 3 "" H 2900 7350 50  0001 C CNN
+	1    2900 7350
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR033
 U 1 1 5BE3077E
-P 3150 6700
-F 0 "#PWR033" H 3150 6450 50  0001 C CNN
-F 1 "GND" H 3155 6527 50  0000 C CNN
-F 2 "" H 3150 6700 50  0001 C CNN
-F 3 "" H 3150 6700 50  0001 C CNN
-	1    3150 6700
+P 3250 6700
+F 0 "#PWR033" H 3250 6450 50  0001 C CNN
+F 1 "GND" H 3255 6527 50  0000 C CNN
+F 2 "" H 3250 6700 50  0001 C CNN
+F 3 "" H 3250 6700 50  0001 C CNN
+	1    3250 6700
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR032
 U 1 1 5BE3077D
-P 2750 6700
-F 0 "#PWR032" H 2750 6450 50  0001 C CNN
-F 1 "GND" H 2755 6527 50  0000 C CNN
-F 2 "" H 2750 6700 50  0001 C CNN
-F 3 "" H 2750 6700 50  0001 C CNN
-	1    2750 6700
+P 2850 6700
+F 0 "#PWR032" H 2850 6450 50  0001 C CNN
+F 1 "GND" H 2855 6527 50  0000 C CNN
+F 2 "" H 2850 6700 50  0001 C CNN
+F 3 "" H 2850 6700 50  0001 C CNN
+	1    2850 6700
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR031
 U 1 1 5BE3077C
-P 2350 6700
-F 0 "#PWR031" H 2350 6450 50  0001 C CNN
-F 1 "GND" H 2355 6527 50  0000 C CNN
-F 2 "" H 2350 6700 50  0001 C CNN
-F 3 "" H 2350 6700 50  0001 C CNN
-	1    2350 6700
+P 2450 6700
+F 0 "#PWR031" H 2450 6450 50  0001 C CNN
+F 1 "GND" H 2455 6527 50  0000 C CNN
+F 2 "" H 2450 6700 50  0001 C CNN
+F 3 "" H 2450 6700 50  0001 C CNN
+	1    2450 6700
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C15
 U 1 1 5BE3077B
-P 2350 6600
-F 0 "C15" H 2442 6646 50  0000 L CNN
-F 1 "0.1uF" H 2442 6555 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 2350 6600 50  0001 C CNN
-F 3 "" H 2350 6600 50  0001 C CNN
-	1    2350 6600
+P 2450 6600
+F 0 "C15" H 2542 6646 50  0000 L CNN
+F 1 "0.1uF" H 2542 6555 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 2450 6600 50  0001 C CNN
+F 3 "" H 2450 6600 50  0001 C CNN
+	1    2450 6600
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C23
 U 1 1 5BE30779
-P 2800 7800
-F 0 "C23" H 2892 7846 50  0000 L CNN
-F 1 "0.1uF" H 2892 7755 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 2800 7800 50  0001 C CNN
-F 3 "" H 2800 7800 50  0001 C CNN
-	1    2800 7800
+P 2900 7800
+F 0 "C23" H 2992 7846 50  0000 L CNN
+F 1 "0.1uF" H 2992 7755 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 2900 7800 50  0001 C CNN
+F 3 "" H 2900 7800 50  0001 C CNN
+	1    2900 7800
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C24
 U 1 1 5BE30778
-P 3150 7800
-F 0 "C24" H 3242 7846 50  0000 L CNN
-F 1 "0.1uF" H 3242 7755 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 3150 7800 50  0001 C CNN
-F 3 "" H 3150 7800 50  0001 C CNN
-	1    3150 7800
+P 3250 7800
+F 0 "C24" H 3342 7846 50  0000 L CNN
+F 1 "0.1uF" H 3342 7755 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 3250 7800 50  0001 C CNN
+F 3 "" H 3250 7800 50  0001 C CNN
+	1    3250 7800
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C17
 U 1 1 5BE30777
-P 3150 6600
-F 0 "C17" H 3242 6646 50  0000 L CNN
-F 1 "0.1uF" H 3242 6555 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 3150 6600 50  0001 C CNN
-F 3 "" H 3150 6600 50  0001 C CNN
-	1    3150 6600
+P 3250 6600
+F 0 "C17" H 3342 6646 50  0000 L CNN
+F 1 "0.1uF" H 3342 6555 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 3250 6600 50  0001 C CNN
+F 3 "" H 3250 6600 50  0001 C CNN
+	1    3250 6600
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C16
 U 1 1 5BE30776
-P 2750 6600
-F 0 "C16" H 2842 6646 50  0000 L CNN
-F 1 "0.1uF" H 2842 6555 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 2750 6600 50  0001 C CNN
-F 3 "" H 2750 6600 50  0001 C CNN
-	1    2750 6600
+P 2850 6600
+F 0 "C16" H 2942 6646 50  0000 L CNN
+F 1 "0.1uF" H 2942 6555 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 2850 6600 50  0001 C CNN
+F 3 "" H 2850 6600 50  0001 C CNN
+	1    2850 6600
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:+1V8 #PWR029
 U 1 1 5BE30775
-P 2600 7150
-F 0 "#PWR029" H 2600 7000 50  0001 C CNN
-F 1 "+1V8" V 2615 7278 50  0000 L CNN
-F 2 "" H 2600 7150 50  0001 C CNN
-F 3 "" H 2600 7150 50  0001 C CNN
-	1    2600 7150
+P 2700 7150
+F 0 "#PWR029" H 2700 7000 50  0001 C CNN
+F 1 "+1V8" V 2715 7278 50  0000 L CNN
+F 2 "" H 2700 7150 50  0001 C CNN
+F 3 "" H 2700 7150 50  0001 C CNN
+	1    2700 7150
 	0    -1   -1   0   
 $EndComp
 $Comp
 L power:+3V3 #PWR028
 U 1 1 5BE30774
-P 2250 6450
-F 0 "#PWR028" H 2250 6300 50  0001 C CNN
-F 1 "+3V3" V 2265 6578 50  0000 L CNN
-F 2 "" H 2250 6450 50  0001 C CNN
-F 3 "" H 2250 6450 50  0001 C CNN
-	1    2250 6450
+P 2350 6450
+F 0 "#PWR028" H 2350 6300 50  0001 C CNN
+F 1 "+3V3" V 2365 6578 50  0000 L CNN
+F 2 "" H 2350 6450 50  0001 C CNN
+F 3 "" H 2350 6450 50  0001 C CNN
+	1    2350 6450
 	0    -1   -1   0   
 $EndComp
 $Comp
 L Device:Crystal_GND3_Small Y1
 U 1 1 5BE30773
-P 3100 8300
-F 0 "Y1" H 3200 8200 50  0000 C CNN
-F 1 "16MHz" H 3100 8434 50  0000 C CNN
-F 2 "footprints:TXC_7M" H 3100 8300 50  0001 C CNN
-F 3 "" H 3100 8300 50  0001 C CNN
-	1    3100 8300
+P 3200 8300
+F 0 "Y1" H 3300 8200 50  0000 C CNN
+F 1 "16MHz" H 3200 8434 50  0000 C CNN
+F 2 "footprints:TXC_7M" H 3200 8300 50  0001 C CNN
+F 3 "" H 3200 8300 50  0001 C CNN
+	1    3200 8300
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR027
 U 1 1 5BE30770
-P 3400 8650
-F 0 "#PWR027" H 3400 8400 50  0001 C CNN
-F 1 "GND" H 3405 8477 50  0000 C CNN
-F 2 "" H 3400 8650 50  0001 C CNN
-F 3 "" H 3400 8650 50  0001 C CNN
-	1    3400 8650
+P 3500 8650
+F 0 "#PWR027" H 3500 8400 50  0001 C CNN
+F 1 "GND" H 3505 8477 50  0000 C CNN
+F 2 "" H 3500 8650 50  0001 C CNN
+F 3 "" H 3500 8650 50  0001 C CNN
+	1    3500 8650
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR026
 U 1 1 5BE3076F
-P 2800 8650
-F 0 "#PWR026" H 2800 8400 50  0001 C CNN
-F 1 "GND" H 2805 8477 50  0000 C CNN
-F 2 "" H 2800 8650 50  0001 C CNN
-F 3 "" H 2800 8650 50  0001 C CNN
-	1    2800 8650
+P 2900 8650
+F 0 "#PWR026" H 2900 8400 50  0001 C CNN
+F 1 "GND" H 2905 8477 50  0000 C CNN
+F 2 "" H 2900 8650 50  0001 C CNN
+F 3 "" H 2900 8650 50  0001 C CNN
+	1    2900 8650
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C25
 U 1 1 5BE3076E
-P 2800 8450
-F 0 "C25" H 2600 8500 50  0000 L CNN
-F 1 "10pF" H 2500 8400 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 2800 8450 50  0001 C CNN
-F 3 "" H 2800 8450 50  0001 C CNN
-	1    2800 8450
+P 2900 8450
+F 0 "C25" H 2700 8500 50  0000 L CNN
+F 1 "10pF" H 2600 8400 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 2900 8450 50  0001 C CNN
+F 3 "" H 2900 8450 50  0001 C CNN
+	1    2900 8450
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C_Small C26
 U 1 1 5BE3076D
-P 3400 8450
-F 0 "C26" H 3492 8496 50  0000 L CNN
-F 1 "10pF" H 3492 8405 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 3400 8450 50  0001 C CNN
-F 3 "" H 3400 8450 50  0001 C CNN
-	1    3400 8450
+P 3500 8450
+F 0 "C26" H 3592 8496 50  0000 L CNN
+F 1 "10pF" H 3592 8405 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 3500 8450 50  0001 C CNN
+F 3 "" H 3500 8450 50  0001 C CNN
+	1    3500 8450
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR025
 U 1 1 5BE3076C
-P 3100 8650
-F 0 "#PWR025" H 3100 8400 50  0001 C CNN
-F 1 "GND" H 3105 8477 50  0000 C CNN
-F 2 "" H 3100 8650 50  0001 C CNN
-F 3 "" H 3100 8650 50  0001 C CNN
-	1    3100 8650
+P 3200 8650
+F 0 "#PWR025" H 3200 8400 50  0001 C CNN
+F 1 "GND" H 3205 8477 50  0000 C CNN
+F 2 "" H 3200 8650 50  0001 C CNN
+F 3 "" H 3200 8650 50  0001 C CNN
+	1    3200 8650
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR023
 U 1 1 5B8B5218
-P 3050 5100
-F 0 "#PWR023" H 3050 4850 50  0001 C CNN
-F 1 "GND" H 3050 4950 50  0000 C CNN
-F 2 "" H 3050 5100 50  0001 C CNN
-F 3 "" H 3050 5100 50  0001 C CNN
-	1    3050 5100
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:C_Small C14
-U 1 1 5B8B4F0E
-P 3500 4950
-F 0 "C14" H 3525 5050 50  0000 L CNN
-F 1 "10nF" H 3525 4850 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 3538 4800 50  0001 C CNN
-F 3 "" H 3500 4950 50  0001 C CNN
-	1    3500 4950
+P 3400 4900
+F 0 "#PWR023" H 3400 4650 50  0001 C CNN
+F 1 "GND" H 3400 4750 50  0000 C CNN
+F 2 "" H 3400 4900 50  0001 C CNN
+F 3 "" H 3400 4900 50  0001 C CNN
+	1    3400 4900
 	1    0    0    -1  
 $EndComp
 Text Label 8200 2100 0    55   ~ 0
@@ -2748,7 +2669,7 @@ Wire Wire Line
 Wire Wire Line
 	12950 5350 15000 5350
 Wire Wire Line
-	12700 1750 12800 1750
+	12700 1600 12800 1600
 Wire Wire Line
 	13800 3950 13800 5050
 Wire Wire Line
@@ -2805,10 +2726,10 @@ Wire Wire Line
 Wire Wire Line
 	14350 4550 14700 4550
 $Comp
-L Device:R R26
+L Device:R R29
 U 1 1 6127308F
 P 14700 4750
-F 0 "R26" V 14800 4700 50  0000 L CNN
+F 0 "R29" V 14800 4700 50  0000 L CNN
 F 1 "47K" V 14700 4650 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 14630 4750 50  0001 C CNN
 F 3 "~" H 14700 4750 50  0001 C CNN
@@ -2816,10 +2737,10 @@ F 3 "~" H 14700 4750 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L Device:R R25
+L Device:R R28
 U 1 1 6127237F
 P 14500 4750
-F 0 "R25" V 14600 4700 50  0000 L CNN
+F 0 "R28" V 14600 4700 50  0000 L CNN
 F 1 "47K" V 14500 4650 50  0000 L CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 14430 4750 50  0001 C CNN
 F 3 "~" H 14500 4750 50  0001 C CNN
@@ -2866,10 +2787,10 @@ $EndComp
 Wire Wire Line
 	11550 5150 11650 5150
 $Comp
-L Device:R R24
+L Device:R R27
 U 1 1 607FF04C
 P 11400 5150
-F 0 "R24" V 11300 5150 50  0000 C CNN
+F 0 "R27" V 11300 5150 50  0000 C CNN
 F 1 "255K" V 11400 5150 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 11330 5150 50  0001 C CNN
 F 3 "~" H 11400 5150 50  0001 C CNN
@@ -2975,7 +2896,7 @@ Text Label 10850 5150 0    60   ~ 0
 SPK_EN
 Text GLabel 11600 5550 0    55   Input ~ 0
 PWM2.1
-Text GLabel 12800 1750 2    55   Output ~ 0
+Text GLabel 12800 1600 2    55   Output ~ 0
 DISP_CS
 Text Label 10650 5550 2    60   ~ 0
 SPK_SD
@@ -2985,7 +2906,7 @@ Connection ~ 15100 2100
 Wire Wire Line
 	15500 2100 15100 2100
 Wire Wire Line
-	15500 1350 15500 2100
+	15500 1350 15500 1500
 Wire Wire Line
 	15100 1000 15100 1050
 Connection ~ 15100 1000
@@ -2998,12 +2919,12 @@ Wire Wire Line
 Wire Wire Line
 	15100 950  15100 1000
 $Comp
-L 74xx:74HC00 U8
+L 74xx-ep:74HC00 U8
 U 5 1 5E6A9496
 P 15100 1550
 F 0 "U8" H 15150 1900 50  0000 L CNN
 F 1 "74HC00" H 15150 1200 50  0000 L CNN
-F 2 "footprints:74HC00BQ115" H 15100 1550 50  0001 C CNN
+F 2 "footprints:DHVQFN-14_2.5x3.0mm_P0.5mm_EP1.0x1.5mm" H 15100 1550 50  0001 C CNN
 F 3 "http://www.ti.com/lit/gpn/sn74hc00" H 15100 1550 50  0001 C CNN
 	5    15100 1550
 	1    0    0    -1  
@@ -3014,7 +2935,7 @@ Connection ~ 14000 2100
 Wire Wire Line
 	14400 2100 14000 2100
 Wire Wire Line
-	14400 1350 14400 2100
+	14400 1350 14400 1500
 Wire Wire Line
 	14000 2050 14000 2100
 Wire Wire Line
@@ -3027,12 +2948,12 @@ Wire Wire Line
 Wire Wire Line
 	14000 950  14000 1000
 $Comp
-L 74xx:74HC00 U7
+L 74xx-ep:74HC00 U7
 U 5 1 5DF6F6B5
 P 14000 1550
 F 0 "U7" H 14050 1900 50  0000 L CNN
 F 1 "74HC00" H 14050 1200 50  0000 L CNN
-F 2 "footprints:74HC00BQ115" H 14000 1550 50  0001 C CNN
+F 2 "footprints:DHVQFN-14_2.5x3.0mm_P0.5mm_EP1.0x1.5mm" H 14000 1550 50  0001 C CNN
 F 3 "http://www.ti.com/lit/gpn/sn74hc00" H 14000 1550 50  0001 C CNN
 	5    14000 1550
 	1    0    0    -1  
@@ -3050,16 +2971,16 @@ Wire Wire Line
 Wire Wire Line
 	9650 5750 9650 5800
 Wire Wire Line
-	8950 5150 8950 5800
+	8950 5150 8950 5550
 Wire Wire Line
 	8850 4350 9650 4350
 $Comp
-L 74xx:74HC595 U10
+L 74xx-ep:74HC595 U10
 U 1 1 5CCEC0AE
 P 9650 5050
 F 0 "U10" H 9850 5600 50  0000 C CNN
 F 1 "74HC595" H 9850 4400 50  0000 C CNN
-F 2 "footprints:74HC595BQ115" H 9650 5050 50  0001 C CNN
+F 2 "footprints:DHVQFN-16_2.5x3.5mm_P0.5mm_EP1.0x2.0mm" H 9650 5050 50  0001 C CNN
 F 3 "http://www.ti.com/lit/ds/symlink/sn74hc595.pdf" H 9650 5050 50  0001 C CNN
 	1    9650 5050
 	1    0    0    -1  
@@ -3128,7 +3049,7 @@ Wire Wire Line
 Connection ~ 8850 4950
 Wire Wire Line
 	9050 4850 9250 4850
-Text Label 13200 2450 2    60   ~ 0
+Text Label 13200 2300 2    60   ~ 0
 SPK_CLK
 Text Label 13250 4050 0    60   ~ 0
 SPK_L-
@@ -3283,7 +3204,7 @@ Wire Wire Line
 Connection ~ 11300 1200
 Wire Wire Line
 	11200 1200 11300 1200
-Connection ~ 11300 1950
+Connection ~ 11300 1800
 $Comp
 L max:MAX98357 U12
 U 1 1 6157FD5C
@@ -3307,17 +3228,17 @@ F 3 "" H 9650 1700 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	11300 2550 11400 2550
+	11300 2400 11400 2400
 Wire Wire Line
-	11200 1650 12100 1650
+	11200 1500 12100 1500
 Wire Wire Line
-	12000 1850 12100 1850
+	12000 1700 12100 1700
 Wire Wire Line
-	11300 1750 11400 1750
+	11300 1600 11400 1600
 Wire Wire Line
-	11300 1950 11300 1750
+	11300 1800 11300 1600
 Wire Wire Line
-	11400 1950 11300 1950
+	11400 1800 11300 1800
 Wire Wire Line
 	11200 900  12100 900 
 Wire Wire Line
@@ -3325,10 +3246,10 @@ Wire Wire Line
 Wire Wire Line
 	11550 3750 11650 3750
 $Comp
-L Device:R R23
+L Device:R R26
 U 1 1 60534525
 P 11400 3750
-F 0 "R23" V 11300 3750 50  0000 C CNN
+F 0 "R26" V 11300 3750 50  0000 C CNN
 F 1 "2.2K" V 11400 3750 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 11330 3750 50  0001 C CNN
 F 3 "~" H 11400 3750 50  0001 C CNN
@@ -3336,14 +3257,14 @@ F 3 "~" H 11400 3750 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	10900 2350 11300 2350
-Connection ~ 11300 2350
-Text Label 10900 2350 0    55   ~ 0
+	10900 2200 11300 2200
+Connection ~ 11300 2200
+Text Label 10900 2200 0    55   ~ 0
 MIC_CLK
 Text Label 8200 1000 0    55   ~ 0
 MIC_CLK
 Wire Wire Line
-	11300 2350 11300 2550
+	11300 2200 11300 2400
 Wire Wire Line
 	8950 4150 8950 5150
 Connection ~ 8950 4150
@@ -3352,58 +3273,58 @@ Wire Wire Line
 Wire Wire Line
 	8850 3600 8850 4350
 $Comp
-L 74xx:74HC00 U8
+L 74xx-ep:74HC00 U8
 U 4 1 5DD4506D
-P 11700 2450
-F 0 "U8" H 11700 2775 50  0000 C CNN
-F 1 "74HC00" H 11700 2684 50  0000 C CNN
-F 2 "footprints:74HC00BQ115" H 11700 2450 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74hc00" H 11700 2450 50  0001 C CNN
-	4    11700 2450
+P 11700 2300
+F 0 "U8" H 11700 2625 50  0000 C CNN
+F 1 "74HC00" H 11700 2534 50  0000 C CNN
+F 2 "footprints:DHVQFN-14_2.5x3.0mm_P0.5mm_EP1.0x1.5mm" H 11700 2300 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74hc00" H 11700 2300 50  0001 C CNN
+	4    11700 2300
 	1    0    0    -1  
 $EndComp
 $Comp
-L 74xx:74HC00 U8
+L 74xx-ep:74HC00 U8
 U 2 1 5DD38D44
-P 11700 1850
-F 0 "U8" H 11700 2175 50  0000 C CNN
-F 1 "74HC00" H 11700 2084 50  0000 C CNN
-F 2 "footprints:74HC00BQ115" H 11700 1850 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74hc00" H 11700 1850 50  0001 C CNN
-	2    11700 1850
+P 11700 1700
+F 0 "U8" H 11700 2025 50  0000 C CNN
+F 1 "74HC00" H 11700 1934 50  0000 C CNN
+F 2 "footprints:DHVQFN-14_2.5x3.0mm_P0.5mm_EP1.0x1.5mm" H 11700 1700 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74hc00" H 11700 1700 50  0001 C CNN
+	2    11700 1700
 	1    0    0    -1  
 $EndComp
 $Comp
-L 74xx:74HC00 U8
+L 74xx-ep:74HC00 U8
 U 1 1 5DBCC5CF
-P 12400 1750
-F 0 "U8" H 12400 2075 50  0000 C CNN
-F 1 "74HC00" H 12400 1984 50  0000 C CNN
-F 2 "footprints:74HC00BQ115" H 12400 1750 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74hc00" H 12400 1750 50  0001 C CNN
-	1    12400 1750
+P 12400 1600
+F 0 "U8" H 12400 1925 50  0000 C CNN
+F 1 "74HC00" H 12400 1834 50  0000 C CNN
+F 2 "footprints:DHVQFN-14_2.5x3.0mm_P0.5mm_EP1.0x1.5mm" H 12400 1600 50  0001 C CNN
+F 3 "http://www.ti.com/lit/gpn/sn74hc00" H 12400 1600 50  0001 C CNN
+	1    12400 1600
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
 	12000 1100 12100 1100
 $Comp
-L 74xx:74HC00 U7
+L 74xx-ep:74HC00 U7
 U 4 1 5D9A7BB2
 P 11700 1100
 F 0 "U7" H 11700 1425 50  0000 C CNN
 F 1 "74HC00" H 11700 1334 50  0000 C CNN
-F 2 "footprints:74HC00BQ115" H 11700 1100 50  0001 C CNN
+F 2 "footprints:DHVQFN-14_2.5x3.0mm_P0.5mm_EP1.0x1.5mm" H 11700 1100 50  0001 C CNN
 F 3 "http://www.ti.com/lit/gpn/sn74hc00" H 11700 1100 50  0001 C CNN
 	4    11700 1100
 	1    0    0    -1  
 $EndComp
 $Comp
-L 74xx:74HC00 U7
+L 74xx-ep:74HC00 U7
 U 3 1 5D99E4A0
 P 12400 1000
 F 0 "U7" H 12400 1325 50  0000 C CNN
 F 1 "74HC00" H 12400 1234 50  0000 C CNN
-F 2 "footprints:74HC00BQ115" H 12400 1000 50  0001 C CNN
+F 2 "footprints:DHVQFN-14_2.5x3.0mm_P0.5mm_EP1.0x1.5mm" H 12400 1000 50  0001 C CNN
 F 3 "http://www.ti.com/lit/gpn/sn74hc00" H 12400 1000 50  0001 C CNN
 	3    12400 1000
 	1    0    0    -1  
@@ -3423,23 +3344,23 @@ Wire Wire Line
 Wire Wire Line
 	9350 1100 9450 1100
 $Comp
-L 74xx:74HC00 U7
+L 74xx-ep:74HC00 U7
 U 2 1 5D4ADBCE
 P 9750 1200
 F 0 "U7" H 9750 1525 50  0000 C CNN
 F 1 "74HC00" H 9750 1434 50  0000 C CNN
-F 2 "footprints:74HC00BQ115" H 9750 1200 50  0001 C CNN
+F 2 "footprints:DHVQFN-14_2.5x3.0mm_P0.5mm_EP1.0x1.5mm" H 9750 1200 50  0001 C CNN
 F 3 "http://www.ti.com/lit/gpn/sn74hc00" H 9750 1200 50  0001 C CNN
 	2    9750 1200
 	1    0    0    -1  
 $EndComp
 $Comp
-L 74xx:74HC00 U7
+L 74xx-ep:74HC00 U7
 U 1 1 5D3EB30A
 P 9050 1100
 F 0 "U7" H 9050 1425 50  0000 C CNN
 F 1 "74HC00" H 9050 1334 50  0000 C CNN
-F 2 "footprints:74HC00BQ115" H 9050 1100 50  0001 C CNN
+F 2 "footprints:DHVQFN-14_2.5x3.0mm_P0.5mm_EP1.0x1.5mm" H 9050 1100 50  0001 C CNN
 F 3 "http://www.ti.com/lit/gpn/sn74hc00" H 9050 1100 50  0001 C CNN
 	1    9050 1100
 	1    0    0    -1  
@@ -3458,16 +3379,16 @@ Wire Wire Line
 Wire Wire Line
 	10050 3900 10150 3900
 Wire Wire Line
-	8950 3500 8950 4150
+	8950 3500 8950 3900
 Wire Wire Line
 	8850 2700 9650 2700
 $Comp
-L 74xx:74HC595 U9
+L 74xx-ep:74HC595 U9
 U 1 1 5D06E6A9
 P 9650 3400
 F 0 "U9" H 9850 3950 50  0000 C CNN
 F 1 "74HC595" H 9850 2750 50  0000 C CNN
-F 2 "footprints:74HC595BQ115" H 9650 3400 50  0001 C CNN
+F 2 "footprints:DHVQFN-16_2.5x3.5mm_P0.5mm_EP1.0x2.0mm" H 9650 3400 50  0001 C CNN
 F 3 "http://www.ti.com/lit/ds/symlink/sn74hc595.pdf" H 9650 3400 50  0001 C CNN
 	1    9650 3400
 	1    0    0    -1  
@@ -3475,7 +3396,7 @@ $EndComp
 Wire Wire Line
 	10250 2200 10250 2400
 Wire Wire Line
-	11300 2350 11400 2350
+	11300 2200 11400 2200
 Wire Wire Line
 	10450 2400 10450 2450
 Wire Wire Line
@@ -3488,17 +3409,15 @@ Wire Wire Line
 	8850 3300 8850 3600
 Wire Wire Line
 	8850 2700 8850 3300
-Wire Wire Line
-	9050 3200 9050 4850
 Connection ~ 10250 2200
 Wire Wire Line
 	10150 2100 10250 2100
 Wire Wire Line
 	10150 2000 10450 2000
 Wire Wire Line
-	12000 2450 13200 2450
+	12000 2300 13200 2300
 Wire Wire Line
-	10900 1950 11300 1950
+	10900 1800 11300 1800
 Wire Wire Line
 	11600 4150 11650 4150
 Wire Wire Line
@@ -3554,7 +3473,7 @@ Wire Wire Line
 Connection ~ 9050 3200
 Text Label 10850 4050 0    60   ~ 0
 SPK_CLK
-Text Label 10900 1950 0    60   ~ 0
+Text Label 10900 1800 0    60   ~ 0
 SPK_EN
 Text Label 10850 4250 0    60   ~ 0
 SPK_SD
@@ -3601,7 +3520,7 @@ Text GLabel 11200 1200 0    55   BiDi ~ 0
 GPIO_18
 Text GLabel 11200 900  0    55   Input ~ 0
 PWM1.2
-Text GLabel 11200 1650 0    55   Input ~ 0
+Text GLabel 11200 1500 0    55   Input ~ 0
 PWM2.1
 $Comp
 L power:+3.3V #PWR05
@@ -3678,27 +3597,268 @@ Wire Wire Line
 $Comp
 L Connector:TestPoint TP?
 U 1 1 6028E702
-P 1150 2450
+P 800 3000
 AR Path="/5FC4BBBD/6028E702" Ref="TP?"  Part="1" 
 AR Path="/6028E702" Ref="TP1"  Part="1" 
-F 0 "TP1" H 1000 2500 50  0000 L CNN
-F 1 "BQ_INT" H 900 2400 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_D1.5mm" H 1350 2450 50  0001 C CNN
-F 3 "~" H 1350 2450 50  0001 C CNN
-	1    1150 2450
+F 0 "TP1" H 650 3050 50  0000 L CNN
+F 1 "BQ_INT" H 650 3200 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_D1.5mm" H 1000 3000 50  0001 C CNN
+F 3 "~" H 1000 3000 50  0001 C CNN
+	1    800  3000
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	2800 2450 1150 2450
 $Comp
 L sifive:FE310-G002 U4
 U 1 1 6073383E
-P 5200 6350
-F 0 "U4" H 5200 7700 60  0000 C CNN
-F 1 "FE310-G002" H 5200 4400 60  0000 C CNN
-F 2 "Package_DFN_QFN:QFN-48-1EP_6x6mm_P0.4mm_EP4.2x4.2mm_ThermalVias" H 4850 6550 60  0001 C CNN
-F 3 "" H 4850 6550 60  0001 C CNN
-	1    5200 6350
+P 5300 6350
+F 0 "U4" H 5300 7700 60  0000 C CNN
+F 1 "FE310-G002" H 5300 4400 60  0000 C CNN
+F 2 "Package_DFN_QFN:QFN-48-1EP_6x6mm_P0.4mm_EP4.2x4.2mm_ThermalVias" H 4950 6550 60  0001 C CNN
+F 3 "" H 4950 6550 60  0001 C CNN
+	1    5300 6350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:R R25
+U 1 1 60D193E4
+P 8250 10050
+F 0 "R25" V 8350 10050 50  0000 C CNN
+F 1 "100K" V 8250 10050 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 8180 10050 50  0001 C CNN
+F 3 "~" H 8250 10050 50  0001 C CNN
+	1    8250 10050
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R23
+U 1 1 60D1B2EF
+P 8250 9650
+F 0 "R23" V 8350 9650 50  0000 C CNN
+F 1 "100K" V 8250 9650 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 8180 9650 50  0001 C CNN
+F 3 "~" H 8250 9650 50  0001 C CNN
+	1    8250 9650
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:R R24
+U 1 1 60D1C743
+P 8250 9850
+F 0 "R24" V 8350 9850 50  0000 C CNN
+F 1 "100K" V 8250 9850 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 8180 9850 50  0001 C CNN
+F 3 "~" H 8250 9850 50  0001 C CNN
+	1    8250 9850
+	0    1    1    0   
+$EndComp
+$Comp
+L power:+3.3V #PWR08
+U 1 1 60D20D5C
+P 8500 9600
+F 0 "#PWR08" H 8500 9450 50  0001 C CNN
+F 1 "+3.3V" H 8500 9740 50  0000 C CNN
+F 2 "" H 8500 9600 50  0001 C CNN
+F 3 "" H 8500 9600 50  0001 C CNN
+	1    8500 9600
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8400 9650 8500 9650
+Wire Wire Line
+	8500 9650 8500 9600
+Wire Wire Line
+	8400 9850 8500 9850
+Wire Wire Line
+	8500 9850 8500 9650
+Connection ~ 8500 9650
+Wire Wire Line
+	8400 10050 8500 10050
+Text GLabel 7900 9850 0    55   Input ~ 0
+SPI1.MOSI
+Text GLabel 7900 9650 0    55   Output ~ 0
+SPI1.MISO
+Text GLabel 7900 10050 0    55   Input ~ 0
+SPI1.SCK
+Wire Wire Line
+	7900 10050 8100 10050
+Wire Wire Line
+	7900 9650 8100 9650
+Wire Wire Line
+	7900 9850 8100 9850
+$Comp
+L Device:R R31
+U 1 1 61F3BAB2
+P 12750 8750
+F 0 "R31" V 12850 8650 50  0000 L CNN
+F 1 "100K" V 12750 8650 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 12680 8750 50  0001 C CNN
+F 3 "~" H 12750 8750 50  0001 C CNN
+	1    12750 8750
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0173
+U 1 1 61F9D2C3
+P 12750 9000
+F 0 "#PWR0173" H 12750 8750 50  0001 C CNN
+F 1 "GND" H 12755 8827 50  0000 C CNN
+F 2 "" H 12750 9000 50  0001 C CNN
+F 3 "" H 12750 9000 50  0001 C CNN
+	1    12750 9000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	12750 8900 12750 9000
+Wire Wire Line
+	12750 8600 12750 8500
+Connection ~ 12750 8500
+Wire Wire Line
+	12750 8500 12850 8500
+$Comp
+L power:GND #PWR0178
+U 1 1 62373E4E
+P 8500 10150
+F 0 "#PWR0178" H 8500 9900 50  0001 C CNN
+F 1 "GND" H 8505 9977 50  0000 C CNN
+F 2 "" H 8500 10150 50  0001 C CNN
+F 3 "" H 8500 10150 50  0001 C CNN
+	1    8500 10150
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	8500 10050 8500 10150
+Wire Wire Line
+	14300 1500 14400 1500
+Connection ~ 14400 1500
+Wire Wire Line
+	14400 1500 14400 2100
+Wire Wire Line
+	15400 1500 15500 1500
+Connection ~ 15500 1500
+Wire Wire Line
+	15500 1500 15500 2100
+Wire Wire Line
+	9250 5550 8950 5550
+Connection ~ 8950 5550
+Wire Wire Line
+	8950 5550 8950 5800
+Wire Wire Line
+	9050 3200 9050 4850
+Wire Wire Line
+	9250 3900 8950 3900
+Connection ~ 8950 3900
+Wire Wire Line
+	8950 3900 8950 4150
+Text Label 3150 5450 0    60   ~ 0
+AON_PMU_OUT_1
+NoConn ~ 3150 5450
+$Comp
+L Connector:TestPoint TP?
+U 1 1 62007591
+P 900 6450
+AR Path="/5FC4BBBD/62007591" Ref="TP?"  Part="1" 
+AR Path="/62007591" Ref="TP2"  Part="1" 
+F 0 "TP2" H 750 6500 50  0000 L CNN
+F 1 "PMU_OUT0" H 700 6650 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_D1.5mm" H 1100 6450 50  0001 C CNN
+F 3 "~" H 1100 6450 50  0001 C CNN
+	1    900  6450
+	1    0    0    -1  
+$EndComp
+NoConn ~ 750  1800
+Wire Wire Line
+	3900 4800 3900 4850
+Wire Wire Line
+	3850 4850 3900 4850
+Wire Wire Line
+	3400 4850 3450 4850
+Wire Wire Line
+	2800 4800 2800 4850
+Wire Wire Line
+	2750 4850 2800 4850
+Connection ~ 2800 4850
+Wire Wire Line
+	2350 4850 2300 4850
+Wire Wire Line
+	2300 4850 2300 4900
+Wire Wire Line
+	3400 4850 3400 4900
+Wire Wire Line
+	3650 5550 3900 5550
+Wire Wire Line
+	3900 4850 3900 5550
+Connection ~ 3900 4850
+Connection ~ 3900 5550
+Wire Wire Line
+	3900 5550 4150 5550
+$Comp
+L power:GND #PWR0172
+U 1 1 61C38D4B
+P 2900 5300
+F 0 "#PWR0172" H 2900 5050 50  0001 C CNN
+F 1 "GND" H 2900 5150 50  0000 C CNN
+F 2 "" H 2900 5300 50  0001 C CNN
+F 3 "" H 2900 5300 50  0001 C CNN
+	1    2900 5300
+	1    0    0    -1  
+$EndComp
+Text Label 3150 5350 0    60   ~ 0
+AON_PMU_OUT_0
+Wire Wire Line
+	900  6450 900  6500
+Connection ~ 2800 5650
+Wire Wire Line
+	2800 4850 2800 5650
+Wire Wire Line
+	2800 5650 4150 5650
+Wire Wire Line
+	4150 5250 2900 5250
+Wire Wire Line
+	2900 5250 2900 5300
+Wire Wire Line
+	2900 5200 2900 5250
+Connection ~ 2900 5250
+Wire Wire Line
+	2800 4850 2900 4850
+Wire Wire Line
+	2900 4850 2900 5000
+Wire Wire Line
+	3150 5350 4150 5350
+Wire Wire Line
+	3150 5450 4150 5450
+Text Label 1650 6500 2    60   ~ 0
+AON_PMU_OUT_0
+Wire Wire Line
+	900  6500 1650 6500
+Wire Wire Line
+	2800 2450 2300 2450
+Text Label 1100 3050 2    55   ~ 0
+BQ_INT
+Wire Wire Line
+	800  3000 800  3050
+Wire Wire Line
+	800  3050 1100 3050
+$Comp
+L Device:C C14
+U 1 1 61166EC3
+P 7450 1500
+F 0 "C14" H 7500 1600 50  0000 L CNN
+F 1 "22uF" H 7500 1400 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric" H 7488 1350 50  0001 C CNN
+F 3 "~" H 7450 1500 50  0001 C CNN
+	1    7450 1500
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	7450 1350 7450 1150
+Connection ~ 7450 1150
+Wire Wire Line
+	7450 1150 7500 1150
+Wire Wire Line
+	7450 1650 7450 1700
+Wire Wire Line
+	7450 1700 7150 1700
+Connection ~ 7150 1700
+Wire Wire Line
+	7150 1700 7150 1750
 $EndSCHEMATC