From 014e1d7c0840b18c489ab3116dad269d017d2b02 Mon Sep 17 00:00:00 2001
From: Adam Wang <adam@qi-hardware.com>
Date: Thu, 13 Aug 2009 10:55:09 +0800
Subject: [PATCH] 1, Updated BOM / Schematic: 	a) Added D6/MSCD104 for
 raising efficiency 	b) Changed C57 to 0.1uF/16V, C49 to 1uF/16V, TP31 to
 CKE 	c) Added R46/10k/5%, 	d) Added TP85 for +5V USB host voltage
 measurement

---
 components/BOM.csv         |    9 +-
 components/jz4720_186p.dcm |    2 +-
 components/jz4720_186p.lib |    6 +-
 main/Qi_AVT2.pro           |    2 +-
 main/Qi_AVT2.sch           |   37 +-
 main/audio.sch             |   36 +-
 main/lcd_usb.sch           |  228 ++++---
 main/memory.sch            | 1298 ++++++++++++++++++------------------
 8 files changed, 847 insertions(+), 771 deletions(-)

diff --git a/components/BOM.csv b/components/BOM.csv
index 957c671..c7e00de 100644
--- a/components/BOM.csv
+++ b/components/BOM.csv
@@ -22,7 +22,7 @@
 18,2,"R33, R35","1K/5%",603,"n/a",,
 19,1,"R39","2.2K/5%",603,"n/a",,
 20,2,"R14, R32","2.5K/5%",603,"n/a",,
-21,15,"R4, R5, R7, R15, R22, R23, R24, R26, R27, R28, R29, R30, R34, R44, R45, ","10K/5%",603,"n/a",,
+21,16,"R4, R5, R7, R15, R22, R23, R24, R26, R27, R28, R29, R30, R34, R44, R45, R46","10K/5%",603,"n/a",,
 22,1,"R47","47K/5%",603,"n/a","n/c(C63)",
 23,6,"R16, R17, R18, R36, R42, R43","100K/5%",603,"n/a",,
 24,2,"R6, R11","150K/1%",603,"n/a",,
@@ -31,16 +31,15 @@
 27,1,"R3","680K/1%",603,"n/a",,
 28,5,"R1, R2, R48, R49, R50","1M/5%",603,"n/a",,
 29,2,"BN1, BN2","33/5%","RP4","n/a",,
-30,4,"D1, D2, D4, D5","MSCD104",805,"v",,"VC8"
+30,5,"D1, D2, D4, D5, D6","MSCD104",805,"v",,"VC8"
 31,1,"D3","RED LED",1206,"n/a",,
 32,1,"Y1","32768KHz",,"n/a",,"VC9"
 33,1,"Y2","12MHz",,"n/a",,"VC9"
 34,2,"C7, C10","10pF/16V",402,"n/a",,
 35,4,"C1, C4, C5, C8","33pF/16V",402,"n/a",,
 36,13,"C2, C6, C13, C9, C11, C17, C22, C28, C37, C45, C50, C52, C72","10uF/10V",805,"n/a",,
-37,4,"C19, C35, C36, C63","1uF/16V",603,"n/a",,
-38,37,"C3, C12, C14, C15, C18, C21, C23, C24, C25, C26, C27, C29, C30, C31, C32, C34, C38, C39, C40, C41, C42, C43, C44, C46, C47, C48, C51, C53, C54, C55, C58, C61, C66, C67, C68, C69, C70","0.1uF/16V",402,"n/a","c69(nc, C63), c70(nc, C63)",
-,1,"C49","0.1uF/16V",603,"n/a",,
+37,5,"C19, C35, C36, C49, C63","1uF/16V",603,"n/a",,
+38,38,"C3, C12, C14, C15, C18, C21, C23, C24, C25, C26, C27, C29, C30, C31, C32, C34, C38, C39, C40, C41, C42, C43, C44, C46, C47, C48, C51, C53, C54, C55, C57, C58, C61, C66, C67, C68, C69, C70","0.1uF/16V",402,"n/a","c69(nc, C63), c70(nc, C63)",
 39,2,"C16, C71","0.01uF/16V",402,"n/a",,
 40,3,"C20, C60, C65","47uF/6.3V",1206,"n/a",,
 41,2,"C59, C62","100uF/4V",1210,"n/a",,
diff --git a/components/jz4720_186p.dcm b/components/jz4720_186p.dcm
index 04a8a48..84050fb 100644
--- a/components/jz4720_186p.dcm
+++ b/components/jz4720_186p.dcm
@@ -1,3 +1,3 @@
-EESchema-DOCLIB  Version 2.0  Date: 30/6/2009-15:00:13
+EESchema-DOCLIB  Version 2.0  Date: 10/8/2009-01:45:19
 #
 #End Doc Library
diff --git a/components/jz4720_186p.lib b/components/jz4720_186p.lib
index 3cabe4d..721851b 100644
--- a/components/jz4720_186p.lib
+++ b/components/jz4720_186p.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: 30/6/2009-15:00:13
+EESchema-LIBRARY Version 2.3  Date: 10/8/2009-01:45:19
 #
 # JZ4720_186P
 #
@@ -13,9 +13,9 @@ X VDDUSB0 105 900 -1000 200 L 30 30 3 1 I
 X VSSCADC 142 900 -1000 200 L 30 30 2 1 I
 X VDDA 109 900 -950 200 L 30 30 3 1 I
 X VSSCDAC 138 900 -950 200 L 30 30 2 1 I
-X DM1 107 900 -850 200 L 30 30 3 1 I
+X DM1 107 900 -850 200 L 30 30 3 1 O
 X VDDCDAC 139 900 -850 200 L 30 30 2 1 I
-X DP1 106 900 -800 200 L 30 30 3 1 I
+X DP1 106 900 -800 200 L 30 30 3 1 O
 X VDDCADC 141 900 -800 200 L 30 30 2 1 I
 X RREF 110 900 -700 200 L 30 30 3 1 I
 X CS4_N/PB28 63 900 -650 200 L 30 30 1 1 T
diff --git a/main/Qi_AVT2.pro b/main/Qi_AVT2.pro
index c1f62e0..e45bd76 100644
--- a/main/Qi_AVT2.pro
+++ b/main/Qi_AVT2.pro
@@ -1,4 +1,4 @@
-update=7/8/2009-14:25:58
+update=13/8/2009-02:40:55
 last_client=KiCad
 [eeschema]
 version=1
diff --git a/main/Qi_AVT2.sch b/main/Qi_AVT2.sch
index 38589a5..621b6ea 100644
--- a/main/Qi_AVT2.sch
+++ b/main/Qi_AVT2.sch
@@ -13,22 +13,29 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Kmarq B 2100 2650 "Warning: Pin power_out connected to Pin BiDi (net 2)" F=1
+Text Label 14100 5900 0    30   ~
+RXD
+Text Label 14100 6100 0    30   ~
+TXD
+Text GLabel 14050 5900 0    30   Output
+KEYIN8
+Text GLabel 14050 6100 0    30   Input
+TXD
 $Comp
 L GND #PWR01
 U 1 1 4A6D2253
-P 14250 6400
-F 0 "#PWR01" H 14250 6400 30  0001 C C
-F 1 "GND" H 14250 6330 30  0001 C C
-	1    14250 6400
+P 14450 6400
+F 0 "#PWR01" H 14450 6400 30  0001 C C
+F 1 "GND" H 14450 6330 30  0001 C C
+	1    14450 6400
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	14250 6400 14250 6300
+	14450 6400 14450 6300
 Wire Wire Line
-	14250 6300 14400 6300
+	14450 6300 14600 6300
 Wire Wire Line
-	14400 5900 13850 5900
+	14600 5900 14050 5900
 Wire Notes Line
 	14800 5150 10600 5150
 Wire Notes Line
@@ -701,18 +708,14 @@ Wire Wire Line
 	2500 2150 2500 2250
 Connection ~ 2500 2200
 Wire Wire Line
-	14400 6100 13850 6100
-Text Label 13850 6100 0    50   ~
-TDO
-Text Label 13850 5900 0    50   ~
-TDI
+	14600 6100 14050 6100
 $Comp
 L SERIAL_CON CON3
 U 1 1 4A6D21E5
-P 14750 6100
-F 0 "CON3" H 14650 6450 60  0000 C C
-F 1 "SERIAL_CON" H 14750 5750 60  0000 C C
-	1    14750 6100
+P 14950 6100
+F 0 "CON3" H 14850 6450 60  0000 C C
+F 1 "SERIAL_CON" H 14950 5750 60  0000 C C
+	1    14950 6100
 	1    0    0    -1  
 $EndComp
 $Comp
diff --git a/main/audio.sch b/main/audio.sch
index 3385ef3..29a4a23 100644
--- a/main/audio.sch
+++ b/main/audio.sch
@@ -224,10 +224,10 @@ F 1 "100uF/4V" V 2600 2100 60  0000 C C
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR0108
+L GND #PWR0107
 U 1 1 4A46E97D
 P 3200 3550
-F 0 "#PWR0108" H 3200 3550 30  0001 C C
+F 0 "#PWR0107" H 3200 3550 30  0001 C C
 F 1 "GND" H 3200 3480 30  0001 C C
 	1    3200 3550
 	1    0    0    -1  
@@ -291,10 +291,10 @@ F 1 "33/5%" V 5350 2550 50  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L V33 #PWR0109
+L V33 #PWR0108
 U 1 1 4A46E6A6
 P 6300 1750
-F 0 "#PWR0109" H 6300 1700 20  0001 C C
+F 0 "#PWR0108" H 6300 1700 20  0001 C C
 F 1 "V33" H 6300 1850 30  0000 C C
 	1    6300 1750
 	1    0    0    -1  
@@ -302,10 +302,10 @@ $EndComp
 Text Label 5900 2500 0    30   ~
 AMPIN
 $Comp
