# HG changeset patch
# User Ethan Zonca <ez@ethanzonca.com>
# Date 2014-08-16 22:16:16
# Node ID 8131b90026aa7397ab99fa199a1743a3cd5c5374
# Parent  93a439e22c8ccdbef4be543c33ce0ad96a72c812

Cleaning up routing

diff --git a/archive/eagle.epf b/archive/eagle.epf
--- a/archive/eagle.epf
+++ b/archive/eagle.epf
@@ -395,12 +395,12 @@ Loc="0 0 599 399"
 State=3
 Number=2
 File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd"
-View="33.4219 0.361366 50.7353 13.2192"
-WireWidths=" 0 0.254 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064"
+View="-12.3932 -2.918 49.6435 43.154"
+WireWidths=" 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0.3048 0.254 0 0.2032"
 PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
 PadDrills=" 0.5 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8"
 ViaDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-ViaDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
+ViaDrills=" 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6 0.381"
 HoleDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
 TextSizes=" 0.254 0.3048 0.4064 0.6096 1.016 1.27 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778 0.8128"
 PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27"
@@ -411,12 +411,12 @@ DimensionExtWidths=" 0.127 0.254 0.1 0.1
 DimensionExtLengths=" 1.27 2.54 1 2 3 0"
 DimensionExtOffsets=" 1.27 2.54 1 2 3 0"
 SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635"
-WireBend=0
+WireBend=1
 WireBendSet=0
 WireCap=1
-MiterStyle=0
+MiterStyle=1
 PadShape=0
-ViaShape=0
+ViaShape=1
 PolygonPour=0
 PolygonRank=1
 PolygonThermals=1
@@ -437,11 +437,11 @@ Layer=16
 
 [Win_2]
 Type="Schematic Editor"
-Loc="0 0 599 399"
+Loc="289 36 914 756"
 State=3
 Number=1
 File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.sch"
-View="120.991 -12.2067 238.547 120.456"
+View="142.886 49.8479 190.129 103.162"
 WireWidths=" 0 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0.1524"
 PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
 PadDrills=" 0.5 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8"
@@ -480,7 +480,7 @@ ArcDirection=0
 AddLevel=2
 PadsSameType=0
 Layer=91
-Views=" 1: 120.991 -12.2067 238.547 120.456"
+Views=" 1: 142.886 49.8479 190.129 103.162"
 Sheet=1
 
 [Win_3]
diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -52,7 +52,7 @@
 <layer number="42" name="bRestrict" color="1" fill="10" visible="no" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
-<layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
@@ -191,6 +191,7 @@
 <text x="43.33875" y="7.381875" size="0.8128" layer="22" ratio="16" rot="MR270">SWD</text>
 <text x="40.16375" y="10.00125" size="0.8128" layer="21" ratio="16">pwr</text>
 <text x="40.16375" y="2.06375" size="0.8128" layer="21" ratio="16">act</text>
+<text x="46.355" y="11.43" size="0.8128" layer="1" ratio="16">LED placement?</text>
 </plain>
 <libraries>
 <library name="microbuilder">
@@ -2588,13 +2589,13 @@ design rules under a new name.</descript
 </pass>
 </autorouter>
 <elements>
-<element name="C106" library="microbuilder" package="0402" value="1.0uF" x="1.905" y="11.43" smashed="yes">
-<attribute name="NAME" x="-3.048" y="9.9695" size="0.8128" layer="25" ratio="16"/>
-<attribute name="VALUE" x="3.302" y="10.795" size="0.4064" layer="27" ratio="10"/>
+<element name="C106" library="microbuilder" package="0402" value="1.0uF" x="1.5875" y="11.43" smashed="yes">
+<attribute name="NAME" x="-3.3655" y="9.9695" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="2.9845" y="10.795" size="0.4064" layer="27" ratio="10"/>
 </element>
-<element name="C105" library="microbuilder" package="0402" value="1.0uF" x="1.905" y="9.8425" smashed="yes">
-<attribute name="NAME" x="-3.048" y="10.922" size="0.8128" layer="25" ratio="16"/>
-<attribute name="VALUE" x="3.302" y="9.2075" size="0.4064" layer="27" ratio="10"/>
+<element name="C105" library="microbuilder" package="0402" value="1.0uF" x="1.5875" y="9.8425" smashed="yes">
+<attribute name="NAME" x="-3.3655" y="10.922" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="2.9845" y="9.2075" size="0.4064" layer="27" ratio="10"/>
 </element>
 <element name="R103" library="microbuilder" package="0402" value="390K" x="1.5875" y="3.81" smashed="yes">
 <attribute name="NAME" x="-3.3655" y="3.6195" size="0.8128" layer="25" ratio="16"/>
@@ -2620,9 +2621,9 @@ design rules under a new name.</descript
 <attribute name="NAME" x="10.12875" y="6.54" size="0.8128" layer="25" font="vector"/>
 <attribute name="VALUE" x="6.43" y="9.55625" size="0.8128" layer="27" font="vector" rot="R270"/>
 </element>
