diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="7.1.0">
+<eagle version="6.5.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
@@ -196,7 +196,7 @@
 <wire x1="1.27" y1="16.51" x2="2.54" y2="16.51" width="0" layer="20"/>
 <wire x1="2.54" y1="16.51" x2="3.81" y2="15.24" width="0" layer="20" curve="-90"/>
 <wire x1="3.81" y1="15.24" x2="3.81" y2="12.7" width="0" layer="20"/>
-<hole x="1.905" y="14.605" drill="1.905"/>
+<hole x="1.905" y="14.605" drill="2.54"/>
 <hole x="0.238125" y="12.7" drill="0.254"/>
 <hole x="0.714375" y="12.7" drill="0.254"/>
 <hole x="1.190625" y="12.7" drill="0.254"/>
@@ -209,7 +209,7 @@
 <wire x1="3.81" y1="-1.27" x2="2.54" y2="-2.54" width="0" layer="20" curve="-90"/>
 <wire x1="2.54" y1="-2.54" x2="1.27" y2="-2.54" width="0" layer="20"/>
 <wire x1="1.27" y1="-2.54" x2="0" y2="-1.27" width="0" layer="20" curve="-90"/>
-<hole x="1.905" y="-0.635" drill="1.905"/>
+<hole x="1.905" y="-0.635" drill="2.54"/>
 <hole x="3.571875" y="1.27" drill="0.254"/>
 <hole x="3.095625" y="1.27" drill="0.254"/>
 <hole x="2.619375" y="1.27" drill="0.254"/>
@@ -222,7 +222,7 @@
 <wire x1="41.275" y1="15.24" x2="42.545" y2="16.51" width="0" layer="20" curve="-90"/>
 <wire x1="42.545" y1="16.51" x2="43.815" y2="16.51" width="0" layer="20"/>
 <wire x1="43.815" y1="16.51" x2="45.085" y2="15.24" width="0" layer="20" curve="-90"/>
-<hole x="43.18" y="14.605" drill="1.905"/>
+<hole x="43.18" y="14.605" drill="2.54"/>
 <hole x="41.513125" y="12.7" drill="0.254"/>
 <hole x="41.989375" y="12.7" drill="0.254"/>
 <hole x="42.465625" y="12.7" drill="0.254"/>
@@ -235,7 +235,7 @@
 <wire x1="43.815" y1="-2.54" x2="42.545" y2="-2.54" width="0" layer="20"/>
 <wire x1="42.545" y1="-2.54" x2="41.275" y2="-1.27" width="0" layer="20" curve="-90"/>
 <wire x1="41.275" y1="-1.27" x2="41.275" y2="1.27" width="0" layer="20"/>
-<hole x="43.18" y="-0.635" drill="1.905"/>
+<hole x="43.18" y="-0.635" drill="2.54"/>
 <hole x="44.846875" y="1.27" drill="0.254"/>
 <hole x="44.370625" y="1.27" drill="0.254"/>
 <hole x="43.894375" y="1.27" drill="0.254"/>
@@ -2257,6 +2257,26 @@ You are welcome to use this library for 
 <text x="-1.5875" y="1.27" size="1.27" layer="25">&gt;NAME</text>
 <text x="-1.5875" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
 </package>
+<package name="POGOPROG-CONN-ALLSMT">
+<smd name="3" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="2" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="4" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="1" x="0" y="2.54" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="5" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
+<wire x1="-0.635" y1="3.175" x2="0.635" y2="3.175" width="0.127" layer="21"/>
+<wire x1="0.635" y1="3.175" x2="0.635" y2="-4.445" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-4.445" x2="-0.635" y2="-4.445" width="0.127" layer="21"/>
+<wire x1="-0.635" y1="-4.445" x2="-0.635" y2="3.175" width="0.127" layer="21"/>
+<smd name="6" x="0" y="-3.81" dx="0.889" dy="0.8128" layer="1"/>
+<polygon width="0.127" layer="21">
+<vertex x="-0.635" y="1.905"/>
+<vertex x="0.635" y="1.905"/>
+<vertex x="0.635" y="3.175"/>
+<vertex x="-0.635" y="3.175"/>
+</polygon>
+<text x="-1.27" y="3.81" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
+</package>
 </packages>
 </library>
 <library name="SparkFun-DiscreteSemi">
@@ -2331,53 +2351,6 @@ chip</description>
 </package>
 </packages>
 </library>
-<library name="resistor-dil">
-<description>&lt;b&gt;Resistors in DIL Packages&lt;/b&gt;&lt;p&gt;
-&lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
-<packages>
-<package name="EXBV4V">
-<description>&lt;b&gt;Chip Resistor Array 0603x2&lt;/b&gt; 2 resistors in 1.60 mm x 1.60 mm size&lt;p&gt;
-Source: PANASONIC .. aoc0000ce1.pdf</description>
-<wire x1="-0.75" y1="0.75" x2="-0.55" y2="0.75" width="0.1016" layer="51"/>
-<wire x1="-0.25" y1="0.75" x2="0.25" y2="0.75" width="0.1016" layer="51"/>
-<wire x1="0.55" y1="0.75" x2="0.75" y2="0.75" width="0.1016" layer="51"/>
-<wire x1="0.75" y1="0.75" x2="0.75" y2="-0.75" width="0.1016" layer="21"/>
-<wire x1="0.75" y1="-0.75" x2="0.55" y2="-0.75" width="0.1016" layer="51"/>
-<wire x1="0.25" y1="-0.75" x2="-0.25" y2="-0.75" width="0.1016" layer="51"/>
-<wire x1="-0.55" y1="-0.75" x2="-0.75" y2="-0.75" width="0.1016" layer="51"/>
-<wire x1="-0.75" y1="-0.75" x2="-0.75" y2="0.75" width="0.1016" layer="21"/>
-<wire x1="-0.55" y1="0.75" x2="-0.4" y2="0.6" width="0.1016" layer="51" curve="90"/>
-<wire x1="-0.4" y1="0.6" x2="-0.25" y2="0.75" width="0.1016" layer="51" curve="90"/>
-<wire x1="-0.25" y1="-0.75" x2="-0.4" y2="-0.6" width="0.1016" layer="51" curve="90"/>
-<wire x1="-0.4" y1="-0.6" x2="-0.55" y2="-0.75" width="0.1016" layer="51" curve="90"/>
-<wire x1="0.25" y1="0.75" x2="0.4" y2="0.6" width="0.1016" layer="51" curve="90"/>
-<wire x1="0.4" y1="0.6" x2="0.55" y2="0.75" width="0.1016" layer="51" curve="90"/>
-<wire x1="0.55" y1="-0.75" x2="0.4" y2="-0.6" width="0.1016" layer="51" curve="90"/>
-<wire x1="0.4" y1="-0.6" x2="0.25" y2="-0.75" width="0.1016" layer="51" curve="90"/>
-<smd name="1" x="-0.4" y="-0.775" dx="0.45" dy="0.7" layer="1"/>
-<smd name="2" x="0.4" y="-0.775" dx="0.45" dy="0.7" layer="1"/>
-<smd name="3" x="0.4" y="0.775" dx="0.45" dy="0.7" layer="1" rot="R180"/>
-<smd name="4" x="-0.4" y="0.775" dx="0.45" dy="0.7" layer="1" rot="R180"/>
-<text x="-1.5875" y="1.27" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.5875" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
-</package>
-</packages>
-</library>
-<library name="testpad">
-<description>&lt;b&gt;Test Pins/Pads&lt;/b&gt;&lt;p&gt;
-Cream on SMD OFF.&lt;br&gt;
-new: Attribute TP_SIGNAL_NAME&lt;br&gt;
-&lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
-<packages>
-<package name="TP06R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="0.6" dy="0.6" layer="1" roundness="100" cream="no"/>
-<text x="-0.3" y="0.4001" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.254" y="-0.381" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-</packages>
-</library>
 </libraries>
 <attributes>
 </attributes>
