Finishing up the layout

2 files changed, 226 insertions, 289 deletions

diff --git a/laser-tag badge/laser-tag.brd b/laser-tag badge/laser-tag.brd
index 0d01d6e..6c155e6 100644
--- a/laser-tag badge/laser-tag.brd
+++ b/laser-tag badge/laser-tag.brd
@@ -1752,42 +1752,6 @@ Metric Code Size 1608</description>
 </package>
 </packages>
 </library>
-<library name="Samtec">
-<description>&lt;b&gt;PCB Matrix Packages&lt;/b&gt;&lt;p&gt;</description>
-<packages>
-<package name="FTSH-105-01-XXX-DV-K">
-<description>TERMINAL STRIP, .050 inch(1.27mm) PITCH, 10 PINS, KEYED</description>
-<smd name="1" x="-2.54" y="-2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="2" x="-2.54" y="2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="3" x="-1.27" y="-2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="4" x="-1.27" y="2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="5" x="0" y="-2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="6" x="0" y="2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="7" x="1.27" y="-2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="8" x="1.27" y="2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="9" x="2.54" y="-2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="10" x="2.54" y="2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<wire x1="-3.175" y1="1.714" x2="-2.54" y2="1.714" width="0.254" layer="51"/>
-<wire x1="-2.54" y1="1.714" x2="-2.54" y2="2.54" width="0.254" layer="51"/>
-<wire x1="-2.54" y1="2.54" x2="2.54" y2="2.54" width="0.254" layer="51"/>
-<wire x1="2.54" y1="2.54" x2="2.54" y2="1.715" width="0.254" layer="51"/>
-<wire x1="2.54" y1="1.715" x2="3.175" y2="1.715" width="0.254" layer="51"/>
-<wire x1="3.175" y1="1.715" x2="3.175" y2="-1.714" width="0.254" layer="51"/>
-<wire x1="3.175" y1="-1.714" x2="2.54" y2="-1.714" width="0.254" layer="51"/>
-<wire x1="2.54" y1="-1.714" x2="2.54" y2="-2.54" width="0.254" layer="51"/>
-<wire x1="2.54" y1="-2.54" x2="-2.54" y2="-2.54" width="0.254" layer="51"/>
-<wire x1="-2.54" y1="-2.54" x2="-2.54" y2="-1.714" width="0.254" layer="51"/>
-<wire x1="-2.54" y1="-1.714" x2="-3.175" y2="-1.714" width="0.254" layer="51"/>
-<wire x1="-3.175" y1="-1.714" x2="-3.175" y2="1.714" width="0.254" layer="51"/>
-<wire x1="-3.683" y1="-3.81" x2="-3.683" y2="3.81" width="0.254" layer="21"/>
-<wire x1="-3.683" y1="3.81" x2="3.683" y2="3.81" width="0.254" layer="21"/>
-<wire x1="3.683" y1="3.81" x2="3.683" y2="-3.81" width="0.254" layer="21"/>
-<wire x1="3.683" y1="-3.81" x2="-3.683" y2="-3.81" width="0.254" layer="21"/>
-<text x="-3.81" y="5.08" size="1.27" layer="25">&gt;NAME</text>
-<text x="-3.81" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
-</package>
-</packages>
-</library>
 <library name="pinhead">
 <description>&lt;b&gt;Pin Header Connectors&lt;/b&gt;&lt;p&gt;
 &lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
@@ -2460,7 +2424,7 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="U1" library="Freescale" package="LQFP-64_10X10X1.6" value="MKL27Z256VLH4" x="67.31" y="40.64" rot="MR45">
+<element name="U1" library="Freescale" package="LQFP-64_10X10X1.6" value="MKL27Z256VLH4" x="67.31" y="40.64" smashed="yes" rot="MR45">
 <attribute name="FLASHKB" value="256" x="25.102796875" y="34.35381875" size="1.778" layer="28" rot="MR45" display="off"/>
 <attribute name="PACKAGE" value="LQFP" x="25.102796875" y="34.35381875" size="1.778" layer="28" rot="MR45" display="off"/>
 <attribute name="SRAMKB" value="32" x="25.102796875" y="34.35381875" size="1.778" layer="28" rot="MR45" display="off"/>
@@ -2469,60 +2433,144 @@ design rules under a new name.</description>
 <attribute name="VENDOR" value="FREESCALE" x="25.102796875" y="34.35381875" size="1.778" layer="28" rot="MR45" display="off"/>
 <attribute name="PINCOUNT" value="64" x="25.102796875" y="34.35381875" size="1.778" layer="28" rot="MR45" display="off"/>
 <attribute name="MANUFACTURER_PART_NUMBER" value="mkl27z256vlh4" x="25.102796875" y="34.35381875" size="1.778" layer="28" rot="MR45" display="off"/>
+<attribute name="NAME" x="75.875528125" y="40.066446875" size="1.27" layer="26" ratio="6" rot="SMR45"/>
+<attribute name="VALUE" x="66.12861875" y="30.12835625" size="1.27" layer="28" ratio="6" rot="SMR45"/>
 </element>
 <element name="BAT" library="adafruit" package="CR2032-SMD" value="BK-883" x="85.725" y="71.755" smashed="yes" rot="MR0">
 <attribute name="NAME" x="74.153" y="79.121" size="1.6764" layer="26" font="vector" rot="MR270"/>
-<attribute name="VALUE" x="94.265" y="79.248" size="1.6764" layer="28" font="vector" rot="MR270"/>
 </element>
-<element name="C1" library="rcl" package="C0603K" value="0.1 uF" x="67.31" y="43.815" rot="R270"/>
-<element name="C2" library="rcl" package="C0603K" value="0.1 uF" x="71.12" y="40.64" rot="R90"/>
-<element name="C3" library="rcl" package="C0603K" value="0.1 uF" x="63.5" y="40.64" rot="R90"/>
-<element name="C4" library="rcl" package="C0603K" value="0.1 uF" x="67.31" y="36.83" rot="R90"/>
-<element name="DEBUG" library="Samtec" package="FTSH-105-01-XXX-DV-K" value="FTSH-105" x="85.725" y="71.755" rot="R90"/>
+<element name="C1" library="rcl" package="C0603K" value="0.1 uF" x="67.31" y="43.815" smashed="yes" rot="R270">
+<attribute name="NAME" x="66.69" y="42.71" size="1.016" layer="25" rot="R270"/>
+<attribute name="VALUE" x="65.66" y="47.79" size="1.016" layer="27" rot="R270"/>
+</element>
+<element name="C2" library="rcl" package="C0603K" value="0.1 uF" x="71.12" y="40.64" smashed="yes" rot="R90">
+<attribute name="NAME" x="71.105" y="41.745" size="1.016" layer="25" rot="R90"/>
+<attribute name="VALUE" x="72.77" y="41.745" size="1.016" layer="27" rot="R90"/>
+</element>
+<element name="C3" library="rcl" package="C0603K" value="0.1 uF" x="64.135" y="40.64" smashed="yes" rot="R90">
+<attribute name="NAME" x="63.485" y="41.11" size="1.016" layer="25" rot="R90"/>
+<attribute name="VALUE" x="63.88" y="43.65" size="1.016" layer="27" rot="R90"/>
+</element>
+<element name="C4" library="rcl" package="C0603K" value="0.1 uF" x="67.31" y="36.83" smashed="yes" rot="R90">
+<attribute name="NAME" x="66.66" y="36.03" size="1.016" layer="25" rot="R90"/>
+<attribute name="VALUE" x="68.96" y="37.3" size="1.016" layer="27" rot="R90"/>
+</element>
 <element name="BREAKOUT1" library="pinhead" package="2X16" value="" x="30.48" y="5.08" rot="R180"/>
 <element name="BREAKOUT2" library="pinhead" package="2X16" value="" x="30.48" y="76.2"/>
-<element name="LD1" library="Photonics" package="LD-FLUSH-WITH-JUMPER" value="LD" x="88.9" y="8.89" rot="R90"/>
+<element name="LD1" library="Photonics" package="LD-FLUSH-WITH-JUMPER" value="LD" x="88.9" y="8.89" smashed="yes" rot="R90">
+<attribute name="NAME" x="85.09" y="5.08" size="1.27" layer="25" rot="R90"/>
+</element>
 <element name="T1" library="transistor" package="SOT23-BEC" value="" x="84.455" y="15.24" rot="MR90"/>