-L GND #PWR0110
+L GND #PWR0109
 U 1 1 4A46E629
 P 6300 3400
-F 0 "#PWR0110" H 6300 3400 30  0001 C C
+F 0 "#PWR0109" H 6300 3400 30  0001 C C
 F 1 "GND" H 6300 3330 30  0001 C C
 	1    6300 3400
 	1    0    0    -1  
@@ -348,10 +348,10 @@ MICIN
 Text Label 8550 3000 0    60   ~
 MICIN
 $Comp
-L GND #PWR0111
+L GND #PWR0110
 U 1 1 4A46E225
 P 9150 2700
-F 0 "#PWR0111" H 9150 2700 30  0001 C C
+F 0 "#PWR0110" H 9150 2700 30  0001 C C
 F 1 "GND" H 9150 2630 30  0001 C C
 	1    9150 2700
 	1    0    0    -1  
@@ -366,10 +366,10 @@ F 1 "0.1uF/16V" V 9550 2200 50  0000 L C
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR0112
+L GND #PWR0111
 U 1 1 4A46E19D
 P 10150 3300
-F 0 "#PWR0112" H 10150 3300 30  0001 C C
+F 0 "#PWR0111" H 10150 3300 30  0001 C C
 F 1 "GND" H 10150 3230 30  0001 C C
 	1    10150 3300
 	1    0    0    -1  
@@ -432,10 +432,10 @@ AMPEN
 Text Label 1950 5700 0    60   ~
 AMPIN
 $Comp
-L GND #PWR0113
+L GND #PWR0112
 U 1 1 4A46DFA2
 P 3050 5400
-F 0 "#PWR0113" H 3050 5400 30  0001 C C
+F 0 "#PWR0112" H 3050 5400 30  0001 C C
 F 1 "GND" H 3050 5330 30  0001 C C
 	1    3050 5400
 	1    0    0    -1  
@@ -459,10 +459,10 @@ F 1 "100K/5%" V 2950 5050 50  0000 C C
 	-1   0    0    1   
 $EndComp
 $Comp
-L VBATO #PWR0114
+L VBATO #PWR0113
 U 1 1 4A46DE09
 P 3600 4650
-F 0 "#PWR0114" H 3600 4600 20  0001 C C
+F 0 "#PWR0113" H 3600 4600 20  0001 C C
 F 1 "VBATO" H 3600 4750 30  0000 C C
 	1    3600 4650
 	1    0    0    -1  
@@ -477,10 +477,10 @@ F 1 "PZ1608D221" V 4100 4700 40  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR0115
+L GND #PWR0114
 U 1 1 4A46DD3A
 P 4700 5350
-F 0 "#PWR0115" H 4700 5350 30  0001 C C
+F 0 "#PWR0114" H 4700 5350 30  0001 C C
 F 1 "GND" H 4700 5280 30  0001 C C
 	1    4700 5350
 	1    0    0    -1  
@@ -504,10 +504,10 @@ F 1 "0.1uF/16V" V 4400 5700 50  0000 L C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR0116
+L GND #PWR0115
 U 1 1 4A46DBD2
 P 6850 6550
-F 0 "#PWR0116" H 6850 6550 30  0001 C C
+F 0 "#PWR0115" H 6850 6550 30  0001 C C
 F 1 "GND" H 6850 6480 30  0001 C C
 	1    6850 6550
 	1    0    0    -1  
diff --git a/main/lcd_usb.sch b/main/lcd_usb.sch
index 3d7cd6a..f753bff 100644
--- a/main/lcd_usb.sch
+++ b/main/lcd_usb.sch
@@ -13,10 +13,18 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Kmarq B 2100 2400 "Warning Pin 3state Unconnected" F=1
-Kmarq B 2100 2950 "Warning Pin output Unconnected" F=1
-Kmarq B 2100 2350 "Warning Pin 3state Unconnected" F=1
-NoConn ~ 3950 2100
+Wire Wire Line
+	7400 5100 7400 5200
+Wire Wire Line
+	850  4000 850  4450
+Wire Wire Line
+	1000 4000 1000 4450
+Wire Wire Line
+	1150 4000 1150 4450
+Wire Wire Line
+	3950 2250 4350 2250
+Wire Wire Line
+	3950 2150 4350 2150
 Wire Wire Line
 	5850 2100 5850 2000
 Wire Wire Line
@@ -32,9 +40,6 @@ Wire Wire Line
 Connection ~ 5950 4650
 Wire Wire Line
 	6300 4650 5950 4650
-Connection ~ 7900 5150
-Wire Wire Line
-	7900 5150 7900 5100
 Wire Wire Line
 	5300 4400 5300 4600
 Wire Wire Line
@@ -44,14 +49,10 @@ Wire Wire Line
 	7400 5650 7250 5650
 Wire Wire Line
 	7150 5400 7250 5400
-Wire Wire Line
-	7400 5150 7400 5200
 Wire Wire Line
 	7150 4950 7200 4950
 Wire Wire Line
 	7200 4950 7200 4650
-Wire Wire Line
-	7200 4650 6900 4650
 Connection ~ 8450 5850
 Wire Wire Line
 	8050 5850 10050 5850
@@ -619,6 +620,67 @@ Wire Wire Line
 Wire Wire Line
 	4500 2050 4500 2200
 Connection ~ 4500 2100
+Wire Wire Line
+	3950 2100 4350 2100
+Wire Wire Line
+	3950 2200 4350 2200
+Wire Wire Line
+	6900 4650 7400 4650
+Wire Wire Line
+	7400 4650 7400 4700
+Connection ~ 7200 4650
+$Comp
+L DIODESCH D6
+U 1 1 4A837C30
+P 7400 4900
+F 0 "D6" H 7400 5000 40  0000 C C
+F 1 "MSCD104" H 7400 5100 40  0000 C C
+	1    7400 4900
+	0    1    1    0   
+$EndComp
+Text Label 7800 5150 0    30   ~
+VHOST
+Text Label 850  4450 1    30   ~
+VHOST
+$Comp
+L TESTPOINT TP85
+U 1 1 4A837BD1
+P 850 3950
+F 0 "TP85" V 850 4150 30  0000 C C
+F 1 "TESTPOINT" H 850 3950 60  0001 C C
+	1    850  3950
+	1    0    0    -1  
+$EndComp
+Text Label 1000 4450 1    30   ~
+XN
+$Comp
+L TESTPOINT TP84
+U 1 1 4A7F79CA
+P 1000 3950
+F 0 "TP84" V 1000 4150 30  0000 C C
+F 1 "TESTPOINT" H 1000 3950 60  0001 C C
+	1    1000 3950
+	1    0    0    -1  
+$EndComp
+Text Label 1150 4450 1    30   ~
+YN
+$Comp
+L TESTPOINT TP83
+U 1 1 4A7F79C9
+P 1150 3950
+F 0 "TP83" V 1150 4150 30  0000 C C
+F 1 "TESTPOINT" H 1150 3950 60  0001 C C
+	1    1150 3950
+	1    0    0    -1  
+$EndComp
+Text Label 4350 2250 2    30   ~
+XN
+Text Label 4350 2200 2    30   ~
+YN
+Text Label 4350 2150 2    30   ~
+YP
+Text Label 4350 2100 2    30   ~
+XP
 $Comp
 L R R48
 U 1 1 4A7C2400
@@ -660,28 +722,19 @@ F 1 "1M/5%" V 5600 4700 50  0000 C C
 	1    0    0    1   
 $EndComp
 $Comp
-L +5V #PWR061
-U 1 1 4A7C1AF0
-P 7900 5100
-F 0 "#PWR061" H 7900 5190 20  0001 C C
-F 1 "+5V" H 7900 5190 30  0000 C C
-	1    7900 5100
-	1    0    0    -1  
-$EndComp
-$Comp
-L VBATO #PWR062
+L VBATO #PWR061
 U 1 1 4A7C160E
 P 5300 4400
-F 0 "#PWR062" H 5300 4350 20  0001 C C
+F 0 "#PWR061" H 5300 4350 20  0001 C C
 F 1 "VBATO" H 5300 4500 30  0000 C C
 	1    5300 4400
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR063
+L GND #PWR062
 U 1 1 4A7C12A3
 P 5300 5200
-F 0 "#PWR063" H 5300 5200 30  0001 C C
+F 0 "#PWR062" H 5300 5200 30  0001 C C
 F 1 "GND" H 5300 5130 30  0001 C C
 	1    5300 5200
 	1    0    0    -1  
@@ -696,10 +749,10 @@ F 1 "3.3uF/16V" V 5100 4800 50  0000 L C
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR064
+L GND #PWR063
 U 1 1 4A7C10ED
 P 7400 5700
-F 0 "#PWR064" H 7400 5700 30  0001 C C
+F 0 "#PWR063" H 7400 5700 30  0001 C C
 F 1 "GND" H 7400 5630 30  0001 C C
 	1    7400 5700
 	1    0    0    -1  
@@ -772,19 +825,19 @@ F 1 "MSCD104" H 9650 5500 40  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR065
+L GND #PWR064
 U 1 1 4A7BDE77
 P 9650 6750
-F 0 "#PWR065" H 9650 6750 30  0001 C C
+F 0 "#PWR064" H 9650 6750 30  0001 C C
 F 1 "GND" H 9650 6680 30  0001 C C
 	1    9650 6750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR066
+L GND #PWR065
 U 1 1 4A7BDDC0
 P 10000 6750
-F 0 "#PWR066" H 10000 6750 30  0001 C C
+F 0 "#PWR065" H 10000 6750 30  0001 C C
 F 1 "GND" H 10000 6680 30  0001 C C
 	1    10000 6750
 	1    0    0    -1  
@@ -799,10 +852,10 @@ F 1 "100K/5%" V 9900 6400 50  0000 C C
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR067
+L GND #PWR066
 U 1 1 4A7BDCBC
 P 10300 6750