-<element name="LED102" library="SparkFun-LED" package="LED-0603" value="" x="39.37" y="10.16" smashed="yes" rot="R180">
-<attribute name="NAME" x="39.116" y="10.8585" size="0.8128" layer="25" ratio="16"/>
-<attribute name="VALUE" x="38.2905" y="11.176" size="0.4064" layer="27" rot="R270"/>
+<element name="LED102" library="SparkFun-LED" package="LED-0603" value="" x="39.37" y="10.4775" smashed="yes" rot="R180">
+<attribute name="NAME" x="39.116" y="11.176" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="38.2905" y="11.4935" size="0.4064" layer="27" rot="R270"/>
 </element>
 <element name="LED101" library="SparkFun-LED" package="LED-0603" value="" x="38.25875" y="0.79375" smashed="yes" rot="R90">
 <attribute name="NAME" x="37.24275" y="1.36525" size="0.8128" layer="25" ratio="16" rot="R180"/>
@@ -2778,16 +2779,11 @@ design rules under a new name.</descript
 <wire x1="29.845" y1="9.8575" x2="30.01875" y2="9.8575" width="0.2032" layer="1"/>
 <wire x1="30.01875" y1="9.8575" x2="31.115" y2="10.95375" width="0.2032" layer="1"/>
 <via x="31.115" y="10.95375" extent="1-16" drill="0.3048"/>
-<via x="41.275" y="11.43" extent="1-16" drill="0.3048"/>
-<via x="38.1" y="10.00125" extent="1-16" drill="0.3048"/>
-<via x="42.38625" y="11.27125" extent="1-16" drill="0.3048"/>
+<via x="43.02125" y="10.31875" extent="1-16" drill="0.3048"/>
 <via x="43.18" y="2.06375" extent="1-16" drill="0.3048"/>
-<wire x1="39.37" y1="9.283" x2="38.81825" y2="9.283" width="0.2032" layer="1"/>
-<wire x1="38.81825" y1="9.283" x2="38.1" y2="10.00125" width="0.2032" layer="1"/>
-<via x="36.35375" y="0.635" extent="1-16" drill="0.3048"/>
-<wire x1="44.7675" y1="10.35" x2="42.6725" y2="10.35" width="0.2032" layer="1"/>
-<wire x1="42.6725" y1="10.35" x2="42.38625" y2="10.63625" width="0.2032" layer="1"/>
-<wire x1="42.38625" y1="10.63625" x2="42.38625" y2="11.27125" width="0.2032" layer="1"/>
+<via x="36.35375" y="0.79375" extent="1-16" drill="0.3048"/>
+<wire x1="44.7675" y1="10.35" x2="42.99" y2="10.35" width="0.2032" layer="1"/>
+<wire x1="42.99" y1="10.35" x2="43.02125" y2="10.31875" width="0.2032" layer="1"/>
 <wire x1="43.18" y1="2.06375" x2="43.97375" y2="2.06375" width="0.2032" layer="1"/>
 <wire x1="43.97375" y1="2.06375" x2="44.45" y2="2.54" width="0.2032" layer="1"/>
 <wire x1="44.45" y1="2.54" x2="44.3225" y2="2.54" width="0.2032" layer="1"/>
@@ -2819,15 +2815,8 @@ design rules under a new name.</descript
 <wire x1="14.44625" y1="10.62125" x2="14.2875" y2="10.62125" width="0.2032" layer="1"/>
 <wire x1="44.7675" y1="2.35" x2="44.64" y2="2.35" width="0.2032" layer="1"/>
 <wire x1="44.64" y1="2.35" x2="44.45" y2="2.54" width="0.2032" layer="1"/>
-<wire x1="41.275" y1="11.43" x2="40.79875" y2="10.95375" width="0.2032" layer="1"/>
-<wire x1="40.79875" y1="10.95375" x2="40.79875" y2="8.09625" width="0.2032" layer="1"/>
-<wire x1="40.79875" y1="8.09625" x2="41.245" y2="7.65" width="0.2032" layer="1"/>
-<wire x1="42.1175" y1="7.65" x2="41.245" y2="7.65" width="0.2032" layer="1"/>
 <contactref element="LCD1" pad="6"/>
-<wire x1="37.276128125" y1="8.701128125" x2="37.276128125" y2="9.177378125" width="0.2032" layer="1"/>
-<wire x1="37.276128125" y1="9.177378125" x2="38.1" y2="10.00125" width="0.2032" layer="1"/>
-<wire x1="37.38175" y1="0.79375" x2="36.5125" y2="0.79375" width="0.2032" layer="1"/>
-<wire x1="36.5125" y1="0.79375" x2="36.35375" y2="0.635" width="0.2032" layer="1"/>
+<wire x1="37.38175" y1="0.79375" x2="36.35375" y2="0.79375" width="0.2032" layer="1"/>
 <wire x1="20.305" y1="4.1275" x2="19.84375" y2="4.1275" width="0.2032" layer="1"/>
 <wire x1="19.84375" y1="4.1275" x2="17.78" y2="6.19125" width="0.2032" layer="1"/>
 <contactref element="C1" pad="2"/>
@@ -2838,13 +2827,24 @@ design rules under a new name.</descript
 <wire x1="0.9375" y1="7.14375" x2="0.9375" y2="6.0325" width="0.2032" layer="1"/>
 <wire x1="0.9375" y1="6.0325" x2="0.9375" y2="4.92125" width="0.2032" layer="1"/>
 <wire x1="0.9375" y1="4.92125" x2="0.9375" y2="3.81" width="0.2032" layer="1"/>