-<element name="R1" library="rcl" package="R0603" value="10k" x="76.835" y="41.275" rot="R180"/>
-<element name="USB" library="adafruit" package="USB-MINIB" value="" x="60.96" y="76.835" rot="MR180"/>
+<element name="R1" library="rcl" package="R0603" value="10k" x="76.835" y="41.275" smashed="yes" rot="R180">
+<attribute name="NAME" x="77.47" y="40.64" size="1.27" layer="25" rot="R180"/>
+<attribute name="VALUE" x="77.47" y="43.18" size="1.27" layer="27" rot="R180"/>
+</element>
+<element name="USB" library="adafruit" package="USB-MINIB" value="" x="3.81" y="22.225" rot="MR90"/>
 <element name="R2" library="rcl" package="R0603" value="10" x="84.455" y="19.05" rot="MR90"/>
-<element name="C5" library="rcl" package="C0603K" value="10 uF" x="72.39" y="35.56" rot="R270"/>
-<element name="S1" library="switch" package="SKHMPXE010" value="SKHMPSE010" x="62.23" y="8.255" rot="R90"/>
-<element name="S2" library="switch" package="SKHMPXE010" value="SKHMPSE010" x="74.93" y="8.255" rot="R90"/>
+<element name="C5" library="rcl" package="C0603K" value="10 uF" x="72.39" y="37.465" smashed="yes" rot="R90">
+<attribute name="NAME" x="72.375" y="34.125" size="1.016" layer="25" rot="R90"/>
+<attribute name="VALUE" x="74.04" y="34.125" size="1.016" layer="27" rot="R90"/>
+</element>
+<element name="S1" library="switch" package="SKHMPXE010" value="SKHMPSE010" x="62.23" y="8.255" smashed="yes" rot="R90">
+<attribute name="NAME" x="59.055" y="5.715" size="1.27" layer="25" rot="R90"/>
+</element>
+<element name="S2" library="switch" package="SKHMPXE010" value="SKHMPSE010" x="74.93" y="8.255" smashed="yes" rot="R90">
+<attribute name="NAME" x="71.755" y="5.715" size="1.27" layer="25" rot="R90"/>
+</element>
 <element name="J1" library="Jumpers" package="JUMPER_SOLDER_1X2_CLOSED" value="JUMPER_SOLDER_1X2_CLOSED" x="52.07" y="2.54" rot="R90"/>
-<element name="J3" library="Jumpers" package="JUMPER_SOLDER_1X2_CLOSED" value="JUMPER_SOLDER_1X2_CLOSED" x="77.47" y="43.815" rot="R180"/>
-<element name="J2" library="Jumpers" package="JUMPER_SOLDER_1X2_OPEN" value="JUMPER_SOLDER_1X2_OPEN" x="70.485" y="35.56" rot="R270"/>
+<element name="J3" library="Jumpers" package="JUMPER_SOLDER_1X2_CLOSED" value="JUMPER_SOLDER_1X2_CLOSED" x="75.565" y="39.37" rot="R270"/>
+<element name="J2" library="Jumpers" package="JUMPER_SOLDER_1X2_OPEN" value="JUMPER_SOLDER_1X2_OPEN" x="69.215" y="37.465" rot="R180"/>
 <element name="PD1" library="Photonics" package="PDB-C156-FLUSH" value="PDB-C156" x="93.98" y="40.64" smashed="yes" rot="R270">
-<attribute name="NAME" x="89.535" y="42.545" size="1.27" layer="25" rot="R270"/>
+<attribute name="NAME" x="92.71" y="36.83" size="1.27" layer="25"/>
 </element>
 <element name="PD2" library="Photonics" package="PDB-C156-FLUSH" value="PDB-C156" x="93.98" y="40.64" smashed="yes" rot="MR90">
-<attribute name="NAME" x="89.535" y="38.735" size="1.27" layer="26" rot="MR90"/>
+<attribute name="NAME" x="92.71" y="44.45" size="1.27" layer="26" rot="MR180"/>
 </element>
 <element name="P1" library="Displays" package="E1260CS021_SLOT" value="E1260CS021" x="31.75" y="40.64" rot="MR270"/>
-<element name="C6" library="rcl" package="C0603K" value="2.2 uF" x="26.035" y="50.8" rot="MR90"/>
-<element name="C7" library="rcl" package="C0603K" value="2.2 uF" x="24.13" y="50.8" rot="MR90"/>
-<element name="C8" library="rcl" package="C0603K" value="2.2 uF" x="22.225" y="50.8" rot="MR90"/>
-<element name="C9" library="rcl" package="C0603K" value="2.2 uF" x="20.32" y="50.8" rot="MR90"/>
-<element name="C10" library="rcl" package="C0603K" value="2.2 uF" x="27.94" y="34.29" rot="MR270"/>
-<element name="R3" library="rcl" package="R0603" value="2K" x="24.765" y="46.355" rot="MR0"/>
-<element name="C11" library="rcl" package="C0603K" value="2.2 uF" x="27.94" y="50.8" rot="MR90"/>
-<element name="C12" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="31.115" rot="MR180"/>
-<element name="C13" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="33.02" rot="MR180"/>
-<element name="C14" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="34.925" rot="MR180"/>
-<element name="C15" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="36.83" rot="MR180"/>
-<element name="C16" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="38.735" rot="MR180"/>
-<element name="C17" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="40.64" rot="MR180"/>
-<element name="C18" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="42.545" rot="MR180"/>
-<element name="C19" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="44.45" rot="MR180"/>
-<element name="C20" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="46.355" rot="MR180"/>
-<element name="D1" library="diode" package="SOD-123_MINI-SMA" value="NRVTS245ESFT1G" x="21.2725" y="56.8325" rot="MR270"/>
-<element name="Q1" library="transistor-small-signal" package="SOT23" value="BSS123" x="17.145" y="56.515" rot="MR180"/>
-<element name="Q2" library="transistor-small-signal" package="SOT23" value="BSS123" x="13.335" y="56.515" rot="MR180"/>
+<element name="C6" library="rcl" package="C0603K" value="2.2 uF" x="26.035" y="50.8" smashed="yes" rot="MR90">
+<attribute name="NAME" x="26.655" y="54.14" size="1.016" layer="26" rot="MR270"/>
+<attribute name="VALUE" x="29.465" y="55.715" size="1.016" layer="28" rot="MR90"/>
+</element>
+<element name="C7" library="rcl" package="C0603K" value="2.2 uF" x="24.13" y="50.8" smashed="yes" rot="MR90">
+<attribute name="NAME" x="24.75" y="54.14" size="1.016" layer="26" rot="MR270"/>
+<attribute name="VALUE" x="28.195" y="55.715" size="1.016" layer="28" rot="MR90"/>
+</element>
+<element name="C8" library="rcl" package="C0603K" value="2.2 uF" x="22.225" y="50.8" smashed="yes" rot="MR90">
+<attribute name="NAME" x="22.845" y="54.14" size="1.016" layer="26" rot="MR270"/>
+<attribute name="VALUE" x="26.925" y="55.715" size="1.016" layer="28" rot="MR90"/>
+</element>
+<element name="C9" library="rcl" package="C0603K" value="2.2 uF" x="20.32" y="50.8" smashed="yes" rot="MR90">
+<attribute name="NAME" x="20.94" y="54.14" size="1.016" layer="26" rot="MR270"/>
+<attribute name="VALUE" x="25.655" y="55.715" size="1.016" layer="28" rot="MR90"/>
+</element>
+<element name="C10" library="rcl" package="C0603K" value="2.2 uF" x="27.94" y="34.29" smashed="yes" rot="MR270">
+<attribute name="NAME" x="28.56" y="38.265" size="1.016" layer="26" rot="MR270"/>
+<attribute name="VALUE" x="27.05" y="38.265" size="1.016" layer="28" rot="MR270"/>
+</element>
+<element name="R3" library="rcl" package="R0603" value="2K" x="24.765" y="46.355" smashed="yes" rot="MR0">
+<attribute name="NAME" x="25.4" y="46.99" size="1.27" layer="26" rot="MR0"/>
+<attribute name="VALUE" x="25.4" y="44.45" size="1.27" layer="28" rot="MR0"/>
+</element>
+<element name="C11" library="rcl" package="C0603K" value="2.2 uF" x="27.94" y="50.8" smashed="yes" rot="MR90">
+<attribute name="NAME" x="28.56" y="54.775" size="1.016" layer="26" rot="MR270"/>
+<attribute name="VALUE" x="30.735" y="55.715" size="1.016" layer="28" rot="MR90"/>
+</element>
+<element name="C12" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="31.115" smashed="yes" rot="MR180">
+<attribute name="NAME" x="15.075" y="31.735" size="1.016" layer="26" rot="MR180"/>
+<attribute name="VALUE" x="9.995" y="31.495" size="1.016" layer="28" rot="MR180"/>
+</element>
+<element name="C13" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="33.02" smashed="yes" rot="MR180">
+<attribute name="NAME" x="15.075" y="33.64" size="1.016" layer="26" rot="MR180"/>
+<attribute name="VALUE" x="9.995" y="33.4" size="1.016" layer="28" rot="MR180"/>
+</element>
+<element name="C14" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="34.925" smashed="yes" rot="MR180">
+<attribute name="NAME" x="15.075" y="35.545" size="1.016" layer="26" rot="MR180"/>
+<attribute name="VALUE" x="9.995" y="35.305" size="1.016" layer="28" rot="MR180"/>
+</element>
+<element name="C15" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="36.83" smashed="yes" rot="MR180">
+<attribute name="NAME" x="15.075" y="37.45" size="1.016" layer="26" rot="MR180"/>
+<attribute name="VALUE" x="9.995" y="37.21" size="1.016" layer="28" rot="MR180"/>
+</element>
+<element name="C16" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="38.735" smashed="yes" rot="MR180">
+<attribute name="NAME" x="15.075" y="39.355" size="1.016" layer="26" rot="MR180"/>
+<attribute name="VALUE" x="9.995" y="39.115" size="1.016" layer="28" rot="MR180"/>
+</element>
+<element name="C17" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="40.64" smashed="yes" rot="MR180">
+<attribute name="NAME" x="15.075" y="41.26" size="1.016" layer="26" rot="MR180"/>
+<attribute name="VALUE" x="9.995" y="41.02" size="1.016" layer="28" rot="MR180"/>
+</element>
+<element name="C18" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="42.545" smashed="yes" rot="MR180">
+<attribute name="NAME" x="15.075" y="43.165" size="1.016" layer="26" rot="MR180"/>
+<attribute name="VALUE" x="9.995" y="42.925" size="1.016" layer="28" rot="MR180"/>
+</element>
+<element name="C19" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="44.45" smashed="yes" rot="MR180">
+<attribute name="NAME" x="15.075" y="45.07" size="1.016" layer="26" rot="MR180"/>
+<attribute name="VALUE" x="9.995" y="44.83" size="1.016" layer="28" rot="MR180"/>
+</element>
+<element name="C20" library="rcl" package="C0603K" value="2.2 uF" x="19.05" y="46.355" smashed="yes" rot="MR180">
+<attribute name="NAME" x="15.075" y="46.975" size="1.016" layer="26" rot="MR180"/>
+<attribute name="VALUE" x="9.995" y="46.735" size="1.016" layer="28" rot="MR180"/>
+</element>
+<element name="D1" library="diode" package="SOD-123_MINI-SMA" value="NRVTS245ESFT1G" x="21.2725" y="56.8325" smashed="yes" rot="MR270">
+<attribute name="NAME" x="24.3205" y="56.0705" size="1.27" layer="26" rot="MR0"/>
+</element>
+<element name="Q1" library="transistor-small-signal" package="SOT23" value="BSS123" x="17.145" y="56.515" smashed="yes" rot="MR180">
+<attribute name="NAME" x="15.24" y="54.61" size="1.27" layer="26" rot="MR180"/>
+</element>
+<element name="Q2" library="transistor-small-signal" package="SOT23" value="BSS123" x="13.335" y="56.515" smashed="yes" rot="MR180">
+<attribute name="NAME" x="11.43" y="54.61" size="1.27" layer="26" rot="MR180"/>
+</element>
 <element name="J4" library="Jumpers" package="JUMPER_SOLDER_1X2_CLOSED" value="JUMPER_SOLDER_1X2_CLOSED" x="31.115" y="8.89" rot="MR180"/>