-F 0 "#PWR067" H 10300 6750 30  0001 C C
+F 0 "#PWR066" H 10300 6750 30  0001 C C
 F 1 "GND" H 10300 6680 30  0001 C C
 	1    10300 6750
 	1    0    0    -1  
@@ -839,23 +892,23 @@ HOST_DM1
 Text Label 4400 2700 2    30   ~
 HOST_DP1
 Text Label 1300 4450 1    30   ~
-HOST_DM1
+YP
 $Comp
-L TESTPOINT TP81
+L TESTPOINT TP82
 U 1 1 4A6C6E45
 P 1300 3950
-F 0 "TP81" V 1300 4150 30  0000 C C
+F 0 "TP82" V 1300 4150 30  0000 C C
 F 1 "TESTPOINT" H 1300 3950 60  0001 C C
 	1    1300 3950
 	1    0    0    -1  
 $EndComp
 Text Label 1450 4450 1    30   ~
-HOST_DP1
+XP
 $Comp
-L TESTPOINT TP80
+L TESTPOINT TP81
 U 1 1 4A6C6E3C
 P 1450 3950
-F 0 "TP80" V 1450 4150 30  0000 C C
+F 0 "TP81" V 1450 4150 30  0000 C C
 F 1 "TESTPOINT" H 1450 3950 60  0001 C C
 	1    1450 3950
 	1    0    0    -1  
@@ -871,10 +924,10 @@ GPC9
 Text Label 6550 1700 0    30   ~
 GPC8
 $Comp
-L V33 #PWR068
+L V33 #PWR067
 U 1 1 4A48317A
 P 6950 950
-F 0 "#PWR068" H 6950 900 20  0001 C C
+F 0 "#PWR067" H 6950 900 20  0001 C C
 F 1 "V33" H 6950 1050 30  0000 C C
 	1    6950 950 
 	1    0    0    -1  
@@ -882,10 +935,10 @@ $EndComp
 NoConn ~ 7050 1650
 NoConn ~ 7500 1700
 $Comp
-L GND #PWR069
+L GND #PWR068
 U 1 1 4A48314F
 P 8000 1800
-F 0 "#PWR069" H 8000 1800 30  0001 C C
+F 0 "#PWR068" H 8000 1800 30  0001 C C
 F 1 "GND" H 8000 1730 30  0001 C C
 	1    8000 1800
 	1    0    0    -1  
@@ -985,19 +1038,19 @@ F 1 "33/5%" H 8650 3800 40  0000 C C
 	-1   0    0    -1  
 $EndComp
 $Comp
-L V33 #PWR070
+L V33 #PWR069
 U 1 1 4A482DB2
 P 9650 2100
-F 0 "#PWR070" H 9650 2050 20  0001 C C
+F 0 "#PWR069" H 9650 2050 20  0001 C C
 F 1 "V33" H 9650 2200 30  0000 C C
 	1    9650 2100
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR071
+L GND #PWR070
 U 1 1 4A482D97
 P 9850 2700
-F 0 "#PWR071" H 9850 2700 30  0001 C C
+F 0 "#PWR070" H 9850 2700 30  0001 C C
 F 1 "GND" H 9850 2630 30  0001 C C
 	1    9850 2700
 	1    0    0    -1  
@@ -1018,19 +1071,19 @@ LCDSCL
 Text GLabel 9650 3800 0    30   Input
 LCDSDA
 $Comp
-L GND #PWR072
+L GND #PWR071
 U 1 1 4A482D03
 P 9700 4050
-F 0 "#PWR072" H 9700 4050 30  0001 C C
+F 0 "#PWR071" H 9700 4050 30  0001 C C
 F 1 "GND" H 9700 3980 30  0001 C C
 	1    9700 4050
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR073
+L GND #PWR072
 U 1 1 4A482CF0
 P 10800 4050
-F 0 "#PWR073" H 10800 4050 30  0001 C C
+F 0 "#PWR072" H 10800 4050 30  0001 C C
 F 1 "GND" H 10800 3980 30  0001 C C
 	1    10800 4050
 	1    0    0    -1  
@@ -1045,28 +1098,28 @@ F 1 "FPCCON24" H 10400 2600 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L V33 #PWR074
+L V33 #PWR073
 U 1 1 4A482A69
 P 4050 5250
-F 0 "#PWR074" H 4050 5200 20  0001 C C
+F 0 "#PWR073" H 4050 5200 20  0001 C C
 F 1 "V33" H 4050 5350 30  0000 C C
 	1    4050 5250
 	1    0    0    -1  
 $EndComp
 $Comp
-L VBUS #PWR075
+L VBUS #PWR074
 U 1 1 4A482A5C
 P 3450 5300
-F 0 "#PWR075" H 3450 5250 20  0001 C C
+F 0 "#PWR074" H 3450 5250 20  0001 C C
 F 1 "VBUS" H 3450 5400 30  0000 C C
 	1    3450 5300
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR076
+L GND #PWR075
 U 1 1 4A482A50
 P 4050 6800
-F 0 "#PWR076" H 4050 6800 30  0001 C C
+F 0 "#PWR075" H 4050 6800 30  0001 C C
 F 1 "GND" H 4050 6730 30  0001 C C
 	1    4050 6800
 	1    0    0    -1  
@@ -1108,28 +1161,28 @@ F 1 "1K/5%" H 3650 5550 50  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR077
+L GND #PWR076
 U 1 1 4A482926
 P 1050 7050
-F 0 "#PWR077" H 1050 7050 30  0001 C C
+F 0 "#PWR076" H 1050 7050 30  0001 C C
 F 1 "GND" H 1050 6980 30  0001 C C
 	1    1050 7050
 	1    0    0    -1  
 $EndComp
 $Comp
-L VBUS #PWR078
+L VBUS #PWR077
 U 1 1 4A4828AF
 P 2450 5350
-F 0 "#PWR078" H 2450 5300 20  0001 C C
+F 0 "#PWR077" H 2450 5300 20  0001 C C
 F 1 "VBUS" H 2450 5450 30  0000 C C
 	1    2450 5350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR079
+L GND #PWR078
 U 1 1 4A4828A1
 P 2450 5950
-F 0 "#PWR079" H 2450 5950 30  0001 C C
+F 0 "#PWR078" H 2450 5950 30  0001 C C
 F 1 "GND" H 2450 5880 30  0001 C C
 	1    2450 5950
 	1    0    0    -1  
@@ -1153,10 +1206,10 @@ F 1 "PZ1608D221" V 2150 5400 40  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR080
+L GND #PWR079
 U 1 1 4A482821
 P 2450 6650
-F 0 "#PWR080" H 2450 6650 30  0001 C C
+F 0 "#PWR079" H 2450 6650 30  0001 C C
 F 1 "GND" H 2450 6580 30  0001 C C
 	1    2450 6650
 	1    0    0    -1  
@@ -1202,19 +1255,19 @@ F 1 "USB_MINIB" H 1250 6350 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L V33 #PWR081
+L V33 #PWR080
 U 1 1 4A482636
 P 4850 2850
-F 0 "#PWR081" H 4850 2800 20  0001 C C
+F 0 "#PWR080" H 4850 2800 20  0001 C C
 F 1 "V33" H 4850 2950 30  0000 C C
 	1    4850 2850
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR082
+L GND #PWR081
 U 1 1 4A4825EB
 P 4150 3500
-F 0 "#PWR082" H 4150 3500 30  0001 C C
+F 0 "#PWR081" H 4150 3500 30  0001 C C
 F 1 "GND" H 4150 3430 30  0001 C C
 	1    4150 3500
 	1    0    0    -1  
@@ -1229,10 +1282,10 @@ F 1 "0.1uF/16V" H 4200 3150 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR083
+L GND #PWR082
 U 1 1 4A4825D2
 P 4850 3400
-F 0 "#PWR083" H 4850 3400 30  0001 C C
+F 0 "#PWR082" H 4850 3400 30  0001 C C
 F 1 "GND" H 4850 3330 30  0001 C C
 	1    4850 3400
 	1    0    0    -1  
@@ -1247,10 +1300,10 @@ F 1 "0.1uF/16V" H 4900 3050 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR084
+L GND #PWR083
 U 1 1 4A48258F
 P 5650 2600
-F 0 "#PWR084" H 5650 2600 30  0001 C C
+F 0 "#PWR083" H 5650 2600 30  0001 C C
 F 1 "GND" H 5650 2530 30  0001 C C
 	1    5650 2600
 	0    -1   -1   0   
@@ -1268,14 +1321,11 @@ Text Label 4350 2450 2    30   ~
 DN
 Text Label 4350 2350 2    30   ~
 DP
-NoConn ~ 3950 2250
-NoConn ~ 3950 2200
-NoConn ~ 3950 2150
 $Comp
-L VBAT #PWR085
+L VBAT #PWR084
 U 1 1 4A4824EE
 P 5200 1950
-F 0 "#PWR085" H 5200 1900 20  0001 C C
+F 0 "#PWR084" H 5200 1900 20  0001 C C
 F 1 "VBAT" H 5200 2050 30  0000 C C
 	1    5200 1950
 	1    0    0    -1  
@@ -1354,19 +1404,19 @@ LCDD1
 Text Label 4500 850  2    30   ~
 LCDD0
 $Comp
-L GND #PWR086
+L GND #PWR085
 U 1 1 4A482291
 P 1150 1850
-F 0 "#PWR086" H 1150 1850 30  0001 C C
+F 0 "#PWR085" H 1150 1850 30  0001 C C
 F 1 "GND" H 1150 1780 30  0001 C C
 	1    1150 1850
 	1    0    0    -1  
 $EndComp
 $Comp
-L VDDHP #PWR087
+L VDDHP #PWR086
 U 1 1 4A482259
 P 1150 1300
-F 0 "#PWR087" H 1150 1250 20  0001 C C
+F 0 "#PWR086" H 1150 1250 20  0001 C C
 F 1 "VDDHP" H 1150 1400 30  0000 C C
 	1    1150 1300
 	1    0    0    -1  
