Changes from review of v0.4 schematics

Remove unnecessary caps
Remove ferrite bead
Consolidate parts to reduce BOM size
Add pull down on GPIOA line

Signed-off-by: Grant Likely <grant.likely@linaro.org>

5 files changed, 202 insertions, 236 deletions

diff --git a/96boards-uart-cache.lib b/96boards-uart-cache.lib
index f467510..7ce0797 100644
--- a/96boards-uart-cache.lib
+++ b/96boards-uart-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Tue 16 Jun 2015 14:35:56 BST
+EESchema-LIBRARY Version 2.3  Date: Tue 16 Jun 2015 15:26:23 BST
 #encoding utf-8
 #
 # +1.8V
@@ -160,25 +160,6 @@ X P8 8 350 150 300 L 60 60 1 1 P I
 ENDDRAW
 ENDDEF
 #
-# FILTER
-#
-DEF FILTER FB 0 40 Y N 1 F N
-F0 "FB" 0 150 60 H V C CNN
-F1 "FILTER" 0 -100 60 H V C CNN
-F2 "~" 0 0 60 H V C CNN
-F3 "~" 0 0 60 H V C CNN
-DRAW
-A -150 0 50 1 1799 0 1 0 N -100 0 -200 0
-A -50 0 50 1 1799 0 1 0 N 0 0 -100 0
-A 0 0 0 0 0 0 1 0 N 0 0 0 0
-A 50 0 50 1 1799 0 1 0 N 100 0 0 0
-A 150 0 50 1 1799 0 1 0 N 200 0 100 0
-S -225 75 225 -50 0 1 0 N
-X 1 1 -350 0 150 R 40 40 1 1 P
-X 2 2 350 0 150 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
 # FT230XS
 #
 DEF FT230XS U 0 40 Y Y 1 F N
diff --git a/96boards-uart.cmp b/96boards-uart.cmp
index 99e0fbd..426898e 100644
--- a/96boards-uart.cmp
+++ b/96boards-uart.cmp
@@ -1,4 +1,4 @@
-Cmp-Mod V01 Created by CvPcb (25-Oct-2014 BZR 4029)-stable date = Tue 16 Jun 2015 14:40:30 BST
+Cmp-Mod V01 Created by CvPcb (25-Oct-2014 BZR 4029)-stable date = Tue 16 Jun 2015 14:43:02 BST
 
 BeginCmp
 TimeStamp = /556231A4;
@@ -60,7 +60,7 @@ BeginCmp
 TimeStamp = /5565AB07;
 Reference = CON1;
 ValeurCmp = ST-USB-001G;
-IdModule  = USB_MICRO_B_001G;
+IdModule  = USB_MICRO_B;
 EndCmp
 
 BeginCmp
diff --git a/96boards-uart.kicad_pcb b/96boards-uart.kicad_pcb
index 3ce42ce..5cae731 100644
--- a/96boards-uart.kicad_pcb
+++ b/96boards-uart.kicad_pcb
@@ -200,7 +200,7 @@
     )
   )
 
