# HG changeset patch
# User Ethan Zonca <ez@ethanzonca.com>
# Date 2016-04-30 22:11:35
# Node ID 9025c69fcdae24681b08e3c33b5ef72d62f7b608
# Parent  82c95875dd59ad8e6aa6b9a7a701dc5c6ec0da39

More DFM work

diff --git a/bom.ods b/bom.ods
index 4fec5a26f638fbc4d58ce0a01538b96fc932525a..544d3f84346a5fea4d3df5fec169124a98632adb
GIT binary patch
literal 18849
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
a=-lp%qks<ZW@Q5@5Cp;kpf+h&5Dx&cp}5Te

diff --git a/canable.brd b/canable.brd
--- a/canable.brd
+++ b/canable.brd
@@ -23,10 +23,10 @@
 <layer number="13" name="Route13" color="4" fill="5" visible="no" active="no"/>
 <layer number="14" name="Route14" color="1" fill="6" visible="no" active="no"/>
 <layer number="15" name="Route15" color="4" fill="6" visible="no" active="no"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="yes"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
-<layer number="19" name="Unrouted" color="6" fill="1" visible="no" active="yes"/>
+<layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
@@ -134,7 +134,7 @@
 <layer number="153" name="FabDoc1" color="7" fill="1" visible="no" active="yes"/>
 <layer number="154" name="FabDoc2" color="7" fill="1" visible="no" active="yes"/>
 <layer number="155" name="FabDoc3" color="7" fill="1" visible="no" active="yes"/>
-<layer number="190" name="Comments" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="190" name="Comments" color="7" fill="1" visible="no" active="yes"/>
 <layer number="191" name="mNets" color="7" fill="1" visible="no" active="yes"/>
 <layer number="192" name="mBusses" color="7" fill="1" visible="no" active="yes"/>
 <layer number="193" name="mPins" color="7" fill="1" visible="no" active="yes"/>
@@ -183,34 +183,34 @@
 </layers>
 <board>
 <plain>
-<dimension x1="0.635" y1="38.735" x2="15.875" y2="38.735" x3="8.255" y3="-5.08" textsize="1.27" layer="209" dtype="horizontal"/>
-<wire x1="0.635" y1="37.465" x2="0.635" y2="0.79375" width="0" layer="20"/>
+<dimension x1="0.635" y1="39.37" x2="15.875" y2="39.37" x3="8.255" y3="-5.08" textsize="1.27" layer="209" dtype="horizontal"/>
+<wire x1="0.635" y1="38.1" x2="0.635" y2="0.79375" width="0" layer="20"/>
 <wire x1="0.635" y1="0.79375" x2="1.27" y2="0.15875" width="0" layer="20" curve="90"/>
 <wire x1="1.27" y1="0.15875" x2="15.24" y2="0.15875" width="0" layer="20"/>
 <wire x1="15.24" y1="0.15875" x2="15.875" y2="0.79375" width="0" layer="20" curve="90"/>
-<wire x1="15.875" y1="0.79375" x2="15.875" y2="37.465" width="0" layer="20"/>
-<wire x1="15.875" y1="37.465" x2="15.24" y2="38.1" width="0" layer="20" curve="90"/>
-<wire x1="15.24" y1="38.1" x2="1.27" y2="38.1" width="0" layer="20"/>
-<wire x1="1.27" y1="38.1" x2="0.635" y2="37.465" width="0" layer="20" curve="90"/>
-<dimension x1="16.51" y1="-1.11125" x2="17.145" y2="38.1" x3="-5.08" y3="18.494375" textsize="1.778" layer="209" dtype="vertical"/>
+<wire x1="15.875" y1="0.79375" x2="15.875" y2="38.1" width="0" layer="20"/>
+<wire x1="15.875" y1="38.1" x2="15.24" y2="38.735" width="0" layer="20" curve="90"/>
+<wire x1="15.24" y1="38.735" x2="1.27" y2="38.735" width="0" layer="20"/>
+<wire x1="1.27" y1="38.735" x2="0.635" y2="38.1" width="0" layer="20" curve="90"/>
+<dimension x1="16.51" y1="-1.11125" x2="17.145" y2="38.735" x3="-5.08" y3="18.811875" textsize="1.778" layer="209" dtype="vertical"/>
 <circle x="2.69875" y="0.79375" radius="0.15875" width="0.127" layer="21"/>
 <circle x="13.81125" y="0.79375" radius="0.15875" width="0.127" layer="21"/>
-<text x="7.77875" y="30.63875" size="0.8128" layer="21" ratio="16" rot="SR180">CANH</text>
-<text x="11.7475" y="30.63875" size="0.8128" layer="21" ratio="16" rot="SR180">CANL</text>
-<text x="14.9225" y="30.63875" size="0.8128" layer="21" ratio="16" rot="SR180">GND</text>
-<text x="12.22375" y="25.55875" size="0.8128" layer="21" ratio="16" rot="R90">TERM</text>
-<text x="4.28625" y="25.4" size="0.8128" layer="21" ratio="16" rot="SR270">BOOT</text>
+<text x="7.77875" y="31.27375" size="0.8128" layer="21" ratio="16" rot="SR180">CANH</text>
+<text x="11.7475" y="31.27375" size="0.8128" layer="21" ratio="16" rot="SR180">CANL</text>
+<text x="14.9225" y="31.27375" size="0.8128" layer="21" ratio="16" rot="SR180">GND</text>
+<text x="12.22375" y="26.19375" size="0.8128" layer="21" ratio="16" rot="R90">TERM</text>
+<text x="4.28625" y="26.035" size="0.8128" layer="21" ratio="16" rot="SR270">BOOT</text>
 <text x="2.69875" y="0.79375" size="1.016" layer="22" ratio="16" rot="SMR90">canable.io</text>
-<text x="5.08" y="33.49625" size="0.8128" layer="22" ratio="16" rot="SMR180">CANH</text>
-<text x="8.73125" y="33.49625" size="0.8128" layer="22" ratio="16" rot="SMR180">CANL</text>
-<text x="12.7" y="33.49625" size="0.8128" layer="22" ratio="16" rot="SMR180">GND</text>
+<text x="5.08" y="34.13125" size="0.8128" layer="22" ratio="16" rot="SMR180">CANH</text>
+<text x="8.73125" y="34.13125" size="0.8128" layer="22" ratio="16" rot="SMR180">CANL</text>
+<text x="12.7" y="34.13125" size="0.8128" layer="22" ratio="16" rot="SMR180">GND</text>
 <text x="0.9525" y="3.96875" size="0.8128" layer="21" ratio="16">Pwr</text>
 <text x="13.6525" y="3.96875" size="0.8128" layer="21" ratio="16">Act</text>
-<text x="2.2225" y="33.49625" size="0.8128" layer="22" ratio="16" rot="SMR180">5v</text>
-<text x="3.81" y="30.63875" size="0.8128" layer="21" ratio="16" rot="SR180">5v</text>
+<text x="2.2225" y="34.13125" size="0.8128" layer="22" ratio="16" rot="SMR180">5v</text>
+<text x="3.81" y="31.27375" size="0.8128" layer="21" ratio="16" rot="SR180">5v</text>
 <text x="1.42875" y="0.79375" size="1.016" layer="22" ratio="16" rot="SMR90">by protofusion.org</text>
-<circle x="3.93125" y="18.6265" radius="0.1" width="0.4064" layer="21"/>
-<circle x="6.3125" y="24.50025" radius="0.1" width="0.4064" layer="21"/>
+<circle x="3.93125" y="19.2615" radius="0.1" width="0.4064" layer="21"/>
+<circle x="6.3125" y="25.13525" radius="0.1" width="0.4064" layer="21"/>
 </plain>
 <libraries>
 <library name="SparkFun-LED">
@@ -243,47 +243,6 @@ We've spent an enormous amount of time c
 &lt;br&gt;&lt;br&gt;
 You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
 <packages>
-<package name="USB-MICROB">
-<description>Micro USB Package</description>
-<wire x1="-3.4" y1="-2.15" x2="-3" y2="-2.15" width="0.127" layer="51"/>
-<wire x1="3" y1="-2.15" x2="3.4" y2="-2.15" width="0.127" layer="51"/>
-<wire x1="-3.4" y1="-2.15" x2="-3.4" y2="-1.45" width="0.127" layer="51"/>
-<wire x1="-3.4" y1="-1.45" x2="-3.4" y2="2.85" width="0.127" layer="51"/>
-<wire x1="3.4" y1="2.85" x2="2.2" y2="2.85" width="0.127" layer="51"/>
-<wire x1="3.4" y1="2.85" x2="3.4" y2="-1.45" width="0.127" layer="51"/>
-<wire x1="3.4" y1="-1.45" x2="3.4" y2="-2.15" width="0.127" layer="51"/>
-<wire x1="-3.4" y1="-1.45" x2="3.4" y2="-1.45" width="0.127" layer="51"/>
-<wire x1="-3.4" y1="1.25" x2="-3.4" y2="2.85" width="0.2032" layer="21"/>
-<wire x1="-3.4" y1="2.85" x2="-2.2" y2="2.85" width="0.2032" layer="21"/>
-<wire x1="3.4" y1="2.85" x2="2.2" y2="2.85" width="0.2032" layer="21"/>
-<wire x1="3.4" y1="1.25" x2="3.4" y2="2.85" width="0.2032" layer="21"/>
-<wire x1="-3.4" y1="-1.45" x2="3.4" y2="-1.45" width="0.2032" layer="21"/>
-<wire x1="-2.2" y1="1.45" x2="2.2" y2="1.45" width="0.127" layer="51"/>
-<wire x1="2.2" y1="1.45" x2="2.2" y2="2.85" width="0.127" layer="51"/>
-<wire x1="-2.2" y1="1.45" x2="-2.2" y2="2.85" width="0.127" layer="51"/>
-<wire x1="-3.4" y1="2.85" x2="-2.2" y2="2.85" width="0.127" layer="51"/>
-<wire x1="-2.2" y1="2.85" x2="-2.2" y2="1.45" width="0.2032" layer="21"/>
-<wire x1="-2.2" y1="1.45" x2="2.2" y2="1.45" width="0.2032" layer="21"/>
-<wire x1="2.2" y1="1.45" x2="2.2" y2="2.85" width="0.2032" layer="21"/>
-<wire x1="-3.4" y1="-2.15" x2="-4" y2="-2.75" width="0.2032" layer="51"/>
-<wire x1="3.4" y1="-2.15" x2="4" y2="-2.75" width="0.2032" layer="51"/>
-<wire x1="-3" y1="-2.15" x2="-3" y2="-2.55" width="0.127" layer="51"/>
-<wire x1="-2.8" y1="-2.8" x2="2.75" y2="-2.8" width="0.127" layer="51"/>
-<wire x1="3" y1="-2.6" x2="3" y2="-2.15" width="0.127" layer="51"/>
-<wire x1="-3" y1="-2.55" x2="-2.8" y2="-2.8" width="0.127" layer="51" curve="84.547378"/>
-<wire x1="2.75" y1="-2.8" x2="3" y2="-2.6" width="0.127" layer="51" curve="84.547378"/>
-<smd name="VBUS" x="-1.3" y="2.65" dx="1.4" dy="0.35" layer="1" rot="R90"/>
-<smd name="GND" x="1.3" y="2.65" dx="1.4" dy="0.35" layer="1" rot="R90"/>
-<smd name="D-" x="-0.65" y="2.65" dx="1.4" dy="0.35" layer="1" rot="R90"/>
-<smd name="D+" x="0" y="2.65" dx="1.4" dy="0.35" layer="1" rot="R90"/>
-<smd name="ID" x="0.65" y="2.65" dx="1.4" dy="0.35" layer="1" rot="R90"/>
-<smd name="MT1" x="-4" y="0" dx="1.8" dy="1.9" layer="1"/>
-<smd name="MT2" x="4" y="0" dx="1.8" dy="1.9" layer="1"/>
-<text x="-1.6" y="-0.35" size="0.762" layer="25">&gt;NAME</text>
-<text x="-1.905" y="-3.175" size="0.762" layer="27">&gt;VALUE</text>
-<smd name="P$1" x="-1.27" y="0" dx="1.9" dy="1.9" layer="1"/>
-<smd name="P$2" x="1.27" y="0" dx="1.9" dy="1.9" layer="1"/>
-</package>
 <package name="1X03_LOCK">
 <wire x1="3.81" y1="0.635" x2="4.445" y2="1.27" width="0.2032" layer="21"/>
 <wire x1="4.445" y1="1.27" x2="5.715" y2="1.27" width="0.2032" layer="21"/>
@@ -1841,6 +1800,45 @@ http://dangerousprototypes.com</descript
 </package>
 </packages>
 </library>
+<library name="MF_Connectors">
+<packages>
+<package name="MICROUSB-RIGHT">
+<description>&lt;b&gt;Description:&lt;/b&gt; Package for Micro USB Type B connector. Based on FCI 10118193-0001LF.&lt;br&gt;</description>
+<smd name="3" x="0" y="1.27" dx="0.4" dy="1.35" layer="1" rot="R180"/>
+<smd name="4" x="0.65" y="1.27" dx="0.4" dy="1.35" layer="1" rot="R180"/>
+<smd name="2" x="-0.65" y="1.27" dx="0.4" dy="1.35" layer="1" rot="R180"/>
+<smd name="1" x="-1.3" y="1.27" dx="0.4" dy="1.35" layer="1" rot="R180"/>
+<smd name="5" x="1.3" y="1.27" dx="0.4" dy="1.35" layer="1" rot="R180"/>
+<smd name="S3" x="-3.2" y="1.27" dx="1.4" dy="1.6" layer="1" rot="R90"/>
+<smd name="S4" x="3.2" y="1.27" dx="1.4" dy="1.6" layer="1" rot="R90"/>
+<text x="-5.08" y="2.7" size="0.8128" layer="25" font="vector" ratio="16">&gt;NAME</text>
+<wire x1="-5.08" y1="-2.855" x2="5.08" y2="-2.855" width="0.127" layer="21"/>
+<wire x1="-5.08" y1="-2.855" x2="-5.08" y2="1.3" width="0.127" layer="21"/>
+<wire x1="-5.08" y1="1.3" x2="-4.08" y2="2.3" width="0.127" layer="21"/>
+<wire x1="-4.08" y1="2.3" x2="4.08" y2="2.3" width="0.127" layer="21"/>
+<wire x1="4.08" y1="2.3" x2="5.08" y2="1.3" width="0.127" layer="21"/>
+<wire x1="5.08" y1="1.3" x2="5.08" y2="-2.855" width="0.127" layer="21"/>
+<smd name="S5" x="-1.2" y="-1.405" dx="1.9" dy="1.9" layer="1"/>
+<smd name="S6" x="1.2" y="-1.405" dx="1.9" dy="1.9" layer="1"/>
+<smd name="S1" x="-3.3" y="-1.4" dx="0.9" dy="1.6" layer="1" roundness="100" rot="R180"/>
+<smd name="S2" x="3.3" y="-1.4" dx="0.9" dy="1.6" layer="1" roundness="100" rot="R180"/>
+<wire x1="-3.55" y1="-1.05" x2="-3.55" y2="-1.75" width="0.01" layer="20"/>
+<wire x1="-3.55" y1="-1.75" x2="-3.3" y2="-2" width="0.01" layer="20" curve="90"/>
+<wire x1="-3.3" y1="-2" x2="-3.05" y2="-1.75" width="0.01" layer="20" curve="90"/>
+<wire x1="-3.05" y1="-1.75" x2="-3.05" y2="-1.05" width="0.01" layer="20"/>
+<wire x1="-3.05" y1="-1.05" x2="-3.3" y2="-0.8" width="0.01" layer="20" curve="90"/>
+<wire x1="-3.3" y1="-0.8" x2="-3.55" y2="-1.05" width="0.01" layer="20" curve="90"/>
+<wire x1="3.05" y1="-1.05" x2="3.05" y2="-1.75" width="0.01" layer="20"/>
+<wire x1="3.05" y1="-1.75" x2="3.3" y2="-2" width="0.01" layer="20" curve="90"/>
+<wire x1="3.3" y1="-2" x2="3.55" y2="-1.75" width="0.01" layer="20" curve="90"/>
+<wire x1="3.55" y1="-1.75" x2="3.55" y2="-1.05" width="0.01" layer="20"/>
+<wire x1="3.55" y1="-1.05" x2="3.3" y2="-0.8" width="0.01" layer="20" curve="90"/>
+<wire x1="3.3" y1="-0.8" x2="3.05" y2="-1.05" width="0.01" layer="20" curve="90"/>
+<smd name="S7" x="-3.3" y="-1.4" dx="0.9" dy="1.6" layer="16" roundness="100" rot="R180" cream="no"/>
+<smd name="S8" x="3.3" y="-1.4" dx="0.9" dy="1.6" layer="16" roundness="100" rot="R180" cream="no"/>
+</package>
+</packages>
+</library>
 </libraries>
 <attributes>
 </attributes>
@@ -1850,26 +1848,12 @@ http://dangerousprototypes.com</descript
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<designrules name="Elecrow_2-layer_eagle_rule">
-<description language="de">&lt;b&gt;EAGLE Design Rules&lt;/b&gt;
-&lt;p&gt;
-Die Standard-Design-Rules sind so gewählt, dass sie für 
-die meisten Anwendungen passen. Sollte ihre Platine 
-besondere Anforderungen haben, treffen Sie die erforderlichen
-Einstellungen hier und speichern die Design Rules unter 
-einem neuen Namen ab.</description>
-<description language="en">&lt;b&gt;EAGLE Design Rules&lt;/b&gt;
-&lt;p&gt;
-The default Design Rules have been set to cover
-a wide range of applications. Your particular design
-may have different requirements, so please make the
-necessary adjustments and save your customized
-design rules under a new name.</description>
-<description language="zh">&lt;b&gt;Elecrow EAGLE Design Rules&lt;/b&gt;
-</description>
+<designrules name="MF_Standard_2_Layer">
+<description language="en">&lt;b&gt;MacroFab, INC. EAGLE Design Rules&lt;/b&gt;
+&lt;p&gt;This DRC check is for 2-Layer Standard Capability boards to be manufactured through the MacroFab, INC. service.</description>
 <param name="layerSetup" value="(1*16)"/>