@@ -2475,9 +2448,6 @@ design rules under a new name.</descript
 <autorouter>
 <pass name="Default">
 <param name="RoutingGrid" value="12.5mil"/>
-<param name="AutoGrid" value="1"/>
-<param name="Efforts" value="0"/>
-<param name="TopRouterVariant" value="1"/>
 <param name="tpViaShape" value="round"/>
 <param name="PrefDir.1" value="|"/>
 <param name="PrefDir.2" value="0"/>
@@ -2630,24 +2600,13 @@ design rules under a new name.</descript
 <attribute name="VALUE" x="30.635" y="14.32625" size="0.4064" layer="27" ratio="10" rot="R180"/>
 </element>
 <element name="U$3" library="Protofusion" package="THERM_LOGO_0.2" value="" x="11.43" y="6.82625" rot="MR180"/>
-<element name="RN1" library="resistor-dil" package="EXBV4V" value="EXB-V4V220JV" x="19.3675" y="2.69875" rot="R270">
-<attribute name="OC_NEWARK" value="unknown" x="19.3675" y="2.69875" size="0.8128" layer="27" ratio="16" rot="R270" display="off"/>
-<attribute name="MPN" value="" x="19.3675" y="2.69875" size="0.8128" layer="27" ratio="16" rot="R270" display="off"/>
-<attribute name="MF" value="" x="19.3675" y="2.69875" size="0.8128" layer="27" ratio="16" rot="R270" display="off"/>
-<attribute name="OC_FARNELL" value="unknown" x="19.3675" y="2.69875" size="0.8128" layer="27" ratio="16" rot="R270" display="off"/>
-</element>
-<element name="U$13" library="Protofusion" package="UFQFPN32" value="STM32F042K" x="14.525625" y="6.746875" rot="R270"/>
-<element name="C5" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.604375" y="10.00125" rot="R180"/>
+<element name="U$13" library="Protofusion" package="UFQFPN32" value="STM32F042K" x="14.525625" y="7.14375" rot="R270"/>
+<element name="C5" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.604375" y="10.239375" rot="R180"/>
 <element name="C6" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="19.129375" y="9.8425"/>
 <element name="C7" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.68375" y="4.445" rot="R180"/>
 <element name="RA1" library="Protofusion" package="1206-ARV-4" value="1uF" x="1.5875" y="6.985" rot="R270"/>
-<element name="TP1" library="testpad" package="TP06R" value="TPTP06R" x="18.25625" y="4.445">
-<attribute name="TP_SIGNAL_NAME" value="" x="18.25625" y="4.445" size="1.778" layer="27" display="off"/>
-</element>
-<element name="TP2" library="testpad" package="TP06R" value="TPTP06R" x="17.62125" y="3.730625">
-<attribute name="TP_SIGNAL_NAME" value="" x="17.62125" y="3.730625" size="1.778" layer="27" display="off"/>
-</element>
 <element name="JP1" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="13.97" y="2.38125" rot="MR0"/>
+<element name="U$6" library="Protofusion" package="POGOPROG-CONN-ALLSMT" value="POGOPIN-CONNALLSMT" x="20.240625" y="2.143125" rot="MR90"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -2709,7 +2668,7 @@ design rules under a new name.</descript
 <wire x1="0.8125" y1="7.385" x2="0.8125" y2="5.785" width="0.2032" layer="1"/>
 <via x="0.873125" y="3.254375" extent="1-16" drill="0.254"/>
 <via x="14.12875" y="6.746875" extent="1-16" drill="0.3048"/>
-<wire x1="14.12875" y1="6.746875" x2="14.525625" y2="6.746875" width="0.2032" layer="1"/>
+<wire x1="14.12875" y1="6.746875" x2="14.525625" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="19.779375" y1="9.8425" x2="18.58875" y2="11.25625" width="0.2032" layer="1"/>
 <wire x1="18.58875" y1="11.25625" x2="18.415" y2="11.43" width="0.2032" layer="1"/>
 <wire x1="8.335" y1="8.12625" x2="5.08" y2="8.12625" width="0.2032" layer="16"/>
@@ -2725,7 +2684,7 @@ design rules under a new name.</descript
 <wire x1="9.04875" y1="3.65125" x2="9.04875" y2="4.43" width="0.2032" layer="1"/>
 <wire x1="9.04875" y1="4.43" x2="9.03375" y2="4.445" width="0.2032" layer="1"/>
 <via x="8.89" y="12.065" extent="1-16" drill="0.3048"/>
-<wire x1="8.954375" y1="10.00125" x2="8.954375" y2="12.000625" width="0.2032" layer="1"/>
+<wire x1="8.954375" y1="10.239375" x2="8.954375" y2="12.000625" width="0.2032" layer="1"/>
 <wire x1="8.954375" y1="12.000625" x2="8.89" y2="12.065" width="0.2032" layer="1"/>
 <wire x1="29.845" y1="9.8575" x2="31.035625" y2="11.048125" width="0.2032" layer="1"/>
 <wire x1="31.035625" y1="11.048125" x2="31.035625" y2="11.27125" width="0.2032" layer="1"/>
@@ -2733,6 +2692,10 @@ design rules under a new name.</descript
 <wire x1="40.64" y1="11.7475" x2="41.195625" y2="11.191875" width="0.2032" layer="1"/>
 <wire x1="0.873125" y1="3.254375" x2="0.873125" y2="4.380625" width="0.2032" layer="1"/>
 <wire x1="0.873125" y1="4.380625" x2="0.9375" y2="4.445" width="0.2032" layer="1"/>