-<element name="S3" library="Switches" package="TPA511GLFS" value="TPA511GLFS" x="68.58" y="67.945" rot="R270"/>
-<element name="L1" library="adafruit" package="WS2812B" value="WS2812B" x="87.63" y="40.64"/>
+<element name="S3" library="Switches" package="TPA511GLFS" value="TPA511GLFS" x="68.58" y="67.945" smashed="yes" rot="R270">
+<attribute name="NAME" x="71.58" y="73.195" size="1.27" layer="25" rot="R270"/>
+</element>
+<element name="L1" library="adafruit" package="WS2812B" value="WS2812B" x="87.63" y="40.64" smashed="yes">
+<attribute name="NAME" x="84.1375" y="39.0525" size="0.8128" layer="25" ratio="10" rot="R270"/>
+</element>
 <element name="J5" library="Jumpers" package="JUMPER_SOLDER_1X2_CLOSED" value="JUMPER_SOLDER_1X2_CLOSED" x="52.07" y="5.08" rot="MR90"/>
-<element name="SP1" library="adafruit" package="PS12" value="SPEAKER/PS12" x="69.85" y="15.875" rot="MR0"/>
+<element name="SP1" library="adafruit" package="PS12" value="SPEAKER/PS12" x="69.85" y="15.875" smashed="yes" rot="MR0">
+<attribute name="NAME" x="72.39" y="22.225" size="1.27" layer="26" ratio="10" rot="MR0"/>
+</element>
 </elements>
 <signals>
 <signal name="GND">
@@ -2531,8 +2579,6 @@ design rules under a new name.</description>
 <contactref element="C2" pad="2"/>
 <contactref element="C3" pad="2"/>
 <contactref element="C4" pad="2"/>
-<contactref element="DEBUG" pad="3"/>
-<contactref element="DEBUG" pad="5"/>
 <contactref element="U1" pad="16"/>
 <contactref element="U1" pad="31"/>
 <contactref element="U1" pad="47"/>
@@ -2615,9 +2661,6 @@ design rules under a new name.</description>
 <via x="83.185" y="42.545" extent="1-16" drill="0.5"/>
 <wire x1="77.685" y1="41.275" x2="78.74" y2="41.275" width="0.254" layer="1"/>
 <via x="78.74" y="41.275" extent="1-16" drill="0.5"/>
-<wire x1="63.5" y1="41.515" x2="64.375" y2="41.515" width="0.254" layer="1"/>
-<wire x1="64.375" y1="41.515" x2="64.77" y2="41.91" width="0.254" layer="1"/>
-<via x="64.77" y="41.91" extent="1-16" drill="0.5"/>
 <via x="68.58" y="43.18" extent="1-16" drill="0.5"/>
 <wire x1="68.58" y1="43.18" x2="68.34" y2="42.94" width="0.254" layer="1"/>
 <wire x1="68.34" y1="42.94" x2="67.31" y2="42.94" width="0.254" layer="1"/>
@@ -2626,19 +2669,19 @@ design rules under a new name.</description>
 <via x="69.85" y="41.275" extent="1-16" drill="0.5"/>
 <wire x1="69.85" y1="41.275" x2="70.09" y2="41.515" width="0.254" layer="1"/>
 <wire x1="70.09" y1="41.515" x2="71.12" y2="41.515" width="0.254" layer="1"/>
-<wire x1="72.39" y1="34.685" x2="72.785" y2="34.685" width="0.254" layer="1"/>
-<wire x1="72.785" y1="34.685" x2="73.66" y2="35.56" width="0.254" layer="1"/>
-<wire x1="73.66" y1="35.56" x2="73.66" y2="40.64" width="0.254" layer="1"/>
 <wire x1="73.66" y1="40.64" x2="72.785" y2="41.515" width="0.254" layer="1"/>
 <wire x1="72.785" y1="41.515" x2="71.12" y2="41.515" width="0.254" layer="1"/>
 <contactref element="T1" pad="E"/>
 <contactref element="SP1" pad="P$1"/>
-<wire x1="87.757" y1="70.485" x2="87.757" y2="71.755" width="0" layer="19" extent="1-1"/>
-<wire x1="85.725" y1="71.755" x2="87.757" y2="71.755" width="0" layer="19" extent="1-16"/>
+<wire x1="72.39" y1="38.34" x2="73.265" y2="38.34" width="0.254" layer="1"/>
+<wire x1="73.265" y1="38.34" x2="73.66" y2="38.735" width="0.254" layer="1"/>
+<wire x1="73.66" y1="38.735" x2="73.66" y2="40.64" width="0.254" layer="1"/>
+<wire x1="64.135" y1="41.515" x2="64.77" y2="42.15" width="0.254" layer="1"/>
+<wire x1="64.77" y1="42.15" x2="64.77" y2="42.545" width="0.254" layer="1"/>
+<via x="64.77" y="42.545" extent="1-16" drill="0.5"/>
 <wire x1="22.225" y1="51.675" x2="20.32" y2="51.675" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="VCC">
-<contactref element="DEBUG" pad="1"/>
 <contactref element="U1" pad="48"/>
 <contactref element="U1" pad="3"/>
 <contactref element="U1" pad="30"/>
@@ -2650,9 +2693,6 @@ design rules under a new name.</description>
 <wire x1="65.984175" y1="47.269134375" x2="67.31" y2="45.94330625" width="0.254" layer="16"/>
 <wire x1="67.31" y1="45.94330625" x2="67.31" y2="45.72" width="0.254" layer="16"/>
 <via x="67.31" y="45.72" extent="1-16" drill="0.5"/>
-<wire x1="61.387971875" y1="38.607065625" x2="62.23" y2="39.449096875" width="0.254" layer="16"/>
-<wire x1="62.23" y1="39.449096875" x2="62.23" y2="40.005" width="0.254" layer="16"/>
-<via x="62.23" y="40.005" extent="1-16" drill="0.5"/>
 <wire x1="73.23203125" y1="38.607065625" x2="72.39" y2="39.44909375" width="0.254" layer="16"/>
 <wire x1="72.39" y1="39.44909375" x2="72.39" y2="40.005" width="0.254" layer="16"/>
 <via x="72.39" y="40.005" extent="1-16" drill="0.5"/>
@@ -2665,24 +2705,19 @@ design rules under a new name.</description>
 <contactref element="C3" pad="1"/>
 <contactref element="C4" pad="1"/>
 <wire x1="66.28" y1="35.955" x2="66.04" y2="36.195" width="0.254" layer="1"/>
-<wire x1="66.04" y1="36.195" x2="63.5" y2="38.735" width="0.254" layer="1"/>
 <wire x1="67.31" y1="35.955" x2="66.28" y2="35.955" width="0.254" layer="1"/>
-<wire x1="63.5" y1="39.765" x2="63.5" y2="38.735" width="0.254" layer="1"/>
 <wire x1="71.12" y1="39.765" x2="72.15" y2="39.765" width="0.254" layer="1"/>
 <wire x1="72.15" y1="39.765" x2="72.39" y2="40.005" width="0.254" layer="1"/>
 <wire x1="67.31" y1="35.955" x2="68.34" y2="35.955" width="0.254" layer="1"/>
 <wire x1="68.34" y1="35.955" x2="68.58" y2="36.195" width="0.254" layer="1"/>
-<wire x1="63.5" y1="39.765" x2="62.47" y2="39.765" width="0.254" layer="1"/>
-<wire x1="62.47" y1="39.765" x2="62.23" y2="40.005" width="0.254" layer="1"/>
 <wire x1="67.31" y1="44.69" x2="67.31" y2="45.72" width="0.254" layer="1"/>
 <wire x1="71.12" y1="39.765" x2="70.245" y2="39.765" width="0.254" layer="1"/>
 <wire x1="70.245" y1="39.765" x2="68.58" y2="38.1" width="0.254" layer="1"/>
-<wire x1="68.58" y1="38.1" x2="68.58" y2="36.195" width="0.254" layer="1"/>
+<wire x1="68.58" y1="38.1" x2="68.58" y2="37.465" width="0.254" layer="1"/>
 <contactref element="BAT" pad="+$1"/>
 <contactref element="BAT" pad="+$2"/>
 <contactref element="J2" pad="2"/>
-<wire x1="68.58" y1="36.195" x2="69.4944" y2="35.2806" width="0.254" layer="1"/>
-<wire x1="69.4944" y1="35.2806" x2="70.485" y2="35.2806" width="0.254" layer="1"/>
+<wire x1="68.58" y1="37.465" x2="68.58" y2="36.195" width="0.254" layer="1"/>
 <contactref element="PD1" pad="C"/>
 <contactref element="PD2" pad="C"/>
 <contactref element="P1" pad="32"/>
@@ -2740,7 +2775,6 @@ design rules under a new name.</description>
 <via x="76.835" y="27.94" extent="1-16" drill="0.5"/>
 <wire x1="76.835" y1="27.94" x2="76.835" y2="29.845" width="0.254" layer="1"/>
 <wire x1="76.835" y1="29.845" x2="74.93" y2="31.75" width="0.254" layer="1"/>
-<wire x1="63.5" y1="39.765" x2="65.165" y2="39.765" width="0.254" layer="1"/>
 <wire x1="65.165" y1="39.765" x2="66.04" y2="40.64" width="0.254" layer="1"/>
 <wire x1="66.04" y1="40.64" x2="66.04" y2="43.815" width="0.254" layer="1"/>
 <wire x1="66.04" y1="43.815" x2="66.915" y2="44.69" width="0.254" layer="1"/>
@@ -2749,19 +2783,26 @@ design rules under a new name.</description>
 <wire x1="80.645" y1="8.89" x2="80.01" y2="9.525" width="0.254" layer="1"/>
 <wire x1="80.01" y1="9.525" x2="80.01" y2="27.305" width="0.254" layer="1"/>
 <wire x1="80.01" y1="27.305" x2="79.375" y2="27.94" width="0.254" layer="1"/>
-<wire x1="73.025" y1="71.755" x2="73.025" y2="60.96" width="0.254" layer="16"/>
-<wire x1="73.025" y1="60.96" x2="70.485" y2="58.42" width="0.254" layer="16"/>
-<via x="70.485" y="58.42" extent="1-16" drill="0.5"/>
-<wire x1="70.485" y1="58.42" x2="70.485" y2="48.895" width="0.254" layer="1"/>
-<wire x1="70.485" y1="48.895" x2="67.31" y2="45.72" width="0.254" layer="1"/>
-<wire x1="87.757" y1="69.215" x2="98.425" y2="71.755" width="0" layer="19" extent="1-16"/>
-<wire x1="73.025" y1="71.755" x2="87.757" y2="69.215" width="0" layer="19" extent="1-16"/>
+<wire x1="73.025" y1="67.945" x2="73.025" y2="60.96" width="0" layer="19" extent="1-16"/>
+<wire x1="73.025" y1="51.435" x2="67.31" y2="45.72" width="0.254" layer="1"/>
+<wire x1="68.9356" y1="37.465" x2="68.58" y2="37.465" width="0.254" layer="1"/>
+<wire x1="61.387971875" y1="38.607065625" x2="62.78590625" y2="40.005" width="0.254" layer="16"/>
+<wire x1="62.78590625" y1="40.005" x2="62.865" y2="40.005" width="0.254" layer="16"/>
+<via x="62.865" y="40.005" extent="1-16" drill="0.5"/>
+<wire x1="62.865" y1="40.005" x2="63.105" y2="39.765" width="0.254" layer="1"/>
+<wire x1="63.105" y1="39.765" x2="64.135" y2="39.765" width="0.254" layer="1"/>
+<wire x1="64.135" y1="39.765" x2="64.135" y2="38.1" width="0.254" layer="1"/>
+<wire x1="64.135" y1="38.1" x2="66.04" y2="36.195" width="0.254" layer="1"/>
+<wire x1="64.135" y1="39.765" x2="65.165" y2="39.765" width="0.254" layer="1"/>
+<wire x1="73.025" y1="51.435" x2="73.025" y2="67.945" width="0.254" layer="1"/>
+<via x="73.025" y="67.945" extent="1-16" drill="0.5"/>
+<wire x1="73.025" y1="67.945" x2="73.025" y2="71.755" width="0.254" layer="16"/>
+<wire x1="73.025" y1="71.755" x2="98.425" y2="71.755" width="0" layer="19" extent="16-16"/>
 <wire x1="69.703478125" y1="35.071521875" x2="69.696484375" y2="35.071521875" width="0" layer="19" extent="16-16"/>
 <wire x1="90.08" y1="38.99" x2="89.28" y2="38.99" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PTA3">
 <contactref element="U1" pad="25"/>
-<contactref element="DEBUG" pad="2"/>
 <contactref element="BREAKOUT1" pad="25"/>
 <wire x1="63.155753125" y1="36.8392875" x2="59.055" y2="32.738534375" width="0.254" layer="16"/>
 <wire x1="59.055" y1="32.738534375" x2="59.055" y2="29.21" width="0.254" layer="16"/>