-<param name="mtCopper" value="0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm"/>
-<param name="mtIsolate" value="1.5mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm"/>
+<param name="mtCopper" value="0.035mm 0.0175mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.0175mm 0.035mm"/>
+<param name="mtIsolate" value="1.5mm 1.1mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm"/>
 <param name="mdWireWire" value="6mil"/>
 <param name="mdWirePad" value="6mil"/>
 <param name="mdWireVia" value="6mil"/>
@@ -1895,11 +1879,11 @@ design rules under a new name.</descript
 <param name="rvViaInner" value="0.25"/>
 <param name="rvMicroViaOuter" value="0.25"/>
 <param name="rvMicroViaInner" value="0.25"/>
-<param name="rlMinPadTop" value="10mil"/>
+<param name="rlMinPadTop" value="6mil"/>
 <param name="rlMaxPadTop" value="20mil"/>
-<param name="rlMinPadInner" value="10mil"/>
+<param name="rlMinPadInner" value="6mil"/>
 <param name="rlMaxPadInner" value="20mil"/>
-<param name="rlMinPadBottom" value="10mil"/>
+<param name="rlMinPadBottom" value="6mil"/>
 <param name="rlMaxPadBottom" value="20mil"/>
 <param name="rlMinViaOuter" value="6mil"/>
 <param name="rlMaxViaOuter" value="20mil"/>
@@ -1920,7 +1904,7 @@ design rules under a new name.</descript
 <param name="mlMaxStopFrame" value="2mil"/>
 <param name="mlMinCreamFrame" value="0mil"/>
 <param name="mlMaxCreamFrame" value="0mil"/>
-<param name="mlViaStopLimit" value="100mil"/>
+<param name="mlViaStopLimit" value="25mil"/>
 <param name="srRoundness" value="0"/>
 <param name="srMinRoundness" value="0mil"/>
 <param name="srMaxRoundness" value="0mil"/>
@@ -2032,64 +2016,57 @@ design rules under a new name.</descript
 </pass>
 </autorouter>
 <elements>
-<element name="J2" library="SparkFun-Connectors" package="USB-MICROB" value="USB-MICROB" x="8.255" y="1.42875" smashed="yes">
-<attribute name="PROD_ID" value="CONN-09505" x="36.195" y="-32.86125" size="1.778" layer="27" display="off"/>
-<attribute name="NAME" x="7.686875" y="1.07875" size="0.8128" layer="25" ratio="16"/>
-<attribute name="VALUE" x="6.35" y="-1.74625" size="0.762" layer="27"/>
-</element>
-<element name="U2" library="SparkFun-PowerIC" package="SOT23-5" value="AP2202K-3.3TRG1" x="8.41375" y="7.9375" smashed="yes" rot="R270">
-<attribute name="PROD_ID" value="VREG-00822" x="-24.60625" y="-27.6225" size="1.778" layer="27" rot="R270" display="off"/>
-<attribute name="NAME" x="10.414" y="6.4135" size="0.8128" layer="25" ratio="16" rot="R180"/>
-<attribute name="VALUE" x="8.22325" y="8.89" size="0.4064" layer="27" rot="R270"/>
+<element name="U2" library="SparkFun-PowerIC" package="SOT23-5" value="AP2202K-3.3TRG1" x="8.41375" y="8.5725" smashed="yes" rot="R270">
+<attribute name="PROD_ID" value="VREG-00822" x="-24.60625" y="-26.9875" size="1.778" layer="27" rot="R270" display="off"/>
+<attribute name="NAME" x="10.414" y="7.0485" size="0.8128" layer="25" ratio="16" rot="R180"/>
+<attribute name="VALUE" x="8.22325" y="9.525" size="0.4064" layer="27" rot="R270"/>
 </element>
 <element name="LED1" library="SparkFun-LED" package="LED-0603" value="BLUE" x="14.605" y="2.38125" smashed="yes" rot="R180">
 <attribute name="NAME" x="15.3035" y="3.667125" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="13.5255" y="3.39725" size="0.4064" layer="27" rot="R270"/>
 </element>
-<element name="C5" library="SparkFun-Passives" package="0603-CAP" value="4.7uF" x="4.28625" y="8.89" smashed="yes" rot="R180">
-<attribute name="NAME" x="5.93725" y="9.064625" size="0.8128" layer="25" ratio="16" rot="R270"/>
-<attribute name="VALUE" x="5.36575" y="10.033" size="0.4064" layer="27" rot="R180"/>
+<element name="C5" library="SparkFun-Passives" package="0603-CAP" value="4.7uF" x="4.28625" y="9.525" smashed="yes" rot="R180">
+<attribute name="NAME" x="5.93725" y="9.699625" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="5.36575" y="10.668" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="C7" library="SparkFun-Passives" package="0603-CAP" value="4.7uF" x="11.509375" y="7.9375" smashed="yes" rot="R270">
-<attribute name="NAME" x="9.42975" y="7.286625" size="0.8128" layer="25" ratio="16"/>
-<attribute name="VALUE" x="10.366375" y="9.017" size="0.4064" layer="27" rot="R270"/>
+<element name="C7" library="SparkFun-Passives" package="0603-CAP" value="4.7uF" x="11.509375" y="8.5725" smashed="yes" rot="R270">
+<attribute name="NAME" x="9.42975" y="7.921625" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="10.366375" y="9.652" size="0.4064" layer="27" rot="R270"/>
 </element>
-<element name="R1" library="SparkFun-Passives" package="0603-RES" value="" x="14.605" y="7.9375" smashed="yes" rot="R270">
-<attribute name="NAME" x="15.3035" y="9.4615" size="0.8128" layer="25" ratio="16" rot="R270"/>
-<attribute name="VALUE" x="13.462" y="9.017" size="0.4064" layer="27" rot="R270"/>
+<element name="R1" library="SparkFun-Passives" package="0603-RES" value="" x="14.605" y="8.5725" smashed="yes" rot="R270">
+<attribute name="NAME" x="15.3035" y="10.0965" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="13.462" y="9.652" size="0.4064" layer="27" rot="R270"/>
 </element>
-<element name="C2" library="SparkFun-Passives" package="0603-CAP" value="0.1uF" x="13.335" y="20.32" smashed="yes">
-<attribute name="NAME" x="13.668375" y="21.0185" size="0.8128" layer="25" ratio="16" rot="R90"/>
-<attribute name="VALUE" x="12.2555" y="19.177" size="0.4064" layer="27"/>
+<element name="C2" library="SparkFun-Passives" package="0603-CAP" value="0.1uF" x="13.335" y="20.955" smashed="yes">
+<attribute name="NAME" x="13.668375" y="21.6535" size="0.8128" layer="25" ratio="16" rot="R90"/>
+<attribute name="VALUE" x="12.2555" y="19.812" size="0.4064" layer="27"/>
 </element>
-<element name="C1" library="SparkFun-Passives" package="0603-CAP" value="0.1uF" x="13.0175" y="7.9375" smashed="yes" rot="R270">
-<attribute name="NAME" x="11.176" y="8.397875" size="0.8128" layer="25" ratio="16"/>
-<attribute name="VALUE" x="11.8745" y="9.017" size="0.4064" layer="27" rot="R270"/>
+<element name="C1" library="SparkFun-Passives" package="0603-CAP" value="0.1uF" x="13.0175" y="8.5725" smashed="yes" rot="R270">
+<attribute name="NAME" x="11.176" y="9.032875" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="11.8745" y="9.652" size="0.4064" layer="27" rot="R270"/>
 </element>
-<element name="U3" library="SparkFun-DigitalIC" package="SO08" value="MCP2551" x="8.255" y="25.4">
-<attribute name="PROD_ID" value="IC-09907" x="8.255" y="25.4" size="1.778" layer="27" display="off"/>
+<element name="U3" library="SparkFun-DigitalIC" package="SO08" value="MCP2551" x="8.255" y="26.035">
+<attribute name="PROD_ID" value="IC-09907" x="8.255" y="26.035" size="1.778" layer="27" display="off"/>
 </element>
-<element name="U1" library="Protofusion" package="LQFP48" value="STM32F042C6T6" x="8.255" y="15.24"/>
-<element name="J1" library="Protofusion" package="POGOPROG-CONN-4-ALLSMT" value="POGOPIN-CONN-4" x="14.9225" y="14.44625" rot="R180"/>
+<element name="U1" library="Protofusion" package="LQFP48" value="STM32F042C6T6" x="8.255" y="15.875"/>
+<element name="J1" library="Protofusion" package="POGOPROG-CONN-4-ALLSMT" value="POGOPIN-CONN-4" x="14.9225" y="15.08125" rot="R180"/>
 <element name="LED2" library="SparkFun-LED" package="LED-0603" value="GREEN" x="1.905" y="2.38125" rot="R180"/>
-<element name="R2" library="SparkFun-Passives" package="0603-RES" value="" x="1.905" y="7.9375" rot="R270"/>
-<element name="C3" library="SparkFun-Passives" package="0603-CAP" value="0.1uF" x="4.92125" y="27.305" rot="R90"/>
-<element name="R3" library="SparkFun-Passives" package="0603-RES" value="120" x="11.7475" y="23.8125" rot="R270"/>
-<element name="C4" library="SparkFun-Passives" package="0603-CAP" value="0.1uF" x="3.175" y="20.32" rot="R180"/>
-<element name="C6" library="SparkFun-Passives" package="0603-CAP" value="0.1uF" x="1.905" y="12.85875" rot="R270"/>
-<element name="R4" library="SparkFun-Passives" package="0603-RES" value="" x="1.905" y="17.4625" rot="R90"/>
-<element name="JP2" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="2.54" y="22.86" rot="R90"/>
-<element name="JP1" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="13.97" y="22.86" rot="R90"/>
+<element name="R2" library="SparkFun-Passives" package="0603-RES" value="" x="1.905" y="8.5725" rot="R270"/>
+<element name="C3" library="SparkFun-Passives" package="0603-CAP" value="0.1uF" x="4.92125" y="27.94" rot="R90"/>
+<element name="R3" library="SparkFun-Passives" package="0603-RES" value="120" x="11.7475" y="24.4475" rot="R270"/>
+<element name="C4" library="SparkFun-Passives" package="0603-CAP" value="0.1uF" x="3.175" y="20.955" rot="R180"/>
+<element name="C6" library="SparkFun-Passives" package="0603-CAP" value="0.1uF" x="1.905" y="13.49375" rot="R270"/>
+<element name="R4" library="SparkFun-Passives" package="0603-RES" value="" x="1.905" y="18.0975" rot="R90"/>
+<element name="JP2" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="2.54" y="23.495" rot="R90"/>
+<element name="JP1" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="13.97" y="23.495" rot="R90"/>
 <element name="U$3" library="Protofusion" package="CANABLE-0.2" value="" x="4.7625" y="2.38125" rot="MR90"/>
-<element name="J3" library="SparkFun-Connectors" package="SCREWTERMINAL-3.5MM-4_LOCK" value="" x="3.01625" y="34.925"/>
-<element name="F1" library="dp_devices" package="PTC0805" value="" x="3.65125" y="6.35" rot="R270"/>
+<element name="J3" library="SparkFun-Connectors" package="SCREWTERMINAL-3.5MM-4_LOCK" value="" x="3.01625" y="35.56"/>
+<element name="F1" library="dp_devices" package="PTC0805" value="" x="3.65125" y="6.985" rot="R270"/>
+<element name="J2" library="MF_Connectors" package="MICROUSB-RIGHT" value="" x="8.255" y="2.8575"/>
 </elements>
 <signals>
 <signal name="GND">
 <contactref element="U2" pad="2"/>
-<contactref element="J2" pad="GND"/>
-<contactref element="J2" pad="MT1"/>
-<contactref element="J2" pad="MT2"/>
 <contactref element="LED1" pad="C"/>
 <contactref element="C5" pad="1"/>
 <contactref element="C7" pad="2"/>
@@ -2119,16 +2096,25 @@ design rules under a new name.</descript
 <vertex x="21.59" y="43.18"/>
 <vertex x="-2.54" y="43.18"/>
 </polygon>
-<via x="12.7" y="3.33375" extent="1-16" drill="0.381"/>
-<via x="3.81" y="3.33375" extent="1-16" drill="0.381"/>
-<via x="10.16" y="24.765" extent="1-16" drill="0.381"/>
-<via x="2.8575" y="19.20875" extent="1-16" drill="0.381"/>
-<wire x1="4.92125" y1="28.09875" x2="6.35" y2="28.09875" width="0.254" layer="1"/>
+<via x="13.335" y="3.33375" extent="1-16" drill="0.381"/>
+<via x="3.175" y="3.33375" extent="1-16" drill="0.381"/>
+<via x="10.16" y="25.4" extent="1-16" drill="0.381"/>
+<via x="2.8575" y="19.84375" extent="1-16" drill="0.381"/>
+<wire x1="4.92125" y1="28.73375" x2="6.35" y2="28.73375" width="0.254" layer="1"/>
 <contactref element="J3" pad="4"/>
-<wire x1="10.505" y1="10.94" x2="10.505" y2="9.87" width="0.254" layer="1"/>
-<wire x1="10.505" y1="9.87" x2="10.16" y2="9.525" width="0.254" layer="1"/>
-<via x="4.445" y="10.31875" extent="1-16" drill="0.381"/>
-<via x="5.87375" y="7.77875" extent="1-16" drill="0.381"/>
+<wire x1="10.505" y1="11.575" x2="10.505" y2="10.505" width="0.254" layer="1"/>
+<wire x1="10.505" y1="10.505" x2="10.16" y2="10.16" width="0.254" layer="1"/>
+<via x="4.445" y="10.95375" extent="1-16" drill="0.381"/>
+<via x="5.87375" y="8.41375" extent="1-16" drill="0.381"/>
+<contactref element="J2" pad="5"/>
+<contactref element="J2" pad="S1"/>
+<contactref element="J2" pad="S3"/>
+<contactref element="J2" pad="S5"/>
+<contactref element="J2" pad="S2"/>
+<contactref element="J2" pad="S4"/>
+<contactref element="J2" pad="S6"/>
+<wire x1="9.455" y1="1.4525" x2="11.555" y2="1.4575" width="0" layer="19" extent="1-1"/>
+<wire x1="4.955" y1="1.4575" x2="7.055" y2="1.4525" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="3.3V">
 <contactref element="U2" pad="5"/>
@@ -2143,50 +2129,50 @@ design rules under a new name.</descript
 <contactref element="C2" pad="1"/>
 <contactref element="C4" pad="1"/>
 <contactref element="C6" pad="1"/>
-<wire x1="9.71385" y1="8.8875" x2="9.71385" y2="8.12635" width="0.254" layer="1"/>
-<wire x1="9.71385" y1="8.12635" x2="9.525" y2="7.9375" width="0.254" layer="1"/>
-<via x="9.525" y="7.9375" extent="1-16" drill="0.381"/>
-<via x="3.96875" y="19.05" extent="1-16" drill="0.381"/>
-<via x="1.905" y="14.9225" extent="1-16" drill="0.381"/>
-<via x="12.54125" y="19.05" extent="1-16" drill="0.381"/>
-<wire x1="9.525" y1="13.97" x2="9.525" y2="18.151975" width="0.254" layer="16"/>
-<wire x1="9.525" y1="18.151975" x2="10.423025" y2="19.05" width="0.254" layer="16"/>
-<wire x1="10.423025" y1="19.05" x2="12.54125" y2="19.05" width="0.254" layer="16"/>
-<via x="14.9225" y="12.065" extent="1-16" drill="0.381"/>
-<via x="13.0175" y="10.16" extent="1-16" drill="0.381"/>
+<wire x1="9.71385" y1="9.5225" x2="9.71385" y2="8.76135" width="0.254" layer="1"/>
+<wire x1="9.71385" y1="8.76135" x2="9.525" y2="8.5725" width="0.254" layer="1"/>
+<via x="9.525" y="8.5725" extent="1-16" drill="0.381"/>
+<via x="3.96875" y="19.685" extent="1-16" drill="0.381"/>
+<via x="1.905" y="15.5575" extent="1-16" drill="0.381"/>
+<via x="12.54125" y="19.685" extent="1-16" drill="0.381"/>
+<wire x1="9.525" y1="14.605" x2="9.525" y2="18.786975" width="0.254" layer="16"/>
+<wire x1="9.525" y1="18.786975" x2="10.423025" y2="19.685" width="0.254" layer="16"/>
+<wire x1="10.423025" y1="19.685" x2="12.54125" y2="19.685" width="0.254" layer="16"/>
+<via x="14.9225" y="12.7" extent="1-16" drill="0.381"/>
+<via x="13.0175" y="10.795" extent="1-16" drill="0.381"/>
 <contactref element="JP2" pad="1"/>