@@ -1381,19 +1431,19 @@ F 1 "0.1uF/16V" V 1000 1600 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR088
+L GND #PWR087
 U 1 1 4A4821E0
 P 2000 1550
-F 0 "#PWR088" H 2000 1550 30  0001 C C
+F 0 "#PWR087" H 2000 1550 30  0001 C C
 F 1 "GND" H 2000 1480 30  0001 C C
 	1    2000 1550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR089
+L GND #PWR088
 U 1 1 4A4821C5
 P 2000 1800
-F 0 "#PWR089" H 2000 1800 30  0001 C C
+F 0 "#PWR088" H 2000 1800 30  0001 C C
 F 1 "GND" H 2000 1730 30  0001 C C
 	1    2000 1800
 	1    0    0    -1  
@@ -1401,10 +1451,10 @@ $EndComp
 Text Label 1500 2500 0    30   ~
 VREF
 $Comp
-L GND #PWR090
+L GND #PWR089
 U 1 1 4A482190
 P 1050 3100
-F 0 "#PWR090" H 1050 3100 30  0001 C C
+F 0 "#PWR089" H 1050 3100 30  0001 C C
 F 1 "GND" H 1050 3030 30  0001 C C
 	1    1050 3100
 	1    0    0    -1  
@@ -1428,10 +1478,10 @@ F 1 "10uF/10V" V 750 2750 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR091
+L GND #PWR090
 U 1 1 4A48210D
 P 2000 2750
-F 0 "#PWR091" H 2000 2750 30  0001 C C
+F 0 "#PWR090" H 2000 2750 30  0001 C C
 F 1 "GND" H 2000 2680 30  0001 C C
 	1    2000 2750
 	1    0    0    -1  
