diff --git a/archive/eagle.epf b/archive/eagle.epf
--- a/archive/eagle.epf
+++ b/archive/eagle.epf
@@ -390,19 +390,19 @@ UsedLibrary="/home/ethanzonca/Projects/S
 UsedLibrary="/home/ethanzonca/Projects/ZonCoffeeOLED/lbr/microbuilder.lbr"
 
 [Win_1]
-Type="Board Editor"
-Loc="0 0 625 724"
-State=1
-Number=2
-File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd"
-View="-12.6372 -5.7481 99.5559 66.6821"
-WireWidths=" 0 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0.2032"
+Type="Library Editor"
+Loc="0 0 599 399"
+State=3
+Number=1
+File="/home/ethanzonca/Projects/protofusion-hardware/lbr/Protofusion.lbr"
+View="-7.20347 -13.0217 10.7611 12.5137"
+WireWidths=" 0 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0.127"
 PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-PadDrills=" 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8 0.3048"
+PadDrills=" 0.5 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8"
 ViaDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-ViaDrills=" 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6 0.3048"
-HoleDrills=" 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6 0.3048"
-TextSizes=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778"
+ViaDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
+HoleDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
+TextSizes=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778 1.27"
 PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27"
 PolygonIsolates=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
 MiterRadiuss=" 0.254 0.3175 0.635 1.27 2.54 1 2 2.5 5 7.5 10 0"
@@ -411,14 +411,14 @@ DimensionExtWidths=" 0.127 0.254 0.1 0.1
 DimensionExtLengths=" 1.27 2.54 1 2 3 0"
 DimensionExtOffsets=" 1.27 2.54 1 2 3 0"
 SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635"
-WireBend=2
+WireBend=0
 WireBendSet=0
 WireCap=1
-MiterStyle=1
+MiterStyle=0
 PadShape=0
-ViaShape=1
+ViaShape=0
 PolygonPour=0
-PolygonRank=1
+PolygonRank=0
 PolygonThermals=1
 PolygonOrphans=0
 TextRatio=8
@@ -433,15 +433,16 @@ SwapLevel=0
 ArcDirection=0
 AddLevel=2
 PadsSameType=0
-Layer=16
+Layer=94
+Device="POGOPIN-CONN"
 
 [Win_2]
 Type="Schematic Editor"
 Loc="640 0 1265 724"
-State=1
+State=3
 Number=3
 File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.sch"
-View="-248.841 -100.836 353.228 113.041"
+View="137.963 -36.0327 379.921 49.9197"
 WireWidths=" 0 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0.1524"
 PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
 PadDrills=" 0.5 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8"
@@ -480,10 +481,56 @@ ArcDirection=0
 AddLevel=2
 PadsSameType=0
 Layer=91
-Views=" 1: -248.841 -100.836 353.228 113.041"
+Views=" 1: 137.963 -36.0327 379.921 49.9197"
 Sheet=1
 
 [Win_3]
+Type="Board Editor"
+Loc="0 0 625 724"
+State=1
+Number=2
+File="/home/ethanzonca/Projects/ZonCoffeeOLED/zoncoffee.brd"
+View="7.96895 0.0965813 39.5597 15.4546"
+WireWidths=" 0 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0.2032"
+PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
+PadDrills=" 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8 0.3048"
+ViaDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
+ViaDrills=" 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6 0.3048"
+HoleDrills=" 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6 0.3048"
+TextSizes=" 0.254 0.3048 0.4064 0.6096 0.8128 1.27 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778 1.016"
+PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27"
+PolygonIsolates=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
+MiterRadiuss=" 0.254 0.3175 0.635 1.27 2.54 1 2 2.5 5 7.5 10 0"
+DimensionWidths=" 0 0.127 0.254 0.1 0.26 0.13"
+DimensionExtWidths=" 0.127 0.254 0.1 0.13 0.26 0"
+DimensionExtLengths=" 1.27 2.54 1 2 3 0"
+DimensionExtOffsets=" 1.27 2.54 1 2 3 0"
+SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635"
+WireBend=2
+WireBendSet=0
+WireCap=1
+MiterStyle=1
+PadShape=0
+ViaShape=1
+PolygonPour=0
+PolygonRank=1
+PolygonThermals=1
+PolygonOrphans=0
+TextRatio=16
+DimensionUnit=1
+DimensionPrecision=2
+DimensionShowUnit=0
+PinDirection=3
+PinFunction=0
+PinLength=2
+PinVisible=3
+SwapLevel=0
+ArcDirection=0
+AddLevel=2
+PadsSameType=0
+Layer=1
+
+[Win_4]
 Type="Control Panel"
 Loc="585 230 1184 629"
 State=2
@@ -494,3 +541,4 @@ Screen="1280 800"
 Window="Win_1"
 Window="Win_2"
 Window="Win_3"
+Window="Win_4"
diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="7.1.0">
+<eagle version="6.5.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
@@ -196,7 +196,7 @@
 <wire x1="1.27" y1="16.51" x2="2.54" y2="16.51" width="0" layer="20"/>
 <wire x1="2.54" y1="16.51" x2="3.81" y2="15.24" width="0" layer="20" curve="-90"/>
 <wire x1="3.81" y1="15.24" x2="3.81" y2="12.7" width="0" layer="20"/>
-<hole x="1.905" y="14.605" drill="1.905"/>
+<hole x="1.905" y="14.605" drill="2.54"/>
 <hole x="0.238125" y="12.7" drill="0.254"/>
 <hole x="0.714375" y="12.7" drill="0.254"/>
 <hole x="1.190625" y="12.7" drill="0.254"/>
@@ -209,7 +209,7 @@
 <wire x1="3.81" y1="-1.27" x2="2.54" y2="-2.54" width="0" layer="20" curve="-90"/>
 <wire x1="2.54" y1="-2.54" x2="1.27" y2="-2.54" width="0" layer="20"/>
 <wire x1="1.27" y1="-2.54" x2="0" y2="-1.27" width="0" layer="20" curve="-90"/>
-<hole x="1.905" y="-0.635" drill="1.905"/>
+<hole x="1.905" y="-0.635" drill="2.54"/>
 <hole x="3.571875" y="1.27" drill="0.254"/>
 <hole x="3.095625" y="1.27" drill="0.254"/>
 <hole x="2.619375" y="1.27" drill="0.254"/>
@@ -222,7 +222,7 @@
 <wire x1="41.275" y1="15.24" x2="42.545" y2="16.51" width="0" layer="20" curve="-90"/>
 <wire x1="42.545" y1="16.51" x2="43.815" y2="16.51" width="0" layer="20"/>
 <wire x1="43.815" y1="16.51" x2="45.085" y2="15.24" width="0" layer="20" curve="-90"/>
-<hole x="43.18" y="14.605" drill="1.905"/>
+<hole x="43.18" y="14.605" drill="2.54"/>
 <hole x="41.513125" y="12.7" drill="0.254"/>
 <hole x="41.989375" y="12.7" drill="0.254"/>
 <hole x="42.465625" y="12.7" drill="0.254"/>
@@ -235,7 +235,7 @@
 <wire x1="43.815" y1="-2.54" x2="42.545" y2="-2.54" width="0" layer="20"/>
 <wire x1="42.545" y1="-2.54" x2="41.275" y2="-1.27" width="0" layer="20" curve="-90"/>
 <wire x1="41.275" y1="-1.27" x2="41.275" y2="1.27" width="0" layer="20"/>
-<hole x="43.18" y="-0.635" drill="1.905"/>
+<hole x="43.18" y="-0.635" drill="2.54"/>
 <hole x="44.846875" y="1.27" drill="0.254"/>
 <hole x="44.370625" y="1.27" drill="0.254"/>
 <hole x="43.894375" y="1.27" drill="0.254"/>
@@ -2257,6 +2257,26 @@ You are welcome to use this library for 
 <text x="-1.5875" y="1.27" size="1.27" layer="25">&gt;NAME</text>
 <text x="-1.5875" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
 </package>
+<package name="POGOPROG-CONN-ALLSMT">
+<smd name="3" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="2" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="4" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="1" x="0" y="2.54" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="5" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
+<wire x1="-0.635" y1="3.175" x2="0.635" y2="3.175" width="0.127" layer="21"/>
+<wire x1="0.635" y1="3.175" x2="0.635" y2="-4.445" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-4.445" x2="-0.635" y2="-4.445" width="0.127" layer="21"/>
+<wire x1="-0.635" y1="-4.445" x2="-0.635" y2="3.175" width="0.127" layer="21"/>
+<smd name="6" x="0" y="-3.81" dx="0.889" dy="0.8128" layer="1"/>
+<polygon width="0.127" layer="21">
+<vertex x="-0.635" y="1.905"/>
+<vertex x="0.635" y="1.905"/>
+<vertex x="0.635" y="3.175"/>
+<vertex x="-0.635" y="3.175"/>
+</polygon>
+<text x="-1.27" y="3.81" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
+</package>
 </packages>
 </library>
 <library name="SparkFun-DiscreteSemi">
@@ -2331,53 +2351,6 @@ chip</description>
 </package>
 </packages>
 </library>
-<library name="resistor-dil">
-<description>&lt;b&gt;Resistors in DIL Packages&lt;/b&gt;&lt;p&gt;
-&lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
-<packages>
-<package name="EXBV4V">
-<description>&lt;b&gt;Chip Resistor Array 0603x2&lt;/b&gt; 2 resistors in 1.60 mm x 1.60 mm size&lt;p&gt;
-Source: PANASONIC .. aoc0000ce1.pdf</description>
-<wire x1="-0.75" y1="0.75" x2="-0.55" y2="0.75" width="0.1016" layer="51"/>
-<wire x1="-0.25" y1="0.75" x2="0.25" y2="0.75" width="0.1016" layer="51"/>
-<wire x1="0.55" y1="0.75" x2="0.75" y2="0.75" width="0.1016" layer="51"/>
-<wire x1="0.75" y1="0.75" x2="0.75" y2="-0.75" width="0.1016" layer="21"/>
-<wire x1="0.75" y1="-0.75" x2="0.55" y2="-0.75" width="0.1016" layer="51"/>
-<wire x1="0.25" y1="-0.75" x2="-0.25" y2="-0.75" width="0.1016" layer="51"/>
-<wire x1="-0.55" y1="-0.75" x2="-0.75" y2="-0.75" width="0.1016" layer="51"/>
-<wire x1="-0.75" y1="-0.75" x2="-0.75" y2="0.75" width="0.1016" layer="21"/>
-<wire x1="-0.55" y1="0.75" x2="-0.4" y2="0.6" width="0.1016" layer="51" curve="90"/>
-<wire x1="-0.4" y1="0.6" x2="-0.25" y2="0.75" width="0.1016" layer="51" curve="90"/>
-<wire x1="-0.25" y1="-0.75" x2="-0.4" y2="-0.6" width="0.1016" layer="51" curve="90"/>
-<wire x1="-0.4" y1="-0.6" x2="-0.55" y2="-0.75" width="0.1016" layer="51" curve="90"/>
-<wire x1="0.25" y1="0.75" x2="0.4" y2="0.6" width="0.1016" layer="51" curve="90"/>
-<wire x1="0.4" y1="0.6" x2="0.55" y2="0.75" width="0.1016" layer="51" curve="90"/>
-<wire x1="0.55" y1="-0.75" x2="0.4" y2="-0.6" width="0.1016" layer="51" curve="90"/>
-<wire x1="0.4" y1="-0.6" x2="0.25" y2="-0.75" width="0.1016" layer="51" curve="90"/>
-<smd name="1" x="-0.4" y="-0.775" dx="0.45" dy="0.7" layer="1"/>
-<smd name="2" x="0.4" y="-0.775" dx="0.45" dy="0.7" layer="1"/>
-<smd name="3" x="0.4" y="0.775" dx="0.45" dy="0.7" layer="1" rot="R180"/>
-<smd name="4" x="-0.4" y="0.775" dx="0.45" dy="0.7" layer="1" rot="R180"/>
-<text x="-1.5875" y="1.27" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.5875" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
-</package>
-</packages>
-</library>
-<library name="testpad">
-<description>&lt;b&gt;Test Pins/Pads&lt;/b&gt;&lt;p&gt;
-Cream on SMD OFF.&lt;br&gt;
-new: Attribute TP_SIGNAL_NAME&lt;br&gt;
-&lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
-<packages>
-<package name="TP06R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="0.6" dy="0.6" layer="1" roundness="100" cream="no"/>
-<text x="-0.3" y="0.4001" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.254" y="-0.381" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-</packages>
-</library>
 </libraries>
 <attributes>
 </attributes>
@@ -2475,9 +2448,6 @@ design rules under a new name.</descript
 <autorouter>
 <pass name="Default">
 <param name="RoutingGrid" value="12.5mil"/>
-<param name="AutoGrid" value="1"/>
-<param name="Efforts" value="0"/>
-<param name="TopRouterVariant" value="1"/>
 <param name="tpViaShape" value="round"/>
 <param name="PrefDir.1" value="|"/>
 <param name="PrefDir.2" value="0"/>
@@ -2630,24 +2600,13 @@ design rules under a new name.</descript
 <attribute name="VALUE" x="30.635" y="14.32625" size="0.4064" layer="27" ratio="10" rot="R180"/>
 </element>
 <element name="U$3" library="Protofusion" package="THERM_LOGO_0.2" value="" x="11.43" y="6.82625" rot="MR180"/>
-<element name="RN1" library="resistor-dil" package="EXBV4V" value="EXB-V4V220JV" x="19.3675" y="2.69875" rot="R270">
-<attribute name="OC_NEWARK" value="unknown" x="19.3675" y="2.69875" size="0.8128" layer="27" ratio="16" rot="R270" display="off"/>
-<attribute name="MPN" value="" x="19.3675" y="2.69875" size="0.8128" layer="27" ratio="16" rot="R270" display="off"/>
-<attribute name="MF" value="" x="19.3675" y="2.69875" size="0.8128" layer="27" ratio="16" rot="R270" display="off"/>
-<attribute name="OC_FARNELL" value="unknown" x="19.3675" y="2.69875" size="0.8128" layer="27" ratio="16" rot="R270" display="off"/>
-</element>
-<element name="U$13" library="Protofusion" package="UFQFPN32" value="STM32F042K" x="14.525625" y="6.746875" rot="R270"/>
-<element name="C5" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.604375" y="10.00125" rot="R180"/>
+<element name="U$13" library="Protofusion" package="UFQFPN32" value="STM32F042K" x="14.525625" y="7.14375" rot="R270"/>
+<element name="C5" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.604375" y="10.239375" rot="R180"/>
 <element name="C6" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="19.129375" y="9.8425"/>
 <element name="C7" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.68375" y="4.445" rot="R180"/>
 <element name="RA1" library="Protofusion" package="1206-ARV-4" value="1uF" x="1.5875" y="6.985" rot="R270"/>
-<element name="TP1" library="testpad" package="TP06R" value="TPTP06R" x="18.25625" y="4.445">
-<attribute name="TP_SIGNAL_NAME" value="" x="18.25625" y="4.445" size="1.778" layer="27" display="off"/>
-</element>
-<element name="TP2" library="testpad" package="TP06R" value="TPTP06R" x="17.62125" y="3.730625">
-<attribute name="TP_SIGNAL_NAME" value="" x="17.62125" y="3.730625" size="1.778" layer="27" display="off"/>
-</element>
 <element name="JP1" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="M022.54MM_SCREWTERM" x="13.97" y="2.38125" rot="MR0"/>
+<element name="U$6" library="Protofusion" package="POGOPROG-CONN-ALLSMT" value="POGOPIN-CONNALLSMT" x="20.240625" y="2.143125" rot="MR90"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -2709,7 +2668,7 @@ design rules under a new name.</descript
 <wire x1="0.8125" y1="7.385" x2="0.8125" y2="5.785" width="0.2032" layer="1"/>
 <via x="0.873125" y="3.254375" extent="1-16" drill="0.254"/>
 <via x="14.12875" y="6.746875" extent="1-16" drill="0.3048"/>
-<wire x1="14.12875" y1="6.746875" x2="14.525625" y2="6.746875" width="0.2032" layer="1"/>
+<wire x1="14.12875" y1="6.746875" x2="14.525625" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="19.779375" y1="9.8425" x2="18.58875" y2="11.25625" width="0.2032" layer="1"/>
 <wire x1="18.58875" y1="11.25625" x2="18.415" y2="11.43" width="0.2032" layer="1"/>
 <wire x1="8.335" y1="8.12625" x2="5.08" y2="8.12625" width="0.2032" layer="16"/>
@@ -2725,7 +2684,7 @@ design rules under a new name.</descript
 <wire x1="9.04875" y1="3.65125" x2="9.04875" y2="4.43" width="0.2032" layer="1"/>
 <wire x1="9.04875" y1="4.43" x2="9.03375" y2="4.445" width="0.2032" layer="1"/>
 <via x="8.89" y="12.065" extent="1-16" drill="0.3048"/>
-<wire x1="8.954375" y1="10.00125" x2="8.954375" y2="12.000625" width="0.2032" layer="1"/>
+<wire x1="8.954375" y1="10.239375" x2="8.954375" y2="12.000625" width="0.2032" layer="1"/>
 <wire x1="8.954375" y1="12.000625" x2="8.89" y2="12.065" width="0.2032" layer="1"/>
 <wire x1="29.845" y1="9.8575" x2="31.035625" y2="11.048125" width="0.2032" layer="1"/>
 <wire x1="31.035625" y1="11.048125" x2="31.035625" y2="11.27125" width="0.2032" layer="1"/>
@@ -2733,6 +2692,10 @@ design rules under a new name.</descript
 <wire x1="40.64" y1="11.7475" x2="41.195625" y2="11.191875" width="0.2032" layer="1"/>
 <wire x1="0.873125" y1="3.254375" x2="0.873125" y2="4.380625" width="0.2032" layer="1"/>
 <wire x1="0.873125" y1="4.380625" x2="0.9375" y2="4.445" width="0.2032" layer="1"/>
+<contactref element="U$6" pad="2"/>
+<contactref element="U$13" pad="31"/>
+<wire x1="16.875625" y1="8.39375" x2="15.775625" y2="8.39375" width="0.2032" layer="1"/>
+<wire x1="15.775625" y1="8.39375" x2="14.12875" y2="6.746875" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$1">
 <contactref element="C106" pad="1"/>
@@ -2830,9 +2793,10 @@ design rules under a new name.</descript
 <wire x1="3.92375" y1="8.77625" x2="8.335" y2="8.77625" width="0.2032" layer="16"/>
 <wire x1="22.5425" y1="6.35" x2="23.65375" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="23.65375" y1="7.46125" x2="24.4475" y2="7.46125" width="0.2032" layer="1"/>
-<wire x1="24.4475" y1="7.46125" x2="29.845" y2="7.46125" width="0.2032" layer="1"/>
+<wire x1="29.845" y1="8.5575" x2="29.845" y2="7.888696875" width="0.2032" layer="1"/>
+<wire x1="29.845" y1="7.888696875" x2="29.417553125" y2="7.46125" width="0.2032" layer="1"/>
+<wire x1="29.417553125" y1="7.46125" x2="24.4475" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="24.4475" y1="9.04" x2="24.4475" y2="7.46125" width="0.2032" layer="1"/>
-<wire x1="29.845" y1="8.5575" x2="29.845" y2="7.46125" width="0.2032" layer="1"/>
 <wire x1="10.16" y1="8.255" x2="10.16" y2="11.1125" width="0.2032" layer="16"/>
 <contactref element="C6" pad="1"/>
 <contactref element="U$13" pad="1"/>
@@ -2851,32 +2815,31 @@ design rules under a new name.</descript
 <wire x1="20.0025" y1="8.89" x2="19.764375" y2="9.128125" width="0.2032" layer="1"/>
 <wire x1="19.764375" y1="9.128125" x2="19.19375" y2="9.128125" width="0.2032" layer="1"/>
 <wire x1="19.19375" y1="9.128125" x2="18.479375" y2="9.8425" width="0.2032" layer="1"/>
-<wire x1="14.223125" y1="9.149375" x2="14.275625" y2="9.096875" width="0.2032" layer="1"/>
-<wire x1="16.275625" y1="9.096875" x2="16.275625" y2="9.759375" width="0.2032" layer="1"/>
-<wire x1="16.275625" y1="9.759375" x2="16.271875" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="14.3025" y1="9.466875" x2="14.275625" y2="9.49375" width="0.2032" layer="1"/>
+<wire x1="16.275625" y1="9.49375" x2="16.275625" y2="9.759375" width="0.2032" layer="1"/>
+<wire x1="16.275625" y1="9.759375" x2="16.271875" y2="10.00125" width="0.2032" layer="1"/>
 <wire x1="22.54" y1="5.3674" x2="21.639275" y2="5.3674" width="0.2032" layer="1"/>
 <wire x1="21.639275" y1="5.3674" x2="21.351875" y2="5.08" width="0.2032" layer="1"/>
 <wire x1="21.351875" y1="5.08" x2="21.351875" y2="4.539375" width="0.2032" layer="1"/>
 <wire x1="21.351875" y1="4.539375" x2="20.94" y2="4.1275" width="0.2032" layer="1"/>
 <wire x1="8.35" y1="7.46125" x2="10.16" y2="7.46125" width="0.2032" layer="16"/>
 <wire x1="10.33375" y1="4.445" x2="12.7275" y2="4.445" width="0.2032" layer="1"/>
-<wire x1="12.7275" y1="4.445" x2="12.775625" y2="4.396875" width="0.2032" layer="1"/>
+<wire x1="12.7275" y1="4.445" x2="12.775625" y2="4.79375" width="0.2032" layer="1"/>
 <wire x1="10.33375" y1="4.445" x2="10.33375" y2="5.3825" width="0.2032" layer="1"/>
 <wire x1="10.33375" y1="5.3825" x2="10.16" y2="5.55625" width="0.2032" layer="1"/>
-<wire x1="16.271875" y1="9.763125" x2="15.875" y2="9.763125" width="0.2032" layer="1"/>
-<wire x1="15.875" y1="9.763125" x2="14.275625" y2="9.763125" width="0.2032" layer="1"/>
-<wire x1="10.33375" y1="9.763125" x2="10.254375" y2="10.00125" width="0.2032" layer="1"/>
-<wire x1="10.254375" y1="10.00125" x2="10.254375" y2="11.018125" width="0.2032" layer="1"/>
+<wire x1="16.271875" y1="10.00125" x2="14.275625" y2="10.00125" width="0.2032" layer="1"/>
+<wire x1="10.33375" y1="9.763125" x2="10.254375" y2="10.239375" width="0.2032" layer="1"/>
+<wire x1="10.254375" y1="10.239375" x2="10.254375" y2="11.018125" width="0.2032" layer="1"/>
 <wire x1="10.254375" y1="11.018125" x2="10.16" y2="11.1125" width="0.2032" layer="1"/>
-<wire x1="14.275625" y1="9.096875" x2="14.275625" y2="9.763125" width="0.2032" layer="1"/>
-<wire x1="14.275625" y1="9.763125" x2="14.275625" y2="10.330625" width="0.2032" layer="1"/>
+<wire x1="14.275625" y1="9.49375" x2="14.275625" y2="10.00125" width="0.2032" layer="1"/>
+<wire x1="14.275625" y1="10.00125" x2="14.275625" y2="10.330625" width="0.2032" layer="1"/>
 <wire x1="14.275625" y1="10.330625" x2="13.6525" y2="10.95375" width="0.2032" layer="1"/>
 <wire x1="13.6525" y1="10.95375" x2="10.31875" y2="10.95375" width="0.2032" layer="1"/>
 <wire x1="10.31875" y1="10.95375" x2="10.16" y2="11.1125" width="0.2032" layer="1"/>
 <wire x1="2.3625" y1="8.185" x2="3.26375" y2="8.185" width="0.2032" layer="1"/>
 <wire x1="3.26375" y1="8.185" x2="3.81" y2="8.73125" width="0.2032" layer="1"/>
-<wire x1="18.479375" y1="9.8425" x2="18.4" y2="9.763125" width="0.2032" layer="1"/>
-<wire x1="18.4" y1="9.763125" x2="16.271875" y2="9.763125" width="0.2032" layer="1"/>
+<wire x1="18.479375" y1="9.8425" x2="18.320625" y2="10.00125" width="0.2032" layer="1"/>
+<wire x1="18.320625" y1="10.00125" x2="16.271875" y2="10.00125" width="0.2032" layer="1"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="JP101" pad="P1"/>
@@ -2897,8 +2860,7 @@ design rules under a new name.</descript
 <wire x1="30.48" y1="12.22375" x2="30.32125" y2="12.065" width="0.2032" layer="16"/>
 <wire x1="30.32125" y1="12.065" x2="30.32125" y2="10.4775" width="0.2032" layer="16"/>
 <wire x1="30.32125" y1="10.4775" x2="30.1625" y2="10.31875" width="0.2032" layer="16"/>
-<wire x1="30.1625" y1="10.31875" x2="24.4475" y2="10.31875" width="0.2032" layer="16"/>
-<wire x1="24.4475" y1="10.31875" x2="23.65375" y2="10.00125" width="0.2032" layer="16"/>
+<wire x1="30.1625" y1="10.31875" x2="23.97125" y2="10.31875" width="0.2032" layer="16"/>
 <via x="23.65375" y="10.00125" extent="1-16" drill="0.3048"/>
 <wire x1="23.65375" y1="10.00125" x2="23.65375" y2="8.62018125" width="0.2032" layer="1"/>
 <wire x1="23.65375" y1="8.62018125" x2="23.00116875" y2="7.9676" width="0.2032" layer="1"/>
@@ -2907,11 +2869,11 @@ design rules under a new name.</descript
 <via x="31.115" y="12.065" extent="1-16" drill="0.3048"/>
 <wire x1="31.115" y1="12.065" x2="31.115" y2="12.22375" width="0.2032" layer="16"/>
 <wire x1="31.115" y1="12.22375" x2="30.48" y2="12.22375" width="0.2032" layer="16"/>
+<wire x1="23.97125" y1="10.31875" x2="23.65375" y2="10.00125" width="0.2032" layer="16"/>
 </signal>
 <signal name="SW-A">
 <contactref element="SW101" pad="1"/>
 <via x="31.75" y="7.14375" extent="1-16" drill="0.3048"/>
-<contactref element="U$13" pad="29"/>
 <wire x1="20.16125" y1="7.540625" x2="31.353125" y2="7.540625" width="0.2032" layer="16"/>
 <wire x1="31.353125" y1="7.540625" x2="31.75" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="31.75" y1="7.14375" x2="31.75" y2="5.7899" width="0.2032" layer="1"/>
@@ -2919,10 +2881,9 @@ design rules under a new name.</descript
 <wire x1="20.16125" y1="7.540625" x2="19.84375" y2="7.223125" width="0.2032" layer="16"/>
 <wire x1="19.84375" y1="7.223125" x2="18.335625" y2="7.223125" width="0.2032" layer="16"/>
 <via x="18.335625" y="7.223125" extent="1-16" drill="0.3048"/>
-<wire x1="18.335625" y1="7.223125" x2="18.018125" y2="7.223125" width="0.2032" layer="1"/>
-<wire x1="18.018125" y1="7.223125" x2="17.78" y2="6.985" width="0.2032" layer="1"/>
-<wire x1="16.875625" y1="6.996875" x2="17.768125" y2="6.996875" width="0.2032" layer="1"/>
-<wire x1="17.768125" y1="6.996875" x2="17.78" y2="6.985" width="0.2032" layer="1"/>
+<contactref element="U$13" pad="28"/>
+<wire x1="16.875625" y1="6.89375" x2="18.00625" y2="6.89375" width="0.2032" layer="1"/>
+<wire x1="18.00625" y1="6.89375" x2="18.335625" y2="7.223125" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-C">
 <contactref element="SW101" pad="3"/>
@@ -2931,20 +2892,22 @@ design rules under a new name.</descript
 <wire x1="34.76625" y1="4.7625" x2="34.44875" y2="4.445" width="0.2032" layer="16"/>
 <wire x1="34.44875" y1="4.445" x2="33.02" y2="4.445" width="0.2032" layer="16"/>
 <wire x1="33.02" y1="4.445" x2="30.718125" y2="6.746875" width="0.2032" layer="16"/>
-<contactref element="U$13" pad="27"/>
 <wire x1="19.605625" y1="5.87375" x2="20.47875" y2="6.746875" width="0.2032" layer="16"/>
 <wire x1="20.47875" y1="6.746875" x2="30.718125" y2="6.746875" width="0.2032" layer="16"/>
 <wire x1="34.76625" y1="4.7625" x2="34.6824" y2="4.7625" width="0.2032" layer="1"/>
 <wire x1="34.6824" y1="4.7625" x2="33.56381875" y2="3.64391875" width="0.2032" layer="1"/>
 <wire x1="19.605625" y1="5.87375" x2="18.89125" y2="5.87375" width="0.2032" layer="16"/>
 <via x="18.89125" y="5.87375" extent="1-16" drill="0.3048"/>
-<wire x1="16.875625" y1="5.996875" x2="18.768125" y2="5.996875" width="0.2032" layer="1"/>
 <wire x1="18.768125" y1="5.996875" x2="18.89125" y2="5.87375" width="0.2032" layer="1"/>
+<contactref element="U$13" pad="26"/>
+<wire x1="16.875625" y1="5.89375" x2="17.4825" y2="5.89375" width="0.2032" layer="1"/>
+<wire x1="17.4825" y1="5.89375" x2="17.541875" y2="5.953125" width="0.2032" layer="1"/>
+<wire x1="17.541875" y1="5.953125" x2="18.811875" y2="5.953125" width="0.2032" layer="1"/>
+<wire x1="18.811875" y1="5.953125" x2="18.89125" y2="5.87375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-B">
 <contactref element="SW101" pad="4"/>
 <via x="35.2425" y="8.09625" extent="1-16" drill="0.3048"/>
-<contactref element="U$13" pad="31"/>
 <wire x1="19.3675" y1="8.493125" x2="32.146875" y2="8.334375" width="0.2032" layer="16"/>
 <wire x1="36.286178125" y1="10.326078125" x2="35.2425" y2="9.2824" width="0.2032" layer="1"/>
 <wire x1="35.2425" y1="9.2824" x2="35.2425" y2="8.09625" width="0.2032" layer="1"/>
@@ -2952,14 +2915,14 @@ design rules under a new name.</descript
 <wire x1="32.940625" y1="7.540625" x2="34.686875" y2="7.540625" width="0.2032" layer="16"/>
 <wire x1="34.686875" y1="7.540625" x2="35.2425" y2="8.09625" width="0.2032" layer="16"/>
 <via x="19.3675" y="8.493125" extent="1-16" drill="0.3048"/>
-<wire x1="19.3675" y1="8.493125" x2="17.93875" y2="8.493125" width="0.2032" layer="1"/>
-<wire x1="17.93875" y1="8.493125" x2="17.4425" y2="7.996875" width="0.2032" layer="1"/>
-<wire x1="16.875625" y1="7.996875" x2="17.4425" y2="7.996875" width="0.2032" layer="1"/>
+<wire x1="19.3675" y1="8.493125" x2="18.25625" y2="8.493125" width="0.2032" layer="1"/>
+<wire x1="18.25625" y1="8.493125" x2="17.656875" y2="7.89375" width="0.2032" layer="1"/>
+<contactref element="U$13" pad="30"/>
+<wire x1="16.875625" y1="7.89375" x2="17.656875" y2="7.89375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-D">
 <contactref element="SW101" pad="6"/>
 <via x="36.98875" y="7.14375" extent="1-16" drill="0.3048"/>
-<contactref element="U$13" pad="30"/>
 <wire x1="20.0025" y1="7.9375" x2="31.90875" y2="7.9375" width="0.2032" layer="16"/>
 <wire x1="36.98875" y1="7.14375" x2="37.06365" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="37.06365" y1="7.14375" x2="38.266078125" y2="8.346178125" width="0.2032" layer="1"/>
@@ -2969,51 +2932,71 @@ design rules under a new name.</descript
 <wire x1="19.764375" y1="7.699375" x2="18.970625" y2="7.699375" width="0.2032" layer="16"/>
 <wire x1="18.970625" y1="7.699375" x2="18.811875" y2="7.858125" width="0.2032" layer="16"/>
 <via x="18.811875" y="7.858125" extent="1-16" drill="0.3048"/>
-<wire x1="18.811875" y1="7.858125" x2="18.018125" y2="7.858125" width="0.2032" layer="1"/>
-<wire x1="18.018125" y1="7.858125" x2="17.656875" y2="7.496875" width="0.2032" layer="1"/>
-<wire x1="16.875625" y1="7.496875" x2="17.656875" y2="7.496875" width="0.2032" layer="1"/>
+<wire x1="18.811875" y1="7.858125" x2="18.176875" y2="7.858125" width="0.2032" layer="1"/>
+<wire x1="18.176875" y1="7.858125" x2="17.7125" y2="7.39375" width="0.2032" layer="1"/>
+<contactref element="U$13" pad="29"/>
+<wire x1="16.875625" y1="7.39375" x2="17.7125" y2="7.39375" width="0.2032" layer="1"/>
 </signal>
 <signal name="D+">
 <contactref element="J101" pad="D+"/>
-<contactref element="RN1" pad="4"/>
 <wire x1="41.165" y1="6.985" x2="40.005" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="40.005" y1="6.985" x2="39.6875" y2="6.6675" width="0.2032" layer="1"/>
 <wire x1="39.6875" y1="6.6675" x2="39.6875" y2="2.778125" width="0.2032" layer="1"/>
 <wire x1="39.6875" y1="2.778125" x2="39.21125" y2="2.301875" width="0.2032" layer="1"/>
-<wire x1="39.21125" y1="2.301875" x2="22.304375" y2="2.301875" width="0.2032" layer="1"/>
-<wire x1="22.304375" y1="2.301875" x2="21.5075" y2="3.09875" width="0.2032" layer="1"/>
-<wire x1="21.5075" y1="3.09875" x2="20.1425" y2="3.09875" width="0.2032" layer="1"/>
+<wire x1="39.21125" y1="2.301875" x2="18.576875" y2="2.301875" width="0.2032" layer="1"/>
+<contactref element="U$13" pad="22"/>
+<wire x1="15.275625" y1="4.79375" x2="15.275625" y2="3.774375" width="0.2032" layer="1"/>
+<wire x1="15.275625" y1="3.774375" x2="15.95125" y2="3.09875" width="0.2032" layer="1"/>
+<contactref element="U$6" pad="5"/>
+<wire x1="17.78" y1="3.09875" x2="15.95125" y2="3.09875" width="0.2032" layer="1"/>
+<wire x1="17.700625" y1="2.143125" x2="17.700625" y2="3.019375" width="0.2032" layer="16"/>
+<wire x1="17.700625" y1="3.019375" x2="17.78" y2="3.09875" width="0.2032" layer="16"/>
+<via x="17.78" y="3.09875" extent="1-16" drill="0.3048"/>
+<wire x1="18.576875" y1="2.301875" x2="17.78" y2="3.09875" width="0.2032" layer="1"/>
 </signal>
 <signal name="D-">
 <contactref element="J101" pad="D-"/>
-<contactref element="RN1" pad="3"/>
 <wire x1="41.165" y1="6.335" x2="40.3075" y2="6.335" width="0.2032" layer="1"/>
 <wire x1="40.3075" y1="6.335" x2="40.16375" y2="6.19125" width="0.2032" layer="1"/>
 <wire x1="21.9075" y1="1.905" x2="39.6875" y2="1.905" width="0.2032" layer="1"/>
 <wire x1="39.6875" y1="1.905" x2="40.16375" y2="2.38125" width="0.2032" layer="1"/>
 <wire x1="40.16375" y1="2.38125" x2="40.16375" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="21.9075" y1="1.905" x2="21.51375" y2="2.29875" width="0.2032" layer="1"/>
-<wire x1="21.51375" y1="2.29875" x2="20.1425" y2="2.29875" width="0.2032" layer="1"/>
+<wire x1="21.9075" y1="1.905" x2="21.910625" y2="1.901875" width="0.2032" layer="1"/>
+<contactref element="U$13" pad="21"/>
+<wire x1="14.775625" y1="4.79375" x2="14.775625" y2="3.639375" width="0.2032" layer="1"/>
+<wire x1="21.910625" y1="1.901875" x2="15.64" y2="1.901875" width="0.2032" layer="1"/>
+<contactref element="U$6" pad="6"/>
+<via x="15.39875" y="1.905" extent="1-16" drill="0.3048"/>
+<wire x1="14.775625" y1="3.639375" x2="15.39875" y2="3.01625" width="0.2032" layer="1"/>
+<wire x1="15.39875" y1="3.01625" x2="15.39875" y2="1.905" width="0.2032" layer="1"/>
+<wire x1="15.64" y1="1.901875" x2="15.39875" y2="1.905" width="0.2032" layer="1"/>
+<wire x1="16.430625" y1="2.143125" x2="15.636875" y2="2.143125" width="0.2032" layer="16"/>
+<wire x1="15.636875" y1="2.143125" x2="15.39875" y2="1.905" width="0.2032" layer="16"/>
 </signal>
-<signal name="N$10">
+<signal name="VUSB">
 <contactref element="J101" pad="VBUS"/>
 <contactref element="D101" pad="A"/>
 <wire x1="41.165" y1="5.685" x2="42.1975" y2="5.685" width="0.2032" layer="1"/>
 <wire x1="42.1975" y1="5.685" x2="42.38625" y2="6.0325" width="0.2032" layer="1"/>
+<via x="42.38625" y="11.495" extent="1-16" drill="0.3048"/>
 <wire x1="42.38625" y1="6.0325" x2="42.38625" y2="11.495" width="0.2032" layer="1"/>
-<via x="42.38625" y="11.495" extent="1-16" drill="0.3048"/>
 <wire x1="42.38625" y1="11.495" x2="41.81625" y2="12.065" width="0.2032" layer="16"/>
 <wire x1="41.81625" y1="12.065" x2="34.925" y2="12.065" width="0.2032" layer="16"/>
 <via x="34.925" y="12.065" extent="1-16" drill="0.3048"/>
 <wire x1="34.925" y1="12.065" x2="33.72" y2="12.065" width="0.2032" layer="1"/>
+<contactref element="U$6" pad="1"/>
+<wire x1="22.780625" y1="2.143125" x2="40.243125" y2="2.143125" width="0.2032" layer="16"/>
+<via x="42.38625" y="4.28625" extent="1-16" drill="0.3048"/>
+<wire x1="42.38625" y1="4.28625" x2="42.38625" y2="6.0325" width="0.2032" layer="1"/>
+<wire x1="40.243125" y1="2.143125" x2="42.38625" y2="4.28625" width="0.2032" layer="16"/>
 </signal>
 <signal name="SSR+">
 <contactref element="JP102" pad="P1"/>
 <contactref element="U$13" pad="7"/>
-<wire x1="13.275625" y1="9.096875" x2="13.275625" y2="9.783125" width="0.2032" layer="1"/>
-<wire x1="13.275625" y1="9.783125" x2="13.335" y2="9.8425" width="0.2032" layer="1"/>
-<via x="13.335" y="9.8425" extent="1-16" drill="0.3048"/>
-<wire x1="13.335" y1="9.8425" x2="14.9225" y2="11.43" width="0.2032" layer="16"/>
+<wire x1="13.275625" y1="9.49375" x2="13.275625" y2="9.783125" width="0.2032" layer="1"/>
+<wire x1="13.275625" y1="9.783125" x2="13.335" y2="10.31875" width="0.2032" layer="1"/>
+<via x="13.335" y="10.31875" extent="1-16" drill="0.3048"/>
+<wire x1="13.335" y1="10.31875" x2="14.9225" y2="11.43" width="0.2032" layer="16"/>
 <wire x1="14.9225" y1="11.43" x2="15.875" y2="11.43" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$23">
@@ -3035,7 +3018,7 @@ design rules under a new name.</descript
 <via x="17.62125" y="9.128125" extent="1-16" drill="0.3048"/>
 <wire x1="17.62125" y1="9.128125" x2="17.145" y2="9.128125" width="0.2032" layer="1"/>
 <wire x1="17.145" y1="9.128125" x2="16.875625" y2="8.85875" width="0.2032" layer="1"/>
-<wire x1="16.875625" y1="8.85875" x2="16.875625" y2="8.496875" width="0.2032" layer="1"/>
+<wire x1="16.875625" y1="8.85875" x2="16.875625" y2="8.89375" width="0.2032" layer="1"/>
 </signal>
 <signal name="!RES">
 <via x="5.715" y="5.87375" extent="1-16" drill="0.3048"/>
@@ -3047,8 +3030,8 @@ design rules under a new name.</descript
 <wire x1="8.335" y1="6.17625" x2="8.27" y2="6.17625" width="0.2032" layer="16"/>
 <wire x1="8.27" y1="6.17625" x2="8.255" y2="6.19125" width="0.2032" layer="16"/>
 <contactref element="U$13" pad="9"/>
-<wire x1="12.175625" y1="8.496875" x2="6.909375" y2="8.496875" width="0.2032" layer="1"/>
-<wire x1="6.909375" y1="8.496875" x2="5.794375" y2="7.381875" width="0.2032" layer="1"/>
+<wire x1="12.175625" y1="8.89375" x2="7.30625" y2="8.89375" width="0.2032" layer="1"/>
+<wire x1="7.30625" y1="8.89375" x2="5.794375" y2="7.381875" width="0.2032" layer="1"/>
 <wire x1="5.794375" y1="7.381875" x2="5.794375" y2="5.953125" width="0.2032" layer="1"/>
 <wire x1="5.794375" y1="5.953125" x2="5.715" y2="5.87375" width="0.2032" layer="1"/>
 </signal>
@@ -3058,8 +3041,8 @@ design rules under a new name.</descript
 <contactref element="LCD1" pad="10"/>
 <wire x1="8.335" y1="5.52625" x2="6.53875" y2="5.52625" width="0.2032" layer="16"/>
 <contactref element="U$13" pad="10"/>
-<wire x1="12.175625" y1="7.996875" x2="7.361875" y2="7.996875" width="0.2032" layer="1"/>
-<wire x1="7.361875" y1="7.996875" x2="6.50875" y2="7.14375" width="0.2032" layer="1"/>
+<wire x1="12.175625" y1="8.39375" x2="7.75875" y2="8.39375" width="0.2032" layer="1"/>
+<wire x1="7.75875" y1="8.39375" x2="6.50875" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="6.50875" y1="7.14375" x2="6.50875" y2="5.55625" width="0.2032" layer="1"/>
 </signal>
 <signal name="T-">
@@ -3080,37 +3063,24 @@ design rules under a new name.</descript
 <contactref element="SW101" pad="2"/>
 <wire x1="32.385" y1="5.715" x2="33.655" y2="5.715" width="0.2032" layer="16"/>
 <via x="33.655" y="5.715" extent="1-16" drill="0.3048"/>
-<contactref element="U$13" pad="28"/>
 <wire x1="20.32" y1="7.14375" x2="30.95625" y2="7.14375" width="0.2032" layer="16"/>
 <wire x1="30.95625" y1="7.14375" x2="32.385" y2="5.715" width="0.2032" layer="16"/>
 <wire x1="33.655" y1="5.715" x2="32.57386875" y2="4.63386875" width="0.2032" layer="1"/>
 <wire x1="20.32" y1="7.14375" x2="19.764375" y2="6.588125" width="0.2032" layer="16"/>
 <wire x1="19.764375" y1="6.588125" x2="19.288125" y2="6.588125" width="0.2032" layer="16"/>
 <via x="19.288125" y="6.588125" extent="1-16" drill="0.3048"/>
-<wire x1="16.875625" y1="6.496875" x2="19.196875" y2="6.496875" width="0.2032" layer="1"/>
 <wire x1="19.196875" y1="6.496875" x2="19.288125" y2="6.588125" width="0.2032" layer="1"/>
-</signal>
-<signal name="N$17">
-<contactref element="U$13" pad="22"/>
-<contactref element="RN1" pad="1"/>
-<wire x1="15.275625" y1="4.396875" x2="15.275625" y2="3.774375" width="0.2032" layer="1"/>
-<wire x1="15.275625" y1="3.774375" x2="15.95125" y2="3.09875" width="0.2032" layer="1"/>
-<wire x1="15.95125" y1="3.09875" x2="18.5925" y2="3.09875" width="0.2032" layer="1"/>
-</signal>
-<signal name="N$18">
-<contactref element="U$13" pad="21"/>
-<contactref element="RN1" pad="2"/>
-<wire x1="14.775625" y1="4.396875" x2="14.775625" y2="3.639375" width="0.2032" layer="1"/>
-<wire x1="14.775625" y1="3.639375" x2="16.11625" y2="2.29875" width="0.2032" layer="1"/>
-<wire x1="16.11625" y1="2.29875" x2="18.5925" y2="2.29875" width="0.2032" layer="1"/>
+<contactref element="U$13" pad="27"/>
+<wire x1="16.875625" y1="6.39375" x2="19.09375" y2="6.39375" width="0.2032" layer="1"/>
+<wire x1="19.09375" y1="6.39375" x2="19.288125" y2="6.588125" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MOSI">
 <via x="6.50875" y="4.206875" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="12"/>
 <contactref element="U$13" pad="13"/>
-<wire x1="12.175625" y1="6.496875" x2="11.815" y2="6.496875" width="0.2032" layer="1"/>
-<wire x1="11.815" y1="6.496875" x2="11.509375" y2="6.19125" width="0.2032" layer="1"/>
-<wire x1="11.509375" y1="6.19125" x2="8.711875" y2="6.19125" width="0.2032" layer="1"/>
+<wire x1="12.175625" y1="6.89375" x2="11.65625" y2="6.655625" width="0.2032" layer="1"/>
+<wire x1="11.65625" y1="6.655625" x2="11.350625" y2="6.19125" width="0.2032" layer="1"/>
+<wire x1="11.350625" y1="6.19125" x2="8.711875" y2="6.19125" width="0.2032" layer="1"/>
 <wire x1="8.335" y1="4.22625" x2="6.528125" y2="4.22625" width="0.2032" layer="16"/>
 <wire x1="6.528125" y1="4.22625" x2="6.50875" y2="4.206875" width="0.2032" layer="16"/>
 <wire x1="8.711875" y1="6.19125" x2="6.7275" y2="4.206875" width="0.2032" layer="1"/>
@@ -3128,10 +3098,10 @@ design rules under a new name.</descript
 <wire x1="21.034375" y1="5.953125" x2="19.84375" y2="4.7625" width="0.2032" layer="16"/>
 <wire x1="19.84375" y1="4.7625" x2="12.97560625" y2="4.7625" width="0.2032" layer="16"/>
 <wire x1="12.97560625" y1="4.7625" x2="11.43" y2="6.38748125" width="0.2032" layer="16"/>
-<wire x1="11.43" y1="6.38748125" x2="11.43" y2="6.905625" width="0.2032" layer="16"/>
-<via x="11.43" y="6.905625" extent="1-16" drill="0.3048"/>
-<wire x1="12.175625" y1="6.996875" x2="11.52125" y2="6.996875" width="0.2032" layer="1"/>
-<wire x1="11.52125" y1="6.996875" x2="11.43" y2="6.905625" width="0.2032" layer="1"/>
+<wire x1="11.43" y1="6.38748125" x2="11.43" y2="7.14375" width="0.2032" layer="16"/>
+<via x="11.43" y="7.14375" extent="1-16" drill="0.3048"/>
+<wire x1="12.175625" y1="7.39375" x2="11.68" y2="7.39375" width="0.2032" layer="1"/>
+<wire x1="11.68" y1="7.39375" x2="11.43" y2="7.14375" width="0.2032" layer="1"/>
 <wire x1="26.19375" y1="5.000625" x2="26.9875" y2="5.55625" width="0.2032" layer="16"/>
 <wire x1="26.9875" y1="5.55625" x2="26.9875" y2="5.715" width="0.2032" layer="16"/>
 </signal>
@@ -3141,20 +3111,20 @@ design rules under a new name.</descript
 <contactref element="U104" pad="5"/>
 <via x="24.13" y="5.23875" extent="1-16" drill="0.3048"/>
 <contactref element="U$13" pad="11"/>
-<wire x1="10.830625" y1="7.4175" x2="10.795" y2="7.381875" width="0.2032" layer="1"/>
-<via x="10.795" y="7.381875" extent="1-16" drill="0.3048"/>
-<wire x1="10.795" y1="7.381875" x2="10.795" y2="6.344109375" width="0.2032" layer="16"/>
+<wire x1="10.830625" y1="7.814375" x2="10.795" y2="7.858125" width="0.2032" layer="1"/>
+<via x="10.795" y="7.858125" extent="1-16" drill="0.3048"/>
+<wire x1="10.795" y1="7.858125" x2="10.795" y2="6.344109375" width="0.2032" layer="16"/>
 <wire x1="10.795" y1="6.344109375" x2="12.852859375" y2="4.28625" width="0.2032" layer="16"/>
 <wire x1="12.852859375" y1="4.28625" x2="20.0025" y2="4.28625" width="0.2032" layer="16"/>
-<wire x1="12.175625" y1="7.496875" x2="10.795" y2="7.496875" width="0.2032" layer="1"/>
-<wire x1="10.795" y1="7.496875" x2="8.131875" y2="7.496875" width="0.2032" layer="1"/>
-<wire x1="8.131875" y1="7.496875" x2="7.62" y2="6.985" width="0.2032" layer="1"/>
+<wire x1="12.175625" y1="7.89375" x2="10.795" y2="7.89375" width="0.2032" layer="1"/>
+<wire x1="10.795" y1="7.89375" x2="8.52875" y2="7.89375" width="0.2032" layer="1"/>
+<wire x1="8.52875" y1="7.89375" x2="7.62" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="7.62" y1="6.985" x2="7.62" y2="5.67" width="0.2032" layer="1"/>
 <wire x1="7.62" y1="5.67" x2="6.82625" y2="4.87625" width="0.2032" layer="1"/>
 <wire x1="6.82625" y1="4.87625" x2="5.9875" y2="4.87625" width="0.2032" layer="1"/>
 <wire x1="5.9875" y1="4.87625" x2="6.0325" y2="4.92125" width="0.2032" layer="1"/>
-<wire x1="10.830625" y1="7.4175" x2="10.830625" y2="7.46125" width="0.2032" layer="1"/>
-<wire x1="10.830625" y1="7.46125" x2="10.795" y2="7.496875" width="0.2032" layer="1"/>
+<wire x1="10.830625" y1="7.814375" x2="10.75125" y2="7.858125" width="0.2032" layer="1"/>
+<wire x1="10.75125" y1="7.858125" x2="10.795" y2="7.89375" width="0.2032" layer="1"/>
 <wire x1="20.0025" y1="4.28625" x2="21.193125" y2="5.476875" width="0.2032" layer="16"/>
 <wire x1="21.193125" y1="5.476875" x2="23.891875" y2="5.476875" width="0.2032" layer="16"/>
 <wire x1="24.4475" y1="3.64" x2="24.45875" y2="4.91" width="0.2032" layer="1"/>
@@ -3168,17 +3138,15 @@ design rules under a new name.</descript
 <via x="5.159375" y="6.82625" extent="1-16" drill="0.3048"/>
 <wire x1="8.335" y1="6.82625" x2="5.159375" y2="6.82625" width="0.2032" layer="16"/>
 <contactref element="U$13" pad="8"/>
-<wire x1="12.775625" y1="9.096875" x2="6.874375" y2="9.096875" width="0.2032" layer="1"/>
-<wire x1="6.874375" y1="9.096875" x2="5.159375" y2="7.381875" width="0.2032" layer="1"/>
+<wire x1="12.775625" y1="9.49375" x2="7.27125" y2="9.49375" width="0.2032" layer="1"/>
+<wire x1="7.27125" y1="9.49375" x2="5.159375" y2="7.381875" width="0.2032" layer="1"/>
 <wire x1="5.159375" y1="7.381875" x2="5.159375" y2="6.82625" width="0.2032" layer="1"/>
 </signal>
 <signal name="!CS_MAX">
 <contactref element="U104" pad="6"/>
 <contactref element="U$13" pad="25"/>
 <wire x1="19.52625" y1="5.23875" x2="20.6375" y2="6.35" width="0.2032" layer="16"/>
-<wire x1="20.6375" y1="6.35" x2="24.765" y2="6.35" width="0.2032" layer="16"/>
-<wire x1="24.765" y1="6.35" x2="24.844375" y2="6.270625" width="0.2032" layer="16"/>
-<wire x1="24.844375" y1="6.270625" x2="25.7175" y2="5.794375" width="0.2032" layer="16"/>
+<wire x1="20.6375" y1="6.35" x2="25.161875" y2="6.35" width="0.2032" layer="16"/>
 <via x="25.7175" y="5.794375" extent="1-16" drill="0.3048"/>
 <wire x1="25.7175" y1="5.794375" x2="25.7175" y2="3.64" width="0.2032" layer="1"/>
 <wire x1="19.52625" y1="5.23875" x2="18.176875" y2="5.23875" width="0.2032" layer="16"/>
@@ -3186,25 +3154,13 @@ design rules under a new name.</descript
 <via x="18.018125" y="5.3975" extent="1-16" drill="0.3048"/>
 <wire x1="18.018125" y1="5.3975" x2="17.62125" y2="5.000625" width="0.2032" layer="1"/>
 <wire x1="17.62125" y1="5.000625" x2="16.879375" y2="5.000625" width="0.2032" layer="1"/>
-<wire x1="16.879375" y1="5.000625" x2="16.875625" y2="4.996875" width="0.2032" layer="1"/>
-</signal>
-<signal name="N$5">
-<contactref element="U$13" pad="24"/>
-<contactref element="TP1" pad="TP"/>
-<wire x1="16.275625" y1="4.396875" x2="17.986875" y2="4.396875" width="0.2032" layer="1"/>
-<wire x1="17.986875" y1="4.396875" x2="18.25625" y2="4.445" width="0.2032" layer="1"/>
-</signal>
-<signal name="N$6">
-<contactref element="U$13" pad="23"/>
-<contactref element="TP2" pad="TP"/>
-<wire x1="15.775625" y1="4.396875" x2="15.775625" y2="3.98875" width="0.2032" layer="1"/>
-<wire x1="15.775625" y1="3.98875" x2="16.03375" y2="3.730625" width="0.2032" layer="1"/>
-<wire x1="16.03375" y1="3.730625" x2="17.62125" y2="3.730625" width="0.2032" layer="1"/>
+<wire x1="16.879375" y1="5.000625" x2="16.875625" y2="5.39375" width="0.2032" layer="1"/>
+<wire x1="25.161875" y1="6.35" x2="25.7175" y2="5.794375" width="0.2032" layer="16"/>
 </signal>
 <signal name="AUX-TX">
 <contactref element="JP1" pad="P1"/>
 <contactref element="U$13" pad="19"/>
-<wire x1="13.775625" y1="4.396875" x2="13.775625" y2="3.933125" width="0.2032" layer="1"/>
+<wire x1="13.775625" y1="4.79375" x2="13.775625" y2="3.933125" width="0.2032" layer="1"/>
 <wire x1="13.775625" y1="3.933125" x2="13.49375" y2="3.65125" width="0.2032" layer="1"/>
 <wire x1="13.49375" y1="3.65125" x2="11.58875" y2="3.65125" width="0.2032" layer="1"/>
 <wire x1="11.58875" y1="3.65125" x2="11.43" y2="3.4925" width="0.2032" layer="1"/>
@@ -3213,10 +3169,31 @@ design rules under a new name.</descript
 <signal name="AUX-RX">
 <contactref element="JP1" pad="P2"/>
 <contactref element="U$13" pad="20"/>
-<wire x1="14.275625" y1="4.396875" x2="14.275625" y2="3.798125" width="0.2032" layer="1"/>
+<wire x1="14.275625" y1="4.79375" x2="14.275625" y2="3.798125" width="0.2032" layer="1"/>
 <wire x1="14.275625" y1="3.798125" x2="13.97" y2="3.4925" width="0.2032" layer="1"/>
 <wire x1="13.97" y1="3.4925" x2="13.97" y2="2.38125" width="0.2032" layer="1"/>
 </signal>
+<signal name="SWCLK">
+<contactref element="U$6" pad="3"/>
+<contactref element="U$13" pad="24"/>
+<via x="20.240625" y="3.095625" extent="1-16" drill="0.3048"/>
+<wire x1="20.32" y1="2.2225" x2="20.240625" y2="2.143125" width="0.2032" layer="16"/>
+<wire x1="16.275625" y1="4.79375" x2="18.939375" y2="4.396875" width="0.2032" layer="1"/>
+<wire x1="18.939375" y1="4.396875" x2="20.240625" y2="3.095625" width="0.2032" layer="1"/>
+<wire x1="20.240625" y1="3.095625" x2="20.240625" y2="2.143125" width="0.2032" layer="16"/>
+</signal>
+<signal name="SWDIO">
+<contactref element="U$6" pad="4"/>
+<contactref element="U$13" pad="23"/>
+<wire x1="15.775625" y1="4.79375" x2="15.775625" y2="3.909375" width="0.2032" layer="1"/>
+<via x="18.970625" y="3.095625" extent="1-16" drill="0.3048"/>
+<wire x1="19.05" y1="2.2225" x2="18.970625" y2="2.143125" width="0.2032" layer="16"/>
+<wire x1="15.775625" y1="3.909375" x2="15.875" y2="3.81" width="0.2032" layer="1"/>
+<wire x1="15.875" y1="3.81" x2="18.811875" y2="3.81" width="0.2032" layer="1"/>
+<wire x1="18.811875" y1="3.81" x2="18.970625" y2="3.65125" width="0.2032" layer="1"/>
+<wire x1="18.970625" y1="3.65125" x2="18.970625" y2="3.095625" width="0.2032" layer="1"/>
+<wire x1="18.970625" y1="3.095625" x2="18.970625" y2="2.143125" width="0.2032" layer="16"/>
+</signal>
 </signals>
 </board>
 </drawing>
diff --git a/zoncoffee.sch b/zoncoffee.sch
--- a/zoncoffee.sch
+++ b/zoncoffee.sch
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="7.1.0">
+<eagle version="6.5.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
@@ -3061,6 +3061,161 @@ 5V - VREG-00823</description>
 <text x="-1.5875" y="1.27" size="1.27" layer="25">&gt;NAME</text>
 <text x="-1.5875" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
 </package>
+<package name="POGOPROG-CONN">
+<description>Standard pogo pin programming header with two alignment holes. Small SMD pads.</description>
+<smd name="3" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="2" x="0" y="2.54" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="4" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="1" x="0" y="3.81" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="5" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
+<hole x="0" y="5.08" drill="0.508"/>
+<hole x="0" y="-3.81" drill="0.508"/>
+<wire x1="-0.635" y1="5.715" x2="0.635" y2="5.715" width="0.127" layer="21"/>
+<wire x1="0.635" y1="5.715" x2="0.635" y2="-4.445" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-4.445" x2="-0.635" y2="-4.445" width="0.127" layer="21"/>
+<wire x1="-0.635" y1="-4.445" x2="-0.635" y2="5.715" width="0.127" layer="21"/>
+<smd name="6" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
+<polygon width="0.127" layer="21">
+<vertex x="-0.635" y="3.175"/>
+<vertex x="0.635" y="3.175"/>
+<vertex x="0.635" y="5.715"/>
+<vertex x="-0.635" y="5.715"/>
+</polygon>
+<text x="-1.27" y="6.35" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
+<circle x="0" y="5.08" radius="0.635" width="0" layer="29"/>
+<circle x="0" y="-3.81" radius="0.635" width="0" layer="29"/>
+<circle x="0" y="-3.81" radius="0.635" width="0" layer="30"/>
+<circle x="0" y="5.08" radius="0.635" width="0" layer="30"/>
+</package>
+<package name="POGOPROG-CONN-0H">
+<description>No holes, 2 vias, pogo pin programming header.</description>
+<smd name="3" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="2" x="0" y="2.54" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="4" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="5" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
+<wire x1="-0.635" y1="4.445" x2="0.635" y2="4.445" width="0.127" layer="21"/>
+<wire x1="0.635" y1="4.445" x2="0.635" y2="-3.175" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-3.175" x2="-0.635" y2="-3.175" width="0.127" layer="21"/>
+<wire x1="-0.635" y1="-3.175" x2="-0.635" y2="4.445" width="0.127" layer="21"/>
+<polygon width="0.127" layer="21">
+<vertex x="-0.635" y="1.905"/>
+<vertex x="0.635" y="1.905"/>
+<vertex x="0.635" y="4.445"/>
+<vertex x="-0.635" y="4.445"/>
+</polygon>
+<text x="-1.27" y="5.08" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-5.08" size="1.27" layer="27">&gt;VALUE</text>
+<pad name="1" x="0" y="3.81" drill="0.4572"/>
+<pad name="6" x="0" y="-2.54" drill="0.4572"/>
+</package>
+<package name="POGOPROG-CONN-1H">
+<description>Standard pogo pin programming header with ONE alignment hole. Small SMD pads.</description>
+<smd name="3" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="2" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="4" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="1" x="0" y="2.54" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="5" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
+<hole x="0" y="3.81" drill="0.5"/>
+<wire x1="-0.635" y1="4.445" x2="0.635" y2="4.445" width="0.127" layer="21"/>
+<wire x1="0.635" y1="4.445" x2="0.635" y2="-4.445" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-4.445" x2="-0.635" y2="-4.445" width="0.127" layer="21"/>
+<wire x1="-0.635" y1="-4.445" x2="-0.635" y2="4.445" width="0.127" layer="21"/>
+<smd name="6" x="0" y="-3.81" dx="0.889" dy="0.8128" layer="1"/>
+<polygon width="0.127" layer="21">
+<vertex x="-0.635" y="1.905"/>
+<vertex x="0.635" y="1.905"/>
+<vertex x="0.635" y="4.445"/>
+<vertex x="-0.635" y="4.445"/>
+</polygon>
+<text x="-1.27" y="5.08" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
+</package>
+<package name="POGOPROG-CONN-OH-SMALLERVIAS">
+<description>No holes, 2 vias, pogo pin programming header. With smaller vias.</description>
+<smd name="3" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="2" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="4" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="5" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
+<wire x1="-0.635" y1="3.175" x2="0.635" y2="3.175" width="0.127" layer="21"/>
+<wire x1="0.635" y1="3.175" x2="0.635" y2="-4.445" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-4.445" x2="-0.635" y2="-4.445" width="0.127" layer="21"/>
+<wire x1="-0.635" y1="-4.445" x2="-0.635" y2="3.175" width="0.127" layer="21"/>
+<polygon width="0.127" layer="21">
+<vertex x="-0.635" y="0.635"/>
+<vertex x="0.635" y="0.635"/>
+<vertex x="0.635" y="3.175"/>
+<vertex x="-0.635" y="3.175"/>
+</polygon>
+<text x="-1.27" y="3.81" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
+<pad name="1" x="0" y="2.54" drill="0.381"/>
+<pad name="6" x="0" y="-3.81" drill="0.381"/>
+</package>
+<package name="POGOPROG-CONN-W">
+<description>Standard pogo pin programming header with two alignment holes. WIDE smd pads.</description>
+<smd name="3" x="0" y="0" dx="1.143" dy="0.8128" layer="1"/>
+<smd name="2" x="0" y="1.27" dx="1.143" dy="0.8128" layer="1"/>
+<smd name="4" x="0" y="-1.27" dx="1.143" dy="0.8128" layer="1"/>
+<smd name="1" x="0" y="2.54" dx="1.143" dy="0.8128" layer="1"/>
+<smd name="5" x="0" y="-2.54" dx="1.143" dy="0.8128" layer="1"/>
+<hole x="0" y="3.81" drill="0.5"/>
+<hole x="0" y="-5.08" drill="0.5"/>
+<wire x1="-0.635" y1="4.445" x2="0.635" y2="4.445" width="0.127" layer="21"/>
+<wire x1="0.635" y1="4.445" x2="0.635" y2="-5.715" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-5.715" x2="-0.635" y2="-5.715" width="0.127" layer="21"/>
+<wire x1="-0.635" y1="-5.715" x2="-0.635" y2="4.445" width="0.127" layer="21"/>
+<smd name="6" x="0" y="-3.81" dx="1.143" dy="0.8128" layer="1"/>
+<polygon width="0.127" layer="21">
+<vertex x="-0.635" y="1.905"/>
+<vertex x="0.635" y="1.905"/>
+<vertex x="0.635" y="4.445"/>
+<vertex x="-0.635" y="4.445"/>
+</polygon>
+<text x="-1.27" y="5.08" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-7.62" size="1.27" layer="27">&gt;VALUE</text>
+</package>
+<package name="POGOPROG-CONN-OH-1V">
+<description>No holes, 1 via, pogo pin programming header.</description>
+<smd name="3" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="2" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="4" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="5" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
+<wire x1="-0.635" y1="3.175" x2="0.635" y2="3.175" width="0.127" layer="21"/>
+<wire x1="0.635" y1="3.175" x2="0.635" y2="-4.445" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-4.445" x2="-0.635" y2="-4.445" width="0.127" layer="21"/>
+<wire x1="-0.635" y1="-4.445" x2="-0.635" y2="3.175" width="0.127" layer="21"/>
+<polygon width="0.127" layer="21">
+<vertex x="-0.635" y="0.635"/>
+<vertex x="0.635" y="0.635"/>
+<vertex x="0.635" y="3.175"/>
+<vertex x="-0.635" y="3.175"/>
+</polygon>
+<text x="-1.27" y="3.81" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
+<pad name="1" x="0" y="2.54" drill="0.4572"/>
+<smd name="6" x="0" y="-3.81" dx="0.889" dy="0.8128" layer="1"/>
+</package>
+<package name="POGOPROG-CONN-ALLSMT">
+<smd name="3" x="0" y="0" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="2" x="0" y="1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="4" x="0" y="-1.27" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="1" x="0" y="2.54" dx="0.889" dy="0.8128" layer="1"/>
+<smd name="5" x="0" y="-2.54" dx="0.889" dy="0.8128" layer="1"/>
+<wire x1="-0.635" y1="3.175" x2="0.635" y2="3.175" width="0.127" layer="21"/>
+<wire x1="0.635" y1="3.175" x2="0.635" y2="-4.445" width="0.127" layer="21"/>
+<wire x1="0.635" y1="-4.445" x2="-0.635" y2="-4.445" width="0.127" layer="21"/>
+<wire x1="-0.635" y1="-4.445" x2="-0.635" y2="3.175" width="0.127" layer="21"/>
+<smd name="6" x="0" y="-3.81" dx="0.889" dy="0.8128" layer="1"/>
+<polygon width="0.127" layer="21">
+<vertex x="-0.635" y="1.905"/>
+<vertex x="0.635" y="1.905"/>
+<vertex x="0.635" y="3.175"/>
+<vertex x="-0.635" y="3.175"/>
+</polygon>
+<text x="-1.27" y="3.81" size="1.27" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
+</package>
 </packages>
 <symbols>
 <symbol name="STM32F042K">
@@ -3116,6 +3271,17 @@ 5V - VREG-00823</description>
 <wire x1="-0.762" y1="1.016" x2="0" y2="1.016" width="0.4064" layer="94"/>
 <wire x1="0" y1="1.016" x2="0.762" y2="1.016" width="0.4064" layer="94"/>
 </symbol>
+<symbol name="POGOPROG-CONN">
+<pin name="MOSI" x="-2.54" y="-5.08" length="short"/>
+<pin name="MISO" x="-2.54" y="-2.54" length="short"/>
+<pin name="SCK" x="-2.54" y="0" length="short"/>
+<pin name="\RST" x="-2.54" y="-7.62" length="short"/>
+<pin name="VCC" x="-2.54" y="5.08" length="short"/>
+<pin name="GND" x="-2.54" y="2.54" length="short"/>
+<text x="0" y="7.62" size="1.778" layer="95">&gt;NAME</text>
+<text x="0" y="-10.16" size="1.778" layer="95" rot="MR180">&gt;VALUE</text>
+<rectangle x1="0" y1="-8.89" x2="1.27" y2="6.35" layer="94"/>
+</symbol>
 </symbols>
 <devicesets>
 <deviceset name="STM32F042K">
@@ -3190,6 +3356,105 @@ 5V - VREG-00823</description>
 </device>
 </devices>
 </deviceset>
+<deviceset name="POGOPIN-CONN">
+<description>Protofusion custom pogo pin programming header</description>
+<gates>
+<gate name="J" symbol="POGOPROG-CONN" x="0" y="0"/>
+</gates>
+<devices>
+<device name="STANDARD" package="POGOPROG-CONN">
+<connects>
+<connect gate="J" pin="GND" pad="5"/>
+<connect gate="J" pin="MISO" pad="3"/>
+<connect gate="J" pin="MOSI" pad="2"/>
+<connect gate="J" pin="SCK" pad="4"/>
+<connect gate="J" pin="VCC" pad="6"/>
+<connect gate="J" pin="\RST" pad="1"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+<device name="WITHVIAS" package="POGOPROG-CONN-0H">
+<connects>
+<connect gate="J" pin="GND" pad="5"/>
+<connect gate="J" pin="MISO" pad="3"/>
+<connect gate="J" pin="MOSI" pad="2"/>
+<connect gate="J" pin="SCK" pad="4"/>
+<connect gate="J" pin="VCC" pad="6"/>
+<connect gate="J" pin="\RST" pad="1"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+<device name="ONEHOLE" package="POGOPROG-CONN-1H">
+<connects>
+<connect gate="J" pin="GND" pad="5"/>
+<connect gate="J" pin="MISO" pad="3"/>
+<connect gate="J" pin="MOSI" pad="2"/>
+<connect gate="J" pin="SCK" pad="4"/>
+<connect gate="J" pin="VCC" pad="6"/>
+<connect gate="J" pin="\RST" pad="1"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+<device name="WITHVIAS-SMV" package="POGOPROG-CONN-OH-SMALLERVIAS">
+<connects>
+<connect gate="J" pin="GND" pad="5"/>
+<connect gate="J" pin="MISO" pad="3"/>
+<connect gate="J" pin="MOSI" pad="2"/>
+<connect gate="J" pin="SCK" pad="4"/>
+<connect gate="J" pin="VCC" pad="6"/>
+<connect gate="J" pin="\RST" pad="1"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+<device name="WIDE" package="POGOPROG-CONN-W">
+<connects>
+<connect gate="J" pin="GND" pad="5"/>
+<connect gate="J" pin="MISO" pad="3"/>
+<connect gate="J" pin="MOSI" pad="2"/>
+<connect gate="J" pin="SCK" pad="4"/>
+<connect gate="J" pin="VCC" pad="6"/>
+<connect gate="J" pin="\RST" pad="1"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+<device name="WITHVIAS-1V" package="POGOPROG-CONN-OH-1V">
+<connects>
+<connect gate="J" pin="GND" pad="5"/>
+<connect gate="J" pin="MISO" pad="3"/>
+<connect gate="J" pin="MOSI" pad="2"/>
+<connect gate="J" pin="SCK" pad="4"/>
+<connect gate="J" pin="VCC" pad="6"/>
+<connect gate="J" pin="\RST" pad="1"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+<device name="ALLSMT" package="POGOPROG-CONN-ALLSMT">
+<connects>
+<connect gate="J" pin="GND" pad="2"/>
+<connect gate="J" pin="MISO" pad="4"/>
+<connect gate="J" pin="MOSI" pad="5"/>
+<connect gate="J" pin="SCK" pad="3"/>
+<connect gate="J" pin="VCC" pad="1"/>
+<connect gate="J" pin="\RST" pad="6"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
 </devicesets>
 </library>
 <library name="SparkFun-Aesthetics">
@@ -4400,892 +4665,6 @@ Standard 0603 ceramic capacitor, and 0.1
 </deviceset>
 </devicesets>
 </library>
-<library name="resistor-dil">
-<description>&lt;b&gt;Resistors in DIL Packages&lt;/b&gt;&lt;p&gt;
-&lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
-<packages>
-<package name="EXB14V">
-<description>&lt;b&gt;Chip Resistor Array 0201x2&lt;/b&gt; 2 resistors in 0.8 mm x 0.6 mm size&lt;p&gt;
-Source: PANASONIC .. aoc0000ce1.pdf</description>
-<wire x1="-0.35" y1="0.25" x2="-0.1" y2="0.25" width="0.1016" layer="51"/>
-<wire x1="-0.1" y1="0.25" x2="-0.1" y2="0.2" width="0.1016" layer="21"/>
-<wire x1="-0.1" y1="0.2" x2="0" y2="0.1" width="0.1016" layer="21" curve="90"/>
-<wire x1="0" y1="0.1" x2="0.1" y2="0.2" width="0.1016" layer="21" curve="90"/>
-<wire x1="0.1" y1="0.2" x2="0.1" y2="0.25" width="0.1016" layer="21"/>
-<wire x1="0.1" y1="0.25" x2="0.35" y2="0.25" width="0.1016" layer="51"/>
-<wire x1="0.35" y1="0.25" x2="0.35" y2="-0.25" width="0.1016" layer="51"/>
-<wire x1="0.35" y1="-0.25" x2="0.1" y2="-0.25" width="0.1016" layer="51"/>
-<wire x1="0.1" y1="-0.25" x2="0.1" y2="-0.2" width="0.1016" layer="21"/>
-<wire x1="0.1" y1="-0.2" x2="0" y2="-0.1" width="0.1016" layer="21" curve="90"/>
-<wire x1="0" y1="-0.1" x2="-0.1" y2="-0.2" width="0.1016" layer="21" curve="90"/>
-<wire x1="-0.1" y1="-0.2" x2="-0.1" y2="-0.25" width="0.1016" layer="21"/>
-<wire x1="-0.1" y1="-0.25" x2="-0.35" y2="-0.25" width="0.1016" layer="51"/>
-<wire x1="-0.35" y1="-0.25" x2="-0.35" y2="0.25" width="0.1016" layer="51"/>
-<smd name="1" x="-0.3" y="-0.3" dx="0.3" dy="0.3" layer="1"/>
-<smd name="2" x="0.3" y="-0.3" dx="0.3" dy="0.3" layer="1"/>
-<smd name="3" x="0.3" y="0.3" dx="0.3" dy="0.3" layer="1"/>
-<smd name="4" x="-0.3" y="0.3" dx="0.3" dy="0.3" layer="1"/>
-<text x="-0.9525" y="0.635" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.9525" y="-1.905" size="1.27" layer="27">&gt;VALUE</text>
-</package>
-<package name="EXB24V">
-<description>&lt;b&gt;Chip Resistor Array 0402x2&lt;/b&gt; 2 resistors in 1.0 mm x 1.0 mm size&lt;p&gt;
-Source: PANASONIC .. aoc0000ce1.pdf</description>
-<wire x1="-0.45" y1="0.45" x2="-0.15" y2="0.45" width="0.1016" layer="51"/>
-<wire x1="-0.15" y1="0.45" x2="0" y2="0.3" width="0.1016" layer="51" curve="90"/>
-<wire x1="0" y1="0.3" x2="0.15" y2="0.45" width="0.1016" layer="51" curve="90"/>
-<wire x1="0.15" y1="0.45" x2="0.45" y2="0.45" width="0.1016" layer="51"/>
-<wire x1="0.45" y1="0.45" x2="0.45" y2="-0.45" width="0.1016" layer="51"/>
-<wire x1="0.45" y1="-0.45" x2="0.15" y2="-0.45" width="0.1016" layer="51"/>
-<wire x1="0.15" y1="-0.45" x2="0" y2="-0.3" width="0.1016" layer="51" curve="90"/>
-<wire x1="0" y1="-0.3" x2="-0.15" y2="-0.45" width="0.1016" layer="51" curve="90"/>
-<wire x1="-0.15" y1="-0.45" x2="-0.45" y2="-0.45" width="0.1016" layer="51"/>
-<wire x1="-0.45" y1="-0.45" x2="-0.45" y2="0.45" width="0.1016" layer="51"/>
-<wire x1="-0.45" y1="-0.15" x2="-0.45" y2="0.15" width="0.1016" layer="21"/>
-<wire x1="0.45" y1="0.15" x2="0.45" y2="-0.15" width="0.1016" layer="21"/>
-<smd name="1" x="-0.35" y="-0.475" dx="0.4" dy="0.45" layer="1"/>
-<smd name="2" x="0.35" y="-0.475" dx="0.4" dy="0.45" layer="1"/>
-<smd name="3" x="0.35" y="0.475" dx="0.4" dy="0.45" layer="1"/>
-<smd name="4" x="-0.35" y="0.475" dx="0.4" dy="0.45" layer="1"/>
-<text x="-0.9525" y="0.9525" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.9525" y="-2.2225" size="1.27" layer="27">&gt;VALUE</text>
-</package>
-<package name="EXB34V">
-<description>&lt;b&gt;Chip Resistor Array 0603x2&lt;/b&gt; 2 resistors in 1.6 mm x 1.6 mm size (EXB34V, V4V)&lt;p&gt;
-Source: PANASONIC .. aoc0000ce1.pdf</description>
-<wire x1="0.75" y1="0.75" x2="0.75" y2="-0.75" width="0.1016" layer="51"/>
-<wire x1="0.75" y1="-0.75" x2="0.2" y2="-0.75" width="0.1016" layer="51"/>
-<wire x1="-0.2" y1="-0.75" x2="-0.75" y2="-0.75" width="0.1016" layer="51"/>
-<wire x1="-0.75" y1="-0.75" x2="-0.75" y2="0.75" width="0.1016" layer="51"/>
-<wire x1="-0.75" y1="-0.4" x2="-0.75" y2="0.4" width="0.1016" layer="21"/>
-<wire x1="0.75" y1="0.4" x2="0.75" y2="-0.4" width="0.1016" layer="21"/>
-<wire x1="-0.75" y1="0.75" x2="-0.2" y2="0.75" width="0.1016" layer="51"/>
-<wire x1="0.2" y1="0.75" x2="0.75" y2="0.75" width="0.1016" layer="51"/>
-<wire x1="-0.2" y1="0.75" x2="-0.2" y2="0.63" width="0.1016" layer="51"/>
-<wire x1="-0.2" y1="0.63" x2="-0.02" y2="0.45" width="0.1016" layer="51" curve="90"/>
-<wire x1="-0.02" y1="0.45" x2="0.02" y2="0.45" width="0.1016" layer="51"/>
-<wire x1="0.02" y1="0.45" x2="0.2" y2="0.63" width="0.1016" layer="51" curve="90"/>
-<wire x1="0.2" y1="0.63" x2="0.2" y2="0.75" width="0.1016" layer="51"/>
-<wire x1="0.2" y1="-0.75" x2="0.2" y2="-0.63" width="0.1016" layer="51"/>
-<wire x1="0.2" y1="-0.63" x2="0.02" y2="-0.45" width="0.1016" layer="51" curve="90"/>
-<wire x1="0.02" y1="-0.45" x2="-0.02" y2="-0.45" width="0.1016" layer="51"/>
-<wire x1="-0.02" y1="-0.45" x2="-0.2" y2="-0.63" width="0.1016" layer="51" curve="90"/>
-<wire x1="-0.2" y1="-0.63" x2="-0.2" y2="-0.75" width="0.1016" layer="51"/>
-<smd name="1" x="-0.5" y="-0.7" dx="0.5" dy="0.5" layer="1"/>
-<smd name="2" x="0.5" y="-0.7" dx="0.5" dy="0.5" layer="1"/>
-<smd name="3" x="0.5" y="0.7" dx="0.5" dy="0.5" layer="1" rot="R180"/>
-<smd name="4" x="-0.5" y="0.7" dx="0.5" dy="0.5" layer="1" rot="R180"/>
-<text x="-0.9725" y="1.27" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.9725" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
-</package>
-<package name="EXBV4V">
-<description>&lt;b&gt;Chip Resistor Array 0603x2&lt;/b&gt; 2 resistors in 1.60 mm x 1.60 mm size&lt;p&gt;
-Source: PANASONIC .. aoc0000ce1.pdf</description>
-<wire x1="-0.75" y1="0.75" x2="-0.55" y2="0.75" width="0.1016" layer="51"/>
-<wire x1="-0.25" y1="0.75" x2="0.25" y2="0.75" width="0.1016" layer="51"/>
-<wire x1="0.55" y1="0.75" x2="0.75" y2="0.75" width="0.1016" layer="51"/>
-<wire x1="0.75" y1="0.75" x2="0.75" y2="-0.75" width="0.1016" layer="21"/>
-<wire x1="0.75" y1="-0.75" x2="0.55" y2="-0.75" width="0.1016" layer="51"/>
-<wire x1="0.25" y1="-0.75" x2="-0.25" y2="-0.75" width="0.1016" layer="51"/>
-<wire x1="-0.55" y1="-0.75" x2="-0.75" y2="-0.75" width="0.1016" layer="51"/>
-<wire x1="-0.75" y1="-0.75" x2="-0.75" y2="0.75" width="0.1016" layer="21"/>
-<wire x1="-0.55" y1="0.75" x2="-0.4" y2="0.6" width="0.1016" layer="51" curve="90"/>
-<wire x1="-0.4" y1="0.6" x2="-0.25" y2="0.75" width="0.1016" layer="51" curve="90"/>
-<wire x1="-0.25" y1="-0.75" x2="-0.4" y2="-0.6" width="0.1016" layer="51" curve="90"/>
-<wire x1="-0.4" y1="-0.6" x2="-0.55" y2="-0.75" width="0.1016" layer="51" curve="90"/>
-<wire x1="0.25" y1="0.75" x2="0.4" y2="0.6" width="0.1016" layer="51" curve="90"/>
-<wire x1="0.4" y1="0.6" x2="0.55" y2="0.75" width="0.1016" layer="51" curve="90"/>
-<wire x1="0.55" y1="-0.75" x2="0.4" y2="-0.6" width="0.1016" layer="51" curve="90"/>
-<wire x1="0.4" y1="-0.6" x2="0.25" y2="-0.75" width="0.1016" layer="51" curve="90"/>
-<smd name="1" x="-0.4" y="-0.775" dx="0.45" dy="0.7" layer="1"/>
-<smd name="2" x="0.4" y="-0.775" dx="0.45" dy="0.7" layer="1"/>
-<smd name="3" x="0.4" y="0.775" dx="0.45" dy="0.7" layer="1" rot="R180"/>
-<smd name="4" x="-0.4" y="0.775" dx="0.45" dy="0.7" layer="1" rot="R180"/>
-<text x="-1.5875" y="1.27" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.5875" y="-2.54" size="1.27" layer="27">&gt;VALUE</text>
-</package>
-</packages>
-<symbols>
-<symbol name="R1NV">
-<wire x1="-2.54" y1="-0.762" x2="2.54" y2="-0.762" width="0.254" layer="94"/>
-<wire x1="2.54" y1="0.762" x2="-2.54" y2="0.762" width="0.254" layer="94"/>
-<wire x1="2.54" y1="-0.762" x2="2.54" y2="0.762" width="0.254" layer="94"/>
-<wire x1="-2.54" y1="0.762" x2="-2.54" y2="-0.762" width="0.254" layer="94"/>
-<text x="2.54" y="-3.048" size="1.778" layer="96">&gt;VALUE</text>
-<text x="-5.08" y="-3.048" size="1.778" layer="95">&gt;NAME</text>
-<pin name="1" x="-5.08" y="0" visible="pad" length="short" direction="pas" swaplevel="1"/>
-<pin name="2" x="5.08" y="0" visible="pad" length="short" direction="pas" swaplevel="1" rot="R180"/>
-</symbol>
-</symbols>
-<devicesets>
-<deviceset name="2R-N" prefix="RN" uservalue="yes">
-<description>&lt;b&gt;Array Chip Resistor&lt;/b&gt;&lt;p&gt;
-Source: Panasonic</description>
-<gates>
-<gate name="A" symbol="R1NV" x="0" y="2.54" addlevel="always"/>
-<gate name="B" symbol="R1NV" x="0" y="-2.54" addlevel="always"/>
-</gates>
-<devices>
-<device name="EXB14V" package="EXB14V">
-<connects>
-<connect gate="A" pin="1" pad="1"/>
-<connect gate="A" pin="2" pad="4"/>
-<connect gate="B" pin="1" pad="2"/>
-<connect gate="B" pin="2" pad="3"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="MF" value="" constant="no"/>
-<attribute name="MPN" value="" constant="no"/>
-<attribute name="OC_FARNELL" value="unknown" constant="no"/>
-<attribute name="OC_NEWARK" value="unknown" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="EXB24V" package="EXB24V">
-<connects>
-<connect gate="A" pin="1" pad="1"/>
-<connect gate="A" pin="2" pad="4"/>
-<connect gate="B" pin="1" pad="2"/>
-<connect gate="B" pin="2" pad="3"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="MF" value="" constant="no"/>
-<attribute name="MPN" value="" constant="no"/>
-<attribute name="OC_FARNELL" value="unknown" constant="no"/>
-<attribute name="OC_NEWARK" value="unknown" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="EXB34V" package="EXB34V">
-<connects>
-<connect gate="A" pin="1" pad="1"/>
-<connect gate="A" pin="2" pad="4"/>
-<connect gate="B" pin="1" pad="2"/>
-<connect gate="B" pin="2" pad="3"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="MF" value="" constant="no"/>
-<attribute name="MPN" value="" constant="no"/>
-<attribute name="OC_FARNELL" value="unknown" constant="no"/>
-<attribute name="OC_NEWARK" value="unknown" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="EXBV4V" package="EXBV4V">
-<connects>
-<connect gate="A" pin="1" pad="1"/>
-<connect gate="A" pin="2" pad="4"/>
-<connect gate="B" pin="1" pad="2"/>
-<connect gate="B" pin="2" pad="3"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="MF" value="" constant="no"/>
-<attribute name="MPN" value="" constant="no"/>
-<attribute name="OC_FARNELL" value="unknown" constant="no"/>
-<attribute name="OC_NEWARK" value="unknown" constant="no"/>
-</technology>
-</technologies>
-</device>
-</devices>
-</deviceset>
-</devicesets>
-</library>
-<library name="testpad">
-<description>&lt;b&gt;Test Pins/Pads&lt;/b&gt;&lt;p&gt;
-Cream on SMD OFF.&lt;br&gt;
-new: Attribute TP_SIGNAL_NAME&lt;br&gt;
-&lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
-<packages>
-<package name="B1,27">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<wire x1="-0.635" y1="0" x2="0.635" y2="0" width="0.0024" layer="37"/>
-<wire x1="0" y1="0.635" x2="0" y2="-0.635" width="0.0024" layer="37"/>
-<smd name="TP" x="0" y="0" dx="1.27" dy="1.27" layer="1" roundness="100" cream="no"/>
-<text x="-0.635" y="1.016" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="-0.635" y="-0.762" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="-0.635" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="B2,54">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<wire x1="-0.635" y1="0" x2="0.635" y2="0" width="0.0024" layer="37"/>
-<wire x1="0" y1="-0.635" x2="0" y2="0.635" width="0.0024" layer="37"/>
-<circle x="0" y="0" radius="0.635" width="0.254" layer="37"/>
-<smd name="TP" x="0" y="0" dx="2.54" dy="2.54" layer="1" roundness="100" cream="no"/>
-<text x="-1.27" y="1.651" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="-1.27" y="-1.397" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="-1.27" y="-3.175" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="P1-13">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<circle x="0" y="0" radius="0.762" width="0.1524" layer="51"/>
-<pad name="TP" x="0" y="0" drill="1.3208" diameter="2.159" shape="octagon"/>
-<text x="-1.016" y="1.27" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="0" y="0" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="-1.27" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-<rectangle x1="-0.3302" y1="-0.3302" x2="0.3302" y2="0.3302" layer="51"/>
-</package>
-<package name="P1-13Y">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<circle x="0" y="0" radius="0.762" width="0.1524" layer="51"/>
-<pad name="TP" x="0" y="0" drill="1.3208" diameter="1.905" shape="long" rot="R90"/>
-<text x="-0.889" y="2.159" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="0" y="0" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="-1.27" y="-3.81" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-<rectangle x1="-0.3302" y1="-0.3302" x2="0.3302" y2="0.3302" layer="51"/>
-</package>
-<package name="P1-17">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<circle x="0" y="0" radius="0.8128" width="0.1524" layer="51"/>
-<pad name="TP" x="0" y="0" drill="1.7018" diameter="2.54" shape="octagon"/>
-<text x="-1.143" y="1.397" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="0" y="0" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="-1.27" y="-3.175" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-<rectangle x1="-0.3302" y1="-0.3302" x2="0.3302" y2="0.3302" layer="51"/>
-</package>
-<package name="P1-17Y">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<circle x="0" y="0" radius="0.8128" width="0.1524" layer="51"/>
-<pad name="TP" x="0" y="0" drill="1.7018" diameter="2.1208" shape="long" rot="R90"/>
-<text x="-1.143" y="2.286" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="0" y="0" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="-1.27" y="-3.81" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-<rectangle x1="-0.3302" y1="-0.3302" x2="0.3302" y2="0.3302" layer="51"/>
-</package>
-<package name="P1-20">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<circle x="0" y="0" radius="1.016" width="0.1524" layer="51"/>
-<pad name="TP" x="0" y="0" drill="2.0066" diameter="3.1496" shape="octagon"/>
-<text x="-1.524" y="1.778" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="0" y="0" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="-1.27" y="-3.175" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-<rectangle x1="-0.3302" y1="-0.3302" x2="0.3302" y2="0.3302" layer="51"/>
-</package>
-<package name="P1-20Y">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<circle x="0" y="0" radius="1.016" width="0.1524" layer="51"/>
-<pad name="TP" x="0" y="0" drill="2.0066" diameter="2.54" shape="long" rot="R90"/>
-<text x="-1.27" y="2.794" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="0" y="0" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="-1.27" y="-4.445" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-<rectangle x1="-0.3302" y1="-0.3302" x2="0.3302" y2="0.3302" layer="51"/>
-</package>
-<package name="TP06R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="0.6" dy="0.6" layer="1" roundness="100" cream="no"/>
-<text x="-0.3" y="0.4001" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.254" y="-0.381" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP06SQ">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="0.5996" dy="0.5996" layer="1" cream="no"/>
-<text x="-0.3" y="0.4001" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.254" y="-0.381" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP07R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="0.7" dy="0.7" layer="1" roundness="100" cream="no"/>
-<text x="-0.3" y="0.4001" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.254" y="-0.508" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP07SQ">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="0.7" dy="0.7" layer="1" cream="no"/>
-<text x="-0.3" y="0.4001" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.381" y="-0.381" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP08R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="0.8" dy="0.8" layer="1" roundness="100" cream="no"/>
-<text x="-0.3" y="0.4001" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.381" y="-0.381" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP08SQ">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="0.8" dy="0.8" layer="1" cream="no"/>
-<text x="-0.3" y="0.4001" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.381" y="-0.508" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP09R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="0.9" dy="0.9" layer="1" roundness="100" cream="no"/>
-<text x="-0.4501" y="0.5001" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.381" y="-0.508" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP09SQ">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="0.8998" dy="0.8998" layer="1" cream="no"/>
-<text x="-0.4501" y="0.5001" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.381" y="-0.508" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP10R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1" dy="1" layer="1" roundness="100" cream="no"/>
-<text x="-0.5001" y="0.5499" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.381" y="-0.508" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP10SQ">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1" dy="1" layer="1" cream="no"/>
-<text x="-0.5001" y="0.5499" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.508" y="-0.635" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP11R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.1" dy="1.1" layer="1" roundness="100" cream="no"/>
-<text x="-0.5499" y="0.5999" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.508" y="-0.508" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP11SQ">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.1" dy="1.1" layer="1" cream="no"/>
-<text x="-0.5499" y="0.5999" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.508" y="-0.635" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP12SQ">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.1998" dy="1.1998" layer="1" cream="no"/>
-<text x="-0.5999" y="0.65" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.508" y="-0.635" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP12R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.2" dy="1.2" layer="1" roundness="100" cream="no"/>
-<text x="-0.5999" y="0.65" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.508" y="-0.635" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP13R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.3" dy="1.3" layer="1" roundness="100" cream="no"/>
-<text x="-0.65" y="0.7" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.508" y="-0.635" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP14R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.4" dy="1.4" layer="1" roundness="100" cream="no"/>
-<text x="-0.7" y="0.7501" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.508" y="-0.762" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP15R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.5" dy="1.5" layer="1" roundness="100" cream="no"/>
-<text x="-0.7501" y="0.8001" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.635" y="-0.762" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP16R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.6" dy="1.6" layer="1" roundness="100" cream="no"/>
-<text x="-0.8001" y="0.8499" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.635" y="-0.762" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP17R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.7" dy="1.7" layer="1" roundness="100" cream="no"/>
-<text x="-0.8499" y="0.8999" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.635" y="-0.889" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP18R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.8" dy="1.8" layer="1" roundness="100" cream="no"/>
-<text x="-0.8999" y="0.95" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.762" y="-0.889" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP19R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.9" dy="1.9" layer="1" roundness="100" cream="no"/>
-<text x="-0.95" y="1" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.762" y="-0.889" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP20R">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="2" dy="2" layer="1" roundness="100" cream="no"/>
-<text x="-1" y="1.05" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.762" y="-1.016" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP13SQ">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.3" dy="1.3" layer="1" cream="no"/>
-<text x="-0.65" y="0.7" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.635" y="-0.762" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP14SQ">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.4" dy="1.4" layer="1" cream="no"/>
-<text x="-0.7" y="0.7501" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.635" y="-0.762" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP15SQ">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.5" dy="1.5" layer="1" cream="no"/>
-<text x="-0.7501" y="0.8001" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.762" y="-0.889" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP16SQ">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.5996" dy="1.5996" layer="1" cream="no"/>
-<text x="-0.8001" y="0.8499" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.762" y="-0.889" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP17SQ">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.7" dy="1.7" layer="1" cream="no"/>
-<text x="-0.8499" y="0.8999" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.762" y="-0.889" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP18SQ">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.8" dy="1.8" layer="1" cream="no"/>
-<text x="-0.8999" y="0.95" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.889" y="-1.016" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP19SQ">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="1.8998" dy="1.8998" layer="1" cream="no"/>
-<text x="-0.95" y="1" size="1.27" layer="25">&gt;NAME</text>
-<text x="-0.889" y="-1.016" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="TP20SQ">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<smd name="TP" x="0" y="0" dx="2" dy="2" layer="1" cream="no"/>
-<text x="-1" y="1.05" size="1.27" layer="25">&gt;NAME</text>
-<text x="-1.016" y="-1.143" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="0" y="-2.54" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-</packages>
-<symbols>
-<symbol name="TP">
-<wire x1="-0.762" y1="-0.762" x2="0" y2="0" width="0.254" layer="94"/>
-<wire x1="0" y1="0" x2="0.762" y2="-0.762" width="0.254" layer="94"/>
-<wire x1="0.762" y1="-0.762" x2="0" y2="-1.524" width="0.254" layer="94"/>
-<wire x1="0" y1="-1.524" x2="-0.762" y2="-0.762" width="0.254" layer="94"/>
-<text x="-1.27" y="1.27" size="1.778" layer="95">&gt;NAME</text>
-<text x="1.27" y="-1.27" size="1.778" layer="97">&gt;TP_SIGNAL_NAME</text>
-<pin name="TP" x="0" y="-2.54" visible="off" length="short" direction="in" rot="R90"/>
-</symbol>
-</symbols>
-<devicesets>
-<deviceset name="TP" prefix="TP">
-<description>&lt;b&gt;Test pad&lt;/b&gt;</description>
-<gates>
-<gate name="G$1" symbol="TP" x="0" y="0"/>
-</gates>
-<devices>
-<device name="B1,27" package="B1,27">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="B2,54" package="B2,54">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="PAD1-13" package="P1-13">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="PAD1-13Y" package="P1-13Y">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="PAD1-17" package="P1-17">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="PAD1-17Y" package="P1-17Y">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="PAD1-20" package="P1-20">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="PAD1-20Y" package="P1-20Y">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP06R" package="TP06R">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP06SQ" package="TP06SQ">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP07R" package="TP07R">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP07SQ" package="TP07SQ">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP08R" package="TP08R">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP08SQ" package="TP08SQ">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP09R" package="TP09R">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP09SQ" package="TP09SQ">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP10R" package="TP10R">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP10SQ" package="TP10SQ">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP11R" package="TP11R">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP11SQ" package="TP11SQ">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP12SQ" package="TP12SQ">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP12R" package="TP12R">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP13R" package="TP13R">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP14R" package="TP14R">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP15R" package="TP15R">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP16R" package="TP16R">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP17R" package="TP17R">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP18R" package="TP18R">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP19R" package="TP19R">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP20R" package="TP20R">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP13SQ" package="TP13SQ">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP14SQ" package="TP14SQ">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP15SQ" package="TP15SQ">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP16SQ" package="TP16SQ">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP17SQ" package="TP17SQ">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP18SQ" package="TP18SQ">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP19SQ" package="TP19SQ">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="TP20SQ" package="TP20SQ">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="TP_SIGNAL_NAME" value="" constant="no"/>
-</technology>
-</technologies>
-</device>
-</devices>
-</deviceset>
-</devicesets>
-</library>
 </libraries>
 <attributes>
 </attributes>
@@ -5330,7 +4709,6 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <part name="GND8" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="FRAME1" library="SparkFun-Aesthetics" deviceset="FRAME-A4L" device=""/>
 <part name="LCD1" library="microbuilder" deviceset="DISP_OLED_UG-2832HSWEG04" device="WRAPAROUND"/>
-<part name="RN1" library="resistor-dil" deviceset="2R-N" device="EXBV4V" value="EXB-V4V220JV"/>
 <part name="U$13" library="Protofusion" deviceset="STM32F042K" device=""/>
 <part name="C5" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
 <part name="C6" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.1uF"/>
@@ -5343,24 +4721,20 @@ new: Attribute TP_SIGNAL_NAME&lt;br&gt;
 <part name="SUPPLY12" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
 <part name="SUPPLY13" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
 <part name="RA1" library="Protofusion" deviceset="CAP-ARRAY" device="" value="1uF"/>
-<part name="TP1" library="testpad" deviceset="TP" device="TP06R" value="TPTP06R"/>
-<part name="TP2" library="testpad" deviceset="TP" device="TP06R" value="TPTP06R"/>
 <part name="JP1" library="SparkFun-Connectors" deviceset="M02" device="2.54MM_SCREWTERM"/>
+<part name="U$6" library="Protofusion" deviceset="POGOPIN-CONN" device="ALLSMT"/>
+<part name="U$7" library="microbuilder" deviceset="GND" device=""/>
 </parts>
 <sheets>
 <sheet>
 <plain>
 <text x="170.18" y="5.08" size="1.778" layer="91">Replace with ceramicone</text>
-<text x="66.04" y="-78.74" size="6.4516" layer="113">BOOT pins@? Does USB DFU start on boot?</text>
 <text x="266.7" y="81.28" size="2.54" layer="113">Connectors</text>
 <text x="187.96" y="15.24" size="2.54" layer="113">Power Supply</text>
 <text x="109.22" y="12.7" size="2.54" layer="113">OLED Display</text>
 <text x="66.04" y="12.7" size="2.54" layer="113">Indication</text>
 <text x="200.66" y="-25.4" size="2.54" layer="113">Buttons</text>
 <text x="266.7" y="111.76" size="2.54" layer="113">TC Amp</text>
-<text x="116.84" y="-50.8" size="1.778" layer="94">DOWNSIZE ALL CAPS TO 1UF AND TEST
-REPLACE WITH 1UF 6v ARR</text>
-<text x="25.4" y="35.56" size="3.81" layer="91">CONSIDER ADDING POGO PADS FOR USB</text>
 </plain>
 <instances>
 <instance part="C106" gate="G$1" x="121.92" y="0" rot="R90"/>
@@ -5369,7 +4743,7 @@ REPLACE WITH 1UF 6v ARR</text>
 <instance part="R103" gate="G$1" x="106.68" y="-30.48"/>
 <instance part="U$17" gate="G$1" x="149.86" y="-5.08"/>
 <instance part="SW101" gate="SW" x="208.28" y="-38.1"/>
-<instance part="J101" gate="G$1" x="284.48" y="-25.4"/>
+<instance part="J101" gate="G$1" x="299.72" y="-25.4"/>
 <instance part="U104" gate="G$1" x="269.24" y="96.52" rot="R180"/>
 <instance part="U102" gate="G$1" x="210.82" y="-2.54"/>
 <instance part="LED102" gate="G$1" x="78.74" y="-22.86"/>
@@ -5382,8 +4756,8 @@ REPLACE WITH 1UF 6v ARR</text>
 <instance part="GND2" gate="1" x="195.58" y="-12.7"/>
 <instance part="SUPPLY4" gate="G$1" x="238.76" y="5.08"/>
 <instance part="U$4" gate="G$1" x="231.14" y="-43.18"/>
-<instance part="U$5" gate="G$1" x="279.4" y="-27.94"/>
-<instance part="D101" gate="G$1" x="269.24" y="-22.86" rot="R180"/>
+<instance part="U$5" gate="G$1" x="294.64" y="-27.94"/>
+<instance part="D101" gate="G$1" x="274.32" y="-22.86" rot="R180"/>
 <instance part="SUPPLY5" gate="G$1" x="261.62" y="-20.32"/>
 <instance part="C107" gate="G$1" x="182.88" y="0" rot="R180"/>
 <instance part="C110" gate="G$1" x="243.84" y="-5.08"/>
@@ -5397,8 +4771,6 @@ REPLACE WITH 1UF 6v ARR</text>
 <instance part="GND8" gate="1" x="243.84" y="-12.7"/>
 <instance part="FRAME1" gate="G$1" x="58.42" y="-58.42"/>
 <instance part="LCD1" gate="G$1" x="137.16" y="-17.78"/>
-<instance part="RN1" gate="A" x="220.98" y="76.2"/>
-<instance part="RN1" gate="B" x="228.6" y="73.66"/>
 <instance part="U$13" gate="G$1" x="160.02" y="63.5"/>
 <instance part="C5" gate="G$1" x="86.36" y="83.82"/>
 <instance part="C6" gate="G$1" x="73.66" y="91.44"/>
@@ -5409,14 +4781,14 @@ REPLACE WITH 1UF 6v ARR</text>
 <instance part="U$18" gate="G$1" x="160.02" y="48.26"/>
 <instance part="SUPPLY11" gate="G$1" x="73.66" y="104.14"/>
 <instance part="SUPPLY12" gate="G$1" x="86.36" y="93.98"/>
-<instance part="SUPPLY13" gate="G$1" x="213.36" y="66.04"/>
+<instance part="SUPPLY13" gate="G$1" x="213.36" y="63.5"/>
 <instance part="RA1" gate="1" x="119.38" y="-10.16" rot="R90"/>
 <instance part="RA1" gate="2" x="114.3" y="-15.24" rot="R90"/>
 <instance part="RA1" gate="3" x="119.38" y="-33.02" rot="R90"/>
 <instance part="RA1" gate="4" x="114.3" y="-35.56" rot="R90"/>
-<instance part="TP1" gate="G$1" x="228.6" y="81.28" rot="R270"/>
-<instance part="TP2" gate="G$1" x="233.68" y="78.74" rot="R270"/>
 <instance part="JP1" gate="G$1" x="198.12" y="33.02" rot="R180"/>
+<instance part="U$6" gate="J" x="246.38" y="40.64"/>
+<instance part="U$7" gate="G$1" x="228.6" y="93.98"/>
 </instances>
 <busses>
 </busses>
@@ -5501,7 +4873,7 @@ REPLACE WITH 1UF 6v ARR</text>
 <segment>
 <pinref part="J101" gate="G$1" pin="GND"/>
 <pinref part="U$5" gate="G$1" pin="GND"/>
-<wire x1="279.4" y1="-25.4" x2="281.94" y2="-25.4" width="0.1524" layer="91"/>
+<wire x1="294.64" y1="-25.4" x2="297.18" y2="-25.4" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="JP102" gate="G$1" pin="2"/>
@@ -5555,6 +4927,17 @@ REPLACE WITH 1UF 6v ARR</text>
 <pinref part="U$18" gate="G$1" pin="GND"/>
 <wire x1="160.02" y1="50.8" x2="160.02" y2="53.34" width="0.1524" layer="91"/>
 </segment>
+<segment>
+<pinref part="U$6" gate="J" pin="GND"/>
+<wire x1="238.76" y1="43.18" x2="243.84" y2="43.18" width="0.1524" layer="91"/>
+<label x="238.76" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+<segment>
+<pinref part="U$13" gate="G$1" pin="BOOT0-PF11"/>
+<wire x1="205.74" y1="99.06" x2="228.6" y2="99.06" width="0.1524" layer="91"/>
+<wire x1="228.6" y1="99.06" x2="228.6" y2="96.52" width="0.1524" layer="91"/>
+<pinref part="U$7" gate="G$1" pin="GND"/>
+</segment>
 </net>
 <net name="N$8" class="0">
 <segment>
@@ -5639,7 +5022,6 @@ REPLACE WITH 1UF 6v ARR</text>
 <wire x1="205.74" y1="63.5" x2="213.36" y2="63.5" width="0.1524" layer="91"/>
 <wire x1="213.36" y1="63.5" x2="213.36" y2="60.96" width="0.1524" layer="91"/>
 <pinref part="SUPPLY13" gate="G$1" pin="3.3V"/>
-<wire x1="213.36" y1="66.04" x2="213.36" y2="63.5" width="0.1524" layer="91"/>
 <junction x="213.36" y="63.5"/>
 </segment>
 </net>
@@ -5666,7 +5048,7 @@ REPLACE WITH 1UF 6v ARR</text>
 </segment>
 <segment>
 <pinref part="D101" gate="G$1" pin="C"/>
-<wire x1="266.7" y1="-22.86" x2="261.62" y2="-22.86" width="0.1524" layer="91"/>
+<wire x1="271.78" y1="-22.86" x2="261.62" y2="-22.86" width="0.1524" layer="91"/>
 <wire x1="261.62" y1="-22.86" x2="261.62" y2="-20.32" width="0.1524" layer="91"/>
 <pinref part="SUPPLY5" gate="G$1" pin="V_BATT"/>
 </segment>
@@ -5678,9 +5060,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="190.5" y="-35.56" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="208.28" y1="93.98" x2="205.74" y2="93.98" width="0.1524" layer="91"/>
-<label x="208.28" y="93.98" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="I2C1_SCL/USART1_TX/PB6"/>
+<wire x1="208.28" y1="91.44" x2="205.74" y2="91.44" width="0.1524" layer="91"/>
+<label x="208.28" y="91.44" size="1.016" layer="95" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="SPI1_MOSI/PB5"/>
 </segment>
 </net>
 <net name="SW-C" class="0">
@@ -5690,9 +5072,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="190.5" y="-40.64" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="208.28" y1="88.9" x2="205.74" y2="88.9" width="0.1524" layer="91"/>
-<label x="208.28" y="88.9" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="SPI1_MISO/PB4"/>
+<wire x1="208.28" y1="86.36" x2="205.74" y2="86.36" width="0.1524" layer="91"/>
+<label x="208.28" y="86.36" size="1.016" layer="95" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="SPI1_SCK/PB3"/>
 </segment>
 </net>
 <net name="SW-B" class="0">
@@ -5702,9 +5084,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="223.52" y="-35.56" size="1.016" layer="95" xref="yes"/>
 </segment>
 <segment>
-<wire x1="208.28" y1="99.06" x2="205.74" y2="99.06" width="0.1524" layer="91"/>
-<label x="208.28" y="99.06" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="BOOT0-PF11"/>
+<wire x1="208.28" y1="96.52" x2="205.74" y2="96.52" width="0.1524" layer="91"/>
+<label x="208.28" y="96.52" size="1.016" layer="95" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="I2C1_SDA/USART1_RX/PB7"/>
 </segment>
 </net>
 <net name="SW-D" class="0">
@@ -5714,40 +5096,60 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="223.52" y="-40.64" size="1.016" layer="95" xref="yes"/>
 </segment>
 <segment>
-<wire x1="208.28" y1="96.52" x2="205.74" y2="96.52" width="0.1524" layer="91"/>
-<label x="208.28" y="96.52" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="I2C1_SDA/USART1_RX/PB7"/>
+<wire x1="208.28" y1="93.98" x2="205.74" y2="93.98" width="0.1524" layer="91"/>
+<label x="208.28" y="93.98" size="1.016" layer="95" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="I2C1_SCL/USART1_TX/PB6"/>
 </segment>
 </net>
 <net name="D+" class="0">
 <segment>
 <pinref part="J101" gate="G$1" pin="D+"/>
-<wire x1="276.86" y1="-17.78" x2="281.94" y2="-17.78" width="0.1524" layer="91"/>
-<label x="276.86" y="-17.78" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="292.1" y1="-17.78" x2="297.18" y2="-17.78" width="0.1524" layer="91"/>
+<label x="292.1" y="-17.78" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="226.06" y1="76.2" x2="236.22" y2="76.2" width="0.1524" layer="91"/>
 <label x="236.22" y="76.2" size="1.016" layer="95" xref="yes"/>
-<pinref part="RN1" gate="A" pin="2"/>
+<pinref part="U$13" gate="G$1" pin="CAN_TX/I2C1_SDA/USB_DP/PA12"/>
+<wire x1="205.74" y1="76.2" x2="236.22" y2="76.2" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<pinref part="U$6" gate="J" pin="MOSI"/>
+<wire x1="238.76" y1="35.56" x2="243.84" y2="35.56" width="0.1524" layer="91"/>
+<label x="238.76" y="35.56" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="D-" class="0">
 <segment>
 <pinref part="J101" gate="G$1" pin="D-"/>
-<wire x1="276.86" y1="-20.32" x2="281.94" y2="-20.32" width="0.1524" layer="91"/>
-<label x="276.86" y="-20.32" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="292.1" y1="-20.32" x2="297.18" y2="-20.32" width="0.1524" layer="91"/>
+<label x="292.1" y="-20.32" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="236.22" y1="73.66" x2="233.68" y2="73.66" width="0.1524" layer="91"/>
 <label x="236.22" y="73.66" size="1.016" layer="95" xref="yes"/>
-<pinref part="RN1" gate="B" pin="2"/>
+<pinref part="U$13" gate="G$1" pin="CAN_RX/I2C1_SCL/USB_DM/PA11"/>
+<wire x1="205.74" y1="73.66" x2="236.22" y2="73.66" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<pinref part="U$6" gate="J" pin="\RST"/>
+<wire x1="238.76" y1="33.02" x2="243.84" y2="33.02" width="0.1524" layer="91"/>
+<label x="238.76" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
-<net name="N$10" class="0">
+<net name="VUSB" class="0">
 <segment>
 <pinref part="J101" gate="G$1" pin="VBUS"/>
 <pinref part="D101" gate="G$1" pin="A"/>
-<wire x1="271.78" y1="-22.86" x2="281.94" y2="-22.86" width="0.1524" layer="91"/>
+<wire x1="276.86" y1="-22.86" x2="281.94" y2="-22.86" width="0.1524" layer="91"/>
+<wire x1="281.94" y1="-22.86" x2="297.18" y2="-22.86" width="0.1524" layer="91"/>
+<wire x1="281.94" y1="-22.86" x2="281.94" y2="-7.62" width="0.1524" layer="91"/>
+<junction x="281.94" y="-22.86"/>
+<wire x1="281.94" y1="-7.62" x2="276.86" y2="-7.62" width="0.1524" layer="91"/>
+<label x="276.86" y="-7.62" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+<segment>
+<pinref part="U$6" gate="J" pin="VCC"/>
+<wire x1="243.84" y1="45.72" x2="238.76" y2="45.72" width="0.1524" layer="91"/>
+<label x="238.76" y="45.72" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="SSR+" class="0">
@@ -5836,23 +5238,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="190.5" y="-38.1" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="205.74" y1="91.44" x2="208.28" y2="91.44" width="0.1524" layer="91"/>
-<label x="208.28" y="91.44" size="1.016" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="SPI1_MOSI/PB5"/>
-</segment>
-</net>
-<net name="N$17" class="0">
-<segment>
-<pinref part="U$13" gate="G$1" pin="CAN_TX/I2C1_SDA/USB_DP/PA12"/>
-<wire x1="205.74" y1="76.2" x2="215.9" y2="76.2" width="0.1524" layer="91"/>
-<pinref part="RN1" gate="A" pin="1"/>
-</segment>
-</net>
-<net name="N$18" class="0">
-<segment>
-<pinref part="U$13" gate="G$1" pin="CAN_RX/I2C1_SCL/USB_DM/PA11"/>
-<wire x1="205.74" y1="73.66" x2="223.52" y2="73.66" width="0.1524" layer="91"/>
-<pinref part="RN1" gate="B" pin="1"/>
+<wire x1="205.74" y1="88.9" x2="208.28" y2="88.9" width="0.1524" layer="91"/>
+<label x="208.28" y="88.9" size="1.016" layer="95" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="SPI1_MISO/PB4"/>
 </segment>
 </net>
 <net name="SPI_MOSI" class="0">
@@ -5920,20 +5308,6 @@ REPLACE WITH 1UF 6v ARR</text>
 <pinref part="U$13" gate="G$1" pin="USART2_RX/PA15"/>
 </segment>
 </net>
-<net name="N$5" class="0">
-<segment>
-<pinref part="U$13" gate="G$1" pin="USART2_TX/SWCLK/PA14"/>
-<pinref part="TP1" gate="G$1" pin="TP"/>
-<wire x1="226.06" y1="81.28" x2="205.74" y2="81.28" width="0.1524" layer="91"/>
-</segment>
-</net>
-<net name="N$6" class="0">
-<segment>
-<pinref part="U$13" gate="G$1" pin="SWDIO/PA13"/>
-<pinref part="TP2" gate="G$1" pin="TP"/>
-<wire x1="231.14" y1="78.74" x2="205.74" y2="78.74" width="0.1524" layer="91"/>
-</segment>
-</net>
 <net name="AUX-TX" class="0">
 <segment>
 <pinref part="JP1" gate="G$1" pin="1"/>
@@ -5958,15 +5332,33 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="243.84" y="71.12" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
+<net name="SWCLK" class="0">
+<segment>
+<pinref part="U$6" gate="J" pin="SCK"/>
+<wire x1="238.76" y1="40.64" x2="243.84" y2="40.64" width="0.1524" layer="91"/>
+<label x="238.76" y="40.64" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+<segment>
+<pinref part="U$13" gate="G$1" pin="USART2_TX/SWCLK/PA14"/>
+<wire x1="226.06" y1="81.28" x2="205.74" y2="81.28" width="0.1524" layer="91"/>
+<label x="226.06" y="81.28" size="1.27" layer="95" xref="yes"/>
+</segment>
+</net>
+<net name="SWDIO" class="0">
+<segment>
+<pinref part="U$6" gate="J" pin="MISO"/>
+<wire x1="238.76" y1="38.1" x2="243.84" y2="38.1" width="0.1524" layer="91"/>
+<label x="238.76" y="38.1" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+<segment>
+<pinref part="U$13" gate="G$1" pin="SWDIO/PA13"/>
+<wire x1="226.06" y1="78.74" x2="205.74" y2="78.74" width="0.1524" layer="91"/>
+<label x="226.06" y="78.74" size="1.27" layer="95" xref="yes"/>
+</segment>
+</net>
 </nets>
 </sheet>
 </sheets>
 </schematic>
 </drawing>
-<compatibility>
-<note version="6.3" minversion="6.2.2" severity="warning">
-Since Version 6.2.2 text objects can contain more than one line,
-which will not be processed correctly with this version.
-</note>
-</compatibility>
 </eagle>