+<contactref element="U$6" pad="2"/>
+<contactref element="U$13" pad="31"/>
+<wire x1="16.875625" y1="8.39375" x2="15.775625" y2="8.39375" width="0.2032" layer="1"/>
+<wire x1="15.775625" y1="8.39375" x2="14.12875" y2="6.746875" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$1">
 <contactref element="C106" pad="1"/>
@@ -2830,9 +2793,10 @@ design rules under a new name.</descript
 <wire x1="3.92375" y1="8.77625" x2="8.335" y2="8.77625" width="0.2032" layer="16"/>
 <wire x1="22.5425" y1="6.35" x2="23.65375" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="23.65375" y1="7.46125" x2="24.4475" y2="7.46125" width="0.2032" layer="1"/>
-<wire x1="24.4475" y1="7.46125" x2="29.845" y2="7.46125" width="0.2032" layer="1"/>
+<wire x1="29.845" y1="8.5575" x2="29.845" y2="7.888696875" width="0.2032" layer="1"/>
+<wire x1="29.845" y1="7.888696875" x2="29.417553125" y2="7.46125" width="0.2032" layer="1"/>
+<wire x1="29.417553125" y1="7.46125" x2="24.4475" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="24.4475" y1="9.04" x2="24.4475" y2="7.46125" width="0.2032" layer="1"/>
-<wire x1="29.845" y1="8.5575" x2="29.845" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="10.16" y1="8.255" x2="10.16" y2="11.1125" width="0.2032" layer="16"/>
 <contactref element="C6" pad="1"/>
 <contactref element="U$13" pad="1"/>
@@ -2851,32 +2815,31 @@ design rules under a new name.</descript
 <wire x1="20.0025" y1="8.89" x2="19.764375" y2="9.128125" width="0.2032" layer="1"/>
 <wire x1="19.764375" y1="9.128125" x2="19.19375" y2="9.128125" width="0.2032" layer="1"/>
 <wire x1="19.19375" y1="9.128125" x2="18.479375" y2="9.8425" width="0.2032" layer="1"/>
-<wire x1="14.223125" y1="9.149375" x2="14.275625" y2="9.096875" width="0.2032" layer="1"/>
-<wire x1="16.275625" y1="9.096875" x2="16.275625" y2="9.759375" width="0.2032" layer="1"/>
-<wire x1="16.275625" y1="9.759375" x2="16.271875" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="14.3025" y1="9.466875" x2="14.275625" y2="9.49375" width="0.2032" layer="1"/>
+<wire x1="16.275625" y1="9.49375" x2="16.275625" y2="9.759375" width="0.2032" layer="1"/>
+<wire x1="16.275625" y1="9.759375" x2="16.271875" y2="10.00125" width="0.2032" layer="1"/>
 <wire x1="22.54" y1="5.3674" x2="21.639275" y2="5.3674" width="0.2032" layer="1"/>
 <wire x1="21.639275" y1="5.3674" x2="21.351875" y2="5.08" width="0.2032" layer="1"/>
 <wire x1="21.351875" y1="5.08" x2="21.351875" y2="4.539375" width="0.2032" layer="1"/>
 <wire x1="21.351875" y1="4.539375" x2="20.94" y2="4.1275" width="0.2032" layer="1"/>
 <wire x1="8.35" y1="7.46125" x2="10.16" y2="7.46125" width="0.2032" layer="16"/>
 <wire x1="10.33375" y1="4.445" x2="12.7275" y2="4.445" width="0.2032" layer="1"/>
-<wire x1="12.7275" y1="4.445" x2="12.775625" y2="4.396875" width="0.2032" layer="1"/>
+<wire x1="12.7275" y1="4.445" x2="12.775625" y2="4.79375" width="0.2032" layer="1"/>
 <wire x1="10.33375" y1="4.445" x2="10.33375" y2="5.3825" width="0.2032" layer="1"/>
 <wire x1="10.33375" y1="5.3825" x2="10.16" y2="5.55625" width="0.2032" layer="1"/>
-<wire x1="16.271875" y1="9.763125" x2="15.875" y2="9.763125" width="0.2032" layer="1"/>
-<wire x1="15.875" y1="9.763125" x2="14.275625" y2="9.763125" width="0.2032" layer="1"/>
-<wire x1="10.33375" y1="9.763125" x2="10.254375" y2="10.00125" width="0.2032" layer="1"/>
-<wire x1="10.254375" y1="10.00125" x2="10.254375" y2="11.018125" width="0.2032" layer="1"/>
+<wire x1="16.271875" y1="10.00125" x2="14.275625" y2="10.00125" width="0.2032" layer="1"/>
+<wire x1="10.33375" y1="9.763125" x2="10.254375" y2="10.239375" width="0.2032" layer="1"/>
+<wire x1="10.254375" y1="10.239375" x2="10.254375" y2="11.018125" width="0.2032" layer="1"/>
 <wire x1="10.254375" y1="11.018125" x2="10.16" y2="11.1125" width="0.2032" layer="1"/>
-<wire x1="14.275625" y1="9.096875" x2="14.275625" y2="9.763125" width="0.2032" layer="1"/>
-<wire x1="14.275625" y1="9.763125" x2="14.275625" y2="10.330625" width="0.2032" layer="1"/>
+<wire x1="14.275625" y1="9.49375" x2="14.275625" y2="10.00125" width="0.2032" layer="1"/>
+<wire x1="14.275625" y1="10.00125" x2="14.275625" y2="10.330625" width="0.2032" layer="1"/>
 <wire x1="14.275625" y1="10.330625" x2="13.6525" y2="10.95375" width="0.2032" layer="1"/>
 <wire x1="13.6525" y1="10.95375" x2="10.31875" y2="10.95375" width="0.2032" layer="1"/>
 <wire x1="10.31875" y1="10.95375" x2="10.16" y2="11.1125" width="0.2032" layer="1"/>
 <wire x1="2.3625" y1="8.185" x2="3.26375" y2="8.185" width="0.2032" layer="1"/>
 <wire x1="3.26375" y1="8.185" x2="3.81" y2="8.73125" width="0.2032" layer="1"/>
-<wire x1="18.479375" y1="9.8425" x2="18.4" y2="9.763125" width="0.2032" layer="1"/>
-<wire x1="18.4" y1="9.763125" x2="16.271875" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="18.479375" y1="9.8425" x2="18.320625" y2="10.00125" width="0.2032" layer="1"/>
+<wire x1="18.320625" y1="10.00125" x2="16.271875" y2="10.00125" width="0.2032" layer="1"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="JP101" pad="P1"/>
@@ -2897,8 +2860,7 @@ design rules under a new name.</descript
 <wire x1="30.48" y1="12.22375" x2="30.32125" y2="12.065" width="0.2032" layer="16"/>
 <wire x1="30.32125" y1="12.065" x2="30.32125" y2="10.4775" width="0.2032" layer="16"/>
 <wire x1="30.32125" y1="10.4775" x2="30.1625" y2="10.31875" width="0.2032" layer="16"/>