diff --git a/main/memory.sch b/main/memory.sch
index 95258a1..1f111cc 100644
--- a/main/memory.sch
+++ b/main/memory.sch
@@ -13,524 +13,557 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-NoConn ~ 3650 2950
-Wire Wire Line
-	3650 2900 4150 2900
-Wire Wire Line
-	8750 6150 8750 6000
-Connection ~ 8100 5600
-Wire Wire Line
-	7450 5500 8100 5500
-Connection ~ 8750 6100
-Wire Wire Line
-	8350 6100 8350 6000
-Connection ~ 8350 5550
-Wire Wire Line
-	7450 5550 9150 5550
-Wire Wire Line
-	9150 5550 9150 5600
-Connection ~ 5450 5550
-Wire Wire Line
-	6650 5550 5450 5550
-Wire Wire Line
-	6650 5900 6000 5900
-Wire Wire Line
-	6650 5450 6100 5450
-Wire Wire Line
-	6650 5400 6100 5400
-Wire Wire Line
-	6650 5350 6100 5350
-Wire Wire Line
-	5950 5250 6650 5250
-Wire Wire Line
-	1800 5600 1800 5550
-Connection ~ 2000 6300
-Wire Wire Line
-	2000 6300 2000 5550
-Wire Wire Line
-	2000 5550 2500 5550
-Connection ~ 2250 6550
-Wire Wire Line
-	2250 6550 2250 5850
-Wire Wire Line
-	2250 5850 2500 5850
-Connection ~ 2350 6650
-Wire Wire Line
-	2350 6650 2350 6050
-Wire Wire Line
-	2350 6050 2500 6050
-Wire Wire Line
-	1300 6200 3700 6200
-Connection ~ 3400 5550
-Connection ~ 3400 5850
-Wire Wire Line
-	3400 5950 3000 5950
-Wire Wire Line
-	3400 5650 3000 5650
-Wire Wire Line
-	3400 5550 3000 5550
-Connection ~ 3550 6250
-Wire Wire Line
-	3550 6400 3700 6400
-Connection ~ 3700 4150
-Wire Wire Line
-	3700 4100 3700 4300
-Wire Wire Line
-	2150 4100 2150 4150
-Wire Wire Line
-	2150 4150 2550 4150
-Connection ~ 3700 4800
-Wire Wire Line
-	3700 4850 3700 4700
-Wire Wire Line
-	3250 4300 3250 4150
-Connection ~ 5650 3650
-Wire Wire Line
-	5650 3750 5650 3600
-Connection ~ 7650 4250
-Wire Wire Line
-	7650 4250 7650 4150
-Connection ~ 6850 4250
-Wire Wire Line
-	6850 4250 6850 4150
-Connection ~ 6050 4250
-Wire Wire Line
-	6050 4250 6050 4150
-Wire Wire Line
-	6050 4150 6100 4150
-Connection ~ 8050 3650
-Wire Wire Line
-	8050 3650 8050 3750
-Connection ~ 7250 3650
-Wire Wire Line
-	7250 3650 7250 3750
-Connection ~ 6450 3650
-Wire Wire Line
-	6450 3650 6450 3750
-Wire Wire Line
-	5650 3650 8450 3650
-Wire Wire Line
-	8450 3650 8450 3750
-Connection ~ 7500 1100
-Wire Wire Line
-	7500 1100 7500 1050
-Connection ~ 7550 1100
-Wire Wire Line
-	7550 1100 7550 1150
-Connection ~ 7400 1100
-Wire Wire Line
-	7400 1100 7400 1150
-Wire Wire Line
-	7300 1150 7300 1100
-Wire Wire Line
-	7300 1100 7650 1100
-Wire Wire Line
-	7650 1100 7650 1150
-Connection ~ 7600 3000
-Wire Wire Line
-	7600 2950 7600 3000
-Connection ~ 7450 3000
-Wire Wire Line
-	7450 3000 7450 2950
-Connection ~ 7350 3000
-Wire Wire Line
-	7350 3000 7350 2950
-Wire Wire Line
-	8000 2150 8500 2150
-Wire Wire Line
-	8000 2100 8500 2100
-Wire Wire Line
-	8000 2050 8500 2050
-Wire Wire Line
-	8000 2000 8500 2000
-Wire Wire Line
-	8000 1950 8500 1950
-Wire Wire Line
-	8000 1900 8500 1900
-Wire Wire Line
-	8000 1850 8500 1850
-Wire Wire Line
-	8000 1800 8500 1800
-Wire Wire Line
-	8000 1750 8500 1750
-Wire Wire Line
-	8000 1700 8500 1700
-Wire Wire Line
-	8000 1650 8500 1650
-Wire Wire Line
-	8000 1600 8500 1600
-Wire Wire Line
-	8000 1550 8500 1550
-Wire Wire Line
-	8000 1500 8500 1500
-Wire Wire Line
-	8000 1450 8500 1450
-Wire Wire Line
-	8000 1400 8500 1400
-Wire Wire Line
-	6450 2750 6950 2750
-Wire Wire Line
-	6450 2700 6950 2700
-Wire Wire Line
-	6450 2600 6950 2600
-Wire Wire Line
-	6450 2550 6950 2550
-Wire Wire Line
-	6450 2450 6950 2450
-Wire Wire Line
-	6450 2350 6950 2350
-Wire Wire Line
-	6450 2300 6950 2300
-Wire Wire Line
-	6450 2200 6950 2200
-Wire Wire Line
-	6450 2150 6950 2150
-Wire Wire Line
-	6450 2100 6950 2100
-Wire Wire Line
-	6450 2000 6950 2000
-Wire Wire Line
-	6450 1950 6950 1950
-Wire Wire Line
-	6450 1900 6950 1900
-Wire Wire Line
-	6450 1850 6950 1850
-Wire Wire Line
-	6450 1800 6950 1800
-Wire Wire Line
-	6450 1750 6950 1750
-Wire Wire Line
-	6450 1700 6950 1700
-Wire Wire Line
-	6450 1650 6950 1650
-Wire Wire Line
-	6450 1600 6950 1600
-Wire Wire Line
-	6450 1550 6950 1550
-Wire Wire Line
-	6450 1500 6950 1500
-Wire Wire Line
-	6450 1450 6950 1450
-Wire Wire Line
-	6450 1400 6950 1400
-Wire Wire Line
-	5350 3000 5700 3000
-Wire Wire Line
-	4550 3000 4850 3000
-Wire Wire Line
-	5350 2750 5700 2750
-Wire Wire Line
-	4750 2300 4750 2250
-Wire Wire Line
-	4750 2250 4800 2250
-Wire Wire Line
-	3650 2850 4150 2850
-Wire Wire Line
-	3650 2800 4150 2800
-Wire Wire Line
-	3650 2700 4150 2700
-Wire Wire Line
-	3650 2650 4150 2650
-Wire Wire Line
-	3650 2600 4150 2600
-Wire Wire Line
-	3650 2550 4150 2550
-Wire Wire Line
-	3650 2350 4150 2350
-Wire Wire Line
-	3650 2250 4150 2250
-Wire Wire Line
-	3650 2200 4150 2200
-Wire Wire Line
-	3650 2150 4150 2150
-Wire Wire Line
-	3650 2050 4150 2050
-Wire Wire Line
-	3650 2000 4150 2000
-Wire Wire Line
-	3650 1950 4150 1950
-Wire Wire Line
-	3650 1900 4150 1900
-Wire Wire Line
-	3650 1850 4150 1850
-Wire Wire Line
-	3650 1800 4150 1800
-Wire Wire Line
-	3650 1750 4150 1750
-Wire Wire Line
-	3650 1700 4150 1700
-Wire Wire Line
-	3650 1650 4150 1650
-Wire Wire Line
-	3650 1600 4150 1600
-Wire Wire Line
-	3650 1550 4150 1550
-Wire Wire Line
-	3650 1500 4150 1500
-Wire Wire Line
-	3650 1450 4150 1450
-Wire Wire Line
-	3650 1400 4150 1400
-Wire Wire Line
-	3650 1350 4150 1350
-Wire Wire Line
-	3650 1300 4150 1300
-Wire Wire Line
-	3650 1250 4150 1250
-Wire Wire Line
-	1300 1800 1800 1800
-Wire Wire Line
-	1300 3300 1800 3300
-Wire Wire Line
-	1300 3250 1800 3250
-Wire Wire Line
-	1300 3200 1800 3200
-Wire Wire Line
-	1300 3150 1800 3150
-Wire Wire Line
-	1300 3000 1800 3000
-Wire Wire Line
-	1300 2950 1800 2950
-Wire Wire Line
-	1300 2900 1800 2900
-Wire Wire Line
-	1300 2850 1800 2850
-Wire Wire Line
-	1300 2550 1800 2550
-Wire Wire Line
-	1300 2500 1800 2500
-Wire Wire Line
-	1300 2350 1800 2350
-Wire Wire Line
-	1300 2300 1800 2300
-Wire Wire Line
-	1300 2250 1800 2250
-Wire Wire Line
-	1300 2200 1800 2200
-Wire Wire Line
-	1300 2000 1800 2000
-Wire Wire Line
-	1300 1950 1800 1950
-Wire Wire Line
-	1300 1900 1800 1900
-Wire Wire Line
-	1300 1850 1800 1850
-Wire Wire Line
-	1300 1750 1800 1750
-Wire Wire Line
-	1300 1700 1800 1700
-Wire Wire Line
-	1300 1650 1800 1650
-Wire Wire Line
-	1300 1600 1800 1600
-Wire Wire Line
-	1300 1550 1800 1550
-Wire Wire Line
-	1300 1500 1800 1500
-Wire Wire Line
-	1300 1450 1800 1450
-Wire Wire Line
-	1300 1400 1800 1400
-Wire Wire Line
-	1300 1350 1800 1350
-Wire Wire Line
-	1300 1300 1800 1300
-Wire Wire Line
-	1300 1250 1800 1250
-Wire Wire Line
-	4800 2100 3650 2100
-Wire Wire Line
-	4550 2750 4850 2750
-Wire Wire Line
-	7650 2950 7650 3000
-Wire Wire Line
-	7650 3000 7300 3000
-Wire Wire Line
-	7300 3000 7300 2950
-Wire Wire Line
-	7400 3000 7400 2950
-Connection ~ 7400 3000
-Wire Wire Line
-	7550 3000 7550 2950
-Connection ~ 7550 3000
-Wire Wire Line
-	7500 3000 7500 3050
-Connection ~ 7500 3000
-Wire Wire Line
-	7350 1100 7350 1150
-Connection ~ 7350 1100
-Wire Wire Line
-	7450 1100 7450 1150
-Connection ~ 7450 1100
-Wire Wire Line
-	7600 1150 7600 1100
-Connection ~ 7600 1100
-Wire Wire Line
-	9100 1150 9100 1600
-Wire Wire Line
-	9250 1150 9250 1600
-Wire Wire Line
-	9400 1150 9400 1600
-Wire Wire Line
-	9550 1150 9550 1600
-Wire Wire Line
-	9700 1150 9700 1600
-Wire Wire Line
-	9850 1150 9850 1600
-Wire Wire Line
-	9100 2050 9100 2500
-Wire Wire Line
-	9250 2050 9250 2500
-Wire Wire Line
-	9550 2050 9550 2500
-Wire Wire Line
-	9700 2050 9700 2500
-Wire Wire Line
-	9850 2050 9850 2500
-Wire Wire Line
-	9100 2950 9100 3400
-Wire Wire Line
-	9250 2950 9250 3400
-Wire Wire Line
-	9400 2950 9400 3400
-Wire Wire Line
-	9550 2950 9550 3400
-Wire Wire Line
-	9700 2950 9700 3400
-Wire Wire Line
-	9850 2950 9850 3400
-Wire Wire Line
-	6050 3650 6050 3750
-Connection ~ 6050 3650
-Wire Wire Line
-	6850 3650 6850 3750
-Connection ~ 6850 3650
-Wire Wire Line
-	7650 3650 7650 3750
-Connection ~ 7650 3650
-Wire Wire Line
-	8450 4150 8450 4250
-Wire Wire Line
-	8450 4250 5650 4250
-Wire Wire Line
-	6450 4250 6450 4150
-Connection ~ 6450 4250
-Wire Wire Line
-	7250 4250 7250 4150
-Connection ~ 7250 4250
-Wire Wire Line
-	8050 4250 8050 4150
-Connection ~ 8050 4250
-Wire Wire Line
-	5650 4150 5650 4300
-Connection ~ 5650 4250
-Wire Wire Line
-	3700 4800 3250 4800
-Wire Wire Line
-	3250 4800 3250 4700
-Wire Wire Line
-	2900 4150 3700 4150
-Connection ~ 3250 4150
-Wire Wire Line
-	2600 4400 2600 4650
-Wire Wire Line
-	2600 4650 2150 4650
-Wire Wire Line
-	3700 6150 3550 6150
-Wire Wire Line
-	3700 6250 3550 6250
-Wire Wire Line
-	3550 6150 3550 6800
-Connection ~ 3550 6400
-Wire Wire Line
-	3400 5850 3000 5850
-Connection ~ 3400 5650
-Wire Wire Line
-	3000 6050 3400 6050
-Connection ~ 3400 5950
-Wire Wire Line
-	3400 5450 3400 6500
-Wire Wire Line
-	3400 6500 3700 6500
-Connection ~ 3400 6050
-Wire Wire Line
-	1300 6300 3700 6300
-Wire Wire Line
-	1300 6350 3700 6350
-Wire Wire Line
-	3700 6450 1300 6450
-Wire Wire Line
-	1300 6550 3700 6550
-Wire Wire Line
-	1300 6600 3700 6600
-Wire Wire Line
-	1300 6650 3700 6650
-Wire Wire Line
-	2500 5950 2300 5950
-Wire Wire Line
-	2300 5950 2300 6600
-Connection ~ 2300 6600
-Wire Wire Line
-	2500 5650 2050 5650
-Wire Wire Line
-	2050 5650 2050 6350
-Connection ~ 2050 6350
-Wire Wire Line
-	1800 6100 1800 6200
-Connection ~ 1800 6200
-Wire Wire Line
-	5950 4600 5950 4550
-Wire Wire Line
-	6650 5300 5950 5300
-Wire Wire Line
-	5950 5300 5950 5100
-Connection ~ 5950 5250
-Wire Wire Line
-	6650 5600 6500 5600
-Wire Wire Line
-	6500 5600 6500 5650
-Wire Wire Line
-	6650 5850 6100 5850
-Wire Wire Line
-	6650 5800 6100 5800
-Wire Wire Line
-	6650 5750 6100 5750
-Wire Wire Line
-	5500 5900 5450 5900
-Wire Wire Line
-	5450 5900 5450 5500
-Wire Wire Line
-	7450 5200 7950 5200
-Wire Wire Line
-	7450 5250 7950 5250
-Wire Wire Line
-	7450 5300 7950 5300
-Wire Wire Line
-	7450 5350 7950 5350
-Wire Wire Line
-	7450 5800 7950 5800
-Wire Wire Line
-	7450 5850 7950 5850
-Wire Wire Line
-	7450 5900 7950 5900
-Wire Wire Line
-	7450 5950 7950 5950
-Wire Wire Line
-	8350 5550 8350 5600
-Connection ~ 8750 5550
-Wire Wire Line
-	9150 6000 9150 6100
+Text Label 1300 3000 0    30   ~
+RXD
+Text GLabel 1300 2950 0    30   Output
+TXD
+Wire Wire Line
+	10000 2050 10000 2500
+Text Label 10000 2500 1    30   ~
+TXD
+$Comp
+L TESTPOINT TP75
+U 1 1 4A7F8308
+P 10000 2000
+F 0 "TP75" V 10000 2200 30  0000 C C
+F 1 "TESTPOINT" H 10000 2000 60  0001 C C
+	1    10000 2000
+	1    0    0    -1  
+$EndComp
+Text Label 4150 2950 2    30   ~
+GPB28
+Wire Wire Line
+	3650 2950 4150 2950
+Wire Wire Line
+	3650 2300 4150 2300
+Wire Wire Line
+	8750 5500 8750 5600
+Connection ~ 8350 6100
+Wire Wire Line
+	8100 6100 9150 6100
+Wire Wire Line
+	8100 6100 8100 5500
 Wire Wire Line
 	8100 5600 7450 5600
 Wire Wire Line
-	8100 5500 8100 6100
+	9150 6100 9150 6000
+Connection ~ 8750 5550
 Wire Wire Line
-	8100 6100 9150 6100
-Connection ~ 8350 6100
+	8350 5550 8350 5600
 Wire Wire Line
-	8750 5500 8750 5600
+	7450 5950 7950 5950
 Wire Wire Line
