PCB sent to OSHPark for manufacture

This version has been sent off. I've cleaned up a bunch of the
silkscreen to make it more useful.

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

7 files changed, 1183 insertions, 404 deletions

diff --git a/96boards-uart-cache.lib b/96boards-uart-cache.lib
index 7d21709..622ea8b 100644
--- a/96boards-uart-cache.lib
+++ b/96boards-uart-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Mon 02 Mar 2015 11:34:39 GMT
+EESchema-LIBRARY Version 2.3  Date: Mon 02 Mar 2015 13:22:11 GMT
 #encoding utf-8
 #
 # +1.8V
@@ -145,6 +145,34 @@ X 2 2 300 0 200 L 60 60 0 1 P I
 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
+#
+DEF VIO #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
+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
+C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
+ENDDRAW
+ENDDEF
+#
 # ZENER
 #
 DEF ZENER D 0 40 N N 1 F N
diff --git a/96boards-uart.cmp b/96boards-uart.cmp
index 7bef02c..07e2a03 100644
--- a/96boards-uart.cmp
+++ b/96boards-uart.cmp
@@ -1,38 +1,31 @@
-Cmp-Mod V01 Created by CvPcb (22-Jun-2014 BZR 4027)-stable date = Wed 25 Feb 2015 17:57:44 GMT
+Cmp-Mod V01 Created by CvPcb (22-Jun-2014 BZR 4027)-stable date = Mon 02 Mar 2015 22:25:58 GMT
 
 BeginCmp
-TimeStamp = /54EC9AB4;
-Reference = J2;
-ValeurCmp = CONN_5;
-IdModule  = SIL-5;
+TimeStamp = /54F37856;
+Reference = D1;
+ValeurCmp = MMSZ4678T1G;
+IdModule  = SOD-123;
 EndCmp
 
 BeginCmp
-TimeStamp = /54EC9AD9;
-Reference = J3;
-ValeurCmp = CONN_3;
-IdModule  = SIL-3;
-EndCmp
-
-BeginCmp
-TimeStamp = /54EC9AA7;
-Reference = J5;
-ValeurCmp = CONN_5;
-IdModule  = SIL-5;
+TimeStamp = /54F0AFFF;
+Reference = P1;
+ValeurCmp = 96BOARD_LS_EXPANSION;
+IdModule  = 96BOARDS_LV_EXPANSION;
 EndCmp
 
 BeginCmp
-TimeStamp = /54EC9ACC;
-Reference = J6;
-ValeurCmp = CONN_3;
-IdModule  = SIL-3;
+TimeStamp = /54F0A1F1;
+Reference = P2;
+ValeurCmp = CP2104_MINI;
+IdModule  = CP2104_MINI;
 EndCmp
 
 BeginCmp
-TimeStamp = /54E6538C;
-Reference = P1;
-ValeurCmp = CONN_20X2;
-IdModule  = PIN_ARRAY_2MM_20X2;
+TimeStamp = /54F378F7;
+Reference = R1;
+ValeurCmp = 10K;
+IdModule  = SM0402_r;
 EndCmp
 
 BeginCmp
diff --git a/96boards-uart.kicad_pcb b/96boards-uart.kicad_pcb
index 41a5bde..3f13c4e 100644
--- a/96boards-uart.kicad_pcb
+++ b/96boards-uart.kicad_pcb
@@ -1,15 +1,15 @@
 (kicad_pcb (version 3) (host pcbnew "(22-Jun-2014 BZR 4027)-stable")
 
   (general
-    (links 20)
+    (links 24)
     (no_connects 0)
     (area 96.949999 90.449999 141.050001 122.050001)
     (thickness 1.6)
-    (drawings 10)
-    (tracks 56)
+    (drawings 18)
+    (tracks 63)
     (zones 0)
-    (modules 4)
-    (nets 10)
+    (modules 6)
+    (nets 12)
   )
 
   (page A3)
@@ -53,8 +53,8 @@
     (mod_edge_width 0.15)
     (mod_text_size 1 1)
     (mod_text_width 0.15)
-    (pad_size 1.397 1.397)
-    (pad_drill 0.8128)
+    (pad_size 0.91 1.22)
+    (pad_drill 0)
     (pad_to_mask_clearance 0)
     (aux_axis_origin 97 108)
     (visible_elements FFFFFFFF)
@@ -95,7 +95,9 @@
   (net 6 /UART0_RXD_LV)
   (net 7 /UART0_TXD_LV)
   (net 8 GND)
-  (net 9 N-000023)
+  (net 9 N-000006)
+  (net 10 VDD)
+  (net 11 VIO)
 
   (net_class Default "This is the default net class."
     (clearance 0.24)
@@ -113,20 +115,417 @@
     (add_net /UART0_RXD_LV)
     (add_net /UART0_TXD_LV)
     (add_net GND)
-    (add_net N-000023)
+    (add_net N-000006)
+    (add_net VDD)
+    (add_net VIO)
   )
 
-  (module PIN_ARRAY_2MM_20X2 (layer F.Cu) (tedit 54EE0AB2) (tstamp 54E8C3B0)
+  (module SW_PUSH_SM (layer F.Cu) (tedit 54F4E4B5) (tstamp 54F1A9C9)
+    (at 124 98 90)
+    (path /54EBBD3A)
+    (fp_text reference SW1 (at -2.25 -4.5 90) (layer F.SilkS)
+      (effects (font (size 1.016 1.016) (thickness 0.2032)))
+    )
+    (fp_text value PWR (at 2.25 -4.5 90) (layer F.SilkS)
+      (effects (font (size 1.016 1.016) (thickness 0.2032)))
+    )
+    (fp_circle (center 0 0) (end 0 -2.54) (layer F.SilkS) (width 0.127))
+    (fp_line (start -3.81 -3.81) (end 3.81 -3.81) (layer F.SilkS) (width 0.127))
+    (fp_line (start 3.81 -3.81) (end 3.81 3.81) (layer F.SilkS) (width 0.127))
+    (fp_line (start 3.81 3.81) (end -3.81 3.81) (layer F.SilkS) (width 0.127))
+    (fp_line (start -3.81 -3.81) (end -3.81 3.81) (layer F.SilkS) (width 0.127))
+    (pad 1 smd rect (at 4.55 -2.25 90) (size 2.1 1.4)
+      (layers F.Cu F.Paste F.Mask)
+      (net 2 /PWR_BTN)
+    )
+    (pad 2 smd rect (at 4.55 2.25 90) (size 2.1 1.4)
+      (layers F.Cu F.Paste F.Mask)
+      (net 8 GND)
+    )
+    (pad 1 smd rect (at -4.55 -2.25 90) (size 2.1 1.4)
+      (layers F.Cu F.Paste F.Mask)
+      (net 2 /PWR_BTN)
+    )
+    (pad 2 smd rect (at -4.55 2.25 90) (size 2.1 1.4)
+      (layers F.Cu F.Paste F.Mask)
+      (net 8 GND)
+    )
+  )
+
+  (module SW_PUSH_SM (layer F.Cu) (tedit 54F4E4D1) (tstamp 54F1A9D6)
+    (at 136 98 90)
+    (path /54EBBD47)
+    (fp_text reference SW2 (at -2.25 -4.5 90) (layer F.SilkS)
+      (effects (font (size 1.016 1.016) (thickness 0.2032)))
+    )
+    (fp_text value RST (at 2.5 -4.5 90) (layer F.SilkS)
+      (effects (font (size 1.016 1.016) (thickness 0.2032)))
+    )
+    (fp_circle (center 0 0) (end 0 -2.54) (layer F.SilkS) (width 0.127))
+    (fp_line (start -3.81 -3.81) (end 3.81 -3.81) (layer F.SilkS) (width 0.127))
+    (fp_line (start 3.81 -3.81) (end 3.81 3.81) (layer F.SilkS) (width 0.127))
+    (fp_line (start 3.81 3.81) (end -3.81 3.81) (layer F.SilkS) (width 0.127))
+    (fp_line (start -3.81 -3.81) (end -3.81 3.81) (layer F.SilkS) (width 0.127))
+    (pad 1 smd rect (at 4.55 -2.25 90) (size 2.1 1.4)
+      (layers F.Cu F.Paste F.Mask)
+      (net 3 /RST_BTN)
+    )
+    (pad 2 smd rect (at 4.55 2.25 90) (size 2.1 1.4)
+      (layers F.Cu F.Paste F.Mask)
+      (net 8 GND)
+    )
+    (pad 1 smd rect (at -4.55 -2.25 90) (size 2.1 1.4)
+      (layers F.Cu F.Paste F.Mask)
+      (net 3 /RST_BTN)
+    )
+    (pad 2 smd rect (at -4.55 2.25 90) (size 2.1 1.4)
+      (layers F.Cu F.Paste F.Mask)
+      (net 8 GND)
+    )
+  )
+
+  (module CP2104_MINI (layer F.Cu) (tedit 54F4E5CC) (tstamp 54F1AA9D)
+    (at 108.5 100.5)
+    (descr "Connecteur 5 pins")
+    (tags "CONN DEV")
+    (path /54F0A1F1)
+    (fp_text reference P2 (at 11.388 6.688) (layer F.SilkS)
+      (effects (font (size 1.72974 1.08712) (thickness 0.3048)))
+    )
+    (fp_text value CP2104_MINI (at 4 -0.75 90) (layer F.SilkS)
+      (effects (font (size 1.524 1.016) (thickness 0.254)))
+    )
+    (fp_line (start -10.16 7.62) (end 10.16 7.62) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -10.16 5.08) (end 10.16 5.08) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -10.16 -8.89) (end 10.16 -8.89) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 5.08 7.62) (end 5.08 5.08) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 10.16 5.08) (end 10.16 7.62) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 2.54 7.62) (end 2.54 5.08) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 2.54 -6.35) (end 2.54 -8.89) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 10.16 -8.89) (end 10.16 -6.35) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 5.08 -6.35) (end 5.08 -8.89) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -7.62 -6.35) (end -7.62 -8.89) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 2.54 -8.89) (end 2.54 -6.35) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -10.16 -6.35) (end 10.16 -6.35) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -10.16 -6.35) (end -10.16 -8.89) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -10.16 7.62) (end -10.16 5.08) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 2.54 5.08) (end 2.54 7.62) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -7.62 7.62) (end -7.62 5.08) (layer F.SilkS) (width 0.3048))
+    (pad 8 thru_hole circle (at 8.89 6.35) (size 1.397 1.397) (drill 0.8128)
+      (layers *.Cu *.Mask F.SilkS)
+    )
+    (pad 7 thru_hole circle (at 6.35 6.35) (size 1.397 1.397) (drill 0.8128)
+      (layers *.Cu *.Mask F.SilkS)
+      (net 3 /RST_BTN)
+    )
+    (pad 6 thru_hole rect (at 3.81 6.35) (size 1.397 1.397) (drill 0.8128)
+      (layers *.Cu *.Mask F.SilkS)
+      (net 2 /PWR_BTN)
+    )
+    (pad 14 thru_hole rect (at 3.81 -7.62) (size 1.397 1.397) (drill 0.8128)
+      (layers *.Cu *.Mask F.SilkS)
+    )
+    (pad 15 thru_hole circle (at 6.35 -7.62) (size 1.397 1.397) (drill 0.8128)
+      (layers *.Cu *.Mask F.SilkS)
+    )
+    (pad 16 thru_hole circle (at 8.89 -7.62) (size 1.397 1.397) (drill 0.8128)
+      (layers *.Cu *.Mask F.SilkS)
+    )
+    (pad 13 thru_hole circle (at 1.27 -7.62) (size 1.397 1.397) (drill 0.8128)
+      (layers *.Cu *.Mask F.SilkS)
+      (net 5 /UART0_RTS_LV)
+    )
+    (pad 12 thru_hole circle (at -1.27 -7.62) (size 1.397 1.397) (drill 0.8128)
+      (layers *.Cu *.Mask F.SilkS)
+      (net 4 /UART0_CTS_LV)
+    )
+    (pad 11 thru_hole circle (at -3.81 -7.62) (size 1.397 1.397) (drill 0.8128)
+      (layers *.Cu *.Mask F.SilkS)
+      (net 7 /UART0_TXD_LV)
+    )
+    (pad 10 thru_hole circle (at -6.35 -7.62) (size 1.397 1.397) (drill 0.8128)
+      (layers *.Cu *.Mask F.SilkS)
+      (net 6 /UART0_RXD_LV)
+    )
+    (pad 9 thru_hole rect (at -8.89 -7.62) (size 1.397 1.397) (drill 0.8128)
+      (layers *.Cu *.Mask F.SilkS)
+      (net 8 GND)
+    )
+    (pad 1 thru_hole rect (at -8.89 6.35) (size 1.397 1.397) (drill 0.8128)
+      (layers *.Cu *.Mask F.SilkS)
+      (net 11 VIO)
+    )
+    (pad 2 thru_hole circle (at -6.35 6.35) (size 1.397 1.397) (drill 0.8128)
+      (layers *.Cu *.Mask F.SilkS)
+      (net 10 VDD)
+    )
+    (pad 3 thru_hole circle (at -3.81 6.35) (size 1.397 1.397) (drill 0.8128)
+      (layers *.Cu *.Mask F.SilkS)
+    )
+    (pad 4 thru_hole circle (at -1.27 6.35) (size 1.397 1.397) (drill 0.8128)
+      (layers *.Cu *.Mask F.SilkS)
+      (net 1 +1.8V)
+    )
+    (pad 5 thru_hole circle (at 1.27 6.35) (size 1.397 1.397) (drill 0.8128)
+      (layers *.Cu *.Mask F.SilkS)
+      (net 9 N-000006)
+    )
+  )
+
+  (module SOD-123 (layer F.Cu) (tedit 54F46534) (tstamp 54F4C821)
+    (at 100.5 100.5 270)
+    (path /54F37856)
+    (fp_text reference D1 (at 0.084 1.694 270) (layer F.SilkS)
+      (effects (font (size 0.5 0.5) (thickness 0.125)))
+    )
+    (fp_text value MMSZ4678T1G (at 0 1.27 270) (layer F.SilkS) hide
+      (effects (font (size 0.5 0.5) (thickness 0.125)))
+    )
+    (fp_line (start -0.635 -1.27) (end -0.635 1.27) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.27 -1.27) (end 1.27 -1.27) (layer F.SilkS) (width 0.15))
+    (fp_line (start 1.27 -1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.15))
+    (fp_line (start 1.27 1.27) (end -1.27 1.27) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.27 1.27) (end -1.27 -1.27) (layer F.SilkS) (width 0.15))
+    (pad 1 smd rect (at -1.635 0 270) (size 0.91 1.22)
+      (layers F.Cu F.Paste F.Mask)
+      (net 8 GND)
+    )
+    (pad 2 smd rect (at 1.635 0 270) (size 0.91 1.22)
+      (layers F.Cu F.Paste F.Mask)
+      (net 11 VIO)
+    )
+  )
+
+  (module SM0402_r (layer F.Cu) (tedit 54F46543) (tstamp 54F4C82D)
+    (at 100.5 104)
+    (path /54F378F7)
+    (attr smd)
+    (fp_text reference R1 (at -0.424 -0.622) (layer F.SilkS)
+      (effects (font (size 0.35052 0.3048) (thickness 0.07112)))
+    )
+    (fp_text value 10K (at 0.09906 0) (layer F.SilkS) hide
+      (effects (font (size 0.35052 0.3048) (thickness 0.07112)))
+    )
+    (fp_line (start -0.254 -0.381) (end -0.762 -0.381) (layer F.SilkS) (width 0.07112))
+    (fp_line (start -0.762 -0.381) (end -0.762 0.381) (layer F.SilkS) (width 0.07112))
+    (fp_line (start -0.762 0.381) (end -0.254 0.381) (layer F.SilkS) (width 0.07112))
+    (fp_line (start 0.254 -0.381) (end 0.762 -0.381) (layer F.SilkS) (width 0.07112))
+    (fp_line (start 0.762 -0.381) (end 0.762 0.381) (layer F.SilkS) (width 0.07112))
+    (fp_line (start 0.762 0.381) (end 0.254 0.381) (layer F.SilkS) (width 0.07112))
+    (pad 1 smd rect (at -0.44958 0) (size 0.39878 0.59944)
+      (layers F.Cu F.Paste F.Mask)
+      (net 11 VIO)
+    )
+    (pad 2 smd rect (at 0.44958 0) (size 0.39878 0.59944)
+      (layers F.Cu F.Paste F.Mask)
+      (net 10 VDD)
+    )
+    (model smd/resistors/R0402.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 0.27 0.27 0.27))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module 96BOARDS_LV_EXPANSION (layer F.Cu) (tedit 54F4E5B3) (tstamp 54E8C3B0)
     (at 119 112)
     (descr "Double rangee de contacts 2 x 12 pins")
     (tags CONN)
     (path /54F0AFFF)