-<wire x1="30.1625" y1="10.31875" x2="24.4475" y2="10.31875" width="0.2032" layer="16"/>
-<wire x1="24.4475" y1="10.31875" x2="23.65375" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="30.1625" y1="10.31875" x2="23.97125" y2="10.31875" width="0.2032" layer="16"/>
 <via x="23.65375" y="10.00125" extent="1-16" drill="0.3048"/>
 <wire x1="23.65375" y1="10.00125" 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"/>
@@ -2907,11 +2869,11 @@ design rules under a new name.</descript
 <via x="31.115" y="12.065" extent="1-16" drill="0.3048"/>
 <wire x1="31.115" y1="12.065" x2="31.115" y2="12.22375" width="0.2032" layer="16"/>
 <wire x1="31.115" y1="12.22375" x2="30.48" y2="12.22375" width="0.2032" layer="16"/>
+<wire x1="23.97125" y1="10.31875" x2="23.65375" y2="10.00125" width="0.2032" layer="16"/>
 </signal>
 <signal name="SW-A">
 <contactref element="SW101" pad="1"/>
 <via x="31.75" y="7.14375" extent="1-16" drill="0.3048"/>
-<contactref element="U$13" pad="29"/>
 <wire x1="20.16125" y1="7.540625" x2="31.353125" y2="7.540625" width="0.2032" layer="16"/>
 <wire x1="31.353125" y1="7.540625" x2="31.75" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="31.75" y1="7.14375" x2="31.75" y2="5.7899" width="0.2032" layer="1"/>
@@ -2919,10 +2881,9 @@ design rules under a new name.</descript
 <wire x1="20.16125" y1="7.540625" x2="19.84375" y2="7.223125" width="0.2032" layer="16"/>
 <wire x1="19.84375" y1="7.223125" x2="18.335625" y2="7.223125" width="0.2032" layer="16"/>
 <via x="18.335625" y="7.223125" extent="1-16" drill="0.3048"/>
-<wire x1="18.335625" y1="7.223125" x2="18.018125" y2="7.223125" width="0.2032" layer="1"/>
-<wire x1="18.018125" y1="7.223125" x2="17.78" y2="6.985" width="0.2032" layer="1"/>
-<wire x1="16.875625" y1="6.996875" x2="17.768125" y2="6.996875" width="0.2032" layer="1"/>
-<wire x1="17.768125" y1="6.996875" x2="17.78" y2="6.985" width="0.2032" layer="1"/>
+<contactref element="U$13" pad="28"/>
+<wire x1="16.875625" y1="6.89375" x2="18.00625" y2="6.89375" width="0.2032" layer="1"/>
+<wire x1="18.00625" y1="6.89375" x2="18.335625" y2="7.223125" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-C">
 <contactref element="SW101" pad="3"/>
@@ -2931,20 +2892,22 @@ design rules under a new name.</descript
 <wire x1="34.76625" y1="4.7625" x2="34.44875" y2="4.445" width="0.2032" layer="16"/>
 <wire x1="34.44875" y1="4.445" x2="33.02" y2="4.445" width="0.2032" layer="16"/>
 <wire x1="33.02" y1="4.445" x2="30.718125" y2="6.746875" width="0.2032" layer="16"/>
-<contactref element="U$13" pad="27"/>
 <wire x1="19.605625" y1="5.87375" x2="20.47875" y2="6.746875" width="0.2032" layer="16"/>
 <wire x1="20.47875" y1="6.746875" x2="30.718125" y2="6.746875" width="0.2032" layer="16"/>
 <wire x1="34.76625" y1="4.7625" x2="34.6824" y2="4.7625" width="0.2032" layer="1"/>
 <wire x1="34.6824" y1="4.7625" x2="33.56381875" y2="3.64391875" width="0.2032" layer="1"/>
 <wire x1="19.605625" y1="5.87375" x2="18.89125" y2="5.87375" width="0.2032" layer="16"/>
 <via x="18.89125" y="5.87375" extent="1-16" drill="0.3048"/>
-<wire x1="16.875625" y1="5.996875" x2="18.768125" y2="5.996875" width="0.2032" layer="1"/>
 <wire x1="18.768125" y1="5.996875" x2="18.89125" y2="5.87375" width="0.2032" layer="1"/>
+<contactref element="U$13" pad="26"/>
+<wire x1="16.875625" y1="5.89375" x2="17.4825" y2="5.89375" width="0.2032" layer="1"/>
+<wire x1="17.4825" y1="5.89375" x2="17.541875" y2="5.953125" width="0.2032" layer="1"/>
+<wire x1="17.541875" y1="5.953125" x2="18.811875" y2="5.953125" width="0.2032" layer="1"/>
+<wire x1="18.811875" y1="5.953125" x2="18.89125" y2="5.87375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-B">
 <contactref element="SW101" pad="4"/>
 <via x="35.2425" y="8.09625" extent="1-16" drill="0.3048"/>
-<contactref element="U$13" pad="31"/>
 <wire x1="19.3675" y1="8.493125" x2="32.146875" y2="8.334375" width="0.2032" layer="16"/>
 <wire x1="36.286178125" y1="10.326078125" x2="35.2425" y2="9.2824" width="0.2032" layer="1"/>
 <wire x1="35.2425" y1="9.2824" x2="35.2425" y2="8.09625" width="0.2032" layer="1"/>
@@ -2952,14 +2915,14 @@ design rules under a new name.</descript
 <wire x1="32.940625" y1="7.540625" x2="34.686875" y2="7.540625" width="0.2032" layer="16"/>
 <wire x1="34.686875" y1="7.540625" x2="35.2425" y2="8.09625" width="0.2032" layer="16"/>
 <via x="19.3675" y="8.493125" extent="1-16" drill="0.3048"/>
-<wire x1="19.3675" y1="8.493125" x2="17.93875" y2="8.493125" width="0.2032" layer="1"/>
-<wire x1="17.93875" y1="8.493125" x2="17.4425" y2="7.996875" width="0.2032" layer="1"/>
-<wire x1="16.875625" y1="7.996875" x2="17.4425" y2="7.996875" width="0.2032" layer="1"/>
+<wire x1="19.3675" y1="8.493125" x2="18.25625" y2="8.493125" width="0.2032" layer="1"/>
+<wire x1="18.25625" y1="8.493125" x2="17.656875" y2="7.89375" width="0.2032" layer="1"/>
+<contactref element="U$13" pad="30"/>
+<wire x1="16.875625" y1="7.89375" x2="17.656875" y2="7.89375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-D">
 <contactref element="SW101" pad="6"/>
 <via x="36.98875" y="7.14375" extent="1-16" drill="0.3048"/>