-<wire x1="7.73" y1="3.55625" x2="0.9375" y2="3.81" width="0" layer="19" extent="1-1"/>
+<wire x1="42.1175" y1="7.65" x2="42.1175" y2="9" width="0.2032" layer="1"/>
+<wire x1="42.1175" y1="9" x2="41.5925" y2="9.525" width="0.2032" layer="1"/>
+<via x="0.9525" y="0.79375" extent="1-16" drill="0.381"/>
+<wire x1="0.9375" y1="2.69875" x2="0.9525" y2="2.69875" width="0.2032" layer="1"/>
+<wire x1="0.9525" y1="2.69875" x2="0.9525" y2="0.79375" width="0.2032" layer="1"/>
+<wire x1="37.276128125" y1="8.701128125" x2="38.1" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="38.1" y1="9.525" x2="38.89375" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="38.89375" y1="9.525" x2="39.13575" y2="9.283" width="0.2032" layer="1"/>
+<wire x1="39.13575" y1="9.283" x2="39.37" y2="9.6005" width="0.2032" layer="1"/>
+<wire x1="39.37" y1="9.6005" x2="39.612" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="39.612" y1="9.525" x2="41.5925" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="10.31875" y1="7.77875" x2="8.335" y2="7.65" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$1">
 <contactref element="C106" pad="1"/>
-<wire x1="1.255" y1="11.43" x2="1.255" y2="10.81" width="0.2032" layer="1"/>
-<wire x1="1.255" y1="10.81" x2="1.42875" y2="10.63625" width="0.2032" layer="1"/>
-<wire x1="1.42875" y1="10.63625" x2="3.81" y2="10.63625" width="0.2032" layer="1"/>
+<wire x1="0.9375" y1="11.43" x2="0.9375" y2="10.81" width="0.2032" layer="1"/>
+<wire x1="0.9375" y1="10.81" x2="1.11125" y2="10.63625" width="0.2032" layer="1"/>
+<wire x1="1.11125" y1="10.63625" x2="3.81" y2="10.63625" width="0.2032" layer="1"/>
 <via x="3.81" y="10.63625" extent="1-16" drill="0.3048"/>
 <wire x1="3.81" y1="10.63625" x2="4.19625" y2="10.25" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="2"/>
@@ -2852,7 +2852,7 @@ design rules under a new name.</descript
 </signal>
 <signal name="N$2">
 <contactref element="C106" pad="2"/>
-<wire x1="2.555" y1="11.43" x2="3.81" y2="11.43" width="0.2032" layer="1"/>
+<wire x1="2.2375" y1="11.43" x2="3.81" y2="11.43" width="0.2032" layer="1"/>
 <via x="3.81" y="11.43" extent="1-16" drill="0.3048"/>
 <wire x1="3.81" y1="11.43" x2="4.34" y2="10.9" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="1"/>
@@ -2860,9 +2860,9 @@ design rules under a new name.</descript
 </signal>
 <signal name="N$3">
 <contactref element="C105" pad="1"/>
-<wire x1="1.255" y1="9.8425" x2="1.255" y2="9.2225" width="0.2032" layer="1"/>
-<wire x1="1.255" y1="9.2225" x2="1.42875" y2="9.04875" width="0.2032" layer="1"/>
-<wire x1="1.42875" y1="9.04875" x2="3.81" y2="9.04875" width="0.2032" layer="1"/>
+<wire x1="0.9375" y1="9.8425" x2="0.9375" y2="9.2225" width="0.2032" layer="1"/>
+<wire x1="0.9375" y1="9.2225" x2="1.11125" y2="9.04875" width="0.2032" layer="1"/>
+<wire x1="1.11125" y1="9.04875" x2="3.81" y2="9.04875" width="0.2032" layer="1"/>
 <via x="3.81" y="9.04875" extent="1-16" drill="0.3048"/>
 <wire x1="3.90875" y1="8.95" x2="3.81" y2="9.04875" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="4"/>
@@ -2870,7 +2870,7 @@ design rules under a new name.</descript
 </signal>
 <signal name="N$4">
 <contactref element="C105" pad="2"/>
-<wire x1="2.555" y1="9.8425" x2="3.81" y2="9.8425" width="0.2032" layer="1"/>
+<wire x1="2.2375" y1="9.8425" x2="3.81" y2="9.8425" width="0.2032" layer="1"/>
 <via x="3.81" y="9.8425" extent="1-16" drill="0.3048"/>
 <wire x1="4.0525" y1="9.6" x2="3.81" y2="9.8425" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="3"/>
@@ -2878,37 +2878,38 @@ design rules under a new name.</descript
 </signal>
 <signal name="N$8">
 <contactref element="R103" pad="2"/>
-<wire x1="2.2375" y1="3.81" x2="3.33375" y2="4.1275" width="0.2032" layer="1"/>
-<wire x1="3.33375" y1="4.1275" x2="3.96875" y2="3.4925" width="0.2032" layer="1"/>
+<wire x1="2.2375" y1="3.81" x2="3.65125" y2="3.81" width="0.2032" layer="1"/>
+<wire x1="3.65125" y1="3.81" x2="3.96875" y2="3.4925" width="0.2032" layer="1"/>
 <via x="3.96875" y="3.4925" extent="1-16" drill="0.3048"/>
 <wire x1="3.96875" y1="3.4925" x2="4.36125" y2="3.1" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="13"/>
 <wire x1="4.36125" y1="3.1" x2="8.335" y2="3.1" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$9">