-<wire x1="1.905" y1="14.9225" x2="1.905" y2="13.70875" width="0.254" layer="1"/>
-<wire x1="4.025" y1="20.32" x2="4.025" y2="19.05" width="0.254" layer="1"/>
-<wire x1="4.025" y1="19.05" x2="4.025" y2="18.06" width="0.254" layer="1"/>
-<wire x1="4.025" y1="18.06" x2="3.955" y2="17.99" width="0.254" layer="1"/>
-<wire x1="5.505" y1="19.54" x2="5.505" y2="19.10125" width="0.254" layer="1"/>
-<wire x1="3.96875" y1="19.05" x2="4.025" y2="19.05" width="0.254" layer="1"/>
-<wire x1="4.025" y1="20.32" x2="4.025" y2="21.248" width="0.254" layer="1"/>
-<wire x1="4.025" y1="21.248" x2="2.413" y2="22.86" width="0.254" layer="1"/>
-<wire x1="1.905" y1="14.9225" x2="3.96875" y2="16.98625" width="0.254" layer="16"/>
-<wire x1="3.96875" y1="16.98625" x2="3.96875" y2="19.05" width="0.254" layer="16"/>
-<wire x1="12.54125" y1="19.05" x2="12.555" y2="19.05" width="0.254" layer="1"/>
-<wire x1="12.555" y1="19.05" x2="12.555" y2="17.99" width="0.254" layer="1"/>
-<wire x1="12.555" y1="19.05" x2="12.555" y2="20.25" width="0.254" layer="1"/>
-<wire x1="12.555" y1="20.25" x2="12.485" y2="20.32" width="0.254" layer="1"/>
-<wire x1="1.905" y1="13.6525" x2="1.905" y2="13.70875" width="0.254" layer="1"/>
-<wire x1="5.505" y1="19.10125" x2="5.45375" y2="19.05" width="0.254" layer="1"/>
-<wire x1="5.45375" y1="19.05" x2="3.96875" y2="19.05" width="0.254" layer="1"/>
-<wire x1="14.9225" y1="13.17625" x2="14.9225" y2="12.065" width="0.254" layer="1"/>
-<wire x1="13.0175" y1="10.16" x2="14.9225" y2="12.065" width="0.254" layer="16"/>
-<via x="9.525" y="13.97" extent="1-16" drill="0.381"/>
-<wire x1="3.955" y1="13.99" x2="9.505" y2="13.99" width="0.254" layer="1"/>
-<wire x1="3.955" y1="13.99" x2="2.18625" y2="13.99" width="0.254" layer="1"/>
-<wire x1="2.18625" y1="13.99" x2="1.905" y2="13.70875" width="0.254" layer="1"/>
-<wire x1="9.71385" y1="8.8875" x2="11.409375" y2="8.8875" width="0.254" layer="1"/>
-<wire x1="11.005" y1="10.94" x2="11.005" y2="10.10875" width="0.254" layer="1"/>
-<wire x1="11.509375" y1="8.7875" x2="11.509375" y2="9.604375" width="0.254" layer="1"/>
-<wire x1="11.509375" y1="9.604375" x2="11.005" y2="10.10875" width="0.254" layer="1"/>
-<wire x1="13.0175" y1="8.7875" x2="13.0175" y2="10.16" width="0.254" layer="1"/>
-<wire x1="11.509375" y1="8.7875" x2="13.0175" y2="8.7875" width="0.254" layer="1"/>
-<wire x1="9.525" y1="7.9375" x2="9.525" y2="13.97" width="0.254" layer="16"/>
-<wire x1="11.509375" y1="8.7875" x2="11.409375" y2="8.8875" width="0.254" layer="1"/>
-<wire x1="9.505" y1="13.99" x2="9.525" y2="13.97" width="0.254" layer="1"/>
+<wire x1="1.905" y1="15.5575" x2="1.905" y2="14.34375" width="0.254" layer="1"/>
+<wire x1="4.025" y1="20.955" x2="4.025" y2="19.685" width="0.254" layer="1"/>
+<wire x1="4.025" y1="19.685" x2="4.025" y2="18.695" width="0.254" layer="1"/>
+<wire x1="4.025" y1="18.695" x2="3.955" y2="18.625" width="0.254" layer="1"/>
+<wire x1="5.505" y1="20.175" x2="5.505" y2="19.73625" width="0.254" layer="1"/>
+<wire x1="3.96875" y1="19.685" x2="4.025" y2="19.685" width="0.254" layer="1"/>
+<wire x1="4.025" y1="20.955" x2="4.025" y2="21.883" width="0.254" layer="1"/>
+<wire x1="4.025" y1="21.883" x2="2.413" y2="23.495" width="0.254" layer="1"/>
+<wire x1="1.905" y1="15.5575" x2="3.96875" y2="17.62125" width="0.254" layer="16"/>
+<wire x1="3.96875" y1="17.62125" x2="3.96875" y2="19.685" width="0.254" layer="16"/>
+<wire x1="12.54125" y1="19.685" x2="12.555" y2="19.685" width="0.254" layer="1"/>
+<wire x1="12.555" y1="19.685" x2="12.555" y2="18.625" width="0.254" layer="1"/>
+<wire x1="12.555" y1="19.685" x2="12.555" y2="20.885" width="0.254" layer="1"/>
+<wire x1="12.555" y1="20.885" x2="12.485" y2="20.955" width="0.254" layer="1"/>
+<wire x1="1.905" y1="14.2875" x2="1.905" y2="14.34375" width="0.254" layer="1"/>
+<wire x1="5.505" y1="19.73625" x2="5.45375" y2="19.685" width="0.254" layer="1"/>
+<wire x1="5.45375" y1="19.685" x2="3.96875" y2="19.685" width="0.254" layer="1"/>
+<wire x1="14.9225" y1="13.81125" x2="14.9225" y2="12.7" width="0.254" layer="1"/>
+<wire x1="13.0175" y1="10.795" x2="14.9225" y2="12.7" width="0.254" layer="16"/>
+<via x="9.525" y="14.605" extent="1-16" drill="0.381"/>
+<wire x1="3.955" y1="14.625" x2="9.505" y2="14.625" width="0.254" layer="1"/>
+<wire x1="3.955" y1="14.625" x2="2.18625" y2="14.625" width="0.254" layer="1"/>
+<wire x1="2.18625" y1="14.625" x2="1.905" y2="14.34375" width="0.254" layer="1"/>
+<wire x1="9.71385" y1="9.5225" x2="11.409375" y2="9.5225" width="0.254" layer="1"/>
+<wire x1="11.005" y1="11.575" x2="11.005" y2="10.74375" width="0.254" layer="1"/>
+<wire x1="11.509375" y1="9.4225" x2="11.509375" y2="10.239375" width="0.254" layer="1"/>
+<wire x1="11.509375" y1="10.239375" x2="11.005" y2="10.74375" width="0.254" layer="1"/>
+<wire x1="13.0175" y1="9.4225" x2="13.0175" y2="10.795" width="0.254" layer="1"/>
+<wire x1="11.509375" y1="9.4225" x2="13.0175" y2="9.4225" width="0.254" layer="1"/>
+<wire x1="9.525" y1="8.5725" x2="9.525" y2="14.605" width="0.254" layer="16"/>
+<wire x1="11.509375" y1="9.4225" x2="11.409375" y2="9.5225" width="0.254" layer="1"/>
+<wire x1="9.505" y1="14.625" x2="9.525" y2="14.605" width="0.254" layer="1"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="U2" pad="3"/>
@@ -2194,190 +2180,189 @@ design rules under a new name.</descript
 <contactref element="C5" pad="2"/>
 <contactref element="U3" pad="3"/>
 <contactref element="C3" pad="1"/>
-<wire x1="8.255" y1="8.73125" x2="8.255" y2="7.3025" width="0.4064" layer="1"/>
-<wire x1="8.255" y1="7.3025" x2="7.9375" y2="6.985" width="0.4064" layer="1"/>
-<wire x1="7.9375" y1="6.985" x2="7.11615" y2="6.985" width="0.4064" layer="1"/>
-<wire x1="7.14375" y1="6.9574" x2="7.11615" y2="6.985" width="0.254" layer="1"/>
-<wire x1="7.11615" y1="6.985" x2="7.11365" y2="6.9875" width="0.254" layer="1"/>
-<via x="8.255" y="8.73125" extent="1-16" drill="0.381"/>
-<wire x1="7.62" y1="23.1775" x2="8.89" y2="24.4475" width="0.4064" layer="16"/>
-<via x="8.89" y="24.4475" extent="1-16" drill="0.381"/>
-<wire x1="8.89" y1="24.4475" x2="8.89" y2="22.7838" width="0.4064" layer="1"/>
-<wire x1="8.89" y1="24.4475" x2="8.41375" y2="24.92375" width="0.4064" layer="1"/>
-<wire x1="8.41375" y1="24.92375" x2="5.23875" y2="24.92375" width="0.4064" layer="1"/>
-<wire x1="5.23875" y1="24.92375" x2="4.92125" y2="25.24125" width="0.4064" layer="1"/>
-<wire x1="4.92125" y1="25.24125" x2="4.92125" y2="26.455" width="0.4064" layer="1"/>
+<wire x1="8.255" y1="9.36625" x2="8.255" y2="7.9375" width="0.4064" layer="1"/>
+<wire x1="8.255" y1="7.9375" x2="7.9375" y2="7.62" width="0.4064" layer="1"/>
+<wire x1="7.9375" y1="7.62" x2="7.11615" y2="7.62" width="0.4064" layer="1"/>
+<wire x1="7.14375" y1="7.5924" x2="7.11615" y2="7.62" width="0.254" layer="1"/>
+<wire x1="7.11615" y1="7.62" x2="7.11365" y2="7.6225" width="0.254" layer="1"/>
+<via x="8.255" y="9.36625" extent="1-16" drill="0.381"/>
+<wire x1="7.62" y1="23.8125" x2="8.89" y2="25.0825" width="0.4064" layer="16"/>
+<via x="8.89" y="25.0825" extent="1-16" drill="0.381"/>
+<wire x1="8.89" y1="25.0825" x2="8.89" y2="23.4188" width="0.4064" layer="1"/>
+<wire x1="8.89" y1="25.0825" x2="8.41375" y2="25.55875" width="0.4064" layer="1"/>
+<wire x1="8.41375" y1="25.55875" x2="5.23875" y2="25.55875" width="0.4064" layer="1"/>
+<wire x1="5.23875" y1="25.55875" x2="4.92125" y2="25.87625" width="0.4064" layer="1"/>
+<wire x1="4.92125" y1="25.87625" x2="4.92125" y2="27.09" width="0.4064" layer="1"/>
 <contactref element="J3" pad="1"/>
-<wire x1="2.83845" y1="34.925" x2="8.89" y2="28.87345" width="0.4064" layer="16"/>
-<wire x1="8.89" y1="28.87345" x2="8.89" y2="24.4475" width="0.4064" layer="16"/>
+<wire x1="2.83845" y1="35.56" x2="8.89" y2="29.50845" width="0.4064" layer="16"/>
+<wire x1="8.89" y1="29.50845" x2="8.89" y2="25.0825" width="0.4064" layer="16"/>
 <contactref element="F1" pad="1"/>
-<wire x1="3.43625" y1="8.89" x2="3.43625" y2="7.665" width="0.4064" layer="1"/>
-<wire x1="3.43625" y1="7.665" x2="3.65125" y2="7.45" width="0.4064" layer="1"/>
-<wire x1="7.11615" y1="6.985" x2="5.55625" y2="6.985" width="0.4064" layer="1"/>
-<wire x1="5.55625" y1="6.985" x2="5.08" y2="7.46125" width="0.4064" layer="1"/>
-<wire x1="5.08" y1="7.46125" x2="3.6625" y2="7.46125" width="0.4064" layer="1"/>
-<wire x1="3.6625" y1="7.46125" x2="3.65125" y2="7.45" width="0.4064" layer="1"/>
-<wire x1="8.255" y1="8.73125" x2="7.62" y2="9.36625" width="0.4064" layer="16"/>
-<wire x1="7.62" y1="9.36625" x2="7.62" y2="23.1775" width="0.4064" layer="16"/>
-<wire x1="7.11365" y1="8.8875" x2="8.09875" y2="8.8875" width="0.4064" layer="1"/>
-<wire x1="8.09875" y1="8.8875" x2="8.255" y2="8.73125" width="0.4064" layer="1"/>
+<wire x1="3.43625" y1="9.525" x2="3.43625" y2="8.3" width="0.4064" layer="1"/>
+<wire x1="3.43625" y1="8.3" x2="3.65125" y2="8.085" width="0.4064" layer="1"/>
+<wire x1="7.11615" y1="7.62" x2="5.55625" y2="7.62" width="0.4064" layer="1"/>
+<wire x1="5.55625" y1="7.62" x2="5.08" y2="8.09625" width="0.4064" layer="1"/>
+<wire x1="5.08" y1="8.09625" x2="3.6625" y2="8.09625" width="0.4064" layer="1"/>
+<wire x1="3.6625" y1="8.09625" x2="3.65125" y2="8.085" width="0.4064" layer="1"/>
+<wire x1="8.255" y1="9.36625" x2="7.62" y2="10.00125" width="0.4064" layer="16"/>
+<wire x1="7.62" y1="10.00125" x2="7.62" y2="23.8125" width="0.4064" layer="16"/>
+<wire x1="7.11365" y1="9.5225" x2="8.09875" y2="9.5225" width="0.4064" layer="1"/>
+<wire x1="8.09875" y1="9.5225" x2="8.255" y2="9.36625" width="0.4064" layer="1"/>
 </signal>
 <signal name="D+">
-<contactref element="J2" pad="D+"/>
 <contactref element="U1" pad="33"/>
-<wire x1="8.255" y1="4.07875" x2="8.255" y2="5.08" width="0.254" layer="1"/>
-<wire x1="8.255" y1="5.08" x2="8.5725" y2="5.3975" width="0.254" layer="1"/>
-<via x="8.5725" y="5.3975" extent="1-16" drill="0.381"/>
-<via x="11.1125" y="14.9225" extent="1-16" drill="0.381"/>
-<wire x1="12.555" y1="16.49" x2="9.8225" y2="16.49" width="0.254" layer="1"/>
-<wire x1="9.8225" y1="16.49" x2="9.525" y2="16.1925" width="0.254" layer="1"/>
-<wire x1="9.525" y1="16.1925" x2="9.525" y2="15.24" width="0.254" layer="1"/>
-<wire x1="9.525" y1="15.24" x2="9.8425" y2="14.9225" width="0.254" layer="1"/>
-<wire x1="9.8425" y1="14.9225" x2="11.1125" y2="14.9225" width="0.254" layer="1"/>
-<wire x1="11.1125" y1="14.9225" x2="11.1125" y2="6.76311875" width="0.254" layer="16"/>
-<wire x1="11.1125" y1="6.76311875" x2="9.74688125" y2="5.3975" width="0.254" layer="16"/>
-<wire x1="9.74688125" y1="5.3975" x2="8.5725" y2="5.3975" width="0.254" layer="16"/>
+<via x="8.5725" y="6.0325" extent="1-16" drill="0.381"/>
+<via x="11.1125" y="15.5575" extent="1-16" drill="0.381"/>
+<wire x1="12.555" y1="17.125" x2="9.8225" y2="17.125" width="0.254" layer="1"/>
+<wire x1="9.8225" y1="17.125" x2="9.525" y2="16.8275" width="0.254" layer="1"/>
+<wire x1="9.525" y1="16.8275" x2="9.525" y2="15.875" width="0.254" layer="1"/>
+<wire x1="9.525" y1="15.875" x2="9.8425" y2="15.5575" width="0.254" layer="1"/>
+<wire x1="9.8425" y1="15.5575" x2="11.1125" y2="15.5575" width="0.254" layer="1"/>
+<wire x1="11.1125" y1="15.5575" x2="11.1125" y2="7.39811875" width="0.254" layer="16"/>
+<wire x1="11.1125" y1="7.39811875" x2="9.74688125" y2="6.0325" width="0.254" layer="16"/>
+<wire x1="9.74688125" y1="6.0325" x2="8.5725" y2="6.0325" width="0.254" layer="16"/>
+<contactref element="J2" pad="3"/>
+<wire x1="8.255" y1="4.1275" x2="8.255" y2="5.715" width="0.3048" layer="1"/>
+<wire x1="8.255" y1="5.715" x2="8.5725" y2="6.0325" width="0.3048" layer="1"/>
 </signal>
 <signal name="D-">
-<contactref element="J2" pad="D-"/>
 <contactref element="U1" pad="32"/>
-<via x="7.46125" y="5.3975" extent="1-16" drill="0.381"/>
-<wire x1="8.41375" y1="6.35" x2="9.74636875" y2="6.35" width="0.254" layer="16"/>
-<wire x1="9.74636875" y1="6.35" x2="10.31875" y2="6.92238125" width="0.254" layer="16"/>
-<wire x1="10.31875" y1="6.92238125" x2="10.31875" y2="15.71625" width="0.254" layer="16"/>
-<via x="10.31875" y="15.71625" extent="1-16" drill="0.381"/>
-<wire x1="12.555" y1="15.99" x2="10.5925" y2="15.99" width="0.254" layer="1"/>
-<wire x1="10.5925" y1="15.99" x2="10.31875" y2="15.71625" width="0.254" layer="1"/>
-<wire x1="7.605" y1="4.07875" x2="7.605" y2="5.25375" width="0.254" layer="1"/>
-<wire x1="7.605" y1="5.25375" x2="7.46125" y2="5.3975" width="0.254" layer="1"/>
-<wire x1="7.46125" y1="5.3975" x2="8.41375" y2="6.35" width="0.254" layer="16"/>
+<via x="7.46125" y="6.0325" extent="1-16" drill="0.381"/>
+<wire x1="8.41375" y1="6.985" x2="9.74636875" y2="6.985" width="0.254" layer="16"/>
+<wire x1="9.74636875" y1="6.985" x2="10.31875" y2="7.55738125" width="0.254" layer="16"/>
+<wire x1="10.31875" y1="7.55738125" x2="10.31875" y2="16.35125" width="0.254" layer="16"/>
+<via x="10.31875" y="16.35125" extent="1-16" drill="0.381"/>
+<wire x1="12.555" y1="16.625" x2="10.5925" y2="16.625" width="0.254" layer="1"/>
+<wire x1="10.5925" y1="16.625" x2="10.31875" y2="16.35125" width="0.254" layer="1"/>
+<wire x1="7.46125" y1="6.0325" x2="8.41375" y2="6.985" width="0.254" layer="16"/>
+<contactref element="J2" pad="2"/>
+<wire x1="7.605" y1="4.1275" x2="7.605" y2="5.88875" width="0.3048" layer="1"/>
+<wire x1="7.605" y1="5.88875" x2="7.46125" y2="6.0325" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$23">
 <contactref element="LED1" pad="A"/>
 <contactref element="R1" pad="2"/>
-<wire x1="14.605" y1="7.0875" x2="14.605" y2="3.25825" width="0.254" layer="1"/>
+<wire x1="14.605" y1="7.7225" x2="14.605" y2="3.25825" width="0.254" layer="1"/>
 </signal>
 <signal name="LED_RX">
 <contactref element="R1" pad="1"/>
 <contactref element="U1" pad="19"/>