-<contactref element="U$13" pad="30"/>
 <wire x1="20.0025" y1="7.9375" x2="31.90875" y2="7.9375" width="0.2032" layer="16"/>
 <wire x1="36.98875" y1="7.14375" x2="37.06365" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="37.06365" y1="7.14375" x2="38.266078125" y2="8.346178125" width="0.2032" layer="1"/>
@@ -2969,51 +2932,71 @@ design rules under a new name.</descript
 <wire x1="19.764375" y1="7.699375" x2="18.970625" y2="7.699375" width="0.2032" layer="16"/>
 <wire x1="18.970625" y1="7.699375" x2="18.811875" y2="7.858125" width="0.2032" layer="16"/>
 <via x="18.811875" y="7.858125" extent="1-16" drill="0.3048"/>
-<wire x1="18.811875" y1="7.858125" x2="18.018125" y2="7.858125" width="0.2032" layer="1"/>
-<wire x1="18.018125" y1="7.858125" x2="17.656875" y2="7.496875" width="0.2032" layer="1"/>
-<wire x1="16.875625" y1="7.496875" x2="17.656875" y2="7.496875" width="0.2032" layer="1"/>
+<wire x1="18.811875" y1="7.858125" x2="18.176875" y2="7.858125" width="0.2032" layer="1"/>
+<wire x1="18.176875" y1="7.858125" x2="17.7125" y2="7.39375" width="0.2032" layer="1"/>
+<contactref element="U$13" pad="29"/>
+<wire x1="16.875625" y1="7.39375" x2="17.7125" y2="7.39375" width="0.2032" layer="1"/>
 </signal>
 <signal name="D+">
 <contactref element="J101" pad="D+"/>
-<contactref element="RN1" pad="4"/>
 <wire x1="41.165" y1="6.985" x2="40.005" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="40.005" y1="6.985" x2="39.6875" y2="6.6675" width="0.2032" layer="1"/>
 <wire x1="39.6875" y1="6.6675" x2="39.6875" y2="2.778125" width="0.2032" layer="1"/>
 <wire x1="39.6875" y1="2.778125" x2="39.21125" y2="2.301875" width="0.2032" layer="1"/>
-<wire x1="39.21125" y1="2.301875" x2="22.304375" y2="2.301875" width="0.2032" layer="1"/>
-<wire x1="22.304375" y1="2.301875" x2="21.5075" y2="3.09875" width="0.2032" layer="1"/>
-<wire x1="21.5075" y1="3.09875" x2="20.1425" y2="3.09875" width="0.2032" layer="1"/>
+<wire x1="39.21125" y1="2.301875" x2="18.576875" y2="2.301875" width="0.2032" layer="1"/>
+<contactref element="U$13" pad="22"/>
+<wire x1="15.275625" y1="4.79375" x2="15.275625" y2="3.774375" width="0.2032" layer="1"/>
+<wire x1="15.275625" y1="3.774375" x2="15.95125" y2="3.09875" width="0.2032" layer="1"/>
+<contactref element="U$6" pad="5"/>
+<wire x1="17.78" y1="3.09875" x2="15.95125" y2="3.09875" width="0.2032" layer="1"/>
+<wire x1="17.700625" y1="2.143125" x2="17.700625" y2="3.019375" width="0.2032" layer="16"/>
+<wire x1="17.700625" y1="3.019375" x2="17.78" y2="3.09875" width="0.2032" layer="16"/>
+<via x="17.78" y="3.09875" extent="1-16" drill="0.3048"/>
+<wire x1="18.576875" y1="2.301875" x2="17.78" y2="3.09875" width="0.2032" layer="1"/>
 </signal>
 <signal name="D-">
 <contactref element="J101" pad="D-"/>
-<contactref element="RN1" pad="3"/>
 <wire x1="41.165" y1="6.335" x2="40.3075" y2="6.335" width="0.2032" layer="1"/>
 <wire x1="40.3075" y1="6.335" x2="40.16375" y2="6.19125" width="0.2032" layer="1"/>
 <wire x1="21.9075" y1="1.905" x2="39.6875" y2="1.905" width="0.2032" layer="1"/>
 <wire x1="39.6875" y1="1.905" x2="40.16375" y2="2.38125" width="0.2032" layer="1"/>
 <wire x1="40.16375" y1="2.38125" x2="40.16375" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="21.9075" y1="1.905" x2="21.51375" y2="2.29875" width="0.2032" layer="1"/>
-<wire x1="21.51375" y1="2.29875" x2="20.1425" y2="2.29875" width="0.2032" layer="1"/>
+<wire x1="21.9075" y1="1.905" x2="21.910625" y2="1.901875" width="0.2032" layer="1"/>
+<contactref element="U$13" pad="21"/>
+<wire x1="14.775625" y1="4.79375" x2="14.775625" y2="3.639375" width="0.2032" layer="1"/>
+<wire x1="21.910625" y1="1.901875" x2="15.64" y2="1.901875" width="0.2032" layer="1"/>
+<contactref element="U$6" pad="6"/>
+<via x="15.39875" y="1.905" extent="1-16" drill="0.3048"/>
+<wire x1="14.775625" y1="3.639375" x2="15.39875" y2="3.01625" width="0.2032" layer="1"/>
+<wire x1="15.39875" y1="3.01625" x2="15.39875" y2="1.905" width="0.2032" layer="1"/>
+<wire x1="15.64" y1="1.901875" x2="15.39875" y2="1.905" width="0.2032" layer="1"/>
+<wire x1="16.430625" y1="2.143125" x2="15.636875" y2="2.143125" width="0.2032" layer="16"/>
+<wire x1="15.636875" y1="2.143125" x2="15.39875" y2="1.905" width="0.2032" layer="16"/>
 </signal>
-<signal name="N$10">
+<signal name="VUSB">
 <contactref element="J101" pad="VBUS"/>
 <contactref element="D101" pad="A"/>
 <wire x1="41.165" y1="5.685" x2="42.1975" y2="5.685" width="0.2032" layer="1"/>
 <wire x1="42.1975" y1="5.685" x2="42.38625" y2="6.0325" width="0.2032" layer="1"/>
+<via x="42.38625" y="11.495" extent="1-16" drill="0.3048"/>
 <wire x1="42.38625" y1="6.0325" x2="42.38625" y2="11.495" width="0.2032" layer="1"/>
-<via x="42.38625" y="11.495" extent="1-16" drill="0.3048"/>
 <wire x1="42.38625" y1="11.495" x2="41.81625" y2="12.065" width="0.2032" layer="16"/>
 <wire x1="41.81625" y1="12.065" x2="34.925" y2="12.065" width="0.2032" layer="16"/>
 <via x="34.925" y="12.065" extent="1-16" drill="0.3048"/>
 <wire x1="34.925" y1="12.065" x2="33.72" y2="12.065" width="0.2032" layer="1"/>