-	3650 2300 4150 2300
+	7450 5900 7950 5900
+Wire Wire Line
+	7450 5850 7950 5850
+Wire Wire Line
+	7450 5800 7950 5800
+Wire Wire Line
+	7450 5350 7950 5350
+Wire Wire Line
+	7450 5300 7950 5300
+Wire Wire Line
+	7450 5250 7950 5250
+Wire Wire Line
+	7450 5200 7950 5200
+Wire Wire Line
+	5450 5500 5450 5900
+Wire Wire Line
+	5450 5900 5500 5900
+Wire Wire Line
+	6650 5750 6100 5750
+Wire Wire Line
+	6650 5800 6100 5800
+Wire Wire Line
+	6650 5850 6100 5850
+Wire Wire Line
+	6500 5650 6500 5600
+Wire Wire Line
+	6500 5600 6650 5600
+Connection ~ 5950 5250
+Wire Wire Line
+	5950 5100 5950 5300
+Wire Wire Line
+	5950 5300 6650 5300
+Wire Wire Line
+	5950 4600 5950 4550
+Connection ~ 1800 6200
+Wire Wire Line
+	1800 6100 1800 6200
+Connection ~ 2050 6350
+Wire Wire Line
+	2050 6350 2050 5650
+Wire Wire Line
+	2050 5650 2500 5650
+Connection ~ 2300 6600
+Wire Wire Line
+	2300 6600 2300 5950
+Wire Wire Line
+	2300 5950 2500 5950
+Wire Wire Line
+	1300 6650 3700 6650
+Wire Wire Line
+	1300 6600 3700 6600
+Wire Wire Line
+	1300 6550 3700 6550
+Wire Wire Line
+	3700 6450 1300 6450
+Wire Wire Line
+	1300 6350 3700 6350
+Wire Wire Line
+	1300 6300 3700 6300
+Connection ~ 3400 6050
+Wire Wire Line
+	3700 6500 3400 6500
+Wire Wire Line
+	3400 6500 3400 5450
+Connection ~ 3400 5950
+Wire Wire Line
+	3000 6050 3400 6050
+Connection ~ 3400 5650
+Wire Wire Line
+	3400 5850 3000 5850
+Connection ~ 3550 6400
+Wire Wire Line
+	3550 6800 3550 6150
+Wire Wire Line
+	3700 6250 3550 6250
+Wire Wire Line
+	3550 6150 3700 6150
+Wire Wire Line
+	2150 4650 2600 4650
+Wire Wire Line
+	2600 4650 2600 4400
+Connection ~ 3250 4150
+Wire Wire Line
+	2900 4150 3700 4150
+Wire Wire Line
+	3250 4700 3250 4800
+Wire Wire Line
+	3250 4800 3700 4800
+Connection ~ 5650 4250
+Wire Wire Line
+	5650 4150 5650 4300
+Connection ~ 8050 4250
+Wire Wire Line
+	8050 4250 8050 4150
+Connection ~ 7250 4250
+Wire Wire Line
+	7250 4250 7250 4150
+Connection ~ 6450 4250
+Wire Wire Line
+	6450 4250 6450 4150
+Wire Wire Line
+	5650 4250 8450 4250
+Wire Wire Line
+	8450 4250 8450 4150
+Connection ~ 7650 3650
+Wire Wire Line
+	7650 3650 7650 3750
+Connection ~ 6850 3650
+Wire Wire Line
+	6850 3650 6850 3750
+Connection ~ 6050 3650
+Wire Wire Line
+	6050 3650 6050 3750
+Wire Wire Line
+	9850 2050 9850 2500
+Wire Wire Line
+	9700 2050 9700 2500
+Wire Wire Line
+	9550 2050 9550 2500
+Wire Wire Line
+	9400 2050 9400 2500
+Wire Wire Line
+	9250 2050 9250 2500
+Wire Wire Line
+	9100 2050 9100 2500
+Wire Wire Line
+	10600 1150 10600 1600
+Wire Wire Line
+	10450 1150 10450 1600
+Wire Wire Line
+	10300 1150 10300 1600
+Wire Wire Line
+	10150 1150 10150 1600
+Wire Wire Line
+	10000 1150 10000 1600
+Wire Wire Line
+	9850 1150 9850 1600
+Wire Wire Line
+	9700 1150 9700 1600
+Wire Wire Line
+	9550 1150 9550 1600
+Wire Wire Line
+	9400 1150 9400 1600
+Wire Wire Line
+	9250 1150 9250 1600
+Wire Wire Line
+	9100 1150 9100 1600
+Connection ~ 7600 1100
+Wire Wire Line
+	7600 1150 7600 1100
+Connection ~ 7450 1100
+Wire Wire Line
+	7450 1100 7450 1150
+Connection ~ 7350 1100
+Wire Wire Line
+	7350 1100 7350 1150
+Connection ~ 7500 3000
+Wire Wire Line
+	7500 3000 7500 3050
+Connection ~ 7550 3000
+Wire Wire Line
+	7550 3000 7550 2950
+Connection ~ 7400 3000
+Wire Wire Line
+	7400 3000 7400 2950
+Wire Wire Line
+	7300 2950 7300 3000
+Wire Wire Line
+	7300 3000 7650 3000
+Wire Wire Line
+	7650 3000 7650 2950
+Wire Wire Line
+	4550 2750 4850 2750
+Wire Wire Line
+	4800 2100 3650 2100
+Wire Wire Line
+	1300 1250 1800 1250
+Wire Wire Line
+	1300 1300 1800 1300
+Wire Wire Line
+	1300 1350 1800 1350
+Wire Wire Line
+	1300 1400 1800 1400
+Wire Wire Line
+	1300 1450 1800 1450
+Wire Wire Line
+	1300 1500 1800 1500
+Wire Wire Line
+	1300 1550 1800 1550
+Wire Wire Line
+	1300 1600 1800 1600
+Wire Wire Line
+	1300 1650 1800 1650
+Wire Wire Line
+	1300 1700 1800 1700
+Wire Wire Line
+	1300 1750 1800 1750
+Wire Wire Line
+	1300 1850 1800 1850
+Wire Wire Line
+	1300 1900 1800 1900
+Wire Wire Line
+	1300 1950 1800 1950
+Wire Wire Line
+	1300 2000 1800 2000
+Wire Wire Line
+	1300 2200 1800 2200
+Wire Wire Line
+	1300 2250 1800 2250
+Wire Wire Line
+	1300 2300 1800 2300
+Wire Wire Line
+	1300 2350 1800 2350
+Wire Wire Line
+	1300 2500 1800 2500
+Wire Wire Line
+	1300 2550 1800 2550
+Wire Wire Line
+	1300 2850 1800 2850
+Wire Wire Line
+	1300 2900 1800 2900
+Wire Wire Line
+	1300 2950 1800 2950
+Wire Wire Line
+	1300 3000 1800 3000
+Wire Wire Line
+	1300 3150 1800 3150
+Wire Wire Line
+	1300 3200 1800 3200
+Wire Wire Line
+	1300 3250 1800 3250
+Wire Wire Line
+	1300 3300 1800 3300
+Wire Wire Line
+	1300 1800 1800 1800
+Wire Wire Line
+	3650 1250 4150 1250
+Wire Wire Line
+	3650 1300 4150 1300
+Wire Wire Line
+	3650 1350 4150 1350
+Wire Wire Line
+	3650 1400 4150 1400
+Wire Wire Line
+	3650 1450 4150 1450
+Wire Wire Line
+	3650 1500 4150 1500
+Wire Wire Line
+	3650 1550 4150 1550
+Wire Wire Line
+	3650 1600 4150 1600
+Wire Wire Line
+	3650 1650 4150 1650
+Wire Wire Line
+	3650 1700 4150 1700
+Wire Wire Line
+	3650 1750 4150 1750
+Wire Wire Line
+	3650 1800 4150 1800
+Wire Wire Line
+	3650 1850 4150 1850
+Wire Wire Line
+	3650 1900 4150 1900
+Wire Wire Line
+	3650 1950 4150 1950
+Wire Wire Line
+	3650 2000 4150 2000
+Wire Wire Line
+	3650 2050 4150 2050
+Wire Wire Line
+	3650 2150 4150 2150
+Wire Wire Line
+	3650 2200 4150 2200
+Wire Wire Line
+	3650 2250 4150 2250
+Wire Wire Line
+	3650 2350 4150 2350
+Wire Wire Line
+	3650 2550 4150 2550
+Wire Wire Line
+	3650 2600 4150 2600
+Wire Wire Line
+	3650 2650 4150 2650
+Wire Wire Line
+	3650 2700 4150 2700
+Wire Wire Line
+	3650 2800 4150 2800
+Wire Wire Line
+	3650 2850 4150 2850
+Wire Wire Line
+	4800 2250 4750 2250
+Wire Wire Line
+	4750 2250 4750 2300
+Wire Wire Line
+	5350 2750 5700 2750
+Wire Wire Line
+	4550 3000 4850 3000
+Wire Wire Line
+	5350 3000 5700 3000
+Wire Wire Line
+	6450 1400 6950 1400
+Wire Wire Line
+	6450 1450 6950 1450
+Wire Wire Line
+	6450 1500 6950 1500
+Wire Wire Line
+	6450 1550 6950 1550
+Wire Wire Line
+	6450 1600 6950 1600
+Wire Wire Line
+	6450 1650 6950 1650
+Wire Wire Line
+	6450 1700 6950 1700
+Wire Wire Line
+	6450 1750 6950 1750
+Wire Wire Line
+	6450 1800 6950 1800
+Wire Wire Line
+	6450 1850 6950 1850
+Wire Wire Line
+	6450 1900 6950 1900
+Wire Wire Line
+	6450 1950 6950 1950
+Wire Wire Line
+	6450 2000 6950 2000
+Wire Wire Line
+	6450 2100 6950 2100
+Wire Wire Line
+	6450 2150 6950 2150
+Wire Wire Line
+	6450 2200 6950 2200
+Wire Wire Line
+	6450 2300 6950 2300
+Wire Wire Line
+	6450 2350 6950 2350
+Wire Wire Line
+	6450 2450 6950 2450
+Wire Wire Line
+	6450 2550 6950 2550
+Wire Wire Line
+	6450 2600 6950 2600
+Wire Wire Line
+	6450 2700 6950 2700
+Wire Wire Line
+	6450 2750 6950 2750
+Wire Wire Line
+	8000 1400 8500 1400
+Wire Wire Line
+	8000 1450 8500 1450
+Wire Wire Line
+	8000 1500 8500 1500
+Wire Wire Line
+	8000 1550 8500 1550
+Wire Wire Line
+	8000 1600 8500 1600
+Wire Wire Line
+	8000 1650 8500 1650
+Wire Wire Line
+	8000 1700 8500 1700
+Wire Wire Line
+	8000 1750 8500 1750
+Wire Wire Line
+	8000 1800 8500 1800
+Wire Wire Line
+	8000 1850 8500 1850
+Wire Wire Line
+	8000 1900 8500 1900
+Wire Wire Line
+	8000 1950 8500 1950
+Wire Wire Line
+	8000 2000 8500 2000
+Wire Wire Line
+	8000 2050 8500 2050
+Wire Wire Line
+	8000 2100 8500 2100
+Wire Wire Line
+	8000 2150 8500 2150
+Wire Wire Line
+	7350 3000 7350 2950
+Connection ~ 7350 3000
+Wire Wire Line
+	7450 3000 7450 2950
+Connection ~ 7450 3000
+Wire Wire Line
+	7600 2950 7600 3000
+Connection ~ 7600 3000
+Wire Wire Line
+	7650 1150 7650 1100
+Wire Wire Line
+	7650 1100 7300 1100
+Wire Wire Line
+	7300 1100 7300 1150
+Wire Wire Line
+	7400 1100 7400 1150
+Connection ~ 7400 1100
+Wire Wire Line
+	7550 1100 7550 1150
+Connection ~ 7550 1100
+Wire Wire Line
+	7500 1100 7500 1050
+Connection ~ 7500 1100
+Wire Wire Line
+	8450 3750 8450 3650
+Wire Wire Line
+	8450 3650 5650 3650
+Wire Wire Line
+	6450 3650 6450 3750
+Connection ~ 6450 3650
+Wire Wire Line
+	7250 3650 7250 3750
+Connection ~ 7250 3650
+Wire Wire Line
+	8050 3650 8050 3750
+Connection ~ 8050 3650
+Wire Wire Line
+	6100 4150 6050 4150
+Wire Wire Line
+	6050 4150 6050 4250
+Connection ~ 6050 4250
+Wire Wire Line
+	6850 4250 6850 4150
+Connection ~ 6850 4250
+Wire Wire Line
+	7650 4250 7650 4150
+Connection ~ 7650 4250
+Wire Wire Line
+	5650 3750 5650 3600
+Connection ~ 5650 3650
+Wire Wire Line
+	3250 4300 3250 4150
+Wire Wire Line
+	3700 4850 3700 4700
+Connection ~ 3700 4800
+Wire Wire Line
+	2550 4150 2150 4150
+Wire Wire Line
+	2150 4150 2150 4100
+Wire Wire Line
+	3700 4100 3700 4300
+Connection ~ 3700 4150
+Wire Wire Line
+	3550 6400 3700 6400
+Connection ~ 3550 6250
+Wire Wire Line
+	3400 5550 3000 5550
+Wire Wire Line
+	3400 5650 3000 5650
+Wire Wire Line
+	3400 5950 3000 5950
+Connection ~ 3400 5850
+Connection ~ 3400 5550
+Wire Wire Line
+	1300 6200 3700 6200
+Wire Wire Line
+	2500 6050 2350 6050
+Wire Wire Line
+	2350 6050 2350 6650
+Connection ~ 2350 6650
+Wire Wire Line
+	2500 5850 2250 5850
+Wire Wire Line
+	2250 5850 2250 6550
+Connection ~ 2250 6550
+Wire Wire Line
+	2500 5550 2000 5550
+Wire Wire Line
+	2000 5550 2000 6300
+Connection ~ 2000 6300
+Wire Wire Line
+	1800 5600 1800 5550
+Wire Wire Line
+	5950 5250 6650 5250
+Wire Wire Line
+	6650 5350 6100 5350
+Wire Wire Line
+	6650 5400 6100 5400
+Wire Wire Line
+	6650 5450 6100 5450
+Wire Wire Line
+	6650 5900 6000 5900
+Wire Wire Line
+	6650 5550 5450 5550
+Connection ~ 5450 5550
+Wire Wire Line
+	9150 5600 9150 5550
+Wire Wire Line
+	9150 5550 7450 5550
+Connection ~ 8350 5550
+Wire Wire Line
+	8350 6100 8350 6000
+Connection ~ 8750 6100
+Wire Wire Line
+	8100 5500 7450 5500
+Connection ~ 8100 5600
+Wire Wire Line
+	8750 6150 8750 6000
+Wire Wire Line
+	3650 2900 4150 2900
+Wire Wire Line
+	10150 2050 10150 2500
+Text Label 10150 2500 1    30   ~
+GPB28
+$Comp
+L TESTPOINT TP80
+U 1 1 4A7F6EE5
+P 10150 2000
+F 0 "TP80" V 10150 2200 30  0000 C C
+F 1 "TESTPOINT" H 10150 2000 60  0001 C C
+	1    10150 2000
+	1    0    0    -1  
+$EndComp
 Text GLabel 4150 2900 2    30   Input
 USB_ID
 Text GLabel 4150 2300 2    30   Output