-<wire x1="11.7475" y1="11.7475" x2="11.1125" y2="12.3825" width="0.254" layer="1"/>
-<wire x1="11.1125" y1="12.3825" x2="8.89" y2="12.3825" width="0.254" layer="1"/>
-<wire x1="8.89" y1="12.3825" x2="8.505" y2="11.9975" width="0.254" layer="1"/>
-<wire x1="8.505" y1="10.94" x2="8.505" y2="11.9975" width="0.254" layer="1"/>
-<wire x1="11.7475" y1="11.7475" x2="13.0175" y2="11.7475" width="0.254" layer="1"/>
-<wire x1="13.0175" y1="11.7475" x2="14.605" y2="10.16" width="0.254" layer="1"/>
-<wire x1="14.605" y1="10.16" x2="14.605" y2="8.7875" width="0.254" layer="1"/>
+<wire x1="11.7475" y1="12.3825" x2="11.1125" y2="13.0175" width="0.254" layer="1"/>
+<wire x1="11.1125" y1="13.0175" x2="8.89" y2="13.0175" width="0.254" layer="1"/>
+<wire x1="8.89" y1="13.0175" x2="8.505" y2="12.6325" width="0.254" layer="1"/>
+<wire x1="8.505" y1="11.575" x2="8.505" y2="12.6325" width="0.254" layer="1"/>
+<wire x1="11.7475" y1="12.3825" x2="13.0175" y2="12.3825" width="0.254" layer="1"/>
+<wire x1="13.0175" y1="12.3825" x2="14.605" y2="10.795" width="0.254" layer="1"/>
+<wire x1="14.605" y1="10.795" x2="14.605" y2="9.4225" width="0.254" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="LED2" pad="A"/>
 <contactref element="R2" pad="2"/>
-<wire x1="1.905" y1="3.25825" x2="1.905" y2="7.0875" width="0.254" layer="1"/>
+<wire x1="1.905" y1="3.25825" x2="1.905" y2="7.7225" width="0.254" layer="1"/>
 </signal>
 <signal name="LED_TX">
 <contactref element="R2" pad="1"/>
 <contactref element="U1" pad="18"/>
-<wire x1="5.3825" y1="12.3825" x2="7.62" y2="12.3825" width="0.254" layer="1"/>
-<wire x1="7.62" y1="12.3825" x2="8.005" y2="11.9975" width="0.254" layer="1"/>
-<wire x1="8.005" y1="10.94" x2="8.005" y2="11.9975" width="0.254" layer="1"/>
-<wire x1="5.3825" y1="12.3825" x2="3.16" y2="10.16" width="0.254" layer="1"/>
-<wire x1="3.16" y1="10.16" x2="2.259975" y2="10.16" width="0.254" layer="1"/>
-<wire x1="2.259975" y1="10.16" x2="1.905" y2="9.805025" width="0.254" layer="1"/>
-<wire x1="1.905" y1="9.805025" x2="1.905" y2="8.7875" width="0.254" layer="1"/>
+<wire x1="5.3825" y1="13.0175" x2="7.62" y2="13.0175" width="0.254" layer="1"/>
+<wire x1="7.62" y1="13.0175" x2="8.005" y2="12.6325" width="0.254" layer="1"/>
+<wire x1="8.005" y1="11.575" x2="8.005" y2="12.6325" width="0.254" layer="1"/>
+<wire x1="5.3825" y1="13.0175" x2="3.16" y2="10.795" width="0.254" layer="1"/>
+<wire x1="3.16" y1="10.795" x2="2.259975" y2="10.795" width="0.254" layer="1"/>
+<wire x1="2.259975" y1="10.795" x2="1.905" y2="10.440025" width="0.254" layer="1"/>
+<wire x1="1.905" y1="10.440025" x2="1.905" y2="9.4225" width="0.254" layer="1"/>
 </signal>
 <signal name="CAN_RX">
 <contactref element="U1" pad="45"/>
 <contactref element="U3" pad="4"/>
-<wire x1="7.005" y1="19.54" x2="7.005" y2="20.49875" width="0.254" layer="1"/>
-<wire x1="7.005" y1="20.49875" x2="7.3025" y2="20.79625" width="0.254" layer="1"/>
-<wire x1="10.16" y1="22.7838" x2="10.16" y2="21.2725" width="0.254" layer="1"/>
-<wire x1="10.16" y1="21.2725" x2="9.68375" y2="20.79625" width="0.254" layer="1"/>
-<wire x1="7.3025" y1="20.79625" x2="9.68375" y2="20.79625" width="0.254" layer="1"/>
+<wire x1="7.005" y1="20.175" x2="7.005" y2="21.13375" width="0.254" layer="1"/>
+<wire x1="7.005" y1="21.13375" x2="7.3025" y2="21.43125" width="0.254" layer="1"/>
+<wire x1="10.16" y1="23.4188" x2="10.16" y2="21.9075" width="0.254" layer="1"/>
+<wire x1="10.16" y1="21.9075" x2="9.68375" y2="21.43125" width="0.254" layer="1"/>
+<wire x1="7.3025" y1="21.43125" x2="9.68375" y2="21.43125" width="0.254" layer="1"/>
 </signal>
 <signal name="CAN_TX">
 <contactref element="U1" pad="46"/>
 <contactref element="U3" pad="1"/>
-<wire x1="6.505" y1="19.54" x2="6.505" y2="23.34" width="0.254" layer="1"/>
-<wire x1="6.505" y1="23.34" x2="6.35" y2="23.495" width="0.254" layer="1"/>
-<wire x1="6.35" y1="23.495" x2="6.35" y2="22.7838" width="0.254" layer="1"/>
+<wire x1="6.505" y1="20.175" x2="6.505" y2="23.975" width="0.254" layer="1"/>
+<wire x1="6.505" y1="23.975" x2="6.35" y2="24.13" width="0.254" layer="1"/>
+<wire x1="6.35" y1="24.13" x2="6.35" y2="23.4188" width="0.254" layer="1"/>
 </signal>
 <signal name="SWDIO">
 <contactref element="U1" pad="34"/>
 <contactref element="J1" pad="4"/>
-<wire x1="12.555" y1="16.99" x2="14.91875" y2="16.99" width="0.254" layer="1"/>
-<wire x1="14.91875" y1="16.99" x2="14.9225" y2="16.98625" width="0.254" layer="1"/>
+<wire x1="12.555" y1="17.625" x2="14.91875" y2="17.625" width="0.254" layer="1"/>
+<wire x1="14.91875" y1="17.625" x2="14.9225" y2="17.62125" width="0.254" layer="1"/>
 </signal>
 <signal name="SWCLK">
 <contactref element="U1" pad="37"/>
 <contactref element="J1" pad="3"/>
-<wire x1="11.005" y1="19.54" x2="11.005" y2="17.99" width="0.254" layer="1"/>
-<wire x1="11.005" y1="17.99" x2="10.795" y2="17.78" width="0.254" layer="1"/>
-<via x="13.97" y="15.71625" extent="1-16" drill="0.381"/>
-<wire x1="13.97" y1="15.71625" x2="12.85875" y2="15.71625" width="0.254" layer="16"/>
-<wire x1="12.85875" y1="15.71625" x2="10.795" y2="17.78" width="0.254" layer="16"/>
-<via x="10.795" y="17.78" extent="1-16" drill="0.381"/>
-<wire x1="14.9225" y1="15.71625" x2="13.97" y2="15.71625" width="0.254" layer="1"/>
+<wire x1="11.005" y1="20.175" x2="11.005" y2="18.625" width="0.254" layer="1"/>
+<wire x1="11.005" y1="18.625" x2="10.795" y2="18.415" width="0.254" layer="1"/>
+<via x="13.97" y="16.35125" extent="1-16" drill="0.381"/>
+<wire x1="13.97" y1="16.35125" x2="12.85875" y2="16.35125" width="0.254" layer="16"/>
+<wire x1="12.85875" y1="16.35125" x2="10.795" y2="18.415" width="0.254" layer="16"/>
+<via x="10.795" y="18.415" extent="1-16" drill="0.381"/>
+<wire x1="14.9225" y1="16.35125" x2="13.97" y2="16.35125" width="0.254" layer="1"/>
 </signal>
 <signal name="CANH">
 <contactref element="U3" pad="7"/>
 <contactref element="R3" pad="1"/>
-<wire x1="7.62" y1="28.0162" x2="7.62" y2="33.99905" width="0.254" layer="1"/>
-<wire x1="7.62" y1="28.0162" x2="7.62" y2="26.67" width="0.254" layer="1"/>
-<wire x1="7.62" y1="26.67" x2="8.255" y2="26.035" width="0.254" layer="1"/>
-<wire x1="11.7475" y1="24.6625" x2="11.7475" y2="25.7175" width="0.254" layer="1"/>
-<wire x1="11.7475" y1="25.7175" x2="11.43" y2="26.035" width="0.254" layer="1"/>
-<wire x1="11.43" y1="26.035" x2="8.255" y2="26.035" width="0.254" layer="1"/>
+<wire x1="7.62" y1="28.6512" x2="7.62" y2="34.63405" width="0.254" layer="1"/>
+<wire x1="7.62" y1="28.6512" x2="7.62" y2="27.305" width="0.254" layer="1"/>
+<wire x1="7.62" y1="27.305" x2="8.255" y2="26.67" width="0.254" layer="1"/>
+<wire x1="11.7475" y1="25.2975" x2="11.7475" y2="26.3525" width="0.254" layer="1"/>
+<wire x1="11.7475" y1="26.3525" x2="11.43" y2="26.67" width="0.254" layer="1"/>
+<wire x1="11.43" y1="26.67" x2="8.255" y2="26.67" width="0.254" layer="1"/>
 <contactref element="J3" pad="2"/>
-<wire x1="7.62" y1="33.99905" x2="6.69405" y2="34.925" width="0.254" layer="1"/>
+<wire x1="7.62" y1="34.63405" x2="6.69405" y2="35.56" width="0.254" layer="1"/>
 </signal>
 <signal name="CANL">
 <contactref element="U3" pad="6"/>
-<wire x1="8.89" y1="28.0162" x2="8.89" y2="30.48" width="0.254" layer="1"/>
-<wire x1="11.303" y1="30.48" x2="8.89" y2="30.48" width="0.254" layer="1"/>
+<wire x1="8.89" y1="28.6512" x2="8.89" y2="31.115" width="0.254" layer="1"/>
+<wire x1="11.303" y1="31.115" x2="8.89" y2="31.115" width="0.254" layer="1"/>
 <contactref element="JP1" pad="3"/>
-<wire x1="11.303" y1="30.48" x2="13.843" y2="27.94" width="0.254" layer="1"/>
+<wire x1="11.303" y1="31.115" x2="13.843" y2="28.575" width="0.254" layer="1"/>
 <contactref element="J3" pad="3"/>
-<wire x1="8.89" y1="30.48" x2="8.89" y2="33.97655" width="0.254" layer="1"/>
-<wire x1="8.89" y1="33.97655" x2="9.83845" y2="34.925" width="0.254" layer="1"/>
+<wire x1="8.89" y1="31.115" x2="8.89" y2="34.61155" width="0.254" layer="1"/>
+<wire x1="8.89" y1="34.61155" x2="9.83845" y2="35.56" width="0.254" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="R3" pad="2"/>
 <contactref element="JP1" pad="2"/>
-<wire x1="12.7" y1="23.8125" x2="12.7" y2="25.0825" width="0.254" layer="1"/>
-<wire x1="12.7" y1="25.0825" x2="13.0175" y2="25.4" width="0.254" layer="1"/>
-<wire x1="13.0175" y1="25.4" x2="14.097" y2="25.4" width="0.254" layer="1"/>
-<wire x1="12.7" y1="23.8125" x2="11.85" y2="22.9625" width="0.254" layer="1"/>
-<wire x1="11.85" y1="22.9625" x2="11.7475" y2="22.9625" width="0.254" layer="1"/>
+<wire x1="12.7" y1="24.4475" x2="12.7" y2="25.7175" width="0.254" layer="1"/>
+<wire x1="12.7" y1="25.7175" x2="13.0175" y2="26.035" width="0.254" layer="1"/>
+<wire x1="13.0175" y1="26.035" x2="14.097" y2="26.035" width="0.254" layer="1"/>
+<wire x1="12.7" y1="24.4475" x2="11.85" y2="23.5975" width="0.254" layer="1"/>
+<wire x1="11.85" y1="23.5975" x2="11.7475" y2="23.5975" width="0.254" layer="1"/>
 </signal>
 <signal name="BOOT0">
 <contactref element="JP2" pad="2"/>
 <contactref element="U1" pad="44"/>
 <contactref element="R4" pad="2"/>
-<wire x1="7.505" y1="19.54" x2="7.505" y2="18.3" width="0.254" layer="1"/>
+<wire x1="7.505" y1="20.175" x2="7.505" y2="18.935" width="0.254" layer="1"/>
 <contactref element="U1" pad="2"/>
-<wire x1="7.505" y1="18.3" x2="6.695" y2="17.49" width="0.254" layer="1"/>
-<wire x1="3.955" y1="17.49" x2="6.695" y2="17.49" width="0.254" layer="1"/>
-<wire x1="2.667" y1="25.4" x2="2.54" y2="25.4" width="0.254" layer="1"/>
-<wire x1="2.54" y1="25.4" x2="1.11125" y2="23.97125" width="0.254" layer="1"/>
-<wire x1="1.11125" y1="23.97125" x2="1.11125" y2="19.10625" width="0.254" layer="1"/>
-<wire x1="1.11125" y1="19.10625" x2="1.905" y2="18.3125" width="0.254" layer="1"/>
-<wire x1="3.955" y1="17.49" x2="2.7275" y2="17.49" width="0.254" layer="1"/>
-<wire x1="2.7275" y1="17.49" x2="1.905" y2="18.3125" width="0.254" layer="1"/>
+<wire x1="7.505" y1="18.935" x2="6.695" y2="18.125" width="0.254" layer="1"/>
+<wire x1="3.955" y1="18.125" x2="6.695" y2="18.125" width="0.254" layer="1"/>
+<wire x1="2.667" y1="26.035" x2="2.54" y2="26.035" width="0.254" layer="1"/>
+<wire x1="2.54" y1="26.035" x2="1.11125" y2="24.60625" width="0.254" layer="1"/>
+<wire x1="1.11125" y1="24.60625" x2="1.11125" y2="19.74125" width="0.254" layer="1"/>
+<wire x1="1.11125" y1="19.74125" x2="1.905" y2="18.9475" width="0.254" layer="1"/>
+<wire x1="3.955" y1="18.125" x2="2.7275" y2="18.125" width="0.254" layer="1"/>
+<wire x1="2.7275" y1="18.125" x2="1.905" y2="18.9475" width="0.254" layer="1"/>
 </signal>
 <signal name="N$1">
 <polygon width="0" layer="1" pour="cutout">
-<vertex x="5.08" y="27.94"/>
-<vertex x="5.715" y="27.94"/>
+<vertex x="5.08" y="28.575"/>
 <vertex x="5.715" y="28.575"/>
-<vertex x="5.08" y="28.575"/>
+<vertex x="5.715" y="29.21"/>
+<vertex x="5.08" y="29.21"/>
 </polygon>
 </signal>
-<signal name="N$4">
-<contactref element="J2" pad="VBUS"/>
+<signal name="VBUS_RAW">
 <contactref element="F1" pad="2"/>
-<wire x1="6.955" y1="4.07875" x2="6.39875" y2="4.07875" width="0.4064" layer="1"/>
-<wire x1="6.39875" y1="4.07875" x2="5.23875" y2="5.23875" width="0.4064" layer="1"/>
-<wire x1="5.23875" y1="5.23875" x2="3.6625" y2="5.23875" width="0.4064" layer="1"/>
-<wire x1="3.6625" y1="5.23875" x2="3.65125" y2="5.25" width="0.4064" layer="1"/>
+<contactref element="J2" pad="1"/>
+<wire x1="3.65125" y1="5.885" x2="6.33875" y2="5.885" width="0.3048" layer="1"/>
+<wire x1="6.33875" y1="5.885" x2="6.955" y2="5.26875" width="0.3048" layer="1"/>
+<wire x1="6.955" y1="4.1275" x2="6.955" y2="5.26875" width="0.3048" layer="1"/>
 </signal>
 </signals>
 </board>
diff --git a/canable.sch b/canable.sch
--- a/canable.sch
+++ b/canable.sch
@@ -535,445 +535,6 @@ We've spent an enormous amount of time c
 &lt;br&gt;&lt;br&gt;
 You are welcome to use this library for commercial purposes. For attribution, we ask that when you begin to sell your device using our footprint, you email us with a link to the product being sold. We want bragging rights that we helped (in a very small part) to create your 8th world wonder. We would like the opportunity to feature your device on our homepage.</description>
 <packages>