-<wire x1="3.2512" y1="6.2738" x2="3.4925" y2="6.0325" width="0.2032" layer="1"/>
-<via x="3.4925" y="6.0325" extent="1-16" drill="0.3048"/>
+<via x="3.4925" y="6.35" extent="1-16" drill="0.3048"/>
 <wire x1="3.74125" y1="2.45" x2="3.33375" y2="2.8575" width="0.2032" layer="16"/>
 <wire x1="3.33375" y1="2.8575" x2="3.33375" y2="3.96875" width="0.2032" layer="16"/>
 <wire x1="3.33375" y1="3.96875" x2="3.81" y2="4.445" width="0.2032" layer="16"/>
-<wire x1="3.81" y1="4.445" x2="3.81" y2="5.715" width="0.2032" layer="16"/>
-<wire x1="3.81" y1="5.715" x2="3.4925" y2="6.0325" width="0.2032" layer="16"/>
+<wire x1="3.81" y1="4.445" x2="3.81" y2="6.0325" width="0.2032" layer="16"/>
+<wire x1="3.81" y1="6.0325" x2="3.4925" y2="6.35" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="14"/>
 <wire x1="3.74125" y1="2.45" x2="8.335" y2="2.45" width="0.2032" layer="16"/>
 <contactref element="C2" pad="1"/>
-<wire x1="3.2512" y1="6.2738" x2="3.10745" y2="6.2738" width="0.2032" layer="1"/>
-<wire x1="3.10745" y1="6.2738" x2="2.2375" y2="7.14375" width="0.2032" layer="1"/>
+<wire x1="3.4925" y1="6.35" x2="3.4925" y2="6.985" width="0.2032" layer="1"/>
+<wire x1="3.4925" y1="6.985" x2="3.33375" y2="7.14375" width="0.2032" layer="1"/>
+<wire x1="3.33375" y1="7.14375" x2="2.2375" y2="7.14375" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$15">
 <via x="3.175" y="4.7625" extent="1-16" drill="0.3048"/>
-<wire x1="3.5975" y1="1.8" x2="2.54" y2="2.8575" width="0.2032" layer="16"/>
-<wire x1="2.54" y1="2.8575" x2="2.54" y2="4.1275" width="0.2032" layer="16"/>
-<wire x1="2.54" y1="4.1275" x2="3.175" y2="4.7625" width="0.2032" layer="16"/>
+<wire x1="3.5975" y1="1.8" x2="2.8575" y2="2.54" width="0.2032" layer="16"/>
+<wire x1="2.8575" y1="2.54" x2="2.8575" y2="4.445" width="0.2032" layer="16"/>
+<wire x1="2.8575" y1="4.445" x2="3.175" y2="4.7625" width="0.2032" layer="16"/>
 <contactref element="LCD1" pad="15"/>
 <wire x1="3.5975" y1="1.8" x2="8.335" y2="1.8" width="0.2032" layer="16"/>
 <contactref element="C4" pad="1"/>
-<wire x1="3.175" y1="4.7625" x2="3.175" y2="5.095" width="0.2032" layer="1"/>
-<wire x1="3.175" y1="5.095" x2="2.2375" y2="6.0325" width="0.2032" layer="1"/>
+<wire x1="3.175" y1="4.7625" x2="3.175" y2="5.715" width="0.2032" layer="1"/>
+<wire x1="3.175" y1="5.715" x2="2.8575" y2="6.0325" width="0.2032" layer="1"/>
+<wire x1="2.8575" y1="6.0325" x2="2.2375" y2="6.0325" width="0.2032" layer="1"/>
 </signal>
 <signal name="3.3V">
 <contactref element="U102" pad="5"/>
@@ -2945,15 +2946,12 @@ design rules under a new name.</descript
 <wire x1="8.905" y1="10.4775" x2="9.68375" y2="10.4775" width="0.2032" layer="1"/>
 <wire x1="9.68375" y1="10.4775" x2="10.16" y2="10.00125" width="0.2032" layer="1"/>
 <wire x1="2.06375" y1="2.69875" x2="2.1825" y2="2.58" width="0.2032" layer="1"/>
-<via x="3.4925" y="7.14375" extent="1-16" drill="0.3048"/>
-<via x="3.175" y="8.41375" extent="1-16" drill="0.3048"/>
+<via x="3.175" y="8.255" extent="1-16" drill="0.3048"/>
 <wire x1="6.35" y1="7.3025" x2="6.6525" y2="7" width="0.2032" layer="16"/>
 <wire x1="1.74625" y1="5.08" x2="1.5875" y2="4.92125" width="0.2032" layer="1"/>
-<wire x1="1.5875" y1="4.92125" x2="1.5875" y2="2.8575" width="0.2032" layer="1"/>
-<wire x1="1.5875" y1="2.8575" x2="1.74625" y2="2.69875" width="0.2032" layer="1"/>
-<wire x1="1.74625" y1="2.69875" x2="2.06375" y2="2.69875" width="0.2032" layer="1"/>
+<wire x1="1.5875" y1="4.92125" x2="1.5875" y2="2.69875" width="0.2032" layer="1"/>
+<wire x1="1.5875" y1="2.69875" x2="1.5875" y2="1.74625" width="0.2032" layer="1"/>
 <wire x1="2.06375" y1="2.69875" x2="2.2375" y2="2.69875" width="0.2032" layer="1"/>
-<wire x1="3.40995" y1="7.0612" x2="3.4925" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="2.43625" y1="2.8975" x2="2.2375" y2="2.69875" width="0.2032" layer="1"/>
 <wire x1="16.8275" y1="9.525" x2="14.12875" y2="9.525" width="0.2032" layer="16"/>
 <wire x1="14.12875" y1="9.525" x2="13.6525" y2="10.00125" width="0.2032" layer="16"/>
