Implement feedback from Rob Herring on FTDI version

Things fixed:
- Tie #RESET to VCC
- Rename power busses: VDD-->VBUS, VCC-->+3.3V, VIO-->+1.8V
- Rework the LEDs. Use a transistor for the 1.8V_SENSE LED, and drive
  from +3.3V for the others.
- Add pulldown to CTS
- Add series resistor between CBUS pins and RST/PWR to avoid shorting a
  driven output pin to GND.
- Add a 100nF bypass cap to 3V3OUT

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

6 files changed, 900 insertions, 880 deletions

diff --git a/96boards-uart-cache.lib b/96boards-uart-cache.lib
index c3d752f..c43238c 100644
--- a/96boards-uart-cache.lib
+++ b/96boards-uart-cache.lib
@@ -1,6 +1,21 @@
-EESchema-LIBRARY Version 2.3  Date: Wed 27 May 2015 14:28:38 BST
+EESchema-LIBRARY Version 2.3  Date: Thu 28 May 2015 16:38:59 BST
 #encoding utf-8
 #
+# +1.8V
+#
+DEF +1.8V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 140 20 H I C CNN
+F1 "+1.8V" 0 110 30 H V C CNN
+F2 "~" 0 0 60 H V C CNN
+F3 "~" 0 0 60 H V C CNN
+ALIAS 1V8
+DRAW
+P 3 0 0 0  0 0  0 40  0 40 N
+X +1.8V 1 0 0 0 U 20 20 0 0 W N
+C 0 60 20 0 1 0 N
+ENDDRAW
+ENDDEF
+#
 # +3.3V
 #
 DEF +3.3V #PWR 0 0 Y Y 1 F P
@@ -88,22 +103,22 @@ X ~ 2 0 -100 90 U 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# DIODE
+# FILTER
 #
-DEF DIODE D 0 40 N N 1 F N
-F0 "D" 0 100 40 H V C CNN
-F1 "DIODE" 0 -100 40 H V C CNN
+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
-$FPLIST
- D?
- S*
-$ENDFPLIST
 DRAW
-P 2 0 1 6  50 50  50 -50 N
-P 3 0 1 0  -50 50  50 0  -50 -50 F
-X A 1 -200 0 150 R 40 40 1 1 P
-X K 2 200 0 150 L 40 40 1 1 P
+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
 #
@@ -118,14 +133,14 @@ DRAW
 S -650 850 600 -900 0 1 0 N
 X TXD 1 900 700 300 L 50 50 1 1 O
 X RTS 2 900 500 300 L 50 50 1 1 O V
-X VCCIO 3 -950 750 300 R 50 50 1 1 I
+X VCCIO 3 -950 750 300 R 50 50 1 1 W
 X RXD 4 900 600 300 L 50 50 1 1 I
 X GND 5 -150 -1200 300 U 50 50 1 1 W
 X CTS 6 900 400 300 L 50 50 1 1 I L
 X CBUS2 7 900 -300 300 L 50 50 1 1 B
 X USBD+ 8 -950 300 300 R 50 50 1 1 B
 X USBD- 9 -950 400 300 R 50 50 1 1 B
-X 3V3OUT 10 -950 -500 300 R 50 50 1 1 I
+X 3V3OUT 10 -950 -500 300 R 50 50 1 1 w
 X RESET 11 -950 0 300 R 50 50 1 1 I L
 X VCC 12 -950 650 300 R 50 50 1 1 W
 X GND 13 150 -1200 300 U 50 50 1 1 W
@@ -225,6 +240,26 @@ X IN 3 -400 50 150 R 40 40 1 1 I
 ENDDRAW
 ENDDEF
 #
+# NPN
+#
+DEF NPN Q 0 0 Y Y 1 F N
+F0 "Q" 0 -150 50 H V R CNN
+F1 "NPN" 0 150 50 H V R CNN
+F2 "~" 0 0 60 H V C CNN
+F3 "~" 0 0 60 H V C CNN
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0  0 0  100 100 N
+P 3 0 1 10  0 75  0 -75  0 -75 N
+P 3 0 1 0  50 -50  0 0  0 0 N
+P 3 0 1 0  90 -90  100 -100  100 -100 N
+P 5 0 1 0  90 -90  70 -30  30 -70  90 -90  90 -90 F
+X E 1 100 -200 100 U 40 40 1 1 P
+X B 2 -200 0 200 R 40 40 1 1 I
+X C 3 100 200 100 D 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
 # R
 #
 DEF R R 0 0 N Y 1 F N
@@ -285,29 +320,15 @@ X SHELL4 9 550 -300 200 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# VDD
-#
-DEF VDD #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 100 30 H I C CNN
-F1 "VDD" 0 110 30 H V C CNN
-F2 "~" 0 0 60 H V C CNN
-F3 "~" 0 0 60 H V C CNN
-DRAW
-X VDD 1 0 0 0 U 40 40 0 0 W N
-C 0 60 20 0 1 0 N
-P 3 0 1 0  0 0  0 40  0 40 N
-ENDDRAW
-ENDDEF
-#
-# VIO
+# VBUS
 #
-DEF VIO #PWR 0 0 Y Y 1 F P
+DEF VBUS #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 100 30 H I C CNN
-F1 "VIO" 0 110 30 H V C CNN
+F1 "VBUS" 0 110 30 H V C CNN
 F2 "~" 0 0 60 H V C CNN
 F3 "~" 0 0 60 H V C CNN
 DRAW
-X VIO 1 0 0 0 U 40 40 0 0 W N
+X VBUS 1 0 0 0 U 40 40 0 0 W N
 C 0 60 20 0 1 0 N
 P 3 0 1 0  0 0  0 40  0 40 N
 ENDDRAW
diff --git a/96boards-uart.cmp b/96boards-uart.cmp
index 8468094..01f3798 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 = Wed 27 May 2015 14:30:30 BST
+Cmp-Mod V01 Created by CvPcb (25-Oct-2014 BZR 4029)-stable date = Thu 28 May 2015 16:37:52 BST
 
 BeginCmp
 TimeStamp = /556231A4;
@@ -50,6 +50,13 @@ IdModule  = SM0603_Capa;
 EndCmp
 
 BeginCmp
+TimeStamp = /55674229;
+Reference = C8;
+ValeurCmp = 100nF;
+IdModule  = SM0603_Capacitor;
+EndCmp
+
+BeginCmp
 TimeStamp = /5565AB07;
 Reference = CON1;
 ValeurCmp = USB-MINI-B;
@@ -57,23 +64,16 @@ IdModule  = USB_MINI_B;
 EndCmp
 
 BeginCmp
-TimeStamp = /5562F916;
+TimeStamp = /55674ACF;
 Reference = D1;
-ValeurCmp = RST;
-IdModule  = LED-0603;
-EndCmp
-
-BeginCmp
-TimeStamp = /5562F902;
-Reference = D2;
 ValeurCmp = PWR;
 IdModule  = LED-0603;
 EndCmp
 
 BeginCmp
-TimeStamp = /5562F3F7;
-Reference = D3;
-ValeurCmp = VIO;
+TimeStamp = /55674ABA;
+Reference = D2;
+ValeurCmp = RST;
 IdModule  = LED-0603;
 EndCmp
 
@@ -92,38 +92,17 @@ IdModule  = LED-0603;
 EndCmp
 
 BeginCmp
-TimeStamp = /556339ED;
-Reference = D6;
-ValeurCmp = DIODE;
-IdModule  = SM0603;
-EndCmp
-
-BeginCmp
 TimeStamp = /5565DB8E;
 Reference = D7;
-ValeurCmp = RX;
+ValeurCmp = TX/RX;
 IdModule  = SM0603;
 EndCmp
 
 BeginCmp
-TimeStamp = /5565DB82;
-Reference = D8;
-ValeurCmp = TX;
-IdModule  = SM0603;
-EndCmp
-
-BeginCmp
-TimeStamp = /5562F481;
-Reference = GS1;
-ValeurCmp = RST;
-IdModule  = GS2;
-EndCmp
-
-BeginCmp
-TimeStamp = /5562F487;
-Reference = GS2;
-ValeurCmp = PWR;
-IdModule  = GS2;
+TimeStamp = /556723CE;
+Reference = FB1;
+ValeurCmp = FILTER;
+IdModule  = SM0805;
 EndCmp
 
 BeginCmp
@@ -162,37 +141,44 @@ IdModule  = 96BOARDS_LV_EXPANSION;
 EndCmp
 
 BeginCmp
-TimeStamp = /5562F922;
+TimeStamp = /55672D62;
+Reference = Q1;
+ValeurCmp = S9013;
+IdModule  = SOT-23;
+EndCmp
+
+BeginCmp
+TimeStamp = /55672BFC;
 Reference = R1;
-ValeurCmp = 22;
+ValeurCmp = 220;
 IdModule  = SM0603_Resistor;
 EndCmp
 
 BeginCmp
 TimeStamp = /5565DB88;
 Reference = R2;
-ValeurCmp = 22;
+ValeurCmp = 220;
 IdModule  = SM0603_Resistor;
 EndCmp
 
 BeginCmp
-TimeStamp = /5562F90E;
+TimeStamp = /55671B7C;
 Reference = R3;
-ValeurCmp = 22;
+ValeurCmp = 100;
 IdModule  = SM0603_Resistor;
 EndCmp
 
 BeginCmp
-TimeStamp = /5562F403;
+TimeStamp = /55671B8B;
 Reference = R4;
-ValeurCmp = 22;
+ValeurCmp = 100;
 IdModule  = SM0603_Resistor;
 EndCmp
 
 BeginCmp
 TimeStamp = /5562F0F6;
 Reference = R5;
-ValeurCmp = 22;
+ValeurCmp = 220;
 IdModule  = SM0603_Resistor;
 EndCmp
 
@@ -204,17 +190,17 @@ IdModule  = SM0603_Resistor;
 EndCmp
 
 BeginCmp
-TimeStamp = /5565DB7C;
+TimeStamp = /55670DD9;
 Reference = R7;
-ValeurCmp = 22;
+ValeurCmp = 10k;
 IdModule  = SM0603_Resistor;
 EndCmp
 
 BeginCmp