-  (module 96BOARDS_LV_EXPANSION (layer F.Cu) (tedit 556AF4EB) (tstamp 556B028D)
+  (module 96BOARDS_LS_EXPANSION (layer F.Cu) (tedit 556AF4EB) (tstamp 556B028D)
     (at 129 105)
     (descr "Double rangee de contacts 2 x 12 pins")
     (tags CONN)
diff --git a/96boards-uart.pdf b/96boards-uart.pdf
index 56e5da7..f7b0f55 100644
--- a/96boards-uart.pdf
+++ b/96boards-uart.pdf
diff --git a/96boards-uart.sch b/96boards-uart.sch
index 89ff276..f3581db 100644
--- a/96boards-uart.sch
+++ b/96boards-uart.sch
@@ -47,10 +47,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR01
+L GND #PWR24
 U 1 1 54EB8F88
 P 7450 6100
-F 0 "#PWR01" H 7450 6100 30  0001 C CNN
+F 0 "#PWR24" H 7450 6100 30  0001 C CNN
 F 1 "GND" H 7450 6030 30  0001 C CNN
 F 2 "" H 7450 6100 60  0000 C CNN
 F 3 "" H 7450 6100 60  0000 C CNN
@@ -58,10 +58,10 @@ F 3 "" H 7450 6100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L SW_PUSH SW2
+L SW_PUSH SW1
 U 1 1 54EBBD47
 P 10100 4600
-F 0 "SW2" H 10250 4710 50  0000 C CNN
+F 0 "SW1" H 10250 4710 50  0000 C CNN
 F 1 "RST" H 10100 4520 50  0000 C CNN
 F 2 "~" H 10100 4600 60  0000 C CNN
 F 3 "~" H 10100 4600 60  0000 C CNN
@@ -70,10 +70,10 @@ F 4 "3110040P1" H 10100 4600 60  0001 C CNN "OPL"
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR02
+L GND #PWR19
 U 1 1 54EBBDBB
 P 10100 5000
-F 0 "#PWR02" H 10100 5000 30  0001 C CNN
+F 0 "#PWR19" H 10100 5000 30  0001 C CNN
 F 1 "GND" H 10100 4930 30  0001 C CNN
 F 2 "" H 10100 5000 60  0000 C CNN
 F 3 "" H 10100 5000 60  0000 C CNN
@@ -81,10 +81,10 @@ F 3 "" H 10100 5000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L 96BOARD_LS_EXPANSION J1
+L 96BOARD_LS_EXPANSION J2
 U 1 1 54F0AFFF
 P 8650 4900
-F 0 "J1" H 8650 5950 60  0000 C CNN
+F 0 "J2" H 8650 5950 60  0000 C CNN
 F 1 "96BOARDS_LS_EXPANSION" H 8650 3850 50  0000 C CNN
 F 2 "96BOARDS_LS_EXPANSION" H 8650 4900 60  0001 C CNN
 F 3 "" H 8650 4900 60  0000 C CNN
@@ -93,10 +93,10 @@ F 4 "320020089" H 8650 4900 60  0001 C CNN "OPL"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR03
+L GND #PWR12
 U 1 1 54E654DB
 P 10050 3750
-F 0 "#PWR03" H 10050 3750 30  0001 C CNN
+F 0 "#PWR12" H 10050 3750 30  0001 C CNN
 F 1 "GND" H 10050 3680 30  0001 C CNN
 F 2 "" H 10050 3750 60  0000 C CNN
 F 3 "" H 10050 3750 60  0000 C CNN
@@ -104,10 +104,10 @@ F 3 "" H 10050 3750 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR04
+L GND #PWR11
 U 1 1 55618FF7
 P 7200 3750
-F 0 "#PWR04" H 7200 3750 30  0001 C CNN
+F 0 "#PWR11" H 7200 3750 30  0001 C CNN
 F 1 "GND" H 7200 3680 30  0001 C CNN
 F 2 "" H 7200 3750 60  0000 C CNN
 F 3 "" H 7200 3750 60  0000 C CNN
@@ -131,10 +131,10 @@ L CSMALL C1
 U 1 1 556231A4
 P 1700 2200
 F 0 "C1" H 1725 2250 30  0000 L CNN
-F 1 "10uF" H 1725 2150 30  0000 L CNN
+F 1 "1uF" H 1725 2150 30  0000 L CNN
 F 2 "SM0603_Capa" H 1450 2200 60  0001 C CNN
 F 3 "" H 1550 2200 60  0000 C CNN
-F 4 "302010103" H 1700 2200 60  0001 C CNN "OPL"
+F 4 "~" H 1700 2200 60  0001 C CNN "OPL"
 	1    1700 2200
 	1    0    0    -1  
 $EndComp
@@ -143,18 +143,18 @@ L CSMALL C2
 U 1 1 556232C3
 P 2950 2200
 F 0 "C2" H 2975 2250 30  0000 L CNN
-F 1 "10uF" H 2975 2150 30  0000 L CNN
+F 1 "1uF" H 2975 2150 30  0000 L CNN
 F 2 "SM0603" H 3200 2200 60  0001 C CNN
 F 3 "" H 3200 2300 60  0000 C CNN
-F 4 "302010103" H 2950 2200 60  0001 C CNN "OPL"
+F 4 "~" H 2950 2200 60  0001 C CNN "OPL"
 	1    2950 2200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR05
+L GND #PWR25
 U 1 1 54EB8F4C
 P 9800 6100
-F 0 "#PWR05" H 9800 6100 30  0001 C CNN
+F 0 "#PWR25" H 9800 6100 30  0001 C CNN
 F 1 "GND" H 9800 6030 30  0001 C CNN
 F 2 "" H 9800 6100 60  0000 C CNN
 F 3 "" H 9800 6100 60  0000 C CNN
@@ -187,10 +187,10 @@ NoConn ~ 9800 5550
 NoConn ~ 9800 5650
 NoConn ~ 9800 5750
 $Comp
-L GND #PWR06
+L GND #PWR7
 U 1 1 5563348F
 P 2650 2500
-F 0 "#PWR06" H 2650 2500 30  0001 C CNN
+F 0 "#PWR7" H 2650 2500 30  0001 C CNN
 F 1 "GND" H 2650 2430 30  0001 C CNN
 F 2 "" H 2650 2500 60  0000 C CNN
 F 3 "" H 2650 2500 60  0000 C CNN
@@ -198,10 +198,10 @@ F 3 "" H 2650 2500 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR07
+L GND #PWR26
 U 1 1 55659C7D
 P 4250 6450
-F 0 "#PWR07" H 4250 6450 30  0001 C CNN
+F 0 "#PWR26" H 4250 6450 30  0001 C CNN
 F 1 "GND" H 4250 6380 30  0001 C CNN
 F 2 "" H 4250 6450 60  0000 C CNN
 F 3 "" H 4250 6450 60  0000 C CNN
@@ -211,20 +211,20 @@ $EndComp
 $Comp
 L USB-MINI-B CON1
 U 1 1 5565AB07
-P 1300 4800
-F 0 "CON1" H 1050 5250 60  0000 C CNN
-F 1 "ST-USB-001G" H 1250 4300 60  0000 C CNN
-F 2 "" H 1300 4800 60  0000 C CNN
-F 3 "" H 1300 4800 60  0000 C CNN
-F 4 "320010000" H 1300 4800 60  0001 C CNN "OPL"
-	1    1300 4800
+P 1500 4800
+F 0 "CON1" H 1250 5250 60  0000 C CNN
+F 1 "ST-USB-001G" H 1450 4300 60  0000 C CNN
+F 2 "" H 1500 4800 60  0000 C CNN
+F 3 "" H 1500 4800 60  0000 C CNN
+F 4 "320010000" H 1500 4800 60  0001 C CNN "OPL"
+	1    1500 4800
 	-1   0    0    -1  
 $EndComp
 $Comp
-L R R6
+L R R9
 U 1 1 5565BAFA
 P 2950 4650
-F 0 "R6" V 3000 4850 40  0000 C CNN
+F 0 "R9" V 3000 4850 40  0000 C CNN
 F 1 "22" V 2957 4651 40  0000 C CNN
 F 2 "SM0603_Resistor" V 2880 4650 30  0001 C CNN
 F 3 "~" H 2950 4650 30  0000 C CNN
@@ -233,68 +233,56 @@ F 4 "0010010P1" V 2950 4650 60  0001 C CNN "OPL"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR08
+L GND #PWR20
 U 1 1 5565BCDE
-P 750 5200
-F 0 "#PWR08" H 750 5200 30  0001 C CNN
-F 1 "GND" H 750 5130 30  0001 C CNN
-F 2 "" H 750 5200 60  0000 C CNN
-F 3 "" H 750 5200 60  0000 C CNN
-	1    750  5200
-	1    0    0    -1  
-$EndComp
-$Comp
-L CSMALL C7
-U 1 1 5565BF0F
-P 2500 5000
-F 0 "C7" H 2525 5050 30  0000 L CNN
-F 1 "39pF" H 2525 4950 30  0000 L CNN
-F 2 "SM0603_Capa" H 2500 5000 60  0001 C CNN
-F 3 "~" H 2500 5000 60  0000 C CNN
-F 4 "CC0603JRNPO9BN390" H 2500 5000 60  0001 C CNN "OPL"
-	1    2500 5000
+P 950 5200
+F 0 "#PWR20" H 950 5200 30  0001 C CNN
+F 1 "GND" H 950 5130 30  0001 C CNN
+F 2 "" H 950 5200 60  0000 C CNN
+F 3 "" H 950 5200 60  0000 C CNN
+	1    950  5200
 	1    0    0    -1  
 $EndComp
 $Comp
 L CSMALL C6
-U 1 1 5565BEFD
-P 2300 5000
-F 0 "C6" H 2325 5050 30  0000 L CNN
-F 1 "39pF" H 2325 4950 30  0000 L CNN
-F 2 "SM0603_Capa" H 2300 5000 60  0001 C CNN
-F 3 "~" H 2300 5000 60  0000 C CNN
-F 4 "CC0603JRNPO9BN390" H 2300 5000 60  0001 C CNN "OPL"
-	1    2300 5000
+U 1 1 5565BF0F
+P 2500 4950
+F 0 "C6" H 2525 5000 30  0000 L CNN
+F 1 "39pF" H 2525 4900 30  0000 L CNN
+F 2 "SM0603_Capa" H 2500 4950 60  0001 C CNN
+F 3 "~" H 2500 4950 60  0000 C CNN
+F 4 "CC0603JRNPO9BN390" H 2500 4950 60  0001 C CNN "OPL"
+	1    2500 4950
 	1    0    0    -1  
 $EndComp
 $Comp
 L CSMALL C5
-U 1 1 5565C27A
-P 2100 5000
-F 0 "C5" H 2125 5050 30  0000 L CNN
-F 1 "10nF" H 2125 4950 30  0000 L CNN
-F 2 "SM0603_Capa" H 2100 5000 60  0001 C CNN
-F 3 "~" H 2100 5000 60  0000 C CNN
-F 4 "0100350P1" H 2100 5000 60  0001 C CNN "OPL"
-	1    2100 5000
+U 1 1 5565BEFD
+P 2300 4950
+F 0 "C5" H 2325 5000 30  0000 L CNN
+F 1 "39pF" H 2325 4900 30  0000 L CNN
+F 2 "SM0603_Capa" H 2300 4950 60  0001 C CNN
+F 3 "~" H 2300 4950 60  0000 C CNN
+F 4 "CC0603JRNPO9BN390" H 2300 4950 60  0001 C CNN "OPL"
+	1    2300 4950
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR09
+L GND #PWR21
 U 1 1 5565C12D
-P 2200 5350
-F 0 "#PWR09" H 2200 5350 30  0001 C CNN
-F 1 "GND" H 2200 5280 30  0001 C CNN
-F 2 "" H 2200 5350 60  0000 C CNN
-F 3 "" H 2200 5350 60  0000 C CNN
-	1    2200 5350
+P 2150 5200
+F 0 "#PWR21" H 2150 5200 30  0001 C CNN
+F 1 "GND" H 2150 5130 30  0001 C CNN
+F 2 "" H 2150 5200 60  0000 C CNN
+F 3 "" H 2150 5200 60  0000 C CNN
+	1    2150 5200
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R7
+L R R10
 U 1 1 5565BB09
 P 2950 4750
-F 0 "R7" V 3000 4950 40  0000 C CNN
+F 0 "R10" V 3000 4950 40  0000 C CNN
 F 1 "22" V 2957 4751 40  0000 C CNN
 F 2 "~" V 2880 4750 30  0000 C CNN
 F 3 "~" H 2950 4750 30  0000 C CNN
@@ -305,36 +293,36 @@ $EndComp
 $Comp
 L CSMALL C4
 U 1 1 5565C7D2
-P 2800 3750
-F 0 "C4" H 2825 3800 30  0000 L CNN
-F 1 "100nF" H 2825 3700 30  0000 L CNN
-F 2 "SM0603_Capa" H 2800 3750 60  0001 C CNN
-F 3 "~" H 2800 3750 60  0000 C CNN
-F 4 "0100020P1" H 2800 3750 60  0001 C CNN "OPL"
-	1    2800 3750
+P 1600 3800
+F 0 "C4" H 1625 3850 30  0000 L CNN
+F 1 "100nF" H 1625 3750 30  0000 L CNN
+F 2 "SM0603_Capa" H 1600 3800 60  0001 C CNN
+F 3 "~" H 1600 3800 60  0000 C CNN
+F 4 "0100020P1" H 1600 3800 60  0001 C CNN "OPL"
+	1    1600 3800
 	1    0    0    -1  
 $EndComp
 $Comp
 L CSMALL C3
 U 1 1 5565C7D8
-P 2600 3750
-F 0 "C3" H 2625 3800 30  0000 L CNN
-F 1 "4.7uF" H 2625 3700 30  0000 L CNN
-F 2 "SM0603_Capa" H 2600 3750 60  0001 C CNN
-F 3 "~" H 2600 3750 60  0000 C CNN
-F 4 "302010111" H 2600 3750 60  0001 C CNN "OPL"
-	1    2600 3750
+P 1400 3800
+F 0 "C3" H 1425 3850 30  0000 L CNN
+F 1 "1uF" H 1425 3750 30  0000 L CNN
+F 2 "SM0603_Capa" H 1400 3800 60  0001 C CNN
+F 3 "~" H 1400 3800 60  0000 C CNN
+F 4 "~" H 1400 3800 60  0001 C CNN "OPL"
+	1    1400 3800
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR010
+L GND #PWR13
 U 1 1 5565C7DE
-P 2700 4050
-F 0 "#PWR010" H 2700 4050 30  0001 C CNN
-F 1 "GND" H 2700 3980 30  0001 C CNN
-F 2 "" H 2700 4050 60  0000 C CNN
-F 3 "" H 2700 4050 60  0000 C CNN
-	1    2700 4050
+P 1500 4100
+F 0 "#PWR13" H 1500 4100 30  0001 C CNN
+F 1 "GND" H 1500 4030 30  0001 C CNN
+F 2 "" H 1500 4100 60  0000 C CNN
+F 3 "" H 1500 4100 60  0000 C CNN
+	1    1500 4100
 	1    0    0    -1  
 $EndComp
 Text GLabel 5250 5150 2    60   Input ~ 0
@@ -348,10 +336,10 @@ CBUS0
 Text GLabel 6050 2400 3    60   Input ~ 0
 CBUS3
 $Comp
-L +3.3V #PWR011
+L +3.3V #PWR17
 U 1 1 5565E749
 P 3200 4950
-F 0 "#PWR011" H 3200 4910 30  0001 C CNN
+F 0 "#PWR17" H 3200 4910 30  0001 C CNN
 F 1 "+3.3V" H 3200 5060 30  0000 C CNN
 F 2 "" H 3200 4950 60  0000 C CNN
 F 3 "" H 3200 4950 60  0000 C CNN
@@ -359,22 +347,22 @@ F 3 "" H 3200 4950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3.3V #PWR012
+L +3.3V #PWR3
 U 1 1 5565E82D
 P 1700 1900
-F 0 "#PWR012" H 1700 1860 30  0001 C CNN
+F 0 "#PWR3" H 1700 1860 30  0001 C CNN
 F 1 "+3.3V" H 1700 2010 30  0000 C CNN
 F 2 "" H 1700 1900 60  0000 C CNN
 F 3 "" H 1700 1900 60  0000 C CNN
 	1    1700 1900
 	1    0    0    -1  
 $EndComp
-NoConn ~ 1850 4950
+NoConn ~ 2050 4950
 $Comp
-L VBUS #PWR013
+L VBUS #PWR14
 U 1 1 556715C3
 P 3050 4200
-F 0 "#PWR013" H 3050 4300 30  0001 C CNN
+F 0 "#PWR14" H 3050 4300 30  0001 C CNN
 F 1 "VBUS" H 3050 4310 30  0000 C CNN
 F 2 "" H 3050 4200 60  0000 C CNN
 F 3 "" H 3050 4200 60  0000 C CNN
@@ -382,32 +370,32 @@ F 3 "" H 3050 4200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VBUS #PWR014
+L VBUS #PWR16
 U 1 1 556715ED
-P 2100 3450
-F 0 "#PWR014" H 2100 3550 30  0001 C CNN
-F 1 "VBUS" H 2100 3560 30  0000 C CNN
-F 2 "" H 2100 3450 60  0000 C CNN
-F 3 "" H 2100 3450 60  0000 C CNN
-	1    2100 3450
+P 2150 4400
+F 0 "#PWR16" H 2150 4500 30  0001 C CNN
+F 1 "VBUS" H 2150 4510 30  0000 C CNN
+F 2 "" H 2150 4400 60  0000 C CNN
+F 3 "" H 2150 4400 60  0000 C CNN
+	1    2150 4400
 	1    0    0    -1  
 $EndComp
 $Comp
-L VBUS #PWR015
+L VBUS #PWR10
 U 1 1 556715FC
-P 2700 3450
-F 0 "#PWR015" H 2700 3550 30  0001 C CNN
-F 1 "VBUS" H 2700 3560 30  0000 C CNN
-F 2 "" H 2700 3450 60  0000 C CNN
-F 3 "" H 2700 3450 60  0000 C CNN
-	1    2700 3450
+P 1500 3500
+F 0 "#PWR10" H 1500 3600 30  0001 C CNN
+F 1 "VBUS" H 1500 3610 30  0000 C CNN
+F 2 "" H 1500 3500 60  0000 C CNN
+F 3 "" H 1500 3500 60  0000 C CNN
+	1    1500 3500
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1.8V #PWR016
+L +1.8V #PWR15
 U 1 1 5567160B
 P 3200 4200
-F 0 "#PWR016" H 3200 4340 20  0001 C CNN
+F 0 "#PWR15" H 3200 4340 20  0001 C CNN
 F 1 "+1.8V" H 3200 4310 30  0000 C CNN
 F 2 "" H 3200 4200 60  0000 C CNN
 F 3 "" H 3200 4200 60  0000 C CNN
@@ -415,10 +403,10 @@ F 3 "" H 3200 4200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1.8V #PWR017
+L +1.8V #PWR4
 U 1 1 55671642
 P 2950 1900
-F 0 "#PWR017" H 2950 2040 20  0001 C CNN
+F 0 "#PWR4" H 2950 2040 20  0001 C CNN
 F 1 "+1.8V" H 2950 2010 30  0000 C CNN
 F 2 "" H 2950 1900 60  0000 C CNN
 F 3 "" H 2950 1900 60  0000 C CNN
@@ -426,11 +414,11 @@ F 3 "" H 2950 1900 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R8
+L R R7
 U 1 1 55671B7C
 P 10450 4000
-F 0 "R8" V 10530 4000 40  0000 C CNN
-F 1 "100" V 10457 4001 40  0000 C CNN
+F 0 "R7" V 10530 4000 40  0000 C CNN
+F 1 "220" V 10457 4001 40  0000 C CNN
 F 2 "SM0603_Resistor" V 10380 4000 30  0001 C CNN
 F 3 "~" H 10450 4000 30  0000 C CNN
 F 4 "301010090" V 10450 4000 60  0001 C CNN "OPL"
@@ -438,11 +426,11 @@ F 4 "301010090" V 10450 4000 60  0001 C CNN "OPL"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R9
+L R R8
 U 1 1 55671B8B
 P 10450 4150
-F 0 "R9" V 10530 4150 40  0000 C CNN
-F 1 "100" V 10457 4151 40  0000 C CNN
+F 0 "R8" V 10530 4150 40  0000 C CNN
+F 1 "220" V 10457 4151 40  0000 C CNN
 F 2 "SM0603_Resistor" V 10380 4150 30  0001 C CNN
 F 3 "~" H 10450 4150 30  0000 C CNN
 F 4 "301010090" V 10450 4150 60  0001 C CNN "OPL"
@@ -450,10 +438,10 @@ F 4 "301010090" V 10450 4150 60  0001 C CNN "OPL"
 	0    1    1    0   
 $EndComp
 $Comp
-L R R10
+L R R11
 U 1 1 55670DD9
 P 5600 4850
-F 0 "R10" V 5680 4850 40  0000 C CNN
+F 0 "R11" V 5680 4850 40  0000 C CNN
 F 1 "10k" V 5607 4851 40  0000 C CNN
 F 2 "SM0603_Resistor" V 5530 4850 30  0001 C CNN
 F 3 "~" H 5600 4850 30  0000 C CNN
@@ -462,10 +450,10 @@ F 4 "0011240P1" V 5600 4850 60  0001 C CNN "OPL"
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR018
+L GND #PWR18
 U 1 1 5567226A
 P 5950 4950
-F 0 "#PWR018" H 5950 4950 30  0001 C CNN
+F 0 "#PWR18" H 5950 4950 30  0001 C CNN
 F 1 "GND" H 5950 4880 30  0001 C CNN
 F 2 "" H 5950 4950 60  0000 C CNN
 F 3 "" H 5950 4950 60  0000 C CNN
@@ -473,22 +461,10 @@ F 3 "" H 5950 4950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FILTER FB1
-U 1 1 556723CE
-P 2100 3900
-F 0 "FB1" H 2100 4050 60  0000 C CNN
-F 1 "BLM18AG121SN1D" H 2100 3800 60  0000 C CNN
-F 2 "SM0603" H 2100 3900 60  0001 C CNN
-F 3 "~" H 2100 3900 60  0000 C CNN
-F 4 "0900120P1" H 2100 3900 60  0001 C CNN "OPL"
-	1    2100 3900
-	0    -1   -1   0   
-$EndComp
-$Comp
-L +3.3V #PWR019
+L +3.3V #PWR2
 U 1 1 556724B3
 P 5900 1150
-F 0 "#PWR019" H 5900 1110 30  0001 C CNN
+F 0 "#PWR2" H 5900 1110 30  0001 C CNN
 F 1 "+3.3V" H 5900 1260 30  0000 C CNN
 F 2 "" H 5900 1150 60  0000 C CNN
 F 3 "" H 5900 1150 60  0000 C CNN
@@ -523,10 +499,10 @@ $EndComp
 Text GLabel 5600 5250 2    60   Input ~ 0
 CBUS1
 $Comp
-L CSMALL C8
+L CSMALL C7
 U 1 1 55674229
 P 3200 5800
-F 0 "C8" H 3225 5850 30  0000 L CNN
+F 0 "C7" H 3225 5850 30  0000 L CNN
 F 1 "100nF" H 3225 5750 30  0000 L CNN
 F 2 "SM0603_Capa" H 3200 5800 60  0001 C CNN
 F 3 "~" H 3200 5800 60  0000 C CNN
@@ -535,10 +511,10 @@ F 4 "0100020P1" H 3200 5800 60  0001 C CNN "OPL"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR020
+L GND #PWR23
 U 1 1 55674363
 P 3200 6000
-F 0 "#PWR020" H 3200 6000 30  0001 C CNN
+F 0 "#PWR23" H 3200 6000 30  0001 C CNN
 F 1 "GND" H 3200 5930 30  0001 C CNN
 F 2 "" H 3200 6000 60  0000 C CNN
 F 3 "" H 3200 6000 60  0000 C CNN
@@ -592,7 +568,7 @@ L R R1
 U 1 1 556793FC
 P 5150 1550
 F 0 "R1" V 5230 1550 40  0000 C CNN
-F 1 "330" V 5157 1551 40  0000 C CNN
+F 1 "220" V 5157 1551 40  0000 C CNN
 F 2 "SM0603_Resistor" V 5080 1550 30  0001 C CNN
 F 3 "~" H 5150 1550 30  0000 C CNN
 F 4 "301010163" V 5150 1550 60  0001 C CNN "OPL"
@@ -600,22 +576,22 @@ F 4 "301010163" V 5150 1550 60  0001 C CNN "OPL"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR021
+L GND #PWR9
 U 1 1 556795AE
-P 5150 2800
-F 0 "#PWR021" H 5150 2800 30  0001 C CNN
-F 1 "GND" H 5150 2730 30  0001 C CNN
-F 2 "" H 5150 2800 60  0000 C CNN
-F 3 "" H 5150 2800 60  0000 C CNN
-	1    5150 2800
+P 5150 3300
+F 0 "#PWR9" H 5150 3300 30  0001 C CNN
+F 1 "GND" H 5150 3230 30  0001 C CNN
+F 2 "" H 5150 3300 60  0000 C CNN
+F 3 "" H 5150 3300 60  0000 C CNN
+	1    5150 3300
 	1    0    0    -1  
 $EndComp
 NoConn ~ 7450 5650
 $Comp
-L DIL8 J2
+L DIL8 J1
 U 1 1 557EDA6D
 P 8650 1950
-F 0 "J2" H 8650 2200 60  0000 C CNN
+F 0 "J1" H 8650 2200 60  0000 C CNN
 F 1 "DIL8" V 8650 1950 50  0000 C CNN
 F 2 "" H 8650 1950 60  0000 C CNN
 F 3 "" H 8650 1950 60  0000 C CNN
@@ -623,10 +599,10 @@ F 3 "" H 8650 1950 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR6
 U 1 1 557EE0BC
 P 9000 2200
-F 0 "#PWR022" H 9000 2200 30  0001 C CNN
+F 0 "#PWR6" H 9000 2200 30  0001 C CNN
 F 1 "GND" H 9000 2130 30  0001 C CNN
 F 2 "" H 9000 2200 60  0000 C CNN
 F 3 "" H 9000 2200 60  0000 C CNN
@@ -659,10 +635,10 @@ F 4 "301010163" V 5450 1550 60  0001 C CNN "OPL"
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR023
+L GND #PWR8
 U 1 1 557EE38D
 P 5450 2800
-F 0 "#PWR023" H 5450 2800 30  0001 C CNN
+F 0 "#PWR8" H 5450 2800 30  0001 C CNN
 F 1 "GND" H 5450 2730 30  0001 C CNN
 F 2 "" H 5450 2800 60  0000 C CNN
 F 3 "" H 5450 2800 60  0000 C CNN
@@ -670,10 +646,10 @@ F 3 "" H 5450 2800 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR024
+L +5V #PWR22
 U 1 1 557EE3A2
 P 7300 5650
-F 0 "#PWR024" H 7300 5740 20  0001 C CNN
+F 0 "#PWR22" H 7300 5740 20  0001 C CNN
 F 1 "+5V" H 7300 5740 30  0000 C CNN
 F 2 "" H 7300 5650 60  0000 C CNN
 F 3 "" H 7300 5650 60  0000 C CNN
@@ -681,10 +657,10 @@ F 3 "" H 7300 5650 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR025
+L +5V #PWR1
 U 1 1 557EE457
 P 5300 1150
-F 0 "#PWR025" H 5300 1240 20  0001 C CNN
+F 0 "#PWR1" H 5300 1240 20  0001 C CNN
 F 1 "+5V" H 5300 1240 30  0000 C CNN
 F 2 "" H 5300 1150 60  0000 C CNN
 F 3 "" H 5300 1150 60  0000 C CNN
@@ -700,7 +676,7 @@ L R R5
 U 1 1 557FD7B6
 P 4450 2550
 F 0 "R5" V 4530 2550 40  0000 C CNN
-F 1 "R" V 4457 2551 40  0000 C CNN
+F 1 "3k" V 4457 2551 40  0000 C CNN
 F 2 "~" V 4380 2550 30  0000 C CNN
 F 3 "~" H 4450 2550 30  0000 C CNN
 	1    4450 2550
@@ -711,17 +687,17 @@ L BFR92 Q1
 U 1 1 557FE8FF
 P 5050 2550
 F 0 "Q1" H 5250 2450 50  0000 C CNN
-F 1 "S9013" H 4800 2700 50  0000 L CNN
+F 1 "S8050" H 4800 2700 50  0000 L CNN
 F 2 "SOT323" H 5240 2550 30  0001 L CNN
 F 3 "" H 5050 2550 60  0000 C CNN
 	1    5050 2550
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1.8V #PWR026
+L +1.8V #PWR5
 U 1 1 55800D19
 P 7550 2000
-F 0 "#PWR026" H 7550 2140 20  0001 C CNN
+F 0 "#PWR5" H 7550 2140 20  0001 C CNN
 F 1 "+1.8V" H 7550 2110 30  0000 C CNN
 F 2 "" H 7550 2000 60  0000 C CNN
 F 3 "" H 7550 2000 60  0000 C CNN
@@ -799,7 +775,7 @@ Wire Wire Line
 Wire Wire Line
 	5150 2300 5150 2350
 Wire Wire Line
-	5150 2750 5150 2800
+	5150 2750 5150 3300
 Wire Wire Line
 	7300 5750 7450 5750
 Wire Wire Line
@@ -855,69 +831,55 @@ Wire Wire Line
 	3200 4950 3200 5700
 Wire Wire Line
 	5150 5350 5250 5350
+Connection ~ 1500 3600
 Wire Wire Line
-	2100 3450 2100 3550
-Connection ~ 2700 3550
+	1500 3500 1500 3600
 Wire Wire Line
-	2700 3450 2700 3550
+	1400 3600 1600 3600
 Wire Wire Line
-	2600 3550 2800 3550
+	1400 3700 1400 3600
+Connection ~ 1500 4000
 Wire Wire Line
-	2600 3650 2600 3550
-Connection ~ 2700 3950
+	1500 4000 1500 4100
 Wire Wire Line
-	2700 3950 2700 4050
+	1600 4000 1600 3900
 Wire Wire Line
-	2800 3950 2800 3850
+	1400 4000 1600 4000
 Wire Wire Line
-	2600 3950 2800 3950
+	1400 3900 1400 4000
 Wire Wire Line
-	2600 3850 2600 3950
-Wire Wire Line
-	2800 3550 2800 3650
+	1600 3600 1600 3700
 Connection ~ 2300 4750
 Wire Wire Line
-	1950 4750 2700 4750
-Wire Wire Line
-	1950 4800 1950 4750
-Wire Wire Line
-	1850 4800 1950 4800
-Connection ~ 2200 5200
-Wire Wire Line
-	2200 5200 2200 5350
-Connection ~ 2300 5200
-Wire Wire Line
-	2500 5200 2500 5100
-Connection ~ 2100 5200
-Wire Wire Line
-	2300 5200 2300 5100
+	2150 4750 2700 4750
 Wire Wire Line
-	2100 5200 2100 5100
+	2150 4800 2150 4750
 Wire Wire Line
-	1950 5200 2500 5200
+	2050 4800 2150 4800
+Connection ~ 2150 5100
 Wire Wire Line
-	1950 5100 1950 5200
-Connection ~ 2100 4500
+	2150 5100 2150 5200
+Connection ~ 2300 5100
 Wire Wire Line
-	2300 4750 2300 4900
+	2500 5100 2500 5050
 Wire Wire Line
-	2500 4900 2500 4650
+	2300 5100 2300 5050
 Wire Wire Line
-	2100 4250 2100 4900
+	2050 5100 2500 5100
 Wire Wire Line
-	1850 4500 2100 4500
+	2300 4750 2300 4850
 Wire Wire Line
-	1850 5100 1950 5100
+	2500 4850 2500 4650
 Connection ~ 2500 4650
-Connection ~ 750  4650
-Connection ~ 750  4950
+Connection ~ 950  4650
+Connection ~ 950  4950
 Wire Wire Line
-	750  4650 750  4650
-Connection ~ 750  5100
+	950  4650 950  4650
+Connection ~ 950  5100
 Wire Wire Line
-	750  4500 750  5200
+	950  4500 950  5200
 Wire Wire Line
-	1850 4650 2700 4650
+	2050 4650 2700 4650
 Wire Wire Line
 	3200 4750 3300 4750
 Wire Wire Line
@@ -1026,4 +988,27 @@ Wire Wire Line
 Wire Wire Line
 	5150 1200 5150 1300
 Connection ~ 5300 1200
+Wire Wire Line
+	2150 4400 2150 4500
+Wire Wire Line
+	2150 4500 2050 4500
+$Comp
+L R R6
+U 1 1 55802EBD
+P 4800 2900
+F 0 "R6" V 4880 2900 40  0000 C CNN
+F 1 "10k" V 4807 2901 40  0000 C CNN
+F 2 "~" V 4730 2900 30  0000 C CNN
+F 3 "~" H 4800 2900 30  0000 C CNN
+	1    4800 2900
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4800 2650 4800 2550
+Connection ~ 4800 2550
+Wire Wire Line
+	4800 3150 4800 3200
+Wire Wire Line
+	4800 3200 5150 3200
+Connection ~ 5150 3200
 $EndSCHEMATC