@@ -2961,19 +2959,15 @@ design rules under a new name.</descript
 <wire x1="21.2575" y1="1.905" x2="21.2575" y2="3.01625" width="0.2032" layer="1"/>
 <wire x1="22.5425" y1="5.3699" x2="22.5425" y2="6.35" width="0.2032" layer="1"/>
 <wire x1="22.5425" y1="6.35" x2="20.6375" y2="6.35" width="0.2032" layer="1"/>
-<wire x1="20.6375" y1="6.35" x2="20.16125" y2="6.82625" width="0.2032" layer="1"/>
-<wire x1="20.16125" y1="6.82625" x2="20.16125" y2="6.985" width="0.2032" layer="1"/>
-<wire x1="20.16125" y1="6.985" x2="20.0025" y2="7.14375" width="0.2032" layer="1"/>
-<wire x1="20.0025" y1="7.14375" x2="20.0025" y2="8.5725" width="0.2032" layer="1"/>
+<wire x1="20.6375" y1="6.35" x2="20.0025" y2="6.985" width="0.2032" layer="1"/>
+<wire x1="20.0025" y1="6.985" x2="20.0025" y2="8.5725" width="0.2032" layer="1"/>
 <wire x1="20.0025" y1="8.5725" x2="18.7325" y2="9.8425" width="0.2032" layer="1"/>
 <wire x1="18.7325" y1="9.8425" x2="17.145" y2="9.8425" width="0.2032" layer="1"/>
 <wire x1="21.605" y1="4.1275" x2="21.9075" y2="4.1275" width="0.2032" layer="1"/>
 <wire x1="18.0725" y1="2.03875" x2="18.57375" y2="2.54" width="0.2032" layer="1"/>
 <wire x1="29.86" y1="8.5725" x2="29.845" y2="8.5575" width="0.2032" layer="1"/>
-<wire x1="18.57375" y1="2.54" x2="18.57375" y2="3.175" width="0.2032" layer="1"/>
-<wire x1="18.57375" y1="3.175" x2="18.7325" y2="3.33375" width="0.2032" layer="1"/>
-<wire x1="18.7325" y1="3.33375" x2="20.94" y2="3.33375" width="0.2032" layer="1"/>
-<wire x1="20.94" y1="3.33375" x2="21.2575" y2="3.01625" width="0.2032" layer="1"/>
+<wire x1="18.57375" y1="2.54" x2="18.57375" y2="2.8847375" width="0.2032" layer="1"/>
+<wire x1="18.57375" y1="2.8847375" x2="19.0227625" y2="3.33375" width="0.2032" layer="1"/>
 <wire x1="21.605" y1="4.1275" x2="21.605" y2="3.98375" width="0.2032" layer="1"/>
 <wire x1="21.605" y1="3.98375" x2="21.43125" y2="3.81" width="0.2032" layer="1"/>
 <wire x1="21.43125" y1="3.81" x2="21.43125" y2="3.19" width="0.2032" layer="1"/>
@@ -2981,12 +2975,10 @@ design rules under a new name.</descript
 <wire x1="24.4475" y1="7.9375" x2="29.225" y2="7.9375" width="0.2032" layer="1"/>
 <wire x1="29.225" y1="7.9375" x2="29.845" y2="8.5575" width="0.2032" layer="1"/>
 <wire x1="6.35" y1="7.3025" x2="3.65125" y2="7.3025" width="0.2032" layer="16"/>
-<wire x1="3.65125" y1="7.3025" x2="3.4925" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="10.115" y1="8.3" x2="10.16" y2="8.255" width="0.2032" layer="16"/>
 <wire x1="16.8275" y1="9.525" x2="17.145" y2="9.8425" width="0.2032" layer="16"/>
 <wire x1="16.1775" y1="8.73125" x2="16.1775" y2="8.875" width="0.2032" layer="1"/>
 <wire x1="16.1775" y1="8.73125" x2="16.0025" y2="8.55625" width="0.2032" layer="1"/>
-<wire x1="3.175" y1="8.41375" x2="3.33375" y2="8.1153" width="0" layer="19" extent="1-16"/>
 <wire x1="21.605" y1="4.1275" x2="21.605" y2="3.825" width="0.2032" layer="1"/>
 <wire x1="21.605" y1="3.825" x2="21.59" y2="3.81" width="0.2032" layer="1"/>
 <wire x1="21.9075" y1="4.1125" x2="21.8925" y2="4.1125" width="0.2032" layer="1"/>
@@ -2999,8 +2991,8 @@ design rules under a new name.</descript
 <wire x1="6.6525" y1="7" x2="8.335" y2="7" width="0.2032" layer="16"/>
 <wire x1="8.335" y1="8.3" x2="10.115" y2="8.3" width="0.2032" layer="16"/>
 <wire x1="8.335" y1="7" x2="8.35" y2="6.985" width="0.2032" layer="16"/>
-<wire x1="3.175" y1="8.41375" x2="3.4475" y2="8.3" width="0.2032" layer="16"/>
-<wire x1="3.4475" y1="8.3" x2="8.335" y2="8.3" width="0.2032" layer="16"/>
+<wire x1="3.175" y1="8.255" x2="3.28875" y2="8.3" width="0.2032" layer="16"/>
+<wire x1="3.28875" y1="8.3" x2="8.335" y2="8.3" width="0.2032" layer="16"/>
 <wire x1="2.2375" y1="2.69875" x2="4.60375" y2="2.69875" width="0.2032" layer="1"/>
 <wire x1="4.60375" y1="2.69875" x2="4.96125" y2="3.05625" width="0.2032" layer="1"/>
 <wire x1="7.73" y1="3.05625" x2="4.96125" y2="3.05625" width="0.2032" layer="1"/>