-TimeStamp = /5565CB11;
+TimeStamp = /55674AC9;
 Reference = R8;
-ValeurCmp = FB;
-IdModule  = SM0805;
+ValeurCmp = 220;
+IdModule  = SM0603_Resistor;
 EndCmp
 
 BeginCmp
@@ -232,6 +218,13 @@ IdModule  = SM0603_Resistor;
 EndCmp
 
 BeginCmp
+TimeStamp = /55674AB4;
+Reference = R11;
+ValeurCmp = 220;
+IdModule  = SM0603_Resistor;
+EndCmp
+
+BeginCmp
 TimeStamp = /54EBBD3A;
 Reference = SW1;
 ValeurCmp = PWR;
@@ -256,7 +249,7 @@ BeginCmp
 TimeStamp = /5565A864;
 Reference = U2;
 ValeurCmp = FT230XS;
-IdModule  = SSOP17;
+IdModule  = SSOP20;
 EndCmp
 
 EndListe
diff --git a/96boards-uart.lib b/96boards-uart.lib
index fd17b3a..204238d 100644
--- a/96boards-uart.lib
+++ b/96boards-uart.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Wed 27 May 2015 12:12:24 BST
+EESchema-LIBRARY Version 2.3  Date: Thu 28 May 2015 14:11:24 BST
 #encoding utf-8
 #
 # 96BOARD_LS_EXPANSION
@@ -92,14 +92,14 @@ DRAW
 S -650 850 600 -900 0 1 0 N
 X TXD 1 900 700 300 L 50 50 1 1 O
 X RTS 2 900 500 300 L 50 50 1 1 O V
-X VCCIO 3 -950 750 300 R 50 50 1 1 I
+X VCCIO 3 -950 750 300 R 50 50 1 1 W
 X RXD 4 900 600 300 L 50 50 1 1 I
 X GND 5 -150 -1200 300 U 50 50 1 1 W
 X CTS 6 900 400 300 L 50 50 1 1 I L
 X CBUS2 7 900 -300 300 L 50 50 1 1 B
 X USBD+ 8 -950 300 300 R 50 50 1 1 B
 X USBD- 9 -950 400 300 R 50 50 1 1 B
-X 3V3OUT 10 -950 -500 300 R 50 50 1 1 I
+X 3V3OUT 10 -950 -500 300 R 50 50 1 1 w
 X RESET 11 -950 0 300 R 50 50 1 1 I L
 X VCC 12 -950 650 300 R 50 50 1 1 W
 X GND 13 150 -1200 300 U 50 50 1 1 W
@@ -109,6 +109,20 @@ X CBUS3 16 900 -400 300 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
+# VBUS
+#
+DEF VBUS #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 100 30 H I C CNN
+F1 "VBUS" 0 110 30 H V C CNN
+F2 "~" 0 0 60 H V C CNN
+F3 "~" 0 0 60 H V C CNN
+DRAW
+X VBUS 1 0 0 0 U 40 40 0 0 W N
+C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
+ENDDRAW
+ENDDEF
+#
 # VIO
 #
 DEF VIO #PWR 0 0 Y Y 1 F P