@@ -540,19 +573,19 @@ Text Notes 6750 6350 0    50   ~
 NoConn ~ 6650 5700
 NoConn ~ 6650 5650
 $Comp
-L V33 #PWR092
+L V33 #PWR091
 U 1 1 4A481C7B
 P 8750 5500
-F 0 "#PWR092" H 8750 5450 20  0001 C C
+F 0 "#PWR091" H 8750 5450 20  0001 C C
 F 1 "V33" H 8750 5600 30  0000 C C
 	1    8750 5500
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR093
+L GND #PWR092
 U 1 1 4A481C6B
 P 8750 6150
-F 0 "#PWR093" H 8750 6150 30  0001 C C
+F 0 "#PWR092" H 8750 6150 30  0001 C C
 F 1 "GND" H 8750 6080 30  0001 C C
 	1    8750 6150
 	1    0    0    -1  
@@ -575,10 +608,10 @@ Text Label 7950 5800 2    30   ~
 D3
 NoConn ~ 7450 5150
 $Comp
-L V33 #PWR094
+L V33 #PWR093
 U 1 1 4A481B33
 P 5450 5500
-F 0 "#PWR094" H 5450 5450 20  0001 C C
+F 0 "#PWR093" H 5450 5450 20  0001 C C
 F 1 "V33" H 5450 5600 30  0000 C C
 	1    5450 5500
 	1    0    0    -1  
@@ -592,10 +625,10 @@ FALE/GPB16
 Text Label 6100 5750 0    30   ~
 FCLE/GPB15
 $Comp
-L GND #PWR095
+L GND #PWR094
 U 1 1 4A481A8B
 P 6500 5650
-F 0 "#PWR095" H 6500 5650 30  0001 C C
+F 0 "#PWR094" H 6500 5650 30  0001 C C
 F 1 "GND" H 6500 5580 30  0001 C C
 	1    6500 5650
 	1    0    0    -1  
@@ -611,10 +644,10 @@ FRB_N
 Text Label 6150 5250 0    30   ~
 FRB_N
 $Comp
-L V33 #PWR096
+L V33 #PWR095
 U 1 1 4A481948
 P 5950 4550
-F 0 "#PWR096" H 5950 4500 20  0001 C C
+F 0 "#PWR095" H 5950 4500 20  0001 C C
 F 1 "V33" H 5950 4650 30  0000 C C
 	1    5950 4550
 	1    0    0    -1  
@@ -647,7 +680,7 @@ L C C49
 U 1 1 4A4818D2
 P 9150 5800
 F 0 "C49" V 9200 5950 50  0000 L C
-F 1 "10uF/10V" V 9300 5800 50  0000 L C
+F 1 "1uF/16V" V 9300 5800 50  0000 L C
 	1    9150 5800
 	1    0    0    -1  
 $EndComp
@@ -711,28 +744,28 @@ SDD1
 Text GLabel 1300 6200 0    30   Input
 SDDET
 $Comp
-L V33 #PWR097
+L V33 #PWR096
 U 1 1 4A480302
 P 1800 5550
-F 0 "#PWR097" H 1800 5500 20  0001 C C
+F 0 "#PWR096" H 1800 5500 20  0001 C C
 F 1 "V33" H 1800 5650 30  0000 C C
 	1    1800 5550
 	1    0    0    -1  
 $EndComp
 $Comp
-L V33SD #PWR098
+L V33SD #PWR097
 U 1 1 4A480210
 P 3400 5450
-F 0 "#PWR098" H 3400 5400 20  0001 C C
+F 0 "#PWR097" H 3400 5400 20  0001 C C
 F 1 "V33SD" H 3400 5550 30  0000 C C
 	1    3400 5450
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR099
+L GND #PWR098
 U 1 1 4A4801C9
 P 3550 6800
-F 0 "#PWR099" H 3550 6800 30  0001 C C
+F 0 "#PWR098" H 3550 6800 30  0001 C C
 F 1 "GND" H 3550 6730 30  0001 C C
 	1    3550 6800
 	1    0    0    -1  
@@ -801,10 +834,10 @@ F 1 "MS_1D77" H 4100 6050 60  0000 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L V33SD #PWR0100
+L V33SD #PWR099
 U 1 1 4A480089
 P 3700 4100
-F 0 "#PWR0100" H 3700 4050 20  0001 C C
+F 0 "#PWR099" H 3700 4050 20  0001 C C
 F 1 "V33SD" H 3700 4200 30  0000 C C
 	1    3700 4100
 	1    0    0    -1  
@@ -812,19 +845,19 @@ $EndComp
 Text GLabel 2150 4650 0    30   Input
 SDPWEN
 $Comp
-L V33 #PWR0101
+L V33 #PWR0100
 U 1 1 4A47FFDD
 P 2150 4100
-F 0 "#PWR0101" H 2150 4050 20  0001 C C
+F 0 "#PWR0100" H 2150 4050 20  0001 C C
 F 1 "V33" H 2150 4200 30  0000 C C
 	1    2150 4100
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0102
+L GND #PWR0101
 U 1 1 4A47FFBE
 P 3700 4850
-F 0 "#PWR0102" H 3700 4850 30  0001 C C
+F 0 "#PWR0101" H 3700 4850 30  0001 C C
 F 1 "GND" H 3700 4780 30  0001 C C
 	1    3700 4850
 	1    0    0    -1  