+<contactref element="U$6" pad="1"/>
+<wire x1="22.780625" y1="2.143125" x2="40.243125" y2="2.143125" width="0.2032" layer="16"/>
+<via x="42.38625" y="4.28625" extent="1-16" drill="0.3048"/>
+<wire x1="42.38625" y1="4.28625" x2="42.38625" y2="6.0325" width="0.2032" layer="1"/>
+<wire x1="40.243125" y1="2.143125" x2="42.38625" y2="4.28625" width="0.2032" layer="16"/>
 </signal>
 <signal name="SSR+">
 <contactref element="JP102" pad="P1"/>
 <contactref element="U$13" pad="7"/>
-<wire x1="13.275625" y1="9.096875" x2="13.275625" y2="9.783125" width="0.2032" layer="1"/>
-<wire x1="13.275625" y1="9.783125" x2="13.335" y2="9.8425" width="0.2032" layer="1"/>
-<via x="13.335" y="9.8425" extent="1-16" drill="0.3048"/>
-<wire x1="13.335" y1="9.8425" x2="14.9225" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="13.275625" y1="9.49375" x2="13.275625" y2="9.783125" width="0.2032" layer="1"/>
+<wire x1="13.275625" y1="9.783125" x2="13.335" y2="10.31875" width="0.2032" layer="1"/>
+<via x="13.335" y="10.31875" extent="1-16" drill="0.3048"/>
+<wire x1="13.335" y1="10.31875" x2="14.9225" y2="11.43" width="0.2032" layer="16"/>
 <wire x1="14.9225" y1="11.43" x2="15.875" y2="11.43" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$23">
@@ -3035,7 +3018,7 @@ design rules under a new name.</descript
 <via x="17.62125" y="9.128125" extent="1-16" drill="0.3048"/>
 <wire x1="17.62125" y1="9.128125" x2="17.145" y2="9.128125" width="0.2032" layer="1"/>
 <wire x1="17.145" y1="9.128125" x2="16.875625" y2="8.85875" width="0.2032" layer="1"/>
-<wire x1="16.875625" y1="8.85875" x2="16.875625" y2="8.496875" width="0.2032" layer="1"/>
+<wire x1="16.875625" y1="8.85875" x2="16.875625" y2="8.89375" width="0.2032" layer="1"/>
 </signal>
 <signal name="!RES">
 <via x="5.715" y="5.87375" extent="1-16" drill="0.3048"/>
@@ -3047,8 +3030,8 @@ design rules under a new name.</descript
 <wire x1="8.335" y1="6.17625" x2="8.27" y2="6.17625" width="0.2032" layer="16"/>
 <wire x1="8.27" y1="6.17625" x2="8.255" y2="6.19125" width="0.2032" layer="16"/>
 <contactref element="U$13" pad="9"/>
-<wire x1="12.175625" y1="8.496875" x2="6.909375" y2="8.496875" width="0.2032" layer="1"/>
-<wire x1="6.909375" y1="8.496875" x2="5.794375" y2="7.381875" width="0.2032" layer="1"/>
+<wire x1="12.175625" y1="8.89375" x2="7.30625" y2="8.89375" width="0.2032" layer="1"/>
+<wire x1="7.30625" y1="8.89375" x2="5.794375" y2="7.381875" width="0.2032" layer="1"/>
 <wire x1="5.794375" y1="7.381875" x2="5.794375" y2="5.953125" width="0.2032" layer="1"/>
 <wire x1="5.794375" y1="5.953125" x2="5.715" y2="5.87375" width="0.2032" layer="1"/>
 </signal>
@@ -3058,8 +3041,8 @@ design rules under a new name.</descript
 <contactref element="LCD1" pad="10"/>
 <wire x1="8.335" y1="5.52625" x2="6.53875" y2="5.52625" width="0.2032" layer="16"/>
 <contactref element="U$13" pad="10"/>
-<wire x1="12.175625" y1="7.996875" x2="7.361875" y2="7.996875" width="0.2032" layer="1"/>
-<wire x1="7.361875" y1="7.996875" x2="6.50875" y2="7.14375" width="0.2032" layer="1"/>
+<wire x1="12.175625" y1="8.39375" x2="7.75875" y2="8.39375" width="0.2032" layer="1"/>
+<wire x1="7.75875" y1="8.39375" x2="6.50875" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="6.50875" y1="7.14375" x2="6.50875" y2="5.55625" width="0.2032" layer="1"/>
 </signal>
 <signal name="T-">
@@ -3080,37 +3063,24 @@ design rules under a new name.</descript
 <contactref element="SW101" pad="2"/>
 <wire x1="32.385" y1="5.715" x2="33.655" y2="5.715" width="0.2032" layer="16"/>
 <via x="33.655" y="5.715" extent="1-16" drill="0.3048"/>
-<contactref element="U$13" pad="28"/>
 <wire x1="20.32" y1="7.14375" x2="30.95625" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="30.95625" y1="7.14375" x2="32.385" y2="5.715" width="0.2032" layer="16"/>
 <wire x1="33.655" y1="5.715" x2="32.57386875" y2="4.63386875" width="0.2032" layer="1"/>
 <wire x1="20.32" y1="7.14375" x2="19.764375" y2="6.588125" width="0.2032" layer="16"/>
 <wire x1="19.764375" y1="6.588125" x2="19.288125" y2="6.588125" width="0.2032" layer="16"/>
 <via x="19.288125" y="6.588125" extent="1-16" drill="0.3048"/>
-<wire x1="16.875625" y1="6.496875" x2="19.196875" y2="6.496875" width="0.2032" layer="1"/>
 <wire x1="19.196875" y1="6.496875" x2="19.288125" y2="6.588125" width="0.2032" layer="1"/>
-</signal>
-<signal name="N$17">
-<contactref element="U$13" pad="22"/>
-<contactref element="RN1" pad="1"/>
-<wire x1="15.275625" y1="4.396875" x2="15.275625" y2="3.774375" width="0.2032" layer="1"/>
-<wire x1="15.275625" y1="3.774375" x2="15.95125" y2="3.09875" width="0.2032" layer="1"/>
-<wire x1="15.95125" y1="3.09875" x2="18.5925" y2="3.09875" width="0.2032" layer="1"/>
-</signal>
-<signal name="N$18">
-<contactref element="U$13" pad="21"/>
-<contactref element="RN1" pad="2"/>
-<wire x1="14.775625" y1="4.396875" x2="14.775625" y2="3.639375" width="0.2032" layer="1"/>
-<wire x1="14.775625" y1="3.639375" x2="16.11625" y2="2.29875" width="0.2032" layer="1"/>
-<wire x1="16.11625" y1="2.29875" x2="18.5925" y2="2.29875" width="0.2032" layer="1"/>
+<contactref element="U$13" pad="27"/>
+<wire x1="16.875625" y1="6.39375" x2="19.09375" y2="6.39375" width="0.2032" layer="1"/>
+<wire x1="19.09375" y1="6.39375" x2="19.288125" y2="6.588125" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MOSI">
 <via x="6.50875" y="4.206875" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="12"/>
 <contactref element="U$13" pad="13"/>