diff --git a/96boards-uart.net b/96boards-uart.net
index e218d2c..6de87f7 100644
--- a/96boards-uart.net
+++ b/96boards-uart.net
@@ -1,4 +1,4 @@
-# EESchema Netlist Version 1.1 created  Wed 27 May 2015 14:28:42 BST
+# EESchema Netlist Version 1.1 created  Thu 28 May 2015 16:35:53 BST
 (
  ( /54EBBD3A $noname  SW1 PWR {Lib=SW_PUSH}
   (    1 /PWR_BTN )
@@ -11,17 +11,17 @@
  ( /54F0AFFF 96BOARD_LS_EXPANSION  P1 96BOARD_LS_EXPANSION {Lib=96BOARD_LS_EXPANSION}
   (    1 GND )
   (    2 GND )
-  (    3 N-000015 )
+  (    3 N-000010 )
   (    4 /PWR_BTN )
-  (    5 N-000016 )
+  (    5 N-000013 )
   (    6 N-000026 )
-  (    7 N-000005 )
+  (    7 N-000017 )
   (    8 ? )
-  (    9 N-000010 )
+  (    9 N-000005 )
   (   10 ? )
-  (   11 N-000004 )
+  (   11 N-000016 )
   (   12 ? )
-  (   13 N-000001 )
+  (   13 N-000018 )
   (   14 ? )
   (   15 ? )
   (   16 ? )
@@ -43,16 +43,16 @@
   (   32 ? )
   (   33 ? )
   (   34 ? )
-  (   35 N-000025 )
+  (   35 +1.8_SENSE )
   (   36 ? )
-  (   37 N-000008 )
+  (   37 N-000007 )
   (   38 ? )
   (   39 GND )
   (   40 GND )
  )
  ( /556230AA SOT-23  U1 XC6206P182MR {Lib=LM317AEMP}
   (    1 GND )
-  (    2 VIO )
+  (    2 +1.8V )
   (    3 +3.3V )
  )
  ( /556231A4 SM0603  C1 10uF {Lib=CSMALL}
@@ -60,85 +60,39 @@
   (    2 GND )
  )
  ( /556232C3 SM0603  C2 10uF {Lib=CSMALL}
-  (    1 VIO )
+  (    1 +1.8V )
   (    2 GND )
  )
  ( /55624346 GS3  GS3 SEL_RxD {Lib=GS3}
-  (    1 N-000005 )
-  (    2 /UART_RXD )
-  (    3 N-000001 )
+  (    1 N-000017 )
+  (    2 /RXD )
+  (    3 N-000018 )
  )
  ( /556244B7 GS3  GS4 SEL_TxD {Lib=GS3}
-  (    1 N-000016 )
-  (    2 /UART_TXD )
-  (    3 N-000004 )
+  (    1 N-000013 )
+  (    2 /TXD )
+  (    3 N-000016 )
  )
  ( /556246F1 GS2  GS5 SEL_CTS {Lib=GS2}
-  (    1 N-000015 )
-  (    2 /UART_CTS )
- )
- ( /5562E6B2 SM0603  D4 1.8V {Lib=LED}
-  (    1 N-000014 )
-  (    2 GND )
- )
- ( /5562F0F6 SM0603  R5 22 {Lib=R}
-  (    1 N-000025 )
-  (    2 N-000014 )
+  (    1 N-000010 )
+  (    2 /CTS )
  )
  ( /5562F1F1 SM0603  D5 5V {Lib=LED}
-  (    1 N-000013 )
-  (    2 GND )
- )
- ( /5562F1FD SM0603  R6 320 {Lib=R}
-  (    1 N-000008 )
-  (    2 N-000013 )
- )
- ( /5562F3F7 SM0603  D3 VIO {Lib=LED}
   (    1 N-000012 )
   (    2 GND )
  )
- ( /5562F403 SM0603  R4 22 {Lib=R}
-  (    1 VIO )
+ ( /5562F1FD SM0603  R6 320 {Lib=R}
+  (    1 N-000007 )
   (    2 N-000012 )
  )
- ( /5562F481 GS2  GS1 RST {Lib=GS2}
-  (    1 N-000026 )
-  (    2 CBUS0 )
- )
- ( /5562F487 GS2  GS2 PWR {Lib=GS2}
-  (    1 /PWR_BTN )
-  (    2 CBUS3 )
- )
  ( /5562467A GS2  GS6 SEL_RTS {Lib=GS2}
-  (    1 N-000010 )
-  (    2 /UART_RTS )
- )
- ( /556339ED SM0603  D6 DIODE {Lib=DIODE}
-  (    1 +3.3V )
-  (    2 VIO )
- )
- ( /5565A864 SSOP-16  U2 FT230XS {Lib=FT230XS}
-  (    1 /UART_RXD )
-  (    2 /UART_CTS )
-  (    3 VIO )
-  (    4 /UART_TXD )
-  (    5 GND )
-  (    6 /UART_RTS )
-  (    7 CBUS2 )
-  (    8 N-000032 )
-  (    9 N-000033 )
-  (   10 +3.3V )
-  (   11 ? )
-  (   12 VDD )
-  (   13 GND )
-  (   14 CBUS1 )
-  (   15 CBUS0 )
-  (   16 CBUS3 )
+  (    1 N-000005 )
+  (    2 /RTS )
  )
  ( /5565AB07 $noname  CON1 USB-MINI-B {Lib=USB-MINI-B}
-  (    1 N-000030 )
-  (    2 N-000029 )
-  (    3 N-000031 )
+  (    1 N-000008 )
+  (    2 N-000001 )
+  (    3 N-000006 )
   (    4 ? )
   (    5 GND )
   (    6 GND )
@@ -147,68 +101,111 @@
   (    9 GND )
  )
  ( /5565BAFA $noname  R9 22 {Lib=R}
-  (    1 N-000029 )
-  (    2 N-000033 )
+  (    1 N-000001 )
+  (    2 N-000003 )
  )
  ( /5565BF0F $noname  C7 47pF {Lib=CSMALL}
-  (    1 N-000029 )
+  (    1 N-000001 )
   (    2 GND )
  )
  ( /5565BEFD $noname  C6 47pF {Lib=CSMALL}
-  (    1 N-000031 )
+  (    1 N-000006 )
   (    2 GND )
  )
  ( /5565C27A $noname  C5 10nF {Lib=CSMALL}
-  (    1 N-000030 )
+  (    1 N-000008 )
   (    2 GND )
  )
  ( /5565BB09 $noname  R10 22 {Lib=R}
-  (    1 N-000031 )
-  (    2 N-000032 )
+  (    1 N-000006 )
+  (    2 N-000002 )
  )
  ( /5565C7D2 $noname  C4 100nF {Lib=CSMALL}
-  (    1 VDD )
+  (    1 VBUS )
   (    2 GND )
  )
  ( /5565C7D8 $noname  C3 4.7uF {Lib=CSMALL}
-  (    1 VDD )
+  (    1 VBUS )
   (    2 GND )
  )
- ( /5565CB11 SM0805  R8 FB {Lib=R}
-  (    1 VDD )
-  (    2 N-000030 )
+ ( /5565DB88 SM0603  R2 220 {Lib=R}
+  (    1 +3.3V )
+  (    2 N-000025 )
+ )
+ ( /5565DB8E LED-0603  D7 TX/RX {Lib=LED}
+  (    1 N-000025 )
+  (    2 CBUS1 )
  )
- ( /5562F922 SM0603  R1 22 {Lib=R}
-  (    1 VIO )
-  (    2 N-000020 )
+ ( /5565A864 SSOP-16  U2 FT230XS {Lib=FT230XS}
+  (    1 /RXD )
+  (    2 /CTS )
+  (    3 +1.8V )
+  (    4 /TXD )
+  (    5 GND )
+  (    6 /RTS )
+  (    7 CBUS2 )
+  (    8 N-000002 )
+  (    9 N-000003 )
+  (   10 +3.3V )
+  (   11 +3.3V )
+  (   12 VBUS )
+  (   13 GND )
+  (   14 CBUS1 )
+  (   15 CBUS0 )
+  (   16 CBUS3 )
  )
- ( /5562F916 SM0603  D1 RST {Lib=LED}
-  (    1 N-000020 )
-  (    2 CBUS0 )
+ ( /55671B7C SM0603_Resistor  R3 100 {Lib=R}
+  (    1 CBUS3 )
+  (    2 /PWR_BTN )
  )
- ( /5562F90E SM0603  R3 22 {Lib=R}
-  (    1 VIO )
-  (    2 N-000019 )
+ ( /55671B8B SM0603_Resistor  R4 100 {Lib=R}
+  (    1 CBUS0 )
+  (    2 N-000026 )
  )
- ( /5562F902 SM0603  D2 PWR {Lib=LED}
-  (    1 N-000019 )
-  (    2 CBUS3 )
+ ( /55670DD9 $noname  R7 10k {Lib=R}
+  (    1 /RTS )
+  (    2 GND )
  )
- ( /5565DB7C SM0603  R7 22 {Lib=R}
-  (    1 VIO )
-  (    2 N-000018 )
+ ( /556723CE $noname  FB1 FILTER {Lib=FILTER}
+  (    1 N-000008 )
+  (    2 VBUS )
  )
- ( /5565DB82 SM0603  D8 TX {Lib=LED}
-  (    1 N-000018 )
+ ( /55672BFC $noname  R1 220 {Lib=R}
+  (    1 +1.8_SENSE )
   (    2 CBUS2 )
  )
- ( /5565DB88 SM0603  R2 22 {Lib=R}
-  (    1 VIO )
-  (    2 N-000017 )
+ ( /5562F0F6 SM0603  R5 220 {Lib=R}
+  (    1 +3.3V )
+  (    2 N-000030 )
  )
- ( /5565DB8E SM0603  D7 RX {Lib=LED}
-  (    1 N-000017 )
-  (    2 CBUS1 )
+ ( /5562E6B2 LED-0603  D4 1.8V {Lib=LED}
+  (    1 N-000030 )
+  (    2 N-000028 )
+ )
+ ( /55672D62 SOT-23  Q1 S9013 {Lib=NPN}
+  (    1 GND )
+  (    2 CBUS2 )
+  (    3 N-000028 )
+ )
+ ( /55674229 SM0603_Capacitor  C8 100nF {Lib=CSMALL}
+  (    1 +3.3V )
+  (    2 GND )
+ )
+ ( /55674AB4 SM0603  R11 220 {Lib=R}
+  (    1 +3.3V )
+  (    2 N-000023 )
+ )
+ ( /55674ABA LED-0603  D2 RST {Lib=LED}
+  (    1 N-000023 )
+  (    2 N-000026 )
+ )
+ ( /55674AC9 SM0603  R8 220 {Lib=R}
+  (    1 +3.3V )
+  (    2 N-000024 )
+ )
+ ( /55674ACF LED-0603  D1 PWR {Lib=LED}
+  (    1 N-000024 )
+  (    2 /PWR_BTN )
  )
 )
 *
@@ -226,22 +223,6 @@ $component C2
  C?
  C1-1
 $endlist
-$component D4
- LED-3MM
- LED-5MM
- LED-10MM
- LED-0603
- LED-0805
- LED-1206
- LEDV
-$endlist
-$component R5
- R?
- SM0603
- SM0805
- R?-*
- SM1206
-$endlist
 $component D5
  LED-3MM
  LED-5MM
@@ -258,26 +239,6 @@ $component R6
  R?-*
  SM1206
 $endlist
-$component D3
- LED-3MM
- LED-5MM
- LED-10MM
- LED-0603
- LED-0805
- LED-1206
- LEDV
-$endlist
-$component R4
- R?
- SM0603
- SM0805
- R?-*
- SM1206
-$endlist
-$component D6
- D?
- S*
-$endlist
 $component CON1
  USB-Mini-B-Jack
 $endlist
@@ -320,21 +281,14 @@ $component C3
  C?
  C1-1
 $endlist
-$component R8
- R?
- SM0603
- SM0805
- R?-*
- SM1206
-$endlist
-$component R1
+$component R2
  R?
  SM0603
  SM0805
  R?-*
  SM1206
 $endlist
-$component D1
+$component D7
  LED-3MM
  LED-5MM
  LED-10MM
@@ -350,7 +304,35 @@ $component R3
  R?-*
  SM1206
 $endlist
-$component D2
+$component R4
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$endlist
+$component R7
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$endlist
+$component R1
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$endlist
+$component R5
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$endlist
+$component D4
  LED-3MM
  LED-5MM
  LED-10MM
@@ -359,14 +341,19 @@ $component D2
  LED-1206
  LEDV
 $endlist
-$component R7
+$component C8
+ SM*
+ C?
+ C1-1
+$endlist
+$component R11
  R?
  SM0603
  SM0805
  R?-*
  SM1206
 $endlist
-$component D8
+$component D2
  LED-3MM
  LED-5MM
  LED-10MM
@@ -375,14 +362,14 @@ $component D8
  LED-1206
  LEDV
 $endlist
-$component R2
+$component R8
  R?
  SM0603
  SM0805
  R?-*
  SM1206
 $endlist
-$component D7
+$component D1
  LED-3MM
  LED-5MM
  LED-10MM
@@ -395,146 +382,145 @@ $endfootprintlist
 }
 { Pin List by Nets
 Net 1 "" ""
- P1 13
- GS3 3
-Net 2 "/UART_CTS" "UART_CTS"
+ R9 1
+ C7 1
+ CON1 2
+Net 2 "" ""
+ U2 8
+ R10 2
+Net 3 "" ""
+ R9 2
+ U2 9
+Net 4 "/RTS" "RTS"
+ U2 6
+ GS6 2
+ R7 1
+Net 5 "" ""
+ GS6 1
+ P1 9
+Net 6 "" ""
+ R10 1
+ C6 1
+ CON1 3
+Net 7 "" ""
+ P1 37
+ R6 1
+Net 8 "" ""
+ FB1 1
+ CON1 1
+ C5 1
+Net 9 "+1.8V" "+1.8V"
+ U1 2
+ U2 3
+ C2 1
+Net 10 "" ""
+ P1 3
+ GS5 1
+Net 11 "/RXD" "RXD"
+ U2 1
+ GS3 2
+Net 12 "" ""
+ D5 1
+ R6 2
+Net 13 "" ""
+ P1 5
+ GS4 1
+Net 14 "/CTS" "CTS"
  U2 2
  GS5 2
-Net 3 "/UART_RXD" "UART_RXD"
- GS3 2
- U2 1
-Net 4 "" ""
+Net 15 "/TXD" "TXD"
+ GS4 2
+ U2 4
+Net 16 "" ""
  P1 11
  GS4 3
-Net 5 "" ""
- P1 7
+Net 17 "" ""
  GS3 1
-Net 6 "GND" "GND"
- U1 1
+ P1 7
+Net 18 "" ""
+ P1 13
+ GS3 3
+Net 19 "+1.8_SENSE" "+1.8_SENSE"
+ P1 35
+ R1 1
+Net 20 "GND" "GND"
+ Q1 1
+ D5 2
+ P1 39
  C2 2
  C1 2
- CON1 7
- CON1 6
- CON1 5
- U2 13
- U2 5
+ U1 1
+ CON1 9
  C3 2
  C4 2
- CON1 8
  C5 2
  C6 2
  C7 2
- D4 2
- P1 39
- D3 2
- D5 2
- P1 40
  P1 2
  P1 1
  SW2 2
  SW1 2
- CON1 9
-Net 7 "VDD" "VDD"
- R8 1
- U2 12
- C4 1
- C3 1
-Net 8 "" ""
- P1 37
- R6 1
-Net 9 "+3.3V" "+3.3V"
- U1 3
- C1 1
- U2 10
- D6 1
-Net 10 "" ""
- GS6 1
- P1 9
-Net 11 "VIO" "VIO"
- R2 1
- R4 1
- D6 2
- C2 1
- R1 1
- R7 1
- U1 2
- R3 1
- U2 3
-Net 12 "" ""
- D3 1
- R4 2
-Net 13 "" ""
- R6 2
- D5 1
-Net 14 "" ""
- D4 1
- R5 2
-Net 15 "" ""
- GS5 1
- P1 3
-Net 16 "" ""
- P1 5
- GS4 1
-Net 17 "" ""
- D7 1
- R2 2
-Net 18 "" ""
- D8 1
+ P1 40
  R7 2
-Net 19 "" ""
- D2 1
- R3 2
-Net 20 "" ""
- R1 2
- D1 1
+ U2 13
+ U2 5
+ CON1 8
+ CON1 7
+ CON1 6
+ CON1 5
+ C8 2
 Net 21 "CBUS2" "CBUS2"
  U2 7
- D8 2
-Net 22 "CBUS3" "CBUS3"
- U2 16
- D2 2
- GS2 2
-Net 23 "CBUS1" "CBUS1"
- D7 2
+ Q1 2
+ R1 2
+Net 22 "CBUS1" "CBUS1"
  U2 14
+ D7 2
+Net 23 "" ""
+ D2 1
+ R11 2
+Net 24 "" ""
+ D1 1
+ R8 2
 Net 25 "" ""
- R5 1
- P1 35
+ D7 1
+ R2 2
 Net 26 "" ""
+ R4 2
  SW2 1
  P1 6
- GS1 1
-Net 28 "CBUS0" "CBUS0"
- U2 15
- D1 2
- GS1 2
-Net 29 "" ""
- CON1 2
- C7 1
- R9 1
+ D2 2
+Net 27 "VBUS" "VBUS"
+ U2 12
+ FB1 2
+ C3 1
+ C4 1
+Net 28 "" ""
+ Q1 3
+ D4 2
+Net 29 "+3.3V" "+3.3V"
+ U2 10
+ R2 1
+ U2 11
+ R5 1
+ R8 1
+ R11 1
+ C1 1
+ U1 3
+ C8 1
 Net 30 "" ""
- C5 1
- R8 2
- CON1 1
-Net 31 "" ""
- R10 1
- C6 1
- CON1 3
-Net 32 "" ""
- U2 8
- R10 2
-Net 33 "" ""
- U2 9
- R9 2
-Net 41 "/PWR_BTN" "PWR_BTN"
+ R5 2
+ D4 1
+Net 31 "CBUS3" "CBUS3"
+ R3 1
+ U2 16
+Net 32 "CBUS0" "CBUS0"
+ R4 1
+ U2 15
+Net 52 "/PWR_BTN" "PWR_BTN"
+ R3 2
  P1 4
- GS2 1
  SW1 1
-Net 61 "/UART_RTS" "UART_RTS"
- U2 6
- GS6 2
-Net 62 "/UART_TXD" "UART_TXD"
- GS4 2
- U2 4
+ D1 2
 }
 #End
diff --git a/96boards-uart.pdf b/96boards-uart.pdf
new file mode 100644
index 0000000..11a4724
--- /dev/null
+++ b/96boards-uart.pdf
diff --git a/96boards-uart.sch b/96boards-uart.sch
index 180195b..238586c 100644
--- a/96boards-uart.sch
+++ b/96boards-uart.sch
@@ -38,7 +38,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 1
 Title ""
-Date "27 may 2015"
+Date "28 may 2015"
 Rev ""
 Comp ""
 Comment1 ""
@@ -47,10 +47,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR01
+L GND #PWR19
 U 1 1 54EB8F88
 P 7650 5700
-F 0 "#PWR01" H 7650 5700 30  0001 C CNN
+F 0 "#PWR19" H 7650 5700 30  0001 C CNN
 F 1 "GND" H 7650 5630 30  0001 C CNN
 F 2 "" H 7650 5700 60  0000 C CNN
 F 3 "" H 7650 5700 60  0000 C CNN
@@ -73,23 +73,23 @@ $EndComp
 $Comp
 L SW_PUSH SW2
 U 1 1 54EBBD47
-P 11000 4150
-F 0 "SW2" H 11150 4260 50  0000 C CNN
-F 1 "RST" H 11000 4070 50  0000 C CNN
-F 2 "~" H 11000 4150 60  0000 C CNN
-F 3 "~" H 11000 4150 60  0000 C CNN
-	1    11000 4150
+P 10850 4700
+F 0 "SW2" H 11000 4810 50  0000 C CNN
+F 1 "RST" H 10850 4620 50  0000 C CNN
+F 2 "~" H 10850 4700 60  0000 C CNN
+F 3 "~" H 10850 4700 60  0000 C CNN
+	1    10850 4700
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR02
+L GND #PWR16
 U 1 1 54EBBDBB
-P 10850 4700
-F 0 "#PWR02" H 10850 4700 30  0001 C CNN
-F 1 "GND" H 10850 4630 30  0001 C CNN
-F 2 "" H 10850 4700 60  0000 C CNN
-F 3 "" H 10850 4700 60  0000 C CNN
-	1    10850 4700
+P 10750 5250
+F 0 "#PWR16" H 10750 5250 30  0001 C CNN
+F 1 "GND" H 10750 5180 30  0001 C CNN
+F 2 "" H 10750 5250 60  0000 C CNN
+F 3 "" H 10750 5250 60  0000 C CNN
+	1    10750 5250
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -104,21 +104,10 @@ F 3 "" H 8850 4500 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VDD #PWR03
-U 1 1 54F463DD
-P 3100 4200
-F 0 "#PWR03" H 3100 4300 30  0001 C CNN
-F 1 "VDD" H 3100 4310 30  0000 C CNN
-F 2 "" H 3100 4200 60  0000 C CNN
-F 3 "" H 3100 4200 60  0000 C CNN
-	1    3100 4200
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR04
+L GND #PWR10
 U 1 1 54E654DB
 P 10250 3350
-F 0 "#PWR04" H 10250 3350 30  0001 C CNN
+F 0 "#PWR10" H 10250 3350 30  0001 C CNN
 F 1 "GND" H 10250 3280 30  0001 C CNN
 F 2 "" H 10250 3350 60  0000 C CNN
 F 3 "" H 10250 3350 60  0000 C CNN
@@ -126,10 +115,10 @@ F 3 "" H 10250 3350 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR05
+L GND #PWR9
 U 1 1 55618FF7
 P 7400 3350
-F 0 "#PWR05" H 7400 3350 30  0001 C CNN
+F 0 "#PWR9" H 7400 3350 30  0001 C CNN
 F 1 "GND" H 7400 3280 30  0001 C CNN
 F 2 "" H 7400 3350 60  0000 C CNN
 F 3 "" H 7400 3350 60  0000 C CNN
@@ -139,63 +128,41 @@ $EndComp
 $Comp
 L LM317AEMP U1
 U 1 1 556230AA
-P 3600 2150
-F 0 "U1" H 3400 2350 40  0000 C CNN
-F 1 "XC6206P182MR" H 3500 2350 40  0000 L CNN
-F 2 "SOT-23" H 3600 2250 30  0000 C CIN
-F 3 "" H 3600 2150 60  0000 C CNN
-	1    3600 2150
+P 2900 1550
+F 0 "U1" H 2700 1750 40  0000 C CNN
+F 1 "XC6206P182MR" H 2800 1750 40  0000 L CNN
+F 2 "SOT-23" H 2900 1650 30  0000 C CIN
+F 3 "" H 2900 1550 60  0000 C CNN
+	1    2900 1550
 	1    0    0    -1  
 $EndComp
 $Comp
 L CSMALL C1
 U 1 1 556231A4
-P 2950 2300
-F 0 "C1" H 2975 2350 30  0000 L CNN
-F 1 "10uF" H 2975 2250 30  0000 L CNN
-F 2 "SM0603" H 2700 2300 60  0001 C CNN
-F 3 "" H 2800 2300 60  0000 C CNN
-	1    2950 2300
+P 2250 1700
+F 0 "C1" H 2275 1750 30  0000 L CNN
+F 1 "10uF" H 2275 1650 30  0000 L CNN
+F 2 "SM0603" H 2000 1700 60  0001 C CNN
+F 3 "" H 2100 1700 60  0000 C CNN
+	1    2250 1700
 	1    0    0    -1  
 $EndComp
 $Comp
 L CSMALL C2
 U 1 1 556232C3
-P 4250 2300
-F 0 "C2" H 4275 2350 30  0000 L CNN
-F 1 "10uF" H 4275 2250 30  0000 L CNN
-F 2 "SM0603" H 4500 2300 60  0001 C CNN
-F 3 "" H 4500 2400 60  0000 C CNN
-	1    4250 2300
+P 3550 1700
+F 0 "C2" H 3575 1750 30  0000 L CNN
+F 1 "10uF" H 3575 1650 30  0000 L CNN
+F 2 "SM0603" H 3800 1700 60  0001 C CNN
+F 3 "" H 3800 1800 60  0000 C CNN
+	1    3550 1700
 	1    0    0    -1  
 $EndComp
 $Comp
-L VIO #PWR06
-U 1 1 54F464F9
-P 4250 1600
-F 0 "#PWR06" H 4250 1700 30  0001 C CNN
-F 1 "VIO" H 4250 1710 30  0000 C CNN
-F 2 "" H 4250 1600 60  0000 C CNN
-F 3 "" H 4250 1600 60  0000 C CNN
-	1    4250 1600
-	1    0    0    -1  
-$EndComp
-$Comp
-L VIO #PWR07
-U 1 1 55623499
-P 3200 4200
-F 0 "#PWR07" H 3200 4300 30  0001 C CNN
-F 1 "VIO" 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
-	1    3200 4200
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR08
+L GND #PWR20
 U 1 1 54EB8F4C
 P 10000 5700
-F 0 "#PWR08" H 10000 5700 30  0001 C CNN
+F 0 "#PWR20" H 10000 5700 30  0001 C CNN
 F 1 "GND" H 10000 5630 30  0001 C CNN
 F 2 "" H 10000 5700 60  0000 C CNN
 F 3 "" H 10000 5700 60  0000 C CNN
@@ -205,70 +172,37 @@ $EndComp
 $Comp
 L GS3 GS3
 U 1 1 55624346
-P 6050 3950
-F 0 "GS3" H 6200 4100 50  0000 C CNN
-F 1 "SEL_RxD" H 5750 3950 40  0000 C CNN
-F 2 "GS3" V 6138 3876 30  0001 C CNN
-F 3 "" H 6050 3950 60  0000 C CNN
-	1    6050 3950
+P 6450 3950
+F 0 "GS3" H 6600 4100 50  0000 C CNN
+F 1 "SEL_RxD" H 6150 3950 40  0000 C CNN
+F 2 "GS3" V 6538 3876 30  0001 C CNN
+F 3 "" H 6450 3950 60  0000 C CNN
+	1    6450 3950
 	-1   0    0    -1  
 $EndComp
 $Comp
 L GS3 GS4
 U 1 1 556244B7
-P 6050 4450
-F 0 "GS4" H 6200 4600 50  0000 C CNN
-F 1 "SEL_TxD" H 5750 4450 40  0000 C CNN
-F 2 "GS3" V 6138 4376 30  0001 C CNN
-F 3 "" H 6050 4450 60  0000 C CNN
-	1    6050 4450
+P 6450 4450
+F 0 "GS4" H 6600 4600 50  0000 C CNN
+F 1 "SEL_TxD" H 6150 4450 40  0000 C CNN
+F 2 "GS3" V 6538 4376 30  0001 C CNN
+F 3 "" H 6450 4450 60  0000 C CNN
+	1    6450 4450
 	-1   0    0    -1  
 $EndComp
 $Comp
 L GS2 GS5
 U 1 1 556246F1
-P 6100 4750
-F 0 "GS5" V 6050 4550 50  0000 C CNN
-F 1 "SEL_CTS" V 6050 5000 40  0000 C CNN
-F 2 "GS2" V 6174 4750 30  0001 C CNN
-F 3 "" H 6100 4750 60  0000 C CNN
-	1    6100 4750
+P 6850 4750
+F 0 "GS5" V 6800 4550 50  0000 C CNN
+F 1 "SEL_CTS" V 6800 5000 40  0000 C CNN
+F 2 "GS2" V 6924 4750 30  0001 C CNN
+F 3 "" H 6850 4750 60  0000 C CNN
+	1    6850 4750
 	0    1    1    0   
 $EndComp
 $Comp
-L LED D4
-U 1 1 5562E6B2
-P 7100 6450
-F 0 "D4" H 7100 6550 50  0000 C CNN
-F 1 "1.8V" H 7100 6350 50  0000 C CNN
-F 2 "SM0603" H 7100 6450 60  0001 C CNN
-F 3 "~" H 7100 6450 60  0000 C CNN
-	1    7100 6450
-	0    1    1    0   
-$EndComp
-$Comp
-L GND #PWR09
-U 1 1 5562F08B
-P 7100 6700
-F 0 "#PWR09" H 7100 6700 30  0001 C CNN
-F 1 "GND" H 7100 6630 30  0001 C CNN
-F 2 "" H 7100 6700 60  0000 C CNN
-F 3 "" H 7100 6700 60  0000 C CNN
-	1    7100 6700
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R5
-U 1 1 5562F0F6
-P 7100 5950
-F 0 "R5" V 7180 5950 40  0000 C CNN
-F 1 "22" V 7107 5951 40  0000 C CNN
-F 2 "SM0603" V 7030 5950 30  0000 C CNN
-F 3 "~" H 7100 5950 30  0000 C CNN
-	1    7100 5950
-	1    0    0    -1  
-$EndComp
-$Comp
 L LED D5
 U 1 1 5562F1F1
 P 7400 6450
@@ -280,10 +214,10 @@ F 3 "~" H 7400 6450 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR010
+L GND #PWR23
 U 1 1 5562F1F7
 P 7400 6700
-F 0 "#PWR010" H 7400 6700 30  0001 C CNN
+F 0 "#PWR23" H 7400 6700 30  0001 C CNN
 F 1 "GND" H 7400 6630 30  0001 C CNN
 F 2 "" H 7400 6700 60  0000 C CNN
 F 3 "" H 7400 6700 60  0000 C CNN
@@ -302,80 +236,14 @@ F 3 "~" H 7400 5950 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED D3
-U 1 1 5562F3F7
-P 4600 2450
-F 0 "D3" H 4600 2550 50  0000 C CNN
-F 1 "VIO" H 4600 2350 50  0000 C CNN
-F 2 "SM0603" H 4600 2450 60  0001 C CNN
-F 3 "~" H 4600 2450 60  0000 C CNN
-	1    4600 2450
-	0    1    1    0   
-$EndComp
-$Comp
-L GND #PWR011
-U 1 1 5562F3FD
-P 4600 2700
-F 0 "#PWR011" H 4600 2700 30  0001 C CNN
-F 1 "GND" H 4600 2630 30  0001 C CNN
-F 2 "" H 4600 2700 60  0000 C CNN
-F 3 "" H 4600 2700 60  0000 C CNN
-	1    4600 2700
-	1    0    0    -1  
-$EndComp
-$Comp
-L R R4
-U 1 1 5562F403
-P 4600 1950
-F 0 "R4" V 4680 1950 40  0000 C CNN
-F 1 "22" V 4607 1951 40  0000 C CNN
-F 2 "SM0603" V 4530 1950 30  0000 C CNN
-F 3 "~" H 4600 1950 30  0000 C CNN
-	1    4600 1950
-	1    0    0    -1  
-$EndComp
-$Comp
-L GS2 GS1
-U 1 1 5562F481
-P 11000 3400
-F 0 "GS1" V 10950 3200 50  0000 C CNN
-F 1 "RST" V 10950 3600 40  0000 C CNN
-F 2 "GS2" V 11074 3400 30  0000 C CNN
-F 3 "" H 11000 3400 60  0000 C CNN
-	1    11000 3400
-	-1   0    0    1   
-$EndComp
-$Comp
-L GS2 GS2
-U 1 1 5562F487
-P 10700 3400
-F 0 "GS2" V 10650 3200 50  0000 C CNN
-F 1 "PWR" V 10650 3600 40  0000 C CNN
-F 2 "GS2" V 10774 3400 30  0000 C CNN
-F 3 "" H 10700 3400 60  0000 C CNN
-	1    10700 3400
-	-1   0    0    1   
-$EndComp
-$Comp
-L VIO #PWR012
-U 1 1 5562FDE3
-P 10550 1500
-F 0 "#PWR012" H 10550 1600 30  0001 C CNN
-F 1 "VIO" H 10550 1610 30  0000 C CNN
-F 2 "" H 10550 1500 60  0000 C CNN
-F 3 "" H 10550 1500 60  0000 C CNN
-	1    10550 1500
-	1    0    0    -1  
-$EndComp
-$Comp
 L GS2 GS6
 U 1 1 5562467A
-P 6100 4900
-F 0 "GS6" V 6050 4700 50  0000 C CNN
-F 1 "SEL_RTS" V 6050 5150 40  0000 C CNN
-F 2 "GS2" V 6174 4900 30  0001 C CNN
-F 3 "" H 6100 4900 60  0000 C CNN
-	1    6100 4900
+P 6850 4900
+F 0 "GS6" V 6800 4700 50  0000 C CNN
+F 1 "SEL_RTS" V 6800 5150 40  0000 C CNN
+F 2 "GS2" V 6924 4900 30  0001 C CNN
+F 3 "" H 6850 4900 60  0000 C CNN
+	1    6850 4900
 	0    1    1    0   
 $EndComp
 NoConn ~ 7650 4250
@@ -405,44 +273,31 @@ NoConn ~ 10000 5150
 NoConn ~ 10000 5250
 NoConn ~ 10000 5350
 $Comp
-L GND #PWR013
+L GND #PWR6
 U 1 1 5563348F
-P 3900 2550
-F 0 "#PWR013" H 3900 2550 30  0001 C CNN
-F 1 "GND" H 3900 2480 30  0001 C CNN
-F 2 "" H 3900 2550 60  0000 C CNN
-F 3 "" H 3900 2550 60  0000 C CNN
-	1    3900 2550
-	1    0    0    -1  
-$EndComp
-Text Notes 3150 1500 0    30   ~ 0
-diode used for simple 1.8V rail. Remove\nthe regulator, and put a resistor on C2
-$Comp
-L DIODE D6
-U 1 1 556339ED
-P 3600 1700
-F 0 "D6" H 3600 1800 40  0000 C CNN
-F 1 "DIODE" H 3600 1600 40  0000 C CNN
-F 2 "SM0603" H 3600 1700 60  0001 C CNN
-F 3 "~" H 3600 1700 60  0000 C CNN
-	1    3600 1700
+P 3200 1950
+F 0 "#PWR6" H 3200 1950 30  0001 C CNN
+F 1 "GND" H 3200 1880 30  0001 C CNN
+F 2 "" H 3200 1950 60  0000 C CNN
+F 3 "" H 3200 1950 60  0000 C CNN
+	1    3200 1950
 	1    0    0    -1  
 $EndComp
 Text Notes 7350 7550 0    60   ~ 0
-96Boards SonicScrewdriver
-Text Label 5350 3950 0    60   ~ 0
-UART_RXD
-Text Label 5350 4450 0    60   ~ 0
-UART_TXD
-Text Label 5350 4750 0    60   ~ 0
-UART_CTS
-Text Label 5350 4900 0    60   ~ 0
-UART_RTS
+96Boards SonicScrewdriver (FTDI Version) v0.3
+Text Label 5150 4350 0    60   ~ 0
+RXD
+Text Label 5150 4450 0    60   ~ 0
+TXD
+Text Label 5150 4550 0    60   ~ 0
+CTS
+Text Label 5150 4650 0    60   ~ 0
+RTS
 $Comp
-L GND #PWR014
+L GND #PWR22
 U 1 1 55659C7D
 P 4250 6450
-F 0 "#PWR014" H 4250 6450 30  0001 C CNN
+F 0 "#PWR22" 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
@@ -450,17 +305,6 @@ F 3 "" H 4250 6450 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L FT230XS U2
-U 1 1 5565A864
-P 4250 5050
-F 0 "U2" H 4250 5950 60  0000 C CNN
-F 1 "FT230XS" H 4650 4050 60  0000 L CNN
-F 2 "SSOP-16" H 4250 5850 60  0000 C CNN
-F 3 "" H 4250 5050 60  0000 C CNN
-	1    4250 5050
-	1    0    0    -1  
-$EndComp
-$Comp
 L USB-MINI-B CON1
 U 1 1 5565AB07
 P 1300 4800
@@ -483,10 +327,10 @@ F 3 "~" H 2950 4650 30  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR015
+L GND #PWR15
 U 1 1 5565BCDE
 P 750 5200
-F 0 "#PWR015" H 750 5200 30  0001 C CNN
+F 0 "#PWR15" 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
@@ -494,17 +338,6 @@ F 3 "" H 750 5200 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VDD #PWR016
-U 1 1 5565C274
-P 2100 3800
-F 0 "#PWR016" H 2100 3900 30  0001 C CNN
-F 1 "VDD" H 2100 3910 30  0000 C CNN
-F 2 "" H 2100 3800 60  0000 C CNN
-F 3 "" H 2100 3800 60  0000 C CNN
-	1    2100 3800
-	1    0    0    -1  
-$EndComp
-$Comp
 L CSMALL C7
 U 1 1 5565BF0F
 P 2500 5000
@@ -538,10 +371,10 @@ F 3 "~" H 2100 5000 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR017
+L GND #PWR17
 U 1 1 5565C12D
 P 2200 5350
-F 0 "#PWR017" H 2200 5350 30  0001 C CNN
+F 0 "#PWR17" 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
@@ -562,184 +395,235 @@ $EndComp
 $Comp
 L CSMALL C4
 U 1 1 5565C7D2
-P 2300 1950
-F 0 "C4" H 2325 2000 30  0000 L CNN
-F 1 "100nF" H 2325 1900 30  0000 L CNN
-F 2 "~" H 2300 1950 60  0000 C CNN
-F 3 "~" H 2300 1950 60  0000 C CNN
-	1    2300 1950
+P 1450 1700
+F 0 "C4" H 1475 1750 30  0000 L CNN
+F 1 "100nF" H 1475 1650 30  0000 L CNN
+F 2 "~" H 1450 1700 60  0000 C CNN
+F 3 "~" H 1450 1700 60  0000 C CNN
+	1    1450 1700
 	1    0    0    -1  
 $EndComp
 $Comp
 L CSMALL C3
 U 1 1 5565C7D8
-P 2100 1950
-F 0 "C3" H 2125 2000 30  0000 L CNN
-F 1 "4.7uF" H 2125 1900 30  0000 L CNN
-F 2 "~" H 2100 1950 60  0000 C CNN
-F 3 "~" H 2100 1950 60  0000 C CNN
-	1    2100 1950
+P 1250 1700
+F 0 "C3" H 1275 1750 30  0000 L CNN
+F 1 "4.7uF" H 1275 1650 30  0000 L CNN
+F 2 "~" H 1250 1700 60  0000 C CNN
+F 3 "~" H 1250 1700 60  0000 C CNN
+	1    1250 1700
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR018
+L GND #PWR7
 U 1 1 5565C7DE
-P 2200 2300
-F 0 "#PWR018" H 2200 2300 30  0001 C CNN
-F 1 "GND" H 2200 2230 30  0001 C CNN
-F 2 "" H 2200 2300 60  0000 C CNN
-F 3 "" H 2200 2300 60  0000 C CNN
-	1    2200 2300
+P 1350 2050
+F 0 "#PWR7" H 1350 2050 30  0001 C CNN
+F 1 "GND" H 1350 1980 30  0001 C CNN
+F 2 "" H 1350 2050 60  0000 C CNN
+F 3 "" H 1350 2050 60  0000 C CNN
+	1    1350 2050
 	1    0    0    -1  
 $EndComp
+Text GLabel 5250 5050 2    60   Input ~ 0
+CBUS0
+Text GLabel 5250 5350 2    60   Input ~ 0
+CBUS2
+Text GLabel 5250 5500 2    60   Input ~ 0
+CBUS3
 $Comp
-L VDD #PWR019
-U 1 1 5565CA49
-P 2200 1600
-F 0 "#PWR019" H 2200 1700 30  0001 C CNN
-F 1 "VDD" H 2200 1710 30  0000 C CNN
-F 2 "" H 2200 1600 60  0000 C CNN
-F 3 "" H 2200 1600 60  0000 C CNN
-	1    2200 1600
+L R R2
+U 1 1 5565DB88
+P 7450 1350
+F 0 "R2" V 7530 1350 40  0000 C CNN
+F 1 "220" V 7457 1351 40  0000 C CNN
+F 2 "SM0603" V 7380 1350 30  0001 C CNN
+F 3 "~" H 7450 1350 30  0000 C CNN
+	1    7450 1350
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R8
-U 1 1 5565CB11
-P 2100 4150
-F 0 "R8" V 2180 4150 40  0000 C CNN
-F 1 "FB" V 2107 4151 40  0000 C CNN
-F 2 "SM0805" V 2030 4150 30  0001 C CNN
-F 3 "~" H 2100 4150 30  0000 C CNN
-	1    2100 4150
-	1    0    0    -1  
+L LED D7
+U 1 1 5565DB8E
+P 7450 1900
+F 0 "D7" H 7450 2000 50  0000 C CNN
+F 1 "TX/RX" H 7450 1800 50  0000 C CNN
+F 2 "LED-0603" H 7450 1900 60  0001 C CNN
+F 3 "~" H 7450 1900 60  0000 C CNN
+	1    7450 1900
+	0    1    1    0   
 $EndComp
-NoConn ~ 3300 5050
-Text GLabel 5250 5150 2    60   Input ~ 0
+Text GLabel 9950 2750 0    60   Input ~ 0
 CBUS0
-Text GLabel 5650 5250 2    60   Input ~ 0
-CBUS1
-Text GLabel 5250 5350 2    60   Input ~ 0
-CBUS2
-Text GLabel 5650 5450 2    60   Input ~ 0
-CBUS3
 Text GLabel 9950 2900 0    60   Input ~ 0
-CBUS2
+CBUS3
+Text GLabel 7450 2350 3    60   Input ~ 0
+CBUS1
 $Comp
-L R R1
-U 1 1 5562F922
-P 11000 1900
-F 0 "R1" V 11080 1900 40  0000 C CNN
-F 1 "22" V 11007 1901 40  0000 C CNN
-F 2 "SM0603" V 10930 1900 30  0000 C CNN
-F 3 "~" H 11000 1900 30  0000 C CNN
-	1    11000 1900
+L +3.3V #PWR14
+U 1 1 5565E749
+P 3200 4950
+F 0 "#PWR14" 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
+	1    3200 4950
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED D1
-U 1 1 5562F916
-P 11000 2450
-F 0 "D1" H 11000 2550 50  0000 C CNN
-F 1 "RST" H 11000 2350 50  0000 C CNN
-F 2 "SM0603" H 11000 2450 60  0001 C CNN
-F 3 "~" H 11000 2450 60  0000 C CNN
-	1    11000 2450
-	0    1    1    0   
+L +3.3V #PWR3
+U 1 1 5565E82D
+P 2250 1350
+F 0 "#PWR3" H 2250 1310 30  0001 C CNN
+F 1 "+3.3V" H 2250 1460 30  0000 C CNN
+F 2 "" H 2250 1350 60  0000 C CNN
+F 3 "" H 2250 1350 60  0000 C CNN
+	1    2250 1350
+	1    0    0    -1  
 $EndComp
+NoConn ~ 1850 4950
 $Comp
-L R R3
-U 1 1 5562F90E
-P 10700 1900
-F 0 "R3" V 10780 1900 40  0000 C CNN
-F 1 "22" V 10707 1901 40  0000 C CNN
-F 2 "SM0603" V 10630 1900 30  0000 C CNN
-F 3 "~" H 10700 1900 30  0000 C CNN
-	1    10700 1900
+L VBUS #PWR12
+U 1 1 556715C3
+P 3050 4200
+F 0 "#PWR12" 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
+	1    3050 4200
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED D2
-U 1 1 5562F902
-P 10700 2450
-F 0 "D2" H 10700 2550 50  0000 C CNN
-F 1 "PWR" H 10700 2350 50  0000 C CNN
-F 2 "SM0603" H 10700 2450 60  0001 C CNN
-F 3 "~" H 10700 2450 60  0000 C CNN
-	1    10700 2450
-	0    1    1    0   
+L VBUS #PWR11
+U 1 1 556715ED
+P 2100 3600
+F 0 "#PWR11" H 2100 3700 30  0001 C CNN
+F 1 "VBUS" H 2100 3710 30  0000 C CNN
+F 2 "" H 2100 3600 60  0000 C CNN
+F 3 "" H 2100 3600 60  0000 C CNN
+	1    2100 3600
+	1    0    0    -1  
 $EndComp
 $Comp
-L R R7
-U 1 1 5565DB7C
-P 10400 1900
-F 0 "R7" V 10480 1900 40  0000 C CNN
-F 1 "22" V 10407 1901 40  0000 C CNN
-F 2 "SM0603" V 10330 1900 30  0000 C CNN
-F 3 "~" H 10400 1900 30  0000 C CNN
-	1    10400 1900
+L VBUS #PWR2
+U 1 1 556715FC
+P 1350 1350
+F 0 "#PWR2" H 1350 1450 30  0001 C CNN
+F 1 "VBUS" H 1350 1460 30  0000 C CNN
+F 2 "" H 1350 1350 60  0000 C CNN
+F 3 "" H 1350 1350 60  0000 C CNN
+	1    1350 1350
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED D8
-U 1 1 5565DB82
-P 10400 2450
-F 0 "D8" H 10400 2550 50  0000 C CNN
-F 1 "TX" H 10400 2350 50  0000 C CNN
-F 2 "SM0603" H 10400 2450 60  0001 C CNN
-F 3 "~" H 10400 2450 60  0000 C CNN
-	1    10400 2450
-	0    1    1    0   
+L +1.8V #PWR13
+U 1 1 5567160B
+P 3200 4200
+F 0 "#PWR13" 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
+	1    3200 4200
+	1    0    0    -1  
 $EndComp
 $Comp
-L R R2
-U 1 1 5565DB88
-P 10100 1900
-F 0 "R2" V 10180 1900 40  0000 C CNN
-F 1 "22" V 10107 1901 40  0000 C CNN
-F 2 "SM0603" V 10030 1900 30  0000 C CNN
-F 3 "~" H 10100 1900 30  0000 C CNN
-	1    10100 1900
+L +1.8V #PWR4
+U 1 1 55671642
+P 3550 1350
+F 0 "#PWR4" H 3550 1490 20  0001 C CNN
+F 1 "+1.8V" H 3550 1460 30  0000 C CNN
+F 2 "" H 3550 1350 60  0000 C CNN
+F 3 "" H 3550 1350 60  0000 C CNN
+	1    3550 1350
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED D7
-U 1 1 5565DB8E
-P 10100 2450
-F 0 "D7" H 10100 2550 50  0000 C CNN
-F 1 "RX" H 10100 2350 50  0000 C CNN
-F 2 "SM0603" H 10100 2450 60  0001 C CNN
-F 3 "~" H 10100 2450 60  0000 C CNN
-	1    10100 2450
-	0    1    1    0   
+L FT230XS U2
+U 1 1 5565A864
+P 4250 5050
+F 0 "U2" H 4250 5950 60  0000 C CNN
+F 1 "FT230XS" H 4650 4050 60  0000 L CNN
+F 2 "SSOP-16" H 4250 5850 60  0000 C CNN
+F 3 "" H 4250 5050 60  0000 C CNN
+	1    4250 5050
+	1    0    0    -1  
+$EndComp
+$Comp
+L R R3
+U 1 1 55671B7C
+P 10300 2900
+F 0 "R3" V 10380 2900 40  0000 C CNN
+F 1 "100" V 10307 2901 40  0000 C CNN
+F 2 "SM0603_Resistor" V 10230 2900 30  0001 C CNN
+F 3 "~" H 10300 2900 30  0000 C CNN
+	1    10300 2900
+	0    -1   -1   0   
+$EndComp
+$Comp
+L R R4
+U 1 1 55671B8B
+P 10300 2750
+F 0 "R4" V 10380 2750 40  0000 C CNN
+F 1 "100" V 10307 2751 40  0000 C CNN
+F 2 "SM0603_Resistor" V 10230 2750 30  0001 C CNN
+F 3 "~" H 10300 2750 30  0000 C CNN
+	1    10300 2750
+	0    -1   -1   0   
+$EndComp
+$Comp
+L R R7
+U 1 1 55670DD9
+P 6050 5150
+F 0 "R7" V 6130 5150 40  0000 C CNN
+F 1 "10k" V 6057 5151 40  0000 C CNN
+F 2 "~" V 5980 5150 30  0000 C CNN
+F 3 "~" H 6050 5150 30  0000 C CNN
+	1    6050 5150
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR18
+U 1 1 5567226A
+P 6050 5500
+F 0 "#PWR18" H 6050 5500 30  0001 C CNN
+F 1 "GND" H 6050 5430 30  0001 C CNN
+F 2 "" H 6050 5500 60  0000 C CNN
+F 3 "" H 6050 5500 60  0000 C CNN
+	1    6050 5500
+	1    0    0    -1  
+$EndComp
+$Comp
+L FILTER FB1
+U 1 1 556723CE
+P 2100 4050
+F 0 "FB1" H 2100 4200 60  0000 C CNN
+F 1 "FILTER" H 2100 3950 60  0000 C CNN
+F 2 "~" H 2100 4050 60  0000 C CNN
+F 3 "~" H 2100 4050 60  0000 C CNN
+	1    2100 4050
+	0    -1   -1   0   
 $EndComp
-Text GLabel 9950 3100 0    60   Input ~ 0
-CBUS0
-Text GLabel 9550 3000 0    60   Input ~ 0
-CBUS3
-Text GLabel 9550 2800 0    60   Input ~ 0
-CBUS1
 $Comp
-L VIO #PWR020
-U 1 1 5562F40B
-P 4600 1600
-F 0 "#PWR020" H 4600 1700 30  0001 C CNN
-F 1 "VIO" H 4600 1710 30  0000 C CNN
-F 2 "" H 4600 1600 60  0000 C CNN
-F 3 "" H 4600 1600 60  0000 C CNN
-	1    4600 1600
+L +3.3V #PWR1
+U 1 1 556724B3
+P 7300 900
+F 0 "#PWR1" H 7300 860 30  0001 C CNN
+F 1 "+3.3V" H 7300 1010 30  0000 C CNN
+F 2 "" H 7300 900 60  0000 C CNN
+F 3 "" H 7300 900 60  0000 C CNN
+	1    7300 900 
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
 	7650 5450 7650 5700
 Wire Wire Line
-	6950 3650 7650 3650
+	7350 3650 7650 3650
 Wire Wire Line
 	10000 3650 10700 3650
 Wire Wire Line
-	7150 3950 7650 3950
+	7550 3950 7650 3950
 Wire Wire Line
-	6600 3750 7650 3750
+	7000 3750 7650 3750
 Wire Wire Line
 	3200 4300 3300 4300
 Wire Wire Line
@@ -758,75 +642,59 @@ Wire Wire Line
 	10050 3250 10250 3250
 Wire Wire Line
 	10250 3250 10250 3350
+Connection ~ 2250 1500
 Wire Wire Line
-	2950 1600 2950 2200
-Connection ~ 2950 2100
-Wire Wire Line
-	2950 2400 2950 2450
-Wire Wire Line
-	4250 2100 4000 2100
-Wire Wire Line
-	4250 1600 4250 2200
-Connection ~ 4250 2100
+	2250 1800 2250 1850
 Wire Wire Line
-	4250 2450 4250 2400
+	3550 1500 3300 1500
+Connection ~ 3550 1500
 Wire Wire Line
-	2950 2450 4250 2450
-Wire Wire Line
-	3600 2450 3600 2400
-Connection ~ 3600 2450
-Wire Wire Line
-	3200 4200 3200 4300
+	3550 1850 3550 1800
 Wire Wire Line
-	3100 4200 3100 4400
+	2250 1850 3550 1850
 Wire Wire Line
-	3100 4400 3300 4400
+	2900 1850 2900 1800
+Connection ~ 2900 1850
 Wire Wire Line
-	2950 2100 3200 2100
+	2250 1500 2500 1500
 Wire Wire Line
 	10000 5450 10000 5700
 Wire Wire Line
-	7650 4150 6350 4150
+	7650 4150 6750 4150
 Wire Wire Line
-	6350 4150 6350 4050
+	6750 4150 6750 4050
 Wire Wire Line
-	6350 4050 6200 4050
+	6750 4050 6600 4050
 Wire Wire Line
-	6200 3850 7650 3850
+	6600 3850 7650 3850
 Wire Wire Line
-	7650 4050 6700 4050
+	7650 4050 7100 4050
 Wire Wire Line
-	6700 4050 6700 4550
+	7100 4050 7100 4550
 Wire Wire Line
-	6700 4550 6200 4550
+	7100 4550 6600 4550
 Wire Wire Line
-	5150 4350 5350 4350
+	5150 4350 6150 4350
 Wire Wire Line
-	5350 4350 5350 3950
+	6150 4350 6150 3950
 Wire Wire Line
-	5350 3950 5900 3950
+	6150 3950 6300 3950
 Wire Wire Line
-	5150 4450 5900 4450
+	5150 4450 6300 4450
 Wire Wire Line
-	5150 4550 5350 4550
+	5150 4550 6150 4550
 Wire Wire Line
-	5350 4550 5350 4750
+	6150 4550 6150 4750
 Wire Wire Line
-	5350 4750 5900 4750
+	5150 4650 6050 4650
 Wire Wire Line
-	5150 4650 5250 4650
+	7000 3750 7000 4350
 Wire Wire Line
-	6600 3750 6600 4350
+	7000 4350 6600 4350
 Wire Wire Line
-	6600 4350 6200 4350
+	7050 4750 7350 4750
 Wire Wire Line
-	6300 4750 6950 4750
-Wire Wire Line
-	6950 4750 6950 3650
-Wire Wire Line
-	7100 6700 7100 6650
-Wire Wire Line
-	7100 6250 7100 6200
+	7350 4750 7350 3650
 Wire Wire Line
 	7400 6700 7400 6650
 Wire Wire Line
@@ -835,38 +703,18 @@ Wire Wire Line
 	7400 5700 7400 5350
 Wire Wire Line
 	7400 5350 7650 5350
-Wire Wire Line
-	4600 2700 4600 2650
-Wire Wire Line
-	4600 2250 4600 2200
-Wire Wire Line
-	4600 1600 4600 1700
 Connection ~ 10700 3650
 Wire Wire Line
-	7150 4900 6300 4900
-Wire Wire Line
-	7150 3950 7150 4900
+	7550 4900 7050 4900
 Wire Wire Line
-	5250 4900 5900 4900
+	7550 3950 7550 4900
 Wire Wire Line
-	5250 4650 5250 4900
+	6050 4900 6650 4900
 Wire Wire Line
-	3900 2450 3900 2550
-Connection ~ 3900 2450
+	6050 4650 6050 4900
 Wire Wire Line
-	2950 1700 3400 1700
-Connection ~ 2950 1700
-Wire Wire Line
-	3800 1700 4250 1700
-Connection ~ 4250 1700
-Wire Notes Line
-	3100 1400 4150 1400
-Wire Notes Line
-	4150 1400 4150 1850
-Wire Notes Line
-	4150 1850 3100 1850
-Wire Notes Line
-	3100 1850 3100 1400
+	3200 1850 3200 1950
+Connection ~ 3200 1850
 Wire Wire Line
 	4250 6450 4250 6350
 Wire Wire Line
@@ -928,117 +776,275 @@ Wire Wire Line
 	1950 4750 2700 4750
 Connection ~ 2300 4750
 Wire Wire Line
-	2300 1700 2300 1850
+	1450 1450 1450 1600
 Wire Wire Line
-	2100 2050 2100 2150
+	1250 1800 1250 1900
 Wire Wire Line
-	2100 2150 2300 2150
+	1250 1900 1450 1900
 Wire Wire Line
-	2300 2150 2300 2050
+	1450 1900 1450 1800
 Wire Wire Line
-	2200 2150 2200 2300
-Connection ~ 2200 2150
+	1350 1900 1350 2050
+Connection ~ 1350 1900
 Wire Wire Line
-	2100 1850 2100 1700
+	1250 1600 1250 1450
 Wire Wire Line
-	2100 1700 2300 1700
+	1250 1450 1450 1450
 Wire Wire Line
-	2200 1600 2200 1700
-Connection ~ 2200 1700
+	1350 1350 1350 1450
+Connection ~ 1350 1450
 Wire Wire Line
-	2100 3800 2100 3900
+	2100 3600 2100 3700
 Wire Wire Line
-	11000 3600 11000 3850
-Connection ~ 11000 3750
+	10850 2600 10850 4400
+Connection ~ 10850 3750
 Wire Wire Line
-	10000 3750 11000 3750
+	10000 3750 10850 3750
 Wire Wire Line
-	10700 4450 10700 4550
+	10700 4450 10700 5100
 Wire Wire Line
-	10700 4550 11000 4550
+	10700 5100 10850 5100
 Wire Wire Line
-	11000 4550 11000 4450
+	10850 5100 10850 5000
 Wire Wire Line
-	10850 4550 10850 4700
-Connection ~ 10850 4550
+	10750 5100 10750 5250
+Connection ~ 10750 5100
 Wire Wire Line
-	5150 5150 5250 5150
+	5150 5350 5250 5350
 Wire Wire Line
-	5150 5250 5650 5250
+	10700 2600 10700 3850
 Wire Wire Line
-	5150 5350 5250 5350
+	7450 1600 7450 1700
 Wire Wire Line
-	5150 5450 5650 5450
+	7450 2100 7450 2350
 Wire Wire Line
-	11000 2650 11000 3200
+	6150 4750 6650 4750
 Wire Wire Line
-	10700 3600 10700 3850
+	3200 4950 3200 5700
 Wire Wire Line
-	10700 2650 10700 3200
+	3200 5050 3300 5050
 Wire Wire Line
-	7100 5700 7100 5250
+	3200 5550 3300 5550
+Connection ~ 3200 5050
 Wire Wire Line
-	7100 5250 7650 5250
+	3200 4200 3200 4300
 Wire Wire Line
-	11000 2150 11000 2250
+	3050 4200 3050 4400
 Wire Wire Line
-	10700 2150 10700 2250
+	3050 4400 3300 4400
 Wire Wire Line
-	10400 2150 10400 2250
+	6050 5500 6050 5400
 Wire Wire Line
-	10100 2150 10100 2250
+	7450 1000 7450 1100
 Wire Wire Line
-	10100 1650 10100 1550
+	9950 2750 10050 2750
 Wire Wire Line
-	10100 1550 11000 1550
+	9950 2900 10050 2900
+$Comp
+L R R1
+U 1 1 55672BFC
+P 6500 2350
+F 0 "R1" V 6580 2350 40  0000 C CNN
+F 1 "220" V 6507 2351 40  0000 C CNN
+F 2 "~" V 6430 2350 30  0000 C CNN
+F 3 "~" H 6500 2350 30  0000 C CNN
+	1    6500 2350
+	0    -1   -1   0   
+$EndComp
 Wire Wire Line
-	10550 1550 10550 1500
+	7150 1700 7150 1600
+$Comp
+L R R5
+U 1 1 5562F0F6
+P 7150 1350
+F 0 "R5" V 7230 1350 40  0000 C CNN
+F 1 "220" V 7157 1351 40  0000 C CNN
+F 2 "SM0603" V 7080 1350 30  0001 C CNN
+F 3 "~" H 7150 1350 30  0000 C CNN
+	1    7150 1350
+	1    0    0    -1  
+$EndComp
+$Comp
+L LED D4
+U 1 1 5562E6B2
+P 7150 1900
+F 0 "D4" H 7150 2000 50  0000 C CNN
+F 1 "1.8V" H 7150 1800 50  0000 C CNN
+F 2 "LED-0603" H 7150 1900 60  0001 C CNN
+F 3 "~" H 7150 1900 60  0000 C CNN
+	1    7150 1900
+	0    1    1    0   
+$EndComp
+$Comp
+L NPN Q1
+U 1 1 55672D62
+P 7050 2350
+F 0 "Q1" H 7050 2200 50  0000 R CNN
+F 1 "S9013" H 7050 2500 50  0000 R CNN
+F 2 "SOT-23" H 7050 2350 60  0001 C CNN
+F 3 "~" H 7050 2350 60  0000 C CNN
+	1    7050 2350
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR8
+U 1 1 55672DA5
+P 7150 2650
+F 0 "#PWR8" H 7150 2650 30  0001 C CNN
+F 1 "GND" H 7150 2580 30  0001 C CNN
+F 2 "" H 7150 2650 60  0000 C CNN
+F 3 "" H 7150 2650 60  0000 C CNN
+	1    7150 2650
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	10400 1650 10400 1550
-Connection ~ 10400 1550
+	7150 2650 7150 2550
 Wire Wire Line
-	10700 1550 10700 1650
-Connection ~ 10550 1550
+	7150 2100 7150 2150
 Wire Wire Line
-	11000 1550 11000 1650
-Connection ~ 10700 1550
+	7300 900  7300 1000
+Connection ~ 7300 1000
 Wire Wire Line
-	9550 2800 10100 2800
+	7150 1100 7150 1000
 Wire Wire Line
-	10100 2800 10100 2650
+	7150 1000 7450 1000
 Wire Wire Line
-	9950 2900 10400 2900
+	5150 5450 5200 5450
 Wire Wire Line
-	10400 2900 10400 2650
+	5200 5450 5200 5500
 Wire Wire Line
-	9550 3000 10700 3000
-Connection ~ 10700 3000
+	5200 5500 5250 5500
+Connection ~ 6050 4900
 Wire Wire Line
-	9950 3100 11000 3100
-Connection ~ 11000 3100
+	5150 5150 5200 5150
+Wire Wire Line
+	5200 5150 5200 5050
+Wire Wire Line
+	5200 5050 5250 5050
+Text GLabel 5250 5200 2    60   Input ~ 0
+CBUS1
+Wire Wire Line
+	5250 5200 5200 5200
+Wire Wire Line
+	5200 5200 5200 5250
+Wire Wire Line
+	5200 5250 5150 5250
+Text GLabel 6050 2600 0    60   Input ~ 0
+CBUS2
+Text GLabel 6050 2350 0    60   Input ~ 0
++1.8_SENSE
+Wire Wire Line
+	6050 2350 6250 2350
+Wire Wire Line
+	6050 2600 6800 2600
+Wire Wire Line
+	6800 2600 6800 2350
+Wire Wire Line
+	6750 2350 6850 2350
+Connection ~ 6800 2350
+Text GLabel 7450 5250 0    60   Input ~ 0
++1.8_SENSE
+Wire Wire Line
+	7450 5250 7650 5250
+Wire Wire Line
+	2250 1350 2250 1600
+Wire Wire Line
+	3550 1350 3550 1600
 $Comp
-L +3.3V #PWR021
-U 1 1 5565E749
-P 3300 5450
-F 0 "#PWR021" H 3300 5410 30  0001 C CNN
-F 1 "+3.3V" H 3300 5560 30  0000 C CNN
-F 2 "" H 3300 5450 60  0000 C CNN
-F 3 "" H 3300 5450 60  0000 C CNN
-	1    3300 5450
+L CSMALL C8
+U 1 1 55674229
+P 3200 5800
+F 0 "C8" H 3225 5850 30  0000 L CNN
+F 1 "100nF" H 3225 5750 30  0000 L CNN
+F 2 "SM0603_Capacitor" H 3200 5800 60  0001 C CNN
+F 3 "~" H 3200 5800 60  0000 C CNN
+	1    3200 5800
 	1    0    0    -1  
 $EndComp
+Connection ~ 3200 5550
+$Comp
+L GND #PWR21
+U 1 1 55674363
+P 3200 6000
+F 0 "#PWR21" 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
+	1    3200 6000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3200 6000 3200 5900
+Wire Wire Line
+	10550 2900 10700 2900
 Wire Wire Line
-	3300 5450 3300 5550
+	10550 2750 10850 2750
 $Comp
-L +3.3V #PWR022
-U 1 1 5565E82D
-P 2950 1600
-F 0 "#PWR022" H 2950 1560 30  0001 C CNN
-F 1 "+3.3V" H 2950 1710 30  0000 C CNN
-F 2 "" H 2950 1600 60  0000 C CNN
-F 3 "" H 2950 1600 60  0000 C CNN
-	1    2950 1600
+L R R11
+U 1 1 55674AB4
+P 10850 1850
+F 0 "R11" V 10930 1850 40  0000 C CNN
+F 1 "220" V 10857 1851 40  0000 C CNN
+F 2 "SM0603" V 10780 1850 30  0001 C CNN
+F 3 "~" H 10850 1850 30  0000 C CNN
+	1    10850 1850
 	1    0    0    -1  
 $EndComp
-NoConn ~ 1850 4950
+$Comp
+L LED D2
+U 1 1 55674ABA
+P 10850 2400
+F 0 "D2" H 10950 2500 50  0000 C CNN
+F 1 "RST" H 10750 2500 50  0000 C CNN
+F 2 "LED-0603" H 10850 2400 60  0001 C CNN
+F 3 "~" H 10850 2400 60  0000 C CNN
+	1    10850 2400
+	0    1    1    0   
+$EndComp
+$Comp
+L +3.3V #PWR5
+U 1 1 55674AC0
+P 10700 1400
+F 0 "#PWR5" H 10700 1360 30  0001 C CNN
+F 1 "+3.3V" H 10700 1510 30  0000 C CNN
+F 2 "" H 10700 1400 60  0000 C CNN
+F 3 "" H 10700 1400 60  0000 C CNN
+	1    10700 1400
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	10850 2100 10850 2200
+Wire Wire Line
+	10700 2200 10700 2100
+$Comp
+L R R8
+U 1 1 55674AC9
+P 10700 1850
+F 0 "R8" V 10780 1850 40  0000 C CNN
+F 1 "220" V 10707 1851 40  0000 C CNN
+F 2 "SM0603" V 10630 1850 30  0001 C CNN
+F 3 "~" H 10700 1850 30  0000 C CNN
+	1    10700 1850
+	1    0    0    -1  
+$EndComp
+$Comp
+L LED D1
+U 1 1 55674ACF
+P 10700 2400
+F 0 "D1" H 10800 2300 50  0000 C CNN
+F 1 "PWR" H 10600 2300 50  0000 C CNN
+F 2 "LED-0603" H 10700 2400 60  0001 C CNN
+F 3 "~" H 10700 2400 60  0000 C CNN
+	1    10700 2400
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	10700 1400 10700 1600
+Connection ~ 10700 1500
+Connection ~ 10700 2900
+Connection ~ 10850 2750
+Wire Wire Line
+	10700 1500 10850 1500
+Wire Wire Line
+	10850 1500 10850 1600
 $EndSCHEMATC