@@ -857,19 +890,19 @@ F 1 "10uF/10V" V 3400 4500 50  0000 L C
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0103
+L GND #PWR0102
 U 1 1 4A47FEBC
 P 5650 4300
-F 0 "#PWR0103" H 5650 4300 30  0001 C C
+F 0 "#PWR0102" H 5650 4300 30  0001 C C
 F 1 "GND" H 5650 4230 30  0001 C C
 	1    5650 4300
 	1    0    0    -1  
 $EndComp
 $Comp
-L V33 #PWR0104
+L V33 #PWR0103
 U 1 1 4A47FEB1
 P 5650 3600
-F 0 "#PWR0104" H 5650 3550 20  0001 C C
+F 0 "#PWR0103" H 5650 3550 20  0001 C C
 F 1 "V33" H 5650 3700 30  0000 C C
 	1    5650 3600
 	1    0    0    -1  
@@ -946,27 +979,27 @@ F 1 "10uF/10V" V 5800 3950 50  0000 L C
 	1    5650 3950
 	1    0    0    -1  
 $EndComp
-Text Label 9850 3400 1    30   ~
-CKO
-Text Label 9700 3400 1    30   ~
-DCS0_N
-Text Label 9550 3400 1    30   ~
-FRB_N
-Text Label 9400 3400 1    30   ~
-CKO
-Text Label 9250 3400 1    30   ~
-RDWR_N
-Text Label 9100 3400 1    30   ~
-FWE_N
 Text Label 9850 2500 1    30   ~
-FRE_N
+CKE
 Text Label 9700 2500 1    30   ~
-CS2_N
+DCS0_N
 Text Label 9550 2500 1    30   ~
-CS1_N
+FRB_N
+Text Label 9400 2500 1    30   ~
+CKO
 Text Label 9250 2500 1    30   ~
-SDDET
+RDWR_N
 Text Label 9100 2500 1    30   ~
+FWE_N
+Text Label 10600 1600 1    30   ~
+FRE_N
+Text Label 10450 1600 1    30   ~
+CS2_N
+Text Label 10300 1600 1    30   ~
+CS1_N
+Text Label 10150 1600 1    30   ~
+SDDET
+Text Label 10000 1600 1    30   ~
 SDCMD
 Text Label 9850 1600 1    30   ~
 SDCLK
@@ -983,103 +1016,103 @@ SDPWEN
 $Comp
 L TESTPOINT TP31
 U 1 1 4A47FBF4
-P 9850 2900
-F 0 "TP31" V 9850 3100 30  0000 C C
-F 1 "TESTPOINT" H 9850 2900 60  0001 C C
-	1    9850 2900
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP30
-U 1 1 4A47FBF3
-P 9700 2900
-F 0 "TP30" V 9700 3100 30  0000 C C
-F 1 "TESTPOINT" H 9700 2900 60  0001 C C
-	1    9700 2900
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP29
-U 1 1 4A47FBF2
-P 9550 2900
-F 0 "TP29" V 9550 3100 30  0000 C C
-F 1 "TESTPOINT" H 9550 2900 60  0001 C C
-	1    9550 2900
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP28
-U 1 1 4A47FBF1
-P 9400 2900
-F 0 "TP28" V 9400 3100 30  0000 C C
-F 1 "TESTPOINT" H 9400 2900 60  0001 C C
-	1    9400 2900
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP27
-U 1 1 4A47FBF0
-P 9250 2900
-F 0 "TP27" V 9250 3100 30  0000 C C
-F 1 "TESTPOINT" H 9250 2900 60  0001 C C
-	1    9250 2900
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP26
-U 1 1 4A47FBEF
-P 9100 2900
-F 0 "TP26" V 9100 3100 30  0000 C C
-F 1 "TESTPOINT" H 9100 2900 60  0001 C C
-	1    9100 2900
-	1    0    0    -1  
-$EndComp
-$Comp
-L TESTPOINT TP21
-U 1 1 4A47FBE7
 P 9850 2000
-F 0 "TP21" V 9850 2200 30  0000 C C
+F 0 "TP31" V 9850 2200 30  0000 C C
 F 1 "TESTPOINT" H 9850 2000 60  0001 C C
 	1    9850 2000
 	1    0    0    -1  
 $EndComp
 $Comp
-L TESTPOINT TP20
-U 1 1 4A47FBE6
+L TESTPOINT TP30
+U 1 1 4A47FBF3
 P 9700 2000
-F 0 "TP20" V 9700 2200 30  0000 C C
+F 0 "TP30" V 9700 2200 30  0000 C C
 F 1 "TESTPOINT" H 9700 2000 60  0001 C C
 	1    9700 2000
 	1    0    0    -1  
 $EndComp
 $Comp
-L TESTPOINT TP19
-U 1 1 4A47FBE5
+L TESTPOINT TP29
+U 1 1 4A47FBF2
 P 9550 2000
-F 0 "TP19" V 9550 2200 30  0000 C C
+F 0 "TP29" V 9550 2200 30  0000 C C
 F 1 "TESTPOINT" H 9550 2000 60  0001 C C
 	1    9550 2000
 	1    0    0    -1  
 $EndComp
 $Comp
-L TESTPOINT TP18
-U 1 1 4A47FBE3
+L TESTPOINT TP28
+U 1 1 4A47FBF1
+P 9400 2000
+F 0 "TP28" V 9400 2200 30  0000 C C
+F 1 "TESTPOINT" H 9400 2000 60  0001 C C
+	1    9400 2000
+	1    0    0    -1  
+$EndComp
+$Comp
+L TESTPOINT TP27
+U 1 1 4A47FBF0
 P 9250 2000
-F 0 "TP18" V 9250 2200 30  0000 C C
+F 0 "TP27" V 9250 2200 30  0000 C C
 F 1 "TESTPOINT" H 9250 2000 60  0001 C C
 	1    9250 2000
 	1    0    0    -1  
 $EndComp
 $Comp
-L TESTPOINT TP17
-U 1 1 4A47FBE2
+L TESTPOINT TP26
+U 1 1 4A47FBEF
 P 9100 2000
-F 0 "TP17" V 9100 2200 30  0000 C C
+F 0 "TP26" V 9100 2200 30  0000 C C
 F 1 "TESTPOINT" H 9100 2000 60  0001 C C
 	1    9100 2000
 	1    0    0    -1  
 $EndComp
 $Comp
+L TESTPOINT TP21
+U 1 1 4A47FBE7
+P 10600 1100
+F 0 "TP21" V 10600 1300 30  0000 C C
+F 1 "TESTPOINT" H 10600 1100 60  0001 C C
+	1    10600 1100
+	1    0    0    -1  
+$EndComp
+$Comp
+L TESTPOINT TP20
+U 1 1 4A47FBE6
+P 10450 1100
+F 0 "TP20" V 10450 1300 30  0000 C C
+F 1 "TESTPOINT" H 10450 1100 60  0001 C C
+	1    10450 1100
+	1    0    0    -1  
+$EndComp
+$Comp
+L TESTPOINT TP19
+U 1 1 4A47FBE5
+P 10300 1100
+F 0 "TP19" V 10300 1300 30  0000 C C
+F 1 "TESTPOINT" H 10300 1100 60  0001 C C
+	1    10300 1100
+	1    0    0    -1  
+$EndComp
+$Comp
+L TESTPOINT TP18
+U 1 1 4A47FBE3
+P 10150 1100
+F 0 "TP18" V 10150 1300 30  0000 C C
+F 1 "TESTPOINT" H 10150 1100 60  0001 C C
+	1    10150 1100
+	1    0    0    -1  
+$EndComp
+$Comp
+L TESTPOINT TP17
+U 1 1 4A47FBE2
+P 10000 1100
+F 0 "TP17" V 10000 1300 30  0000 C C
+F 1 "TESTPOINT" H 10000 1100 60  0001 C C
+	1    10000 1100
+	1    0    0    -1  
+$EndComp
+$Comp
 L TESTPOINT TP16
 U 1 1 4A47FBC8
 P 9850 1100
@@ -1134,19 +1167,19 @@ F 1 "TESTPOINT" H 9100 1100 60  0001 C C
 	1    0    0    -1  
 $EndComp
 $Comp
-L V33 #PWR0105
+L V33 #PWR0104
 U 1 1 4A47F986
 P 7500 1050
-F 0 "#PWR0105" H 7500 1000 20  0001 C C
+F 0 "#PWR0104" H 7500 1000 20  0001 C C
 F 1 "V33" H 7500 1150 30  0000 C C
 	1    7500 1050
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0106
+L GND #PWR0105
 U 1 1 4A47F94A
 P 7500 3050
-F 0 "#PWR0106" H 7500 3050 30  0001 C C
+F 0 "#PWR0105" H 7500 3050 30  0001 C C
 F 1 "GND" H 7500 2980 30  0001 C C
 	1    7500 3050
 	1    0    0    -1  
@@ -1270,10 +1303,10 @@ A11
 Text Label 4800 2100 2    30   ~
 BUZPWM
 $Comp
-L GND #PWR0107
+L GND #PWR0106
 U 1 1 4A47F42B
 P 4750 2300
-F 0 "#PWR0107" H 4750 2300 30  0001 C C
+F 0 "#PWR0106" H 4750 2300 30  0001 C C
 F 1 "GND" H 4750 2230 30  0001 C C
 	1    4750 2300
 	1    0    0    -1  
@@ -1370,15 +1403,6 @@ Text Label 4150 1250 2    30   ~
 A0
 Text GLabel 1300 3150 0    30   Input
 CHARGE_N
-$Comp
-L TESTPOINT TP75
-U 1 1 4A4780E9
-P 1250 2950
-F 0 "TP75" V 1250 3200 30  0000 C C
-F 1 "TESTPOINT" H 1250 2950 60  0001 C C
-	1    1250 2950
-	0    -1   -1   0   
-$EndComp
 Text Label 1300 2950 0    30   ~
 TXD
 Text GLabel 1300 3000 0    30   Input