-<package name="USB-A-H">
-<description>&lt;b&gt;USB Series A Hole Mounted&lt;/b&gt;</description>
-<wire x1="-17.8" y1="6" x2="-17.8" y2="-6" width="0.2032" layer="51"/>
-<wire x1="-3" y1="6" x2="-3" y2="-6" width="0.2032" layer="21"/>
-<wire x1="-3" y1="6" x2="-17.8" y2="6" width="0.2032" layer="51"/>
-<wire x1="-3" y1="-6" x2="-17.8" y2="-6" width="0.2032" layer="51"/>
-<wire x1="-3" y1="6" x2="-2" y2="6" width="0.2032" layer="21"/>
-<wire x1="-3" y1="-6" x2="-2" y2="-6" width="0.2032" layer="21"/>
-<wire x1="1" y1="-4" x2="1" y2="4" width="0.2032" layer="21"/>
-<wire x1="-13.5" y1="4.3" x2="-13.5" y2="1.9" width="0.2032" layer="51"/>
-<wire x1="-13.5" y1="1.9" x2="-11.2" y2="1.9" width="0.2032" layer="51"/>
-<wire x1="-11.2" y1="1.9" x2="-11.2" y2="4.3" width="0.2032" layer="51"/>
-<wire x1="-11.2" y1="4.3" x2="-13.5" y2="4.3" width="0.2032" layer="51"/>
-<wire x1="-13.5" y1="-1.9" x2="-13.5" y2="-4.3" width="0.2032" layer="51"/>
-<wire x1="-13.5" y1="-4.3" x2="-11.2" y2="-4.3" width="0.2032" layer="51"/>
-<wire x1="-11.2" y1="-4.3" x2="-11.2" y2="-1.9" width="0.2032" layer="51"/>
-<wire x1="-11.2" y1="-1.9" x2="-13.5" y2="-1.9" width="0.2032" layer="51"/>
-<pad name="GND" x="2.4" y="3.5" drill="0.9144" diameter="1.8796" rot="R270"/>
-<pad name="D+" x="2.4" y="1.127" drill="0.9144" diameter="1.8796" rot="R270"/>
-<pad name="D-" x="2.4" y="-1.127" drill="0.9144" diameter="1.8796" rot="R270"/>
-<pad name="VBUS" x="2.4" y="-3.5" drill="0.9144" diameter="1.8796" rot="R270"/>
-<pad name="GND2" x="0" y="-5.8" drill="2.2" rot="R270"/>
-<pad name="GND3" x="0" y="5.8" drill="2.2" rot="R270"/>
-<text x="5.85" y="-2.7" size="1.27" layer="25" rot="R90">&gt;NAME</text>
-<text x="-3.9" y="-4.4" size="1.27" layer="51" rot="R90">PCB Edge</text>
-<hole x="-0.1" y="2.25" drill="1.1"/>
-<hole x="-0.1" y="-2.25" drill="1.1"/>
-</package>
-<package name="USB-A-S">
-<description>&lt;b&gt;USB Series A Surface Mounted&lt;/b&gt;</description>
-<wire x1="3.6957" y1="6.5659" x2="-10.287" y2="6.5659" width="0.127" layer="21"/>
-<wire x1="3.6957" y1="-6.5659" x2="-10.287" y2="-6.5659" width="0.127" layer="21"/>
-<wire x1="-10.287" y1="6.477" x2="-10.287" y2="-6.477" width="0.127" layer="21"/>
-<wire x1="3.7084" y1="6.5024" x2="3.7084" y2="-6.5024" width="0.127" layer="21"/>
-<wire x1="-2.54" y1="-5.08" x2="-8.89" y2="-4.445" width="0.127" layer="21"/>
-<wire x1="-8.89" y1="-4.445" x2="-8.89" y2="-1.27" width="0.127" layer="21"/>
-<wire x1="-8.89" y1="-1.27" x2="-2.54" y2="-0.635" width="0.127" layer="21"/>
-<wire x1="-2.54" y1="5.08" x2="-8.89" y2="4.445" width="0.127" layer="21"/>
-<wire x1="-8.89" y1="4.445" x2="-8.89" y2="1.27" width="0.127" layer="21"/>
-<wire x1="-8.89" y1="1.27" x2="-2.54" y2="0.635" width="0.127" layer="21"/>
-<pad name="P$5" x="0" y="-6.5659" drill="2.3114" rot="R270"/>
-<pad name="P$6" x="0" y="6.5659" drill="2.3114" rot="R270"/>
-<smd name="D-" x="3.45" y="1" dx="3" dy="0.9" layer="1"/>
-<smd name="VBUS" x="3.45" y="3" dx="3" dy="0.9" layer="1"/>
-<smd name="D+" x="3.45" y="-1" dx="3" dy="0.9" layer="1"/>
-<smd name="GND" x="3.45" y="-3" dx="3" dy="0.9" layer="1"/>
-<text x="5.715" y="3.81" size="1.27" layer="25" rot="R90">&gt;NAME</text>
-</package>
-<package name="USB-MB-H">
-<description>&lt;b&gt;USB Series Mini-B Hole Mounted&lt;/b&gt;</description>
-<wire x1="-3.75" y1="3.9" x2="-3.75" y2="-3.9" width="0.127" layer="22"/>
-<wire x1="5.25" y1="3.9" x2="5.25" y2="-3.9" width="0.127" layer="22"/>
-<wire x1="-3.75" y1="3.9" x2="5.25" y2="3.9" width="0.127" layer="22"/>
-<wire x1="-3.75" y1="-3.9" x2="5.25" y2="-3.9" width="0.127" layer="22"/>
-<wire x1="0.75" y1="3.5" x2="-3.25" y2="3" width="0.127" layer="22"/>
-<wire x1="-3.25" y1="3" x2="-3.25" y2="2" width="0.127" layer="22"/>
-<wire x1="-3.25" y1="2" x2="0.75" y2="1.5" width="0.127" layer="22"/>
-<wire x1="1.25" y1="-3.5" x2="-3.25" y2="-3" width="0.127" layer="22"/>
-<wire x1="-3.25" y1="-3" x2="-3.25" y2="-2" width="0.127" layer="22"/>
-<wire x1="-3.25" y1="-2" x2="1.25" y2="-1.5" width="0.127" layer="22"/>
-<wire x1="-3.25" y1="1.25" x2="1.75" y2="0.75" width="0.127" layer="22"/>
-<wire x1="1.75" y1="0.75" x2="1.75" y2="-0.75" width="0.127" layer="22"/>
-<wire x1="1.75" y1="-0.75" x2="-3.25" y2="-1.25" width="0.127" layer="22"/>
-<pad name="VBUS" x="5.1" y="1.6" drill="0.8"/>
-<pad name="D+" x="5.1" y="0" drill="0.8"/>
-<pad name="GND" x="5.1" y="-1.6" drill="0.8"/>
-<pad name="D-" x="3.9" y="0.8" drill="0.8"/>
-<pad name="ID" x="3.9" y="-0.8" drill="0.8"/>
-<pad name="P$6" x="0" y="-3.65" drill="1.9"/>
-<pad name="P$7" x="0" y="3.65" drill="1.9"/>
-<text x="7.25" y="1.5" size="1.27" layer="25" rot="R90">&gt;NAME</text>
-<rectangle x1="3.25" y1="3" x2="5.75" y2="4.4" layer="43"/>
-<rectangle x1="3.25" y1="-4.4" x2="5.75" y2="-3" layer="43"/>
-<rectangle x1="-3.75" y1="-3.1" x2="-1.425" y2="3.1" layer="43"/>
-<rectangle x1="-1.425" y1="-2.325" x2="-0.65" y2="2.325" layer="43"/>
-</package>
-<package name="USB-B-SMT">
-<description>USB Series B Surface Mounted</description>
-<wire x1="-1" y1="-6" x2="2.4" y2="-6" width="0.2032" layer="51"/>
-<wire x1="2.4" y1="6" x2="-1" y2="6" width="0.2032" layer="51"/>
-<wire x1="2.4" y1="6" x2="2.4" y2="7.3" width="0.2032" layer="51"/>
-<wire x1="2.4" y1="7.3" x2="2.2" y2="7.5" width="0.2032" layer="51"/>
-<wire x1="2.2" y1="7.5" x2="1.9" y2="7.5" width="0.2032" layer="51"/>
-<wire x1="1.9" y1="7.5" x2="1.4" y2="7" width="0.2032" layer="51"/>
-<wire x1="-1" y1="6" x2="-1" y2="7.3" width="0.2032" layer="51"/>
-<wire x1="-0.8" y1="7.5" x2="-0.5" y2="7.5" width="0.2032" layer="51"/>
-<wire x1="-0.5" y1="7.5" x2="0" y2="7" width="0.2032" layer="51"/>
-<wire x1="0" y1="7" x2="1.4" y2="7" width="0.2032" layer="51"/>
-<wire x1="-1" y1="-6" x2="-1" y2="-7.3" width="0.2032" layer="51"/>
-<wire x1="-1" y1="-7.3" x2="-0.8" y2="-7.5" width="0.2032" layer="51"/>
-<wire x1="-0.8" y1="-7.5" x2="-0.5" y2="-7.5" width="0.2032" layer="51"/>
-<wire x1="-0.5" y1="-7.5" x2="0" y2="-7" width="0.2032" layer="51"/>
-<wire x1="1.9" y1="-7.5" x2="1.4" y2="-7" width="0.2032" layer="51"/>
-<wire x1="1.4" y1="-7" x2="0" y2="-7" width="0.2032" layer="51"/>
-<wire x1="-1" y1="7.3" x2="-0.8" y2="7.5" width="0.2032" layer="51"/>
-<wire x1="2.2" y1="-7.5" x2="1.9" y2="-7.5" width="0.2032" layer="51"/>
-<wire x1="2.2" y1="-7.5" x2="2.4" y2="-7.3" width="0.2032" layer="51"/>
-<wire x1="2.4" y1="-6" x2="2.4" y2="-7.3" width="0.2032" layer="51"/>
-<wire x1="-5" y1="6" x2="-5" y2="-6" width="0.2032" layer="51"/>
-<wire x1="-5" y1="6" x2="-9" y2="6" width="0.2032" layer="51"/>
-<wire x1="-9" y1="6" x2="-9" y2="-6" width="0.2032" layer="51"/>
-<wire x1="-9" y1="-6" x2="-5" y2="-6" width="0.2032" layer="51"/>
-<wire x1="-5" y1="6" x2="-3" y2="6" width="0.2032" layer="21"/>
-<wire x1="-5" y1="-6" x2="-3" y2="-6" width="0.2032" layer="21"/>
-<wire x1="4" y1="-6" x2="7" y2="-6" width="0.2032" layer="21"/>
-<wire x1="7" y1="-6" x2="7" y2="-3" width="0.2032" layer="21"/>
-<wire x1="7" y1="3" x2="7" y2="6" width="0.2032" layer="21"/>
-<wire x1="7" y1="6" x2="4" y2="6" width="0.2032" layer="21"/>
-<smd name="5" x="0.58" y="6.8" dx="6.04" dy="3.4" layer="1"/>
-<smd name="6" x="0.58" y="-6.8" dx="6.04" dy="3.4" layer="1"/>
-<smd name="D+" x="7" y="1.875" dx="3" dy="0.7" layer="1"/>
-<smd name="D-" x="7" y="0.625" dx="3" dy="0.7" layer="1"/>
-<smd name="GND" x="7" y="-0.625" dx="3" dy="0.7" layer="1"/>
-<smd name="VUSB" x="7" y="-1.875" dx="3" dy="0.7" layer="1"/>
-<text x="4.3" y="-7.795" size="1.27" layer="25">&gt;NAME</text>
-<hole x="0" y="2.25" drill="1.4"/>
-<hole x="0" y="-2.25" drill="1.4"/>
-</package>
-<package name="USB-MINIB-OLD">
-<description>&lt;b&gt;USB Series Mini-B Surface Mounted&lt;/b&gt;</description>
-<wire x1="-1.5" y1="3.8" x2="0.9" y2="3.8" width="0.127" layer="21"/>
-<wire x1="3.3" y1="3.1" x2="3.3" y2="2.1" width="0.127" layer="21"/>
-<wire x1="3.3" y1="-2.1" x2="3.3" y2="-3.1" width="0.127" layer="21"/>
-<wire x1="1" y1="-3.8" x2="-1.5" y2="-3.8" width="0.127" layer="21"/>
-<wire x1="-5.9" y1="3.8" x2="-5.9" y2="-3.8" width="0.127" layer="51"/>
-<wire x1="-5.9" y1="-3.8" x2="-4.5" y2="-3.8" width="0.127" layer="51"/>
-<wire x1="-5.9" y1="3.8" x2="-4.5" y2="3.8" width="0.127" layer="51"/>
-<smd name="1" x="-3" y="-4.5" dx="2.5" dy="2" layer="1"/>
-<smd name="2" x="-3" y="4.5" dx="2.5" dy="2" layer="1"/>
-<smd name="3" x="3" y="-4.5" dx="3.5" dy="2" layer="1"/>
-<smd name="4" x="3" y="4.5" dx="3.5" dy="2" layer="1"/>
-<smd name="D+" x="3" y="0" dx="3.5" dy="0.5" layer="1"/>
-<smd name="D-" x="3" y="0.8" dx="3.5" dy="0.5" layer="1"/>
-<smd name="VBUS" x="3.01" y="1.61" dx="3.5" dy="0.5" layer="1"/>
-<smd name="ID" x="3" y="-0.8" dx="3.5" dy="0.5" layer="1"/>
-<smd name="GND" x="3" y="-1.6" dx="3.5" dy="0.5" layer="1"/>
-<text x="-3.81" y="-1.27" size="0.4064" layer="27">&gt;VALUE</text>
-<text x="-3.81" y="0" size="0.4064" layer="25">&gt;NAME</text>
-<hole x="0" y="2.2" drill="0.9"/>
-<hole x="0" y="-2.2" drill="0.9"/>
-</package>
-<package name="USB-B-PTH">
-<description>&lt;b&gt;USB Series B Hole Mounted&lt;/b&gt;</description>
-<wire x1="-12.5" y1="6" x2="-8.6" y2="6" width="0.2032" layer="51"/>
-<wire x1="-8.6" y1="6" x2="-8.6" y2="-6" width="0.2032" layer="51"/>
-<wire x1="-8.6" y1="-6" x2="-12.5" y2="-6" width="0.2032" layer="51"/>
-<wire x1="-12.5" y1="-6" x2="-12.5" y2="6" width="0.2032" layer="51"/>
-<wire x1="-8.6" y1="6" x2="-4.8" y2="6" width="0.2032" layer="21"/>
-<wire x1="-8.6" y1="-6" x2="-4.8" y2="-6" width="0.2032" layer="21"/>
-<wire x1="-0.6" y1="-6" x2="3.3" y2="-6" width="0.2032" layer="21"/>
-<wire x1="3.3" y1="-6" x2="3.3" y2="6" width="0.2032" layer="21"/>
-<wire x1="3.3" y1="6" x2="-0.6" y2="6" width="0.2032" layer="21"/>
-<pad name="VBUS" x="1.9812" y="-1.25" drill="0.9144" diameter="1.6764" rot="R90"/>
-<pad name="D-" x="1.9812" y="1.25" drill="0.9144" diameter="1.6764" rot="R90"/>
-<pad name="D+" x="0" y="1.25" drill="0.9144" diameter="1.6764" rot="R270"/>
-<pad name="GND" x="0" y="-1.25" drill="0.9144" diameter="1.6764" rot="R270"/>
-<pad name="S1" x="-2.7178" y="-6.0198" drill="2.286"/>
-<pad name="S2" x="-2.7178" y="6.0198" drill="2.286"/>
-<text x="-1.27" y="3.81" size="0.4064" layer="25">&gt;NAME</text>
-<text x="-1.27" y="2.54" size="0.4064" layer="27">&gt;VALUE</text>
-</package>
-<package name="S4B-PH">
-<wire x1="-6" y1="2" x2="-6" y2="-7" width="0.3048" layer="51"/>
-<wire x1="-6" y1="-7" x2="6" y2="-7" width="0.3048" layer="51"/>
-<wire x1="6" y1="-7" x2="6" y2="2" width="0.3048" layer="51"/>
-<wire x1="6" y1="2" x2="-6" y2="2" width="0.3048" layer="51"/>
-<smd name="1" x="-3" y="-4.7" dx="1" dy="4.6" layer="1"/>
-<smd name="2" x="-1" y="-4.7" dx="1" dy="4.6" layer="1"/>
-<smd name="3" x="1" y="-4.7" dx="1" dy="4.6" layer="1"/>
-<smd name="4" x="3" y="-4.7" dx="1" dy="4.6" layer="1"/>
-<smd name="P$1" x="-5.4" y="0.5" dx="3.4" dy="1.6" layer="1" rot="R90"/>
-<smd name="P$2" x="5.4" y="0.5" dx="3.4" dy="1.6" layer="1" rot="R90"/>
-</package>
-<package name="USB-MINIB">
-<description>&lt;b&gt;USB Series Mini-B Surface Mounted&lt;/b&gt;</description>
-<wire x1="-1.3" y1="3.8" x2="0.8" y2="3.8" width="0.2032" layer="21"/>
-<wire x1="3.3" y1="3.1" x2="3.3" y2="2.2" width="0.2032" layer="21"/>
-<wire x1="3.3" y1="-2.2" x2="3.3" y2="-3.1" width="0.2032" layer="21"/>
-<wire x1="0.8" y1="-3.8" x2="-1.3" y2="-3.8" width="0.2032" layer="21"/>
-<wire x1="-5.9" y1="3.8" x2="-5.9" y2="-3.8" width="0.2032" layer="51"/>
-<wire x1="-5.9" y1="-3.8" x2="-4.5" y2="-3.8" width="0.2032" layer="51"/>
-<wire x1="-5.9" y1="3.8" x2="-4.5" y2="3.8" width="0.2032" layer="51"/>
-<smd name="D+" x="2.5" y="0" dx="2.5" dy="0.5" layer="1"/>
-<smd name="D-" x="2.5" y="0.8" dx="2.5" dy="0.5" layer="1"/>
-<smd name="GND" x="2.5" y="-1.6" dx="2.5" dy="0.5" layer="1"/>
-<smd name="ID" x="2.5" y="-0.8" dx="2.5" dy="0.5" layer="1"/>
-<smd name="MTN3" x="-3" y="-4.5" dx="2.5" dy="2" layer="1"/>
-<smd name="MTN1" x="-3" y="4.5" dx="2.5" dy="2" layer="1"/>
-<smd name="MTN4" x="2.5" y="-4.5" dx="2.5" dy="2" layer="1"/>
-<smd name="MTN2" x="2.5" y="4.5" dx="2.5" dy="2" layer="1"/>
-<smd name="VBUS" x="2.5" y="1.6" dx="2.5" dy="0.5" layer="1"/>
-<text x="-3.81" y="1.27" size="0.4064" layer="25">&gt;NAME</text>
-<text x="-3.81" y="0" size="0.4064" layer="27">&gt;VALUE</text>
-<hole x="0" y="2.2" drill="0.9"/>
-<hole x="0" y="-2.2" drill="0.9"/>
-</package>
-<package name="USB-A-PCB">
-<description>Card-edge USB A connector.
-
-For boards designed to be plugged directly into a USB slot. If possible, ensure that your PCB is about 2.4mm thick to fit snugly.</description>
-<wire x1="-5" y1="6" x2="3.7" y2="6" width="0.127" layer="51"/>
-<wire x1="3.7" y1="6" x2="3.7" y2="-6" width="0.127" layer="51" style="shortdash"/>
-<wire x1="3.7" y1="-6" x2="-5" y2="-6" width="0.127" layer="51"/>
-<wire x1="-5" y1="-6" x2="-5" y2="6" width="0.127" layer="51"/>
-<smd name="5V" x="-0.2" y="-3.5" dx="7.5" dy="1.5" layer="1"/>
-<smd name="USB_M" x="0.3" y="-1" dx="6.5" dy="1" layer="1"/>
-<smd name="USB_P" x="0.3" y="1" dx="6.5" dy="1" layer="1"/>
-<smd name="GND" x="-0.2" y="3.5" dx="7.5" dy="1.5" layer="1"/>
-<text x="-1.27" y="5.08" size="0.4064" layer="25">&gt;Name</text>
-<text x="-1.27" y="-5.08" size="0.4064" layer="27">&gt;Value</text>
-<text x="-6.35" y="-3.81" size="1.016" layer="48" rot="R90">Card edge</text>
-</package>
-<package name="USB-B-PTH-VERTICAL">
-<description>&lt;b&gt;USB Series B Hole Mounted&lt;/b&gt;</description>
-<wire x1="0" y1="0" x2="11.938" y2="0" width="0.254" layer="21"/>
-<wire x1="11.938" y1="0" x2="11.938" y2="11.303" width="0.254" layer="21"/>
-<wire x1="11.938" y1="11.303" x2="0" y2="11.303" width="0.254" layer="21"/>
-<wire x1="0" y1="11.303" x2="0" y2="0" width="0.254" layer="21"/>
-<wire x1="1.27" y1="1.27" x2="10.795" y2="1.27" width="0.254" layer="51"/>
-<wire x1="10.795" y1="1.27" x2="10.795" y2="8.255" width="0.254" layer="51"/>
-<wire x1="10.795" y1="8.255" x2="8.89" y2="10.16" width="0.254" layer="51"/>
-<wire x1="8.89" y1="10.16" x2="3.175" y2="10.16" width="0.254" layer="51"/>
-<wire x1="3.175" y1="10.16" x2="1.27" y2="8.255" width="0.254" layer="51"/>
-<wire x1="1.27" y1="8.255" x2="1.27" y2="1.27" width="0.254" layer="51"/>
-<pad name="GND" x="7.3152" y="4.3942" drill="0.9144" diameter="1.6764" rot="R90"/>
-<pad name="VBUS" x="7.3152" y="7.5946" drill="0.9144" diameter="1.6764" rot="R90"/>
-<pad name="D-" x="4.826" y="7.5946" drill="0.9144" diameter="1.6764" rot="R270"/>
-<pad name="D+" x="4.826" y="4.3942" drill="0.9144" diameter="1.6764" rot="R270"/>
-<pad name="P$1" x="0" y="4.9022" drill="2.286"/>
-<pad name="P$2" x="12.0396" y="4.9022" drill="2.286"/>
-<text x="8.89" y="-1.27" size="0.8128" layer="25">&gt;NAME</text>
-<text x="0" y="-1.27" size="0.8128" layer="27">&gt;VALUE</text>
-</package>
-<package name="USB-A-S-NOSILK">
-<wire x1="3.6957" y1="6.5659" x2="-10.287" y2="6.5659" width="0.127" layer="51"/>
-<wire x1="3.6957" y1="-6.5659" x2="-10.287" y2="-6.5659" width="0.127" layer="51"/>
-<wire x1="-10.287" y1="6.477" x2="-10.287" y2="-6.477" width="0.127" layer="51"/>
-<wire x1="3.7084" y1="6.5024" x2="3.7084" y2="-6.5024" width="0.127" layer="51"/>
-<wire x1="-2.54" y1="-5.08" x2="-8.89" y2="-4.445" width="0.127" layer="51"/>
-<wire x1="-8.89" y1="-4.445" x2="-8.89" y2="-1.27" width="0.127" layer="51"/>
-<wire x1="-8.89" y1="-1.27" x2="-2.54" y2="-0.635" width="0.127" layer="51"/>
-<wire x1="-2.54" y1="5.08" x2="-8.89" y2="4.445" width="0.127" layer="51"/>
-<wire x1="-8.89" y1="4.445" x2="-8.89" y2="1.27" width="0.127" layer="51"/>
-<wire x1="-8.89" y1="1.27" x2="-2.54" y2="0.635" width="0.127" layer="51"/>
-<pad name="P$5" x="0" y="-6.5659" drill="2.3114" rot="R270"/>
-<pad name="P$6" x="0" y="6.5659" drill="2.3114" rot="R270"/>
-<smd name="D-" x="3.45" y="1" dx="3" dy="0.9" layer="1"/>
-<smd name="VBUS" x="3.45" y="3" dx="3" dy="0.9" layer="1"/>
-<smd name="D+" x="3.45" y="-1" dx="3" dy="0.9" layer="1"/>
-<smd name="GND" x="3.45" y="-3" dx="3" dy="0.9" layer="1"/>
-<text x="5.715" y="3.81" size="1.27" layer="51" rot="R90">&gt;NAME</text>
-</package>
-<package name="USB-A-S-NOSILK-FEMALE">
-<wire x1="3.6957" y1="6.5659" x2="-10.287" y2="6.5659" width="0.127" layer="51"/>
-<wire x1="3.6957" y1="-6.5659" x2="-10.287" y2="-6.5659" width="0.127" layer="51"/>
-<wire x1="-10.287" y1="6.477" x2="-10.287" y2="-6.477" width="0.127" layer="51"/>
-<wire x1="3.7084" y1="6.5024" x2="3.7084" y2="-6.5024" width="0.127" layer="51"/>
-<wire x1="-2.54" y1="-5.08" x2="-8.89" y2="-4.445" width="0.127" layer="51"/>
-<wire x1="-8.89" y1="-4.445" x2="-8.89" y2="-1.27" width="0.127" layer="51"/>
-<wire x1="-8.89" y1="-1.27" x2="-2.54" y2="-0.635" width="0.127" layer="51"/>
-<wire x1="-2.54" y1="5.08" x2="-8.89" y2="4.445" width="0.127" layer="51"/>
-<wire x1="-8.89" y1="4.445" x2="-8.89" y2="1.27" width="0.127" layer="51"/>
-<wire x1="-8.89" y1="1.27" x2="-2.54" y2="0.635" width="0.127" layer="51"/>
-<pad name="S1" x="0" y="-6.5659" drill="2.3114" rot="R270"/>
-<pad name="S2" x="0" y="6.5659" drill="2.3114" rot="R270"/>
-<smd name="D-" x="4.212" y="1" dx="3" dy="0.9" layer="1"/>
-<smd name="VBUS" x="4.212" y="3.5" dx="3" dy="0.9" layer="1"/>
-<smd name="D+" x="4.212" y="-1" dx="3" dy="0.9" layer="1"/>
-<smd name="GND" x="4.212" y="-3.5" dx="3" dy="0.9" layer="1"/>
-<text x="8.46" y="-7.205" size="1.27" layer="51" rot="R180">&gt;NAME</text>
-</package>
-<package name="USB-MINIB-NOSTOP">
-<wire x1="-1.3" y1="3.8" x2="0.8" y2="3.8" width="0.2032" layer="21"/>
-<wire x1="3.3" y1="3.1" x2="3.3" y2="2.2" width="0.2032" layer="21"/>
-<wire x1="3.3" y1="-2.2" x2="3.3" y2="-3.1" width="0.2032" layer="21"/>
-<wire x1="0.8" y1="-3.8" x2="-1.3" y2="-3.8" width="0.2032" layer="21"/>
-<wire x1="-5.9" y1="3.8" x2="-5.9" y2="-3.8" width="0.2032" layer="51"/>
-<wire x1="-5.9" y1="-3.8" x2="-4.5" y2="-3.8" width="0.2032" layer="51"/>
-<wire x1="-5.9" y1="3.8" x2="-4.5" y2="3.8" width="0.2032" layer="51"/>
-<circle x="0" y="2.2" radius="0.35" width="0.41" layer="29"/>
-<circle x="0" y="-2.2" radius="0.35" width="0.41" layer="29"/>
-<pad name="H1" x="0" y="2.2" drill="0.9" diameter="0.8" stop="no"/>
-<pad name="H2" x="0" y="-2.2" drill="0.9" diameter="0.7874" stop="no"/>
-<smd name="D+" x="2.5" y="0" dx="2.5" dy="0.5" layer="1"/>
-<smd name="D-" x="2.5" y="0.8" dx="2.5" dy="0.5" layer="1"/>
-<smd name="GND" x="2.5" y="-1.6" dx="2.5" dy="0.5" layer="1"/>
-<smd name="ID" x="2.5" y="-0.8" dx="2.5" dy="0.5" layer="1"/>
-<smd name="G1" x="-3" y="-4.5" dx="2.5" dy="2" layer="1"/>
-<smd name="G2" x="-3" y="4.5" dx="2.5" dy="2" layer="1"/>
-<smd name="G4" x="2.5" y="-4.5" dx="2.5" dy="2" layer="1"/>
-<smd name="G3" x="2.5" y="4.5" dx="2.5" dy="2" layer="1"/>
-<smd name="VBUS" x="2.5" y="1.6" dx="2.5" dy="0.5" layer="1"/>
-<text x="-3.81" y="1.27" size="0.4064" layer="25">&gt;NAME</text>
-<text x="-3.81" y="0" size="0.4064" layer="27">&gt;VALUE</text>
-</package>
-<package name="USB-A-S-SILK-FEMALE">
-<wire x1="6.6957" y1="6.5659" x2="-7.287" y2="6.5659" width="0.127" layer="51"/>
-<wire x1="6.6957" y1="-6.5659" x2="-7.287" y2="-6.5659" width="0.127" layer="51"/>
-<wire x1="-7.287" y1="6.477" x2="-7.287" y2="-6.477" width="0.127" layer="51"/>
-<wire x1="6.7084" y1="6.5024" x2="6.7084" y2="-6.5024" width="0.127" layer="51"/>
-<wire x1="0.46" y1="-5.08" x2="-5.89" y2="-4.445" width="0.127" layer="51"/>
-<wire x1="-5.89" y1="-4.445" x2="-5.89" y2="-1.27" width="0.127" layer="51"/>
-<wire x1="-5.89" y1="-1.27" x2="0.46" y2="-0.635" width="0.127" layer="51"/>
-<wire x1="0.46" y1="5.08" x2="-5.89" y2="4.445" width="0.127" layer="51"/>
-<wire x1="-5.89" y1="4.445" x2="-5.89" y2="1.27" width="0.127" layer="51"/>
-<wire x1="-5.89" y1="1.27" x2="0.46" y2="0.635" width="0.127" layer="51"/>
-<wire x1="-7.366" y1="6.604" x2="0.508" y2="6.604" width="0.2032" layer="21"/>
-<wire x1="-7.366" y1="6.604" x2="-7.366" y2="-6.604" width="0.2032" layer="21"/>
-<wire x1="-7.366" y1="-6.604" x2="0.508" y2="-6.604" width="0.2032" layer="21"/>
-<wire x1="5.08" y1="-6.604" x2="6.858" y2="-6.604" width="0.2032" layer="21"/>
-<wire x1="6.858" y1="-6.604" x2="6.858" y2="-4.318" width="0.2032" layer="21"/>
-<wire x1="6.858" y1="4.318" x2="6.858" y2="6.604" width="0.2032" layer="21"/>
-<wire x1="6.858" y1="6.604" x2="5.08" y2="6.604" width="0.2032" layer="21"/>
-<pad name="P$5" x="3" y="-6.5659" drill="2.3114" rot="R270"/>
-<pad name="P$6" x="3" y="6.5659" drill="2.3114" rot="R270"/>
-<smd name="D-" x="7.212" y="1" dx="3" dy="0.9" layer="1"/>
-<smd name="VBUS" x="7.212" y="3.5" dx="3" dy="0.9" layer="1"/>
-<smd name="D+" x="7.212" y="-1" dx="3" dy="0.9" layer="1"/>
-<smd name="GND" x="7.212" y="-3.5" dx="3" dy="0.9" layer="1"/>
-<text x="-3.81" y="2.54" size="0.4064" layer="25">&gt;NAME</text>
-<text x="-3.81" y="-3.81" size="0.4064" layer="27">&gt;VALUE</text>
-</package>
-<package name="USB-MICROB">
-<description>Micro USB Package</description>
-<wire x1="-3.4" y1="-2.15" x2="-3" y2="-2.15" width="0.127" layer="51"/>
-<wire x1="3" y1="-2.15" x2="3.4" y2="-2.15" width="0.127" layer="51"/>
-<wire x1="-3.4" y1="-2.15" x2="-3.4" y2="-1.45" width="0.127" layer="51"/>
-<wire x1="-3.4" y1="-1.45" x2="-3.4" y2="2.85" width="0.127" layer="51"/>
-<wire x1="3.4" y1="2.85" x2="2.2" y2="2.85" width="0.127" layer="51"/>
-<wire x1="3.4" y1="2.85" x2="3.4" y2="-1.45" width="0.127" layer="51"/>
-<wire x1="3.4" y1="-1.45" x2="3.4" y2="-2.15" width="0.127" layer="51"/>
-<wire x1="-3.4" y1="-1.45" x2="3.4" y2="-1.45" width="0.127" layer="51"/>
-<wire x1="-3.4" y1="1.25" x2="-3.4" y2="2.85" width="0.2032" layer="21"/>
-<wire x1="-3.4" y1="2.85" x2="-2.2" y2="2.85" width="0.2032" layer="21"/>
-<wire x1="3.4" y1="2.85" x2="2.2" y2="2.85" width="0.2032" layer="21"/>
-<wire x1="3.4" y1="1.25" x2="3.4" y2="2.85" width="0.2032" layer="21"/>
-<wire x1="-3.4" y1="-1.45" x2="3.4" y2="-1.45" width="0.2032" layer="21"/>
-<wire x1="-2.2" y1="1.45" x2="2.2" y2="1.45" width="0.127" layer="51"/>
-<wire x1="2.2" y1="1.45" x2="2.2" y2="2.85" width="0.127" layer="51"/>
-<wire x1="-2.2" y1="1.45" x2="-2.2" y2="2.85" width="0.127" layer="51"/>
-<wire x1="-3.4" y1="2.85" x2="-2.2" y2="2.85" width="0.127" layer="51"/>
-<wire x1="-2.2" y1="2.85" x2="-2.2" y2="1.45" width="0.2032" layer="21"/>
-<wire x1="-2.2" y1="1.45" x2="2.2" y2="1.45" width="0.2032" layer="21"/>
-<wire x1="2.2" y1="1.45" x2="2.2" y2="2.85" width="0.2032" layer="21"/>
-<wire x1="-3.4" y1="-2.15" x2="-4" y2="-2.75" width="0.2032" layer="51"/>
-<wire x1="3.4" y1="-2.15" x2="4" y2="-2.75" width="0.2032" layer="51"/>
-<wire x1="-3" y1="-2.15" x2="-3" y2="-2.55" width="0.127" layer="51"/>
-<wire x1="-2.8" y1="-2.8" x2="2.75" y2="-2.8" width="0.127" layer="51"/>
-<wire x1="3" y1="-2.6" x2="3" y2="-2.15" width="0.127" layer="51"/>
-<wire x1="-3" y1="-2.55" x2="-2.8" y2="-2.8" width="0.127" layer="51" curve="84.547378"/>
-<wire x1="2.75" y1="-2.8" x2="3" y2="-2.6" width="0.127" layer="51" curve="84.547378"/>
-<smd name="VBUS" x="-1.3" y="2.65" dx="1.4" dy="0.35" layer="1" rot="R90"/>
-<smd name="GND" x="1.3" y="2.65" dx="1.4" dy="0.35" layer="1" rot="R90"/>
-<smd name="D-" x="-0.65" y="2.65" dx="1.4" dy="0.35" layer="1" rot="R90"/>
-<smd name="D+" x="0" y="2.65" dx="1.4" dy="0.35" layer="1" rot="R90"/>
-<smd name="ID" x="0.65" y="2.65" dx="1.4" dy="0.35" layer="1" rot="R90"/>
-<smd name="MT1" x="-4" y="0" dx="1.8" dy="1.9" layer="1"/>
-<smd name="MT2" x="4" y="0" dx="1.8" dy="1.9" layer="1"/>
-<text x="-1.6" y="-0.35" size="0.762" layer="25">&gt;NAME</text>
-<text x="-1.905" y="-3.175" size="0.762" layer="27">&gt;VALUE</text>
-<smd name="P$1" x="-1.27" y="0" dx="1.9" dy="1.9" layer="1"/>
-<smd name="P$2" x="1.27" y="0" dx="1.9" dy="1.9" layer="1"/>
-</package>
-<package name="USB-A-SMT-MALE">
-<wire x1="6" y1="14.58" x2="-6" y2="14.58" width="0.2032" layer="51"/>
-<wire x1="6" y1="0" x2="-6" y2="0" width="0.2032" layer="21"/>
-<wire x1="6" y1="0" x2="6" y2="14.58" width="0.2032" layer="51"/>
-<wire x1="-6" y1="0" x2="-6" y2="14.58" width="0.2032" layer="51"/>
-<wire x1="6" y1="0" x2="6" y2="-1.22" width="0.2032" layer="21"/>
-<wire x1="-6" y1="0" x2="-6" y2="-1.22" width="0.2032" layer="21"/>
-<wire x1="-4" y1="-4.22" x2="4" y2="-4.22" width="0.2032" layer="21"/>
-<wire x1="4.3" y1="10.28" x2="1.9" y2="10.28" width="0.2032" layer="51"/>
-<wire x1="1.9" y1="10.28" x2="1.9" y2="7.98" width="0.2032" layer="51"/>
-<wire x1="1.9" y1="7.98" x2="4.3" y2="7.98" width="0.2032" layer="51"/>
-<wire x1="4.3" y1="7.98" x2="4.3" y2="10.28" width="0.2032" layer="51"/>
-<wire x1="-1.9" y1="10.28" x2="-4.3" y2="10.28" width="0.2032" layer="51"/>
-<wire x1="-4.3" y1="10.28" x2="-4.3" y2="7.98" width="0.2032" layer="51"/>
-<wire x1="-4.3" y1="7.98" x2="-1.9" y2="7.98" width="0.2032" layer="51"/>
-<wire x1="-1.9" y1="7.98" x2="-1.9" y2="10.28" width="0.2032" layer="51"/>
-<smd name="D+1" x="1.027" y="-5.87" dx="2.5" dy="0.8" layer="1" rot="R270"/>
-<smd name="D-1" x="-1.027" y="-5.87" dx="2.5" dy="0.8" layer="1" rot="R270"/>
-<smd name="GND1" x="3.5508" y="-5.87" dx="2.5" dy="0.8" layer="1" rot="R270"/>
-<pad name="P$1" x="5.85" y="-3.05" drill="0.8" diameter="1.778" shape="long" rot="R90"/>
-<pad name="P$3" x="-5.85" y="-3.05" drill="0.8" diameter="1.778" shape="long" rot="R90"/>
-<smd name="VBUS1" x="-3.5" y="-5.87" dx="2.5" dy="0.8" layer="1" rot="R270"/>
-<text x="-2.7" y="-9.07" size="1.27" layer="25">&gt;NAME</text>
-<text x="-4.4" y="0.68" size="1.27" layer="51">PCB Edge</text>
-<hole x="2.25" y="-3.12" drill="1.1"/>
-<hole x="-2.25" y="-3.12" drill="1.1"/>
-<hole x="-5.85" y="-3.45" drill="0.8"/>
-<hole x="-5.85" y="-3.85" drill="0.8"/>
-<hole x="-5.85" y="-2.65" drill="0.8"/>
-<hole x="-5.85" y="-2.25" drill="0.8"/>
-<hole x="5.85" y="-3.45" drill="0.8"/>
-<hole x="5.85" y="-3.85" drill="0.8"/>
-<hole x="5.85" y="-2.65" drill="0.8"/>
-<hole x="5.85" y="-2.25" drill="0.8"/>
-</package>
-<package name="USB-A-SMT-MALE-LOCKING">
-<wire x1="6" y1="14.58" x2="-6" y2="14.58" width="0.2032" layer="51"/>
-<wire x1="6" y1="0" x2="-6" y2="0" width="0.2032" layer="21"/>
-<wire x1="6" y1="0" x2="6" y2="14.58" width="0.2032" layer="51"/>
-<wire x1="-6" y1="0" x2="-6" y2="14.58" width="0.2032" layer="51"/>
-<wire x1="6" y1="0" x2="6" y2="-1.22" width="0.2032" layer="21"/>
-<wire x1="-6" y1="0" x2="-6" y2="-1.22" width="0.2032" layer="21"/>
-<wire x1="-4" y1="-4.22" x2="4" y2="-4.22" width="0.2032" layer="21"/>
-<wire x1="4.3" y1="10.28" x2="1.9" y2="10.28" width="0.2032" layer="51"/>
-<wire x1="1.9" y1="10.28" x2="1.9" y2="7.98" width="0.2032" layer="51"/>
-<wire x1="1.9" y1="7.98" x2="4.3" y2="7.98" width="0.2032" layer="51"/>
-<wire x1="4.3" y1="7.98" x2="4.3" y2="10.28" width="0.2032" layer="51"/>
-<wire x1="-1.9" y1="10.28" x2="-4.3" y2="10.28" width="0.2032" layer="51"/>
-<wire x1="-4.3" y1="10.28" x2="-4.3" y2="7.98" width="0.2032" layer="51"/>
-<wire x1="-4.3" y1="7.98" x2="-1.9" y2="7.98" width="0.2032" layer="51"/>
-<wire x1="-1.9" y1="7.98" x2="-1.9" y2="10.28" width="0.2032" layer="51"/>
-<smd name="D+1" x="1.027" y="-5.87" dx="2.5" dy="0.8" layer="1" rot="R270"/>
-<smd name="D-1" x="-1.027" y="-5.87" dx="2.5" dy="0.8" layer="1" rot="R270"/>
-<smd name="GND1" x="3.5508" y="-5.87" dx="2.5" dy="0.8" layer="1" rot="R270"/>
-<pad name="P$1" x="5.6468" y="-3.05" drill="0.8" diameter="1.778" shape="long" rot="R90"/>
-<pad name="P$3" x="-5.6468" y="-3.05" drill="0.8" diameter="1.778" shape="long" rot="R90"/>
-<smd name="VBUS1" x="-3.5" y="-5.87" dx="2.5" dy="0.8" layer="1" rot="R270"/>
-<text x="-2.7" y="-9.07" size="1.27" layer="25">&gt;NAME</text>
-<text x="-4.4" y="0.68" size="1.27" layer="51">PCB Edge</text>
-<hole x="2.25" y="-3.12" drill="1.1"/>
-<hole x="-2.25" y="-3.12" drill="1.1"/>
-<hole x="-5.6468" y="-3.45" drill="0.8"/>
-<hole x="-5.6468" y="-3.85" drill="0.8"/>
-<hole x="-5.6468" y="-2.65" drill="0.8"/>
-<hole x="-5.6468" y="-2.25" drill="0.8"/>
-<hole x="5.6468" y="-3.45" drill="0.8"/>
-<hole x="5.6468" y="-3.85" drill="0.8"/>
-<hole x="5.6468" y="-2.65" drill="0.8"/>
-<hole x="5.6468" y="-2.25" drill="0.8"/>
-<wire x1="-5.9944" y1="-4.064" x2="-5.9944" y2="-2.0828" width="0" layer="51"/>
-<wire x1="-6.1849" y1="-4.064" x2="-6.1849" y2="-2.032" width="0" layer="51"/>
-<wire x1="-5.6642" y1="-4.064" x2="-5.6642" y2="-2.0828" width="0" layer="51"/>
-<rectangle x1="-5.9944" y1="-4.064" x2="-5.6642" y2="-2.032" layer="51"/>
-<wire x1="6.1849" y1="-2.032" x2="6.1849" y2="-4.064" width="0" layer="51"/>
-<rectangle x1="5.6642" y1="-4.064" x2="5.9944" y2="-2.032" layer="51" rot="R180"/>
-</package>
 <package name="1X03">
 <wire x1="3.81" y1="0.635" x2="4.445" y2="1.27" width="0.2032" layer="21"/>
 <wire x1="4.445" y1="1.27" x2="5.715" y2="1.27" width="0.2032" layer="21"/>