@@ -2769,11 +2810,9 @@ design rules under a new name.</description>
 <wire x1="52.07" y1="22.225" x2="29.845" y2="22.225" width="0.254" layer="16"/>
 <wire x1="29.845" y1="22.225" x2="19.05" y2="11.43" width="0.254" layer="16"/>
 <wire x1="19.05" y1="11.43" x2="19.05" y2="6.35" width="0.254" layer="16"/>
-<wire x1="63.155753125" y1="36.8392875" x2="83.693" y2="69.215" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="PTA0">
 <contactref element="U1" pad="22"/>
-<contactref element="DEBUG" pad="4"/>
 <contactref element="BREAKOUT1" pad="22"/>
 <wire x1="24.13" y1="3.81" x2="22.86" y2="5.08" width="0.254" layer="16"/>
 <wire x1="64.2164125" y1="35.778628125" x2="60.96" y2="32.522215625" width="0.254" layer="16"/>
@@ -2782,11 +2821,9 @@ design rules under a new name.</description>
 <wire x1="52.07" y1="20.32" x2="29.845" y2="20.32" width="0.254" layer="16"/>
 <wire x1="29.845" y1="20.32" x2="22.86" y2="13.335" width="0.254" layer="16"/>
 <wire x1="22.86" y1="13.335" x2="22.86" y2="5.08" width="0.254" layer="16"/>
-<wire x1="64.2164125" y1="35.778628125" x2="83.693" y2="70.485" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="PTA20">
 <contactref element="U1" pad="34"/>
-<contactref element="DEBUG" pad="10"/>
 <contactref element="BREAKOUT2" pad="2"/>
 <contactref element="P1" pad="7"/>
 <wire x1="61.03441875" y1="42.319378125" x2="55.245" y2="48.108796875" width="0.254" layer="16"/>
@@ -2803,7 +2840,6 @@ design rules under a new name.</description>
 <wire x1="33.02" y1="38.735" x2="12.7" y2="59.055" width="0.254" layer="1"/>
 <wire x1="12.7" y1="59.055" x2="12.7" y2="76.2" width="0.254" layer="1"/>
 <wire x1="12.7" y1="76.2" x2="11.43" y2="77.47" width="0.254" layer="1"/>
-<wire x1="55.245" y1="52.07" x2="83.693" y2="74.295" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="PTE0">
 <contactref element="BREAKOUT1" pad="1"/>
@@ -2838,7 +2874,16 @@ design rules under a new name.</description>
 <wire x1="76.2" y1="33.02" x2="52.705" y2="9.525" width="0.254" layer="16"/>
 <wire x1="52.705" y1="9.525" x2="44.45" y2="9.525" width="0.254" layer="16"/>
 <wire x1="44.45" y1="9.525" x2="44.45" y2="6.35" width="0.254" layer="16"/>
-<wire x1="72.524925" y1="37.8999625" x2="60.96" y2="72.771" width="0" layer="19" extent="16-16"/>
+<wire x1="7.874" y1="22.225" x2="11.43" y2="22.225" width="0.254" layer="16"/>
+<wire x1="11.43" y1="22.225" x2="12.065" y2="21.59" width="0.254" layer="16"/>
+<wire x1="12.065" y1="21.59" x2="12.065" y2="9.525" width="0.254" layer="16"/>
+<wire x1="12.065" y1="9.525" x2="9.525" y2="6.985" width="0.254" layer="16"/>
+<wire x1="9.525" y1="6.985" x2="9.525" y2="3.175" width="0.254" layer="16"/>
+<wire x1="9.525" y1="3.175" x2="10.16" y2="2.54" width="0.254" layer="16"/>
+<wire x1="10.16" y1="2.54" x2="43.18" y2="2.54" width="0.254" layer="16"/>
+<via x="43.18" y="2.54" extent="1-16" drill="0.5"/>
+<wire x1="43.18" y1="2.54" x2="43.18" y2="5.08" width="0.254" layer="1"/>
+<wire x1="43.18" y1="5.08" x2="44.45" y2="6.35" width="0.254" layer="1"/>
 </signal>
 <signal name="USB0_DM">
 <contactref element="U1" pad="6"/>
@@ -2850,7 +2895,17 @@ design rules under a new name.</description>
 <wire x1="52.705" y1="10.16" x2="43.18" y2="10.16" width="0.254" layer="16"/>
 <wire x1="43.18" y1="10.16" x2="43.18" y2="5.08" width="0.254" layer="16"/>
 <wire x1="43.18" y1="5.08" x2="44.45" y2="3.81" width="0.254" layer="16"/>
-<wire x1="72.171371875" y1="37.546409375" x2="60.16" y2="72.771" width="0" layer="19" extent="16-16"/>
+<wire x1="7.874" y1="21.425" x2="10.96" y2="21.425" width="0.254" layer="16"/>
+<wire x1="10.96" y1="21.425" x2="11.43" y2="20.955" width="0.254" layer="16"/>
+<wire x1="11.43" y1="20.955" x2="11.43" y2="9.525" width="0.254" layer="16"/>
+<wire x1="11.43" y1="9.525" x2="8.89" y2="6.985" width="0.254" layer="16"/>
+<wire x1="8.89" y1="6.985" x2="8.89" y2="3.175" width="0.254" layer="16"/>
+<wire x1="8.89" y1="3.175" x2="10.16" y2="1.905" width="0.254" layer="16"/>
+<wire x1="10.16" y1="1.905" x2="41.91" y2="1.905" width="0.254" layer="16"/>
+<wire x1="41.91" y1="1.905" x2="42.545" y2="1.27" width="0.254" layer="16"/>
+<wire x1="42.545" y1="1.27" x2="43.815" y2="1.27" width="0.254" layer="16"/>
+<wire x1="43.815" y1="1.27" x2="44.45" y2="1.905" width="0.254" layer="16"/>
+<wire x1="44.45" y1="1.905" x2="44.45" y2="3.81" width="0.254" layer="16"/>
 </signal>
 <signal name="VREGIN">
 <contactref element="U1" pad="8"/>
@@ -2862,7 +2917,16 @@ design rules under a new name.</description>
 <wire x1="52.705" y1="11.43" x2="40.64" y2="11.43" width="0.254" layer="16"/>
 <wire x1="40.64" y1="11.43" x2="40.64" y2="5.08" width="0.254" layer="16"/>
 <wire x1="40.64" y1="5.08" x2="41.91" y2="3.81" width="0.254" layer="16"/>
-<wire x1="71.46425" y1="36.8392875" x2="59.36" y2="72.771" width="0" layer="19" extent="16-16"/>
+<wire x1="7.874" y1="20.625" x2="10.49" y2="20.625" width="0.254" layer="16"/>
+<wire x1="10.49" y1="20.625" x2="10.795" y2="20.32" width="0.254" layer="16"/>
+<wire x1="10.795" y1="20.32" x2="10.795" y2="10.16" width="0.254" layer="16"/>
+<wire x1="10.795" y1="10.16" x2="10.16" y2="9.525" width="0.254" layer="16"/>
+<via x="10.16" y="9.525" extent="1-16" drill="0.5"/>
+<wire x1="10.16" y1="9.525" x2="9.525" y2="8.89" width="0.254" layer="1"/>
+<wire x1="9.525" y1="8.89" x2="9.525" y2="2.54" width="0.254" layer="1"/>
+<wire x1="9.525" y1="2.54" x2="10.16" y2="1.905" width="0.254" layer="1"/>
+<wire x1="10.16" y1="1.905" x2="40.005" y2="1.905" width="0.254" layer="1"/>
+<wire x1="40.005" y1="1.905" x2="41.91" y2="3.81" width="0.254" layer="1"/>
 </signal>
 <signal name="PTE20">
 <contactref element="U1" pad="9"/>
@@ -2927,12 +2991,8 @@ design rules under a new name.</description>
 </signal>
 <signal name="PTE29">
 <contactref element="BREAKOUT1" pad="17"/>
-<contactref element="R1" pad="2"/>
-<contactref element="J3" pad="1"/>
 <contactref element="U1" pad="17"/>
 <contactref element="J3" pad="2"/>
-<contactref element="PD1" pad="A"/>
-<contactref element="PD2" pad="A"/>
 <wire x1="65.984175" y1="34.0108625" x2="65.19915625" y2="33.22584375" width="0.254" layer="16"/>
 <wire x1="65.19915625" y1="33.22584375" x2="64.135" y2="32.1616875" width="0.254" layer="16"/>
 <wire x1="64.135" y1="32.1616875" x2="64.135" y2="29.21" width="0.254" layer="16"/>
@@ -2940,26 +3000,12 @@ design rules under a new name.</description>
 <wire x1="52.07" y1="17.145" x2="29.845" y2="17.145" width="0.254" layer="16"/>
 <wire x1="29.845" y1="17.145" x2="29.21" y2="16.51" width="0.254" layer="16"/>
 <wire x1="29.21" y1="16.51" x2="29.21" y2="6.35" width="0.254" layer="16"/>
-<wire x1="93.98" y1="41.91" x2="93.98" y2="43.18" width="0.254" layer="1"/>
-<wire x1="93.98" y1="43.18" x2="93.345" y2="43.815" width="0.254" layer="1"/>
-<wire x1="93.345" y1="43.815" x2="90.805" y2="43.815" width="0.254" layer="1"/>
-<wire x1="90.805" y1="43.815" x2="77.7494" y2="43.815" width="0.254" layer="1"/>
-<wire x1="93.98" y1="39.37" x2="91.44" y2="39.37" width="0.254" layer="16"/>
-<wire x1="91.44" y1="39.37" x2="90.805" y2="40.005" width="0.254" layer="16"/>
-<wire x1="90.805" y1="40.005" x2="90.805" y2="43.815" width="0.254" layer="16"/>
-<via x="90.805" y="43.815" extent="1-16" drill="0.5"/>
 <wire x1="75.565" y1="34.29" x2="74.295" y2="33.02" width="0.254" layer="1"/>
 <wire x1="74.295" y1="33.02" x2="66.675" y2="33.02" width="0.254" layer="1"/>
 <via x="66.675" y="33.02" extent="1-16" drill="0.5"/>
 <wire x1="66.675" y1="33.02" x2="65.405" y2="33.02" width="0.254" layer="16"/>
 <wire x1="65.405" y1="33.02" x2="65.19915625" y2="33.22584375" width="0.254" layer="16"/>
-<wire x1="77.1906" y1="43.815" x2="76.835" y2="43.815" width="0.254" layer="1"/>
-<wire x1="76.835" y1="43.815" x2="76.2" y2="43.18" width="0.254" layer="1"/>
-<wire x1="76.2" y1="43.18" x2="76.2" y2="41.49" width="0.254" layer="1"/>
-<wire x1="76.2" y1="41.49" x2="75.985" y2="41.275" width="0.254" layer="1"/>
-<wire x1="75.565" y1="34.29" x2="75.565" y2="40.855" width="0.254" layer="1"/>
-<wire x1="75.565" y1="40.855" x2="75.985" y2="41.275" width="0.254" layer="1"/>
-<wire x1="77.1906" y1="43.815" x2="77.7494" y2="43.815" width="0" layer="19" extent="1-1"/>
+<wire x1="75.565" y1="34.29" x2="75.565" y2="39.0906" width="0.254" layer="1"/>
 </signal>
 <signal name="PTE30">
 <contactref element="BREAKOUT1" pad="18"/>
@@ -3494,9 +3540,6 @@ design rules under a new name.</description>
 <contactref element="BREAKOUT1" pad="7"/>
 <contactref element="J2" pad="1"/>
 <wire x1="70.910675" y1="38.1" x2="70.485" y2="38.1" width="0.254" layer="16"/>
-<wire x1="70.485" y1="38.1" x2="70.485" y2="35.8394" width="0.254" layer="1"/>
-<wire x1="72.39" y1="36.435" x2="70.485" y2="36.435" width="0.254" layer="1"/>
-<wire x1="70.485" y1="36.435" x2="70.485" y2="35.8394" width="0.254" layer="1"/>
 <wire x1="41.91" y1="6.35" x2="41.91" y2="10.795" width="0.254" layer="16"/>
 <wire x1="41.91" y1="10.795" x2="52.705" y2="10.795" width="0.254" layer="16"/>
 <wire x1="52.705" y1="10.795" x2="74.93" y2="33.02" width="0.254" layer="16"/>
@@ -3505,6 +3548,10 @@ design rules under a new name.</description>
 <wire x1="71.817821875" y1="37.19285625" x2="74.93" y2="34.080678125" width="0.254" layer="16"/>
 <wire x1="71.817821875" y1="37.19285625" x2="70.910678125" y2="38.1" width="0.254" layer="16"/>
 <wire x1="70.910678125" y1="38.1" x2="70.485" y2="38.1" width="0.254" layer="16"/>
+<wire x1="72.39" y1="36.59" x2="71.995" y2="36.59" width="0.254" layer="1"/>
+<wire x1="71.995" y1="36.59" x2="70.485" y2="38.1" width="0.254" layer="1"/>
+<wire x1="69.4944" y1="37.465" x2="69.85" y2="37.465" width="0.254" layer="1"/>
+<wire x1="69.85" y1="37.465" x2="70.485" y2="38.1" width="0.254" layer="1"/>
 </signal>
 <signal name="N$2">
 <contactref element="P1" pad="40"/>
@@ -3743,6 +3790,24 @@ design rules under a new name.</description>
 <wire x1="53.975" y1="2.54" x2="52.07" y2="4.445" width="0.254" layer="16"/>
 <wire x1="52.07" y1="4.445" x2="52.07" y2="4.8006" width="0.254" layer="16"/>
 </signal>
+<signal name="N$11">
+<contactref element="R1" pad="2"/>
+<contactref element="J3" pad="1"/>
+<contactref element="PD1" pad="A"/>
+<contactref element="PD2" pad="A"/>
+<wire x1="93.98" y1="41.91" x2="93.98" y2="43.18" width="0.254" layer="1"/>
+<wire x1="93.98" y1="43.18" x2="93.345" y2="43.815" width="0.254" layer="1"/>
+<wire x1="93.345" y1="43.815" x2="90.805" y2="43.815" width="0.254" layer="1"/>
+<wire x1="93.98" y1="39.37" x2="91.44" y2="39.37" width="0.254" layer="16"/>
+<wire x1="91.44" y1="39.37" x2="90.805" y2="40.005" width="0.254" layer="16"/>
+<wire x1="90.805" y1="40.005" x2="90.805" y2="43.815" width="0.254" layer="16"/>
+<via x="90.805" y="43.815" extent="1-16" drill="0.5"/>
+<wire x1="75.565" y1="39.6494" x2="75.565" y2="40.855" width="0.254" layer="1"/>
+<wire x1="75.565" y1="40.855" x2="75.985" y2="41.275" width="0.254" layer="1"/>
+<wire x1="75.985" y1="41.275" x2="75.985" y2="42.965" width="0.254" layer="1"/>
+<wire x1="75.985" y1="42.965" x2="76.835" y2="43.815" width="0.254" layer="1"/>
+<wire x1="76.835" y1="43.815" x2="90.805" y2="43.815" width="0.254" layer="1"/>
+</signal>
 </signals>
 </board>
 </drawing>
diff --git a/laser-tag badge/laser-tag.sch b/laser-tag badge/laser-tag.sch
index 512d347..788c341 100644
--- a/laser-tag badge/laser-tag.sch
+++ b/laser-tag badge/laser-tag.sch
@@ -6984,108 +6984,6 @@ Source: http://www.murata.com .. GRM43DR72E224KW01.pdf</description>
 </deviceset>
 </devicesets>
 </library>
-<library name="Samtec">
-<description>&lt;b&gt;PCB Matrix Packages&lt;/b&gt;&lt;p&gt;</description>
-<packages>
-<package name="FTSH-105-01-XXX-DV-K">
-<description>TERMINAL STRIP, .050 inch(1.27mm) PITCH, 10 PINS, KEYED</description>
-<smd name="1" x="-2.54" y="-2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="2" x="-2.54" y="2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="3" x="-1.27" y="-2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="4" x="-1.27" y="2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="5" x="0" y="-2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="6" x="0" y="2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="7" x="1.27" y="-2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="8" x="1.27" y="2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="9" x="2.54" y="-2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<smd name="10" x="2.54" y="2.032" dx="2.794" dy="0.7366" layer="1" rot="R90"/>
-<wire x1="-3.175" y1="1.714" x2="-2.54" y2="1.714" width="0.254" layer="51"/>
-<wire x1="-2.54" y1="1.714" x2="-2.54" y2="2.54" width="0.254" layer="51"/>
-<wire x1="-2.54" y1="2.54" x2="2.54" y2="2.54" width="0.254" layer="51"/>
-<wire x1="2.54" y1="2.54" x2="2.54" y2="1.715" width="0.254" layer="51"/>
-<wire x1="2.54" y1="1.715" x2="3.175" y2="1.715" width="0.254" layer="51"/>
-<wire x1="3.175" y1="1.715" x2="3.175" y2="-1.714" width="0.254" layer="51"/>
-<wire x1="3.175" y1="-1.714" x2="2.54" y2="-1.714" width="0.254" layer="51"/>
-<wire x1="2.54" y1="-1.714" x2="2.54" y2="-2.54" width="0.254" layer="51"/>
-<wire x1="2.54" y1="-2.54" x2="-2.54" y2="-2.54" width="0.254" layer="51"/>
-<wire x1="-2.54" y1="-2.54" x2="-2.54" y2="-1.714" width="0.254" layer="51"/>
-<wire x1="-2.54" y1="-1.714" x2="-3.175" y2="-1.714" width="0.254" layer="51"/>
-<wire x1="-3.175" y1="-1.714" x2="-3.175" y2="1.714" width="0.254" layer="51"/>
-<wire x1="-3.683" y1="-3.81" x2="-3.683" y2="3.81" width="0.254" layer="21"/>
-<wire x1="-3.683" y1="3.81" x2="3.683" y2="3.81" width="0.254" layer="21"/>
-<wire x1="3.683" y1="3.81" x2="3.683" y2="-3.81" width="0.254" layer="21"/>
-<wire x1="3.683" y1="-3.81" x2="-3.683" y2="-3.81" width="0.254" layer="21"/>
-<text x="-3.81" y="5.08" size="1.27" layer="25">&gt;NAME</text>
-<text x="-3.81" y="-6.35" size="1.27" layer="27">&gt;VALUE</text>
-</package>
-</packages>
-<symbols>
-<symbol name="CON-2X05">
-<wire x1="4.445" y1="6.35" x2="-1.905" y2="6.35" width="0.254" layer="94"/>
-<wire x1="-1.905" y1="-6.35" x2="-1.905" y2="6.35" width="0.254" layer="94"/>
-<wire x1="-1.905" y1="-6.35" x2="4.445" y2="-6.35" width="0.254" layer="94"/>
-<wire x1="4.445" y1="6.35" x2="4.445" y2="-6.35" width="0.254" layer="94"/>
-<wire x1="-2.54" y1="5.08" x2="-0.635" y2="5.08" width="0.1524" layer="94"/>
-<wire x1="-2.54" y1="2.54" x2="-0.635" y2="2.54" width="0.1524" layer="94"/>
-<wire x1="5.08" y1="5.08" x2="3.175" y2="5.08" width="0.1524" layer="94"/>
-<wire x1="5.08" y1="2.54" x2="3.175" y2="2.54" width="0.1524" layer="94"/>
-<wire x1="-2.54" y1="0" x2="-0.635" y2="0" width="0.1524" layer="94"/>
-<wire x1="5.08" y1="0" x2="3.175" y2="0" width="0.1524" layer="94"/>
-<wire x1="-2.54" y1="-2.54" x2="-0.635" y2="-2.54" width="0.1524" layer="94"/>
-<wire x1="5.08" y1="-2.54" x2="3.175" y2="-2.54" width="0.1524" layer="94"/>
-<wire x1="-2.54" y1="-5.08" x2="-0.635" y2="-5.08" width="0.1524" layer="94"/>
-<wire x1="5.08" y1="-5.08" x2="3.175" y2="-5.08" width="0.1524" layer="94"/>
-<wire x1="-0.635" y1="5.08" x2="0.635" y2="5.08" width="0.4064" layer="94"/>
-<wire x1="-0.635" y1="2.54" x2="0.635" y2="2.54" width="0.4064" layer="94"/>
-<wire x1="-0.635" y1="0" x2="0.635" y2="0" width="0.4064" layer="94"/>
-<wire x1="-0.635" y1="-2.54" x2="0.635" y2="-2.54" width="0.4064" layer="94"/>
-<wire x1="-0.635" y1="-5.08" x2="0.635" y2="-5.08" width="0.4064" layer="94"/>
-<wire x1="1.905" y1="5.08" x2="3.175" y2="5.08" width="0.4064" layer="94"/>
-<wire x1="1.905" y1="2.54" x2="3.175" y2="2.54" width="0.4064" layer="94"/>
-<wire x1="1.905" y1="0" x2="3.175" y2="0" width="0.4064" layer="94"/>
-<wire x1="1.905" y1="-2.54" x2="3.175" y2="-2.54" width="0.4064" layer="94"/>
-<wire x1="1.905" y1="-5.08" x2="3.175" y2="-5.08" width="0.4064" layer="94"/>
-<text x="-1.905" y="7.62" size="1.778" layer="95">&gt;NAME</text>
-<text x="-1.905" y="-9.2075" size="1.778" layer="96">&gt;VALUE</text>
-<pin name="1" x="-5.08" y="5.08" visible="pad" length="short" direction="pas"/>
-<pin name="2" x="7.62" y="5.08" visible="pad" length="short" direction="pas" rot="R180"/>
-<pin name="3" x="-5.08" y="2.54" visible="pad" length="short" direction="pas"/>
-<pin name="4" x="7.62" y="2.54" visible="pad" length="short" direction="pas" rot="R180"/>
-<pin name="5" x="-5.08" y="0" visible="pad" length="short" direction="pas"/>
-<pin name="6" x="7.62" y="0" visible="pad" length="short" direction="pas" rot="R180"/>
-<pin name="7" x="-5.08" y="-2.54" visible="pad" length="short" direction="pas"/>
-<pin name="8" x="7.62" y="-2.54" visible="pad" length="short" direction="pas" rot="R180"/>
-<pin name="9" x="-5.08" y="-5.08" visible="pad" length="short" direction="pas"/>
-<pin name="10" x="7.62" y="-5.08" visible="pad" length="short" direction="pas" rot="R180"/>
-</symbol>
-</symbols>
-<devicesets>
-<deviceset name="FTSH-105-01-XXX-DV-K">
-<gates>
-<gate name="A" symbol="CON-2X05" x="0" y="0"/>
-</gates>
-<devices>
-<device name="" package="FTSH-105-01-XXX-DV-K">
-<connects>
-<connect gate="A" pin="1" pad="1"/>
-<connect gate="A" pin="10" pad="10"/>
-<connect gate="A" pin="2" pad="2"/>
-<connect gate="A" pin="3" pad="3"/>
-<connect gate="A" pin="4" pad="4"/>
-<connect gate="A" pin="5" pad="5"/>
-<connect gate="A" pin="6" pad="6"/>
-<connect gate="A" pin="7" pad="7"/>
-<connect gate="A" pin="8" pad="8"/>
-<connect gate="A" pin="9" pad="9"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
-</devicesets>
-</library>
 <library name="pinhead">
 <description>&lt;b&gt;Pin Header Connectors&lt;/b&gt;&lt;p&gt;
 &lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
@@ -9821,9 +9719,6 @@ www.irf.com&lt;p&gt;
 <part name="C2" library="rcl" deviceset="C-EU" device="C0603K" value="0.1 uF"/>
 <part name="C3" library="rcl" deviceset="C-EU" device="C0603K" value="0.1 uF"/>
 <part name="C4" library="rcl" deviceset="C-EU" device="C0603K" value="0.1 uF"/>
-<part name="P+4" library="supply1" deviceset="VCC" device=""/>
-<part name="GND4" library="supply1" deviceset="GND" device=""/>
-<part name="DEBUG" library="Samtec" deviceset="FTSH-105-01-XXX-DV-K" device="" value="FTSH-105"/>
 <part name="BREAKOUT1" library="pinhead" deviceset="PINHD-2X16" device=""/>
 <part name="BREAKOUT2" library="pinhead" deviceset="PINHD-2X16" device=""/>
 <part name="LD1" library="Photonics" deviceset="LD" device=""/>
@@ -9883,6 +9778,9 @@ www.irf.com&lt;p&gt;
 <text x="-96.52" y="99.06" size="1.778" layer="91">Place near VDD pins</text>
 <text x="73.66" y="30.48" size="1.778" layer="91">Ports B and E do not
 support interrupts</text>
+<text x="-7.62" y="45.72" size="1.778" layer="91">SWD_CLK</text>
+<text x="-7.62" y="38.1" size="1.778" layer="91">SWD_DIO</text>
+<text x="121.92" y="22.86" size="1.778" layer="91">RESET</text>
 </plain>
 <instances>
 <instance part="U1" gate="A" x="10.16" y="99.06"/>
@@ -9893,9 +9791,6 @@ support interrupts</text>
 <instance part="C2" gate="G$1" x="-91.44" y="91.44"/>
 <instance part="C3" gate="G$1" x="-81.28" y="91.44"/>
 <instance part="C4" gate="G$1" x="-71.12" y="91.44"/>
-<instance part="P+4" gate="VCC" x="-30.48" y="22.86"/>
-<instance part="GND4" gate="1" x="-30.48" y="2.54"/>
-<instance part="DEBUG" gate="A" x="-22.86" y="12.7"/>
 <instance part="BREAKOUT1" gate="A" x="-109.22" y="43.18"/>
 <instance part="BREAKOUT2" gate="A" x="-68.58" y="43.18"/>
 <instance part="LD1" gate="A" x="-17.78" y="93.98" rot="R270"/>
@@ -9979,16 +9874,6 @@ support interrupts</text>
 <junction x="-81.28" y="81.28"/>
 </segment>
 <segment>
-<pinref part="GND4" gate="1" pin="GND"/>
-<wire x1="-27.94" y1="15.24" x2="-30.48" y2="15.24" width="0.1524" layer="91"/>
-<wire x1="-30.48" y1="15.24" x2="-30.48" y2="12.7" width="0.1524" layer="91"/>
-<wire x1="-30.48" y1="12.7" x2="-30.48" y2="5.08" width="0.1524" layer="91"/>
-<wire x1="-27.94" y1="12.7" x2="-30.48" y2="12.7" width="0.1524" layer="91"/>
-<junction x="-30.48" y="12.7"/>
-<pinref part="DEBUG" gate="A" pin="3"/>
-<pinref part="DEBUG" gate="A" pin="5"/>
-</segment>
-<segment>
 <pinref part="U1" gate="A" pin="VSSA"/>
 <wire x1="10.16" y1="60.96" x2="-5.08" y2="60.96" width="0.1524" layer="91"/>
 <wire x1="-5.08" y1="60.96" x2="-5.08" y2="63.5" width="0.1524" layer="91"/>
@@ -10133,12 +10018,6 @@ support interrupts</text>
 </net>
 <net name="VCC" class="0">
 <segment>
-<pinref part="P+4" gate="VCC" pin="VCC"/>
-<wire x1="-27.94" y1="17.78" x2="-30.48" y2="17.78" width="0.1524" layer="91"/>
-<wire x1="-30.48" y1="17.78" x2="-30.48" y2="20.32" width="0.1524" layer="91"/>
-<pinref part="DEBUG" gate="A" pin="1"/>
-</segment>
-<segment>
 <pinref part="U1" gate="A" pin="VDD"/>
 <wire x1="116.84" y1="58.42" x2="119.38" y2="58.42" width="0.1524" layer="91"/>
 </segment>
@@ -10239,11 +10118,8 @@ support interrupts</text>
 </net>
 <net name="PTA3" class="0">
 <segment>
-<wire x1="-15.24" y1="17.78" x2="-12.7" y2="17.78" width="0.1524" layer="91"/>
-<wire x1="-12.7" y1="17.78" x2="-12.7" y2="38.1" width="0.1524" layer="91"/>
 <pinref part="U1" gate="A" pin="PTA3"/>
-<wire x1="-12.7" y1="38.1" x2="10.16" y2="38.1" width="0.1524" layer="91"/>
-<pinref part="DEBUG" gate="A" pin="2"/>
+<wire x1="5.08" y1="38.1" x2="10.16" y2="38.1" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="BREAKOUT1" gate="A" pin="25"/>
@@ -10253,11 +10129,8 @@ support interrupts</text>
 </net>
 <net name="PTA0" class="0">
 <segment>
-<wire x1="-15.24" y1="15.24" x2="-10.16" y2="15.24" width="0.1524" layer="91"/>
-<wire x1="-10.16" y1="15.24" x2="-10.16" y2="45.72" width="0.1524" layer="91"/>
 <pinref part="U1" gate="A" pin="PTA0"/>
-<wire x1="-10.16" y1="45.72" x2="10.16" y2="45.72" width="0.1524" layer="91"/>
-<pinref part="DEBUG" gate="A" pin="4"/>
+<wire x1="5.08" y1="45.72" x2="10.16" y2="45.72" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="BREAKOUT1" gate="A" pin="22"/>
@@ -10268,10 +10141,7 @@ support interrupts</text>
 <net name="PTA20" class="0">
 <segment>
 <pinref part="U1" gate="A" pin="PTA20"/>
-<wire x1="116.84" y1="22.86" x2="124.46" y2="22.86" width="0.1524" layer="91"/>
-<wire x1="124.46" y1="22.86" x2="124.46" y2="7.62" width="0.1524" layer="91"/>
-<wire x1="124.46" y1="7.62" x2="-15.24" y2="7.62" width="0.1524" layer="91"/>
-<pinref part="DEBUG" gate="A" pin="10"/>
+<wire x1="116.84" y1="22.86" x2="121.92" y2="22.86" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="BREAKOUT2" gate="A" pin="2"/>
@@ -10427,24 +10297,6 @@ support interrupts</text>
 <label x="-116.84" y="40.64" size="1.778" layer="95" rot="R180"/>
 </segment>
 <segment>
-<pinref part="R1" gate="G$1" pin="2"/>
-<wire x1="-38.1" y1="86.36" x2="-38.1" y2="83.82" width="0.1524" layer="91"/>
-<wire x1="-38.1" y1="86.36" x2="-27.94" y2="86.36" width="0.1524" layer="91"/>
-<junction x="-38.1" y="86.36"/>
-<wire x1="-27.94" y1="86.36" x2="-27.94" y2="50.8" width="0.1524" layer="91"/>
-<wire x1="-27.94" y1="50.8" x2="-5.08" y2="50.8" width="0.1524" layer="91"/>
-<wire x1="-5.08" y1="50.8" x2="-5.08" y2="58.42" width="0.1524" layer="91"/>
-<wire x1="-5.08" y1="58.42" x2="-2.54" y2="58.42" width="0.1524" layer="91"/>
-<wire x1="-38.1" y1="91.44" x2="-38.1" y2="88.9" width="0.1524" layer="91"/>
-<wire x1="-38.1" y1="88.9" x2="-38.1" y2="86.36" width="0.1524" layer="91"/>
-<wire x1="-33.02" y1="91.44" x2="-33.02" y2="88.9" width="0.1524" layer="91"/>
-<wire x1="-33.02" y1="88.9" x2="-38.1" y2="88.9" width="0.1524" layer="91"/>
-<junction x="-38.1" y="88.9"/>
-<pinref part="J3" gate="J" pin="1"/>
-<pinref part="PD1" gate="G$1" pin="A"/>
-<pinref part="PD2" gate="G$1" pin="A"/>
-</segment>
-<segment>
 <pinref part="U1" gate="A" pin="PTE29"/>
 <wire x1="7.62" y1="58.42" x2="10.16" y2="58.42" width="0.1524" layer="91"/>
 <pinref part="J3" gate="J" pin="2"/>
@@ -11261,6 +11113,26 @@ support interrupts</text>
 <wire x1="-7.62" y1="99.06" x2="-2.54" y2="99.06" width="0.1524" layer="91"/>
 </segment>
 </net>
+<net name="N$11" class="0">
+<segment>
+<pinref part="R1" gate="G$1" pin="2"/>
+<wire x1="-38.1" y1="86.36" x2="-38.1" y2="83.82" width="0.1524" layer="91"/>
+<wire x1="-38.1" y1="86.36" x2="-27.94" y2="86.36" width="0.1524" layer="91"/>
+<junction x="-38.1" y="86.36"/>
+<wire x1="-27.94" y1="86.36" x2="-27.94" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="-27.94" y1="50.8" x2="-5.08" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="-5.08" y1="50.8" x2="-5.08" y2="58.42" width="0.1524" layer="91"/>
+<wire x1="-5.08" y1="58.42" x2="-2.54" y2="58.42" width="0.1524" layer="91"/>
+<wire x1="-38.1" y1="91.44" x2="-38.1" y2="88.9" width="0.1524" layer="91"/>
+<wire x1="-38.1" y1="88.9" x2="-38.1" y2="86.36" width="0.1524" layer="91"/>
+<wire x1="-33.02" y1="91.44" x2="-33.02" y2="88.9" width="0.1524" layer="91"/>
+<wire x1="-33.02" y1="88.9" x2="-38.1" y2="88.9" width="0.1524" layer="91"/>
+<junction x="-38.1" y="88.9"/>
+<pinref part="J3" gate="J" pin="1"/>
+<pinref part="PD1" gate="G$1" pin="A"/>
+<pinref part="PD2" gate="G$1" pin="A"/>
+</segment>
+</net>
 </nets>
 </sheet>
 </sheets>