-<wire x1="12.175625" y1="6.496875" x2="11.815" y2="6.496875" width="0.2032" layer="1"/>
-<wire x1="11.815" y1="6.496875" x2="11.509375" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="11.509375" y1="6.19125" x2="8.711875" y2="6.19125" width="0.2032" layer="1"/>
+<wire x1="12.175625" y1="6.89375" x2="11.65625" y2="6.655625" width="0.2032" layer="1"/>
+<wire x1="11.65625" y1="6.655625" x2="11.350625" y2="6.19125" width="0.2032" layer="1"/>
+<wire x1="11.350625" y1="6.19125" x2="8.711875" y2="6.19125" width="0.2032" layer="1"/>
 <wire x1="8.335" y1="4.22625" x2="6.528125" y2="4.22625" width="0.2032" layer="16"/>
 <wire x1="6.528125" y1="4.22625" x2="6.50875" y2="4.206875" width="0.2032" layer="16"/>
 <wire x1="8.711875" y1="6.19125" x2="6.7275" y2="4.206875" width="0.2032" layer="1"/>
@@ -3128,10 +3098,10 @@ design rules under a new name.</descript
 <wire x1="21.034375" y1="5.953125" x2="19.84375" y2="4.7625" width="0.2032" layer="16"/>
 <wire x1="19.84375" y1="4.7625" x2="12.97560625" y2="4.7625" width="0.2032" layer="16"/>
 <wire x1="12.97560625" y1="4.7625" x2="11.43" y2="6.38748125" width="0.2032" layer="16"/>
-<wire x1="11.43" y1="6.38748125" x2="11.43" y2="6.905625" width="0.2032" layer="16"/>
-<via x="11.43" y="6.905625" extent="1-16" drill="0.3048"/>
-<wire x1="12.175625" y1="6.996875" x2="11.52125" y2="6.996875" width="0.2032" layer="1"/>
-<wire x1="11.52125" y1="6.996875" x2="11.43" y2="6.905625" width="0.2032" layer="1"/>
+<wire x1="11.43" y1="6.38748125" x2="11.43" y2="7.14375" width="0.2032" layer="16"/>
+<via x="11.43" y="7.14375" extent="1-16" drill="0.3048"/>
+<wire x1="12.175625" y1="7.39375" x2="11.68" y2="7.39375" width="0.2032" layer="1"/>
+<wire x1="11.68" y1="7.39375" x2="11.43" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="26.19375" y1="5.000625" x2="26.9875" y2="5.55625" width="0.2032" layer="16"/>
 <wire x1="26.9875" y1="5.55625" x2="26.9875" y2="5.715" width="0.2032" layer="16"/>
 </signal>
@@ -3141,20 +3111,20 @@ design rules under a new name.</descript
 <contactref element="U104" pad="5"/>
 <via x="24.13" y="5.23875" extent="1-16" drill="0.3048"/>
 <contactref element="U$13" pad="11"/>
-<wire x1="10.830625" y1="7.4175" x2="10.795" y2="7.381875" width="0.2032" layer="1"/>
-<via x="10.795" y="7.381875" extent="1-16" drill="0.3048"/>
-<wire x1="10.795" y1="7.381875" x2="10.795" y2="6.344109375" width="0.2032" layer="16"/>
+<wire x1="10.830625" y1="7.814375" x2="10.795" y2="7.858125" width="0.2032" layer="1"/>
+<via x="10.795" y="7.858125" extent="1-16" drill="0.3048"/>
+<wire x1="10.795" y1="7.858125" x2="10.795" y2="6.344109375" width="0.2032" layer="16"/>
 <wire x1="10.795" y1="6.344109375" x2="12.852859375" y2="4.28625" width="0.2032" layer="16"/>
 <wire x1="12.852859375" y1="4.28625" x2="20.0025" y2="4.28625" width="0.2032" layer="16"/>
-<wire x1="12.175625" y1="7.496875" x2="10.795" y2="7.496875" width="0.2032" layer="1"/>
-<wire x1="10.795" y1="7.496875" x2="8.131875" y2="7.496875" width="0.2032" layer="1"/>
-<wire x1="8.131875" y1="7.496875" x2="7.62" y2="6.985" width="0.2032" layer="1"/>
+<wire x1="12.175625" y1="7.89375" x2="10.795" y2="7.89375" width="0.2032" layer="1"/>
+<wire x1="10.795" y1="7.89375" x2="8.52875" y2="7.89375" width="0.2032" layer="1"/>
+<wire x1="8.52875" y1="7.89375" x2="7.62" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="7.62" y1="6.985" x2="7.62" y2="5.67" width="0.2032" layer="1"/>
 <wire x1="7.62" y1="5.67" x2="6.82625" y2="4.87625" width="0.2032" layer="1"/>
 <wire x1="6.82625" y1="4.87625" x2="5.9875" y2="4.87625" width="0.2032" layer="1"/>
 <wire x1="5.9875" y1="4.87625" x2="6.0325" y2="4.92125" width="0.2032" layer="1"/>
-<wire x1="10.830625" y1="7.4175" x2="10.830625" y2="7.46125" width="0.2032" layer="1"/>
-<wire x1="10.830625" y1="7.46125" x2="10.795" y2="7.496875" width="0.2032" layer="1"/>
+<wire x1="10.830625" y1="7.814375" x2="10.75125" y2="7.858125" width="0.2032" layer="1"/>
+<wire x1="10.75125" y1="7.858125" x2="10.795" y2="7.89375" width="0.2032" layer="1"/>
 <wire x1="20.0025" y1="4.28625" x2="21.193125" y2="5.476875" width="0.2032" layer="16"/>
 <wire x1="21.193125" y1="5.476875" x2="23.891875" y2="5.476875" width="0.2032" layer="16"/>
 <wire x1="24.4475" y1="3.64" x2="24.45875" y2="4.91" width="0.2032" layer="1"/>
@@ -3168,17 +3138,15 @@ design rules under a new name.</descript
 <via x="5.159375" y="6.82625" extent="1-16" drill="0.3048"/>
 <wire x1="8.335" y1="6.82625" x2="5.159375" y2="6.82625" width="0.2032" layer="16"/>
 <contactref element="U$13" pad="8"/>