@@ -1741,16 +1302,6 @@ will be further integrated into the Spar
 </package>
 </packages>
 <symbols>
-<symbol name="USB">
-<wire x1="5.08" y1="8.89" x2="0" y2="8.89" width="0.254" layer="94"/>
-<wire x1="0" y1="8.89" x2="0" y2="-1.27" width="0.254" layer="94"/>
-<wire x1="0" y1="-1.27" x2="5.08" y2="-1.27" width="0.254" layer="94"/>
-<text x="3.81" y="0" size="2.54" layer="94" rot="R90">USB</text>
-<pin name="D+" x="-2.54" y="7.62" visible="pad" length="short"/>
-<pin name="D-" x="-2.54" y="5.08" visible="pad" length="short"/>
-<pin name="VBUS" x="-2.54" y="2.54" visible="pad" length="short"/>
-<pin name="GND" x="-2.54" y="0" visible="pad" length="short"/>
-</symbol>
 <symbol name="M03">
 <wire x1="3.81" y1="-5.08" x2="-2.54" y2="-5.08" width="0.4064" layer="94"/>
 <wire x1="1.27" y1="2.54" x2="2.54" y2="2.54" width="0.6096" layer="94"/>
@@ -1783,218 +1334,6 @@ will be further integrated into the Spar
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="USB" prefix="JP">
-<description>&lt;b&gt;USB Connectors&lt;/b&gt;
-&lt;p&gt;USB-B-PTH is fully proven SKU : PRT-00139/CONN-08278
-&lt;p&gt;USB-miniB is fully proven SKU : PRT-00587
-&lt;p&gt;USB-A-PCB is untested.
-&lt;p&gt;USB-A-H is throughly reviewed, but untested. Spark Fun Electronics SKU : PRT-00437
-&lt;p&gt;USB-B-SMT is throughly reviewed, but untested. Needs silkscreen touching up.
-&lt;p&gt;USB-A-S has not been used/tested
-&lt;p&gt;USB-MB-H has not been used/tested
-&lt;P&gt;USB-MICROB has been used. CONN-09505</description>
-<gates>
-<gate name="G$1" symbol="USB" x="0" y="0"/>
-</gates>
-<devices>
-<device name="-A-H" package="USB-A-H">
-<connects>
-<connect gate="G$1" pin="D+" pad="D-"/>
-<connect gate="G$1" pin="D-" pad="D+"/>
-<connect gate="G$1" pin="GND" pad="VBUS"/>
-<connect gate="G$1" pin="VBUS" pad="GND"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="-A-S" package="USB-A-S">
-<connects>
-<connect gate="G$1" pin="D+" pad="D+"/>
-<connect gate="G$1" pin="D-" pad="D-"/>
-<connect gate="G$1" pin="GND" pad="GND"/>
-<connect gate="G$1" pin="VBUS" pad="VBUS"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="-MB-H" package="USB-MB-H">
-<connects>
-<connect gate="G$1" pin="D+" pad="D+"/>
-<connect gate="G$1" pin="D-" pad="D-"/>
-<connect gate="G$1" pin="GND" pad="GND"/>
-<connect gate="G$1" pin="VBUS" pad="VBUS"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="-B-S" package="USB-B-SMT">
-<connects>
-<connect gate="G$1" pin="D+" pad="D+"/>
-<connect gate="G$1" pin="D-" pad="D-"/>
-<connect gate="G$1" pin="GND" pad="GND"/>
-<connect gate="G$1" pin="VBUS" pad="VUSB"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="OLD" package="USB-MINIB-OLD">
-<connects>
-<connect gate="G$1" pin="D+" pad="D+"/>
-<connect gate="G$1" pin="D-" pad="D-"/>
-<connect gate="G$1" pin="GND" pad="GND"/>
-<connect gate="G$1" pin="VBUS" pad="VBUS"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="PTH" package="USB-B-PTH">
-<connects>
-<connect gate="G$1" pin="D+" pad="D+"/>
-<connect gate="G$1" pin="D-" pad="D-"/>
-<connect gate="G$1" pin="GND" pad="GND"/>
-<connect gate="G$1" pin="VBUS" pad="VBUS"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="PROD_ID" value="CONN-08278" constant="no"/>
-<attribute name="VALUE" value="USB-B" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="-JST-2MM-SMT" package="S4B-PH">
-<connects>
-<connect gate="G$1" pin="D+" pad="2"/>
-<connect gate="G$1" pin="D-" pad="3"/>
-<connect gate="G$1" pin="GND" pad="1"/>
-<connect gate="G$1" pin="VBUS" pad="4"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="SMD" package="USB-MINIB">
-<connects>
-<connect gate="G$1" pin="D+" pad="D+"/>
-<connect gate="G$1" pin="D-" pad="D-"/>
-<connect gate="G$1" pin="GND" pad="GND"/>
-<connect gate="G$1" pin="VBUS" pad="VBUS"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="PROD_ID" value="CONN-08193" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="PCB" package="USB-A-PCB">
-<connects>
-<connect gate="G$1" pin="D+" pad="USB_P"/>
-<connect gate="G$1" pin="D-" pad="USB_M"/>
-<connect gate="G$1" pin="GND" pad="GND"/>
-<connect gate="G$1" pin="VBUS" pad="5V"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="PTH-VERTICAL" package="USB-B-PTH-VERTICAL">
-<connects>
-<connect gate="G$1" pin="D+" pad="D+"/>
-<connect gate="G$1" pin="D-" pad="D-"/>
-<connect gate="G$1" pin="GND" pad="GND"/>
-<connect gate="G$1" pin="VBUS" pad="VBUS"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="USB-A-S-NOSILK" package="USB-A-S-NOSILK">
-<connects>
-<connect gate="G$1" pin="D+" pad="D+"/>
-<connect gate="G$1" pin="D-" pad="D-"/>
-<connect gate="G$1" pin="GND" pad="GND"/>
-<connect gate="G$1" pin="VBUS" pad="VBUS"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="-A-SMD" package="USB-A-S-NOSILK-FEMALE">
-<connects>
-<connect gate="G$1" pin="D+" pad="D+"/>
-<connect gate="G$1" pin="D-" pad="D-"/>
-<connect gate="G$1" pin="GND" pad="GND"/>
-<connect gate="G$1" pin="VBUS" pad="VBUS"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="PROD_ID" value="CONN-09520"/>
-</technology>
-</technologies>
-</device>
-<device name="-SMD-NS" package="USB-MINIB-NOSTOP">
-<connects>
-<connect gate="G$1" pin="D+" pad="D+"/>
-<connect gate="G$1" pin="D-" pad="D-"/>
-<connect gate="G$1" pin="GND" pad="GND"/>
-<connect gate="G$1" pin="VBUS" pad="VBUS"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="_" package="USB-A-S-SILK-FEMALE">
-<connects>
-<connect gate="G$1" pin="D+" pad="D+"/>
-<connect gate="G$1" pin="D-" pad="D-"/>
-<connect gate="G$1" pin="GND" pad="GND"/>
-<connect gate="G$1" pin="VBUS" pad="VBUS"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="-MICROB" package="USB-MICROB">
-<connects>
-<connect gate="G$1" pin="D+" pad="D+"/>
-<connect gate="G$1" pin="D-" pad="D-"/>
-<connect gate="G$1" pin="GND" pad="GND MT1 MT2"/>
-<connect gate="G$1" pin="VBUS" pad="VBUS"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="PROD_ID" value="CONN-09505"/>
-</technology>
-</technologies>
-</device>
-<device name="A-SMD-MALE" package="USB-A-SMT-MALE">
-<connects>
-<connect gate="G$1" pin="D+" pad="D+1"/>
-<connect gate="G$1" pin="D-" pad="D-1"/>
-<connect gate="G$1" pin="GND" pad="GND1"/>
-<connect gate="G$1" pin="VBUS" pad="VBUS1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="A-SMD-MALE-LOCKING" package="USB-A-SMT-MALE-LOCKING">
-<connects>
-<connect gate="G$1" pin="D+" pad="D+1"/>
-<connect gate="G$1" pin="D-" pad="D-1"/>
-<connect gate="G$1" pin="GND" pad="GND1"/>
-<connect gate="G$1" pin="VBUS" pad="VBUS1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
 <deviceset name="M03" prefix="JP" uservalue="yes">
 <description>&lt;b&gt;Header 3&lt;/b&gt;
 Standard 3-pin 0.1" header. Use with straight break away headers (SKU : PRT-00116), right angle break away headers (PRT-00553), swiss pins (PRT-00743), machine pins (PRT-00117), and female headers (PRT-00115). Molex polarized connector foot print use with SKU : PRT-08232 with associated crimp pins and housings.</description>