-    (fp_text reference P1 (at 20 -4) (layer F.SilkS)
-      (effects (font (size 1.016 1.016) (thickness 0.27432)))
+    (fp_text reference P1 (at 20.446 -4.05) (layer F.SilkS)
+      (effects (font (size 1.016 1.016) (thickness 0.254)))
     )
     (fp_text value 96BOARD_LS_EXPANSION (at 0 3.81) (layer F.SilkS) hide
       (effects (font (size 1.016 1.016) (thickness 0.2032)))
     )
+    (fp_line (start 14.25 -2.5) (end 14.25 -2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start 14.25 -2.75) (end 17.75 -2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start 17.75 -2.75) (end 17.75 -2.5) (layer F.SilkS) (width 0.15))
+    (fp_line (start 13.75 -2.5) (end 13.75 -2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start 2.25 -2.5) (end 2.25 -2.75) (layer F.SilkS) (width 0.15))
+    (fp_text user GPIO (at 8 -2.75) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_line (start 7.25 -2.75) (end 2.25 -2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start 8.75 -2.75) (end 13.75 -2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start 8.75 2.75) (end 13.75 2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start 13.75 2.75) (end 13.75 2.5) (layer F.SilkS) (width 0.15))
+    (fp_line (start 7.25 2.75) (end 2.25 2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start 2.25 2.75) (end 2.25 2.5) (layer F.SilkS) (width 0.15))
+    (fp_text user GPIO (at 8 2.75) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user SCL (at -1 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user SDA (at 1 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user I2C1 (at 0 2.75) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_line (start 1.75 2.75) (end 1.75 2.5) (layer F.SilkS) (width 0.15))
+    (fp_line (start 0.75 2.75) (end 1.75 2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.75 2.75) (end -1.75 2.5) (layer F.SilkS) (width 0.15))
+    (fp_line (start -0.75 2.75) (end -1.75 2.75) (layer F.SilkS) (width 0.15))
+    (fp_text user PCM (at -2 -2.75) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_line (start -5.75 -2.75) (end -5.75 -2.5) (layer F.SilkS) (width 0.15))
+    (fp_line (start -2.75 -2.75) (end -5.75 -2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start 1.75 -2.75) (end 1.75 -2.5) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.25 -2.75) (end 1.75 -2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start -9.25 -2.75) (end -6.25 -2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start -6.25 -2.75) (end -6.25 -2.5) (layer F.SilkS) (width 0.15))
+    (fp_line (start -10.75 -2.75) (end -13.75 -2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start -13.75 -2.75) (end -13.75 -2.5) (layer F.SilkS) (width 0.15))
+    (fp_text user SPI0 (at -10 -2.75) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_line (start -13 2.75) (end -10.25 2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start -10.25 2.75) (end -10.25 2.5) (layer F.SilkS) (width 0.15))
+    (fp_line (start -15 2.75) (end -17.75 2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start -17.75 2.75) (end -17.75 2.5) (layer F.SilkS) (width 0.15))
+    (fp_text user UART0 (at -14 2.75) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_line (start -9.75 2.75) (end -9 2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start -6.25 2.75) (end -7 2.75) (layer F.SilkS) (width 0.15))
+    (fp_text user UART1 (at -8 2.75) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_line (start -6.25 2.75) (end -6.25 2.5) (layer F.SilkS) (width 0.15))
+    (fp_line (start -9.75 2.75) (end -9.75 2.5) (layer F.SilkS) (width 0.15))
+    (fp_line (start -4.75 2.75) (end -5.75 2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start -5.75 2.75) (end -5.75 2.5) (layer F.SilkS) (width 0.15))
+    (fp_line (start -3.25 2.75) (end -2.25 2.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start -2.25 2.75) (end -2.25 2.5) (layer F.SilkS) (width 0.15))
+    (fp_text user I2C0 (at -4 2.75) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user 39 (at 20.25 1 90) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user 40 (at 20.25 -1 90) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user 2 (at -20.25 -1 90) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user 1 (at -20.25 1 90) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user PWR (at -17 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user SCLK (at -13 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user RST (at -15 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user DOUT (at -7 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user FS (at -5 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user CS (at -9 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user DIN (at -11 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user D (at 5 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user F (at 7 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user J (at 11 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user H (at 9 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user DI (at 1 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user B (at 3 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user DO (at -1 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user CLK (at -3 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user SYS_DCIN (at 16 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user L (at 13 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user K (at 13 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user +5V (at 17 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user +1.8V (at 15 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user SDA (at -3 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user A/WU (at 3 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user G (at 9 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user I (at 11 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user E (at 7 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user C (at 5 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user RTS (at -11 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user TxD (at -9 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user SCL (at -5 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user RxD (at -7 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user TxD (at -15 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user RxD (at -13 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user CTS (at -17 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user GND (at 19 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user GND (at 19 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user GND (at -19 -2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
+    (fp_text user GND (at -19 2.25) (layer F.SilkS)
+      (effects (font (size 0.381 0.381) (thickness 0.0127)))
+    )
     (fp_line (start 21.5 3.25) (end -21.5 3.25) (layer F.SilkS) (width 0.3048))
     (fp_line (start -21.5 -3.25) (end 21.5 -3.25) (layer F.SilkS) (width 0.3048))
     (fp_line (start 21.5 -3.25) (end 21.5 3.25) (layer F.SilkS) (width 0.3048))
@@ -179,7 +578,7 @@
     )
     (pad 23 thru_hole circle (at 3 1) (size 1.2 1.2) (drill 0.8)
       (layers *.Cu *.Mask F.SilkS)
-      (net 9 N-000023)
+      (net 9 N-000006)
     )
     (pad 16 thru_hole circle (at -5 -1) (size 1.2 1.2) (drill 0.8)
       (layers *.Cu *.Mask F.SilkS)
@@ -263,175 +662,54 @@
     (pad 30 thru_hole circle (at 9 -1) (size 1.2 1.2) (drill 0.8)
       (layers *.Cu *.Mask F.SilkS)
     )
-  )
-
-  (module SW_PUSH_SM (layer F.Cu) (tedit 54EE0CCF) (tstamp 54F1A9C9)
-    (at 124 98 90)
-    (path /54EBBD3A)
-    (fp_text reference SW1 (at 0 -4.5 90) (layer F.SilkS)
-      (effects (font (size 1.016 1.016) (thickness 0.2032)))
-    )
-    (fp_text value SW_PUSH (at 0 1.016 90) (layer F.SilkS)
-      (effects (font (size 1.016 1.016) (thickness 0.2032)))
-    )
-    (fp_circle (center 0 0) (end 0 -2.54) (layer F.SilkS) (width 0.127))
-    (fp_line (start -3.81 -3.81) (end 3.81 -3.81) (layer F.SilkS) (width 0.127))
-    (fp_line (start 3.81 -3.81) (end 3.81 3.81) (layer F.SilkS) (width 0.127))
-    (fp_line (start 3.81 3.81) (end -3.81 3.81) (layer F.SilkS) (width 0.127))
-    (fp_line (start -3.81 -3.81) (end -3.81 3.81) (layer F.SilkS) (width 0.127))
-    (pad 1 smd rect (at 4.55 -2.25 90) (size 2.1 1.4)
-      (layers F.Cu F.Paste F.Mask)
-      (net 2 /PWR_BTN)
-    )
-    (pad 2 smd rect (at 4.55 2.25 90) (size 2.1 1.4)
-      (layers F.Cu F.Paste F.Mask)
-      (net 8 GND)
-    )
-    (pad 1 smd rect (at -4.55 -2.25 90) (size 2.1 1.4)
-      (layers F.Cu F.Paste F.Mask)
-      (net 2 /PWR_BTN)
-    )
-    (pad 2 smd rect (at -4.55 2.25 90) (size 2.1 1.4)
-      (layers F.Cu F.Paste F.Mask)
-      (net 8 GND)
+    (model pin_array/pins_array_20x2.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
     )
   )
 
-  (module SW_PUSH_SM (layer F.Cu) (tedit 54F1AAC2) (tstamp 54F1A9D6)
-    (at 136 98 90)
-    (path /54EBBD47)
-    (fp_text reference SW2 (at 0 -4.5 90) (layer F.SilkS)
-      (effects (font (size 1.016 1.016) (thickness 0.2032)))
-    )
-    (fp_text value SW_PUSH (at 0 1.016 90) (layer F.SilkS)
-      (effects (font (size 1.016 1.016) (thickness 0.2032)))
-    )
-    (fp_circle (center 0 0) (end 0 -2.54) (layer F.SilkS) (width 0.127))
-    (fp_line (start -3.81 -3.81) (end 3.81 -3.81) (layer F.SilkS) (width 0.127))
-    (fp_line (start 3.81 -3.81) (end 3.81 3.81) (layer F.SilkS) (width 0.127))
-    (fp_line (start 3.81 3.81) (end -3.81 3.81) (layer F.SilkS) (width 0.127))
-    (fp_line (start -3.81 -3.81) (end -3.81 3.81) (layer F.SilkS) (width 0.127))
-    (pad 1 smd rect (at 4.55 -2.25 90) (size 2.1 1.4)
-      (layers F.Cu F.Paste F.Mask)
-      (net 3 /RST_BTN)
-    )
-    (pad 2 smd rect (at 4.55 2.25 90) (size 2.1 1.4)
-      (layers F.Cu F.Paste F.Mask)
-      (net 8 GND)
-    )
-    (pad 1 smd rect (at -4.55 -2.25 90) (size 2.1 1.4)
-      (layers F.Cu F.Paste F.Mask)
-      (net 3 /RST_BTN)
-    )
-    (pad 2 smd rect (at -4.55 2.25 90) (size 2.1 1.4)
-      (layers F.Cu F.Paste F.Mask)
-      (net 8 GND)
-    )
+  (gr_text RST (at 114.808 105.156) (layer F.SilkS)
+    (effects (font (size 0.5 0.5) (thickness 0.1)))
   )
-
-  (module CP2104_MINI (layer F.Cu) (tedit 54F10340) (tstamp 54F1AA9D)
-    (at 108.5 100.5)
-    (descr "Connecteur 5 pins")
-    (tags "CONN DEV")
-    (path /54F0A1F1)
-    (fp_text reference P2 (at -8.89 0) (layer F.SilkS)
-      (effects (font (size 1.72974 1.08712) (thickness 0.3048)))
-    )
-    (fp_text value CP2104_MINI (at 5.08 0) (layer F.SilkS) hide
-      (effects (font (size 1.524 1.016) (thickness 0.254)))
-    )
-    (fp_line (start -10.16 7.62) (end 10.16 7.62) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -10.16 5.08) (end 10.16 5.08) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -10.16 -8.89) (end 10.16 -8.89) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 5.08 7.62) (end 5.08 5.08) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 10.16 5.08) (end 10.16 7.62) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 2.54 7.62) (end 2.54 5.08) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 2.54 -6.35) (end 2.54 -8.89) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 10.16 -8.89) (end 10.16 -6.35) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 5.08 -6.35) (end 5.08 -8.89) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -7.62 -6.35) (end -7.62 -8.89) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 2.54 -8.89) (end 2.54 -6.35) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -10.16 -6.35) (end 10.16 -6.35) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -10.16 -6.35) (end -10.16 -8.89) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -10.16 7.62) (end -10.16 5.08) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 2.54 5.08) (end 2.54 7.62) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -7.62 7.62) (end -7.62 5.08) (layer F.SilkS) (width 0.3048))
-    (pad 8 thru_hole circle (at 8.89 6.35) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask F.SilkS)
-    )
-    (pad 7 thru_hole circle (at 6.35 6.35) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask F.SilkS)
-      (net 3 /RST_BTN)
-    )
-    (pad 6 thru_hole rect (at 3.81 6.35) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask F.SilkS)
-      (net 2 /PWR_BTN)
-    )
-    (pad 14 thru_hole rect (at 3.81 -7.62) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask F.SilkS)
-    )
-    (pad 15 thru_hole circle (at 6.35 -7.62) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask F.SilkS)
-    )
-    (pad 16 thru_hole circle (at 8.89 -7.62) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask F.SilkS)
-    )
-    (pad 13 thru_hole circle (at 1.27 -7.62) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask F.SilkS)
-      (net 5 /UART0_RTS_LV)
-    )
-    (pad 12 thru_hole circle (at -1.27 -7.62) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask F.SilkS)
-      (net 4 /UART0_CTS_LV)
-    )
-    (pad 11 thru_hole circle (at -3.81 -7.62) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask F.SilkS)
-      (net 7 /UART0_TXD_LV)
-    )
-    (pad 10 thru_hole circle (at -6.35 -7.62) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask F.SilkS)
-      (net 6 /UART0_RXD_LV)
-    )
-    (pad 9 thru_hole rect (at -8.89 -7.62) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask F.SilkS)
-      (net 8 GND)
-    )
-    (pad 1 thru_hole rect (at -8.89 6.35) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask F.SilkS)
-    )
-    (pad 2 thru_hole circle (at -6.35 6.35) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask F.SilkS)
-    )
-    (pad 3 thru_hole circle (at -3.81 6.35) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask F.SilkS)
-    )
-    (pad 4 thru_hole circle (at -1.27 6.35) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask F.SilkS)
-      (net 1 +1.8V)
-    )
-    (pad 5 thru_hole circle (at 1.27 6.35) (size 1.397 1.397) (drill 0.8128)
-      (layers *.Cu *.Mask F.SilkS)
-      (net 9 N-000023)
-    )
+  (gr_text PWR (at 112.522 105.156) (layer F.SilkS)
+    (effects (font (size 0.5 0.5) (thickness 0.1)))
+  )
+  (gr_text WKUP (at 109.982 105.156) (layer F.SilkS)
+    (effects (font (size 0.5 0.5) (thickness 0.1)))
+  )
+  (gr_text "+1.8V\nSENSE" (at 107.188 104.394) (layer F.SilkS)
+    (effects (font (size 0.5 0.5) (thickness 0.1)))
+  )
+  (gr_text VDD (at 102.108 105.156) (layer F.SilkS)
+    (effects (font (size 0.5 0.5) (thickness 0.1)))
+  )
+  (gr_text VIO (at 99.568 105.156) (layer F.SilkS)
+    (effects (font (size 0.5 0.5) (thickness 0.1)))
+  )
+  (gr_text RTS (at 109.728 94.742) (layer F.SilkS)
+    (effects (font (size 0.5 0.5) (thickness 0.1)))
+  )
+  (gr_text CTS (at 107.188 94.742) (layer F.SilkS)
+    (effects (font (size 0.5 0.5) (thickness 0.1)))
+  )
+  (gr_text TXD (at 104.648 94.742) (layer F.SilkS)
+    (effects (font (size 0.5 0.5) (thickness 0.1)))
+  )
+  (gr_text RXD (at 102.108 94.742) (layer F.SilkS)
+    (effects (font (size 0.5 0.5) (thickness 0.1)))
   )
-
   (gr_line (start 141 90.5) (end 141 115.5) (angle 90) (layer Edge.Cuts) (width 0.1))
   (gr_line (start 97 90.5) (end 141 90.5) (angle 90) (layer Edge.Cuts) (width 0.1))
   (gr_line (start 97 115.5) (end 97 90.5) (angle 90) (layer Edge.Cuts) (width 0.1))
-  (gr_text 2 (at 98.25 111) (layer F.SilkS)
-    (effects (font (size 0.5 0.5) (thickness 0.1)) (justify left))
-  )
-  (gr_text 1 (at 98.25 113) (layer F.SilkS)
-    (effects (font (size 0.5 0.5) (thickness 0.1)) (justify left))
-  )
   (gr_text 1 (at 97.75 107) (layer F.SilkS)
     (effects (font (size 0.5 0.5) (thickness 0.1)) (justify left))
   )
-  (gr_text "96Boards UART Adapter\nv0.1 Linaro, Ltd." (at 126 106) (layer F.SilkS)
+  (gr_text "96Boards Sonic Screwdriver\nv0.1 Linaro, Ltd." (at 122.75 106.25) (layer F.SilkS)
     (effects (font (size 0.762 0.762) (thickness 0.1)) (justify left))
   )
-  (gr_text GND (at 99.695 105.11 90) (layer F.SilkS)
-    (effects (font (size 0.5 0.5) (thickness 0.1)) (justify left))
+  (gr_text GND (at 99.568 94.742) (layer F.SilkS)
+    (effects (font (size 0.5 0.5) (thickness 0.1)))
   )
   (gr_line (start 141 122) (end 141 121.5) (angle 90) (layer Edge.Cuts) (width 0.1))
   (gr_line (start 97 115.5) (end 141 115.5) (angle 90) (layer Edge.Cuts) (width 0.1))
@@ -451,13 +729,13 @@
   (segment (start 110.66 108.5) (end 112.31 106.85) (width 0.254) (layer F.Cu) (net 2) (tstamp 54F324F3))
   (segment (start 104.5 108.5) (end 110.66 108.5) (width 0.254) (layer F.Cu) (net 2) (tstamp 54F324EE))
   (segment (start 133.75 102.55) (end 133.75 93.45) (width 0.254) (layer F.Cu) (net 3))
-  (segment (start 114.85 106.85) (end 114.85 106.65) (width 0.254) (layer F.Cu) (net 3))
   (segment (start 130.8 105.5) (end 133.75 102.55) (width 0.254) (layer F.Cu) (net 3) (tstamp 54F32552))
   (segment (start 116 105.5) (end 130.8 105.5) (width 0.254) (layer F.Cu) (net 3) (tstamp 54F3254E))
-  (segment (start 114.85 106.65) (end 116 105.5) (width 0.254) (layer F.Cu) (net 3) (tstamp 54F32542))
   (segment (start 104 111) (end 105.5 109.5) (width 0.254) (layer F.Cu) (net 3))
-  (segment (start 112.2 109.5) (end 114.85 106.85) (width 0.254) (layer F.Cu) (net 3) (tstamp 54F3253B))
   (segment (start 105.5 109.5) (end 112.2 109.5) (width 0.254) (layer F.Cu) (net 3) (tstamp 54F32536))
+  (segment (start 114.85 106.85) (end 114.85 106.65) (width 0.254) (layer F.Cu) (net 3))
+  (segment (start 114.85 106.65) (end 116 105.5) (width 0.254) (layer F.Cu) (net 3) (tstamp 54F32542))
+  (segment (start 112.2 109.5) (end 114.85 106.85) (width 0.254) (layer F.Cu) (net 3) (tstamp 54F3253B))
   (segment (start 102 113) (end 101 112) (width 0.254) (layer F.Cu) (net 4))
   (segment (start 101 112) (end 101 110.5) (width 0.254) (layer F.Cu) (net 4) (tstamp 54F32449))
   (segment (start 101 110.5) (end 103.5 108) (width 0.254) (layer F.Cu) (net 4) (tstamp 54F3244B))
@@ -492,6 +770,13 @@
   (segment (start 120.5 110) (end 121 110.5) (width 0.254) (layer B.Cu) (net 9) (tstamp 54F3276D))
   (segment (start 110.5 110) (end 120.5 110) (width 0.254) (layer B.Cu) (net 9) (tstamp 54F3276A))
   (segment (start 109.77 109.27) (end 110.5 110) (width 0.254) (layer B.Cu) (net 9) (tstamp 54F32765))
+  (segment (start 100.94958 104) (end 100.952 104) (width 0.254) (layer F.Cu) (net 10))
+  (segment (start 102.15 105.198) (end 102.15 106.85) (width 0.254) (layer F.Cu) (net 10) (tstamp 54F4C86E))
+  (segment (start 100.952 104) (end 102.15 105.198) (width 0.254) (layer F.Cu) (net 10) (tstamp 54F4C86D))
+  (segment (start 99.61 106.85) (end 99.61 104.44042) (width 0.254) (layer F.Cu) (net 11))
+  (segment (start 100.076 102.559) (end 100.5 102.135) (width 0.254) (layer F.Cu) (net 11) (tstamp 54F4C86A))
+  (segment (start 100.076 103.97442) (end 100.076 102.559) (width 0.254) (layer F.Cu) (net 11) (tstamp 54F4C869))
+  (segment (start 99.61 104.44042) (end 100.076 103.97442) (width 0.254) (layer F.Cu) (net 11) (tstamp 54F4C868))
 
   (zone (net 8) (net_name GND) (layer F.Cu) (tstamp 54EE0E99) (hatch edge 0.508)
     (connect_pads (clearance 0.508))
@@ -619,50 +904,64 @@
         (xy 102.414086 94.21373) (xy 102.90438 94.011145) (xy 103.279826 93.636353) (xy 103.420093 93.298551) (xy 103.558855 93.63438)
         (xy 103.933647 94.009826) (xy 104.423587 94.213267) (xy 104.954086 94.21373) (xy 105.44438 94.011145) (xy 105.819826 93.636353)
         (xy 105.960093 93.298551) (xy 106.098855 93.63438) (xy 106.468 94.004169) (xy 106.468 102.454369) (xy 103.054145 105.868224)
-        (xy 102.906353 105.720174) (xy 102.416413 105.516733) (xy 101.885914 105.51627) (xy 101.39562 105.718855) (xy 101.020174 106.093647)
-        (xy 100.94361 106.278033) (xy 100.94361 106.025745) (xy 100.847141 105.792271) (xy 100.668668 105.613487) (xy 100.435364 105.516611)
-        (xy 100.182745 105.51639) (xy 99.483 105.51639) (xy 99.483 94.05475) (xy 99.483 93.007) (xy 99.483 92.753)
-        (xy 99.483 91.70525) (xy 99.32425 91.5465) (xy 98.785745 91.54639) (xy 98.552271 91.642859) (xy 98.373487 91.821332)
-        (xy 98.276611 92.054636) (xy 98.27639 92.307255) (xy 98.2765 92.59425) (xy 98.43525 92.753) (xy 99.483 92.753)
-        (xy 99.483 93.007) (xy 98.43525 93.007) (xy 98.2765 93.16575) (xy 98.27639 93.452745) (xy 98.276611 93.705364)
-        (xy 98.373487 93.938668) (xy 98.552271 94.117141) (xy 98.785745 94.21361) (xy 99.32425 94.2135) (xy 99.483 94.05475)
-        (xy 99.483 105.51639) (xy 98.785745 105.51639) (xy 98.552271 105.612859) (xy 98.373487 105.791332) (xy 98.276611 106.024636)
-        (xy 98.27639 106.277255) (xy 98.27639 107.674255) (xy 98.372859 107.907729) (xy 98.551332 108.086513) (xy 98.784636 108.183389)
-        (xy 99.037255 108.18361) (xy 100.434255 108.18361) (xy 100.667729 108.087141) (xy 100.846513 107.908668) (xy 100.943389 107.675364)
-        (xy 100.94361 107.422745) (xy 100.94361 107.422272) (xy 101.018855 107.60438) (xy 101.393647 107.979826) (xy 101.883587 108.183267)
-        (xy 102.238792 108.183577) (xy 100.542008 109.880361) (xy 100.168964 109.752193) (xy 99.678587 109.782518) (xy 99.366383 109.911836)
-        (xy 99.31687 110.137265) (xy 100 110.820395) (xy 100.014142 110.806252) (xy 100.193747 110.985857) (xy 100.179605 111)
-        (xy 100.193747 111.014142) (xy 100.014142 111.193747) (xy 100 111.179605) (xy 99.985857 111.193747) (xy 99.820395 111.028285)
-        (xy 99.806252 111.014142) (xy 99.820395 111) (xy 99.137265 110.31687) (xy 98.911836 110.366383) (xy 98.752193 110.831036)
-        (xy 98.782518 111.321413) (xy 98.911836 111.633617) (xy 99.137262 111.683129) (xy 99.02157 111.798822) (xy 99.071436 111.848688)
-        (xy 99.040771 111.861359) (xy 98.861987 112.039832) (xy 98.765111 112.273136) (xy 98.76489 112.525755) (xy 98.765 112.71425)
-        (xy 98.92375 112.873) (xy 99.873 112.873) (xy 99.873 112.853) (xy 100.127 112.853) (xy 100.127 112.873)
-        (xy 100.147 112.873) (xy 100.147 113.127) (xy 100.127 113.127) (xy 100.127 114.07625) (xy 100.28575 114.235)
-        (xy 100.725755 114.23511) (xy 100.959229 114.138641) (xy 101.138013 113.960168) (xy 101.160177 113.906789) (xy 101.299515 114.046371)
-        (xy 101.753266 114.234785) (xy 102.244579 114.235214) (xy 102.698657 114.047592) (xy 103.000221 113.746554) (xy 103.299515 114.046371)
-        (xy 103.753266 114.234785) (xy 104.244579 114.235214) (xy 104.698657 114.047592) (xy 105.000221 113.746554) (xy 105.299515 114.046371)
-        (xy 105.753266 114.234785) (xy 106.244579 114.235214) (xy 106.698657 114.047592) (xy 107.000221 113.746554) (xy 107.299515 114.046371)
-        (xy 107.753266 114.234785) (xy 108.244579 114.235214) (xy 108.698657 114.047592) (xy 109.000221 113.746554) (xy 109.299515 114.046371)
-        (xy 109.753266 114.234785) (xy 110.244579 114.235214) (xy 110.698657 114.047592) (xy 111.000221 113.746554) (xy 111.299515 114.046371)
-        (xy 111.753266 114.234785) (xy 112.244579 114.235214) (xy 112.698657 114.047592) (xy 113.000221 113.746554) (xy 113.299515 114.046371)
-        (xy 113.753266 114.234785) (xy 114.244579 114.235214) (xy 114.698657 114.047592) (xy 115.000221 113.746554) (xy 115.299515 114.046371)
-        (xy 115.753266 114.234785) (xy 116.244579 114.235214) (xy 116.698657 114.047592) (xy 117.000221 113.746554) (xy 117.299515 114.046371)
-        (xy 117.753266 114.234785) (xy 118.244579 114.235214) (xy 118.698657 114.047592) (xy 119.000221 113.746554) (xy 119.299515 114.046371)
-        (xy 119.753266 114.234785) (xy 120.244579 114.235214) (xy 120.698657 114.047592) (xy 121.000221 113.746554) (xy 121.299515 114.046371)
-        (xy 121.753266 114.234785) (xy 122.244579 114.235214) (xy 122.698657 114.047592) (xy 123.000221 113.746554) (xy 123.299515 114.046371)
-        (xy 123.753266 114.234785) (xy 124.244579 114.235214) (xy 124.698657 114.047592) (xy 125.000221 113.746554) (xy 125.299515 114.046371)
-        (xy 125.753266 114.234785) (xy 126.244579 114.235214) (xy 126.698657 114.047592) (xy 127.000221 113.746554) (xy 127.299515 114.046371)
-        (xy 127.753266 114.234785) (xy 128.244579 114.235214) (xy 128.698657 114.047592) (xy 129.000221 113.746554) (xy 129.299515 114.046371)
-        (xy 129.753266 114.234785) (xy 130.244579 114.235214) (xy 130.698657 114.047592) (xy 131.000221 113.746554) (xy 131.299515 114.046371)
-        (xy 131.753266 114.234785) (xy 132.244579 114.235214) (xy 132.698657 114.047592) (xy 133.000221 113.746554) (xy 133.299515 114.046371)
-        (xy 133.753266 114.234785) (xy 134.244579 114.235214) (xy 134.698657 114.047592) (xy 135.000221 113.746554) (xy 135.299515 114.046371)
-        (xy 135.753266 114.234785) (xy 136.244579 114.235214) (xy 136.698657 114.047592) (xy 137.046371 113.700485) (xy 137.060571 113.666285)
-        (xy 137.137265 113.68313) (xy 137.820395 113) (xy 137.820395 113.35921) (xy 137.31687 113.862735) (xy 137.366383 114.088164)
-        (xy 137.831036 114.247807) (xy 138.321413 114.217482) (xy 138.633617 114.088164) (xy 138.68313 113.862735) (xy 138.68313 114.815)
-        (xy 99.873 114.815) (xy 99.873 114.07625) (xy 99.873 113.127) (xy 98.92375 113.127) (xy 98.765 113.28575)
-        (xy 98.76489 113.474245) (xy 98.765111 113.726864) (xy 98.861987 113.960168) (xy 99.040771 114.138641) (xy 99.274245 114.23511)
-        (xy 99.71425 114.235) (xy 99.873 114.07625) (xy 99.873 114.815) (xy 97.685 114.815) (xy 97.685 91.185)
-        (xy 140.315 91.185) (xy 140.315 114.815)
+        (xy 102.912 105.72583) (xy 102.912 105.198) (xy 102.911999 105.197999) (xy 102.853996 104.906395) (xy 102.688815 104.659185)
+        (xy 102.688815 104.659184) (xy 101.78408 103.754449) (xy 101.78408 103.574525) (xy 101.687611 103.341051) (xy 101.509138 103.162267)
+        (xy 101.448642 103.137147) (xy 101.469229 103.128641) (xy 101.648013 102.950168) (xy 101.744889 102.716864) (xy 101.74511 102.464245)
+        (xy 101.74511 101.554245) (xy 101.74511 99.445755) (xy 101.74511 98.284245) (xy 101.648641 98.050771) (xy 101.470168 97.871987)
+        (xy 101.236864 97.775111) (xy 100.984245 97.77489) (xy 100.78575 97.775) (xy 100.627 97.93375) (xy 100.627 98.738)
+        (xy 101.58625 98.738) (xy 101.745 98.57925) (xy 101.74511 98.284245) (xy 101.74511 99.445755) (xy 101.745 99.15075)
+        (xy 101.58625 98.992) (xy 100.627 98.992) (xy 100.627 99.79625) (xy 100.78575 99.955) (xy 100.984245 99.95511)
+        (xy 101.236864 99.954889) (xy 101.470168 99.858013) (xy 101.648641 99.679229) (xy 101.74511 99.445755) (xy 101.74511 101.554245)
+        (xy 101.648641 101.320771) (xy 101.470168 101.141987) (xy 101.236864 101.045111) (xy 100.984245 101.04489) (xy 100.373 101.04489)
+        (xy 100.373 99.79625) (xy 100.373 98.992) (xy 100.373 98.738) (xy 100.373 97.93375) (xy 100.21425 97.775)
+        (xy 100.015755 97.77489) (xy 99.763136 97.775111) (xy 99.529832 97.871987) (xy 99.483 97.9189) (xy 99.483 94.05475)
+        (xy 99.483 93.007) (xy 99.483 92.753) (xy 99.483 91.70525) (xy 99.32425 91.5465) (xy 98.785745 91.54639)
+        (xy 98.552271 91.642859) (xy 98.373487 91.821332) (xy 98.276611 92.054636) (xy 98.27639 92.307255) (xy 98.2765 92.59425)
+        (xy 98.43525 92.753) (xy 99.483 92.753) (xy 99.483 93.007) (xy 98.43525 93.007) (xy 98.2765 93.16575)
+        (xy 98.27639 93.452745) (xy 98.276611 93.705364) (xy 98.373487 93.938668) (xy 98.552271 94.117141) (xy 98.785745 94.21361)
+        (xy 99.32425 94.2135) (xy 99.483 94.05475) (xy 99.483 97.9189) (xy 99.351359 98.050771) (xy 99.25489 98.284245)
+        (xy 99.255 98.57925) (xy 99.41375 98.738) (xy 100.373 98.738) (xy 100.373 98.992) (xy 99.41375 98.992)
+        (xy 99.255 99.15075) (xy 99.25489 99.445755) (xy 99.351359 99.679229) (xy 99.529832 99.858013) (xy 99.763136 99.954889)
+        (xy 100.015755 99.95511) (xy 100.21425 99.955) (xy 100.373 99.79625) (xy 100.373 101.04489) (xy 99.764245 101.04489)
+        (xy 99.530771 101.141359) (xy 99.351987 101.319832) (xy 99.255111 101.553136) (xy 99.25489 101.805755) (xy 99.25489 102.715755)
+        (xy 99.314 102.858812) (xy 99.314 103.33913) (xy 99.313017 103.340112) (xy 99.216141 103.573416) (xy 99.21598 103.756809)
+        (xy 99.071185 103.901605) (xy 98.906004 104.148815) (xy 98.848 104.44042) (xy 98.848 105.51639) (xy 98.785745 105.51639)
+        (xy 98.552271 105.612859) (xy 98.373487 105.791332) (xy 98.276611 106.024636) (xy 98.27639 106.277255) (xy 98.27639 107.674255)
+        (xy 98.372859 107.907729) (xy 98.551332 108.086513) (xy 98.784636 108.183389) (xy 99.037255 108.18361) (xy 100.434255 108.18361)
+        (xy 100.667729 108.087141) (xy 100.846513 107.908668) (xy 100.943389 107.675364) (xy 100.94361 107.422745) (xy 100.94361 107.422272)
+        (xy 101.018855 107.60438) (xy 101.393647 107.979826) (xy 101.883587 108.183267) (xy 102.238792 108.183577) (xy 100.542008 109.880361)
+        (xy 100.168964 109.752193) (xy 99.678587 109.782518) (xy 99.366383 109.911836) (xy 99.31687 110.137265) (xy 100 110.820395)
+        (xy 100.014142 110.806252) (xy 100.193747 110.985857) (xy 100.179605 111) (xy 100.193747 111.014142) (xy 100.014142 111.193747)
+        (xy 100 111.179605) (xy 99.985857 111.193747) (xy 99.820395 111.028285) (xy 99.806252 111.014142) (xy 99.820395 111)
+        (xy 99.137265 110.31687) (xy 98.911836 110.366383) (xy 98.752193 110.831036) (xy 98.782518 111.321413) (xy 98.911836 111.633617)
+        (xy 99.137262 111.683129) (xy 99.02157 111.798822) (xy 99.071436 111.848688) (xy 99.040771 111.861359) (xy 98.861987 112.039832)
+        (xy 98.765111 112.273136) (xy 98.76489 112.525755) (xy 98.765 112.71425) (xy 98.92375 112.873) (xy 99.873 112.873)
+        (xy 99.873 112.853) (xy 100.127 112.853) (xy 100.127 112.873) (xy 100.147 112.873) (xy 100.147 113.127)
+        (xy 100.127 113.127) (xy 100.127 114.07625) (xy 100.28575 114.235) (xy 100.725755 114.23511) (xy 100.959229 114.138641)
+        (xy 101.138013 113.960168) (xy 101.160177 113.906789) (xy 101.299515 114.046371) (xy 101.753266 114.234785) (xy 102.244579 114.235214)
+        (xy 102.698657 114.047592) (xy 103.000221 113.746554) (xy 103.299515 114.046371) (xy 103.753266 114.234785) (xy 104.244579 114.235214)
+        (xy 104.698657 114.047592) (xy 105.000221 113.746554) (xy 105.299515 114.046371) (xy 105.753266 114.234785) (xy 106.244579 114.235214)
+        (xy 106.698657 114.047592) (xy 107.000221 113.746554) (xy 107.299515 114.046371) (xy 107.753266 114.234785) (xy 108.244579 114.235214)
+        (xy 108.698657 114.047592) (xy 109.000221 113.746554) (xy 109.299515 114.046371) (xy 109.753266 114.234785) (xy 110.244579 114.235214)
+        (xy 110.698657 114.047592) (xy 111.000221 113.746554) (xy 111.299515 114.046371) (xy 111.753266 114.234785) (xy 112.244579 114.235214)
+        (xy 112.698657 114.047592) (xy 113.000221 113.746554) (xy 113.299515 114.046371) (xy 113.753266 114.234785) (xy 114.244579 114.235214)
+        (xy 114.698657 114.047592) (xy 115.000221 113.746554) (xy 115.299515 114.046371) (xy 115.753266 114.234785) (xy 116.244579 114.235214)
+        (xy 116.698657 114.047592) (xy 117.000221 113.746554) (xy 117.299515 114.046371) (xy 117.753266 114.234785) (xy 118.244579 114.235214)
+        (xy 118.698657 114.047592) (xy 119.000221 113.746554) (xy 119.299515 114.046371) (xy 119.753266 114.234785) (xy 120.244579 114.235214)
+        (xy 120.698657 114.047592) (xy 121.000221 113.746554) (xy 121.299515 114.046371) (xy 121.753266 114.234785) (xy 122.244579 114.235214)
+        (xy 122.698657 114.047592) (xy 123.000221 113.746554) (xy 123.299515 114.046371) (xy 123.753266 114.234785) (xy 124.244579 114.235214)
+        (xy 124.698657 114.047592) (xy 125.000221 113.746554) (xy 125.299515 114.046371) (xy 125.753266 114.234785) (xy 126.244579 114.235214)
+        (xy 126.698657 114.047592) (xy 127.000221 113.746554) (xy 127.299515 114.046371) (xy 127.753266 114.234785) (xy 128.244579 114.235214)
+        (xy 128.698657 114.047592) (xy 129.000221 113.746554) (xy 129.299515 114.046371) (xy 129.753266 114.234785) (xy 130.244579 114.235214)
+        (xy 130.698657 114.047592) (xy 131.000221 113.746554) (xy 131.299515 114.046371) (xy 131.753266 114.234785) (xy 132.244579 114.235214)
+        (xy 132.698657 114.047592) (xy 133.000221 113.746554) (xy 133.299515 114.046371) (xy 133.753266 114.234785) (xy 134.244579 114.235214)
+        (xy 134.698657 114.047592) (xy 135.000221 113.746554) (xy 135.299515 114.046371) (xy 135.753266 114.234785) (xy 136.244579 114.235214)
+        (xy 136.698657 114.047592) (xy 137.046371 113.700485) (xy 137.060571 113.666285) (xy 137.137265 113.68313) (xy 137.820395 113)
+        (xy 137.820395 113.35921) (xy 137.31687 113.862735) (xy 137.366383 114.088164) (xy 137.831036 114.247807) (xy 138.321413 114.217482)
+        (xy 138.633617 114.088164) (xy 138.68313 113.862735) (xy 138.68313 114.815) (xy 99.873 114.815) (xy 99.873 114.07625)
+        (xy 99.873 113.127) (xy 98.92375 113.127) (xy 98.765 113.28575) (xy 98.76489 113.474245) (xy 98.765111 113.726864)
+        (xy 98.861987 113.960168) (xy 99.040771 114.138641) (xy 99.274245 114.23511) (xy 99.71425 114.235) (xy 99.873 114.07625)
+        (xy 99.873 114.815) (xy 97.685 114.815) (xy 97.685 91.185) (xy 140.315 91.185) (xy 140.315 114.815)
       )
     )
   )
diff --git a/96boards-uart.lib b/96boards-uart.lib
index 6ac6e0e..9872162 100644
--- a/96boards-uart.lib
+++ b/96boards-uart.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Mon 02 Mar 2015 11:34:09 GMT
+EESchema-LIBRARY Version 2.3  Date: Mon 02 Mar 2015 13:18:31 GMT
 #encoding utf-8
 #
 # 96BOARD_LS_EXPANSION
@@ -81,4 +81,18 @@ X SUSPEND 16 800 -500 300 L 60 60 1 1 P I
 ENDDRAW
 ENDDEF
 #
+# VIO
+#
+DEF VIO #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
+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
+C 0 60 20 0 1 0 N
+P 3 0 1 0  0 0  0 40  0 40 N
+ENDDRAW
+ENDDEF
+#
 #End Library
diff --git a/96boards-uart.mod b/96boards-uart.mod
index ef1696c..40cce0a 100644
--- a/96boards-uart.mod
+++ b/96boards-uart.mod
@@ -1,12 +1,401 @@
-PCBNEW-LibModule-V1  Fri 27 Feb 2015 23:55:00 GMT
+PCBNEW-LibModule-V1  Mon 02 Mar 2015 22:23:13 GMT
 # encoding utf-8
 Units mm
 $INDEX
+96BOARDS_LV_EXPANSION
 CP2104_MINI
 PIN_ARRAY_2MM_20X2
 SIL2MM-8
+SOD-123
 SW_PUSH_SM
 $EndINDEX
+$MODULE 96BOARDS_LV_EXPANSION
+Po 0 0 0 15 54F4E2C7 00000000 ~~
+Li 96BOARDS_LV_EXPANSION
+Cd Double rangee de contacts 2 x 12 pins
+Kw CONN
+Sc 0
+AR /54E6538C
+Op 0 0 0
+T0 0 -3.81 1.016 1.016 0 0.254 N V 21 N "P?"
+T1 0 3.81 1.016 1.016 0 0.2032 N V 21 N "96BOARDS_LV_EXPANSION"
+DS 14.25 -2.5 14.25 -2.75 0.15 21
+DS 14.25 -2.75 17.75 -2.75 0.15 21
+DS 17.75 -2.75 17.75 -2.5 0.15 21
+DS 13.75 -2.5 13.75 -2.75 0.15 21
+DS 2.25 -2.5 2.25 -2.75 0.15 21
+T2 8 -2.75 0.381 0.381 0 0.0127 N V 21 N "GPIO"
+DS 7.25 -2.75 2.25 -2.75 0.15 21
+DS 8.75 -2.75 13.75 -2.75 0.15 21
+DS 8.75 2.75 13.75 2.75 0.15 21
+DS 13.75 2.75 13.75 2.5 0.15 21
+DS 7.25 2.75 2.25 2.75 0.15 21
+DS 2.25 2.75 2.25 2.5 0.15 21
+T2 8 2.75 0.381 0.381 0 0.0127 N V 21 N "GPIO"
+T2 -1 2.25 0.381 0.381 0 0.0127 N V 21 N "SCL"
+T2 1 2.25 0.381 0.381 0 0.0127 N V 21 N "SDA"
+T2 0 2.75 0.381 0.381 0 0.0127 N V 21 N "I2C1"
+DS 1.75 2.75 1.75 2.5 0.15 21
+DS 0.75 2.75 1.75 2.75 0.15 21
+DS -1.75 2.75 -1.75 2.5 0.15 21
+DS -0.75 2.75 -1.75 2.75 0.15 21
+T2 -2 -2.75 0.381 0.381 0 0.0127 N V 21 N "PCM"
+DS -5.75 -2.75 -5.75 -2.5 0.15 21
+DS -2.75 -2.75 -5.75 -2.75 0.15 21
+DS 1.75 -2.75 1.75 -2.5 0.15 21
+DS -1.25 -2.75 1.75 -2.75 0.15 21
+DS -9.25 -2.75 -6.25 -2.75 0.15 21
+DS -6.25 -2.75 -6.25 -2.5 0.15 21
+DS -10.75 -2.75 -13.75 -2.75 0.15 21
+DS -13.75 -2.75 -13.75 -2.5 0.15 21
+T2 -10 -2.75 0.381 0.381 0 0.0127 N V 21 N "SPI0"
+DS -13 2.75 -10.25 2.75 0.15 21
+DS -10.25 2.75 -10.25 2.5 0.15 21
+DS -15 2.75 -17.75 2.75 0.15 21
+DS -17.75 2.75 -17.75 2.5 0.15 21
+T2 -14 2.75 0.381 0.381 0 0.0127 N V 21 N "UART0"
+DS -9.75 2.75 -9 2.75 0.15 21
+DS -6.25 2.75 -7 2.75 0.15 21
+T2 -8 2.75 0.381 0.381 0 0.0127 N V 21 N "UART1"
+DS -6.25 2.75 -6.25 2.5 0.15 21
+DS -9.75 2.75 -9.75 2.5 0.15 21
+DS -4.75 2.75 -5.75 2.75 0.15 21
+DS -5.75 2.75 -5.75 2.5 0.15 21
+DS -3.25 2.75 -2.25 2.75 0.15 21
+DS -2.25 2.75 -2.25 2.5 0.15 21
+T2 -4 2.75 0.381 0.381 0 0.0127 N V 21 N "I2C0"
+T2 20.25 1 0.381 0.381 900 0.0127 N V 21 N "39"
+T2 20.25 -1 0.381 0.381 900 0.0127 N V 21 N "40"
+T2 -20.25 -1 0.381 0.381 900 0.0127 N V 21 N "2"
+T2 -20.25 1 0.381 0.381 900 0.0127 N V 21 N "1"
+T2 -17 -2.25 0.381 0.381 0 0.0127 N V 21 N "PWR"
+T2 -13 -2.25 0.381 0.381 0 0.0127 N V 21 N "SCLK"
+T2 -15 -2.25 0.381 0.381 0 0.0127 N V 21 N "RST"
+T2 -7 -2.25 0.381 0.381 0 0.0127 N V 21 N "DOUT"
+T2 -5 -2.25 0.381 0.381 0 0.0127 N V 21 N "FS"
+T2 -9 -2.25 0.381 0.381 0 0.0127 N V 21 N "CS"
+T2 -11 -2.25 0.381 0.381 0 0.0127 N V 21 N "DIN"
+T2 5 -2.25 0.381 0.381 0 0.0127 N V 21 N "D"
+T2 7 -2.25 0.381 0.381 0 0.0127 N V 21 N "F"
+T2 11 -2.25 0.381 0.381 0 0.0127 N V 21 N "J"
+T2 9 -2.25 0.381 0.381 0 0.0127 N V 21 N "H"
+T2 1 -2.25 0.381 0.381 0 0.0127 N V 21 N "DI"
+T2 3 -2.25 0.381 0.381 0 0.0127 N V 21 N "B"
+T2 -1 -2.25 0.381 0.381 0 0.0127 N V 21 N "DO"
+T2 -3 -2.25 0.381 0.381 0 0.0127 N V 21 N "CLK"
+T2 16 -2.25 0.381 0.381 0 0.0127 N V 21 N "SYS_DCIN"
+T2 13 -2.25 0.381 0.381 0 0.0127 N V 21 N "L"
+T2 13 2.25 0.381 0.381 0 0.0127 N V 21 N "K"
+T2 17 2.25 0.381 0.381 0 0.0127 N V 21 N "+5V"
+T2 15 2.25 0.381 0.381 0 0.0127 N V 21 N "+1.8V"
+T2 -3 2.25 0.381 0.381 0 0.0127 N V 21 N "SDA"
+T2 3 2.25 0.381 0.381 0 0.0127 N V 21 N "A/WU"
+T2 9 2.25 0.381 0.381 0 0.0127 N V 21 N "G"
+T2 11 2.25 0.381 0.381 0 0.0127 N V 21 N "I"
+T2 7 2.25 0.381 0.381 0 0.0127 N V 21 N "E"
+T2 5 2.25 0.381 0.381 0 0.0127 N V 21 N "C"
+T2 -11 2.25 0.381 0.381 0 0.0127 N V 21 N "RTS"
+T2 -9 2.25 0.381 0.381 0 0.0127 N V 21 N "TxD"
+T2 -5 2.25 0.381 0.381 0 0.0127 N V 21 N "SCL"
+T2 -7 2.25 0.381 0.381 0 0.0127 N V 21 N "RxD"
+T2 -15 2.25 0.381 0.381 0 0.0127 N V 21 N "TxD"
+T2 -13 2.25 0.381 0.381 0 0.0127 N V 21 N "RxD"
+T2 -17 2.25 0.381 0.381 0 0.0127 N V 21 N "CTS"
+T2 19 2.25 0.381 0.381 0 0.0127 N V 21 N "GND"
+T2 19 -2.25 0.381 0.381 0 0.0127 N V 21 N "GND"
+T2 -19 -2.25 0.381 0.381 0 0.0127 N V 21 N "GND"
+T2 -19 2.25 0.381 0.381 0 0.0127 N V 21 N "GND"
+DS 21.5 3.25 -21.5 3.25 0.3048 21
+DS -21.5 -3.25 21.5 -3.25 0.3048 21
+DS 21.5 -3.25 21.5 3.25 0.3048 21
+DS -21.5 -3.25 -21.5 3.25 0.3048 21
+$PAD
+Sh "1" R 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -19 1
+$EndPAD
+$PAD
+Sh "2" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -19 -1
+$EndPAD
+$PAD
+Sh "11" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -9 1
+$EndPAD
+$PAD
+Sh "4" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -17 -1
+$EndPAD
+$PAD
+Sh "13" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -7 1
+$EndPAD
+$PAD
+Sh "6" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -15 -1
+$EndPAD
+$PAD
+Sh "15" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -5 1
+$EndPAD
+$PAD
+Sh "8" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -13 -1
+$EndPAD
+$PAD
+Sh "17" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -3 1
+$EndPAD
+$PAD
+Sh "10" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -11 -1
+$EndPAD
+$PAD
+Sh "19" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -1 1
+$EndPAD
+$PAD
+Sh "12" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -9 -1
+$EndPAD
+$PAD
+Sh "21" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 1 1
+$EndPAD
+$PAD
+Sh "14" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -7 -1
+$EndPAD
+$PAD
+Sh "23" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 3 1
+$EndPAD
+$PAD
+Sh "16" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -5 -1
+$EndPAD
+$PAD
+Sh "25" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 5 1
+$EndPAD
+$PAD
+Sh "18" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -3 -1
+$EndPAD
+$PAD
+Sh "27" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 7 1
+$EndPAD
+$PAD
+Sh "20" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -1 -1
+$EndPAD
+$PAD
+Sh "29" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 9 1
+$EndPAD
+$PAD
+Sh "22" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 1 -1
+$EndPAD
+$PAD
+Sh "31" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 11 1
+$EndPAD
+$PAD
+Sh "24" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 3 -1
+$EndPAD
+$PAD
+Sh "26" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 5 -1
+$EndPAD
+$PAD
+Sh "33" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 13 1
+$EndPAD
+$PAD
+Sh "28" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 7 -1
+$EndPAD
+$PAD
+Sh "32" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 11 -1
+$EndPAD
+$PAD
+Sh "34" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 13 -1
+$EndPAD
+$PAD
+Sh "36" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 15 -1
+$EndPAD
+$PAD
+Sh "38" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 17 -1
+$EndPAD
+$PAD
+Sh "35" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 15 1
+$EndPAD
+$PAD
+Sh "37" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 17 1
+$EndPAD
+$PAD
+Sh "3" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -17 1
+$EndPAD
+$PAD
+Sh "5" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -15 1
+$EndPAD
+$PAD
+Sh "7" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -13 1
+$EndPAD
+$PAD
+Sh "9" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -11 1
+$EndPAD
+$PAD
+Sh "39" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 19 1
+$EndPAD
+$PAD
+Sh "40" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 19 -1
+$EndPAD
+$PAD
+Sh "30" C 1.2 1.2 0 0 0
+Dr 0.8 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 9 -1
+$EndPAD
+$SHAPE3D
+Na "pin_array/pins_array_20x2.wrl"
+Sc 1 1 1
+Of 0 0 0
+Ro 0 0 0
+$EndSHAPE3D
+$EndMODULE 96BOARDS_LV_EXPANSION
 $MODULE CP2104_MINI
 Po 0 0 0 15 54F10340 00000000 ~~
 Li CP2104_MINI
@@ -519,6 +908,34 @@ Ne 1 "GND"
 Po 7 0
 $EndPAD
 $EndMODULE SIL2MM-8
+$MODULE SOD-123
+Po 0 0 0 15 54F46008 00000000 ~~
+Li SOD-123
+Sc 0
+AR 
+Op 0 0 0
+T0 0 -1.27 0.5 0.5 0 0.125 N V 21 N "SOD-123"
+T1 0 1.27 0.5 0.5 0 0.125 N V 21 N "VAL**"
+DS -0.635 -1.27 -0.635 1.27 0.15 21
+DS -1.27 -1.27 1.27 -1.27 0.15 21
+DS 1.27 -1.27 1.27 1.27 0.15 21
+DS 1.27 1.27 -1.27 1.27 0.15 21
+DS -1.27 1.27 -1.27 -1.27 0.15 21
+$PAD
+Sh "1" R 0.91 1.22 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -1.635 0
+$EndPAD
+$PAD
+Sh "2" R 0.91 1.22 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 1.635 0
+$EndPAD
+$EndMODULE SOD-123
 $MODULE SW_PUSH_SM
 Po 0 0 0 15 54EE0CCF 00000000 ~~
 Li SW_PUSH_SM
diff --git a/96boards-uart.net b/96boards-uart.net
index 61f69c1..6c061db 100644
--- a/96boards-uart.net
+++ b/96boards-uart.net
@@ -1,4 +1,4 @@
-# EESchema Netlist Version 1.1 created  Mon 02 Mar 2015 10:31:51 GMT
+# EESchema Netlist Version 1.1 created  Mon 02 Mar 2015 13:19:42 GMT
 (
  ( /54EBBD3A $noname  SW1 SW_PUSH {Lib=SW_PUSH}
   (    1 /PWR_BTN )
@@ -9,11 +9,11 @@
   (    2 GND )
  )
  ( /54F0A1F1 CP2104_MINI  P2 CP2104_MINI {Lib=CP2104_MINI}
-  (    1 N-000025 )
-  (    2 N-000026 )
+  (    1 VIO )
+  (    2 VDD )
   (    3 ? )
   (    4 +1.8V )
-  (    5 N-000024 )
+  (    5 N-000006 )
   (    6 /PWR_BTN )
   (    7 /RST_BTN )
   (    8 ? )
@@ -49,7 +49,7 @@
   (   20 ? )
   (   21 ? )
   (   22 ? )
-  (   23 N-000024 )
+  (   23 N-000006 )
   (   24 ? )
   (   25 ? )
   (   26 ? )
@@ -68,13 +68,13 @@
   (   39 GND )
   (   40 GND )
  )
- ( /54F37856 SOD-123  D1 ZENER {Lib=ZENER}
+ ( /54F37856 SOD-123  D1 MMSZ4678T1G {Lib=ZENER}
   (    1 GND )
-  (    2 N-000025 )
+  (    2 VIO )
  )
- ( /54F378F7 $noname  R1 R {Lib=R}
-  (    1 N-000025 )
-  (    2 N-000026 )
+ ( /54F378F7 $noname  R1 10K {Lib=R}
+  (    1 VIO )
+  (    2 VDD )
  )
 )
 *
@@ -94,47 +94,47 @@ $endlist
 $endfootprintlist
 }
 { Pin List by Nets
-Net 22 "GND" "GND"
- D1 1
+Net 1 "VDD" "VDD"
+ P2 2
+ R1 2
+Net 2 "GND" "GND"
+ P1 2
+ P1 1
+ P2 9
  SW2 2
  SW1 2
  P1 39
+ D1 1
  P1 40
- P2 9
- P1 1
- P1 2
-Net 23 "/UART0_CTS_LV" "UART0_CTS_LV"
+Net 3 "VIO" "VIO"
+ D1 2
+ R1 1
+ P2 1
+Net 4 "+1.8V" "+1.8V"
+ P2 4
+ P1 35
+Net 5 "/UART0_CTS_LV" "UART0_CTS_LV"
  P1 3
  P2 12
-Net 24 "" ""
- P1 23
+Net 6 "" ""
  P2 5
-Net 25 "" ""
- R1 1
- P2 1
- D1 2
-Net 26 "" ""
- P2 2
- R1 2
-Net 38 "/RST_BTN" "RST_BTN"
- P1 6
- SW2 1
- P2 7
-Net 39 "/PWR_BTN" "PWR_BTN"
- P1 4
- P2 6
- SW1 1
-Net 40 "/UART0_TXD_LV" "UART0_TXD_LV"
+ P1 23
+Net 12 "/UART0_TXD_LV" "UART0_TXD_LV"
  P2 11
  P1 5
-Net 41 "/UART0_RXD_LV" "UART0_RXD_LV"
- P2 10
+Net 13 "/UART0_RXD_LV" "UART0_RXD_LV"
  P1 7
-Net 42 "+1.8V" "+1.8V"
- P1 35
- P2 4
-Net 43 "/UART0_RTS_LV" "UART0_RTS_LV"
+ P2 10
+Net 14 "/UART0_RTS_LV" "UART0_RTS_LV"
  P1 9
  P2 13
+Net 15 "/PWR_BTN" "PWR_BTN"
+ P2 6
+ P1 4
+ SW1 1
+Net 16 "/RST_BTN" "RST_BTN"
+ P1 6
+ SW2 1
+ P2 7
 }
 #End
diff --git a/96boards-uart.sch b/96boards-uart.sch
index 695c929..80d5e0a 100644
--- a/96boards-uart.sch
+++ b/96boards-uart.sch
@@ -47,88 +47,57 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR4
+L GND #PWR01
 U 1 1 54E654DB
 P 4900 3200
-F 0 "#PWR4" H 4900 3200 30  0001 C CNN
+F 0 "#PWR01" H 4900 3200 30  0001 C CNN
 F 1 "GND" H 4900 3130 30  0001 C CNN
 F 2 "" H 4900 3200 60  0000 C CNN
 F 3 "" H 4900 3200 60  0000 C CNN
 	1    4900 3200
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	2100 3300 1500 3300
 Text Label 1400 3500 0    60   ~ 0
 UART0_TXD_LV
 Text Label 1400 3600 0    60   ~ 0
 UART0_RXD_LV
 $Comp
-L +1.8V #PWR1
+L +1.8V #PWR02
 U 1 1 54E79659
 P 1300 4850
-F 0 "#PWR1" H 1300 4990 20  0001 C CNN
+F 0 "#PWR02" H 1300 4990 20  0001 C CNN
 F 1 "+1.8V" H 1300 4960 30  0000 C CNN
 F 2 "" H 1300 4850 60  0000 C CNN
 F 3 "" H 1300 4850 60  0000 C CNN
 	1    1300 4850
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	1300 4850 1300 5000
-Wire Wire Line
-	1300 5000 2100 5000
-Wire Wire Line
-	1500 3300 1500 3100
-Wire Wire Line
-	1500 3100 4900 3100
-Wire Wire Line
-	4450 3300 4750 3300
 $Comp
-L GND #PWR3
+L GND #PWR03
 U 1 1 54EB8F4C
 P 4750 5450
-F 0 "#PWR3" H 4750 5450 30  0001 C CNN
+F 0 "#PWR03" H 4750 5450 30  0001 C CNN
 F 1 "GND" H 4750 5380 30  0001 C CNN
 F 2 "" H 4750 5450 60  0000 C CNN
 F 3 "" H 4750 5450 60  0000 C CNN
 	1    4750 5450
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	4450 5200 4750 5200
-Wire Wire Line
-	4750 5200 4750 5450
 $Comp
-L GND #PWR2
+L GND #PWR04
 U 1 1 54EB8F88
 P 1550 5450
-F 0 "#PWR2" H 1550 5450 30  0001 C CNN
+F 0 "#PWR04" H 1550 5450 30  0001 C CNN
 F 1 "GND" H 1550 5380 30  0001 C CNN
 F 2 "" H 1550 5450 60  0000 C CNN
 F 3 "" H 1550 5450 60  0000 C CNN
 	1    1550 5450
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	1550 5450 1550 5200
-Wire Wire Line
-	1550 5200 2100 5200
-Wire Wire Line
-	4900 3100 4900 3200
-Connection ~ 4750 3100
-Wire Wire Line
-	4750 3300 4750 3100
-Wire Wire Line
-	1400 3400 2100 3400
 Text Label 1400 3400 0    60   ~ 0
 UART0_CTS_LV
 Text Label 1400 3700 0    60   ~ 0
 UART0_RTS_LV
-Wire Wire Line
-	4450 3400 5100 3400
-Wire Wire Line
-	4450 3500 5000 3500
 Text Label 4550 3400 0    60   ~ 0
 PWR_BTN
 Text Label 4550 3500 0    60   ~ 0
@@ -155,25 +124,122 @@ F 3 "~" H 6000 5750 60  0000 C CNN
 	1    6000 5750
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	5100 3400 5100 5350
-Wire Wire Line
-	5100 5350 5700 5350
-Wire Wire Line
-	5000 3500 5000 5750
-Wire Wire Line
-	5000 5750 5700 5750
 $Comp
-L GND #PWR6
+L GND #PWR05
 U 1 1 54EBBDBB
 P 6450 5950
-F 0 "#PWR6" H 6450 5950 30  0001 C CNN
+F 0 "#PWR05" H 6450 5950 30  0001 C CNN
 F 1 "GND" H 6450 5880 30  0001 C CNN
 F 2 "" H 6450 5950 60  0000 C CNN
 F 3 "" H 6450 5950 60  0000 C CNN
 	1    6450 5950
 	1    0    0    -1  
 $EndComp
+$Comp
+L GND #PWR06
+U 1 1 54EC9B62
+P 9000 3800
+F 0 "#PWR06" H 9000 3800 30  0001 C CNN
+F 1 "GND" H 9000 3730 30  0001 C CNN
+F 2 "" H 9000 3800 60  0000 C CNN
+F 3 "" H 9000 3800 60  0000 C CNN
+	1    9000 3800
+	1    0    0    -1  
+$EndComp
+$Comp
+L CP2104_MINI P2
+U 1 1 54F0A1F1
+P 7400 3850
+F 0 "P2" H 7400 4150 50  0000 C CNN
+F 1 "CP2104_MINI" H 7400 3250 50  0000 C CNN
+F 2 "CP2104_MINI" H 7400 3850 60  0000 C CNN
+F 3 "" H 7400 3850 60  0000 C CNN
+	1    7400 3850
+	1    0    0    -1  
+$EndComp
+$Comp
+L 96BOARD_LS_EXPANSION P1
+U 1 1 54F0AFFF
+P 3300 4250
+F 0 "P1" H 3300 5300 60  0000 C CNN
+F 1 "96BOARD_LS_EXPANSION" H 3300 3200 50  0000 C CNN
+F 2 "PIN_ARRAY_2MM_20X2" H 3300 4250 60  0000 C CNN
+F 3 "" H 3300 4250 60  0000 C CNN
+	1    3300 4250
+	1    0    0    -1  
+$EndComp
+$Comp
+L ZENER D1
+U 1 1 54F37856
+P 7450 3150
+F 0 "D1" H 7450 3250 50  0000 C CNN
+F 1 "MMSZ4678T1G" H 7450 3050 40  0000 C CNN
+F 2 "SOD-123" H 7450 3150 60  0000 C CNN
+F 3 "~" H 7450 3150 60  0000 C CNN
+	1    7450 3150
+	-1   0    0    1   
+$EndComp
+$Comp
+L R R1
+U 1 1 54F378F7
+P 5600 3450
+F 0 "R1" V 5680 3450 40  0000 C CNN
+F 1 "10K" V 5607 3451 40  0000 C CNN
+F 2 "~" V 5530 3450 30  0000 C CNN
+F 3 "~" H 5600 3450 30  0000 C CNN
+	1    5600 3450
+	1    0    0    -1  
+$EndComp
+$Comp
+L +1.8V #PWR07
+U 1 1 54F46275
+P 6150 3450
+F 0 "#PWR07" H 6150 3590 20  0001 C CNN
+F 1 "+1.8V" H 6150 3560 30  0000 C CNN
+F 2 "" H 6150 3450 60  0000 C CNN
+F 3 "" H 6150 3450 60  0000 C CNN
+	1    6150 3450
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2100 3300 1500 3300
+Wire Wire Line
+	1300 4850 1300 5000
+Wire Wire Line
+	1300 5000 2100 5000
+Wire Wire Line
+	1500 3300 1500 3100
+Wire Wire Line
+	1500 3100 4900 3100
+Wire Wire Line
+	4450 3300 4750 3300
+Wire Wire Line
+	4450 5200 4750 5200
+Wire Wire Line
+	4750 5200 4750 5450
+Wire Wire Line
+	1550 5450 1550 5200
+Wire Wire Line
+	1550 5200 2100 5200
+Wire Wire Line
+	4900 3100 4900 3200
+Connection ~ 4750 3100
+Wire Wire Line
+	4750 3300 4750 3100
+Wire Wire Line
+	1400 3400 2100 3400
+Wire Wire Line
+	4450 3400 5100 3400
+Wire Wire Line
+	4450 3500 5000 3500
+Wire Wire Line
+	5100 3400 5100 5350
+Wire Wire Line
+	5100 5350 5700 5350
+Wire Wire Line
+	5000 3500 5000 5750
+Wire Wire Line
+	5000 5750 5700 5750
 Wire Wire Line
 	6450 5350 6450 5950
 Wire Wire Line
@@ -187,17 +253,6 @@ Wire Wire Line
 	1200 3600 2100 3600
 Wire Wire Line
 	2100 3500 1300 3500
-$Comp
-L GND #PWR7
-U 1 1 54EC9B62
-P 9000 3800
-F 0 "#PWR7" H 9000 3800 30  0001 C CNN
-F 1 "GND" H 9000 3730 30  0001 C CNN
-F 2 "" H 9000 3800 60  0000 C CNN
-F 3 "" H 9000 3800 60  0000 C CNN
-	1    9000 3800
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	8200 3650 9000 3650
 Wire Wire Line
@@ -221,8 +276,6 @@ Wire Wire Line
 Wire Wire Line
 	1400 3400 1400 2850
 Wire Wire Line
-	1400 2850 8550 2850
-Wire Wire Line
 	8550 2850 8550 3950
 Wire Wire Line
 	8550 3950 8200 3950
@@ -234,43 +287,10 @@ Wire Wire Line
 	8850 2550 8850 4050
 Wire Wire Line
 	8850 4050 8200 4050
-$Comp
-L +1.8V #PWR5
-U 1 1 54EC9C8A
-P 6350 3550
-F 0 "#PWR5" H 6350 3690 20  0001 C CNN
-F 1 "+1.8V" H 6350 3660 30  0000 C CNN
-F 2 "" H 6350 3550 60  0000 C CNN
-F 3 "" H 6350 3550 60  0000 C CNN
-	1    6350 3550
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
-	6350 3950 6600 3950
-$Comp
-L CP2104_MINI P2
-U 1 1 54F0A1F1
-P 7400 3850
-F 0 "P2" H 7400 4150 50  0000 C CNN
-F 1 "CP2104_MINI" H 7400 3250 50  0000 C CNN
-F 2 "CP2104_MINI" H 7400 3850 60  0000 C CNN
-F 3 "" H 7400 3850 60  0000 C CNN
-	1    7400 3850
-	1    0    0    -1  
-$EndComp
+	6150 3950 6600 3950
 Wire Wire Line
-	6350 3950 6350 3550
-$Comp
-L 96BOARD_LS_EXPANSION P1
-U 1 1 54F0AFFF
-P 3300 4250
-F 0 "P1" H 3300 5300 60  0000 C CNN
-F 1 "96BOARD_LS_EXPANSION" H 3300 3200 50  0000 C CNN
-F 2 "PIN_ARRAY_2MM_20X2" H 3300 4250 60  0000 C CNN
-F 3 "" H 3300 4250 60  0000 C CNN
-	1    3300 4250
-	1    0    0    -1  
-$EndComp
+	6150 3450 6150 3950
 Wire Wire Line
 	6600 4150 5100 4150
 Connection ~ 5100 4150
@@ -287,17 +307,6 @@ Wire Wire Line
 	6000 2450 6000 4050
 Wire Wire Line
 	6000 4050 6600 4050
-$Comp
-L ZENER D1
-U 1 1 54F37856
-P 7450 3150
-F 0 "D1" H 7450 3250 50  0000 C CNN
-F 1 "MMSZ4678T1G" H 7450 3050 40  0000 C CNN
-F 2 "SOD-123" H 7450 3150 60  0000 C CNN
-F 3 "~" H 7450 3150 60  0000 C CNN
-	1    7450 3150
-	-1   0    0    1   
-$EndComp
 Wire Wire Line
 	7650 3150 8350 3150
 Wire Wire Line
@@ -309,22 +318,41 @@ Wire Wire Line
 	6550 3150 6550 3650
 Wire Wire Line
 	6550 3650 6600 3650
-$Comp
-L R R1
-U 1 1 54F378F7
-P 5600 3450
-F 0 "R1" V 5680 3450 40  0000 C CNN
-F 1 "10K" V 5607 3451 40  0000 C CNN
-F 2 "~" V 5530 3450 30  0000 C CNN
-F 3 "~" H 5600 3450 30  0000 C CNN
-	1    5600 3450
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
-	5600 3200 5600 3150
+	5600 3100 5600 3200
 Connection ~ 6550 3150
 Wire Wire Line
 	5600 3700 5600 3750
 Wire Wire Line
-	5600 3750 6600 3750
+	5350 3750 6600 3750
+Connection ~ 5600 3150
+Text Label 6150 3950 0    60   ~ 0
+1_8V_SENSE
+$Comp
+L VDD #PWR08
+U 1 1 54F463DD
+P 5350 3100
+F 0 "#PWR08" H 5350 3200 30  0001 C CNN
+F 1 "VDD" H 5350 3210 30  0000 C CNN
+F 2 "" H 5350 3100 60  0000 C CNN
+F 3 "" H 5350 3100 60  0000 C CNN
+	1    5350 3100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5350 3100 5350 3750
+Connection ~ 5600 3750
+Wire Wire Line
+	1400 2850 8550 2850
+$Comp
+L VIO #PWR09
+U 1 1 54F464F9
+P 5600 3100
+F 0 "#PWR09" H 5600 3200 30  0001 C CNN
+F 1 "VIO" H 5600 3210 30  0000 C CNN
+F 2 "" H 5600 3100 60  0000 C CNN
+F 3 "" H 5600 3100 60  0000 C CNN
+	1    5600 3100
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC