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>