@@ -3021,11 +3013,17 @@ design rules under a new name.</descript
 <wire x1="33.655" y1="8.89" x2="35.08375" y2="8.89" width="0.2032" layer="1"/>
 <contactref element="C1" pad="1"/>
 <contactref element="C3" pad="1"/>
-<wire x1="2.2375" y1="4.92125" x2="3.40995" y2="7.0612" width="0" layer="19" extent="1-1"/>
-<wire x1="2.2375" y1="8.255" x2="3.01625" y2="8.255" width="0.2032" layer="1"/>
-<wire x1="3.01625" y1="8.255" x2="3.175" y2="8.41375" width="0.2032" layer="1"/>
+<wire x1="2.2375" y1="8.255" x2="3.175" y2="8.255" width="0.2032" layer="1"/>
 <wire x1="1.74625" y1="5.08" x2="2.07875" y2="5.08" width="0.2032" layer="1"/>
 <wire x1="2.07875" y1="5.08" x2="2.2375" y2="4.92125" width="0.2032" layer="1"/>
+<wire x1="3.65125" y1="7.3025" x2="1.74625" y2="5.3975" width="0.2032" layer="16"/>
+<wire x1="1.74625" y1="5.3975" x2="1.74625" y2="1.5875" width="0.2032" layer="16"/>
+<via x="1.74625" y="1.5875" extent="1-16" drill="0.381"/>
+<wire x1="1.5875" y1="1.74625" x2="1.74625" y2="1.5875" width="0.2032" layer="1"/>
+<wire x1="2.06375" y1="2.69875" x2="1.5875" y2="2.69875" width="0.2032" layer="1"/>
+<wire x1="19.0227625" y1="3.33375" x2="20.16125" y2="3.33375" width="0.2032" layer="1"/>
+<wire x1="20.16125" y1="3.33375" x2="20.47875" y2="3.01625" width="0.2032" layer="1"/>
+<wire x1="20.47875" y1="3.01625" x2="21.2575" y2="3.01625" width="0.2032" layer="1"/>
 </signal>
 <signal name="VLCD">
 <contactref element="U101" pad="1"/>
@@ -3040,13 +3038,12 @@ design rules under a new name.</descript
 <wire x1="20.64" y1="9.38375" x2="20.78125" y2="9.525" width="0.2032" layer="1"/>
 <wire x1="22.54" y1="7.9676" x2="22.54" y2="7.14125" width="0.2032" layer="1"/>
 <wire x1="22.54" y1="7.14125" x2="22.38375" y2="6.985" width="0.2032" layer="1"/>
-<wire x1="22.38375" y1="6.985" x2="20.955" y2="6.985" width="0.2032" layer="1"/>
-<wire x1="20.955" y1="6.985" x2="20.79625" y2="7.14375" width="0.2032" layer="1"/>
-<wire x1="20.79625" y1="7.14375" x2="20.79625" y2="7.81135" width="0.2032" layer="1"/>
-<wire x1="20.79625" y1="7.81135" x2="20.64" y2="7.9676" width="0.2032" layer="1"/>
+<wire x1="22.38375" y1="6.985" x2="20.79625" y2="6.985" width="0.2032" layer="1"/>
+<wire x1="20.79625" y1="6.985" x2="20.6375" y2="7.14375" width="0.2032" layer="1"/>
+<wire x1="20.6375" y1="7.14375" x2="20.6375" y2="7.9701" width="0.2032" layer="1"/>
+<wire x1="20.6375" y1="7.9701" x2="20.64" y2="7.9676" width="0.2032" layer="1"/>
 <wire x1="20.78125" y1="9.525" x2="20.78125" y2="10.93875" width="0.2032" layer="1"/>
 <wire x1="20.78125" y1="10.93875" x2="21.2725" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="45.12" y1="0.9175" x2="45.24375" y2="0.79375" width="0.2032" layer="1"/>
 <via x="45.24375" y="0.79375" extent="1-16" drill="0.3048"/>
 <wire x1="45.24375" y1="0.79375" x2="45.56125" y2="1.11125" width="0.2032" layer="16"/>
 <wire x1="45.56125" y1="1.11125" x2="45.56125" y2="12.065" width="0.2032" layer="16"/>
@@ -3061,8 +3058,7 @@ design rules under a new name.</descript
 <wire x1="23.65375" y1="9.525" x2="23.65375" y2="8.62018125" width="0.2032" layer="1"/>
 <wire x1="23.65375" y1="8.62018125" x2="23.00116875" y2="7.9676" width="0.2032" layer="1"/>
 <wire x1="23.00116875" y1="7.9676" x2="22.54" y2="7.9676" width="0.2032" layer="1"/>
-<wire x1="45.12" y1="0.9175" x2="44.22125" y2="0.9175" width="0.2032" layer="1"/>
-<wire x1="44.22125" y1="0.9175" x2="44.0975" y2="0.79375" width="0.2032" layer="1"/>
+<wire x1="44.0975" y1="0.79375" x2="45.24375" y2="0.79375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-A">
 <contactref element="SW101" pad="1"/>
