From b1f40d94db9e423c3a4af1dd007dd537c460deeb Mon Sep 17 00:00:00 2001
From: Conor Patrick <conorpp94@gmail.com>
Date: Wed, 5 Dec 2018 19:23:39 -0500
Subject: [PATCH] fix AMS part footprint :(

---
 .gitignore     |   5 +
 solo/USB-A.brd | 929 +++++++++++++++++++++++++++++++-----------------
 solo/USB-A.sch | 941 +++++++++++++++++++++++++++++++++----------------
 3 files changed, 1245 insertions(+), 630 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7d3da71
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*.b#*
+*.s#*
+CAMOutputs/
+CAMOutputs.zip
+*.swp
diff --git a/solo/USB-A.brd b/solo/USB-A.brd
index e597f0c..e74428d 100644
--- a/solo/USB-A.brd
+++ b/solo/USB-A.brd
@@ -3,7 +3,7 @@
 <eagle version="9.2.2">
 <drawing>
 <settings>
-<setting alwaysvectorfont="yes"/>
+<setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
 <grid distance="0.1" unitdist="mm" unit="mm" style="lines" multiple="1" display="yes" altdistance="0.05" altunitdist="mm" altunit="mm"/>
@@ -59,7 +59,7 @@
 <layer number="99" name="SpiceOrder" color="5" fill="1" visible="no" active="no"/>
 </layers>
 <board>
-<fusionsync huburn="a.cGVyc29uYWw6dWUyYjdlZTY2" projecturn="a.cGVyc29uYWw6dWUyYjdlZTY2IzIwMTgwNDI5MTI5NzYxOTgx" f3durn="urn:adsk.wipprod:dm.lineage:j4HlS92DQ3aJOR3aA8LYVQ" pcbguid="4a57c918-3773-4eb5-941a-4639588bec0f" lastpulledtime="" lastsyncedchangeguid="71668e8e-e8a8-d5e2-9f1e-39fa8c290604"/>
+<fusionsync huburn="a.cGVyc29uYWw6dWUyYjdlZTY2" projecturn="a.cGVyc29uYWw6dWUyYjdlZTY2IzIwMTgwNDI5MTI5NzYxOTgx" f3durn="urn:adsk.wipprod:dm.lineage:j4HlS92DQ3aJOR3aA8LYVQ" pcbguid="4a57c918-3773-4eb5-941a-4639588bec0f" lastpulledtime="" lastsyncedchangeguid="ecdac79e-4fc3-69d4-e8a9-cc550e610d72"/>
 <plain>
 <wire x1="35" y1="59.3" x2="45.9" y2="59.3" width="0.2" layer="47"/>
 <wire x1="45.9" y1="59.3" x2="45.9" y2="61.7" width="0.2" layer="47"/>
@@ -74,12 +74,6 @@
 <wire x1="76" y1="61.7" x2="68.9" y2="46.8" width="0.1524" layer="47"/>
 <wire x1="74" y1="54.25" x2="35.05" y2="54.25" width="0.1524" layer="49"/>
 <wire x1="74" y1="54.2" x2="35.05" y2="54.2" width="0.1524" layer="49"/>
-<wire x1="60.55" y1="61.7" x2="69.55" y2="61.7" width="0.1524" layer="48"/>
-<wire x1="76" y1="52.85" x2="76" y2="56.55" width="0.1524" layer="48"/>
-<wire x1="59.15" y1="46.7" x2="67.05" y2="46.7" width="0.1524" layer="48"/>
-<wire x1="60.55" y1="61.7" x2="69.55" y2="61.7" width="0.1524" layer="48"/>
-<wire x1="76" y1="52.85" x2="76" y2="56.55" width="0.1524" layer="48"/>
-<wire x1="59.15" y1="46.7" x2="67.05" y2="46.7" width="0.1524" layer="48"/>
 <wire x1="33.17241875" y1="49.23265" x2="33.17241875" y2="59.23265" width="0.1" layer="20"/>
 <wire x1="33.17241875" y1="59.23265" x2="34.17241875" y2="60.23265" width="0.1" layer="20" curve="-90"/>
 <wire x1="34.17241875" y1="60.23265" x2="45.47241875" y2="60.23265" width="0.1" layer="20"/>
@@ -97,8 +91,6 @@
 <wire x1="45.47241875" y1="48.23265" x2="34.17241875" y2="48.23265" width="0.1" layer="20"/>
 <wire x1="34.17241875" y1="48.23265" x2="33.17241875" y2="49.23265" width="0.1" layer="20" curve="-90"/>
 <rectangle x1="33.65" y1="56.25" x2="34.45" y2="56.45" layer="41"/>
-<text x="70.2" y="48.35" size="1.4224" layer="21">Solo</text>
-<text x="70.1" y="58.95" size="1.4224" layer="21">v1.2</text>
 <hole x="62" y="51.7" drill="0.5"/>
 <wire x1="60.55" y1="61.7" x2="69.55" y2="61.7" width="0.1524" layer="48"/>
 <wire x1="76" y1="52.85" x2="76" y2="56.55" width="0.1524" layer="48"/>
@@ -106,6 +98,16 @@
 <hole x="66.9" y="52.05" drill="0.5"/>
 <hole x="66.9" y="56.9" drill="0.5"/>
 <hole x="62.95" y="57.15" drill="0.5"/>
+<text x="62.2" y="46.95" size="1.4224" layer="21">Solo</text>
+<text x="62.6" y="60.05" size="1.4224" layer="21">v1.3</text>
+<hole x="62" y="51.65" drill="0.5"/>
+<wire x1="60.55" y1="61.65" x2="69.55" y2="61.65" width="0.1524" layer="48"/>
+<wire x1="76" y1="52.8" x2="76" y2="56.5" width="0.1524" layer="48"/>
+<wire x1="59.15" y1="46.65" x2="67.05" y2="46.65" width="0.1524" layer="48"/>
+<hole x="66.9" y="52" drill="0.5"/>
+<hole x="66.9" y="56.85" drill="0.5"/>
+<hole x="62.95" y="57.1" drill="0.5"/>
+<circle x="72.45" y="54.2" radius="2.282540625" width="0.1524" layer="20"/>
 </plain>
 <libraries>
 <library name="efm-fido" urn="urn:adsk.eagle:library:4245354">
@@ -162,7 +164,7 @@
 <rectangle x1="0.2588" y1="-0.3048" x2="0.5588" y2="0.2951" layer="51"/>
 <rectangle x1="-0.1999" y1="-0.3" x2="0.1999" y2="0.3" layer="35"/>
 </package>
-<package name="CL-505S-X-SD-T" urn="urn:adsk.eagle:footprint:4878738/4" library_version="51">
+<package name="CL-505S-X-SD-T" urn="urn:adsk.eagle:footprint:4878738/4" library_version="57">
 <description>CL-505S-X-SD-T</description>
 <smd name="P$2" x="0.85" y="0.85" dx="0.4" dy="0.4" layer="1"/>
 <smd name="P$1" x="0.85" y="0" dx="0.4" dy="0.4" layer="1"/>
@@ -171,7 +173,7 @@
 <text x="-0.4" y="1.4" size="0.4" layer="21">&gt;NAME</text>
 <circle x="1.2" y="1.2" radius="0.1" width="0.127" layer="21"/>
 </package>
-<package name="QFN32" urn="urn:adsk.eagle:footprint:6434393/1" locally_modified="yes" library_version="51" library_locally_modified="yes">
+<package name="QFN32" urn="urn:adsk.eagle:footprint:6434393/2" library_version="57">
 <description>&lt;b&gt;QFN 32&lt;/b&gt; 5 x 5 mm&lt;p&gt;
 Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <wire x1="-2.45" y1="2.45" x2="2.45" y2="2.45" width="0.1016" layer="51"/>
@@ -649,7 +651,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-1.675" y="2.575"/>
 </polygon>
 </package>
-<package name="REG_NCP114AMX330TCG" urn="urn:adsk.eagle:footprint:5621085/1" locally_modified="yes" library_version="51" library_locally_modified="yes">
+<package name="REG_NCP114AMX330TCG" urn="urn:adsk.eagle:footprint:5621085/2" library_version="57">
 <polygon width="0.001" layer="1">
 <vertex x="-0.475" y="0.65"/>
 <vertex x="-0.475" y="0.22"/>
@@ -758,7 +760,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <smd name="P$5" x="0" y="1.7" dx="0.4" dy="0.5" layer="1"/>
 <text x="-0.5" y="1.8" size="0.4064" layer="25">&gt;NAME</text>
 </package>
-<package name="DOME-BL-12MM" urn="urn:adsk.eagle:footprint:5648518/3" library_version="51">
+<package name="DOME-BL-12MM" urn="urn:adsk.eagle:footprint:5648518/3" library_version="57">
 <circle x="0" y="0" radius="1.4" width="0.1" layer="1"/>
 <circle x="0" y="0" radius="1.39895" width="0.1" layer="1"/>
 <circle x="0" y="0" radius="1.3038375" width="0.1524" layer="29"/>
@@ -1109,6 +1111,36 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <smd name="P$1" x="-4.1" y="0" dx="1.27" dy="0.635" layer="1" stop="no" cream="no"/>
 <smd name="P$2" x="0.2" y="4.5" dx="1.27" dy="0.635" layer="1" stop="no" cream="no"/>
 </package>
+<package name="MLPD3X3" urn="urn:adsk.eagle:footprint:5825737/3" library_version="58" library_locally_modified="yes">
+<smd name="P5" x="0" y="-2.54" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P4" x="0" y="-2.04" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P3" x="0" y="-1.54" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P2" x="0" y="-1.04" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P1" x="0" y="-0.54" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P10" x="3" y="-0.54" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P9" x="3" y="-1.04" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P8" x="3" y="-1.54" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P7" x="3" y="-2.04" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P6" x="3" y="-2.54" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P$11" x="1.5" y="-1.54" dx="1.65" dy="2.38" layer="1" rot="R180"/>
+<text x="-0.5" y="-3.04" size="0.6096" layer="25" rot="R90">&gt;NAME</text>
+<text x="4" y="-3.04" size="0.6096" layer="27" rot="R90">&gt;VALUE</text>
+</package>
+<package name="MOLEX_NFC_COIL1" urn="urn:adsk.eagle:footprint:7114965/3" library_version="57">
+<description>Molex NFC coil, PN: 1462360101</description>
+<wire x1="15.24" y1="0" x2="0.24" y2="0" width="0.1524" layer="21"/>
+<wire x1="0.24" y1="0" x2="0.24" y2="25" width="0.1524" layer="21"/>
+<wire x1="0.24" y1="25" x2="8.74" y2="25" width="0.1524" layer="21"/>
+<wire x1="8.74" y1="25" x2="15.24" y2="25" width="0.1524" layer="21"/>
+<wire x1="15.24" y1="25" x2="15.24" y2="0" width="0.1524" layer="21"/>
+<wire x1="15.24" y1="25" x2="15.24" y2="30" width="0.1524" layer="21"/>
+<wire x1="15.24" y1="30" x2="8.74" y2="30" width="0.1524" layer="21"/>
+<wire x1="8.74" y1="30" x2="8.74" y2="25" width="0.1524" layer="21"/>
+<text x="10.43" y="23.5" size="0.8128" layer="26">&gt;NAME</text>
+<text x="10.43" y="22" size="0.8128" layer="28">&gt;VALUE</text>
+<smd name="P$1" x="13.43" y="28.5" dx="2.2" dy="3.1" layer="1" rot="R180"/>
+<smd name="P$2" x="10.73" y="28.5" dx="2.2" dy="3.1" layer="1" rot="R180"/>
+</package>
 </packages>
 <packages3d>
 <package3d name="USB_TRACES" urn="urn:adsk.eagle:package:4245369/9" type="box" library_version="40">
@@ -1134,22 +1166,20 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <packageinstance name="C0402"/>
 </packageinstances>
 </package3d>
-<package3d name="CL-505S-X-SD-T" urn="urn:adsk.eagle:package:4878740/6" type="box" library_version="51">
+<package3d name="CL-505S-X-SD-T" urn="urn:adsk.eagle:package:4878740/6" type="box" library_version="57">
 <description>CL-505S-X-SD-T</description>
 <packageinstances>
 <packageinstance name="CL-505S-X-SD-T"/>
 </packageinstances>
 </package3d>
-<package3d name="QFN50P500X500X50-32" urn="urn:adsk.eagle:package:4245373/5" locally_modified="yes" type="model" library_version="51" library_locally_modified="yes">
+<package3d name="QFN50P500X500X50-32" urn="urn:adsk.eagle:package:4245373/6" type="model" library_version="57">
 <description>&lt;b&gt;QFN 32&lt;/b&gt; 5 x 5 mm&lt;p&gt;
 Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <packageinstances>
 <packageinstance name="QFN32"/>
 </packageinstances>
 </package3d>
-<package3d name="DFN100X100X60-4" urn="urn:adsk.eagle:package:5621121/2" locally_modified="yes" type="model" library_version="51" library_locally_modified="yes">
-<description>DFN4, 1.00 X 1.00 X 0.60 mm body
-&lt;p&gt;DFN4 package with body size 1.00 X 1.00 X 0.60 mm&lt;/p&gt;</description>
+<package3d name="DFN100X100X60-4" urn="urn:adsk.eagle:package:5621121/3" type="model" library_version="57">
 <packageinstances>
 <packageinstance name="REG_NCP114AMX330TCG"/>
 </packageinstances>
@@ -1159,11 +1189,56 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <packageinstance name="BZA900A"/>
 </packageinstances>
 </package3d>
-<package3d name="DOME-BL-12MM" urn="urn:adsk.eagle:package:5648519/5" type="model" library_version="51">
+<package3d name="DOME-BL-12MM" urn="urn:adsk.eagle:package:5648519/5" type="model" library_version="57">
 <packageinstances>
 <packageinstance name="DOME-BL-12MM"/>
 </packageinstances>
 </package3d>
+<package3d name="MLPD3X3" urn="urn:adsk.eagle:package:5825738/3" type="box" library_version="58" library_locally_modified="yes">
+<packageinstances>
+<packageinstance name="MLPD3X3"/>
+</packageinstances>
+</package3d>
+<package3d name="MOLEX_NFC_COIL1" urn="urn:adsk.eagle:package:7114966/5" type="model" library_version="57">
+<description>Molex NFC coil, PN: 1462360101</description>
+<packageinstances>
+<packageinstance name="MOLEX_NFC_COIL1"/>
+</packageinstances>
+</package3d>
+</packages3d>
+</library>
+<library name="jumper" urn="urn:adsk.eagle:library:252">
+<description>&lt;b&gt;Jumpers&lt;/b&gt;&lt;p&gt;
+&lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
+<packages>
+<package name="SJ" urn="urn:adsk.eagle:footprint:15432/1" library_version="1">
+<description>&lt;b&gt;Solder jumper&lt;/b&gt;</description>
+<wire x1="1.397" y1="-1.016" x2="-1.397" y2="-1.016" width="0.1524" layer="21"/>
+<wire x1="1.397" y1="1.016" x2="1.651" y2="0.762" width="0.1524" layer="21" curve="-90"/>
+<wire x1="-1.651" y1="0.762" x2="-1.397" y2="1.016" width="0.1524" layer="21" curve="-90"/>
+<wire x1="-1.651" y1="-0.762" x2="-1.397" y2="-1.016" width="0.1524" layer="21" curve="90"/>
+<wire x1="1.397" y1="-1.016" x2="1.651" y2="-0.762" width="0.1524" layer="21" curve="90"/>
+<wire x1="1.651" y1="-0.762" x2="1.651" y2="0.762" width="0.1524" layer="21"/>
+<wire x1="-1.651" y1="-0.762" x2="-1.651" y2="0.762" width="0.1524" layer="21"/>
+<wire x1="-1.397" y1="1.016" x2="1.397" y2="1.016" width="0.1524" layer="21"/>
+<wire x1="1.016" y1="0" x2="1.524" y2="0" width="0.1524" layer="51"/>
+<wire x1="-1.016" y1="0" x2="-1.524" y2="0" width="0.1524" layer="51"/>
+<wire x1="-0.254" y1="-0.127" x2="-0.254" y2="0.127" width="1.27" layer="51" curve="-180" cap="flat"/>
+<wire x1="0.254" y1="0.127" x2="0.254" y2="-0.127" width="1.27" layer="51" curve="-180" cap="flat"/>
+<smd name="1" x="-0.762" y="0" dx="1.1684" dy="1.6002" layer="1"/>
+<smd name="2" x="0.762" y="0" dx="1.1684" dy="1.6002" layer="1"/>
+<text x="-1.651" y="1.143" size="1.27" layer="25" ratio="10">&gt;NAME</text>
+<text x="0.4001" y="0" size="0.02" layer="27">&gt;VALUE</text>
+<rectangle x1="-0.0762" y1="-0.9144" x2="0.0762" y2="0.9144" layer="29"/>
+</package>
+</packages>
+<packages3d>
+<package3d name="SJ" urn="urn:adsk.eagle:package:15471/1" type="box" library_version="1">
+<description>Solder jumper</description>
+<packageinstances>
+<packageinstance name="SJ"/>
+</packageinstances>
+</package3d>
 </packages3d>
 </library>
 </libraries>
@@ -1364,95 +1439,109 @@ design rules under a new name.</description>
 <attribute name="NAME" x="42.39" y="49.17" size="1.27" layer="25" rot="R180" display="off"/>
 <attribute name="VALUE" x="42.39" y="60.6" size="1.27" layer="27" rot="R180" display="off"/>
 </element>
-<element name="C7" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u" x="55.35" y="59.36" smashed="yes">
-<attribute name="NAME" x="55.365" y="60.045" size="0.6096" layer="25"/>
-<attribute name="VALUE" x="56.615" y="59.155" size="0.6096" layer="27"/>
+<element name="C7" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u" x="54.85" y="60.26" smashed="yes">
+<attribute name="NAME" x="54.865" y="60.945" size="0.6096" layer="25"/>
+<attribute name="VALUE" x="56.115" y="60.055" size="0.6096" layer="27"/>
 </element>
-<element name="C8" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="55.29" y="58.34" smashed="yes">
-<attribute name="NAME" x="56.505" y="58.125" size="0.6096" layer="25"/>
-<attribute name="VALUE" x="57.855" y="58.235" size="0.6096" layer="27"/>
+<element name="C8" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="54.89" y="58.89" smashed="yes">
+<attribute name="NAME" x="58.405" y="58.775" size="0.6096" layer="25"/>
+<attribute name="VALUE" x="56.355" y="58.685" size="0.6096" layer="27"/>
 </element>
-<element name="C9" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u" x="50.73" y="56.415" smashed="yes" rot="R180">
-<attribute name="NAME" x="51.265" y="57.68" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="49.365" y="56.62" size="0.6096" layer="27" rot="R180"/>
+<element name="C9" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u" x="50.73" y="56.365" smashed="yes" rot="R180">
+<attribute name="NAME" x="51.265" y="57.63" size="0.6096" layer="25" rot="R180"/>
+<attribute name="VALUE" x="49.365" y="56.57" size="0.6096" layer="27" rot="R180"/>
 </element>
-<element name="C10" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="50.69" y="55.51" smashed="yes" rot="R180">
-<attribute name="NAME" x="49.525" y="55.675" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="48.425" y="55.615" size="0.6096" layer="27" rot="R180"/>
+<element name="C10" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="50.69" y="55.46" smashed="yes" rot="R180">
+<attribute name="NAME" x="49.525" y="55.625" size="0.6096" layer="25" rot="R180"/>
+<attribute name="VALUE" x="48.425" y="55.565" size="0.6096" layer="27" rot="R180"/>
 </element>
-<element name="D+1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="51.7" y="51.2" smashed="yes" rot="MR0">
-<attribute name="NAME" x="50.885" y="51.066" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="52.335" y="50.438" size="0.0254" layer="28" rot="MR0"/>
+<element name="D+1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="51.7" y="51.15" smashed="yes" rot="MR0">
+<attribute name="NAME" x="50.885" y="51.016" size="0.6096" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="52.335" y="50.388" size="0.0254" layer="28" rot="MR0"/>
 </element>
-<element name="D-1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="50.2" y="55.35" smashed="yes" rot="MR0">
-<attribute name="NAME" x="52.235" y="55.566" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="50.335" y="54.638" size="0.0254" layer="28" rot="MR0"/>
+<element name="D-1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="50.2" y="55.3" smashed="yes" rot="MR0">
+<attribute name="NAME" x="52.235" y="55.516" size="0.6096" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="50.335" y="54.588" size="0.0254" layer="28" rot="MR0"/>
 </element>
-<element name="GND1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="63.65" y="51" smashed="yes" rot="MR0">
-<attribute name="NAME" x="66.085" y="51.416" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="64.285" y="50.238" size="0.0254" layer="28" rot="MR0"/>
+<element name="GND1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="63.65" y="50.95" smashed="yes" rot="MR0">
+<attribute name="NAME" x="66.085" y="51.366" size="0.6096" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="64.285" y="50.188" size="0.0254" layer="28" rot="MR0"/>
 </element>
-<element name="+5V1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="51.15" y="58.85" smashed="yes" rot="MR0">
-<attribute name="NAME" x="53.385" y="58.866" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="51.785" y="58.088" size="0.0254" layer="28" rot="MR0"/>
+<element name="+5V1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="51.15" y="58.8" smashed="yes" rot="MR0">
+<attribute name="NAME" x="53.385" y="58.816" size="0.6096" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="51.785" y="58.038" size="0.0254" layer="28" rot="MR0"/>
 </element>
-<element name="3V1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="48.55" y="47.75" smashed="yes" rot="MR0">
-<attribute name="NAME" x="49.485" y="48.516" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="48.685" y="47.488" size="0.0254" layer="28" rot="MR0"/>
+<element name="3V1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="48.35" y="47.65" smashed="yes" rot="MR0">
+<attribute name="NAME" x="49.285" y="48.416" size="0.6096" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="48.485" y="47.388" size="0.0254" layer="28" rot="MR0"/>
 </element>
-<element name="SWDIO1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="51.05" y="47.9" smashed="yes" rot="MR0">
-<attribute name="NAME" x="52.485" y="48.816" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="51.685" y="47.138" size="0.0254" layer="28" rot="MR0"/>
+<element name="SWDIO1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="51" y="47.75" smashed="yes" rot="MR0">
+<attribute name="NAME" x="52.435" y="48.666" size="0.6096" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="51.635" y="46.988" size="0.0254" layer="28" rot="MR0"/>
 </element>
-<element name="SWCLK1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="53.35" y="47.7" smashed="yes" rot="MR0">
-<attribute name="NAME" x="57.385" y="47.116" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="53.985" y="46.938" size="0.0254" layer="28" rot="MR0"/>
+<element name="SWCLK1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="53.35" y="47.65" smashed="yes" rot="MR0">
+<attribute name="NAME" x="57.385" y="47.066" size="0.6096" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="53.985" y="46.888" size="0.0254" layer="28" rot="MR0"/>
 </element>
-<element name="R1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="R0402" package3d_urn="urn:adsk.eagle:package:4245807/6" value="175" x="53.6" y="50.15" smashed="yes" rot="R180">
-<attribute name="NAME" x="53.835" y="51.165" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="54.135" y="49.705" size="0.6096" layer="27" rot="R180"/>
+<element name="R2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="R0402" package3d_urn="urn:adsk.eagle:package:4245807/6" value="175" x="53.6" y="50.1" smashed="yes" rot="R180">
+<attribute name="NAME" x="52.435" y="50.315" size="0.6096" layer="25" rot="R180"/>
+<attribute name="VALUE" x="54.135" y="51.155" size="0.6096" layer="27" rot="R180"/>
 </element>
-<element name="L2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="CL-505S-X-SD-T" package3d_urn="urn:adsk.eagle:package:4878740/6" value="EAST1616RGBA3-LED-RGBCL-505S-X-SD-T" x="64.8" y="54.65" smashed="yes" rot="R180">
-<attribute name="NAME" x="64.65" y="55.45" size="0.4" layer="21" rot="R180"/>
+<element name="L2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="CL-505S-X-SD-T" package3d_urn="urn:adsk.eagle:package:4878740/6" value="EAST1616RGBA3-LED-RGBCL-505S-X-SD-T" x="64.8" y="54.6" smashed="yes" rot="R180">
+<attribute name="NAME" x="64.65" y="55.4" size="0.4" layer="21" rot="R180"/>
 </element>
-<element name="STX-&gt;1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="54.1" y="51.25" smashed="yes" rot="MR0">
-<attribute name="NAME" x="55.135" y="52.016" size="0.8128" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="54.735" y="50.488" size="0.0254" layer="28" rot="MR0"/>
+<element name="STX-&gt;1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="54.1" y="51.2" smashed="yes" rot="MR0">
+<attribute name="NAME" x="55.135" y="51.966" size="0.8128" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="54.735" y="50.438" size="0.0254" layer="28" rot="MR0"/>
 </element>
-<element name="SRX&lt;-1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="59.5" y="49.85" smashed="yes" rot="MR0">
-<attribute name="NAME" x="61.235" y="50.566" size="0.8128" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="60.135" y="49.088" size="0.0254" layer="28" rot="MR0"/>
+<element name="SRX&lt;-1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="59.5" y="49.8" smashed="yes" rot="MR0">
+<attribute name="NAME" x="61.235" y="50.516" size="0.8128" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="60.135" y="49.038" size="0.0254" layer="28" rot="MR0"/>
 </element>
-<element name="C11" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u" x="55.95" y="51.05" smashed="yes" rot="R180">
-<attribute name="NAME" x="58.385" y="51.715" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="58.735" y="52.605" size="0.6096" layer="27" rot="R180"/>
+<element name="C11" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u" x="55.95" y="51" smashed="yes" rot="R180">
+<attribute name="NAME" x="58.285" y="51.715" size="0.6096" layer="25" rot="R180"/>
+<attribute name="VALUE" x="59.235" y="52.355" size="0.6096" layer="27" rot="R180"/>
 </element>
-<element name="C12" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="55.95" y="50.2" smashed="yes" rot="R180">
-<attribute name="NAME" x="57.135" y="49.715" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="57.385" y="49.455" size="0.6096" layer="27" rot="R180"/>
+<element name="C12" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="55.95" y="50.15" smashed="yes" rot="R180">
+<attribute name="NAME" x="58.435" y="50.265" size="0.6096" layer="25" rot="R180"/>
+<attribute name="VALUE" x="57.385" y="49.405" size="0.6096" layer="27" rot="R180"/>
 </element>
-<element name="ST2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="QFN32" package3d_urn="urn:adsk.eagle:package:4245373/5" value="STM32L432KCU6" x="54.9" y="54.5" smashed="yes" rot="R180">
-<attribute name="NAME" x="54.5" y="57.8" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="58.95" y="58.85" size="1.27" layer="27" rot="R180" display="off"/>
+<element name="ST2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="QFN32" package3d_urn="urn:adsk.eagle:package:4245373/6" value="STM32L432KCU6" x="54.9" y="54.45" smashed="yes" rot="R180">
+<attribute name="NAME" x="54.5" y="57.75" size="0.6096" layer="25" rot="R180"/>
+<attribute name="VALUE" x="58.95" y="58.8" size="1.27" layer="27" rot="R180" display="off"/>
 </element>
-<element name="SWO1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="56.1" y="48.9" smashed="yes" rot="MR0">
-<attribute name="NAME" x="56.985" y="49.966" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="56.735" y="48.138" size="0.0254" layer="28" rot="MR0"/>
+<element name="SWO1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="B1,27" package3d_urn="urn:adsk.eagle:package:4245792/4" value="TEST_POINT" x="56.1" y="48.85" smashed="yes" rot="MR0">
+<attribute name="NAME" x="56.985" y="49.916" size="0.6096" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="56.735" y="48.088" size="0.0254" layer="28" rot="MR0"/>
 </element>
-<element name="L4" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="REG_NCP114AMX330TCG" package3d_urn="urn:adsk.eagle:package:5621121/2" value="NCP114AMX330TCG" x="52.85" y="58.7" smashed="yes" rot="R90">
-<attribute name="AVAILABILITY" value="Unavailable" x="52.85" y="58.7" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
-<attribute name="DESCRIPTION" value=" CMOS Low Dropout Regulator _LDO_, 300 mA 3.3V, Active Discharge " x="52.85" y="58.7" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
-<attribute name="MF" value="ON Semiconductor" x="52.85" y="58.7" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
-<attribute name="MP" value="NCP114AMX330TCG" x="52.85" y="58.7" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
-<attribute name="NAME" x="53.29228125" y="60.177009375" size="0.6" layer="25" rot="R180"/>
-<attribute name="PACKAGE" value="UDFN-4 ON Semiconductor" x="52.85" y="58.7" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
-<attribute name="PRICE" value="None" x="52.85" y="58.7" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
-<attribute name="VALUE" x="54.842921875" y="60.6449" size="0.306003125" layer="27" rot="R180" display="off"/>
+<element name="L4" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="REG_NCP114AMX330TCG" package3d_urn="urn:adsk.eagle:package:5621121/3" value="NCP114AMX330TCG" x="52.85" y="58.65" smashed="yes" rot="R90">
+<attribute name="AVAILABILITY" value="Unavailable" x="52.85" y="58.65" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
+<attribute name="DESCRIPTION" value=" CMOS Low Dropout Regulator _LDO_, 300 mA 3.3V, Active Discharge " x="52.85" y="58.65" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
+<attribute name="MF" value="ON Semiconductor" x="52.85" y="58.65" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
+<attribute name="MP" value="NCP114AMX330TCG" x="52.85" y="58.65" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
+<attribute name="NAME" x="53.09228125" y="59.827009375" size="0.305740625" layer="25" rot="R180"/>
+<attribute name="PACKAGE" value="UDFN-4 ON Semiconductor" x="52.85" y="58.65" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
+<attribute name="PRICE" value="None" x="52.85" y="58.65" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
+<attribute name="VALUE" x="54.842921875" y="60.5949" size="0.306003125" layer="27" rot="R180" display="off"/>
 </element>
-<element name="Z2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="BZA900A" package3d_urn="urn:adsk.eagle:package:5621120/4" value="BZA900A-ESD-ZENERS" x="50.6" y="52.95" smashed="yes">
-<attribute name="NAME" x="50.7" y="53.6" size="0.6" layer="25"/>
+<element name="Z2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="BZA900A" package3d_urn="urn:adsk.eagle:package:5621120/4" value="BZA900A-ESD-ZENERS" x="50.55" y="52.9" smashed="yes">
+<attribute name="NAME" x="50.75" y="53.45" size="0.4064" layer="25"/>
+</element>
+<element name="U$2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="DOME-BL-12MM" package3d_urn="urn:adsk.eagle:package:5648519/5" value="DOME_BUTTON12MM" x="64.4" y="54.15" smashed="yes"/>
+<element name="N2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="MLPD3X3" package3d_urn="urn:adsk.eagle:package:5825738/3" value="AMS3956" x="74.1" y="57.45" smashed="yes" rot="R180">
+<attribute name="NAME" x="74.5" y="59.35" size="0.6096" layer="25" rot="R270"/>
+<attribute name="VALUE" x="74.6" y="61.45" size="0.6096" layer="27" rot="R180"/>
+</element>
+<element name="SJ2" library="jumper" library_urn="urn:adsk.eagle:library:252" package="SJ" package3d_urn="urn:adsk.eagle:package:15471/1" value="" x="73.15" y="49.95" smashed="yes" rot="R180">
+<attribute name="NAME" x="74.201" y="48.607" size="0.8128" layer="25" ratio="10" rot="R180"/>
+<attribute name="VALUE" x="72.7499" y="49.95" size="0.02" layer="27" rot="R180"/>
+</element>
+<element name="COIL2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="MOLEX_NFC_COIL1" package3d_urn="urn:adsk.eagle:package:7114966/5" value="MOLEX_NFC_COIL_1462360101" x="46" y="46.35" smashed="yes" rot="MR90">
+<attribute name="LINK" value="https://www.mouser.com/ProductDetail/538-146236-0101" x="46" y="46.35" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="MPN" value="1462360101" x="46" y="46.35" size="1.778" layer="28" rot="MR90" display="off"/>
+<attribute name="NAME" x="71.45" y="57.13" size="0.8128" layer="25" rot="MR90"/>
+<attribute name="VALUE" x="68" y="56.78" size="0.8128" layer="27" rot="MR90" display="off"/>
 </element>
-<element name="U$2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="DOME-BL-12MM" package3d_urn="urn:adsk.eagle:package:5648519/5" value="DOME_BUTTON12MM" x="64.4" y="54.2" smashed="yes"/>
 </elements>
 <signals>
 <signal name="PE">
@@ -1482,11 +1571,19 @@ design rules under a new name.</description>
 <contactref element="C8" pad="2"/>
 <contactref element="C10" pad="2"/>
 <contactref element="C9" pad="2"/>
+<polygon width="0.1016" layer="1" isolate="0.254">
+<vertex x="35.9" y="56.7"/>
+<vertex x="35.9" y="59"/>
+<vertex x="44.1" y="59"/>
+<vertex x="44.1" y="64.7"/>
+<vertex x="76.8" y="64.7"/>
+<vertex x="76.8" y="45.6"/>
+<vertex x="45.2" y="45.6"/>
+<vertex x="45.2" y="49.3"/>
+<vertex x="44.2" y="49.3"/>
+<vertex x="44.2" y="56.7"/>
+</polygon>
 <contactref element="GND1" pad="TP"/>
-<via x="67.6" y="47.85" extent="1-16" drill="0.35"/>
-<via x="67.8" y="60.6" extent="1-16" drill="0.35"/>
-<via x="63.4" y="60.6" extent="1-16" drill="0.35"/>
-<via x="63" y="47.4" extent="1-16" drill="0.35"/>
 <contactref element="C12" pad="2"/>
 <contactref element="C11" pad="2"/>
 <contactref element="ST2" pad="16"/>
@@ -1494,78 +1591,106 @@ design rules under a new name.</description>
 <contactref element="ST2" pad="EXP"/>
 <contactref element="L4" pad="2"/>
 <contactref element="Z2" pad="P$2"/>
-<via x="54.9" y="54.5" extent="1-16" drill="0.35"/>
-<wire x1="54.9" y1="54.5" x2="55" y2="54.5" width="0.254" layer="16"/>
-<wire x1="54.3" y1="55.1" x2="54.9" y2="54.5" width="0.254" layer="16"/>
-<wire x1="54.25" y1="55.1" x2="54.3" y2="55.1" width="0.254" layer="16"/>
-<via x="54.25" y="55.1" extent="1-16" drill="0.35"/>
-<wire x1="54.3" y1="55.1" x2="54.25" y2="55.1" width="0.254" layer="1"/>
-<wire x1="54.4" y1="55" x2="55.6" y2="55" width="0.254" layer="1"/>
-<via x="55.6" y="55" extent="1-16" drill="0.35"/>
-<wire x1="54.3" y1="55.1" x2="54.9" y2="54.5" width="0.254" layer="1"/>
-<via x="55.65" y="53.75" extent="1-16" drill="0.35"/>
-<wire x1="54.9" y1="54.5" x2="55.2" y2="54.2" width="0.254" layer="1"/>
-<wire x1="55.2" y1="54.2" x2="55.65" y2="53.75" width="0.254" layer="1"/>
-<wire x1="54.4" y1="55" x2="54.4" y2="53.75" width="0.254" layer="1"/>
-<via x="54.4" y="53.75" extent="1-16" drill="0.35"/>
-<wire x1="56.65" y1="52.55" x2="55.2" y2="54" width="0.1524" layer="1"/>
-<wire x1="56.65" y1="52.15" x2="56.65" y2="52.55" width="0.1524" layer="1"/>
-<wire x1="55.2" y1="54" x2="55.2" y2="54.2" width="0.1524" layer="1"/>
-<wire x1="53.15" y1="56.85" x2="53.1714" y2="56.7786" width="0.1524" layer="1"/>
-<wire x1="53.1714" y1="56.7786" x2="53.1714" y2="56.23166875" width="0.1524" layer="1"/>
-<wire x1="53.1714" y1="56.23166875" x2="54.9" y2="54.50306875" width="0.1524" layer="1"/>
-<wire x1="54.9" y1="54.50306875" x2="54.9" y2="54.5" width="0.1524" layer="1"/>
+<via x="54.9" y="54.45" extent="1-16" drill="0.35"/>
+<wire x1="54.9" y1="54.45" x2="55" y2="54.45" width="0.254" layer="16"/>
+<wire x1="54.3" y1="55.05" x2="54.9" y2="54.45" width="0.254" layer="16"/>
+<wire x1="54.25" y1="55.05" x2="54.3" y2="55.05" width="0.254" layer="16"/>
+<via x="54.25" y="55.05" extent="1-16" drill="0.35"/>
+<wire x1="54.3" y1="55.05" x2="54.25" y2="55.05" width="0.254" layer="1"/>
+<wire x1="54.4" y1="54.95" x2="55.6" y2="54.95" width="0.254" layer="1"/>
+<via x="55.6" y="54.95" extent="1-16" drill="0.35"/>
+<wire x1="54.3" y1="55.05" x2="54.9" y2="54.45" width="0.254" layer="1"/>
+<via x="55.65" y="53.7" extent="1-16" drill="0.35"/>
+<wire x1="54.9" y1="54.45" x2="55.2" y2="54.15" width="0.254" layer="1"/>
+<wire x1="55.2" y1="54.15" x2="55.65" y2="53.7" width="0.254" layer="1"/>
+<wire x1="54.4" y1="54.95" x2="54.4" y2="53.7" width="0.254" layer="1"/>
+<via x="54.4" y="53.7" extent="1-16" drill="0.35"/>
+<wire x1="56.65" y1="52.5" x2="55.2" y2="53.95" width="0.1524" layer="1"/>
+<wire x1="56.65" y1="52.1" x2="56.65" y2="52.5" width="0.1524" layer="1"/>
+<wire x1="55.2" y1="53.95" x2="55.2" y2="54.15" width="0.1524" layer="1"/>
+<wire x1="53.15" y1="56.8" x2="53.1714" y2="56.7286" width="0.1524" layer="1"/>
+<wire x1="53.1714" y1="56.7286" x2="53.1714" y2="56.28166875" width="0.1524" layer="1"/>
+<wire x1="53.1714" y1="56.28166875" x2="53.23166875" y2="56.2214" width="0.1524" layer="1"/>
+<wire x1="53.23166875" y1="56.2214" x2="53.2786" y2="56.2214" width="0.1524" layer="1"/>
+<wire x1="53.2786" y1="56.2214" x2="54.9" y2="54.6" width="0.1524" layer="1"/>
+<wire x1="54.9" y1="54.6" x2="54.9" y2="54.45" width="0.1524" layer="1"/>
 <contactref element="U$2" pad="P$2"/>
-<wire x1="55.3" y1="50.6" x2="55.35" y2="51.05" width="0.254" layer="1"/>
-<wire x1="55.35" y1="50.2" x2="55.3" y2="50.6" width="0.1524" layer="1"/>
-<via x="55.3" y="50.6" extent="1-16" drill="0.35"/>
-<via x="49.7" y="50.2" extent="1-16" drill="0.35"/>
+<wire x1="55.3" y1="50.55" x2="55.35" y2="51" width="0.254" layer="1"/>
+<wire x1="55.35" y1="50.15" x2="55.3" y2="50.55" width="0.1524" layer="1"/>
+<via x="55.3" y="50.55" extent="1-16" drill="0.35"/>
+<contactref element="N2" pad="P5"/>
+<contactref element="N2" pad="P$11"/>
+<via x="62.7" y="58.9" extent="1-16" drill="0.35"/>
+<via x="64.3" y="58.9" extent="1-16" drill="0.35"/>
+<via x="65.95" y="58.9" extent="1-16" drill="0.35"/>
+<via x="62.65" y="49.35" extent="1-16" drill="0.35"/>
+<via x="64.5" y="49.25" extent="1-16" drill="0.35"/>
+<via x="66.15" y="49.3" extent="1-16" drill="0.35"/>
+<wire x1="53.4" y1="59.025" x2="53.4" y2="59.85" width="0.3048" layer="1"/>
+<via x="53.4" y="59.85" extent="1-16" drill="0.35"/>
+<wire x1="53.35" y1="58.975" x2="53.4" y2="59.025" width="0.1524" layer="1"/>
+<wire x1="55.49" y1="58.89" x2="55.9464" y2="59.3464" width="0.1524" layer="1"/>
+<wire x1="55.9464" y1="59.3464" x2="55.9464" y2="59.6" width="0.1524" layer="1"/>
+<via x="55.9464" y="59.6" extent="1-16" drill="0.35"/>
+<wire x1="55.9464" y1="59.6" x2="55.9464" y2="59.7636" width="0.1524" layer="1"/>
+<wire x1="55.9464" y1="59.7636" x2="55.45" y2="60.26" width="0.1524" layer="1"/>
+<via x="51.8" y="60.75" extent="1-16" drill="0.35"/>
+<via x="50.95" y="60.75" extent="1-16" drill="0.35"/>
+<via x="50.65" y="49.95" extent="1-16" drill="0.35"/>
+<wire x1="74.1" y1="59.99" x2="73.6" y2="59.99" width="0.1524" layer="1"/>
+<wire x1="73.6" y1="59.99" x2="72.6" y2="58.99" width="0.1524" layer="1"/>
+<wire x1="72.298" y1="58.99" x2="72.6" y2="58.99" width="0.1524" layer="1"/>
+<via x="72.298" y="58.99" extent="1-16" drill="0.35"/>
 </signal>
 <signal name="+5V">
-<via x="49.95" y="52.4" extent="1-16" drill="0.35"/>
 <wire x1="50.0611125" y1="52.4" x2="49.95" y2="52.4" width="0.254" layer="1"/>
 <wire x1="48.25" y1="50.7" x2="49.95" y2="52.4" width="0.508" layer="1"/>
 <contactref element="U1" pad="5V"/>
 <wire x1="38.95" y1="50.7" x2="48.25" y2="50.7" width="0.508" layer="1"/>
+<via x="51.15" y="58.9" extent="1-16" drill="0.35"/>
+<wire x1="51.1144" y1="54.9644" x2="51.1144" y2="58.8644" width="0.254" layer="16"/>
+<wire x1="50.6" y1="53.05" x2="50.6" y2="54.45" width="0.254" layer="16"/>
+<wire x1="50.6" y1="54.45" x2="51.1144" y2="54.9644" width="0.254" layer="16"/>
+<wire x1="51.15" y1="58.9" x2="51.1144" y2="58.8644" width="0.254" layer="16"/>
+<wire x1="50" y1="52.4" x2="49.95" y2="52.4" width="0.3048" layer="1"/>
+<wire x1="49.95" y1="52.4" x2="50.6" y2="53.05" width="0.3048" layer="16"/>
 <contactref element="C8" pad="1"/>
 <contactref element="C7" pad="1"/>
 <contactref element="+5V1" pad="TP"/>
 <contactref element="L4" pad="4"/>
 <contactref element="L4" pad="3"/>
-<wire x1="54.75" y1="59.36" x2="54.69" y2="59.350003125" width="0.2032" layer="1"/>
-<wire x1="52.35" y1="59.025" x2="52.35" y2="59.05" width="0.1524" layer="1"/>
-<wire x1="52.35" y1="59.05" x2="52.35" y2="59.0834125" width="0.1524" layer="1"/>
-<wire x1="52.35" y1="58.9834125" x2="52.35" y2="59.025" width="0.1524" layer="1"/>
-<wire x1="52.35" y1="58.375" x2="52.35" y2="58.430665625" width="0.2032" layer="1"/>
-<wire x1="52.4" y1="58.325" x2="52.35" y2="58.375" width="0.2032" layer="1"/>
-<wire x1="52.35" y1="58.375" x2="52.35" y2="58.394746875" width="0.254" layer="1"/>
-<wire x1="52.35" y1="58.394746875" x2="52.160478125" y2="58.58426875" width="0.254" layer="1"/>
-<wire x1="52.160478125" y1="58.58426875" x2="52.160478125" y2="58.81573125" width="0.254" layer="1"/>
-<wire x1="52.160478125" y1="58.81573125" x2="52.35" y2="59.005253125" width="0.254" layer="1"/>
-<wire x1="52.35" y1="59.005253125" x2="52.35" y2="59.05" width="0.254" layer="1"/>
-<wire x1="52.35" y1="59.025" x2="52.325" y2="59.05" width="0.254" layer="1"/>
-<wire x1="52.325" y1="59.05" x2="51.3" y2="59.05" width="0.254" layer="1"/>
-<via x="51.15" y="58.9" extent="1-16" drill="0.35"/>
-<wire x1="54.75" y1="59.36" x2="54.64" y2="59.3" width="0.254" layer="1"/>
-<wire x1="54.64" y1="59.3" x2="54.69" y2="58.34" width="0.254" layer="1"/>
-<wire x1="52.35" y1="59.05" x2="52.35" y2="59.4" width="0.254" layer="1"/>
-<wire x1="52.35" y1="59.4" x2="52.65" y2="59.7" width="0.254" layer="1"/>
-<wire x1="52.65" y1="59.7" x2="52.7" y2="59.65" width="0.254" layer="1"/>
-<wire x1="54.41" y1="59.65" x2="54.75" y2="59.36" width="0.254" layer="1"/>
-<wire x1="52.7" y1="59.65" x2="54.41" y2="59.65" width="0.254" layer="1"/>
+<wire x1="54.25" y1="60.26" x2="54.19" y2="60.250003125" width="0.2032" layer="1"/>
+<wire x1="52.35" y1="58.975" x2="52.35" y2="59" width="0.1524" layer="1"/>
+<wire x1="52.35" y1="59" x2="52.35" y2="59.0334125" width="0.1524" layer="1"/>
+<wire x1="52.35" y1="58.9334125" x2="52.35" y2="58.975" width="0.1524" layer="1"/>
+<wire x1="52.35" y1="58.325" x2="52.35" y2="58.380665625" width="0.2032" layer="1"/>
+<wire x1="52.4" y1="58.275" x2="52.35" y2="58.325" width="0.2032" layer="1"/>
+<wire x1="52.35" y1="58.325" x2="52.35" y2="58.344746875" width="0.254" layer="1"/>
+<wire x1="52.35" y1="58.344746875" x2="52.160478125" y2="58.53426875" width="0.254" layer="1"/>
+<wire x1="52.160478125" y1="58.53426875" x2="52.160478125" y2="58.76573125" width="0.254" layer="1"/>
+<wire x1="52.160478125" y1="58.76573125" x2="52.35" y2="58.955253125" width="0.254" layer="1"/>
+<wire x1="52.35" y1="58.955253125" x2="52.35" y2="59" width="0.254" layer="1"/>
+<wire x1="52.35" y1="58.975" x2="52.325" y2="59" width="0.254" layer="1"/>
+<wire x1="52.325" y1="59" x2="51.3" y2="59" width="0.254" layer="1"/>
+<via x="51.15" y="58.85" extent="1-16" drill="0.35"/>
+<wire x1="54.25" y1="60.26" x2="54.25" y2="58.93" width="0.254" layer="1"/>
+<wire x1="54.29" y1="58.89" x2="54.25" y2="58.93" width="0.254" layer="1"/>
+<wire x1="52.35" y1="59" x2="52.35" y2="59.8" width="0.254" layer="1"/>
+<wire x1="52.35" y1="59.8" x2="53.05" y2="60.5" width="0.254" layer="1"/>
+<wire x1="54.25" y1="60.26" x2="54.01" y2="60.5" width="0.254" layer="1"/>
+<wire x1="54.01" y1="60.5" x2="53.05" y2="60.5" width="0.254" layer="1"/>
 <contactref element="Z2" pad="P$1"/>
-<wire x1="51.3" y1="58.75" x2="51.15" y2="58.9" width="0.254" layer="16"/>
-<wire x1="51.1144" y1="54.9644" x2="51.1144" y2="58.8644" width="0.254" layer="16"/>
-<wire x1="50.6" y1="53.05" x2="50.6" y2="54.45" width="0.254" layer="16"/>
-<wire x1="50.6" y1="54.45" x2="51.1144" y2="54.9644" width="0.254" layer="16"/>
-<wire x1="50.55" y1="52.95" x2="50.15" y2="52.5" width="0.254" layer="1"/>
-<wire x1="50.15" y1="52.5" x2="50.05" y2="52.5" width="0.254" layer="1"/>
-<wire x1="51.15" y1="58.9" x2="51.1144" y2="58.8644" width="0.254" layer="16"/>
-<wire x1="51.3" y1="59.05" x2="51.15" y2="58.9" width="0.254" layer="1"/>
-<wire x1="51.15" y1="58.85" x2="51.15" y2="58.9" width="0.1524" layer="16"/>
-<wire x1="50.55" y1="52.95" x2="50" y2="52.4" width="0.3048" layer="1"/>
-<wire x1="50" y1="52.4" x2="49.95" y2="52.4" width="0.3048" layer="1"/>
-<wire x1="49.95" y1="52.4" x2="50.6" y2="53.05" width="0.3048" layer="16"/>
+<via x="49.95" y="52.4" extent="1-16" drill="0.3"/>
+<wire x1="51.3" y1="58.7" x2="51.15" y2="58.85" width="0.254" layer="16"/>
+<wire x1="51.1144" y1="54.9144" x2="51.1144" y2="58.8144" width="0.254" layer="16"/>
+<wire x1="50.6" y1="54.2" x2="50.6" y2="54.4" width="0.254" layer="16"/>
+<wire x1="50.6" y1="54.4" x2="51.1144" y2="54.9144" width="0.254" layer="16"/>
+<wire x1="50.5" y1="52.9" x2="50.05555625" y2="52.4" width="0.254" layer="1"/>
+<wire x1="50.05555625" y1="52.4" x2="49.95" y2="52.4" width="0.254" layer="1"/>
+<wire x1="51.15" y1="58.85" x2="51.1144" y2="58.8144" width="0.254" layer="16"/>
+<wire x1="51.3" y1="59" x2="51.15" y2="58.85" width="0.254" layer="1"/>
+<wire x1="51.15" y1="58.8" x2="51.15" y2="58.85" width="0.1524" layer="16"/>
+<wire x1="51.15" y1="58.9" x2="51.15" y2="58.85" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="D+">
 <contactref element="U1" pad="D+"/>
@@ -1574,245 +1699,383 @@ design rules under a new name.</description>
 <contactref element="D+1" pad="TP"/>
 <contactref element="ST2" pad="22"/>
 <contactref element="Z2" pad="P$3"/>
-<wire x1="51.65" y1="53" x2="51.9" y2="53.25" width="0.1524" layer="1"/>
-<wire x1="51.9" y1="53.25" x2="51.9" y2="53.75" width="0.1524" layer="1"/>
-<wire x1="51.9" y1="53.75" x2="52.55" y2="53.75" width="0.1524" layer="1"/>
-<wire x1="51.6286" y1="52.9435875" x2="51.6286" y2="51.4286" width="0.1524" layer="1"/>
-<via x="51.4" y="51.2" extent="1-16" drill="0.35"/>
-<wire x1="51.65" y1="52.95" x2="51.6286" y2="52.9435875" width="0.1524" layer="1"/>
-<wire x1="51.6286" y1="51.4286" x2="51.4" y2="51.2" width="0.1524" layer="1"/>
-<wire x1="51.7" y1="51.2" x2="51.4" y2="51.2" width="0.254" layer="16"/>
-<wire x1="51.6786" y1="52.9786" x2="51.6786" y2="53.1" width="0.1524" layer="1"/>
-<wire x1="51.6786" y1="53.1" x2="51.6786" y2="53.2446875" width="0.1524" layer="1"/>
-<wire x1="51.6786" y1="53.2446875" x2="51.3232875" y2="53.6" width="0.1524" layer="1"/>
-<wire x1="50" y1="53.6" x2="51.3232875" y2="53.6" width="0.1524" layer="1"/>
-<wire x1="51.65" y1="52.95" x2="51.65" y2="53" width="0.1524" layer="1"/>
-<wire x1="51.65" y1="52.95" x2="51.6786" y2="52.9786" width="0.1524" layer="1"/>
-<wire x1="51.6786" y1="52.9786" x2="51.6786" y2="53.1" width="0.1524" layer="1"/>
-<wire x1="49.4" y1="53.6" x2="50" y2="53.6" width="0.1524" layer="1"/>
+<wire x1="51.6" y1="52.95" x2="51.9" y2="53.25" width="0.1524" layer="1"/>
+<wire x1="51.9" y1="53.25" x2="51.9" y2="53.7" width="0.1524" layer="1"/>
+<wire x1="51.9" y1="53.7" x2="52.55" y2="53.7" width="0.1524" layer="1"/>
+<wire x1="51.6286" y1="52.89143125" x2="51.6286" y2="51.3786" width="0.1524" layer="1"/>
+<via x="51.4" y="51.15" extent="1-16" drill="0.35"/>
+<wire x1="51.6" y1="52.9" x2="51.6286" y2="52.89143125" width="0.1524" layer="1"/>
+<wire x1="51.6286" y1="51.3786" x2="51.4" y2="51.15" width="0.1524" layer="1"/>
+<wire x1="51.7" y1="51.15" x2="51.4" y2="51.15" width="0.254" layer="16"/>
+<wire x1="51.6786" y1="52.9786" x2="51.6786" y2="53.1946875" width="0.1524" layer="1"/>
+<wire x1="51.6786" y1="53.1946875" x2="51.3232875" y2="53.55" width="0.1524" layer="1"/>
+<wire x1="50" y1="53.55" x2="51.3232875" y2="53.55" width="0.1524" layer="1"/>
+<wire x1="51.6" y1="52.9" x2="51.6" y2="52.95" width="0.1524" layer="1"/>
+<wire x1="51.6" y1="52.9" x2="51.6786" y2="52.9786" width="0.1524" layer="1"/>
+<wire x1="49.4" y1="53.6" x2="49.95" y2="53.6" width="0.1524" layer="1"/>
+<wire x1="49.95" y1="53.6" x2="50" y2="53.55" width="0.1524" layer="1"/>
 </signal>
 <signal name="D-">
 <via x="48.7" y="53.3" extent="1-16" drill="0.35"/>
-<wire x1="48.65" y1="53.25" x2="48.7" y2="53.3" width="0.1524" layer="1"/>
 <wire x1="49.5774" y1="54.1774" x2="48.7" y2="53.3" width="0.1524" layer="16"/>
 <contactref element="U1" pad="D-"/>
 <wire x1="39.2" y1="53.05" x2="48.45" y2="53.05" width="0.1524" layer="1"/>
-<wire x1="48.45" y1="53.05" x2="48.65" y2="53.25" width="0.1524" layer="1"/>
+<wire x1="48.45" y1="53.05" x2="48.7" y2="53.3" width="0.1524" layer="1"/>
+<wire x1="49.90254375" y1="55.00254375" x2="49.90254375" y2="55.05254375" width="0.1524" layer="16"/>
+<wire x1="49.90254375" y1="54.2274" x2="49.90254375" y2="54.027475" width="0.1524" layer="1"/>
+<wire x1="49.80254375" y1="54.1774" x2="49.5774" y2="54.1774" width="0.1524" layer="16"/>
+<wire x1="49.90254375" y1="54.2774" x2="49.80254375" y2="54.1774" width="0.1524" layer="16"/>
 <contactref element="D-1" pad="TP"/>
 <contactref element="ST2" pad="21"/>
 <contactref element="Z2" pad="P$4"/>
-<wire x1="51.859090625" y1="54.390909375" x2="52.19375" y2="54.25" width="0.1524" layer="1"/>
-<wire x1="51.45" y1="54.65" x2="50.827246875" y2="54.027246875" width="0.1524" layer="1"/>
-<wire x1="49.90254375" y1="54.027475" x2="50.827246875" y2="54.027246875" width="0.1524" layer="1"/>
-<via x="49.90254375" y="54.2774" extent="1-16" drill="0.3"/>
-<wire x1="49.90254375" y1="54.2774" x2="49.90254375" y2="55.05254375" width="0.1524" layer="16"/>
-<wire x1="49.90254375" y1="55.05254375" x2="50.2" y2="55.35" width="0.1524" layer="16"/>
-<wire x1="52.19375" y1="54.25" x2="52.55" y2="54.25" width="0.1524" layer="1"/>
-<wire x1="51.6" y1="54.65" x2="51.859090625" y2="54.390909375" width="0.1524" layer="1"/>
-<wire x1="51.6" y1="54.65" x2="51.45" y2="54.65" width="0.1524" layer="1"/>
-<wire x1="49.90254375" y1="54.2774" x2="49.90254375" y2="54.027475" width="0.1524" layer="1"/>
-<wire x1="49.80254375" y1="54.1774" x2="49.5774" y2="54.1774" width="0.1524" layer="16"/>
-<wire x1="49.90254375" y1="54.2774" x2="49.80254375" y2="54.1774" width="0.1524" layer="16"/>
+<wire x1="51.772728125" y1="54.377271875" x2="52.19375" y2="54.2" width="0.1524" layer="1"/>
+<wire x1="51.45" y1="54.6" x2="50.827246875" y2="53.977246875" width="0.1524" layer="1"/>
+<wire x1="49.90254375" y1="53.977475" x2="49.99999375" y2="53.97745" width="0.1524" layer="1"/>
+<via x="49.90254375" y="54.2274" extent="1-16" drill="0.3"/>
+<wire x1="49.99999375" y1="53.97745" x2="50.827246875" y2="53.977246875" width="0.1524" layer="1"/>
+<wire x1="49.90254375" y1="54.2774" x2="49.90254375" y2="55.00254375" width="0.1524" layer="16"/>
+<wire x1="49.90254375" y1="55.00254375" x2="50.2" y2="55.3" width="0.1524" layer="16"/>
+<wire x1="52.19375" y1="54.2" x2="52.55" y2="54.2" width="0.1524" layer="1"/>
+<wire x1="51.55" y1="54.6" x2="51.772728125" y2="54.377271875" width="0.1524" layer="1"/>
+<wire x1="51.55" y1="54.6" x2="51.45" y2="54.6" width="0.1524" layer="1"/>
+<wire x1="49.90254375" y1="54.2274" x2="49.90254375" y2="54.2774" width="0.1524" layer="1"/>
+<wire x1="49.90254375" y1="54.2274" x2="49.90254375" y2="54.2774" width="0.1524" layer="16"/>
+<wire x1="49.90254375" y1="54.2274" x2="49.90254375" y2="54.0749" width="0.1524" layer="1"/>
+<wire x1="49.90254375" y1="54.0749" x2="49.99999375" y2="53.97745" width="0.1524" layer="1"/>
 </signal>
 <signal name="+3V3">
 <contactref element="3V1" pad="TP"/>
-<contactref element="R1" pad="2"/>
+<contactref element="R2" pad="2"/>
 <contactref element="C10" pad="1"/>
 <contactref element="C9" pad="1"/>
 <contactref element="ST2" pad="17"/>
 <contactref element="L4" pad="1"/>
-<wire x1="52.85" y1="50.05" x2="53" y2="50.15" width="0.254" layer="1"/>
+<wire x1="52.85" y1="50" x2="53" y2="50.1" width="0.254" layer="1"/>
 <contactref element="C12" pad="1"/>
 <contactref element="C11" pad="1"/>
 <contactref element="ST2" pad="1"/>
 <contactref element="ST2" pad="5"/>
-<wire x1="57.2" y1="51.15" x2="57.15" y2="51.15" width="0.2032" layer="1"/>
-<wire x1="58.1" y1="52.4" x2="58.025" y2="52.475" width="0.2032" layer="1"/>
-<wire x1="58.025" y1="52.475" x2="57.75" y2="52.75" width="0.2032" layer="1"/>
-<wire x1="57.75" y1="52.75" x2="57.25" y2="52.75" width="0.2032" layer="1"/>
-<wire x1="57.25" y1="54.75" x2="57.95" y2="54.75" width="0.2032" layer="1"/>
-<wire x1="57.95" y1="54.75" x2="58.1" y2="54.6" width="0.2032" layer="1"/>
-<wire x1="58.1" y1="54.6" x2="58.1" y2="52.4" width="0.2032" layer="1"/>
-<via x="53.5" y="49.1" extent="1-16" drill="0.35"/>
-<wire x1="56.82875625" y1="47.5856" x2="57.5" y2="48.25684375" width="0.254" layer="16"/>
-<wire x1="53.5" y1="49.05" x2="54.9644" y2="47.5856" width="0.254" layer="16"/>
-<wire x1="54.9644" y1="47.5856" x2="56.82875625" y2="47.5856" width="0.254" layer="16"/>
-<wire x1="57.5" y1="48.25684375" x2="57.5" y2="49.95" width="0.254" layer="16"/>
-<via x="58.15" y="50.6" extent="1-16" drill="0.35"/>
-<wire x1="53.5" y1="49.1" x2="52.95" y2="49.65" width="0.254" layer="1"/>
-<wire x1="52.95" y1="49.65" x2="53" y2="50.15" width="0.254" layer="1"/>
-<wire x1="49.75" y1="49.1" x2="52.65" y2="49.1" width="0.254" layer="16"/>
-<wire x1="52.65" y1="49.1" x2="53.5" y2="49.1" width="0.254" layer="16"/>
-<wire x1="48.55" y1="47.9" x2="49.75" y2="49.1" width="0.254" layer="16"/>
-<wire x1="51.29" y1="55.51" x2="51.34" y2="56.375" width="0.254" layer="1"/>
-<wire x1="51.545" y1="56.25" x2="51.33" y2="56.415" width="0.254" layer="1"/>
-<wire x1="51.545" y1="56.25" x2="52.55" y2="56.25" width="0.254" layer="1"/>
-<wire x1="51.465" y1="56.415" x2="52.6" y2="57.55" width="0.254" layer="1"/>
-<wire x1="52.85" y1="57.8" x2="53.2" y2="57.8" width="0.254" layer="1"/>
-<wire x1="53.2" y1="57.8" x2="53.35" y2="57.95" width="0.254" layer="1"/>
-<wire x1="53.35" y1="57.95" x2="53.35" y2="58.375" width="0.254" layer="1"/>
-<wire x1="51.33" y1="56.415" x2="51.38" y2="57.13" width="0.254" layer="1"/>
-<wire x1="51.38" y1="57.13" x2="51.8" y2="57.55" width="0.254" layer="1"/>
-<via x="51.8" y="57.55" extent="1-16" drill="0.35"/>
-<wire x1="51.8" y1="57.55" x2="52.65" y2="56.7" width="0.254" layer="16"/>
-<wire x1="52.65" y1="56.7" x2="52.65" y2="49.1" width="0.254" layer="16"/>
-<wire x1="51.8" y1="57.55" x2="52.6" y2="57.55" width="0.254" layer="1"/>
-<wire x1="52.6" y1="57.55" x2="52.85" y2="57.8" width="0.254" layer="1"/>
+<wire x1="57.2" y1="51.1" x2="57.15" y2="51.1" width="0.2032" layer="1"/>
+<wire x1="58.025" y1="52.425" x2="57.75" y2="52.7" width="0.2032" layer="1"/>
+<wire x1="57.75" y1="52.7" x2="57.25" y2="52.7" width="0.2032" layer="1"/>
+<wire x1="57.25" y1="54.7" x2="57.95" y2="54.7" width="0.2032" layer="1"/>
+<wire x1="57.95" y1="54.7" x2="58.7" y2="53.95" width="0.2032" layer="1"/>
+<wire x1="58.7" y1="52.75" x2="58.7" y2="53.95" width="0.2032" layer="1"/>
+<via x="53.5" y="49.05" extent="1-16" drill="0.35"/>
+<wire x1="56.82875625" y1="47.5356" x2="57.5" y2="48.20684375" width="0.254" layer="16"/>
+<wire x1="53.5" y1="49" x2="54.9644" y2="47.5356" width="0.254" layer="16"/>
+<wire x1="54.9644" y1="47.5356" x2="56.82875625" y2="47.5356" width="0.254" layer="16"/>
+<wire x1="57.5" y1="48.20684375" x2="57.5" y2="49.9" width="0.254" layer="16"/>
+<via x="58.15" y="50.55" extent="1-16" drill="0.35"/>
+<wire x1="53.5" y1="49.05" x2="52.95" y2="49.6" width="0.254" layer="1"/>
+<wire x1="52.95" y1="49.6" x2="53" y2="50.1" width="0.254" layer="1"/>
+<wire x1="49.75" y1="49.05" x2="52.65" y2="49.05" width="0.254" layer="16"/>
+<wire x1="52.65" y1="49.05" x2="53.5" y2="49.05" width="0.254" layer="16"/>
+<wire x1="48.35" y1="47.65" x2="49.75" y2="49.05" width="0.254" layer="16"/>
+<wire x1="51.29" y1="55.46" x2="51.34" y2="56.325" width="0.254" layer="1"/>
+<wire x1="51.545" y1="56.2" x2="51.33" y2="56.365" width="0.254" layer="1"/>
+<wire x1="51.545" y1="56.2" x2="52.55" y2="56.2" width="0.254" layer="1"/>
+<wire x1="51.465" y1="56.365" x2="52.6" y2="57.5" width="0.254" layer="1"/>
+<wire x1="52.85" y1="57.75" x2="53.2" y2="57.75" width="0.254" layer="1"/>
+<wire x1="53.2" y1="57.75" x2="53.35" y2="57.9" width="0.254" layer="1"/>
+<wire x1="53.35" y1="57.9" x2="53.35" y2="58.325" width="0.254" layer="1"/>
+<wire x1="51.33" y1="56.365" x2="51.38" y2="57.08" width="0.254" layer="1"/>
+<wire x1="51.38" y1="57.08" x2="51.8" y2="57.5" width="0.254" layer="1"/>
+<via x="51.8" y="57.5" extent="1-16" drill="0.35"/>
+<wire x1="51.8" y1="57.5" x2="52.65" y2="56.65" width="0.254" layer="16"/>
+<wire x1="52.65" y1="56.65" x2="52.65" y2="55.6" width="0.254" layer="16"/>
+<wire x1="52.65" y1="55.6" x2="52.65" y2="49.05" width="0.254" layer="16"/>
+<wire x1="51.8" y1="57.5" x2="52.6" y2="57.5" width="0.254" layer="1"/>
+<wire x1="52.6" y1="57.5" x2="52.85" y2="57.75" width="0.254" layer="1"/>
 <contactref element="Z2" pad="P$5"/>
-<wire x1="51.240009375" y1="55.290009375" x2="51.34" y2="55.332028125" width="0.254" layer="1"/>
-<wire x1="51.34" y1="55.332028125" x2="51.29" y2="55.51" width="0.254" layer="1"/>
-<wire x1="51.34" y1="56.375" x2="51.33" y2="56.415" width="0.254" layer="1"/>
-<wire x1="48.55" y1="47.9" x2="48.55" y2="47.75" width="0.254" layer="16"/>
-<wire x1="51.33" y1="56.415" x2="51.465" y2="56.415" width="0.254" layer="1"/>
-<wire x1="50.6" y1="54.65" x2="51.240009375" y2="55.290009375" width="0.254" layer="1"/>
+<wire x1="51.15376875" y1="55.20376875" x2="51.34" y2="55.282028125" width="0.254" layer="1"/>
+<wire x1="51.34" y1="55.282028125" x2="51.29" y2="55.46" width="0.254" layer="1"/>
+<wire x1="51.34" y1="56.325" x2="51.33" y2="56.365" width="0.254" layer="1"/>
+<wire x1="51.33" y1="56.365" x2="51.465" y2="56.365" width="0.254" layer="1"/>
+<wire x1="50.55" y1="54.6" x2="51.15376875" y2="55.20376875" width="0.254" layer="1"/>
 <contactref element="ST2" pad="31"/>
-<wire x1="56.15" y1="52.15" x2="56.0857" y2="52.1357" width="0.1524" layer="1"/>
-<wire x1="57.15" y1="51.15" x2="58.025" y2="52.025" width="0.254" layer="1"/>
-<wire x1="58.025" y1="52.025" x2="58.025" y2="52.475" width="0.254" layer="1"/>
-<wire x1="56.7" y1="51.15" x2="56.75" y2="51.2" width="0.254" layer="1"/>
-<wire x1="56.65" y1="51.1" x2="56.7" y2="51.15" width="0.254" layer="1"/>
-<wire x1="56.7" y1="51.15" x2="57.15" y2="51.15" width="0.254" layer="1"/>
-<wire x1="56.55" y1="51.05" x2="57.7" y2="51.05" width="0.254" layer="1"/>
-<wire x1="57.7" y1="51.05" x2="58.15" y2="50.6" width="0.254" layer="1"/>
-<wire x1="56.55" y1="50.2" x2="56.55" y2="51.05" width="0.254" layer="1"/>
-<wire x1="56.15" y1="52.15" x2="56.15" y2="51.8" width="0.1524" layer="1"/>
-<wire x1="56.15" y1="51.8" x2="56.75" y2="51.2" width="0.1524" layer="1"/>
-<wire x1="56.55" y1="51.05" x2="56.65" y2="51.1" width="0.254" layer="1"/>
-<wire x1="53.5" y1="49.1" x2="53.5" y2="49.05" width="0.254" layer="16"/>
-<wire x1="57.5" y1="49.95" x2="58.15" y2="50.6" width="0.254" layer="16"/>
+<wire x1="56.15" y1="52.1" x2="56.0857" y2="52.0857" width="0.1524" layer="1"/>
+<wire x1="57.15" y1="51.1" x2="58.025" y2="51.975" width="0.254" layer="1"/>
+<wire x1="58.025" y1="51.975" x2="58.025" y2="52.425" width="0.254" layer="1"/>
+<wire x1="56.7" y1="51.1" x2="56.8" y2="51.2" width="0.254" layer="1"/>
+<wire x1="56.65" y1="51.05" x2="56.7" y2="51.1" width="0.254" layer="1"/>
+<wire x1="56.7" y1="51.1" x2="57.15" y2="51.1" width="0.254" layer="1"/>
+<wire x1="56.55" y1="51" x2="57.7" y2="51" width="0.254" layer="1"/>
+<wire x1="57.7" y1="51" x2="58.15" y2="50.55" width="0.254" layer="1"/>
+<wire x1="56.55" y1="50.15" x2="56.55" y2="51" width="0.254" layer="1"/>
+<wire x1="56.15" y1="52.1" x2="56.15" y2="51.85" width="0.1524" layer="1"/>
+<wire x1="56.15" y1="51.85" x2="56.8" y2="51.2" width="0.1524" layer="1"/>
+<wire x1="56.55" y1="51" x2="56.65" y2="51.05" width="0.254" layer="1"/>
+<wire x1="53.5" y1="49.05" x2="53.5" y2="49" width="0.254" layer="16"/>
+<wire x1="57.5" y1="49.9" x2="58.15" y2="50.55" width="0.254" layer="16"/>
+<contactref element="N2" pad="P2"/>
+<contactref element="SJ2" pad="2"/>
+<wire x1="58.55" y1="52.5" x2="58.6" y2="52.5" width="0.3048" layer="1"/>
+<wire x1="58.55" y1="52.5" x2="58.025" y2="51.975" width="0.3048" layer="1"/>
+<wire x1="58.6" y1="52.5" x2="58.6" y2="52.65" width="0.3048" layer="1"/>
+<wire x1="58.6" y1="52.65" x2="58.7" y2="52.75" width="0.3048" layer="1"/>
+<wire x1="53.5" y1="49.05" x2="54.0452" y2="48.5048" width="0.3048" layer="1"/>
+<wire x1="54.0452" y1="48.5048" x2="54.0452" y2="48.49948125" width="0.3048" layer="1"/>
+<wire x1="54.0452" y1="48.49948125" x2="55.04468125" y2="47.5" width="0.3048" layer="1"/>
+<wire x1="55.04468125" y1="47.5" x2="71.25" y2="47.5" width="0.3048" layer="1"/>
+<wire x1="71.25" y1="47.5" x2="72.388" y2="48.638" width="0.3048" layer="1"/>
+<wire x1="72.388" y1="48.638" x2="72.388" y2="49.95" width="0.3048" layer="1"/>
+<wire x1="74.7428" y1="56.9878" x2="74.7428" y2="58.3" width="0.3048" layer="1"/>
+<wire x1="71.33311875" y1="56.9878" x2="69.5122" y2="55.16688125" width="0.3048" layer="1"/>
+<wire x1="69.5122" y1="55.16688125" x2="69.5122" y2="52.93311875" width="0.3048" layer="1"/>
+<wire x1="74.7428" y1="56.9878" x2="71.33311875" y2="56.9878" width="0.3048" layer="1"/>
+<wire x1="72.388" y1="50.05731875" x2="72.388" y2="49.95" width="0.3048" layer="1"/>
+<wire x1="69.5122" y1="52.93311875" x2="72.388" y2="50.05731875" width="0.3048" layer="1"/>
+<wire x1="74.1" y1="58.49" x2="74.5528" y2="58.49" width="0.3048" layer="1"/>
+<wire x1="74.5528" y1="58.49" x2="74.7428" y2="58.3" width="0.3048" layer="1"/>
 </signal>
-<signal name="N$7">
-<contactref element="R1" pad="1"/>
+<signal name="N$15">
+<contactref element="R2" pad="1"/>
 <contactref element="L2" pad="P$4"/>
-<wire x1="64.8" y1="54.65" x2="64.9" y2="54.65" width="0.1524" layer="1"/>
-<via x="64.8" y="54.65" extent="1-16" drill="0.3"/>
-<via x="65.9" y="48.1" extent="1-16" drill="0.2032"/>
-<wire x1="64.95" y1="54.65" x2="64.8" y2="54.65" width="0.2" layer="16"/>
-<wire x1="54.2" y1="50.15" x2="56.25" y2="48.15" width="0.254" layer="1"/>
-<wire x1="56.25" y1="48.15" x2="65.85" y2="48.15" width="0.254" layer="1"/>
-<wire x1="65.9" y1="48.1" x2="65.9" y2="53.7" width="0.254" layer="16"/>
-<wire x1="65.9" y1="53.7" x2="64.95" y2="54.65" width="0.254" layer="16"/>
-<wire x1="65.85" y1="48.15" x2="65.9" y2="48.1" width="0.254" layer="1"/>
+<wire x1="64.8" y1="54.6" x2="64.9" y2="54.6" width="0.1524" layer="1"/>
+<via x="64.8" y="54.6" extent="1-16" drill="0.3"/>
+<via x="69.6" y="49.2" extent="1-16" drill="0.2032"/>
+<wire x1="67.25" y1="54.6" x2="64.8" y2="54.6" width="0.2" layer="16"/>
+<wire x1="54.2" y1="50.1" x2="56.25" y2="48.1" width="0.254" layer="1"/>
+<wire x1="56.25" y1="48.1" x2="68.55" y2="48.1" width="0.254" layer="1"/>
+<wire x1="69.9" y1="51.95" x2="69.9" y2="49.5" width="0.254" layer="16"/>
+<wire x1="69.6" y1="49.2" x2="69.9" y2="49.5" width="0.254" layer="16"/>
+<wire x1="69.9" y1="51.95" x2="67.25" y2="54.6" width="0.254" layer="16"/>
+<wire x1="68.55" y1="48.1" x2="68.55" y2="48.15" width="0.254" layer="1"/>
+<wire x1="68.55" y1="48.15" x2="69.6" y2="49.2" width="0.254" layer="1"/>
 </signal>
 <signal name="SWCLK">
 <contactref element="SWCLK1" pad="TP"/>
 <contactref element="ST2" pad="24"/>
-<via x="53.45" y="47.85" extent="1-16" drill="0.35"/>
-<wire x1="53.45" y1="47.85" x2="53.4" y2="47.9" width="0.1524" layer="16"/>
-<wire x1="53.45" y1="47.85" x2="53.45" y2="48.3" width="0.1524" layer="1"/>
-<wire x1="53.45" y1="48.3" x2="52.4" y2="49.35" width="0.1524" layer="1"/>
-<wire x1="52.4" y1="49.35" x2="52.4" y2="52" width="0.1524" layer="1"/>
-<wire x1="52.55" y1="52.15" x2="52.55" y2="52.75" width="0.1524" layer="1"/>
-<wire x1="52.4" y1="52" x2="52.55" y2="52.15" width="0.1524" layer="1"/>
-<wire x1="53.5" y1="47.85" x2="53.35" y2="47.7" width="0.254" layer="16"/>
-<wire x1="53.5" y1="47.85" x2="53.45" y2="47.85" width="0.254" layer="16"/>
-</signal>
-<signal name="N$12">
-<via x="72.45" y="54.2" extent="1-16" drill="4.25"/>
+<via x="53.45" y="47.8" extent="1-16" drill="0.35"/>
+<wire x1="53.45" y1="47.8" x2="53.4" y2="47.85" width="0.1524" layer="16"/>
+<wire x1="53.45" y1="47.8" x2="53.45" y2="48.25" width="0.1524" layer="1"/>
+<wire x1="53.45" y1="48.25" x2="52.4" y2="49.3" width="0.1524" layer="1"/>
+<wire x1="52.4" y1="49.3" x2="52.4" y2="51.9" width="0.1524" layer="1"/>
+<wire x1="52.6" y1="52.1" x2="52.55" y2="52.7" width="0.1524" layer="1"/>
+<wire x1="52.4" y1="51.9" x2="52.6" y2="52.1" width="0.1524" layer="1"/>
+<wire x1="53.5" y1="47.8" x2="53.35" y2="47.65" width="0.254" layer="16"/>
+<wire x1="53.5" y1="47.8" x2="53.45" y2="47.8" width="0.254" layer="16"/>
 </signal>
 <signal name="STX-&gt;">
 <contactref element="STX-&gt;1" pad="TP"/>
 <contactref element="ST2" pad="29"/>
-<wire x1="55.15" y1="52.15" x2="55.1286" y2="52.1374125" width="0.1524" layer="1"/>
-<wire x1="55.1286" y1="52.1374125" x2="55.1286" y2="51.83166875" width="0.1524" layer="1"/>
-<wire x1="55.1286" y1="51.83166875" x2="54.498465625" y2="51.201534375" width="0.1524" layer="1"/>
-<wire x1="54.29693125" y1="51.1" x2="54.398465625" y2="51.201534375" width="0.1524" layer="1"/>
-<via x="54.398465625" y="51.201534375" extent="1-16" drill="0.3"/>
-<wire x1="54.1" y1="51.25" x2="54.148465625" y2="51.201534375" width="0.1524" layer="16"/>
-<wire x1="54.148465625" y1="51.201534375" x2="54.398465625" y2="51.201534375" width="0.1524" layer="16"/>
-<wire x1="54.498465625" y1="51.201534375" x2="54.398465625" y2="51.201534375" width="0.1524" layer="1"/>
+<wire x1="55.15" y1="52.1" x2="55.0286" y2="52.0286" width="0.1524" layer="1"/>
+<wire x1="55.0286" y1="52.0286" x2="55.0286" y2="51.73166875" width="0.1524" layer="1"/>
+<wire x1="55.0286" y1="51.73166875" x2="54.448465625" y2="51.151534375" width="0.1524" layer="1"/>
+<wire x1="54.448465625" y1="51.151534375" x2="54.398465625" y2="51.151534375" width="0.1524" layer="1"/>
+<wire x1="54.29693125" y1="51.05" x2="54.398465625" y2="51.151534375" width="0.1524" layer="1"/>
+<via x="54.398465625" y="51.151534375" extent="1-16" drill="0.3"/>
+<wire x1="54.1" y1="51.2" x2="54.148465625" y2="51.151534375" width="0.1524" layer="16"/>
+<wire x1="54.148465625" y1="51.151534375" x2="54.398465625" y2="51.151534375" width="0.1524" layer="16"/>
 </signal>
 <signal name="SRX&lt;-">
 <contactref element="SRX&lt;-1" pad="TP"/>
 <contactref element="ST2" pad="30"/>
-<wire x1="55.65" y1="52.15" x2="55.6714" y2="52.1786" width="0.1524" layer="1"/>
-<via x="58.9" y="49.2" extent="1-16" drill="0.3"/>
+<wire x1="55.65" y1="52.1" x2="55.6714" y2="52.1286" width="0.1524" layer="1"/>
+<via x="58.9" y="49.15" extent="1-16" drill="0.3"/>
 <wire x1="55.6714" y1="51.79754375" x2="55.9952" y2="51.47374375" width="0.1524" layer="1"/>
-<wire x1="55.9952" y1="51.47374375" x2="55.9952" y2="49.8315125" width="0.1524" layer="1"/>
-<wire x1="55.6714" y1="52.1786" x2="55.6714" y2="51.79754375" width="0.1524" layer="1"/>
-<wire x1="55.9952" y1="49.8315125" x2="56.6267125" y2="49.2" width="0.1524" layer="1"/>
-<wire x1="56.6267125" y1="49.2" x2="58.9" y2="49.2" width="0.1524" layer="1"/>
-<wire x1="58.9" y1="49.2" x2="59.5" y2="49.8" width="0.1524" layer="16"/>
-<wire x1="59.5" y1="49.8" x2="59.5" y2="49.85" width="0.1524" layer="16"/>
+<wire x1="55.9952" y1="51.47374375" x2="55.9952" y2="49.7815125" width="0.1524" layer="1"/>
+<wire x1="55.6714" y1="52.1286" x2="55.6714" y2="51.79754375" width="0.1524" layer="1"/>
+<wire x1="55.9952" y1="49.7815125" x2="56.6267125" y2="49.15" width="0.1524" layer="1"/>
+<wire x1="56.6267125" y1="49.15" x2="58.9" y2="49.15" width="0.1524" layer="1"/>
+<wire x1="58.9" y1="49.15" x2="59.5" y2="49.75" width="0.1524" layer="16"/>
+<wire x1="59.5" y1="49.75" x2="59.5" y2="49.8" width="0.1524" layer="16"/>
 </signal>
 <signal name="SWDIO">
 <contactref element="ST2" pad="23"/>
 <contactref element="SWDIO1" pad="TP"/>
-<wire x1="52.55" y1="53.25" x2="52.5786" y2="53.2286" width="0.1524" layer="1"/>
-<wire x1="52.5786" y1="53.2286" x2="52.33166875" y2="53.2286" width="0.1524" layer="1"/>
-<wire x1="52.33166875" y1="53.2286" x2="52.0214" y2="52.91833125" width="0.1524" layer="1"/>
-<wire x1="51.15" y1="47.9" x2="51.1" y2="47.95" width="0.1524" layer="16"/>
-<wire x1="52.0214" y1="52.91833125" x2="52.0214" y2="48.7714" width="0.1524" layer="1"/>
-<wire x1="52.0214" y1="48.7714" x2="51.15" y2="47.9" width="0.1524" layer="1"/>
-<via x="51.15" y="47.9" extent="1-16" drill="0.35"/>
-<wire x1="51.05" y1="47.9" x2="51.15" y2="47.9" width="0.1524" layer="16"/>
+<wire x1="52.55" y1="53.2" x2="52.5786" y2="53.1786" width="0.1524" layer="1"/>
+<wire x1="52.5786" y1="53.1786" x2="52.28166875" y2="53.1786" width="0.1524" layer="1"/>
+<wire x1="52.28166875" y1="53.1786" x2="52.0214" y2="52.91833125" width="0.1524" layer="1"/>
+<wire x1="51" y1="47.9" x2="51" y2="47.95" width="0.1524" layer="16"/>
+<wire x1="52.0214" y1="52.91833125" x2="52.0214" y2="48.9214" width="0.1524" layer="1"/>
+<wire x1="52.0214" y1="48.9214" x2="51" y2="47.9" width="0.1524" layer="1"/>
+<via x="51" y="47.9" extent="1-16" drill="0.35"/>
+<wire x1="51" y1="47.75" x2="51" y2="47.9" width="0.1524" layer="16"/>
 </signal>
 <signal name="SWO">
 <contactref element="ST2" pad="26"/>
 <contactref element="SWO1" pad="TP"/>
-<wire x1="53.6214" y1="52.1714" x2="53.6214" y2="51.98166875" width="0.1524" layer="1"/>
-<wire x1="53.6214" y1="51.98166875" x2="53.65" y2="51.95306875" width="0.1524" layer="1"/>
-<wire x1="53.65" y1="52.15" x2="53.6214" y2="52.1714" width="0.1524" layer="1"/>
-<wire x1="53.65" y1="52.15" x2="53.65" y2="49.8" width="0.1524" layer="1"/>
-<wire x1="53.65" y1="49.8" x2="54.65" y2="48.8" width="0.1524" layer="1"/>
-<via x="54.65" y="48.8" extent="1-16" drill="0.3"/>
-<wire x1="54.65" y1="48.8" x2="56" y2="48.8" width="0.1524" layer="16"/>
-<wire x1="56" y1="48.8" x2="56.1" y2="48.9" width="0.1524" layer="16"/>
+<wire x1="53.6214" y1="52.1214" x2="53.6214" y2="51.93166875" width="0.1524" layer="1"/>
+<wire x1="53.6214" y1="51.93166875" x2="53.65" y2="51.90306875" width="0.1524" layer="1"/>
+<wire x1="53.65" y1="52.1" x2="53.6214" y2="52.1214" width="0.1524" layer="1"/>
+<wire x1="53.65" y1="52.1" x2="53.65" y2="49.7" width="0.1524" layer="1"/>
+<wire x1="54.6" y1="48.75" x2="54.65" y2="48.75" width="0.1524" layer="1"/>
+<wire x1="54.6" y1="48.75" x2="53.65" y2="49.7" width="0.1524" layer="1"/>
+<via x="54.65" y="48.75" extent="1-16" drill="0.3"/>
+<wire x1="54.65" y1="48.75" x2="56" y2="48.75" width="0.1524" layer="16"/>
+<wire x1="56" y1="48.75" x2="56.1" y2="48.85" width="0.1524" layer="16"/>
 </signal>
-<signal name="N$8">
+<signal name="N$16">
 <contactref element="L2" pad="P$2"/>
 <contactref element="ST2" pad="8"/>
-<wire x1="57.25" y1="56.25" x2="57.95" y2="56.25" width="0.1524" layer="1"/>
-<wire x1="57.95" y1="56.25" x2="58.15" y2="56.45" width="0.1524" layer="1"/>
-<via x="58.15" y="56.45" extent="1-16" drill="0.3"/>
-<wire x1="58.15" y1="56.45" x2="59.8" y2="56.45" width="0.1524" layer="16"/>
-<wire x1="59.8" y1="56.45" x2="62.65" y2="53.6" width="0.1524" layer="16"/>
-<wire x1="62.65" y1="53.6" x2="63.8" y2="53.6" width="0.1524" layer="16"/>
-<wire x1="63.8" y1="53.6" x2="63.85" y2="53.65" width="0.1524" layer="16"/>
-<wire x1="63.85" y1="53.65" x2="63.85" y2="53.7" width="0.1524" layer="16"/>
-<wire x1="63.85" y1="53.7" x2="63.95" y2="53.8" width="0.1524" layer="16"/>
-<via x="63.95" y="53.8" extent="1-16" drill="0.3"/>
+<wire x1="57.25" y1="56.2" x2="57.95" y2="56.2" width="0.1524" layer="1"/>
+<wire x1="57.95" y1="56.2" x2="58.15" y2="56.4" width="0.1524" layer="1"/>
+<via x="58.15" y="56.4" extent="1-16" drill="0.3"/>
+<wire x1="58.15" y1="56.4" x2="59.8" y2="56.4" width="0.1524" layer="16"/>
+<wire x1="59.8" y1="56.4" x2="62.65" y2="53.55" width="0.1524" layer="16"/>
+<wire x1="62.65" y1="53.55" x2="63.8" y2="53.55" width="0.1524" layer="16"/>
+<wire x1="63.8" y1="53.55" x2="63.85" y2="53.6" width="0.1524" layer="16"/>
+<wire x1="63.85" y1="53.6" x2="63.85" y2="53.65" width="0.1524" layer="16"/>
+<wire x1="63.85" y1="53.65" x2="63.95" y2="53.75" width="0.1524" layer="16"/>
+<via x="63.95" y="53.75" extent="1-16" drill="0.3"/>
 </signal>
-<signal name="N$9">
+<signal name="N$17">
 <contactref element="L2" pad="P$1"/>
 <contactref element="ST2" pad="9"/>
-<wire x1="56.65" y1="57.25" x2="57.1" y2="57.7" width="0.1524" layer="1"/>
-<wire x1="57.1" y1="57.7" x2="57.6" y2="57.7" width="0.1524" layer="1"/>
-<via x="57.6" y="57.7" extent="1-16" drill="0.35"/>
-<wire x1="57.6" y1="57.7" x2="60.9" y2="57.7" width="0.1524" layer="16"/>
-<wire x1="60.9" y1="57.7" x2="63.95" y2="54.65" width="0.1524" layer="16"/>
-<via x="63.95" y="54.65" extent="1-16" drill="0.3"/>
-<wire x1="56.65" y1="56.85" x2="56.65" y2="57.25" width="0.1524" layer="1"/>
+<wire x1="56.65" y1="57.2" x2="57.1" y2="57.65" width="0.1524" layer="1"/>
+<wire x1="57.1" y1="57.65" x2="57.6" y2="57.65" width="0.1524" layer="1"/>
+<via x="57.6" y="57.65" extent="1-16" drill="0.35"/>
+<wire x1="57.6" y1="57.65" x2="60.9" y2="57.65" width="0.1524" layer="16"/>
+<wire x1="60.9" y1="57.65" x2="63.95" y2="54.6" width="0.1524" layer="16"/>
+<via x="63.95" y="54.6" extent="1-16" drill="0.3"/>
+<wire x1="56.65" y1="56.8" x2="56.65" y2="57.2" width="0.1524" layer="1"/>
 </signal>
-<signal name="N$10">
+<signal name="N$18">
 <contactref element="ST2" pad="7"/>
 <contactref element="L2" pad="P$3"/>
-<wire x1="57.25" y1="55.75" x2="58.45" y2="55.75" width="0.1524" layer="1"/>
-<wire x1="58.45" y1="55.75" x2="58.5" y2="55.7" width="0.1524" layer="1"/>
-<via x="58.5" y="55.7" extent="1-16" drill="0.3"/>
-<wire x1="58.5" y1="55.7" x2="61.3" y2="52.9" width="0.1524" layer="16"/>
-<wire x1="61.3" y1="52.9" x2="64.55" y2="52.9" width="0.1524" layer="16"/>
-<wire x1="64.55" y1="52.9" x2="64.8" y2="53.15" width="0.1524" layer="16"/>
-<wire x1="64.8" y1="53.15" x2="64.8" y2="53.8" width="0.1524" layer="16"/>
-<via x="64.8" y="53.8" extent="1-16" drill="0.3"/>
+<wire x1="57.25" y1="55.7" x2="58.45" y2="55.7" width="0.1524" layer="1"/>
+<wire x1="58.45" y1="55.7" x2="58.5" y2="55.65" width="0.1524" layer="1"/>
+<via x="58.5" y="55.65" extent="1-16" drill="0.3"/>
+<wire x1="58.5" y1="55.65" x2="61.3" y2="52.85" width="0.1524" layer="16"/>
+<wire x1="61.3" y1="52.85" x2="64.55" y2="52.85" width="0.1524" layer="16"/>
+<wire x1="64.55" y1="52.85" x2="64.8" y2="53.1" width="0.1524" layer="16"/>
+<wire x1="64.8" y1="53.1" x2="64.8" y2="53.75" width="0.1524" layer="16"/>
+<via x="64.8" y="53.75" extent="1-16" drill="0.3"/>
 </signal>
-<signal name="N$11">
+<signal name="N$19">
 <contactref element="ST2" pad="6"/>
-<wire x1="57.25" y1="55.25" x2="57.2214" y2="55.2286" width="0.1524" layer="1"/>
-<wire x1="57.2214" y1="55.2286" x2="58.11833125" y2="55.2286" width="0.1524" layer="1"/>
-<wire x1="58.42693125" y1="54.92" x2="58.9738" y2="54.92" width="0.1524" layer="1"/>
-<wire x1="58.11833125" y1="55.2286" x2="58.42693125" y2="54.92" width="0.1524" layer="1"/>
-<wire x1="59.6" y1="54.15" x2="59.62" y2="54.17" width="0.1524" layer="1"/>
-<wire x1="59.62" y1="54.17" x2="59.673" y2="54.17" width="0.1524" layer="1"/>
-<wire x1="59.673" y1="54.17" x2="59.7238" y2="54.17" width="0.1524" layer="1"/>
-<wire x1="58.9738" y1="54.92" x2="59.4469" y2="54.4469" width="0.1524" layer="1"/>
-<wire x1="59.6938" y1="54.2" x2="59.7238" y2="54.17" width="0.1524" layer="1"/>
-<wire x1="59.4469" y1="54.4469" x2="59.673" y2="54.2208" width="0.254" layer="1"/>
-<wire x1="59.673" y1="54.2208" x2="59.673" y2="54.17" width="0.254" layer="1"/>
-<wire x1="60.3131" y1="54.4469" x2="59.4469" y2="54.4469" width="0.1524" layer="1"/>
+<wire x1="57.25" y1="55.2" x2="57.2214" y2="55.1786" width="0.1524" layer="1"/>
+<wire x1="57.2214" y1="55.1786" x2="58.11833125" y2="55.1786" width="0.1524" layer="1"/>
+<wire x1="58.42693125" y1="54.87" x2="58.9738" y2="54.87" width="0.1524" layer="1"/>
+<wire x1="58.11833125" y1="55.1786" x2="58.42693125" y2="54.87" width="0.1524" layer="1"/>
+<wire x1="59.6" y1="54.1" x2="59.62" y2="54.12" width="0.1524" layer="1"/>
+<wire x1="59.62" y1="54.12" x2="59.673" y2="54.12" width="0.1524" layer="1"/>
+<wire x1="59.673" y1="54.12" x2="59.7238" y2="54.12" width="0.1524" layer="1"/>
+<wire x1="58.9738" y1="54.87" x2="59.4469" y2="54.3969" width="0.1524" layer="1"/>
+<wire x1="59.6938" y1="54.15" x2="59.7238" y2="54.12" width="0.1524" layer="1"/>
+<wire x1="59.4469" y1="54.3969" x2="59.673" y2="54.1708" width="0.254" layer="1"/>
+<wire x1="59.673" y1="54.1708" x2="59.673" y2="54.12" width="0.254" layer="1"/>
+<wire x1="60.3131" y1="54.3969" x2="59.4469" y2="54.3969" width="0.1524" layer="1"/>
 <contactref element="U$2" pad="P$1"/>
-<wire x1="60.3" y1="54.2" x2="59.6938" y2="54.2" width="0.1524" layer="1"/>
-<wire x1="59.6938" y1="54.2" x2="59.673" y2="54.2208" width="0.1524" layer="1"/>
+<wire x1="60.3" y1="54.15" x2="59.6938" y2="54.15" width="0.1524" layer="1"/>
+<wire x1="59.6938" y1="54.15" x2="59.673" y2="54.1708" width="0.1524" layer="1"/>
+</signal>
+<signal name="SCLK">
+<contactref element="N2" pad="P7"/>
+<contactref element="ST2" pad="11"/>
+<wire x1="68.30165625" y1="60.2234" x2="58.81563125" y2="60.2234" width="0.1524" layer="1"/>
+<wire x1="68.92865625" y1="59.6964" x2="68.886215625" y2="59.738840625" width="0.1524" layer="1"/>
+<wire x1="68.871096875" y1="59.738840625" x2="68.886215625" y2="59.738840625" width="0.1524" layer="1"/>
+<wire x1="68.871096875" y1="59.653959375" x2="68.30165625" y2="60.2234" width="0.1524" layer="1"/>
+<wire x1="58.81563125" y1="60.2234" x2="55.65" y2="57.05776875" width="0.1524" layer="1"/>
+<wire x1="55.65" y1="57.05776875" x2="55.65" y2="56.8" width="0.1524" layer="1"/>
+<wire x1="71.1" y1="59.49" x2="71.09" y2="59.5" width="0.1524" layer="1"/>
+<wire x1="71.09" y1="59.5" x2="70.4" y2="59.5" width="0.1524" layer="1"/>
+<wire x1="70.4" y1="59.5" x2="70.4" y2="60.6" width="0.1524" layer="1"/>
+<via x="70.4" y="60.6" extent="1-16" drill="0.35"/>
+<wire x1="70.4" y1="60.6" x2="70.4" y2="59.9" width="0.1524" layer="16"/>
+<wire x1="70.4" y1="59.9" x2="70.238840625" y2="59.738840625" width="0.1524" layer="16"/>
+<wire x1="70.238840625" y1="59.738840625" x2="68.871096875" y2="59.738840625" width="0.1524" layer="16"/>
+<via x="68.871096875" y="59.738840625" extent="1-16" drill="0.35"/>
+<wire x1="68.871096875" y1="59.738840625" x2="68.871096875" y2="59.653959375" width="0.1524" layer="1"/>
+</signal>
+<signal name="MOSI">
+<contactref element="N2" pad="P8"/>
+<contactref element="ST2" pad="13"/>
+<wire x1="71.1" y1="58.99" x2="71.0972" y2="58.9872" width="0.1524" layer="1"/>
+<wire x1="71.0972" y1="58.9872" x2="70.37635" y2="58.9872" width="0.1524" layer="1"/>
+<wire x1="70.37635" y1="58.9872" x2="69.9" y2="59.46355" width="0.1524" layer="1"/>
+<wire x1="69.9" y1="59.46355" x2="69.9" y2="60.3" width="0.1524" layer="1"/>
+<wire x1="69.9" y1="60.3" x2="69.4" y2="60.8" width="0.1524" layer="1"/>
+<wire x1="69.4" y1="60.8" x2="58.25145" y2="60.8" width="0.1524" layer="1"/>
+<wire x1="58.25145" y1="60.8" x2="54.65" y2="57.19855" width="0.1524" layer="1"/>
+<wire x1="54.65" y1="57.19855" x2="54.65" y2="56.8" width="0.1524" layer="1"/>
+</signal>
+<signal name="MISO">
+<contactref element="N2" pad="P9"/>
+<contactref element="ST2" pad="12"/>
+<wire x1="71.1" y1="58.49" x2="70.3321625" y2="58.49" width="0.1524" layer="1"/>
+<wire x1="70.3321625" y1="58.49" x2="69.49930625" y2="59.32285625" width="0.1524" layer="1"/>
+<wire x1="69.49930625" y1="59.32285625" x2="69.49930625" y2="60.1576375" width="0.1524" layer="1"/>
+<wire x1="69.49930625" y1="60.1576375" x2="69.17954375" y2="60.4774" width="0.1524" layer="1"/>
+<wire x1="69.17954375" y1="60.4774" x2="58.3774" y2="60.4774" width="0.1524" layer="1"/>
+<wire x1="55.15" y1="57.25" x2="55.15" y2="56.8" width="0.1524" layer="1"/>
+<wire x1="58.3774" y1="60.4774" x2="55.15" y2="57.25" width="0.1524" layer="1"/>
+</signal>
+<signal name="N$23">
+<contactref element="SJ2" pad="1"/>
+<contactref element="N2" pad="P1"/>
+<wire x1="73.912" y1="49.95" x2="73.912" y2="51.213225" width="0.4064" layer="1"/>
+<wire x1="73.912" y1="51.213225" x2="73.9243875" y2="51.2256125" width="0.4064" layer="1"/>
+<via x="73.9243875" y="51.2256125" extent="1-16" drill="0.35"/>
+<wire x1="71.24364375" y1="51.2376" x2="69.5376" y2="52.94364375" width="0.254" layer="16"/>
+<wire x1="69.5376" y1="52.94364375" x2="69.5376" y2="55.15635625" width="0.254" layer="16"/>
+<wire x1="69.5376" y1="55.15635625" x2="70.190621875" y2="55.809378125" width="0.254" layer="16"/>
+<wire x1="73.9243875" y1="51.2256125" x2="73.9124" y2="51.2376" width="0.254" layer="16"/>
+<wire x1="73.9124" y1="51.2376" x2="71.24364375" y2="51.2376" width="0.254" layer="16"/>
+<wire x1="74.1" y1="57.99" x2="74.1" y2="57.69" width="0.3048" layer="1"/>
+<wire x1="74.1" y1="57.69" x2="73.91" y2="57.5" width="0.3048" layer="1"/>
+<wire x1="70.8" y1="57.5" x2="70.3" y2="57" width="0.3048" layer="1"/>
+<via x="70.3" y="57" extent="1-16" drill="0.35"/>
+<wire x1="70.3" y1="57" x2="70.3" y2="55.91875625" width="0.3048" layer="16"/>
+<wire x1="70.3" y1="55.91875625" x2="70.190621875" y2="55.809378125" width="0.3048" layer="16"/>
+<wire x1="73.91" y1="57.5" x2="70.8" y2="57.5" width="0.3048" layer="1"/>
+</signal>
+<signal name="AMS_CS">
+<contactref element="N2" pad="P6"/>
+<contactref element="ST2" pad="14"/>
+<wire x1="54.15" y1="57.6" x2="54.15" y2="56.8" width="0.1524" layer="1"/>
+<wire x1="54.15" y1="57.6" x2="54.8614" y2="58.3114" width="0.1524" layer="1"/>
+<wire x1="54.8614" y1="58.3114" x2="54.8614" y2="60.6114" width="0.1524" layer="1"/>
+<wire x1="54.8614" y1="60.6114" x2="55.45" y2="61.2" width="0.1524" layer="1"/>
+<wire x1="55.45" y1="61.2" x2="70.7" y2="61.2" width="0.1524" layer="1"/>
+<wire x1="70.7" y1="61.2" x2="71.1" y2="60.8" width="0.1524" layer="1"/>
+<wire x1="71.1" y1="60.8" x2="71.1" y2="59.99" width="0.1524" layer="1"/>
+</signal>
+<signal name="N$25">
+<contactref element="N2" pad="P4"/>
+<contactref element="COIL2" pad="P$1"/>
+<wire x1="74.1" y1="59.49" x2="74.81" y2="59.49" width="0.1524" layer="1"/>
+<wire x1="74.81" y1="59.49" x2="74.9" y2="59.4" width="0.1524" layer="1"/>
+<via x="74.9" y="59.4" extent="1-16" drill="0.35"/>
+<wire x1="74.9" y1="59.4" x2="74.9" y2="59.6" width="0.1524" layer="16"/>
+<wire x1="74.9" y1="59.6" x2="74.72" y2="59.78" width="0.1524" layer="16"/>
+<wire x1="74.72" y1="59.78" x2="74.5" y2="59.78" width="0.1524" layer="16"/>
+</signal>
+<signal name="N$26">
+<contactref element="N2" pad="P3"/>
+<contactref element="COIL2" pad="P$2"/>
+<via x="75.39421875" y="57.8" extent="1-16" drill="0.35"/>
+<wire x1="74.516975" y1="58.9928" x2="74.1028" y2="58.9928" width="0.1524" layer="1"/>
+<wire x1="74.1" y1="58.99" x2="74.1028" y2="58.9928" width="0.1524" layer="1"/>
+<wire x1="74.516975" y1="58.9928" x2="75.39421875" y2="58.11555625" width="0.1524" layer="1"/>
+<wire x1="75.39421875" y1="58.11555625" x2="75.39421875" y2="57.8" width="0.1524" layer="1"/>
+<wire x1="75.39421875" y1="57.8" x2="75.39421875" y2="57.6" width="0.1524" layer="16"/>
+<wire x1="75.39421875" y1="57.6" x2="74.87421875" y2="57.08" width="0.1524" layer="16"/>
+<wire x1="74.87421875" y1="57.08" x2="74.5" y2="57.08" width="0.1524" layer="16"/>
+</signal>
+<signal name="AMS_IRQ">
+<contactref element="ST2" pad="3"/>
+<wire x1="69.1" y1="51.85" x2="69.1" y2="56.55" width="0.1524" layer="1"/>
+<wire x1="69.1" y1="51.85" x2="69.25" y2="51.7" width="0.1524" layer="1"/>
+<via x="69.25" y="51.7" extent="1-16" drill="0.35"/>
+<wire x1="67.1192875" y1="51.4706" x2="66.6807125" y2="51.4706" width="0.1524" layer="16"/>
+<wire x1="69.25" y1="51.7" x2="67.3486875" y2="51.7" width="0.1524" layer="16"/>
+<wire x1="61.4513125" y1="51.85" x2="60.95" y2="51.85" width="0.1524" layer="16"/>
+<wire x1="67.3486875" y1="51.7" x2="67.1192875" y2="51.4706" width="0.1524" layer="16"/>
+<wire x1="61.7807125" y1="52.1794" x2="61.4513125" y2="51.85" width="0.1524" layer="16"/>
+<wire x1="66.6807125" y1="51.4706" x2="65.9719125" y2="52.1794" width="0.1524" layer="16"/>
+<wire x1="65.9719125" y1="52.1794" x2="61.7807125" y2="52.1794" width="0.1524" layer="16"/>
+<wire x1="59.15" y1="53.65" x2="58.121" y2="53.65" width="0.1524" layer="16"/>
+<via x="58.121" y="53.65" extent="1-16" drill="0.35"/>
+<wire x1="60.95" y1="51.85" x2="59.15" y2="53.65" width="0.1524" layer="16"/>
+<wire x1="58.121" y1="53.65" x2="58.071" y2="53.7" width="0.1524" layer="1"/>
+<wire x1="58.071" y1="53.7" x2="57.25" y2="53.7" width="0.1524" layer="1"/>
+<contactref element="N2" pad="P10"/>
+<wire x1="69.1" y1="56.55" x2="70.54" y2="57.99" width="0.1524" layer="1"/>
+<wire x1="70.54" y1="57.99" x2="71.1" y2="57.99" width="0.1524" layer="1"/>
 </signal>
 </signals>
 <mfgpreviewcolors>
diff --git a/solo/USB-A.sch b/solo/USB-A.sch
index 40d4f87..42bbebb 100644
--- a/solo/USB-A.sch
+++ b/solo/USB-A.sch
@@ -129,7 +129,7 @@
 <text x="-3.15" y="1.05" size="1.27" layer="25">&gt;NAME</text>
 <text x="-3.35" y="-2.45" size="1.27" layer="27">&gt;VALUE</text>
 </package>
-<package name="CL-505S-X-SD-T" urn="urn:adsk.eagle:footprint:4878738/4" library_version="51">
+<package name="CL-505S-X-SD-T" urn="urn:adsk.eagle:footprint:4878738/4" library_version="57">
 <description>CL-505S-X-SD-T</description>
 <smd name="P$2" x="0.85" y="0.85" dx="0.4" dy="0.4" layer="1"/>
 <smd name="P$1" x="0.85" y="0" dx="0.4" dy="0.4" layer="1"/>
@@ -138,7 +138,7 @@
 <text x="-0.4" y="1.4" size="0.4" layer="21">&gt;NAME</text>
 <circle x="1.2" y="1.2" radius="0.1" width="0.127" layer="21"/>
 </package>
-<package name="QFN32" urn="urn:adsk.eagle:footprint:6434393/1" locally_modified="yes" library_version="51" library_locally_modified="yes">
+<package name="QFN32" urn="urn:adsk.eagle:footprint:6434393/2" library_version="57">
 <description>&lt;b&gt;QFN 32&lt;/b&gt; 5 x 5 mm&lt;p&gt;
 Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <wire x1="-2.45" y1="2.45" x2="2.45" y2="2.45" width="0.1016" layer="51"/>
@@ -616,7 +616,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-1.675" y="2.575"/>
 </polygon>
 </package>
-<package name="REG_NCP114AMX330TCG" urn="urn:adsk.eagle:footprint:5621085/1" locally_modified="yes" library_version="51" library_locally_modified="yes">
+<package name="REG_NCP114AMX330TCG" urn="urn:adsk.eagle:footprint:5621085/2" library_version="57">
 <polygon width="0.001" layer="1">
 <vertex x="-0.475" y="0.65"/>
 <vertex x="-0.475" y="0.22"/>
@@ -877,7 +877,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <text x="-2.54" y="5.08" size="1.27" layer="25" font="vector">&gt;NAME</text>
 <text x="-2.54" y="-6.35" size="1.27" layer="27" font="vector">&gt;VALUE</text>
 </package>
-<package name="DOME-BL-12MM" urn="urn:adsk.eagle:footprint:5648518/3" library_version="51">
+<package name="DOME-BL-12MM" urn="urn:adsk.eagle:footprint:5648518/3" library_version="57">
 <circle x="0" y="0" radius="1.4" width="0.1" layer="1"/>
 <circle x="0" y="0" radius="1.39895" width="0.1" layer="1"/>
 <circle x="0" y="0" radius="1.3038375" width="0.1524" layer="29"/>
@@ -1228,6 +1228,36 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <smd name="P$1" x="-4.1" y="0" dx="1.27" dy="0.635" layer="1" stop="no" cream="no"/>
 <smd name="P$2" x="0.2" y="4.5" dx="1.27" dy="0.635" layer="1" stop="no" cream="no"/>
 </package>
+<package name="MLPD3X3" urn="urn:adsk.eagle:footprint:5825737/3" library_version="58" library_locally_modified="yes">
+<smd name="P5" x="0" y="-2.54" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P4" x="0" y="-2.04" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P3" x="0" y="-1.54" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P2" x="0" y="-1.04" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P1" x="0" y="-0.54" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P10" x="3" y="-0.54" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P9" x="3" y="-1.04" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P8" x="3" y="-1.54" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P7" x="3" y="-2.04" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P6" x="3" y="-2.54" dx="0.6" dy="0.35" layer="1" rot="R180"/>
+<smd name="P$11" x="1.5" y="-1.54" dx="1.65" dy="2.38" layer="1" rot="R180"/>
+<text x="-0.5" y="-3.04" size="0.6096" layer="25" rot="R90">&gt;NAME</text>
+<text x="4" y="-3.04" size="0.6096" layer="27" rot="R90">&gt;VALUE</text>
+</package>
+<package name="MOLEX_NFC_COIL1" urn="urn:adsk.eagle:footprint:7114965/3" library_version="57">
+<description>Molex NFC coil, PN: 1462360101</description>
+<wire x1="15.24" y1="0" x2="0.24" y2="0" width="0.1524" layer="21"/>
+<wire x1="0.24" y1="0" x2="0.24" y2="25" width="0.1524" layer="21"/>
+<wire x1="0.24" y1="25" x2="8.74" y2="25" width="0.1524" layer="21"/>
+<wire x1="8.74" y1="25" x2="15.24" y2="25" width="0.1524" layer="21"/>
+<wire x1="15.24" y1="25" x2="15.24" y2="0" width="0.1524" layer="21"/>
+<wire x1="15.24" y1="25" x2="15.24" y2="30" width="0.1524" layer="21"/>
+<wire x1="15.24" y1="30" x2="8.74" y2="30" width="0.1524" layer="21"/>
+<wire x1="8.74" y1="30" x2="8.74" y2="25" width="0.1524" layer="21"/>
+<text x="10.43" y="23.5" size="0.8128" layer="26">&gt;NAME</text>
+<text x="10.43" y="22" size="0.8128" layer="28">&gt;VALUE</text>
+<smd name="P$1" x="13.43" y="28.5" dx="2.2" dy="3.1" layer="1" rot="R180"/>
+<smd name="P$2" x="10.73" y="28.5" dx="2.2" dy="3.1" layer="1" rot="R180"/>
+</package>
 </packages>
 <packages3d>
 <package3d name="USB_TRACES" urn="urn:adsk.eagle:package:4245369/9" type="box" library_version="40">
@@ -1258,22 +1288,20 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <packageinstance name="EAST1616RGBA3-RGB-LED"/>
 </packageinstances>
 </package3d>
-<package3d name="CL-505S-X-SD-T" urn="urn:adsk.eagle:package:4878740/6" type="box" library_version="51">
+<package3d name="CL-505S-X-SD-T" urn="urn:adsk.eagle:package:4878740/6" type="box" library_version="57">
 <description>CL-505S-X-SD-T</description>
 <packageinstances>
 <packageinstance name="CL-505S-X-SD-T"/>
 </packageinstances>
 </package3d>
-<package3d name="QFN50P500X500X50-32" urn="urn:adsk.eagle:package:4245373/5" locally_modified="yes" type="model" library_version="51" library_locally_modified="yes">
+<package3d name="QFN50P500X500X50-32" urn="urn:adsk.eagle:package:4245373/6" type="model" library_version="57">
 <description>&lt;b&gt;QFN 32&lt;/b&gt; 5 x 5 mm&lt;p&gt;
 Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <packageinstances>
 <packageinstance name="QFN32"/>
 </packageinstances>
 </package3d>
-<package3d name="DFN100X100X60-4" urn="urn:adsk.eagle:package:5621121/2" locally_modified="yes" type="model" library_version="51" library_locally_modified="yes">
-<description>DFN4, 1.00 X 1.00 X 0.60 mm body
-&lt;p&gt;DFN4 package with body size 1.00 X 1.00 X 0.60 mm&lt;/p&gt;</description>
+<package3d name="DFN100X100X60-4" urn="urn:adsk.eagle:package:5621121/3" type="model" library_version="57">
 <packageinstances>
 <packageinstance name="REG_NCP114AMX330TCG"/>
 </packageinstances>
@@ -1289,11 +1317,22 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <packageinstance name="DOME-BL10280"/>
 </packageinstances>
 </package3d>
-<package3d name="DOME-BL-12MM" urn="urn:adsk.eagle:package:5648519/5" type="model" library_version="51">
+<package3d name="DOME-BL-12MM" urn="urn:adsk.eagle:package:5648519/5" type="model" library_version="57">
 <packageinstances>
 <packageinstance name="DOME-BL-12MM"/>
 </packageinstances>
 </package3d>
+<package3d name="MLPD3X3" urn="urn:adsk.eagle:package:5825738/3" type="box" library_version="58" library_locally_modified="yes">
+<packageinstances>
+<packageinstance name="MLPD3X3"/>
+</packageinstances>
+</package3d>
+<package3d name="MOLEX_NFC_COIL1" urn="urn:adsk.eagle:package:7114966/5" type="model" library_version="57">
+<description>Molex NFC coil, PN: 1462360101</description>
+<packageinstances>
+<packageinstance name="MOLEX_NFC_COIL1"/>
+</packageinstances>
+</package3d>
 </packages3d>
 <symbols>
 <symbol name="USB4" urn="urn:adsk.eagle:symbol:4245360/2" library_version="36">
@@ -1529,6 +1568,38 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <pin name="1" x="-5.08" y="0" visible="pad" length="short" direction="pas"/>
 <pin name="2" x="5.08" y="0" visible="pad" length="short" direction="pas" rot="R180"/>
 </symbol>
+<symbol name="AS3956" urn="urn:adsk.eagle:symbol:5825726/2" library_version="53">
+<wire x1="-10.16" y1="12.7" x2="10.16" y2="12.7" width="0.254" layer="94"/>
+<wire x1="10.16" y1="12.7" x2="10.16" y2="-12.7" width="0.254" layer="94"/>
+<wire x1="10.16" y1="-12.7" x2="-10.16" y2="-12.7" width="0.254" layer="94"/>
+<wire x1="-10.16" y1="-12.7" x2="-10.16" y2="12.7" width="0.254" layer="94"/>
+<pin name="VP_IO" x="-15.24" y="10.16" length="middle"/>
+<pin name="VP_REG" x="-15.24" y="5.08" length="middle"/>
+<pin name="LC1" x="-15.24" y="0" length="middle"/>
+<pin name="LC2" x="-15.24" y="-5.08" length="middle"/>
+<pin name="VSS" x="-15.24" y="-10.16" length="middle"/>
+<pin name="SS" x="15.24" y="-10.16" length="middle" rot="R180"/>
+<pin name="SCLK" x="15.24" y="-5.08" length="middle" rot="R180"/>
+<pin name="MOSI" x="15.24" y="0" length="middle" rot="R180"/>
+<pin name="MISO" x="15.24" y="5.08" length="middle" rot="R180"/>
+<pin name="IRQ" x="15.24" y="10.16" length="middle" rot="R180"/>
+<text x="-5.08" y="15.24" size="1.778" layer="95">&gt;NAME</text>
+<text x="-5.08" y="-17.78" size="1.778" layer="96">&gt;VALUE</text>
+</symbol>
+<symbol name="MOLEX_NFC_COIL" urn="urn:adsk.eagle:symbol:7114964/1" library_version="56" library_locally_modified="yes">
+<wire x1="0" y1="5.08" x2="1.27" y2="3.81" width="0.254" layer="94" curve="-90" cap="flat"/>
+<wire x1="0" y1="2.54" x2="1.27" y2="3.81" width="0.254" layer="94" curve="90" cap="flat"/>
+<wire x1="0" y1="2.54" x2="1.27" y2="1.27" width="0.254" layer="94" curve="-90" cap="flat"/>
+<wire x1="0" y1="0" x2="1.27" y2="1.27" width="0.254" layer="94" curve="90" cap="flat"/>
+<wire x1="0" y1="0" x2="1.27" y2="-1.27" width="0.254" layer="94" curve="-90" cap="flat"/>
+<wire x1="0" y1="-2.54" x2="1.27" y2="-1.27" width="0.254" layer="94" curve="90" cap="flat"/>
+<wire x1="0" y1="-2.54" x2="1.27" y2="-3.81" width="0.254" layer="94" curve="-90" cap="flat"/>
+<wire x1="0" y1="-5.08" x2="1.27" y2="-3.81" width="0.254" layer="94" curve="90" cap="flat"/>
+<text x="2.54" y="6.35" size="1.778" layer="95">&gt;NAME</text>
+<text x="2.54" y="-6.35" size="1.778" layer="96">&gt;VALUE</text>
+<pin name="1" x="0" y="7.62" visible="off" length="short" direction="pas" swaplevel="1" rot="R270"/>
+<pin name="2" x="0" y="-7.62" visible="off" length="short" direction="pas" swaplevel="1" rot="R90"/>
+</symbol>
 </symbols>
 <devicesets>
 <deviceset name="USB_TRACES" urn="urn:adsk.eagle:component:4245374/10" prefix="U" library_version="40">
@@ -1607,7 +1678,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="EAST1616RGBA3-LED-RGB" urn="urn:adsk.eagle:component:4245376/9" prefix="L" library_version="51">
+<deviceset name="EAST1616RGBA3-LED-RGB" urn="urn:adsk.eagle:component:4245376/9" prefix="L" library_version="57">
 <description>EAST1616RGBA3</description>
 <gates>
 <gate name="G$1" symbol="LED-RGB" x="0" y="-2.54"/>
@@ -1645,7 +1716,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="STM32L432KCU6" urn="urn:adsk.eagle:component:5621128/3" locally_modified="yes" prefix="ST" library_version="51" library_locally_modified="yes">
+<deviceset name="STM32L432KCU6" urn="urn:adsk.eagle:component:5621128/4" prefix="ST" library_version="57">
 <gates>
 <gate name="G$1" symbol="STM32L432KCU6" x="0" y="0"/>
 </gates>
@@ -1687,7 +1758,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <connect gate="G$1" pin="VSS3" pad="EXP"/>
 </connects>
 <package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:4245373/5"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:4245373/6"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -1695,7 +1766,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="NCP114AMX330TCG" urn="urn:adsk.eagle:component:5621125/2" locally_modified="yes" prefix="L" library_version="51" library_locally_modified="yes">
+<deviceset name="NCP114AMX330TCG" urn="urn:adsk.eagle:component:5621125/3" prefix="L" library_version="57">
 <description>CMOS Low Dropout Regulator, 300 mA 3.3V, Active Discharge</description>
 <gates>
 <gate name="G$1" symbol="NCP114AMX330TCG" x="0" y="0"/>
@@ -1710,7 +1781,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <connect gate="G$1" pin="OUT" pad="1"/>
 </connects>
 <package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:5621121/2"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:5621121/3"/>
 </package3dinstances>
 <technologies>
 <technology name="">
@@ -1747,7 +1818,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="DOME_BUTTON" urn="urn:adsk.eagle:component:4878737/11" library_version="51">
+<deviceset name="DOME_BUTTON" urn="urn:adsk.eagle:component:4878737/11" library_version="57">
 <gates>
 <gate name="G$1" symbol="SWITCH-NO" x="0" y="0"/>
 </gates>
@@ -1778,6 +1849,55 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 </device>
 </devices>
 </deviceset>
+<deviceset name="AMS3956" urn="urn:adsk.eagle:component:5825739/4" locally_modified="yes" prefix="N" library_version="58" library_locally_modified="yes">
+<gates>
+<gate name="G$1" symbol="AS3956" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="MLPD3X3">
+<connects>
+<connect gate="G$1" pin="IRQ" pad="P10"/>
+<connect gate="G$1" pin="LC1" pad="P3"/>
+<connect gate="G$1" pin="LC2" pad="P4"/>
+<connect gate="G$1" pin="MISO" pad="P9"/>
+<connect gate="G$1" pin="MOSI" pad="P8"/>
+<connect gate="G$1" pin="SCLK" pad="P7"/>
+<connect gate="G$1" pin="SS" pad="P6"/>
+<connect gate="G$1" pin="VP_IO" pad="P1"/>
+<connect gate="G$1" pin="VP_REG" pad="P2"/>
+<connect gate="G$1" pin="VSS" pad="P$11 P5"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:5825738/3"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+<deviceset name="MOLEX_NFC_COIL_1462360101" urn="urn:adsk.eagle:component:7114967/4" prefix="COIL" library_version="57">
+<gates>
+<gate name="G$1" symbol="MOLEX_NFC_COIL" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="MOLEX_NFC_COIL1">
+<connects>
+<connect gate="G$1" pin="1" pad="P$1"/>
+<connect gate="G$1" pin="2" pad="P$2"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:7114966/5"/>
+</package3dinstances>
+<technologies>
+<technology name="">
+<attribute name="LINK" value="https://www.mouser.com/ProductDetail/538-146236-0101" constant="no"/>
+<attribute name="MPN" value="1462360101" constant="no"/>
+</technology>
+</technologies>
+</device>
+</devices>
+</deviceset>
 </devicesets>
 </library>
 <library name="supply1" urn="urn:adsk.eagle:library:371">
@@ -1868,6 +1988,129 @@ In this library the device names are the same as the pin names of the symbols, t
 </deviceset>
 </devicesets>
 </library>
+<library name="jumper" urn="urn:adsk.eagle:library:252">
+<description>&lt;b&gt;Jumpers&lt;/b&gt;&lt;p&gt;
+&lt;author&gt;Created by librarian@cadsoft.de&lt;/author&gt;</description>
+<packages>
+<package name="SJ" urn="urn:adsk.eagle:footprint:15432/1" library_version="1">
+<description>&lt;b&gt;Solder jumper&lt;/b&gt;</description>
+<wire x1="1.397" y1="-1.016" x2="-1.397" y2="-1.016" width="0.1524" layer="21"/>
+<wire x1="1.397" y1="1.016" x2="1.651" y2="0.762" width="0.1524" layer="21" curve="-90"/>
+<wire x1="-1.651" y1="0.762" x2="-1.397" y2="1.016" width="0.1524" layer="21" curve="-90"/>
+<wire x1="-1.651" y1="-0.762" x2="-1.397" y2="-1.016" width="0.1524" layer="21" curve="90"/>
+<wire x1="1.397" y1="-1.016" x2="1.651" y2="-0.762" width="0.1524" layer="21" curve="90"/>
+<wire x1="1.651" y1="-0.762" x2="1.651" y2="0.762" width="0.1524" layer="21"/>
+<wire x1="-1.651" y1="-0.762" x2="-1.651" y2="0.762" width="0.1524" layer="21"/>
+<wire x1="-1.397" y1="1.016" x2="1.397" y2="1.016" width="0.1524" layer="21"/>
+<wire x1="1.016" y1="0" x2="1.524" y2="0" width="0.1524" layer="51"/>
+<wire x1="-1.016" y1="0" x2="-1.524" y2="0" width="0.1524" layer="51"/>
+<wire x1="-0.254" y1="-0.127" x2="-0.254" y2="0.127" width="1.27" layer="51" curve="-180" cap="flat"/>
+<wire x1="0.254" y1="0.127" x2="0.254" y2="-0.127" width="1.27" layer="51" curve="-180" cap="flat"/>
+<smd name="1" x="-0.762" y="0" dx="1.1684" dy="1.6002" layer="1"/>
+<smd name="2" x="0.762" y="0" dx="1.1684" dy="1.6002" layer="1"/>
+<text x="-1.651" y="1.143" size="1.27" layer="25" ratio="10">&gt;NAME</text>
+<text x="0.4001" y="0" size="0.02" layer="27">&gt;VALUE</text>
+<rectangle x1="-0.0762" y1="-0.9144" x2="0.0762" y2="0.9144" layer="29"/>
+</package>
+<package name="SJW" urn="urn:adsk.eagle:footprint:15433/1" library_version="1">
+<description>&lt;b&gt;Solder jumper&lt;/b&gt;</description>
+<wire x1="1.905" y1="-1.524" x2="-1.905" y2="-1.524" width="0.1524" layer="21"/>
+<wire x1="1.905" y1="1.524" x2="2.159" y2="1.27" width="0.1524" layer="21" curve="-90"/>
+<wire x1="-2.159" y1="1.27" x2="-1.905" y2="1.524" width="0.1524" layer="21" curve="-90"/>
+<wire x1="-2.159" y1="-1.27" x2="-1.905" y2="-1.524" width="0.1524" layer="21" curve="90"/>
+<wire x1="1.905" y1="-1.524" x2="2.159" y2="-1.27" width="0.1524" layer="21" curve="90"/>
+<wire x1="2.159" y1="-1.27" x2="2.159" y2="1.27" width="0.1524" layer="21"/>
+<wire x1="-2.159" y1="-1.27" x2="-2.159" y2="1.27" width="0.1524" layer="21"/>
+<wire x1="-1.905" y1="1.524" x2="1.905" y2="1.524" width="0.1524" layer="21"/>
+<wire x1="0.762" y1="0.762" x2="0.762" y2="-0.762" width="0.1524" layer="51"/>
+<wire x1="-0.762" y1="0.762" x2="-0.762" y2="-0.762" width="0.1524" layer="51"/>
+<wire x1="1.524" y1="0" x2="2.032" y2="0" width="0.1524" layer="51"/>
+<wire x1="-1.524" y1="0" x2="-2.032" y2="0" width="0.1524" layer="51"/>
+<wire x1="0.762" y1="0.762" x2="0.762" y2="-0.762" width="0.1524" layer="51" curve="-180"/>
+<wire x1="-0.762" y1="0.762" x2="-0.762" y2="-0.762" width="0.1524" layer="51" curve="180"/>
+<smd name="1" x="-1.27" y="0" dx="1.27" dy="2.54" layer="1"/>
+<smd name="2" x="1.27" y="0" dx="1.27" dy="2.54" layer="1"/>
+<text x="-2.159" y="1.778" size="1.27" layer="25" ratio="10">&gt;NAME</text>
+<text x="1" y="0" size="0.02" layer="27">&gt;VALUE</text>
+<rectangle x1="0.762" y1="-0.762" x2="1.016" y2="0.762" layer="51"/>
+<rectangle x1="1.016" y1="-0.635" x2="1.27" y2="0.635" layer="51"/>
+<rectangle x1="1.27" y1="-0.508" x2="1.397" y2="0.508" layer="51"/>
+<rectangle x1="1.397" y1="-0.254" x2="1.524" y2="0.254" layer="51"/>
+<rectangle x1="-1.016" y1="-0.762" x2="-0.762" y2="0.762" layer="51"/>
+<rectangle x1="-1.27" y1="-0.635" x2="-1.016" y2="0.635" layer="51"/>
+<rectangle x1="-1.397" y1="-0.508" x2="-1.27" y2="0.508" layer="51"/>
+<rectangle x1="-1.524" y1="-0.254" x2="-1.397" y2="0.254" layer="51"/>
+<rectangle x1="0.9652" y1="-0.7112" x2="1.0922" y2="-0.5842" layer="51"/>
+<rectangle x1="1.3462" y1="-0.3556" x2="1.4732" y2="-0.2286" layer="51"/>
+<rectangle x1="1.3462" y1="0.2032" x2="1.4732" y2="0.3302" layer="51"/>
+<rectangle x1="0.9652" y1="0.5842" x2="1.0922" y2="0.7112" layer="51"/>
+<rectangle x1="-1.0922" y1="-0.7112" x2="-0.9652" y2="-0.5842" layer="51"/>
+<rectangle x1="-1.4478" y1="-0.3302" x2="-1.3208" y2="-0.2032" layer="51"/>
+<rectangle x1="-1.4732" y1="0.2032" x2="-1.3462" y2="0.3302" layer="51"/>
+<rectangle x1="-1.1176" y1="0.5842" x2="-0.9906" y2="0.7112" layer="51"/>
+</package>
+</packages>
+<packages3d>
+<package3d name="SJ" urn="urn:adsk.eagle:package:15471/1" type="box" library_version="1">
+<description>Solder jumper</description>
+<packageinstances>
+<packageinstance name="SJ"/>
+</packageinstances>
+</package3d>
+<package3d name="SJW" urn="urn:adsk.eagle:package:15507/1" type="box" library_version="1">
+<description>Solder jumper</description>
+<packageinstances>
+<packageinstance name="SJW"/>
+</packageinstances>
+</package3d>
+</packages3d>
+<symbols>
+<symbol name="SJ" urn="urn:adsk.eagle:symbol:15431/1" library_version="1">
+<wire x1="0.381" y1="0.635" x2="0.381" y2="-0.635" width="1.27" layer="94" curve="-180" cap="flat"/>
+<wire x1="-0.381" y1="-0.635" x2="-0.381" y2="0.635" width="1.27" layer="94" curve="-180" cap="flat"/>
+<wire x1="2.54" y1="0" x2="1.651" y2="0" width="0.1524" layer="94"/>
+<wire x1="-2.54" y1="0" x2="-1.651" y2="0" width="0.1524" layer="94"/>
+<text x="-2.54" y="2.54" size="1.778" layer="95">&gt;NAME</text>
+<text x="-2.54" y="-3.81" size="1.778" layer="96">&gt;VALUE</text>
+<pin name="2" x="5.08" y="0" visible="pad" length="short" direction="pas" swaplevel="1" rot="R180"/>
+<pin name="1" x="-5.08" y="0" visible="pad" length="short" direction="pas" swaplevel="1"/>
+</symbol>
+</symbols>
+<devicesets>
+<deviceset name="SJ" urn="urn:adsk.eagle:component:15508/1" prefix="SJ" uservalue="yes" library_version="1">
+<description>SMD solder &lt;b&gt;JUMPER&lt;/b&gt;</description>
+<gates>
+<gate name="1" symbol="SJ" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="SJ">
+<connects>
+<connect gate="1" pin="1" pad="1"/>
+<connect gate="1" pin="2" pad="2"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:15471/1"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+<device name="W" package="SJW">
+<connects>
+<connect gate="1" pin="1" pad="1"/>
+<connect gate="1" pin="2" pad="2"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:15507/1"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+</devicesets>
+</library>
 </libraries>
 <attributes>
 </attributes>
@@ -1882,17 +2125,17 @@ In this library the device names are the same as the pin names of the symbols, t
 <part name="P+1" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+5V" device=""/>
 <part name="U1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="USB_TRACES" device="" package3d_urn="urn:adsk.eagle:package:4245369/9"/>
 <part name="C7" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="CAPACITOR" device="" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u"/>
-<part name="SUPPLY8" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="SUPPLY10" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
 <part name="P+5" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+5V" device=""/>
 <part name="C8" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="CAPACITOR" device="" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u"/>
-<part name="SUPPLY10" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="SUPPLY11" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
 <part name="C9" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="CAPACITOR" device="" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u"/>
 <part name="C10" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="CAPACITOR" device="" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u"/>
-<part name="+3V8" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
-<part name="P+6" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+5V" device=""/>
-<part name="SUPPLY11" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
 <part name="+3V9" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="P+6" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+5V" device=""/>
 <part name="SUPPLY12" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="+3V10" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="SUPPLY13" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
 <part name="D+1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="TEST_POINT" device="" package3d_urn="urn:adsk.eagle:package:4245792/4"/>
 <part name="D-1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="TEST_POINT" device="" package3d_urn="urn:adsk.eagle:package:4245792/4"/>
 <part name="GND1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="TEST_POINT" device="" package3d_urn="urn:adsk.eagle:package:4245792/4"/>
@@ -1900,171 +2143,194 @@ In this library the device names are the same as the pin names of the symbols, t
 <part name="3V1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="TEST_POINT" device="" package3d_urn="urn:adsk.eagle:package:4245792/4"/>
 <part name="SWDIO1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="TEST_POINT" device="" package3d_urn="urn:adsk.eagle:package:4245792/4"/>
 <part name="SWCLK1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="TEST_POINT" device="" package3d_urn="urn:adsk.eagle:package:4245792/4"/>
-<part name="R1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="RESISTOR" device="" package3d_urn="urn:adsk.eagle:package:4245807/6" value="175"/>
+<part name="R2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="RESISTOR" device="" package3d_urn="urn:adsk.eagle:package:4245807/6" value="175"/>
 <part name="L2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="EAST1616RGBA3-LED-RGB" device="CL-505S-X-SD-T" package3d_urn="urn:adsk.eagle:package:4878740/6"/>
 <part name="STX-&gt;1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="TEST_POINT" device="" package3d_urn="urn:adsk.eagle:package:4245792/4"/>
 <part name="SRX&lt;-1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="TEST_POINT" device="" package3d_urn="urn:adsk.eagle:package:4245792/4"/>
-<part name="+3V10" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
-<part name="SUPPLY13" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
 <part name="+3V11" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
 <part name="SUPPLY14" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="+3V12" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="SUPPLY15" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
 <part name="C11" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="CAPACITOR" device="" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u"/>
 <part name="C12" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="CAPACITOR" device="" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u"/>
-<part name="SUPPLY15" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
-<part name="ST2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="STM32L432KCU6" device="" package3d_urn="urn:adsk.eagle:package:4245373/5"/>
+<part name="SUPPLY16" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="ST2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="STM32L432KCU6" device="" package3d_urn="urn:adsk.eagle:package:4245373/6"/>
 <part name="SWO1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="TEST_POINT" device="" package3d_urn="urn:adsk.eagle:package:4245792/4"/>
-<part name="L4" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="NCP114AMX330TCG" device="" package3d_urn="urn:adsk.eagle:package:5621121/2"/>
+<part name="L4" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="NCP114AMX330TCG" device="" package3d_urn="urn:adsk.eagle:package:5621121/3"/>
 <part name="Z2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="BZA900A-ESD-ZENERS" device="" package3d_urn="urn:adsk.eagle:package:5621120/4"/>
 <part name="P+7" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+5V" device=""/>
-<part name="SUPPLY16" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
-<part name="+3V12" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="SUPPLY17" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
 <part name="+3V13" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
 <part name="+3V14" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="+3V15" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
 <part name="U$2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="DOME_BUTTON" device="12MM" package3d_urn="urn:adsk.eagle:package:5648519/5"/>
+<part name="N2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="AMS3956" device="" package3d_urn="urn:adsk.eagle:package:5825738/3"/>
+<part name="SUPPLY18" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="+3V16" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="SJ2" library="jumper" library_urn="urn:adsk.eagle:library:252" deviceset="SJ" device="" package3d_urn="urn:adsk.eagle:package:15471/1"/>
+<part name="COIL2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="MOLEX_NFC_COIL_1462360101" device="" package3d_urn="urn:adsk.eagle:package:7114966/5"/>
 </parts>
 <sheets>
 <sheet>
 <plain>
 </plain>
 <instances>
-<instance part="P+1" gate="1" x="86.36" y="81.28" smashed="yes" rot="R180">
-<attribute name="VALUE" x="88.9" y="81.28" size="1.778" layer="96"/>
+<instance part="P+1" gate="1" x="137.16" y="116.84" smashed="yes" rot="R180">
+<attribute name="VALUE" x="139.7" y="116.84" size="1.778" layer="96"/>
 </instance>
-<instance part="U1" gate="G$1" x="76.2" y="101.6" smashed="yes" rot="R180">
-<attribute name="NAME" x="78.74" y="92.71" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="78.74" y="109.22" size="1.778" layer="96" rot="R180"/>
+<instance part="U1" gate="G$1" x="127" y="137.16" smashed="yes" rot="R180">
+<attribute name="NAME" x="129.54" y="128.27" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="129.54" y="144.78" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="C7" gate="G$1" x="147.32" y="78.74" smashed="yes" rot="R180">
-<attribute name="NAME" x="145.796" y="78.359" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="145.796" y="83.439" size="1.778" layer="96" rot="R180"/>
+<instance part="C7" gate="G$1" x="132.08" y="71.12" smashed="yes" rot="R180">
+<attribute name="NAME" x="130.556" y="70.739" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="130.556" y="75.819" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="SUPPLY8" gate="PE" x="195.58" y="167.64" smashed="yes" rot="R180">
-<attribute name="VALUE" x="200.025" y="172.339" size="1.778" layer="96" rot="R180"/>
+<instance part="SUPPLY10" gate="PE" x="182.88" y="152.4" smashed="yes" rot="R180">
+<attribute name="VALUE" x="187.325" y="157.099" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="P+5" gate="1" x="137.16" y="91.44" smashed="yes">
-<attribute name="VALUE" x="134.62" y="91.44" size="1.778" layer="96" rot="R180"/>
+<instance part="P+5" gate="1" x="121.92" y="83.82" smashed="yes">
+<attribute name="VALUE" x="119.38" y="83.82" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="C8" gate="G$1" x="154.94" y="78.74" smashed="yes" rot="R180">
-<attribute name="NAME" x="153.416" y="78.359" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="153.416" y="83.439" size="1.778" layer="96" rot="R180"/>
+<instance part="C8" gate="G$1" x="139.7" y="71.12" smashed="yes" rot="R180">
+<attribute name="NAME" x="138.176" y="70.739" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="138.176" y="75.819" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="SUPPLY10" gate="PE" x="152.4" y="91.44" smashed="yes" rot="R180">
-<attribute name="VALUE" x="156.845" y="96.139" size="1.778" layer="96" rot="R180"/>
+<instance part="SUPPLY11" gate="PE" x="137.16" y="83.82" smashed="yes" rot="R180">
+<attribute name="VALUE" x="141.605" y="88.519" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="C9" gate="G$1" x="193.04" y="154.94" smashed="yes" rot="R180">
-<attribute name="NAME" x="191.516" y="154.559" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="191.516" y="159.639" size="1.778" layer="96" rot="R180"/>
+<instance part="C9" gate="G$1" x="180.34" y="139.7" smashed="yes" rot="R180">
+<attribute name="NAME" x="178.816" y="139.319" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="178.816" y="144.399" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="C10" gate="G$1" x="200.66" y="154.94" smashed="yes" rot="R180">
-<attribute name="NAME" x="199.136" y="154.559" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="199.136" y="159.639" size="1.778" layer="96" rot="R180"/>
+<instance part="C10" gate="G$1" x="187.96" y="139.7" smashed="yes" rot="R180">
+<attribute name="NAME" x="186.436" y="139.319" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="186.436" y="144.399" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="+3V8" gate="G$1" x="208.28" y="33.02" smashed="yes">
-<attribute name="VALUE" x="210.82" y="35.56" size="1.778" layer="96" rot="R180"/>
+<instance part="+3V9" gate="G$1" x="195.58" y="17.78" smashed="yes">
+<attribute name="VALUE" x="198.12" y="20.32" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="P+6" gate="1" x="198.12" y="33.02" smashed="yes">
-<attribute name="VALUE" x="200.66" y="35.56" size="1.778" layer="96" rot="R180"/>
+<instance part="P+6" gate="1" x="185.42" y="17.78" smashed="yes">
+<attribute name="VALUE" x="187.96" y="20.32" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="SUPPLY11" gate="PE" x="187.96" y="30.48" smashed="yes" rot="R180">
-<attribute name="VALUE" x="192.405" y="35.179" size="1.778" layer="96" rot="R180"/>
+<instance part="SUPPLY12" gate="PE" x="175.26" y="15.24" smashed="yes" rot="R180">
+<attribute name="VALUE" x="179.705" y="19.939" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="+3V9" gate="G$1" x="307.34" y="129.54" smashed="yes" rot="R270">
-<attribute name="VALUE" x="302.26" y="132.08" size="1.778" layer="96"/>
+<instance part="+3V10" gate="G$1" x="294.64" y="121.92" smashed="yes" rot="R270">
+<attribute name="VALUE" x="289.56" y="124.46" size="1.778" layer="96"/>
 </instance>
-<instance part="SUPPLY12" gate="PE" x="314.96" y="111.76" smashed="yes">
-<attribute name="VALUE" x="310.515" y="107.061" size="1.778" layer="96"/>
+<instance part="SUPPLY13" gate="PE" x="302.26" y="96.52" smashed="yes">
+<attribute name="VALUE" x="297.815" y="91.821" size="1.778" layer="96"/>
 </instance>
-<instance part="D+1" gate="G$1" x="157.48" y="20.32" smashed="yes" rot="R180">
-<attribute name="NAME" x="158.75" y="19.05" size="1.778" layer="95" rot="R180"/>
+<instance part="D+1" gate="G$1" x="144.78" y="5.08" smashed="yes" rot="R180">
+<attribute name="NAME" x="146.05" y="3.81" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="D-1" gate="G$1" x="170.18" y="20.32" smashed="yes" rot="R180">
-<attribute name="NAME" x="171.45" y="19.05" size="1.778" layer="95" rot="R180"/>
+<instance part="D-1" gate="G$1" x="157.48" y="5.08" smashed="yes" rot="R180">
+<attribute name="NAME" x="158.75" y="3.81" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="GND1" gate="G$1" x="187.96" y="20.32" smashed="yes" rot="R180">
-<attribute name="NAME" x="189.23" y="19.05" size="1.778" layer="95" rot="R180"/>
+<instance part="GND1" gate="G$1" x="175.26" y="5.08" smashed="yes" rot="R180">
+<attribute name="NAME" x="176.53" y="3.81" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="+5V1" gate="G$1" x="198.12" y="20.32" smashed="yes" rot="R180">
-<attribute name="NAME" x="199.39" y="19.05" size="1.778" layer="95" rot="R180"/>
+<instance part="+5V1" gate="G$1" x="185.42" y="5.08" smashed="yes" rot="R180">
+<attribute name="NAME" x="186.69" y="3.81" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="3V1" gate="G$1" x="208.28" y="20.32" smashed="yes" rot="R180">
-<attribute name="NAME" x="209.55" y="19.05" size="1.778" layer="95" rot="R180"/>
+<instance part="3V1" gate="G$1" x="195.58" y="5.08" smashed="yes" rot="R180">
+<attribute name="NAME" x="196.85" y="3.81" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="SWDIO1" gate="G$1" x="256.54" y="20.32" smashed="yes" rot="R180">
-<attribute name="NAME" x="257.81" y="19.05" size="1.778" layer="95" rot="R180"/>
+<instance part="SWDIO1" gate="G$1" x="241.3" y="5.08" smashed="yes" rot="R180">
+<attribute name="NAME" x="242.57" y="3.81" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="SWCLK1" gate="G$1" x="266.7" y="20.32" smashed="yes" rot="R180">
-<attribute name="NAME" x="267.97" y="19.05" size="1.778" layer="95" rot="R180"/>
+<instance part="SWCLK1" gate="G$1" x="254" y="5.08" smashed="yes" rot="R180">
+<attribute name="NAME" x="255.27" y="3.81" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="R1" gate="G$1" x="294.64" y="129.54" smashed="yes">
-<attribute name="NAME" x="290.83" y="131.0386" size="1.778" layer="95"/>
-<attribute name="VALUE" x="290.83" y="126.238" size="1.778" layer="96"/>
+<instance part="R2" gate="G$1" x="281.94" y="121.92" smashed="yes">
+<attribute name="NAME" x="278.13" y="123.4186" size="1.778" layer="95"/>
+<attribute name="VALUE" x="278.13" y="118.618" size="1.778" layer="96"/>
 </instance>
-<instance part="L2" gate="G$1" x="276.86" y="124.46" smashed="yes" rot="R270">
-<attribute name="NAME" x="280.162" y="127" size="1.778" layer="95" rot="R270"/>
-<attribute name="VALUE" x="282.321" y="127" size="1.778" layer="96" rot="R270" display="off"/>
+<instance part="L2" gate="G$1" x="264.16" y="116.84" smashed="yes" rot="R270">
+<attribute name="NAME" x="267.462" y="119.38" size="1.778" layer="95" rot="R270"/>
+<attribute name="VALUE" x="269.621" y="119.38" size="1.778" layer="96" rot="R270" display="off"/>
 </instance>
-<instance part="STX-&gt;1" gate="G$1" x="287.02" y="20.32" smashed="yes" rot="R180">
-<attribute name="NAME" x="288.29" y="19.05" size="1.778" layer="95" rot="R180"/>
+<instance part="STX-&gt;1" gate="G$1" x="274.32" y="5.08" smashed="yes" rot="R180">
+<attribute name="NAME" x="275.59" y="3.81" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="SRX&lt;-1" gate="G$1" x="297.18" y="20.32" smashed="yes" rot="R180">
-<attribute name="NAME" x="298.45" y="19.05" size="1.778" layer="95" rot="R180"/>
+<instance part="SRX&lt;-1" gate="G$1" x="284.48" y="5.08" smashed="yes" rot="R180">
+<attribute name="NAME" x="285.75" y="3.81" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="+3V10" gate="G$1" x="198.12" y="78.74" smashed="yes">
-<attribute name="VALUE" x="195.58" y="73.66" size="1.778" layer="96" rot="R90"/>
+<instance part="+3V11" gate="G$1" x="182.88" y="71.12" smashed="yes">
+<attribute name="VALUE" x="180.34" y="66.04" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="SUPPLY13" gate="PE" x="198.12" y="55.88" smashed="yes">
-<attribute name="VALUE" x="193.675" y="51.181" size="1.778" layer="96"/>
+<instance part="SUPPLY14" gate="PE" x="182.88" y="48.26" smashed="yes">
+<attribute name="VALUE" x="178.435" y="43.561" size="1.778" layer="96"/>
 </instance>
-<instance part="+3V11" gate="G$1" x="180.34" y="142.24" smashed="yes" rot="R90">
-<attribute name="VALUE" x="185.42" y="139.7" size="1.778" layer="96" rot="R180"/>
+<instance part="+3V12" gate="G$1" x="167.64" y="127" smashed="yes" rot="R90">
+<attribute name="VALUE" x="172.72" y="124.46" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="SUPPLY14" gate="PE" x="281.94" y="106.68" smashed="yes" rot="R90">
-<attribute name="VALUE" x="286.639" y="102.235" size="1.778" layer="96" rot="R90"/>
+<instance part="SUPPLY15" gate="PE" x="274.32" y="91.44" smashed="yes" rot="R90">
+<attribute name="VALUE" x="279.019" y="86.995" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="C11" gate="G$1" x="269.24" y="109.22" smashed="yes" rot="R90">
-<attribute name="NAME" x="268.859" y="110.744" size="1.778" layer="95" rot="R90"/>
-<attribute name="VALUE" x="273.939" y="110.744" size="1.778" layer="96" rot="R90"/>
+<instance part="C11" gate="G$1" x="261.62" y="93.98" smashed="yes" rot="R90">
+<attribute name="NAME" x="261.239" y="95.504" size="1.778" layer="95" rot="R90"/>
+<attribute name="VALUE" x="266.319" y="95.504" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="C12" gate="G$1" x="269.24" y="101.6" smashed="yes" rot="R90">
-<attribute name="NAME" x="268.859" y="103.124" size="1.778" layer="95" rot="R90"/>
-<attribute name="VALUE" x="273.939" y="103.124" size="1.778" layer="96" rot="R90"/>
+<instance part="C12" gate="G$1" x="261.62" y="86.36" smashed="yes" rot="R90">
+<attribute name="NAME" x="261.239" y="87.884" size="1.778" layer="95" rot="R90"/>
+<attribute name="VALUE" x="266.319" y="87.884" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="SUPPLY15" gate="PE" x="254" y="83.82" smashed="yes" rot="R90">
-<attribute name="VALUE" x="258.699" y="79.375" size="1.778" layer="96" rot="R90"/>
+<instance part="SUPPLY16" gate="PE" x="241.3" y="68.58" smashed="yes" rot="R90">
+<attribute name="VALUE" x="245.999" y="64.135" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="ST2" gate="G$1" x="223.52" y="116.84" smashed="yes" rot="R180">
-<attribute name="NAME" x="251.46" y="137.16" size="1.27" layer="95" rot="R180"/>
-<attribute name="VALUE" x="256.54" y="139.7" size="1.27" layer="96" rot="R180"/>
+<instance part="ST2" gate="G$1" x="210.82" y="101.6" smashed="yes" rot="R180">
+<attribute name="NAME" x="238.76" y="121.92" size="1.27" layer="95" rot="R180"/>
+<attribute name="VALUE" x="243.84" y="124.46" size="1.27" layer="96" rot="R180"/>
 </instance>
-<instance part="SWO1" gate="G$1" x="236.22" y="20.32" smashed="yes" rot="R180">
-<attribute name="NAME" x="237.49" y="19.05" size="1.778" layer="95" rot="R180"/>
+<instance part="SWO1" gate="G$1" x="223.52" y="5.08" smashed="yes" rot="R180">
+<attribute name="NAME" x="224.79" y="3.81" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="L4" gate="G$1" x="175.26" y="66.04" smashed="yes">
-<attribute name="NAME" x="165.0731" y="71.13345" size="1.782709375" layer="95"/>
-<attribute name="VALUE" x="165.0685" y="58.396340625" size="1.78353125" layer="96"/>
+<instance part="L4" gate="G$1" x="160.02" y="58.42" smashed="yes">
+<attribute name="NAME" x="149.8331" y="63.51345" size="1.782709375" layer="95"/>
+<attribute name="VALUE" x="149.8285" y="50.776340625" size="1.78353125" layer="96"/>
 </instance>
-<instance part="Z2" gate="G$1" x="317.5" y="73.66" smashed="yes" rot="R180">
-<attribute name="NAME" x="320.4464" y="58.3184" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="321.9704" y="85.7758" size="1.778" layer="96" rot="R180"/>
+<instance part="Z2" gate="G$1" x="299.72" y="66.04" smashed="yes" rot="R180">
+<attribute name="NAME" x="302.6664" y="50.6984" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="311.8104" y="78.1558" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="P+7" gate="1" x="302.26" y="76.2" smashed="yes">
-<attribute name="VALUE" x="299.72" y="76.2" size="1.778" layer="96" rot="R180"/>
+<instance part="P+7" gate="1" x="284.48" y="68.58" smashed="yes">
+<attribute name="VALUE" x="281.94" y="68.58" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="SUPPLY16" gate="PE" x="335.28" y="68.58" smashed="yes">
-<attribute name="VALUE" x="330.835" y="63.881" size="1.778" layer="96"/>
+<instance part="SUPPLY17" gate="PE" x="317.5" y="60.96" smashed="yes">
+<attribute name="VALUE" x="313.055" y="56.261" size="1.778" layer="96"/>
 </instance>
-<instance part="+3V12" gate="G$1" x="302.26" y="68.58" smashed="yes" rot="R90">
-<attribute name="VALUE" x="307.34" y="66.04" size="1.778" layer="96" rot="R180"/>
+<instance part="+3V13" gate="G$1" x="284.48" y="60.96" smashed="yes" rot="R90">
+<attribute name="VALUE" x="289.56" y="58.42" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="+3V13" gate="G$1" x="261.62" y="91.44" smashed="yes" rot="R180">
-<attribute name="VALUE" x="264.16" y="96.52" size="1.778" layer="96" rot="R270"/>
+<instance part="+3V14" gate="G$1" x="254" y="76.2" smashed="yes" rot="R180">
+<attribute name="VALUE" x="256.54" y="81.28" size="1.778" layer="96" rot="R270"/>
 </instance>
-<instance part="+3V14" gate="G$1" x="238.76" y="71.12" smashed="yes" rot="R180">
-<attribute name="VALUE" x="241.3" y="76.2" size="1.778" layer="96" rot="R270"/>
+<instance part="+3V15" gate="G$1" x="226.06" y="55.88" smashed="yes" rot="R180">
+<attribute name="VALUE" x="228.6" y="60.96" size="1.778" layer="96" rot="R270"/>
 </instance>
-<instance part="U$2" gate="G$1" x="302.26" y="114.3" smashed="yes">
-<attribute name="NAME" x="298.45" y="116.84" size="1.778" layer="95"/>
-<attribute name="VALUE" x="298.45" y="110.49" size="1.778" layer="96"/>
+<instance part="U$2" gate="G$1" x="289.56" y="99.06" smashed="yes">
+<attribute name="NAME" x="285.75" y="101.6" size="1.778" layer="95"/>
+<attribute name="VALUE" x="278.13" y="105.41" size="1.778" layer="96"/>
+</instance>
+<instance part="N2" gate="G$1" x="256.54" y="152.4" smashed="yes" rot="R180">
+<attribute name="NAME" x="261.62" y="137.16" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="261.62" y="170.18" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="SUPPLY18" gate="PE" x="284.48" y="172.72" smashed="yes" rot="R180">
+<attribute name="VALUE" x="288.925" y="177.419" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="+3V16" gate="G$1" x="292.1" y="134.62" smashed="yes" rot="R180">
+<attribute name="VALUE" x="294.64" y="139.7" size="1.778" layer="96" rot="R270"/>
+</instance>
+<instance part="SJ2" gate="1" x="281.94" y="142.24" smashed="yes">
+<attribute name="NAME" x="279.4" y="144.78" size="1.778" layer="95"/>
+<attribute name="VALUE" x="279.4" y="138.43" size="1.778" layer="96"/>
+</instance>
+<instance part="COIL2" gate="G$1" x="312.42" y="157.48" smashed="yes">
+<attribute name="NAME" x="302.26" y="163.83" size="1.778" layer="95"/>
+<attribute name="VALUE" x="294.64" y="168.91" size="1.778" layer="96"/>
 </instance>
 </instances>
 <busses>
@@ -2072,346 +2338,427 @@ In this library the device names are the same as the pin names of the symbols, t
 <nets>
 <net name="+5V" class="0">
 <segment>
-<wire x1="83.82" y1="96.52" x2="86.36" y2="96.52" width="0.1524" layer="91"/>
-<wire x1="86.36" y1="96.52" x2="101.6" y2="96.52" width="0.1524" layer="91"/>
+<wire x1="137.16" y1="132.08" x2="157.48" y2="132.08" width="0.1524" layer="91"/>
 <pinref part="P+1" gate="1" pin="+5V"/>
-<wire x1="86.36" y1="83.82" x2="86.36" y2="96.52" width="0.1524" layer="91"/>
-<junction x="86.36" y="96.52"/>
-<wire x1="106.68" y1="96.52" x2="101.6" y2="96.52" width="0.1524" layer="91"/>
+<wire x1="137.16" y1="119.38" x2="137.16" y2="132.08" width="0.1524" layer="91"/>
+<junction x="137.16" y="132.08"/>
 <pinref part="U1" gate="G$1" pin="1"/>
-<wire x1="81.28" y1="96.52" x2="83.82" y2="96.52" width="0.1524" layer="91"/>
+<wire x1="132.08" y1="132.08" x2="137.16" y2="132.08" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="P+5" gate="1" pin="+5V"/>
-<wire x1="137.16" y1="88.9" x2="137.16" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="121.92" y1="81.28" x2="121.92" y2="63.5" width="0.1524" layer="91"/>
 <pinref part="C8" gate="G$1" pin="1"/>
-<wire x1="154.94" y1="76.2" x2="154.94" y2="71.12" width="0.1524" layer="91"/>
-<wire x1="154.94" y1="71.12" x2="147.32" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="68.58" x2="139.7" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="63.5" x2="132.08" y2="63.5" width="0.1524" layer="91"/>
 <pinref part="C7" gate="G$1" pin="1"/>
-<wire x1="147.32" y1="71.12" x2="137.16" y2="71.12" width="0.1524" layer="91"/>
-<wire x1="147.32" y1="76.2" x2="147.32" y2="71.12" width="0.1524" layer="91"/>
-<junction x="147.32" y="71.12"/>
-<wire x1="160.02" y1="68.58" x2="154.94" y2="68.58" width="0.1524" layer="91"/>
-<wire x1="154.94" y1="68.58" x2="154.94" y2="71.12" width="0.1524" layer="91"/>
-<junction x="154.94" y="71.12"/>
-<wire x1="160.02" y1="63.5" x2="154.94" y2="63.5" width="0.1524" layer="91"/>
-<wire x1="154.94" y1="63.5" x2="154.94" y2="68.58" width="0.1524" layer="91"/>
-<junction x="154.94" y="68.58"/>
+<wire x1="132.08" y1="63.5" x2="121.92" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="132.08" y1="68.58" x2="132.08" y2="63.5" width="0.1524" layer="91"/>
+<junction x="132.08" y="63.5"/>
+<wire x1="144.78" y1="60.96" x2="139.7" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="60.96" x2="139.7" y2="63.5" width="0.1524" layer="91"/>
+<junction x="139.7" y="63.5"/>
+<wire x1="144.78" y1="55.88" x2="139.7" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="55.88" x2="139.7" y2="60.96" width="0.1524" layer="91"/>
+<junction x="139.7" y="60.96"/>
 <pinref part="L4" gate="G$1" pin="IN"/>
 <pinref part="L4" gate="G$1" pin="EN"/>
 </segment>
 <segment>
 <pinref part="P+6" gate="1" pin="+5V"/>
-<wire x1="198.12" y1="22.86" x2="198.12" y2="30.48" width="0.1524" layer="91"/>
+<wire x1="185.42" y1="7.62" x2="185.42" y2="15.24" width="0.1524" layer="91"/>
 <pinref part="+5V1" gate="G$1" pin="TP"/>
 </segment>
 <segment>
 <pinref part="Z2" gate="G$1" pin="C"/>
 <pinref part="P+7" gate="1" pin="+5V"/>
-<wire x1="314.96" y1="73.66" x2="302.26" y2="73.66" width="0.1524" layer="91"/>
+<wire x1="297.18" y1="66.04" x2="284.48" y2="66.04" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="D+" class="0">
 <segment>
-<wire x1="88.9" y1="99.06" x2="88.9" y2="119.38" width="0.1524" layer="91"/>
-<wire x1="83.82" y1="99.06" x2="88.9" y2="99.06" width="0.1524" layer="91"/>
-<label x="86.36" y="119.38" size="1.778" layer="95"/>
+<wire x1="139.7" y1="134.62" x2="139.7" y2="154.94" width="0.1524" layer="91"/>
+<wire x1="132.08" y1="134.62" x2="139.7" y2="134.62" width="0.1524" layer="91"/>
+<label x="137.16" y="154.94" size="1.778" layer="95"/>
 <pinref part="U1" gate="G$1" pin="2"/>
-<wire x1="81.28" y1="99.06" x2="83.82" y2="99.06" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<wire x1="157.48" y1="22.86" x2="157.48" y2="33.02" width="0.1524" layer="91"/>
-<label x="157.48" y="33.02" size="1.778" layer="95"/>
+<wire x1="144.78" y1="7.62" x2="144.78" y2="17.78" width="0.1524" layer="91"/>
+<label x="144.78" y="17.78" size="1.778" layer="95"/>
 <pinref part="D+1" gate="G$1" pin="TP"/>
 </segment>
 <segment>
-<wire x1="170.18" y1="116.84" x2="170.18" y2="127" width="0.1524" layer="91"/>
-<label x="170.18" y="127" size="1.778" layer="95"/>
+<wire x1="157.48" y1="101.6" x2="157.48" y2="111.76" width="0.1524" layer="91"/>
+<label x="157.48" y="111.76" size="1.778" layer="95"/>
 <pinref part="ST2" gate="G$1" pin="D+"/>
-<wire x1="203.2" y1="111.76" x2="170.18" y2="111.76" width="0.1524" layer="91"/>
-<wire x1="170.18" y1="111.76" x2="170.18" y2="116.84" width="0.1524" layer="91"/>
+<wire x1="190.5" y1="96.52" x2="157.48" y2="96.52" width="0.1524" layer="91"/>
+<wire x1="157.48" y1="96.52" x2="157.48" y2="101.6" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<wire x1="309.88" y1="55.88" x2="309.88" y2="45.72" width="0.1524" layer="91"/>
-<label x="309.88" y="45.72" size="1.778" layer="95" rot="R180"/>
-<wire x1="309.88" y1="63.5" x2="309.88" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="292.1" y1="55.88" x2="292.1" y2="38.1" width="0.1524" layer="91"/>
+<label x="292.1" y="38.1" size="1.778" layer="95" rot="R180"/>
 <pinref part="Z2" gate="G$1" pin="C3"/>
-<wire x1="309.88" y1="63.5" x2="314.96" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="292.1" y1="55.88" x2="297.18" y2="55.88" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="D-" class="0">
 <segment>
-<wire x1="91.44" y1="101.6" x2="91.44" y2="119.38" width="0.1524" layer="91"/>
-<wire x1="83.82" y1="101.6" x2="91.44" y2="101.6" width="0.1524" layer="91"/>
-<label x="93.98" y="119.38" size="1.778" layer="95"/>
+<wire x1="142.24" y1="137.16" x2="142.24" y2="154.94" width="0.1524" layer="91"/>
+<wire x1="132.08" y1="137.16" x2="142.24" y2="137.16" width="0.1524" layer="91"/>
+<label x="144.78" y="154.94" size="1.778" layer="95"/>
 <pinref part="U1" gate="G$1" pin="3"/>
-<wire x1="81.28" y1="101.6" x2="83.82" y2="101.6" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<wire x1="170.18" y1="22.86" x2="170.18" y2="33.02" width="0.1524" layer="91"/>
-<label x="170.18" y="33.02" size="1.778" layer="95"/>
+<wire x1="157.48" y1="7.62" x2="157.48" y2="17.78" width="0.1524" layer="91"/>
+<label x="157.48" y="17.78" size="1.778" layer="95"/>
 <pinref part="D-1" gate="G$1" pin="TP"/>
 </segment>
 <segment>
-<wire x1="177.8" y1="116.84" x2="177.8" y2="127" width="0.1524" layer="91"/>
-<label x="177.8" y="127" size="1.778" layer="95"/>
+<wire x1="165.1" y1="101.6" x2="165.1" y2="111.76" width="0.1524" layer="91"/>
+<label x="165.1" y="111.76" size="1.778" layer="95"/>
 <pinref part="ST2" gate="G$1" pin="D-"/>
-<wire x1="203.2" y1="114.3" x2="177.8" y2="114.3" width="0.1524" layer="91"/>
-<wire x1="177.8" y1="114.3" x2="177.8" y2="116.84" width="0.1524" layer="91"/>
+<wire x1="190.5" y1="99.06" x2="165.1" y2="99.06" width="0.1524" layer="91"/>
+<wire x1="165.1" y1="99.06" x2="165.1" y2="101.6" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<wire x1="307.34" y1="81.28" x2="307.34" y2="91.44" width="0.1524" layer="91"/>
-<label x="307.34" y="91.44" size="1.778" layer="95"/>
+<wire x1="289.56" y1="71.12" x2="289.56" y2="83.82" width="0.1524" layer="91"/>
+<label x="289.56" y="83.82" size="1.778" layer="95"/>
 <pinref part="Z2" gate="G$1" pin="C2"/>
-<wire x1="314.96" y1="78.74" x2="307.34" y2="78.74" width="0.1524" layer="91"/>
-<wire x1="307.34" y1="78.74" x2="307.34" y2="81.28" width="0.1524" layer="91"/>
+<wire x1="297.18" y1="71.12" x2="289.56" y2="71.12" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="PE" class="0">
 <segment>
-<pinref part="SUPPLY10" gate="PE" pin="PE"/>
-<wire x1="152.4" y1="88.9" x2="152.4" y2="86.36" width="0.1524" layer="91"/>
+<pinref part="SUPPLY11" gate="PE" pin="PE"/>
+<wire x1="137.16" y1="81.28" x2="137.16" y2="78.74" width="0.1524" layer="91"/>
 <pinref part="C7" gate="G$1" pin="2"/>
-<wire x1="152.4" y1="86.36" x2="147.32" y2="86.36" width="0.1524" layer="91"/>
-<wire x1="147.32" y1="86.36" x2="147.32" y2="83.82" width="0.1524" layer="91"/>
+<wire x1="137.16" y1="78.74" x2="132.08" y2="78.74" width="0.1524" layer="91"/>
+<wire x1="132.08" y1="78.74" x2="132.08" y2="76.2" width="0.1524" layer="91"/>
 <pinref part="C8" gate="G$1" pin="2"/>
-<wire x1="154.94" y1="83.82" x2="154.94" y2="86.36" width="0.1524" layer="91"/>
-<wire x1="154.94" y1="86.36" x2="152.4" y2="86.36" width="0.1524" layer="91"/>
-<junction x="152.4" y="86.36"/>
+<wire x1="139.7" y1="76.2" x2="139.7" y2="78.74" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="78.74" x2="137.16" y2="78.74" width="0.1524" layer="91"/>
+<junction x="137.16" y="78.74"/>
 </segment>
 <segment>
 <pinref part="C10" gate="G$1" pin="2"/>
-<wire x1="200.66" y1="160.02" x2="200.66" y2="162.56" width="0.1524" layer="91"/>
-<wire x1="200.66" y1="162.56" x2="195.58" y2="162.56" width="0.1524" layer="91"/>
+<wire x1="187.96" y1="144.78" x2="187.96" y2="147.32" width="0.1524" layer="91"/>
+<wire x1="187.96" y1="147.32" x2="182.88" y2="147.32" width="0.1524" layer="91"/>
 <pinref part="C9" gate="G$1" pin="2"/>
-<wire x1="195.58" y1="162.56" x2="193.04" y2="162.56" width="0.1524" layer="91"/>
-<wire x1="193.04" y1="162.56" x2="193.04" y2="160.02" width="0.1524" layer="91"/>
-<pinref part="SUPPLY8" gate="PE" pin="PE"/>
-<wire x1="195.58" y1="165.1" x2="195.58" y2="162.56" width="0.1524" layer="91"/>
-<junction x="195.58" y="162.56"/>
-<wire x1="218.44" y1="139.7" x2="218.44" y2="162.56" width="0.1524" layer="91"/>
-<wire x1="218.44" y1="162.56" x2="200.66" y2="162.56" width="0.1524" layer="91"/>
-<junction x="200.66" y="162.56"/>
+<wire x1="182.88" y1="147.32" x2="180.34" y2="147.32" width="0.1524" layer="91"/>
+<wire x1="180.34" y1="147.32" x2="180.34" y2="144.78" width="0.1524" layer="91"/>
+<pinref part="SUPPLY10" gate="PE" pin="PE"/>
+<wire x1="182.88" y1="149.86" x2="182.88" y2="147.32" width="0.1524" layer="91"/>
+<junction x="182.88" y="147.32"/>
+<wire x1="205.74" y1="124.46" x2="205.74" y2="147.32" width="0.1524" layer="91"/>
+<wire x1="205.74" y1="147.32" x2="187.96" y2="147.32" width="0.1524" layer="91"/>
+<junction x="187.96" y="147.32"/>
 <pinref part="ST2" gate="G$1" pin="VSS"/>
 </segment>
 <segment>
-<pinref part="SUPPLY11" gate="PE" pin="PE"/>
-<wire x1="187.96" y1="22.86" x2="187.96" y2="27.94" width="0.1524" layer="91"/>
+<pinref part="SUPPLY12" gate="PE" pin="PE"/>
+<wire x1="175.26" y1="7.62" x2="175.26" y2="12.7" width="0.1524" layer="91"/>
 <pinref part="GND1" gate="G$1" pin="TP"/>
 </segment>
 <segment>
-<wire x1="314.96" y1="114.3" x2="307.34" y2="114.3" width="0.1524" layer="91"/>
-<pinref part="SUPPLY12" gate="PE" pin="PE"/>
+<wire x1="302.26" y1="99.06" x2="294.64" y2="99.06" width="0.1524" layer="91"/>
+<pinref part="SUPPLY13" gate="PE" pin="PE"/>
 <pinref part="U$2" gate="G$1" pin="2"/>
 </segment>
 <segment>
-<pinref part="SUPPLY13" gate="PE" pin="PE"/>
-<wire x1="198.12" y1="63.5" x2="198.12" y2="58.42" width="0.1524" layer="91"/>
+<pinref part="SUPPLY14" gate="PE" pin="PE"/>
+<wire x1="182.88" y1="58.42" x2="182.88" y2="50.8" width="0.1524" layer="91"/>
 <pinref part="L4" gate="G$1" pin="GND"/>
-<wire x1="190.5" y1="66.04" x2="198.12" y2="66.04" width="0.1524" layer="91"/>
-<wire x1="198.12" y1="66.04" x2="198.12" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="175.26" y1="58.42" x2="182.88" y2="58.42" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C12" gate="G$1" pin="2"/>
-<wire x1="274.32" y1="101.6" x2="276.86" y2="101.6" width="0.1524" layer="91"/>
-<wire x1="276.86" y1="101.6" x2="276.86" y2="106.68" width="0.1524" layer="91"/>
+<wire x1="266.7" y1="86.36" x2="269.24" y2="86.36" width="0.1524" layer="91"/>
+<wire x1="269.24" y1="86.36" x2="269.24" y2="91.44" width="0.1524" layer="91"/>
 <pinref part="C11" gate="G$1" pin="2"/>
-<wire x1="276.86" y1="106.68" x2="276.86" y2="109.22" width="0.1524" layer="91"/>
-<wire x1="276.86" y1="109.22" x2="274.32" y2="109.22" width="0.1524" layer="91"/>
-<pinref part="SUPPLY14" gate="PE" pin="PE"/>
-<wire x1="279.4" y1="106.68" x2="276.86" y2="106.68" width="0.1524" layer="91"/>
-<junction x="276.86" y="106.68"/>
+<wire x1="269.24" y1="91.44" x2="269.24" y2="93.98" width="0.1524" layer="91"/>
+<wire x1="269.24" y1="93.98" x2="266.7" y2="93.98" width="0.1524" layer="91"/>
+<pinref part="SUPPLY15" gate="PE" pin="PE"/>
+<wire x1="271.78" y1="91.44" x2="269.24" y2="91.44" width="0.1524" layer="91"/>
+<junction x="269.24" y="91.44"/>
 </segment>
 <segment>
-<wire x1="238.76" y1="91.44" x2="238.76" y2="83.82" width="0.1524" layer="91"/>
-<pinref part="SUPPLY15" gate="PE" pin="PE"/>
-<wire x1="238.76" y1="83.82" x2="251.46" y2="83.82" width="0.1524" layer="91"/>
-<wire x1="236.22" y1="91.44" x2="236.22" y2="83.82" width="0.1524" layer="91"/>
-<wire x1="236.22" y1="83.82" x2="238.76" y2="83.82" width="0.1524" layer="91"/>
-<junction x="238.76" y="83.82"/>
+<wire x1="226.06" y1="76.2" x2="226.06" y2="68.58" width="0.1524" layer="91"/>
+<pinref part="SUPPLY16" gate="PE" pin="PE"/>
+<wire x1="226.06" y1="68.58" x2="238.76" y2="68.58" width="0.1524" layer="91"/>
+<wire x1="223.52" y1="76.2" x2="223.52" y2="68.58" width="0.1524" layer="91"/>
+<wire x1="223.52" y1="68.58" x2="226.06" y2="68.58" width="0.1524" layer="91"/>
+<junction x="226.06" y="68.58"/>
 <pinref part="ST2" gate="G$1" pin="VSS2"/>
 <pinref part="ST2" gate="G$1" pin="VSS3"/>
 </segment>
 <segment>
-<pinref part="SUPPLY16" gate="PE" pin="PE"/>
+<pinref part="SUPPLY17" gate="PE" pin="PE"/>
 <pinref part="Z2" gate="G$1" pin="P$1"/>
-<wire x1="335.28" y1="71.12" x2="327.66" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="317.5" y1="63.5" x2="309.88" y2="63.5" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<pinref part="N2" gate="G$1" pin="VSS"/>
+<wire x1="271.78" y1="162.56" x2="284.48" y2="162.56" width="0.1524" layer="91"/>
+<wire x1="284.48" y1="162.56" x2="284.48" y2="170.18" width="0.1524" layer="91"/>
+<pinref part="SUPPLY18" gate="PE" pin="PE"/>
 </segment>
 </net>
 <net name="+3V3" class="0">
 <segment>
-<pinref part="+3V8" gate="G$1" pin="+3V3"/>
-<wire x1="208.28" y1="22.86" x2="208.28" y2="30.48" width="0.1524" layer="91"/>
+<pinref part="+3V9" gate="G$1" pin="+3V3"/>
+<wire x1="195.58" y1="7.62" x2="195.58" y2="15.24" width="0.1524" layer="91"/>
 <pinref part="3V1" gate="G$1" pin="TP"/>
 </segment>
 <segment>
-<pinref part="+3V9" gate="G$1" pin="+3V3"/>
-<wire x1="299.72" y1="129.54" x2="304.8" y2="129.54" width="0.1524" layer="91"/>
-<pinref part="R1" gate="G$1" pin="2"/>
+<pinref part="+3V10" gate="G$1" pin="+3V3"/>
+<wire x1="287.02" y1="121.92" x2="292.1" y2="121.92" width="0.1524" layer="91"/>
+<pinref part="R2" gate="G$1" pin="2"/>
 </segment>
 <segment>
-<pinref part="+3V10" gate="G$1" pin="+3V3"/>
-<wire x1="190.5" y1="68.58" x2="198.12" y2="68.58" width="0.1524" layer="91"/>
-<wire x1="198.12" y1="68.58" x2="198.12" y2="76.2" width="0.1524" layer="91"/>
+<pinref part="+3V11" gate="G$1" pin="+3V3"/>
+<wire x1="175.26" y1="60.96" x2="182.88" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="182.88" y1="60.96" x2="182.88" y2="68.58" width="0.1524" layer="91"/>
 <pinref part="L4" gate="G$1" pin="OUT"/>
 </segment>
 <segment>
-<wire x1="200.66" y1="142.24" x2="198.12" y2="142.24" width="0.1524" layer="91"/>
+<wire x1="187.96" y1="127" x2="185.42" y2="127" width="0.1524" layer="91"/>
 <pinref part="C10" gate="G$1" pin="1"/>
-<wire x1="198.12" y1="142.24" x2="193.04" y2="142.24" width="0.1524" layer="91"/>
-<wire x1="200.66" y1="152.4" x2="200.66" y2="142.24" width="0.1524" layer="91"/>
+<wire x1="185.42" y1="127" x2="180.34" y2="127" width="0.1524" layer="91"/>
+<wire x1="187.96" y1="137.16" x2="187.96" y2="127" width="0.1524" layer="91"/>
 <pinref part="C9" gate="G$1" pin="1"/>
-<wire x1="193.04" y1="152.4" x2="193.04" y2="142.24" width="0.1524" layer="91"/>
-<pinref part="+3V11" gate="G$1" pin="+3V3"/>
-<wire x1="182.88" y1="142.24" x2="193.04" y2="142.24" width="0.1524" layer="91"/>
-<junction x="193.04" y="142.24"/>
-<wire x1="203.2" y1="124.46" x2="198.12" y2="124.46" width="0.1524" layer="91"/>
-<wire x1="198.12" y1="124.46" x2="198.12" y2="142.24" width="0.1524" layer="91"/>
-<junction x="198.12" y="142.24"/>
+<wire x1="180.34" y1="137.16" x2="180.34" y2="127" width="0.1524" layer="91"/>
+<pinref part="+3V12" gate="G$1" pin="+3V3"/>
+<wire x1="170.18" y1="127" x2="180.34" y2="127" width="0.1524" layer="91"/>
+<junction x="180.34" y="127"/>
+<wire x1="190.5" y1="109.22" x2="185.42" y2="109.22" width="0.1524" layer="91"/>
+<wire x1="185.42" y1="109.22" x2="185.42" y2="127" width="0.1524" layer="91"/>
+<junction x="185.42" y="127"/>
 <pinref part="ST2" gate="G$1" pin="VDD2"/>
 </segment>
 <segment>
 <pinref part="C12" gate="G$1" pin="1"/>
-<wire x1="266.7" y1="101.6" x2="261.62" y2="101.6" width="0.1524" layer="91"/>
+<wire x1="259.08" y1="86.36" x2="254" y2="86.36" width="0.1524" layer="91"/>
 <pinref part="C11" gate="G$1" pin="1"/>
-<wire x1="266.7" y1="109.22" x2="261.62" y2="109.22" width="0.1524" layer="91"/>
-<wire x1="261.62" y1="109.22" x2="261.62" y2="106.68" width="0.1524" layer="91"/>
-<wire x1="261.62" y1="106.68" x2="261.62" y2="101.6" width="0.1524" layer="91"/>
-<wire x1="251.46" y1="106.68" x2="261.62" y2="106.68" width="0.1524" layer="91"/>
-<junction x="261.62" y="106.68"/>
-<wire x1="251.46" y1="116.84" x2="261.62" y2="116.84" width="0.1524" layer="91"/>
-<wire x1="261.62" y1="116.84" x2="261.62" y2="109.22" width="0.1524" layer="91"/>
-<junction x="261.62" y="109.22"/>
+<wire x1="259.08" y1="93.98" x2="254" y2="93.98" width="0.1524" layer="91"/>
+<wire x1="254" y1="93.98" x2="254" y2="91.44" width="0.1524" layer="91"/>
+<wire x1="254" y1="91.44" x2="254" y2="86.36" width="0.1524" layer="91"/>
+<wire x1="238.76" y1="91.44" x2="254" y2="91.44" width="0.1524" layer="91"/>
+<junction x="254" y="91.44"/>
+<wire x1="238.76" y1="101.6" x2="254" y2="101.6" width="0.1524" layer="91"/>
+<wire x1="254" y1="101.6" x2="254" y2="93.98" width="0.1524" layer="91"/>
+<junction x="254" y="93.98"/>
 <pinref part="ST2" gate="G$1" pin="VDD"/>
 <pinref part="ST2" gate="G$1" pin="VDDA/VREF"/>
-<pinref part="+3V13" gate="G$1" pin="+3V3"/>
-<wire x1="261.62" y1="93.98" x2="261.62" y2="101.6" width="0.1524" layer="91"/>
-<junction x="261.62" y="101.6"/>
+<pinref part="+3V14" gate="G$1" pin="+3V3"/>
+<wire x1="254" y1="78.74" x2="254" y2="86.36" width="0.1524" layer="91"/>
+<junction x="254" y="86.36"/>
 </segment>
 <segment>
-<pinref part="+3V12" gate="G$1" pin="+3V3"/>
+<pinref part="+3V13" gate="G$1" pin="+3V3"/>
 <pinref part="Z2" gate="G$1" pin="C1"/>
-<wire x1="304.8" y1="68.58" x2="314.96" y2="68.58" width="0.1524" layer="91"/>
+<wire x1="287.02" y1="60.96" x2="297.18" y2="60.96" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="ST2" gate="G$1" pin="PH3/BOOT0"/>
-<wire x1="233.68" y1="91.44" x2="233.68" y2="76.2" width="0.1524" layer="91"/>
-<pinref part="+3V14" gate="G$1" pin="+3V3"/>
-<wire x1="233.68" y1="76.2" x2="238.76" y2="76.2" width="0.1524" layer="91"/>
-<wire x1="238.76" y1="76.2" x2="238.76" y2="73.66" width="0.1524" layer="91"/>
+<wire x1="220.98" y1="76.2" x2="220.98" y2="60.96" width="0.1524" layer="91"/>
+<pinref part="+3V15" gate="G$1" pin="+3V3"/>
+<wire x1="220.98" y1="60.96" x2="226.06" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="226.06" y1="60.96" x2="226.06" y2="58.42" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<pinref part="N2" gate="G$1" pin="VP_REG"/>
+<wire x1="271.78" y1="147.32" x2="292.1" y2="147.32" width="0.1524" layer="91"/>
+<pinref part="+3V16" gate="G$1" pin="+3V3"/>
+<wire x1="292.1" y1="137.16" x2="292.1" y2="142.24" width="0.1524" layer="91"/>
+<pinref part="SJ2" gate="1" pin="2"/>
+<wire x1="292.1" y1="142.24" x2="292.1" y2="147.32" width="0.1524" layer="91"/>
+<wire x1="287.02" y1="142.24" x2="292.1" y2="142.24" width="0.1524" layer="91"/>
+<junction x="292.1" y="142.24"/>
 </segment>
 </net>
-<net name="N$7" class="0">
+<net name="N$15" class="0">
 <segment>
-<wire x1="289.56" y1="129.54" x2="281.94" y2="129.54" width="0.1524" layer="91"/>
-<pinref part="R1" gate="G$1" pin="1"/>
+<wire x1="276.86" y1="121.92" x2="269.24" y2="121.92" width="0.1524" layer="91"/>
+<pinref part="R2" gate="G$1" pin="1"/>
 <pinref part="L2" gate="G$1" pin="A2"/>
 </segment>
 </net>
 <net name="SWCLK" class="0">
 <segment>
-<wire x1="266.7" y1="22.86" x2="266.7" y2="33.02" width="0.1524" layer="91"/>
-<label x="266.7" y="33.02" size="1.778" layer="95"/>
+<wire x1="254" y1="7.62" x2="254" y2="17.78" width="0.1524" layer="91"/>
+<label x="254" y="17.78" size="1.778" layer="95"/>
 <pinref part="SWCLK1" gate="G$1" pin="TP"/>
 </segment>
 <segment>
 <pinref part="ST2" gate="G$1" pin="SWCLK"/>
-<wire x1="203.2" y1="106.68" x2="198.12" y2="106.68" width="0.1524" layer="91"/>
-<label x="190.5" y="104.14" size="1.778" layer="95"/>
+<wire x1="190.5" y1="91.44" x2="185.42" y2="91.44" width="0.1524" layer="91"/>
+<label x="177.8" y="88.9" size="1.778" layer="95"/>
 </segment>
 </net>
 <net name="STX-&gt;" class="0">
 <segment>
-<wire x1="287.02" y1="22.86" x2="287.02" y2="33.02" width="0.1524" layer="91"/>
-<label x="287.02" y="33.02" size="1.778" layer="95"/>
+<wire x1="274.32" y1="7.62" x2="274.32" y2="17.78" width="0.1524" layer="91"/>
+<label x="274.32" y="17.78" size="1.778" layer="95"/>
 <pinref part="STX-&gt;1" gate="G$1" pin="TP"/>
 </segment>
 <segment>
-<wire x1="220.98" y1="66.04" x2="223.52" y2="66.04" width="0.1524" layer="91"/>
-<label x="218.44" y="68.58" size="1.778" layer="95"/>
-<wire x1="220.98" y1="66.04" x2="228.6" y2="66.04" width="0.1524" layer="91"/>
-<wire x1="228.6" y1="66.04" x2="228.6" y2="68.58" width="0.1524" layer="91"/>
+<wire x1="208.28" y1="50.8" x2="210.82" y2="50.8" width="0.1524" layer="91"/>
+<label x="205.74" y="53.34" size="1.778" layer="95"/>
+<wire x1="208.28" y1="50.8" x2="215.9" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="215.9" y1="50.8" x2="215.9" y2="53.34" width="0.1524" layer="91"/>
 <pinref part="ST2" gate="G$1" pin="PB6"/>
-<wire x1="228.6" y1="68.58" x2="228.6" y2="91.44" width="0.1524" layer="91"/>
+<wire x1="215.9" y1="53.34" x2="215.9" y2="76.2" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="SRX&lt;-" class="0">
 <segment>
-<wire x1="297.18" y1="22.86" x2="297.18" y2="33.02" width="0.1524" layer="91"/>
-<label x="297.18" y="33.02" size="1.778" layer="95"/>
+<wire x1="284.48" y1="7.62" x2="284.48" y2="17.78" width="0.1524" layer="91"/>
+<label x="284.48" y="17.78" size="1.778" layer="95"/>
 <pinref part="SRX&lt;-1" gate="G$1" pin="TP"/>
 </segment>
 <segment>
-<wire x1="226.06" y1="63.5" x2="228.6" y2="63.5" width="0.1524" layer="91"/>
-<label x="223.52" y="63.5" size="1.778" layer="95" rot="R180"/>
+<wire x1="213.36" y1="48.26" x2="215.9" y2="48.26" width="0.1524" layer="91"/>
+<label x="210.82" y="48.26" size="1.778" layer="95" rot="R180"/>
 <pinref part="ST2" gate="G$1" pin="PB7"/>
-<wire x1="226.06" y1="63.5" x2="231.14" y2="63.5" width="0.1524" layer="91"/>
-<wire x1="231.14" y1="63.5" x2="231.14" y2="91.44" width="0.1524" layer="91"/>
+<wire x1="213.36" y1="48.26" x2="218.44" y2="48.26" width="0.1524" layer="91"/>
+<wire x1="218.44" y1="48.26" x2="218.44" y2="76.2" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="SWDIO" class="0">
 <segment>
 <pinref part="ST2" gate="G$1" pin="SWDIO"/>
-<wire x1="203.2" y1="109.22" x2="198.12" y2="109.22" width="0.1524" layer="91"/>
-<label x="187.96" y="106.68" size="1.778" layer="95"/>
+<wire x1="190.5" y1="93.98" x2="185.42" y2="93.98" width="0.1524" layer="91"/>
+<label x="175.26" y="91.44" size="1.778" layer="95"/>
 </segment>
 <segment>
-<wire x1="256.54" y1="22.86" x2="256.54" y2="33.02" width="0.1524" layer="91"/>
-<label x="256.54" y="33.02" size="1.778" layer="95"/>
+<wire x1="241.3" y1="7.62" x2="241.3" y2="17.78" width="0.1524" layer="91"/>
+<label x="241.3" y="17.78" size="1.778" layer="95"/>
 <pinref part="SWDIO1" gate="G$1" pin="TP"/>
 </segment>
 </net>
 <net name="SWO" class="0">
 <segment>
 <pinref part="ST2" gate="G$1" pin="PB3/SWO"/>
-<wire x1="220.98" y1="91.44" x2="220.98" y2="86.36" width="0.1524" layer="91"/>
-<label x="220.98" y="83.82" size="1.778" layer="95"/>
+<wire x1="208.28" y1="76.2" x2="208.28" y2="71.12" width="0.1524" layer="91"/>
+<label x="208.28" y="68.58" size="1.778" layer="95"/>
 </segment>
 <segment>
-<wire x1="236.22" y1="22.86" x2="236.22" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="223.52" y1="7.62" x2="223.52" y2="17.78" width="0.1524" layer="91"/>
 <pinref part="SWO1" gate="G$1" pin="TP"/>
-<label x="236.22" y="33.02" size="1.778" layer="95"/>
+<label x="223.52" y="17.78" size="1.778" layer="95"/>
 </segment>
 </net>
-<net name="N$8" class="0">
+<net name="N$16" class="0">
 <segment>
 <pinref part="L2" gate="G$1" pin="CRED"/>
-<wire x1="261.62" y1="129.54" x2="274.32" y2="129.54" width="0.1524" layer="91"/>
-<wire x1="261.62" y1="129.54" x2="261.62" y2="124.46" width="0.1524" layer="91"/>
+<wire x1="248.92" y1="121.92" x2="261.62" y2="121.92" width="0.1524" layer="91"/>
+<wire x1="248.92" y1="121.92" x2="248.92" y2="109.22" width="0.1524" layer="91"/>
 <pinref part="ST2" gate="G$1" pin="PA2"/>
-<wire x1="261.62" y1="124.46" x2="251.46" y2="124.46" width="0.1524" layer="91"/>
+<wire x1="248.92" y1="109.22" x2="238.76" y2="109.22" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="N$9" class="0">
+<net name="N$17" class="0">
 <segment>
 <pinref part="L2" gate="G$1" pin="CBLUE"/>
-<wire x1="274.32" y1="124.46" x2="264.16" y2="124.46" width="0.1524" layer="91"/>
-<wire x1="264.16" y1="124.46" x2="264.16" y2="144.78" width="0.1524" layer="91"/>
-<wire x1="264.16" y1="144.78" x2="236.22" y2="144.78" width="0.1524" layer="91"/>
+<wire x1="261.62" y1="116.84" x2="251.46" y2="116.84" width="0.1524" layer="91"/>
+<wire x1="251.46" y1="116.84" x2="251.46" y2="129.54" width="0.1524" layer="91"/>
+<wire x1="251.46" y1="129.54" x2="223.52" y2="129.54" width="0.1524" layer="91"/>
 <pinref part="ST2" gate="G$1" pin="PA3"/>
-<wire x1="236.22" y1="144.78" x2="236.22" y2="139.7" width="0.1524" layer="91"/>
+<wire x1="223.52" y1="129.54" x2="223.52" y2="124.46" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="N$10" class="0">
+<net name="N$18" class="0">
 <segment>
 <pinref part="ST2" gate="G$1" pin="PA1"/>
-<wire x1="251.46" y1="121.92" x2="271.78" y2="121.92" width="0.1524" layer="91"/>
-<wire x1="271.78" y1="121.92" x2="271.78" y2="119.38" width="0.1524" layer="91"/>
+<wire x1="238.76" y1="106.68" x2="259.08" y2="106.68" width="0.1524" layer="91"/>
+<wire x1="259.08" y1="106.68" x2="259.08" y2="111.76" width="0.1524" layer="91"/>
 <pinref part="L2" gate="G$1" pin="CGREEN"/>
-<wire x1="271.78" y1="119.38" x2="274.32" y2="119.38" width="0.1524" layer="91"/>
+<wire x1="259.08" y1="111.76" x2="261.62" y2="111.76" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="N$11" class="0">
+<net name="N$19" class="0">
 <segment>
 <pinref part="ST2" gate="G$1" pin="PA0"/>
-<wire x1="251.46" y1="119.38" x2="266.7" y2="119.38" width="0.1524" layer="91"/>
-<wire x1="266.7" y1="119.38" x2="266.7" y2="116.84" width="0.1524" layer="91"/>
-<wire x1="266.7" y1="116.84" x2="289.56" y2="116.84" width="0.1524" layer="91"/>
-<wire x1="289.56" y1="116.84" x2="289.56" y2="114.3" width="0.1524" layer="91"/>
-<wire x1="289.56" y1="114.3" x2="297.18" y2="114.3" width="0.1524" layer="91"/>
+<wire x1="238.76" y1="104.14" x2="256.54" y2="104.14" width="0.1524" layer="91"/>
+<wire x1="256.54" y1="104.14" x2="256.54" y2="101.6" width="0.1524" layer="91"/>
+<wire x1="256.54" y1="101.6" x2="276.86" y2="101.6" width="0.1524" layer="91"/>
+<wire x1="276.86" y1="101.6" x2="276.86" y2="99.06" width="0.1524" layer="91"/>
+<wire x1="276.86" y1="99.06" x2="284.48" y2="99.06" width="0.1524" layer="91"/>
 <pinref part="U$2" gate="G$1" pin="1"/>
 </segment>
 </net>
+<net name="SCLK" class="0">
+<segment>
+<pinref part="N2" gate="G$1" pin="SCLK"/>
+<pinref part="ST2" gate="G$1" pin="PA5"/>
+<wire x1="241.3" y1="157.48" x2="218.44" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="218.44" y1="157.48" x2="218.44" y2="124.46" width="0.1524" layer="91"/>
+<label x="223.52" y="157.48" size="1.778" layer="95"/>
+</segment>
+</net>
+<net name="MOSI" class="0">
+<segment>
+<pinref part="N2" gate="G$1" pin="MOSI"/>
+<pinref part="ST2" gate="G$1" pin="PA7"/>
+<wire x1="241.3" y1="152.4" x2="213.36" y2="152.4" width="0.1524" layer="91"/>
+<wire x1="213.36" y1="152.4" x2="213.36" y2="124.46" width="0.1524" layer="91"/>
+<label x="223.52" y="152.4" size="1.778" layer="95"/>
+</segment>
+</net>
+<net name="MISO" class="0">
+<segment>
+<pinref part="N2" gate="G$1" pin="MISO"/>
+<pinref part="ST2" gate="G$1" pin="PA6"/>
+<wire x1="241.3" y1="147.32" x2="215.9" y2="147.32" width="0.1524" layer="91"/>
+<wire x1="215.9" y1="147.32" x2="215.9" y2="124.46" width="0.1524" layer="91"/>
+<label x="223.52" y="147.32" size="1.778" layer="95"/>
+</segment>
+</net>
+<net name="N$23" class="0">
+<segment>
+<pinref part="SJ2" gate="1" pin="1"/>
+<pinref part="N2" gate="G$1" pin="VP_IO"/>
+<wire x1="276.86" y1="142.24" x2="271.78" y2="142.24" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="AMS_CS" class="0">
+<segment>
+<pinref part="N2" gate="G$1" pin="SS"/>
+<pinref part="ST2" gate="G$1" pin="PB0"/>
+<wire x1="210.82" y1="124.46" x2="210.82" y2="162.56" width="0.1524" layer="91"/>
+<wire x1="210.82" y1="162.56" x2="241.3" y2="162.56" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$25" class="0">
+<segment>
+<pinref part="N2" gate="G$1" pin="LC2"/>
+<wire x1="271.78" y1="157.48" x2="297.18" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="297.18" y1="157.48" x2="297.18" y2="165.1" width="0.1524" layer="91"/>
+<pinref part="COIL2" gate="G$1" pin="1"/>
+<wire x1="297.18" y1="165.1" x2="312.42" y2="165.1" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$26" class="0">
+<segment>
+<pinref part="N2" gate="G$1" pin="LC1"/>
+<wire x1="271.78" y1="152.4" x2="297.18" y2="152.4" width="0.1524" layer="91"/>
+<wire x1="297.18" y1="152.4" x2="297.18" y2="149.86" width="0.1524" layer="91"/>
+<pinref part="COIL2" gate="G$1" pin="2"/>
+<wire x1="297.18" y1="149.86" x2="312.42" y2="149.86" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="AMS_IRQ" class="0">
+<segment>
+<pinref part="ST2" gate="G$1" pin="PC15"/>
+<wire x1="238.76" y1="96.52" x2="241.3" y2="96.52" width="0.1524" layer="91"/>
+<label x="241.3" y="96.52" size="1.778" layer="95"/>
+</segment>
+<segment>
+<pinref part="N2" gate="G$1" pin="IRQ"/>
+<wire x1="241.3" y1="142.24" x2="233.68" y2="142.24" width="0.1524" layer="91"/>
+<label x="233.68" y="139.7" size="1.778" layer="95"/>
+</segment>
+</net>
 </nets>
 </sheet>
 </sheets>