-<wire x1="12.775625" y1="9.096875" x2="6.874375" y2="9.096875" width="0.2032" layer="1"/>
-<wire x1="6.874375" y1="9.096875" x2="5.159375" y2="7.381875" width="0.2032" layer="1"/>
+<wire x1="12.775625" y1="9.49375" x2="7.27125" y2="9.49375" width="0.2032" layer="1"/>
+<wire x1="7.27125" y1="9.49375" x2="5.159375" y2="7.381875" width="0.2032" layer="1"/>
 <wire x1="5.159375" y1="7.381875" x2="5.159375" y2="6.82625" width="0.2032" layer="1"/>
 </signal>
 <signal name="!CS_MAX">
 <contactref element="U104" pad="6"/>
 <contactref element="U$13" pad="25"/>
 <wire x1="19.52625" y1="5.23875" x2="20.6375" y2="6.35" width="0.2032" layer="16"/>
-<wire x1="20.6375" y1="6.35" x2="24.765" y2="6.35" width="0.2032" layer="16"/>
-<wire x1="24.765" y1="6.35" x2="24.844375" y2="6.270625" width="0.2032" layer="16"/>
-<wire x1="24.844375" y1="6.270625" x2="25.7175" y2="5.794375" width="0.2032" layer="16"/>
+<wire x1="20.6375" y1="6.35" x2="25.161875" y2="6.35" width="0.2032" layer="16"/>
 <via x="25.7175" y="5.794375" extent="1-16" drill="0.3048"/>
 <wire x1="25.7175" y1="5.794375" x2="25.7175" y2="3.64" width="0.2032" layer="1"/>
 <wire x1="19.52625" y1="5.23875" x2="18.176875" y2="5.23875" width="0.2032" layer="16"/>
@@ -3186,25 +3154,13 @@ design rules under a new name.</descript
 <via x="18.018125" y="5.3975" extent="1-16" drill="0.3048"/>
 <wire x1="18.018125" y1="5.3975" x2="17.62125" y2="5.000625" width="0.2032" layer="1"/>
 <wire x1="17.62125" y1="5.000625" x2="16.879375" y2="5.000625" width="0.2032" layer="1"/>
-<wire x1="16.879375" y1="5.000625" x2="16.875625" y2="4.996875" width="0.2032" layer="1"/>
-</signal>
-<signal name="N$5">
-<contactref element="U$13" pad="24"/>
-<contactref element="TP1" pad="TP"/>
-<wire x1="16.275625" y1="4.396875" x2="17.986875" y2="4.396875" width="0.2032" layer="1"/>
-<wire x1="17.986875" y1="4.396875" x2="18.25625" y2="4.445" width="0.2032" layer="1"/>
-</signal>
-<signal name="N$6">
-<contactref element="U$13" pad="23"/>
-<contactref element="TP2" pad="TP"/>
-<wire x1="15.775625" y1="4.396875" x2="15.775625" y2="3.98875" width="0.2032" layer="1"/>
-<wire x1="15.775625" y1="3.98875" x2="16.03375" y2="3.730625" width="0.2032" layer="1"/>
-<wire x1="16.03375" y1="3.730625" x2="17.62125" y2="3.730625" width="0.2032" layer="1"/>
+<wire x1="16.879375" y1="5.000625" x2="16.875625" y2="5.39375" width="0.2032" layer="1"/>
+<wire x1="25.161875" y1="6.35" x2="25.7175" y2="5.794375" width="0.2032" layer="16"/>
 </signal>
 <signal name="AUX-TX">
 <contactref element="JP1" pad="P1"/>
 <contactref element="U$13" pad="19"/>
-<wire x1="13.775625" y1="4.396875" x2="13.775625" y2="3.933125" width="0.2032" layer="1"/>
+<wire x1="13.775625" y1="4.79375" x2="13.775625" y2="3.933125" width="0.2032" layer="1"/>
 <wire x1="13.775625" y1="3.933125" x2="13.49375" y2="3.65125" width="0.2032" layer="1"/>
 <wire x1="13.49375" y1="3.65125" x2="11.58875" y2="3.65125" width="0.2032" layer="1"/>
 <wire x1="11.58875" y1="3.65125" x2="11.43" y2="3.4925" width="0.2032" layer="1"/>
@@ -3213,10 +3169,31 @@ design rules under a new name.</descript
 <signal name="AUX-RX">
 <contactref element="JP1" pad="P2"/>
 <contactref element="U$13" pad="20"/>
-<wire x1="14.275625" y1="4.396875" x2="14.275625" y2="3.798125" width="0.2032" layer="1"/>
+<wire x1="14.275625" y1="4.79375" x2="14.275625" y2="3.798125" width="0.2032" layer="1"/>
 <wire x1="14.275625" y1="3.798125" x2="13.97" y2="3.4925" width="0.2032" layer="1"/>
 <wire x1="13.97" y1="3.4925" x2="13.97" y2="2.38125" width="0.2032" layer="1"/>
 </signal>
+<signal name="SWCLK">
+<contactref element="U$6" pad="3"/>
+<contactref element="U$13" pad="24"/>
+<via x="20.240625" y="3.095625" extent="1-16" drill="0.3048"/>
+<wire x1="20.32" y1="2.2225" x2="20.240625" y2="2.143125" width="0.2032" layer="16"/>
+<wire x1="16.275625" y1="4.79375" x2="18.939375" y2="4.396875" width="0.2032" layer="1"/>
+<wire x1="18.939375" y1="4.396875" x2="20.240625" y2="3.095625" width="0.2032" layer="1"/>
+<wire x1="20.240625" y1="3.095625" x2="20.240625" y2="2.143125" width="0.2032" layer="16"/>
+</signal>
+<signal name="SWDIO">
+<contactref element="U$6" pad="4"/>
+<contactref element="U$13" pad="23"/>
+<wire x1="15.775625" y1="4.79375" x2="15.775625" y2="3.909375" width="0.2032" layer="1"/>
+<via x="18.970625" y="3.095625" extent="1-16" drill="0.3048"/>
+<wire x1="19.05" y1="2.2225" x2="18.970625" y2="2.143125" width="0.2032" layer="16"/>
+<wire x1="15.775625" y1="3.909375" x2="15.875" y2="3.81" width="0.2032" layer="1"/>
+<wire x1="15.875" y1="3.81" x2="18.811875" y2="3.81" width="0.2032" layer="1"/>
+<wire x1="18.811875" y1="3.81" x2="18.970625" y2="3.65125" width="0.2032" layer="1"/>
+<wire x1="18.970625" y1="3.65125" x2="18.970625" y2="3.095625" width="0.2032" layer="1"/>
+<wire x1="18.970625" y1="3.095625" x2="18.970625" y2="2.143125" width="0.2032" layer="16"/>
+</signal>
 </signals>
 </board>
 </drawing>