@@ -3879,6 +3218,166 @@ http://dangerousprototypes.com</descript
 </deviceset>
 </devicesets>
 </library>
+<library name="MF_Connectors">
+<packages>
+<package name="MICROUSB-RIGHT">
+<description>&lt;b&gt;Description:&lt;/b&gt; Package for Micro USB Type B connector. Based on FCI 10118193-0001LF.&lt;br&gt;</description>
+<smd name="3" x="0" y="1.27" dx="0.4" dy="1.35" layer="1" rot="R180"/>
+<smd name="4" x="0.65" y="1.27" dx="0.4" dy="1.35" layer="1" rot="R180"/>
+<smd name="2" x="-0.65" y="1.27" dx="0.4" dy="1.35" layer="1" rot="R180"/>
+<smd name="1" x="-1.3" y="1.27" dx="0.4" dy="1.35" layer="1" rot="R180"/>
+<smd name="5" x="1.3" y="1.27" dx="0.4" dy="1.35" layer="1" rot="R180"/>
+<smd name="S3" x="-3.2" y="1.27" dx="1.4" dy="1.6" layer="1" rot="R90"/>
+<smd name="S4" x="3.2" y="1.27" dx="1.4" dy="1.6" layer="1" rot="R90"/>
+<text x="-5.08" y="2.7" size="0.8128" layer="25" font="vector" ratio="16">&gt;NAME</text>
+<wire x1="-5.08" y1="-2.855" x2="5.08" y2="-2.855" width="0.127" layer="21"/>
+<wire x1="-5.08" y1="-2.855" x2="-5.08" y2="1.3" width="0.127" layer="21"/>
+<wire x1="-5.08" y1="1.3" x2="-4.08" y2="2.3" width="0.127" layer="21"/>
+<wire x1="-4.08" y1="2.3" x2="4.08" y2="2.3" width="0.127" layer="21"/>
+<wire x1="4.08" y1="2.3" x2="5.08" y2="1.3" width="0.127" layer="21"/>
+<wire x1="5.08" y1="1.3" x2="5.08" y2="-2.855" width="0.127" layer="21"/>
+<smd name="S5" x="-1.2" y="-1.405" dx="1.9" dy="1.9" layer="1"/>
+<smd name="S6" x="1.2" y="-1.405" dx="1.9" dy="1.9" layer="1"/>
+<smd name="S1" x="-3.3" y="-1.4" dx="0.9" dy="1.6" layer="1" roundness="100" rot="R180"/>
+<smd name="S2" x="3.3" y="-1.4" dx="0.9" dy="1.6" layer="1" roundness="100" rot="R180"/>
+<wire x1="-3.55" y1="-1.05" x2="-3.55" y2="-1.75" width="0.01" layer="20"/>
+<wire x1="-3.55" y1="-1.75" x2="-3.3" y2="-2" width="0.01" layer="20" curve="90"/>
+<wire x1="-3.3" y1="-2" x2="-3.05" y2="-1.75" width="0.01" layer="20" curve="90"/>
+<wire x1="-3.05" y1="-1.75" x2="-3.05" y2="-1.05" width="0.01" layer="20"/>
+<wire x1="-3.05" y1="-1.05" x2="-3.3" y2="-0.8" width="0.01" layer="20" curve="90"/>
+<wire x1="-3.3" y1="-0.8" x2="-3.55" y2="-1.05" width="0.01" layer="20" curve="90"/>
+<wire x1="3.05" y1="-1.05" x2="3.05" y2="-1.75" width="0.01" layer="20"/>
+<wire x1="3.05" y1="-1.75" x2="3.3" y2="-2" width="0.01" layer="20" curve="90"/>
+<wire x1="3.3" y1="-2" x2="3.55" y2="-1.75" width="0.01" layer="20" curve="90"/>
+<wire x1="3.55" y1="-1.75" x2="3.55" y2="-1.05" width="0.01" layer="20"/>
+<wire x1="3.55" y1="-1.05" x2="3.3" y2="-0.8" width="0.01" layer="20" curve="90"/>
+<wire x1="3.3" y1="-0.8" x2="3.05" y2="-1.05" width="0.01" layer="20" curve="90"/>
+<smd name="S7" x="-3.3" y="-1.4" dx="0.9" dy="1.6" layer="16" roundness="100" rot="R180" cream="no"/>
+<smd name="S8" x="3.3" y="-1.4" dx="0.9" dy="1.6" layer="16" roundness="100" rot="R180" cream="no"/>
+</package>
+<package name="MINIUSB-RIGHT">
+<description>&lt;b&gt;Description:&lt;/b&gt; Package for Mini USB Type B connector. Based on 4UCON 20236.&lt;br&gt;</description>
+<smd name="1" x="-1.6" y="0" dx="0.5" dy="2.25" layer="1"/>
+<smd name="2" x="-0.8" y="0" dx="0.5" dy="2.25" layer="1"/>
+<smd name="3" x="0" y="0" dx="0.5" dy="2.25" layer="1"/>
+<smd name="4" x="0.8" y="0" dx="0.5" dy="2.25" layer="1"/>
+<smd name="5" x="1.6" y="0" dx="0.5" dy="2.25" layer="1"/>
+<smd name="S1" x="-4.45" y="-0.125" dx="2" dy="2.5" layer="1"/>
+<smd name="S3" x="-4.45" y="-5.5" dx="2" dy="2.5" layer="1"/>
+<smd name="S4" x="4.45" y="-5.5" dx="2" dy="2.5" layer="1"/>
+<smd name="S2" x="4.45" y="-0.125" dx="2" dy="2.5" layer="1"/>
+<hole x="-2.2" y="-2.675" drill="0.9"/>
+<hole x="2.2" y="-2.675" drill="0.9"/>
+<wire x1="-3.8" y1="-1.75" x2="-3.8" y2="-4" width="0.127" layer="21"/>
+<wire x1="-3.8" y1="-7" x2="-3.8" y2="-8.575" width="0.127" layer="21"/>
+<wire x1="-3.8" y1="-8.575" x2="3.8" y2="-8.575" width="0.127" layer="21"/>
+<wire x1="-2.25" y1="0.625" x2="-3.05" y2="0.625" width="0.127" layer="21"/>
+<wire x1="2.25" y1="0.625" x2="3.05" y2="0.625" width="0.127" layer="21"/>
+<wire x1="3.8" y1="-7" x2="3.8" y2="-8.575" width="0.127" layer="21"/>
+<wire x1="3.8" y1="-1.75" x2="3.8" y2="-4" width="0.127" layer="21"/>
+<text x="-3.8" y="1.5" size="0.8128" layer="25" font="vector" ratio="16">&gt;NAME</text>
+</package>
+</packages>
+<symbols>
+<symbol name="USB_5PIN">
+<description>&lt;b&gt;Description:&lt;/b&gt; Symbol for 5-Pin USB connectors.&lt;br&gt;</description>
+<pin name="5V" x="7.62" y="5.08" visible="off" length="short" direction="pwr" rot="R180"/>
+<pin name="D-" x="7.62" y="2.54" visible="off" length="short" rot="R180"/>
+<pin name="D+" x="7.62" y="0" visible="off" length="short" rot="R180"/>
+<pin name="GND" x="7.62" y="-5.08" visible="off" length="short" direction="pwr" rot="R180"/>
+<text x="0" y="6.096" size="1.016" layer="97" font="vector" align="bottom-center">USB PORT</text>
+<wire x1="5.08" y1="7.62" x2="5.08" y2="-10.16" width="0.127" layer="94"/>
+<wire x1="5.08" y1="-10.16" x2="-5.08" y2="-10.16" width="0.127" layer="94"/>
+<wire x1="-5.08" y1="-10.16" x2="-5.08" y2="7.62" width="0.127" layer="94"/>
+<wire x1="-5.08" y1="7.62" x2="5.08" y2="7.62" width="0.127" layer="94"/>
+<text x="-5.08" y="12.7" size="1.016" layer="95" font="vector" align="top-left">&gt;NAME</text>
+<text x="-5.08" y="10.16" size="1.016" layer="96" font="vector">&gt;VALUE</text>
+<pin name="ID" x="7.62" y="-2.54" visible="off" length="short" rot="R180"/>
+<pin name="SLD" x="7.62" y="-7.62" visible="off" length="short" direction="pwr" rot="R180"/>
+<text x="4.572" y="5.08" size="1.016" layer="97" font="vector" align="center-right">5V</text>
+<text x="4.572" y="2.54" size="1.016" layer="97" font="vector" align="center-right">D-</text>
+<text x="4.572" y="0" size="1.016" layer="97" font="vector" align="center-right">D+</text>
+<text x="4.572" y="-2.54" size="1.016" layer="97" font="vector" align="center-right">ID</text>
+<text x="4.572" y="-5.08" size="1.016" layer="97" font="vector" align="center-right">GND</text>
+<text x="4.572" y="-7.62" size="1.016" layer="97" font="vector" align="center-right">SHIELD</text>
+<polygon width="0.254" layer="94">
+<vertex x="-1.905" y="3.175"/>
+<vertex x="-1.27" y="4.445"/>
+<vertex x="-0.635" y="3.175"/>
+</polygon>
+<polygon width="0.254" layer="94">
+<vertex x="-3.175" y="0.3175" curve="-90"/>
+<vertex x="-2.8575" y="0" curve="-90"/>
+<vertex x="-3.175" y="-0.3175" curve="-90"/>
+<vertex x="-3.4925" y="0" curve="-90"/>
+</polygon>
+<polygon width="0.254" layer="94">
+<vertex x="0.3175" y="1.5875"/>
+<vertex x="0.3175" y="0.9525"/>
+<vertex x="0.9525" y="0.9525"/>
+<vertex x="0.9525" y="1.5875"/>
+</polygon>
+<wire x1="-1.27" y1="-3.595840625" x2="-1.27" y2="-2.325840625" width="0.254" layer="94"/>
+<wire x1="-1.27" y1="-2.325840625" x2="-1.27" y2="3.175" width="0.254" layer="94"/>
+<wire x1="0.337421875" y1="-0.297578125" x2="-0.972421875" y2="-1.607421875" width="0.254" layer="94"/>
+<wire x1="-3.175" y1="0" x2="-3.175" y2="-0.849159375" width="0.254" layer="94"/>
+<wire x1="-2.877421875" y1="-1.567578125" x2="-1.567578125" y2="-2.877421875" width="0.254" layer="94"/>
+<wire x1="-3.175" y1="-0.849159375" x2="-2.877421875" y2="-1.567578125" width="0.254" layer="94" curve="44.999875"/>
+<wire x1="0.635" y1="1.27" x2="0.635" y2="0.420840625" width="0.254" layer="94"/>
+<wire x1="0.635" y1="0.420840625" x2="0.337421875" y2="-0.297578125" width="0.254" layer="94" curve="-44.999875"/>
+<wire x1="-1.27" y1="-3.81" x2="-1.27" y2="-3.595840625" width="0.254" layer="94"/>
+<wire x1="-1.27" y1="-3.595840625" x2="-1.567578125" y2="-2.877421875" width="0.254" layer="94" curve="44.999875"/>
+<wire x1="-1.27" y1="-2.325840625" x2="-0.972421875" y2="-1.607421875" width="0.254" layer="94" curve="-44.999875"/>
+<polygon width="0.254" layer="94">
+<vertex x="-1.2065" y="-5.715"/>
+<vertex x="-1.3335" y="-5.715" curve="-90"/>
+<vertex x="-2.2225" y="-4.826"/>
+<vertex x="-2.2225" y="-4.699" curve="-90"/>
+<vertex x="-1.3335" y="-3.81"/>
+<vertex x="-1.2065" y="-3.81" curve="-90"/>
+<vertex x="-0.3175" y="-4.699"/>
+<vertex x="-0.3175" y="-4.826" curve="-90"/>
+</polygon>
+</symbol>
+</symbols>
+<devicesets>
+<deviceset name="USB" prefix="J" uservalue="yes">
+<description>&lt;b&gt;Library:&lt;/b&gt;  MF_Connectors&lt;br/&gt;
+&lt;b&gt;Description:&lt;/b&gt; 5 Pin USB Connectors. SLD is the shield connection. Usually tied to ground through a small ferrite bead.&lt;br/&gt;</description>
+<gates>
+<gate name="G$1" symbol="USB_5PIN" x="0" y="0"/>
+</gates>
+<devices>
+<device name="_MICRO_RIGHT" package="MICROUSB-RIGHT">
+<connects>
+<connect gate="G$1" pin="5V" pad="1"/>
+<connect gate="G$1" pin="D+" pad="3"/>
+<connect gate="G$1" pin="D-" pad="2"/>
+<connect gate="G$1" pin="GND" pad="5"/>
+<connect gate="G$1" pin="ID" pad="4"/>
+<connect gate="G$1" pin="SLD" pad="S1 S2 S3 S4 S5 S6"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+<device name="_MINI_RIGHT" package="MINIUSB-RIGHT">
+<connects>
+<connect gate="G$1" pin="5V" pad="1"/>
+<connect gate="G$1" pin="D+" pad="3"/>
+<connect gate="G$1" pin="D-" pad="2"/>
+<connect gate="G$1" pin="GND" pad="5"/>
+<connect gate="G$1" pin="ID" pad="4"/>
+<connect gate="G$1" pin="SLD" pad="S1 S2 S3 S4"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+</devicesets>
+</library>
 </libraries>
 <attributes>
 <attribute name="CNAME" value="CANable USB&lt;=&gt;CAN"/>