@@ -3131,39 +3127,38 @@ design rules under a new name.</descript
 <contactref element="J101" pad="D+"/>
 <contactref element="R104" pad="2"/>
 <wire x1="40.79875" y1="6.35" x2="42.1175" y2="6.35" width="0.2032" layer="1"/>
-<wire x1="40.79875" y1="6.35" x2="39.006003125" y2="4.557253125" width="0.2032" layer="1"/>
-<wire x1="39.006003125" y1="4.557253125" x2="38.781496875" y2="4.557253125" width="0.2032" layer="1"/>
-<wire x1="38.781496875" y1="4.557253125" x2="38.053503125" y2="5.285246875" width="0.2032" layer="1"/>
+<wire x1="40.79875" y1="6.35" x2="39.164753125" y2="4.716003125" width="0.2032" layer="1"/>
+<wire x1="39.164753125" y1="4.716003125" x2="38.622746875" y2="4.716003125" width="0.2032" layer="1"/>
+<wire x1="38.622746875" y1="4.716003125" x2="38.053503125" y2="5.285246875" width="0.2032" layer="1"/>
 <wire x1="38.053503125" y1="5.285246875" x2="37.828996875" y2="5.285246875" width="0.2032" layer="1"/>
 <wire x1="37.828996875" y1="5.285246875" x2="35.8775" y2="3.33375" width="0.2032" layer="1"/>
 <wire x1="35.8775" y1="3.33375" x2="35.8775" y2="1.905" width="0.2032" layer="1"/>
 <wire x1="35.8775" y1="1.905" x2="34.925" y2="0.9525" width="0.2032" layer="1"/>
-<wire x1="34.925" y1="0.9525" x2="32.385" y2="0.9525" width="0.2032" layer="1"/>
-<wire x1="32.385" y1="0.9525" x2="31.4325" y2="1.905" width="0.2032" layer="1"/>
-<wire x1="31.4325" y1="1.905" x2="30.97125" y2="1.905" width="0.2032" layer="1"/>
+<wire x1="34.925" y1="0.9525" x2="32.54375" y2="0.9525" width="0.2032" layer="1"/>
+<wire x1="32.54375" y1="0.9525" x2="31.59125" y2="1.905" width="0.2032" layer="1"/>
+<wire x1="31.59125" y1="1.905" x2="30.97125" y2="1.905" width="0.2032" layer="1"/>
 </signal>
 <signal name="D-">
 <contactref element="J101" pad="D-"/>
 <contactref element="R105" pad="2"/>
 <wire x1="42.1175" y1="5.7" x2="40.9425" y2="5.7" width="0.2032" layer="1"/>
-<wire x1="30.97125" y1="0.79375" x2="30.97125" y2="0.77875" width="0.2032" layer="1"/>
-<wire x1="30.97125" y1="0.77875" x2="31.27375" y2="0.47625" width="0.2032" layer="1"/>
-<wire x1="31.27375" y1="0.47625" x2="35.2425" y2="0.47625" width="0.2032" layer="1"/>
 <wire x1="35.2425" y1="0.47625" x2="36.35375" y2="1.5875" width="0.2032" layer="1"/>
-<wire x1="36.35375" y1="1.5875" x2="40.3225" y2="1.5875" width="0.2032" layer="1"/>
-<wire x1="40.3225" y1="1.5875" x2="40.64" y2="1.905" width="0.2032" layer="1"/>
-<wire x1="40.64" y1="1.905" x2="40.64" y2="5.3975" width="0.2032" layer="1"/>
-<wire x1="40.64" y1="5.3975" x2="40.9425" y2="5.7" width="0.2032" layer="1"/>
+<wire x1="36.35375" y1="1.5875" x2="38.160246875" y2="1.5875" width="0.2032" layer="1"/>
+<wire x1="38.160246875" y1="1.5875" x2="39.52875" y2="2.956003125" width="0.2032" layer="1"/>
+<wire x1="39.52875" y1="2.956003125" x2="39.52875" y2="4.28625" width="0.2032" layer="1"/>
+<wire x1="39.52875" y1="4.28625" x2="40.9425" y2="5.7" width="0.2032" layer="1"/>
+<wire x1="35.2425" y1="0.47625" x2="31.90875" y2="0.47625" width="0.2032" layer="1"/>
+<wire x1="31.90875" y1="0.47625" x2="31.59125" y2="0.79375" width="0.2032" layer="1"/>
+<wire x1="31.59125" y1="0.79375" x2="30.97125" y2="0.79375" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="J101" pad="VBUS"/>
 <contactref element="D101" pad="A"/>
-<wire x1="42.1175" y1="5.05" x2="42.67375" y2="5.05" width="0.2032" layer="1"/>
-<wire x1="42.67375" y1="5.05" x2="42.70375" y2="5.08" width="0.2032" layer="1"/>
-<wire x1="42.70375" y1="5.08" x2="42.70375" y2="2.69875" width="0.2032" layer="1"/>
-<wire x1="42.70375" y1="2.69875" x2="42.545" y2="2.54" width="0.2032" layer="1"/>
-<wire x1="42.545" y1="2.54" x2="42.545" y2="1.04625" width="0.2032" layer="1"/>
+<wire x1="42.545" y1="3.96875" x2="42.545" y2="1.04625" width="0.2032" layer="1"/>
 <wire x1="42.545" y1="1.04625" x2="42.7975" y2="0.79375" width="0.2032" layer="1"/>