@@ -3892,13 +3391,11 @@ http://dangerousprototypes.com</descript
 </class>
 </classes>
 <parts>
-<part name="J2" library="SparkFun-Connectors" deviceset="USB" device="-MICROB"/>
 <part name="U2" library="SparkFun-PowerIC" deviceset="MIC5205" device="3.3V" value="AP2202K-3.3TRG1"/>
 <part name="LED1" library="SparkFun-LED" deviceset="LED" device="0603" value="BLUE"/>
 <part name="SUPPLY3" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
 <part name="GND2" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="SUPPLY4" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="U$5" library="microbuilder" deviceset="GND" device=""/>
 <part name="SUPPLY5" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
 <part name="C5" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="4.7uF"/>
 <part name="C7" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="4.7uF"/>
@@ -3936,6 +3433,8 @@ http://dangerousprototypes.com</descript
 <part name="J3" library="SparkFun-Connectors" deviceset="M04" device="SCREW_LOCK"/>
 <part name="SUPPLY7" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
 <part name="F1" library="dp_devices" deviceset="FUSE_PTC" device="-0805"/>
+<part name="J2" library="MF_Connectors" deviceset="USB" device="_MICRO_RIGHT"/>
+<part name="U$1" library="microbuilder" deviceset="GND" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -3954,14 +3453,12 @@ ease of routing</text>
 <text x="261.366" y="124.968" size="2.1844" layer="94" rot="R180">1-2 enters bootloader</text>
 </plain>
 <instances>
-<instance part="J2" gate="G$1" x="256.54" y="35.56"/>
 <instance part="U2" gate="G$1" x="121.92" y="38.1"/>
 <instance part="LED1" gate="G$1" x="50.8" y="27.94"/>
 <instance part="SUPPLY3" gate="G$1" x="106.68" y="45.72"/>
 <instance part="GND2" gate="1" x="106.68" y="27.94"/>
 <instance part="SUPPLY4" gate="G$1" x="149.86" y="45.72"/>
-<instance part="U$5" gate="G$1" x="251.46" y="33.02"/>
-<instance part="SUPPLY5" gate="G$1" x="231.14" y="40.64"/>
+<instance part="SUPPLY5" gate="G$1" x="228.6" y="50.8"/>
 <instance part="C5" gate="G$1" x="93.98" y="40.64" rot="R180"/>
 <instance part="C7" gate="G$1" x="154.94" y="35.56"/>
 <instance part="R1" gate="G$1" x="50.8" y="38.1" rot="R270"/>
@@ -4000,7 +3497,9 @@ ease of routing</text>
 <instance part="JP1" gate="G$1" x="259.08" y="160.02" rot="R180"/>
 <instance part="J3" gate="G$1" x="256.54" y="93.98" rot="R180"/>
 <instance part="SUPPLY7" gate="G$1" x="248.92" y="99.06"/>
-<instance part="F1" gate="G$1" x="238.76" y="38.1"/>
+<instance part="F1" gate="G$1" x="238.76" y="48.26"/>
+<instance part="J2" gate="G$1" x="269.24" y="43.18" rot="MR0"/>
+<instance part="U$1" gate="G$1" x="256.54" y="30.48"/>
 </instances>
 <busses>
 </busses>
@@ -4013,11 +3512,6 @@ ease of routing</text>
 <pinref part="GND2" gate="1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="J2" gate="G$1" pin="GND"/>
-<pinref part="U$5" gate="G$1" pin="GND"/>
-<wire x1="251.46" y1="35.56" x2="254" y2="35.56" width="0.1524" layer="91"/>
-</segment>
-<segment>
 <pinref part="LED1" gate="G$1" pin="C"/>
 <pinref part="GND4" gate="1" pin="GND"/>
 <wire x1="50.8" y1="22.86" x2="50.8" y2="20.32" width="0.1524" layer="91"/>
@@ -4107,6 +3601,16 @@ ease of routing</text>
 <pinref part="R4" gate="G$1" pin="1"/>
 <wire x1="50.8" y1="124.46" x2="53.34" y2="124.46" width="0.1524" layer="91"/>
 </segment>
+<segment>
+<pinref part="U$1" gate="G$1" pin="GND"/>
+<wire x1="256.54" y1="33.02" x2="256.54" y2="35.56" width="0.1524" layer="91"/>
+<pinref part="J2" gate="G$1" pin="GND"/>
+<wire x1="256.54" y1="35.56" x2="256.54" y2="38.1" width="0.1524" layer="91"/>
+<wire x1="261.62" y1="38.1" x2="256.54" y2="38.1" width="0.1524" layer="91"/>
+<pinref part="J2" gate="G$1" pin="SLD"/>
+<wire x1="261.62" y1="35.56" x2="256.54" y2="35.56" width="0.1524" layer="91"/>
+<junction x="256.54" y="35.56"/>
+</segment>
 </net>
 <net name="3.3V" class="0">
 <segment>
@@ -4203,33 +3707,33 @@ ease of routing</text>
 <segment>
 <pinref part="F1" gate="G$1" pin="1"/>
 <pinref part="SUPPLY5" gate="G$1" pin="V_BATT"/>
-<wire x1="233.68" y1="38.1" x2="231.14" y2="38.1" width="0.1524" layer="91"/>
-<wire x1="231.14" y1="38.1" x2="231.14" y2="40.64" width="0.1524" layer="91"/>
+<wire x1="233.68" y1="48.26" x2="228.6" y2="48.26" width="0.1524" layer="91"/>
+<wire x1="228.6" y1="48.26" x2="228.6" y2="50.8" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="D+" class="0">
 <segment>
-<pinref part="J2" gate="G$1" pin="D+"/>
-<wire x1="248.92" y1="43.18" x2="254" y2="43.18" width="0.1524" layer="91"/>
-<label x="248.92" y="43.18" size="1.016" layer="95" rot="R180" xref="yes"/>
-</segment>
-<segment>
 <pinref part="U1" gate="G$1" pin="PA12"/>
 <wire x1="116.84" y1="132.08" x2="114.3" y2="132.08" width="0.1524" layer="91"/>
 <label x="116.84" y="132.08" size="1.27" layer="95" xref="yes"/>
 </segment>
+<segment>
+<wire x1="256.54" y1="43.18" x2="261.62" y2="43.18" width="0.1524" layer="91"/>
+<label x="256.54" y="43.18" size="1.016" layer="95" rot="R180" xref="yes"/>
+<pinref part="J2" gate="G$1" pin="D+"/>
+</segment>
 </net>
 <net name="D-" class="0">
 <segment>
-<pinref part="J2" gate="G$1" pin="D-"/>
-<wire x1="248.92" y1="40.64" x2="254" y2="40.64" width="0.1524" layer="91"/>
-<label x="248.92" y="40.64" size="1.016" layer="95" rot="R180" xref="yes"/>
-</segment>
-<segment>
 <pinref part="U1" gate="G$1" pin="PA11"/>
 <wire x1="116.84" y1="134.62" x2="114.3" y2="134.62" width="0.1524" layer="91"/>
 <label x="116.84" y="134.62" size="1.27" layer="95" xref="yes"/>
 </segment>
+<segment>
+<wire x1="256.54" y1="45.72" x2="261.62" y2="45.72" width="0.1524" layer="91"/>
+<label x="256.54" y="45.72" size="1.016" layer="95" rot="R180" xref="yes"/>
+<pinref part="J2" gate="G$1" pin="D-"/>
+</segment>
 </net>
 <net name="N$23" class="0">
 <segment>
@@ -4371,11 +3875,11 @@ ease of routing</text>
 <junction x="66.04" y="127"/>
 </segment>
 </net>
-<net name="N$4" class="0">
+<net name="VBUS_RAW" class="0">
 <segment>
-<pinref part="J2" gate="G$1" pin="VBUS"/>
 <pinref part="F1" gate="G$1" pin="2"/>
-<wire x1="254" y1="38.1" x2="243.84" y2="38.1" width="0.1524" layer="91"/>
+<wire x1="261.62" y1="48.26" x2="243.84" y2="48.26" width="0.1524" layer="91"/>
+<pinref part="J2" gate="G$1" pin="5V"/>
 </segment>
 </net>
 </nets>