+<wire x1="42.545" y1="3.96875" x2="42.2275" y2="4.28625" width="0.2032" layer="1"/>
+<wire x1="42.2275" y1="4.28625" x2="42.2275" y2="4.94" width="0.2032" layer="1"/>
+<wire x1="42.2275" y1="4.94" x2="42.1175" y2="5.05" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$6">
 <contactref element="U101" pad="33"/>
@@ -3172,10 +3167,10 @@ design rules under a new name.</descript
 <wire x1="12.43" y1="2.35625" x2="12.43" y2="1.56844375" width="0.2032" layer="1"/>
 <wire x1="12.43" y1="1.56844375" x2="12.88719375" y2="1.11125" width="0.2032" layer="1"/>
 <wire x1="12.88719375" y1="1.11125" x2="22.86" y2="1.11125" width="0.2032" layer="1"/>
-<wire x1="22.86" y1="1.11125" x2="27.94" y2="1.11125" width="0.2032" layer="1"/>
+<wire x1="22.86" y1="1.11125" x2="28.2575" y2="1.11125" width="0.2032" layer="1"/>
 <wire x1="22.5575" y1="1.905" x2="22.5575" y2="1.12625" width="0.2032" layer="1"/>
-<wire x1="27.94" y1="1.11125" x2="28.73375" y2="1.905" width="0.2032" layer="1"/>
-<wire x1="28.73375" y1="1.905" x2="29.67125" y2="1.905" width="0.2032" layer="1"/>
+<wire x1="28.2575" y1="1.11125" x2="29.05125" y2="1.905" width="0.2032" layer="1"/>
+<wire x1="29.05125" y1="1.905" x2="29.67125" y2="1.905" width="0.2032" layer="1"/>
 <wire x1="22.5575" y1="1.12625" x2="22.845" y2="1.12625" width="0.2032" layer="1"/>
 <wire x1="22.845" y1="1.12625" x2="22.86" y2="1.11125" width="0.2032" layer="1"/>
 </signal>
@@ -3192,7 +3187,6 @@ design rules under a new name.</descript
 </signal>
 <signal name="SPI1_MOSI">
 <contactref element="U101" pad="17"/>
-<wire x1="8.275" y1="3.81" x2="5.23875" y2="3.81" width="0.2032" layer="16"/>
 <via x="5.23875" y="3.81" extent="1-16" drill="0.3048"/>
 <wire x1="7.73" y1="6.55625" x2="7.255" y2="6.55625" width="0.2032" layer="1"/>
 <wire x1="7.255" y1="6.55625" x2="6.35" y2="7.46125" width="0.2032" layer="1"/>
@@ -3202,7 +3196,8 @@ design rules under a new name.</descript
 <wire x1="4.60375" y1="4.92125" x2="5.23875" y2="4.28625" width="0.2032" layer="1"/>
 <wire x1="5.23875" y1="4.28625" x2="5.23875" y2="3.81" width="0.2032" layer="1"/>
 <contactref element="LCD1" pad="12"/>
-<wire x1="8.335" y1="3.75" x2="8.275" y2="3.81" width="0.2032" layer="16"/>
+<wire x1="8.335" y1="3.75" x2="5.29875" y2="3.75" width="0.2032" layer="16"/>
+<wire x1="5.29875" y1="3.75" x2="5.23875" y2="3.81" width="0.2032" layer="16"/>
 </signal>
 <signal name="SPI1_SCK">
 <contactref element="U101" pad="15"/>
@@ -3306,7 +3301,7 @@ design rules under a new name.</descript
 <contactref element="LED102" pad="A"/>
 <contactref element="R102" pad="2"/>
 <wire x1="37.48" y1="11.43" x2="38.977" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="38.977" y1="11.43" x2="39.37" y2="11.037" width="0.2032" layer="1"/>
+<wire x1="38.977" y1="11.43" x2="39.37" y2="11.3545" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$24">
 <contactref element="LED101" pad="A"/>
@@ -3322,13 +3317,12 @@ design rules under a new name.</descript
 <wire x1="15.875" y1="7.3025" x2="29.21" y2="7.3025" width="0.2032" layer="16"/>
 <wire x1="29.21" y1="7.3025" x2="33.02" y2="11.1125" width="0.2032" layer="16"/>
 <via x="33.02" y="11.1125" extent="1-16" drill="0.3048"/>
-<wire x1="33.02" y1="11.1125" x2="33.81375" y2="11.90625" width="0.2032" layer="1"/>
-<wire x1="33.81375" y1="11.90625" x2="35.71875" y2="11.90625" width="0.2032" layer="1"/>
-<wire x1="35.71875" y1="11.90625" x2="36.18" y2="11.445" width="0.2032" layer="1"/>
 <wire x1="36.18" y1="11.445" x2="36.18" y2="11.43" width="0.2032" layer="1"/>
 <wire x1="14.63" y1="7.55625" x2="15.145" y2="7.55625" width="0.2032" layer="1"/>
 <wire x1="15.145" y1="7.55625" x2="15.39875" y2="7.3025" width="0.2032" layer="1"/>
 <wire x1="15.39875" y1="7.3025" x2="15.875" y2="7.3025" width="0.2032" layer="1"/>
+<wire x1="36.18" y1="11.445" x2="33.3525" y2="11.445" width="0.2032" layer="1"/>
+<wire x1="33.3525" y1="11.445" x2="33.02" y2="11.1125" width="0.2032" layer="1"/>
 </signal>
 <signal name="!CS">
 <contactref element="U101" pad="19"/>