diff --git a/.gitignore b/.gitignore
index 7d3da71..9a9a3d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,8 @@
 CAMOutputs/
 CAMOutputs.zip
 *.swp
+*.gbr
+*.zip
+*.pdf
+5-*
+6-*
diff --git a/solo/USB-A.brd b/solo/USB-A.brd
index a5f8b9e..464fdff 100644
--- a/solo/USB-A.brd
+++ b/solo/USB-A.brd
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="9.2.2">
+<eagle version="9.3.0">
 <drawing>
 <settings>
-<setting alwaysvectorfont="no"/>
+<setting alwaysvectorfont="yes"/>
 <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"/>
+<grid distance="1" unitdist="mic" unit="mic" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="mm" altunit="mm"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
+<layer number="2" name="Route2" color="16" fill="1" visible="no" active="no"/>
+<layer number="15" name="Route15" color="23" fill="1" visible="yes" active="yes"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
@@ -23,7 +25,7 @@
 <layer number="27" name="tValues" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="yes"/>
-<layer number="30" name="bStop" color="7" fill="6" visible="yes" active="yes"/>
+<layer number="30" name="bStop" color="7" fill="6" visible="no" active="yes"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="yes"/>
 <layer number="32" name="bCream" color="7" fill="5" visible="no" active="yes"/>
 <layer number="33" name="tFinish" color="6" fill="3" visible="no" active="yes"/>
@@ -42,7 +44,7 @@
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="49" name="Reference" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="49" name="Reference" color="7" fill="1" visible="no" active="yes"/>
 <layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="88" name="SimResults" color="9" fill="1" visible="no" active="no"/>
@@ -59,90 +61,53 @@
 <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="7fa645f3-9a4e-baa4-34f7-96cfb9079614"/>
+<fusionsync huburn="a.cGVyc29uYWw6dWUyYjdlZTY2" projecturn="a.cGVyc29uYWw6dWUyYjdlZTY2IzIwMTgwNDI5MTI5NzYxOTgx" f3durn="urn:adsk.wipprod:dm.lineage:j4HlS92DQ3aJOR3aA8LYVQ" pcbguid="4a57c918-3773-4eb5-941a-4639588bec0f" lastpulledtime="" lastsyncedchangeguid="8ec78108-e873-5518-f778-6aed3102f0ab"/>
 <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"/>
-<wire x1="45.9" y1="61.7" x2="69" y2="61.7" width="0.2" layer="47"/>
-<wire x1="69" y1="61.7" x2="76" y2="61.7" width="0.2" layer="47"/>
-<wire x1="76" y1="61.7" x2="76" y2="46.7" width="0.2" layer="47"/>
-<wire x1="76" y1="46.7" x2="46" y2="46.7" width="0.2" layer="47"/>
-<wire x1="46" y1="46.7" x2="46" y2="49.2" width="0.2" layer="47"/>
-<wire x1="46" y1="49.2" x2="35" y2="49.2" width="0.2" layer="47"/>
-<wire x1="35" y1="49.2" x2="35" y2="59.3" width="0.2" layer="47"/>
-<wire x1="75.9" y1="46.8" x2="69" y2="61.7" width="0.1524" layer="47"/>
-<wire x1="76" y1="61.7" x2="68.9" y2="46.8" width="0.1524" layer="47"/>
-<wire x1="78.1" y1="60.55" x2="39.15" y2="60.55" width="0.1524" layer="49"/>
-<wire x1="78.1" y1="60.5" x2="39.15" y2="60.5" width="0.1524" layer="49"/>
-<wire x1="37.27241875" y1="55.53265" x2="37.27241875" y2="65.53265" width="0.1" layer="20"/>
-<wire x1="37.27241875" y1="65.53265" x2="38.27241875" y2="66.53265" width="0.1" layer="20" curve="-90"/>
-<wire x1="38.27241875" y1="66.53265" x2="49.57241875" y2="66.53265" width="0.1" layer="20"/>
-<wire x1="49.57241875" y1="66.53265" x2="50.07241875" y2="67.03265" width="0.1" layer="20" curve="90"/>
-<wire x1="50.07241875" y1="67.03265" x2="50.07241875" y2="67.53265" width="0.1" layer="20"/>
-<wire x1="50.07241875" y1="67.53265" x2="50.57241875" y2="68.03265" width="0.1" layer="20" curve="-90"/>
-<wire x1="50.57241875" y1="68.03265" x2="76.07241875" y2="68.03265" width="0.1" layer="20"/>
-<wire x1="76.07241875" y1="68.03265" x2="80.07241875" y2="64.03265" width="0.1" layer="20" curve="-90"/>
-<wire x1="80.07241875" y1="64.03265" x2="80.07241875" y2="57.03265" width="0.1" layer="20"/>
-<wire x1="80.07241875" y1="57.03265" x2="76.07241875" y2="53.03265" width="0.1" layer="20" curve="-90"/>
-<wire x1="76.07241875" y1="53.03265" x2="50.57241875" y2="53.03265" width="0.1" layer="20"/>
-<wire x1="50.57241875" y1="53.03265" x2="50.07241875" y2="53.53265" width="0.1" layer="20" curve="-90"/>
-<wire x1="50.07241875" y1="53.53265" x2="50.07241875" y2="54.03265" width="0.1" layer="20"/>
-<wire x1="50.07241875" y1="54.03265" x2="49.57241875" y2="54.53265" width="0.1" layer="20" curve="90"/>
-<wire x1="49.57241875" y1="54.53265" x2="38.27241875" y2="54.53265" width="0.1" layer="20"/>
-<wire x1="38.27241875" y1="54.53265" x2="37.27241875" y2="55.53265" width="0.1" layer="20" curve="-90"/>
-<rectangle x1="37.75" y1="62.55" x2="38.55" y2="62.75" layer="41"/>
-<hole x="66.1" y="58" drill="0.5"/>
-<wire x1="64.65" y1="68" x2="73.65" y2="68" width="0.1524" layer="48"/>
-<wire x1="80.1" y1="59.15" x2="80.1" y2="62.85" width="0.1524" layer="48"/>
-<wire x1="63.25" y1="53" x2="71.15" y2="53" width="0.1524" layer="48"/>
-<hole x="71" y="58.35" drill="0.5"/>
-<hole x="71" y="63.2" drill="0.5"/>
-<hole x="67.05" y="63.45" drill="0.5"/>
-<text x="66.3" y="53.25" size="1.4224" layer="21">Solo</text>
-<text x="66.7" y="66.35" size="1.4224" layer="21">v1.4</text>
-<hole x="66.1" y="57.95" drill="0.5"/>
-<wire x1="64.65" y1="67.95" x2="73.65" y2="67.95" width="0.1524" layer="48"/>
-<wire x1="80.1" y1="59.1" x2="80.1" y2="62.8" width="0.1524" layer="48"/>
-<wire x1="63.25" y1="52.95" x2="71.15" y2="52.95" width="0.1524" layer="48"/>
-<hole x="71" y="58.3" drill="0.5"/>
-<hole x="71" y="63.15" drill="0.5"/>
-<hole x="67.05" y="63.4" drill="0.5"/>
-<circle x="76.55" y="60.5" radius="2.282540625" width="0.1524" layer="20"/>
-<wire x1="74.043109375" y1="68.019359375" x2="55.043109375" y2="68.019359375" width="0.05" layer="49"/>
-<wire x1="55.043109375" y1="68.019359375" x2="55.043109375" y2="53.019359375" width="0.05" layer="49"/>
-<wire x1="55.043109375" y1="53.019359375" x2="76.043109375" y2="53.019359375" width="0.05" layer="49"/>
-<wire x1="76.043109375" y1="53.019359375" x2="80.043109375" y2="57.019359375" width="0.05" layer="49" curve="90"/>
-<wire x1="80.043109375" y1="57.019359375" x2="80.043109375" y2="62.019359375" width="0.05" layer="49"/>
-<wire x1="80.043109375" y1="62.019359375" x2="79.386859375" y2="64.747790625" width="0.05" layer="49" curve="27.048102"/>
-<circle x="76.543109375" y="60.519359375" radius="2.125" width="0.05" layer="49"/>
-<wire x1="79.386859375" y1="64.747790625" x2="78.543109375" y2="65.987990625" width="0.05" layer="49" curve="14.361538"/>
-<wire x1="78.543109375" y1="65.987990625" x2="74.043109375" y2="68.019359375" width="0.05" layer="49" curve="48.590347"/>
-<wire x1="78.67775" y1="66.440059375" x2="78.07775" y2="65.910909375" width="0.05" layer="49"/>
-<wire x1="78.07775" y1="65.910909375" x2="78.243109375" y2="65.723409375" width="0.05" layer="49"/>
-<wire x1="78.243109375" y1="65.723409375" x2="78.40846875" y2="65.535909375" width="0.05" layer="49"/>
-<wire x1="78.40846875" y1="65.535909375" x2="79.00846875" y2="66.065059375" width="0.05" layer="49"/>
-<wire x1="79.00846875" y1="66.065059375" x2="78.843109375" y2="66.252559375" width="0.05" layer="49"/>
-<wire x1="78.843109375" y1="66.252559375" x2="78.67775" y2="66.440059375" width="0.05" layer="49"/>
-<wire x1="78.843109375" y1="66.252559375" x2="78.243109375" y2="65.723409375" width="0.05" layer="49"/>
-<wire x1="78.543109375" y1="65.987990625" x2="78.70846875" y2="65.800490625" width="0.05" layer="49"/>
-<wire x1="79.856790625" y1="64.70703125" x2="79.62941875" y2="65.152340625" width="0.05" layer="49"/>
-<wire x1="79.62941875" y1="65.152340625" x2="78.91691875" y2="64.78855" width="0.05" layer="49"/>
-<wire x1="78.91691875" y1="64.78855" x2="79.144290625" y2="64.343240625" width="0.05" layer="49"/>
-<wire x1="79.144290625" y1="64.343240625" x2="79.856790625" y2="64.70703125" width="0.05" layer="49"/>
-<wire x1="79.030609375" y1="64.5659" x2="79.743109375" y2="64.929690625" width="0.05" layer="49"/>
-<wire x1="79.386859375" y1="64.747790625" x2="79.500540625" y2="64.525140625" width="0.05" layer="49"/>
-<polygon width="0.1524" layer="30">
-<vertex x="78.8" y="64.8"/>
-<vertex x="79.6" y="65.2"/>
-<vertex x="79.9" y="64.7"/>
-<vertex x="79.1" y="64.3"/>
-</polygon>
-<polygon width="0.1524" layer="30">
-<vertex x="78.7" y="66.5"/>
-<vertex x="79.1" y="66.1"/>
-<vertex x="78.4" y="65.5"/>
-<vertex x="78" y="66"/>
-</polygon>
+<rectangle x1="3.6" y1="49.05" x2="4.4" y2="49.25" layer="41"/>
+<text x="32.384" y="39.582" size="1.4224" layer="21">Solo</text>
+<wire x1="30.55" y1="55" x2="39.55" y2="55" width="0.1524" layer="48"/>
+<wire x1="46.25" y1="45.35" x2="46.25" y2="49.05" width="0.1524" layer="48"/>
+<wire x1="29.25" y1="39" x2="37.15" y2="39" width="0.1524" layer="48"/>
+<wire x1="40.5" y1="52.75" x2="23.4" y2="52.75" width="0.152" layer="49"/>
+<wire x1="23.4" y1="52.75" x2="23.4" y2="41.75" width="0.152" layer="49"/>
+<wire x1="23.4" y1="41.75" x2="40.5" y2="41.75" width="0.152" layer="49"/>
+<wire x1="2.47241875" y1="41.98265" x2="2.47241875" y2="51.98265" width="0.1" layer="49"/>
+<wire x1="2.47241875" y1="51.98265" x2="3.47241875" y2="52.98265" width="0.1" layer="49" curve="-90"/>
+<wire x1="14.77241875" y1="52.98265" x2="15.27241875" y2="53.48265" width="0.1" layer="49" curve="90"/>
+<wire x1="15.77241875" y1="54.98265" x2="42.27241875" y2="54.98265" width="0.1" layer="49"/>
+<wire x1="42.27241875" y1="38.98265" x2="15.77241875" y2="38.98265" width="0.1" layer="49"/>
+<wire x1="15.77241875" y1="38.98265" x2="15.27241875" y2="39.48265" width="0.1" layer="49" curve="-90"/>
+<wire x1="15.27241875" y1="39.48265" x2="15.27241875" y2="40.48265" width="0.1" layer="49"/>
+<wire x1="15.27241875" y1="40.48265" x2="14.77241875" y2="40.98265" width="0.1" layer="49" curve="90"/>
+<wire x1="3.47241875" y1="40.98265" x2="2.47241875" y2="41.98265" width="0.1" layer="49" curve="-90"/>
+<wire x1="9.8" y1="47.051" x2="46.283" y2="46.972" width="0.2" layer="49"/>
+<hole x="37.25" y="49.44" drill="0.5"/>
+<text x="31.602" y="53.224" size="1.4224" layer="21" ratio="15">v2.1</text>
+<hole x="32.75" y="44.19" drill="0.5"/>
+<wire x1="3.48241875" y1="52.99265" x2="14.78241875" y2="52.99265" width="0.1" layer="49"/>
+<wire x1="15.28241875" y1="53.49265" x2="15.28241875" y2="54.49265" width="0.1" layer="49"/>
+<wire x1="15.28241875" y1="54.49265" x2="15.78241875" y2="54.99265" width="0.1" layer="49" curve="-90"/>
+<wire x1="42.28241875" y1="54.99265" x2="46.28241875" y2="50.99265" width="0.1" layer="49" curve="-90"/>
+<wire x1="46.28241875" y1="50.99265" x2="46.28241875" y2="42.99265" width="0.1" layer="49"/>
+<wire x1="46.28241875" y1="42.99265" x2="42.28241875" y2="38.99265" width="0.1" layer="49" curve="-90"/>
+<wire x1="14.78241875" y1="40.99265" x2="3.48241875" y2="40.99265" width="0.1" layer="49"/>
+<wire x1="2.48241875" y1="41.99265" x2="2.48241875" y2="51.99265" width="0.1" layer="20"/>
+<wire x1="2.48241875" y1="51.99265" x2="3.48241875" y2="52.99265" width="0.1" layer="20" curve="-90"/>
+<wire x1="3.48241875" y1="52.99265" x2="14.78241875" y2="52.99265" width="0.1" layer="20"/>
+<wire x1="14.78241875" y1="52.99265" x2="15.28241875" y2="53.49265" width="0.1" layer="20" curve="90"/>
+<wire x1="15.28241875" y1="53.49265" x2="15.28241875" y2="54.49265" width="0.1" layer="20"/>
+<wire x1="15.28241875" y1="54.49265" x2="15.78241875" y2="54.99265" width="0.1" layer="20" curve="-90"/>
+<wire x1="15.78241875" y1="54.99265" x2="42.28241875" y2="54.99265" width="0.1" layer="20"/>
+<wire x1="42.28241875" y1="54.99265" x2="46.28241875" y2="50.99265" width="0.1" layer="20" curve="-90"/>
+<wire x1="46.28241875" y1="50.99265" x2="46.28241875" y2="42.99265" width="0.1" layer="20"/>
+<wire x1="46.28241875" y1="42.99265" x2="42.28241875" y2="38.99265" width="0.1" layer="20" curve="-90"/>
+<wire x1="42.28241875" y1="38.99265" x2="15.78241875" y2="38.99265" width="0.1" layer="20"/>
+<wire x1="15.78241875" y1="38.99265" x2="15.28241875" y2="39.49265" width="0.1" layer="20" curve="-90"/>
+<wire x1="15.28241875" y1="39.49265" x2="15.28241875" y2="40.49265" width="0.1" layer="20"/>
+<wire x1="15.28241875" y1="40.49265" x2="14.78241875" y2="40.99265" width="0.1" layer="20" curve="90"/>
+<wire x1="14.78241875" y1="40.99265" x2="3.48241875" y2="40.99265" width="0.1" layer="20"/>
+<wire x1="3.48241875" y1="40.99265" x2="2.48241875" y2="41.99265" width="0.1" layer="20" curve="-90"/>
+<circle x="42.03241875" y="46.99265" radius="2.125" width="0.1" layer="20"/>
 </plain>
 <libraries>
 <library name="efm-fido" urn="urn:adsk.eagle:library:4245354">
@@ -158,16 +123,7 @@
 <rectangle x1="-4.15" y1="-2.25" x2="5.45" y2="-0.05" layer="29"/>
 <rectangle x1="-4.15" y1="-4.6" x2="5.95" y2="-2.4" layer="29"/>
 </package>
-<package name="B1,27" urn="urn:adsk.eagle:footprint:27900/1" library_version="2" library_locally_modified="yes">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<wire x1="-0.635" y1="0" x2="0.635" y2="0" width="0.0024" layer="37"/>
-<wire x1="0" y1="0.635" x2="0" y2="-0.635" width="0.0024" layer="37"/>
-<smd name="TP" x="0" y="0" dx="1.27" dy="1.27" layer="1" roundness="100" cream="no"/>
-<text x="-0.635" y="1.016" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="-0.635" y="-0.762" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="-0.635" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="R0402" urn="urn:adsk.eagle:footprint:4245803/4" library_version="49" library_locally_modified="yes">
+<package name="R0402" urn="urn:adsk.eagle:footprint:4245803/4" library_version="48">
 <description>&lt;b&gt;RESISTOR&lt;/b&gt;</description>
 <wire x1="-0.245" y1="0.224" x2="0.245" y2="0.224" width="0.1524" layer="51"/>
 <wire x1="0.245" y1="-0.224" x2="-0.245" y2="-0.224" width="0.1524" layer="51"/>
@@ -183,6 +139,15 @@
 <rectangle x1="0.2588" y1="-0.3048" x2="0.5588" y2="0.2951" layer="51"/>
 <rectangle x1="-0.1999" y1="-0.4001" x2="0.1999" y2="0.4001" layer="35"/>
 </package>
+<package name="B1,27" urn="urn:adsk.eagle:footprint:27900/1" library_version="2" library_locally_modified="yes">
+<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
+<wire x1="-0.635" y1="0" x2="0.635" y2="0" width="0.0024" layer="37"/>
+<wire x1="0" y1="0.635" x2="0" y2="-0.635" width="0.0024" layer="37"/>
+<smd name="TP" x="0" y="0" dx="1.27" dy="1.27" layer="1" roundness="100" cream="no"/>
+<text x="-0.635" y="1.016" size="1.27" layer="25" ratio="10">&gt;NAME</text>
+<text x="-0.635" y="-0.762" size="0.0254" layer="27">&gt;VALUE</text>
+<text x="-0.635" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
+</package>
 <package name="C0402" urn="urn:adsk.eagle:footprint:4894774/3" library_version="49" library_locally_modified="yes">
 <description>&lt;b&gt;CAPACITOR&lt;/b&gt;</description>
 <wire x1="-0.245" y1="0.224" x2="0.245" y2="0.224" width="0.1524" layer="51"/>
@@ -199,16 +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="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"/>
-<smd name="P$4" x="0" y="0" dx="0.4" dy="0.4" layer="1"/>
-<smd name="P$3" x="0" y="0.85" dx="0.4" dy="0.4" layer="1"/>
-<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/3" library_version="62">
+<package name="QFN32" urn="urn:adsk.eagle:footprint:6434393/4" library_version="66">
 <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"/>
@@ -685,14 +641,14 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-1.675" y="2.125"/>
 <vertex x="-1.675" y="2.575"/>
 </polygon>
-<polygon width="0.127" layer="1" spacing="0.6" pour="hatch">
+<polygon width="0.127" layer="1" spacing="0.7112" pour="hatch">
 <vertex x="-1.5" y="1.5"/>
 <vertex x="1.5" y="1.5"/>
 <vertex x="1.5" y="-1.5"/>
 <vertex x="-1.5" y="-1.5"/>
 </polygon>
 </package>
-<package name="REG_NCP114AMX330TCG" urn="urn:adsk.eagle:footprint:5621085/2" library_version="57">
+<package name="REG_NCP114AMX330TCG" urn="urn:adsk.eagle:footprint:5621085/3" library_version="66">
 <polygon width="0.001" layer="1">
 <vertex x="-0.475" y="0.65"/>
 <vertex x="-0.475" y="0.22"/>
@@ -775,7 +731,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-0.475" y="-0.05"/>
 <vertex x="-0.525" y="-0.05"/>
 </polygon>
-<circle x="-0.64" y="-0.648" radius="0.0508" width="0.1016" layer="21"/>
+<circle x="-0.74" y="-0.848" radius="0.14" width="0.1016" layer="21"/>
 <wire x1="-0.5" y1="0.5" x2="-0.5" y2="-0.5" width="0.1" layer="51"/>
 <wire x1="-0.5" y1="-0.5" x2="0.5" y2="-0.5" width="0.1" layer="51"/>
 <wire x1="0.5" y1="-0.5" x2="0.5" y2="0.5" width="0.1" layer="51"/>
@@ -801,7 +757,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/5" library_version="60">
+<package name="DOME-BL-12MM" urn="urn:adsk.eagle:footprint:5648518/7" library_version="70">
 <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"/>
@@ -1063,19 +1019,19 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <wire x1="-1.3" y1="-1.2" x2="-1.5" y2="-1" width="0.127" layer="1"/>
 <wire x1="-1.5" y1="-1" x2="-1.7" y2="-0.6" width="0.127" layer="1"/>
 <wire x1="-1.7" y1="-0.6" x2="-1.8" y2="-0.3" width="0.127" layer="1"/>
-<polygon width="0.1" layer="1" spacing="0.508" pour="hatch">
+<polygon width="0.1" layer="1" spacing="0.75" pour="hatch">
 <vertex x="-3.74" y="2.4937"/>
 <vertex x="-5.59" y="2.4937"/>
 <vertex x="-5.59" y="3.76"/>
 <vertex x="-3.76" y="5.59"/>
-<vertex x="3.76" y="5.59"/>
-<vertex x="5.59" y="3.76"/>
-<vertex x="4.4" y="2.96"/>
-<vertex x="4.3" y="-2.9"/>
-<vertex x="5.3" y="-3.3"/>
-<vertex x="5.39" y="-3.96"/>
+<vertex x="1.7788" y="5.6154"/>
+<vertex x="3.1088" y="4.1854"/>
+<vertex x="4.2" y="3.06"/>
+<vertex x="4.2" y="-3.9"/>
+<vertex x="4.7" y="-4"/>
+<vertex x="5.19" y="-4.16"/>
 <vertex x="3.76" y="-5.59"/>
-<vertex x="-3.76" y="-5.59"/>
+<vertex x="-3.86" y="-5.59"/>
 <vertex x="-5.59" y="-3.76"/>
 <vertex x="-5.59" y="-2.4937"/>
 <vertex x="-3.74" y="-2.4937"/>
@@ -1089,14 +1045,13 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-3.74" y="2.9937"/>
 </polygon>
 <polygon width="0.1524" layer="29">
-<vertex x="-3.8" y="5.6"/>
-<vertex x="-5.6" y="3.8"/>
-<vertex x="-5.6" y="2.5"/>
+<vertex x="-3.8" y="5.7"/>
+<vertex x="-5.7" y="3.8"/>
+<vertex x="-5.6" y="2.4"/>
 <vertex x="-3.7" y="2.5"/>
-<vertex x="-3.7" y="3"/>
-<vertex x="-3" y="3.7"/>
-<vertex x="3" y="3.7"/>
-<vertex x="3.7" y="3"/>
+<vertex x="-2.9" y="3.7"/>
+<vertex x="2.9" y="3.7"/>
+<vertex x="3.7" y="2.8"/>
 <vertex x="3.7" y="-3"/>
 <vertex x="3" y="-3.7"/>
 <vertex x="-3" y="-3.7"/>
@@ -1106,14 +1061,17 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-5.6" y="-3.8"/>
 <vertex x="-3.8" y="-5.6"/>
 <vertex x="3.8" y="-5.6"/>
-<vertex x="5.6" y="-3.8"/>
-<vertex x="5.6" y="3.8"/>
-<vertex x="3.8" y="5.6"/>
+<vertex x="4.6" y="-5"/>
+<vertex x="5.2" y="-4.1"/>
+<vertex x="4.2" y="-3.9"/>
+<vertex x="4.2" y="3"/>
+<vertex x="3.1172" y="4.2254"/>
+<vertex x="1.8172" y="5.6254"/>
 </polygon>
 <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.3" y="4.3" dx="0.5" dy="0.5" layer="1" stop="no" cream="no"/>
 </package>
-<package name="MLPD3X3" urn="urn:adsk.eagle:footprint:5825737/4" library_version="61">
+<package name="MLPD3X3" urn="urn:adsk.eagle:footprint:5825737/7" library_version="77">
 <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"/>
@@ -1127,12 +1085,28 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <smd name="P$11" x="1.6" y="-1.64" dx="0.2" dy="0.2" 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>
-<polygon width="0.127" layer="1" spacing="0.58" pour="hatch">
+<polygon width="0.127" layer="1" spacing="0.7366" pour="hatch">
 <vertex x="0.7" y="-0.4"/>
 <vertex x="2.3" y="-0.4"/>
 <vertex x="2.3" y="-2.7"/>
 <vertex x="0.7" y="-2.7"/>
 </polygon>
+<polygon width="0.127" layer="29">
+<vertex x="0.7" y="-0.4"/>
+<vertex x="2.3" y="-0.4"/>
+<vertex x="2.3" y="-2.7"/>
+<vertex x="0.7" y="-2.7"/>
+</polygon>
+<circle x="-0.5588" y="0.2286" radius="0.1626375" width="0.3556" layer="25"/>
+</package>
+<package name="CL-505S-X-SD-T" urn="urn:adsk.eagle:footprint:4878738/5" library_version="78">
+<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"/>
+<smd name="P$4" x="0" y="0" dx="0.4" dy="0.4" layer="1"/>
+<smd name="P$3" x="0" y="0.85" dx="0.4" dy="0.4" layer="1"/>
+<text x="-0.4" y="1.4" size="0.4" layer="21">&gt;NAME</text>
+<circle x="1.2508" y="-0.4002" radius="0.1" width="0.2032" layer="21"/>
 </package>
 </packages>
 <packages3d>
@@ -1141,38 +1115,32 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <packageinstance name="USB_TRACES"/>
 </packageinstances>
 </package3d>
+<package3d name="R0402" urn="urn:adsk.eagle:package:4245807/6" type="model" library_version="48">
+<description>&lt;b&gt;RESISTOR&lt;/b&gt;</description>
+<packageinstances>
+<packageinstance name="R0402"/>
+</packageinstances>
+</package3d>
 <package3d name="B1,27" urn="urn:adsk.eagle:package:4245792/4" type="box" library_version="7" library_locally_modified="yes">
 <description>TEST PAD</description>
 <packageinstances>
 <packageinstance name="B1,27"/>
 </packageinstances>
 </package3d>
-<package3d name="R0402" urn="urn:adsk.eagle:package:4245807/6" type="model" library_version="49" library_locally_modified="yes">
-<description>&lt;b&gt;RESISTOR&lt;/b&gt;</description>
-<packageinstances>
-<packageinstance name="R0402"/>
-</packageinstances>
-</package3d>
 <package3d name="C0402" urn="urn:adsk.eagle:package:4245806/7" type="model" library_version="49" library_locally_modified="yes">
 <description>&lt;b&gt;CAPACITOR&lt;/b&gt;</description>
 <packageinstances>
 <packageinstance name="C0402"/>
 </packageinstances>
 </package3d>
-<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/7" type="model" library_version="62">
+<package3d name="QFN50P500X500X50-32" urn="urn:adsk.eagle:package:4245373/8" type="model" library_version="66">
 <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/3" type="model" library_version="57">
+<package3d name="DFN100X100X60-4" urn="urn:adsk.eagle:package:5621121/4" type="model" library_version="66">
 <packageinstances>
 <packageinstance name="REG_NCP114AMX330TCG"/>
 </packageinstances>
@@ -1182,16 +1150,22 @@ 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/7" type="model" library_version="60">
+<package3d name="DOME-BL-12MM" urn="urn:adsk.eagle:package:5648519/9" type="model" library_version="70">
 <packageinstances>
 <packageinstance name="DOME-BL-12MM"/>
 </packageinstances>
 </package3d>
-<package3d name="MLPD3X3" urn="urn:adsk.eagle:package:5825738/4" type="box" library_version="61">
+<package3d name="MLPD3X3" urn="urn:adsk.eagle:package:5825738/7" type="box" library_version="77">
 <packageinstances>
 <packageinstance name="MLPD3X3"/>
 </packageinstances>
 </package3d>
+<package3d name="CL-505S-X-SD-T" urn="urn:adsk.eagle:package:4878740/7" type="box" library_version="78">
+<description>CL-505S-X-SD-T</description>
+<packageinstances>
+<packageinstance name="CL-505S-X-SD-T"/>
+</packageinstances>
+</package3d>
 </packages3d>
 </library>
 </libraries>
@@ -1203,6 +1177,9 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <class number="0" name="default" width="0.1524" drill="0.2032">
 <clearance class="0" value="0.1016"/>
 </class>
+<class number="1" name="nfc" width="0.0889" drill="0.2032">
+<clearance class="1" value="0.0889"/>
+</class>
 </classes>
 <designrules name="default *">
 <description language="de">&lt;b&gt;EAGLE Design Rules&lt;/b&gt;
@@ -1221,7 +1198,7 @@ necessary adjustments and save your customized
 design rules under a new name.</description>
 <param name="layerSetup" value="(1*16)"/>
 <param name="mtCopper" value="0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm"/>
-<param name="mtIsolate" value="1.93mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm"/>
+<param name="mtIsolate" value="2.35mm 1.93mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm"/>
 <param name="mdWireWire" value="4mil"/>
 <param name="mdWirePad" value="4mil"/>
 <param name="mdWireVia" value="5mil"/>
@@ -1388,680 +1365,705 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="U1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="USB_TRACES" package3d_urn="urn:adsk.eagle:package:4245369/9" value="USB_TRACES" x="43.95" y="60.55" smashed="yes" rot="R180">
-<attribute name="NAME" x="46.49" y="55.47" size="1.27" layer="25" rot="R180" display="off"/>
-<attribute name="VALUE" x="46.49" y="66.9" size="1.27" layer="27" rot="R180" display="off"/>
+<element name="U1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="USB_TRACES" package3d_urn="urn:adsk.eagle:package:4245369/9" value="USB_TRACES" x="9.6" y="47.05" smashed="yes" rot="R180">
+<attribute name="NAME" x="12.14" y="41.97" size="1.27" layer="25" rot="R180" display="off"/>
+<attribute name="VALUE" x="12.14" y="53.4" 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="58.95" y="66.56" smashed="yes">
-<attribute name="NAME" x="58.965" y="67.245" size="0.6096" layer="25"/>
-<attribute name="VALUE" x="60.215" y="66.355" size="0.6096" layer="27"/>
+<element name="C1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u" x="26.64" y="53.03" smashed="yes">
+<attribute name="NAME" x="26.545" y="53.715" size="0.6096" layer="25" ratio="15"/>
+<attribute name="VALUE" x="27.905" y="52.825" 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="58.99" y="65.19" smashed="yes">
-<attribute name="NAME" x="62.505" y="65.075" size="0.6096" layer="25"/>
-<attribute name="VALUE" x="60.455" y="64.985" size="0.6096" layer="27"/>
+<element name="C2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="26.63" y="52.19" smashed="yes">
+<attribute name="NAME" x="26.665" y="51.055" size="0.6096" layer="25" ratio="15"/>
+<attribute name="VALUE" x="28.095" y="51.985" 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="54.83" y="62.665" smashed="yes" rot="R180">
-<attribute name="NAME" x="55.365" y="63.93" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="53.465" y="62.87" size="0.6096" layer="27" rot="R180"/>
+<element name="C4" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u" x="21.5" y="49.225" smashed="yes" rot="R180">
+<attribute name="NAME" x="20.155" y="49.43" size="0.6096" layer="25" ratio="15" 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="54.79" y="61.76" smashed="yes" rot="R180">
-<attribute name="NAME" x="53.625" y="61.925" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="52.525" y="61.865" size="0.6096" layer="27" rot="R180"/>
+<element name="C5" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="21.48" y="48.3" smashed="yes" rot="R180">
+<attribute name="NAME" x="20.155" y="48.495" size="0.6096" layer="25" ratio="15" 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="55.8" y="57.45" smashed="yes" rot="MR0">
-<attribute name="NAME" x="54.985" y="57.316" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="56.435" y="56.688" 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="34.2" y="43.79" smashed="yes" rot="MR0">
+<attribute name="NAME" x="36.635" y="44.206" size="0.6096" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="34.835" y="43.028" 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="54.3" y="61.6" smashed="yes" rot="MR0">
-<attribute name="NAME" x="56.335" y="61.816" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="54.435" y="60.888" 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="17.82" y="53.7" smashed="yes" rot="MR0">
+<attribute name="NAME" x="19.055" y="52.216" size="0.6096" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="18.455" y="52.938" 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="67.75" y="57.25" smashed="yes" rot="MR0">
-<attribute name="NAME" x="70.185" y="57.666" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="68.385" y="56.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="29.46" y="42.89" smashed="yes" rot="MR0">
+<attribute name="NAME" x="31.655" y="41.916" size="0.6096" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="29.595" y="42.628" 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="55.25" y="65.1" smashed="yes" rot="MR0">
-<attribute name="NAME" x="57.485" y="65.116" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="55.885" y="64.338" 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="18.16" y="40.38" smashed="yes" rot="MR0">
+<attribute name="NAME" x="19.595" y="41.496" size="0.6096" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="18.795" y="39.618" 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="52.45" y="53.95" smashed="yes" rot="MR0">
-<attribute name="NAME" x="53.385" y="54.716" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="52.585" y="53.688" 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="23.65" y="42.34" smashed="yes" rot="MR0">
+<attribute name="NAME" x="25.065" y="40.686" size="0.6096" layer="26" ratio="15" rot="MR0"/>
+<attribute name="VALUE" x="24.285" y="41.578" 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="55.1" y="54.05" smashed="yes" rot="MR0">
-<attribute name="NAME" x="56.535" y="54.966" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="55.735" y="53.288" size="0.0254" layer="28" rot="MR0"/>
+<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="24.29" y="43.32" smashed="yes" rot="R180">
+<attribute name="NAME" x="23.055" y="43.525" size="0.6096" layer="25" ratio="15" rot="R180"/>
 </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="57.45" y="53.95" smashed="yes" rot="MR0">
-<attribute name="NAME" x="61.485" y="53.366" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="58.085" y="53.188" 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="24.91" y="44.3" smashed="yes" rot="MR0">
+<attribute name="NAME" x="25.945" y="45.066" size="0.8128" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="25.545" y="43.538" size="0.0254" layer="28" rot="MR0"/>
 </element>
-<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="57.7" y="56.4" smashed="yes" rot="R180">
-<attribute name="NAME" x="56.535" y="56.615" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="58.235" y="57.455" size="0.6096" layer="27" rot="R180"/>
+<element name="C6" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u" x="26.5" y="43.84" smashed="yes" rot="R180">
+<attribute name="NAME" x="29.115" y="44.455" size="0.6096" layer="25" ratio="15" rot="R180"/>
+<attribute name="VALUE" x="29.785" y="45.195" 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="68.9" y="60.9" smashed="yes" rot="R180">
-<attribute name="NAME" x="68.75" y="61.7" size="0.4" layer="21" rot="R180"/>
+<element name="C13" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="26.5" y="42.99" smashed="yes" rot="R180">
+<attribute name="NAME" x="29.385" y="42.915" size="0.6096" layer="25" ratio="15" 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="58.2" y="57.5" smashed="yes" rot="MR0">
-<attribute name="NAME" x="59.235" y="58.266" size="0.8128" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="58.835" y="56.738" size="0.0254" layer="28" rot="MR0"/>
+<element name="ST2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="QFN32" package3d_urn="urn:adsk.eagle:package:4245373/8" value="STM32L432KCU6" x="25.45" y="47.29" smashed="yes" rot="R180">
+<attribute name="NAME" x="26.34" y="50.72" size="0.6096" layer="25" ratio="15" rot="R180"/>
+<attribute name="VALUE" x="29.5" y="51.64" size="1.27" layer="27" rot="R180" display="off"/>
 </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="63.6" y="56.1" smashed="yes" rot="MR0">
-<attribute name="NAME" x="65.335" y="56.816" size="0.8128" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="64.235" y="55.338" size="0.0254" layer="28" rot="MR0"/>
+<element name="L3" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="REG_NCP114AMX330TCG" package3d_urn="urn:adsk.eagle:package:5621121/4" value="NCP114AMX330TCG" x="24.57" y="52.13" smashed="yes">
+<attribute name="AVAILABILITY" value="Unavailable" x="24.57" y="52.13" size="1.778" layer="27" font="vector" display="off"/>
+<attribute name="DESCRIPTION" value=" CMOS Low Dropout Regulator _LDO_, 300 mA 3.3V, Active Discharge " x="24.57" y="52.13" size="1.778" layer="27" font="vector" display="off"/>
+<attribute name="MF" value="ON Semiconductor" x="24.57" y="52.13" size="1.778" layer="27" font="vector" display="off"/>
+<attribute name="MP" value="NCP114AMX330TCG" x="24.57" y="52.13" size="1.778" layer="27" font="vector" display="off"/>
+<attribute name="NAME" x="23.427009375" y="52.42771875" size="0.6" layer="25" ratio="15" rot="R90"/>
+<attribute name="PACKAGE" value="UDFN-4 ON Semiconductor" x="24.57" y="52.13" size="1.778" layer="27" font="vector" display="off"/>
+<attribute name="PRICE" value="None" x="24.57" y="52.13" size="1.778" layer="27" font="vector" display="off"/>
+<attribute name="VALUE" x="26.5149" y="50.137078125" size="0.306003125" layer="27" rot="R90" display="off"/>
 </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="60.05" y="57.3" smashed="yes" rot="R180">
-<attribute name="NAME" x="62.385" y="58.015" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="63.335" y="58.655" size="0.6096" layer="27" rot="R180"/>
+<element name="Z1" 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="21.1" y="45.74" smashed="yes">
+<attribute name="NAME" x="21.1" y="46.28" size="0.7" layer="25" ratio="14"/>
 </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="60.05" y="56.45" smashed="yes" rot="R180">
-<attribute name="NAME" x="62.535" y="56.565" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="61.485" y="55.705" size="0.6096" layer="27" rot="R180"/>
+<element name="U$1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="DOME-BL-12MM" package3d_urn="urn:adsk.eagle:package:5648519/9" value="DOME_BUTTON12MM" x="34.95" y="46.99" smashed="yes"/>
+<element name="N1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="MLPD3X3" package3d_urn="urn:adsk.eagle:package:5825738/7" value="AMS3956" x="43.986" y="49.53" smashed="yes" rot="R180">
+<attribute name="NAME" x="41.97" y="52.696" size="0.8" layer="25" ratio="15"/>
+<attribute name="VALUE" x="44.256" y="48.92" size="0.6096" layer="27" ratio="15" 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/7" value="STM32L432KCU6" x="59" y="60.75" smashed="yes" rot="R180">
-<attribute name="NAME" x="58.6" y="64.05" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="63.05" y="65.1" size="1.27" layer="27" rot="R180" display="off"/>
+<element name="C19" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".5p" x="44.82" y="51.07" smashed="yes" rot="R90">
+<attribute name="NAME" x="44.965" y="46.935" size="0.8" layer="25" ratio="15" rot="R90"/>
 </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="60.2" y="55.15" smashed="yes" rot="MR0">
-<attribute name="NAME" x="61.085" y="56.216" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="60.835" y="54.388" size="0.0254" layer="28" rot="MR0"/>
+<element name="C20" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".5p" x="45.59" y="51.07" smashed="yes" rot="R90">
+<attribute name="NAME" x="45.935" y="46.995" size="0.8" layer="25" ratio="15" rot="R90"/>
 </element>
-<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="56.95" y="64.95" smashed="yes" rot="R90">
-<attribute name="AVAILABILITY" value="Unavailable" x="56.95" y="64.95" 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="56.95" y="64.95" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
-<attribute name="MF" value="ON Semiconductor" x="56.95" y="64.95" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
-<attribute name="MP" value="NCP114AMX330TCG" x="56.95" y="64.95" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
-<attribute name="NAME" x="57.19228125" y="66.127009375" size="0.305740625" layer="25" rot="R180"/>
-<attribute name="PACKAGE" value="UDFN-4 ON Semiconductor" x="56.95" y="64.95" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
-<attribute name="PRICE" value="None" x="56.95" y="64.95" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
-<attribute name="VALUE" x="58.942921875" y="66.8949" size="0.306003125" layer="27" rot="R180" display="off"/>
+<element name="C3" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="26.62" y="42.12" smashed="yes" rot="R180">
+<attribute name="NAME" x="29.295" y="42.115" size="0.6096" layer="25" ratio="15" rot="R180"/>
+<attribute name="VALUE" x="27.255" y="44.025" size="1.27" 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="54.65" y="59.2" smashed="yes">
-<attribute name="NAME" x="54.85" y="59.75" size="0.4064" layer="25"/>
+<element name="C7" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="26.6" y="41.25" smashed="yes" rot="R180">
+<attribute name="NAME" x="29.425" y="41.345" size="0.7" layer="25" ratio="15" rot="R180"/>
 </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/7" value="DOME_BUTTON12MM" x="68.5" y="60.45" smashed="yes"/>
-<element name="N2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="MLPD3X3" package3d_urn="urn:adsk.eagle:package:5825738/4" value="AMS3956" x="77.95" y="63.7" smashed="yes" rot="R180">
-<attribute name="NAME" x="78.35" y="65.6" size="0.6096" layer="25" rot="R270"/>
-<attribute name="VALUE" x="77.95" y="67.3" size="0.6096" layer="27" rot="R180"/>
+<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="21.53" y="50.16" smashed="yes" rot="R180">
+<attribute name="NAME" x="20.365" y="50.465" size="0.7" layer="25" ratio="15" rot="R180"/>
 </element>
-<element name="MID" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u" x="78.9" y="65.3" smashed="yes" rot="R90">
-<attribute name="NAME" x="78.265" y="64.665" size="1.27" layer="25" rot="R90"/>
-<attribute name="VALUE" x="80.805" y="64.665" size="1.27" layer="27" rot="R90"/>
+<element name="C9" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="21.54" y="50.99" smashed="yes" rot="R180">
+<attribute name="NAME" x="20.415" y="51.685" size="0.7" layer="25" ratio="15" rot="R180"/>
 </element>
-<element name="C2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u" x="77" y="67" smashed="yes" rot="R180">
-<attribute name="NAME" x="77.635" y="66.365" size="1.27" layer="25" rot="R180"/>
-<attribute name="VALUE" x="77.635" y="68.905" size="1.27" layer="27" rot="R180"/>
-</element>
-<element name="C3" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u" x="79.1" y="63" smashed="yes" rot="R90">
-<attribute name="NAME" x="78.465" y="62.365" size="1.27" layer="25" rot="R90"/>
-<attribute name="VALUE" x="81.005" y="62.365" size="1.27" layer="27" rot="R90"/>
+<element name="L1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="CL-505S-X-SD-T" package3d_urn="urn:adsk.eagle:package:4878740/7" value="RGB_LED_1X1CL-505S-X-SD-T" x="35.36" y="47.45" smashed="yes" rot="R180">
+<attribute name="NAME" x="35.76" y="46.05" size="0.4" layer="21" rot="R180"/>
 </element>
 </elements>
 <signals>
 <signal name="PE">
 <polygon width="0.1016" layer="1" isolate="0.254">
-<vertex x="38" y="63"/>
-<vertex x="38" y="65.4"/>
-<vertex x="48.108334375" y="65.4"/>
-<vertex x="48.108334375" y="63"/>
+<vertex x="3.75" y="49.5"/>
+<vertex x="3.75" y="51.9"/>
+<vertex x="13.708334375" y="51.9"/>
+<vertex x="13.708334375" y="49.5"/>
 </polygon>
-<contactref element="C7" pad="2"/>
-<contactref element="C8" pad="2"/>
-<contactref element="C10" pad="2"/>
-<contactref element="C9" pad="2"/>
+<contactref element="C1" pad="2"/>
+<contactref element="C2" pad="2"/>
+<contactref element="C5" pad="2"/>
+<contactref element="C4" pad="2"/>
 <contactref element="GND1" pad="TP"/>
-<contactref element="C12" pad="2"/>
-<contactref element="C11" pad="2"/>
+<contactref element="C13" pad="2"/>
+<contactref element="C6" pad="2"/>
 <contactref element="ST2" pad="16"/>
 <contactref element="ST2" pad="32"/>
 <contactref element="ST2" pad="EXP"/>
-<contactref element="L4" pad="2"/>
-<contactref element="Z2" pad="P$2"/>
-<via x="59" y="60.75" extent="1-16" drill="0.35"/>
-<wire x1="59.1" y1="60.75" x2="59" y2="60.75" width="0.254" layer="16"/>
-<wire x1="58.4" y1="61.35" x2="59" y2="60.75" width="0.254" layer="16"/>
-<wire x1="58.35" y1="61.35" x2="58.4" y2="61.35" width="0.254" layer="16"/>
-<via x="58.35" y="61.35" extent="1-16" drill="0.35"/>
-<wire x1="58.4" y1="61.35" x2="58.35" y2="61.35" width="0.254" layer="1"/>
-<wire x1="58.5" y1="61.25" x2="59.7" y2="61.25" width="0.254" layer="1"/>
-<via x="59.7" y="61.25" extent="1-16" drill="0.35"/>
-<wire x1="58.4" y1="61.35" x2="59" y2="60.75" width="0.254" layer="1"/>
-<via x="59.75" y="60" extent="1-16" drill="0.35"/>
-<wire x1="59" y1="60.75" x2="59.3" y2="60.45" width="0.254" layer="1"/>
-<wire x1="59.3" y1="60.45" x2="59.75" y2="60" width="0.254" layer="1"/>
-<wire x1="58.5" y1="61.25" x2="58.5" y2="60" width="0.254" layer="1"/>
-<via x="58.5" y="60" extent="1-16" drill="0.35"/>
-<wire x1="60.75" y1="58.8" x2="59.3" y2="60.25" width="0.1524" layer="1"/>
-<wire x1="60.75" y1="58.4" x2="60.75" y2="58.8" width="0.1524" layer="1"/>
-<wire x1="59.3" y1="60.25" x2="59.3" y2="60.45" width="0.1524" layer="1"/>
-<wire x1="57.25" y1="63.1" x2="57.2714" y2="63.0286" width="0.1524" layer="1"/>
-<wire x1="57.2714" y1="63.0286" x2="57.2714" y2="62.58166875" width="0.1524" layer="1"/>
-<wire x1="57.2714" y1="62.58166875" x2="57.33166875" y2="62.5214" width="0.1524" layer="1"/>
-<wire x1="57.33166875" y1="62.5214" x2="57.3786" y2="62.5214" width="0.1524" layer="1"/>
-<wire x1="57.3786" y1="62.5214" x2="59" y2="60.9" width="0.1524" layer="1"/>
-<wire x1="59" y1="60.9" x2="59" y2="60.75" width="0.1524" layer="1"/>
-<contactref element="U$2" pad="P$2"/>
-<wire x1="59.4" y1="56.85" x2="59.45" y2="57.3" width="0.254" layer="1"/>
-<wire x1="59.45" y1="56.45" x2="59.4" y2="56.85" width="0.1524" layer="1"/>
-<via x="59.4" y="56.85" extent="1-16" drill="0.35"/>
-<contactref element="N2" pad="P5"/>
-<contactref element="N2" pad="P$11"/>
-<via x="66.8" y="65.2" extent="1-16" drill="0.35"/>
-<via x="68.4" y="65.2" extent="1-16" drill="0.35"/>
-<via x="70.05" y="65.2" extent="1-16" drill="0.35"/>
-<via x="66.75" y="55.65" extent="1-16" drill="0.35"/>
-<via x="68.6" y="55.55" extent="1-16" drill="0.35"/>
-<via x="70.25" y="55.6" extent="1-16" drill="0.35"/>
-<wire x1="57.5" y1="65.325" x2="57.5" y2="66.15" width="0.3048" layer="1"/>
-<via x="57.5" y="66.15" extent="1-16" drill="0.35"/>
-<wire x1="57.45" y1="65.275" x2="57.5" y2="65.325" width="0.1524" layer="1"/>
-<wire x1="59.59" y1="65.19" x2="60.0464" y2="65.6464" width="0.1524" layer="1"/>
-<wire x1="60.0464" y1="65.6464" x2="60.0464" y2="65.9" width="0.1524" layer="1"/>
-<via x="60.0464" y="65.9" extent="1-16" drill="0.35"/>
-<wire x1="60.0464" y1="65.9" x2="60.0464" y2="66.0636" width="0.1524" layer="1"/>
-<wire x1="60.0464" y1="66.0636" x2="59.55" y2="66.56" width="0.1524" layer="1"/>
-<wire x1="77.95" y1="66.24" x2="77.6388875" y2="66.24" width="0.1524" layer="1"/>
-<wire x1="77.6388875" y1="66.24" x2="76.603065625" y2="65.39250625" width="0.1524" layer="1"/>
-<wire x1="76.598" y1="65.39" x2="76.603065625" y2="65.39250625" width="0.1524" layer="1"/>
-<via x="76.598" y="65.39" extent="1-16" drill="0.35"/>
-<via x="47.7" y="64.2" extent="1-16" drill="0.35"/>
-<wire x1="47.7" y1="64.2" x2="52.695" y2="64.2" width="0.3048" layer="1"/>
-<wire x1="52.695" y1="64.2" x2="54.0975" y2="62.7975" width="0.3048" layer="1"/>
-<wire x1="54.0975" y1="62.7975" x2="54.23" y2="62.665" width="0.3048" layer="1"/>
-<wire x1="54.19" y1="61.76" x2="54.19" y2="62.625" width="0.3048" layer="1"/>
-<wire x1="54.19" y1="62.625" x2="54.23" y2="62.665" width="0.3048" layer="1"/>
-<wire x1="55.15" y1="59.2" x2="55.15" y2="58.05" width="0.3048" layer="1"/>
-<wire x1="55.15" y1="58.05" x2="54.1" y2="57" width="0.3048" layer="1"/>
-<via x="54.1" y="57" extent="1-16" drill="0.35"/>
-<wire x1="52.1956" y1="59.85035625" x2="52.2" y2="59.85475625" width="0.3048" layer="16"/>
-<wire x1="52.2" y1="59.85475625" x2="52.2" y2="60.3" width="0.3048" layer="16"/>
-<wire x1="54.1" y1="57" x2="52.1956" y2="58.9044" width="0.3048" layer="16"/>
-<wire x1="52.1956" y1="58.9044" x2="52.1956" y2="59.85035625" width="0.3048" layer="16"/>
-<wire x1="52.2" y1="60.3" x2="53" y2="61.1" width="0.3048" layer="16"/>
-<wire x1="53" y1="61.1" x2="53" y2="62.2" width="0.3048" layer="16"/>
-<via x="53" y="62.2" extent="1-16" drill="0.35"/>
-<wire x1="53" y1="62.2" x2="53.5975" y2="62.7975" width="0.3048" layer="1"/>
-<wire x1="53.5975" y1="62.7975" x2="54.0975" y2="62.7975" width="0.3048" layer="1"/>
-<wire x1="53" y1="62.2" x2="53" y2="65" width="0.3048" layer="16"/>
-<wire x1="53" y1="65" x2="54.6" y2="66.6" width="0.3048" layer="16"/>
-<wire x1="54.6" y1="66.6" x2="57.05" y2="66.6" width="0.3048" layer="16"/>
-<wire x1="57.05" y1="66.6" x2="57.5" y2="66.15" width="0.3048" layer="16"/>
-<wire x1="57.5" y1="66.15" x2="59.7964" y2="66.15" width="0.3048" layer="16"/>
-<wire x1="59.7964" y1="66.15" x2="60.0464" y2="65.9" width="0.3048" layer="16"/>
-<wire x1="60.0464" y1="65.9" x2="66.1" y2="65.9" width="0.3048" layer="16"/>
-<wire x1="66.1" y1="65.9" x2="66.8" y2="65.2" width="0.3048" layer="16"/>
-<wire x1="68.4" y1="65.2" x2="66.8" y2="65.2" width="0.3048" layer="16"/>
-<wire x1="70.05" y1="65.2" x2="68.4" y2="65.2" width="0.3048" layer="16"/>
-<wire x1="68.6" y1="55.55" x2="70.2" y2="55.55" width="0.3048" layer="16"/>
-<wire x1="70.2" y1="55.55" x2="70.25" y2="55.6" width="0.3048" layer="16"/>
-<wire x1="68.6" y1="55.55" x2="66.85" y2="55.55" width="0.3048" layer="16"/>
-<wire x1="66.85" y1="55.55" x2="66.75" y2="55.65" width="0.3048" layer="16"/>
-<wire x1="66.75" y1="55.65" x2="67.75" y2="56.65" width="0.3048" layer="16"/>
-<wire x1="67.75" y1="56.65" x2="67.75" y2="57.25" width="0.3048" layer="16"/>
-<wire x1="59.4" y1="56.85" x2="59.4" y2="59.65" width="0.3048" layer="16"/>
-<wire x1="59.4" y1="59.65" x2="59.75" y2="60" width="0.3048" layer="16"/>
-<wire x1="59" y1="60.75" x2="59.75" y2="60" width="0.3048" layer="16"/>
-<wire x1="58.5" y1="60" x2="59" y2="60.5" width="0.3048" layer="16"/>
-<wire x1="59" y1="60.5" x2="59" y2="60.75" width="0.3048" layer="16"/>
-<wire x1="59.7" y1="61.25" x2="59.2" y2="60.75" width="0.3048" layer="16"/>
-<wire x1="59.2" y1="60.75" x2="59.1" y2="60.75" width="0.3048" layer="16"/>
-<wire x1="59.75" y1="60" x2="61.45" y2="58.3" width="0.3048" layer="16"/>
-<wire x1="64.1" y1="58.3" x2="66.75" y2="55.65" width="0.3048" layer="16"/>
-<wire x1="61.45" y1="58.3" x2="64.1" y2="58.3" width="0.3048" layer="16"/>
-<wire x1="58.35" y1="61.35" x2="60.0464" y2="63.0464" width="0.3048" layer="16"/>
-<wire x1="60.0464" y1="63.0464" x2="60.0464" y2="65.9" width="0.3048" layer="16"/>
-<wire x1="58.35" y1="61.35" x2="58.35" y2="65.3" width="0.3048" layer="16"/>
-<wire x1="58.35" y1="65.3" x2="57.5" y2="66.15" width="0.3048" layer="16"/>
-<wire x1="70.05" y1="65.2" x2="75.9" y2="65.2" width="0.3048" layer="16"/>
-<wire x1="75.9" y1="65.2" x2="76.408" y2="65.2" width="0.3048" layer="16"/>
-<wire x1="76.408" y1="65.2" x2="76.598" y2="65.39" width="0.3048" layer="16"/>
-<wire x1="68.2" y1="64.75" x2="68.4" y2="64.95" width="0.3048" layer="1"/>
-<wire x1="68.4" y1="64.95" x2="68.4" y2="65.2" width="0.3048" layer="1"/>
-<contactref element="C2" pad="2"/>
-<contactref element="C3" pad="1"/>
-<wire x1="79.1" y1="62.4" x2="78.5" y2="63" width="0.1524" layer="1"/>
-<wire x1="78.5" y1="63" x2="78.1" y2="63" width="0.1524" layer="1"/>
-<via x="78.1" y="63" extent="1-16" drill="0.35"/>
-<wire x1="78.1" y1="63" x2="75.9" y2="65.2" width="0.1524" layer="16"/>
-<wire x1="76.4" y1="67" x2="76.4" y2="65.595571875" width="0.1524" layer="1"/>
-<wire x1="76.4" y1="65.595571875" x2="76.603065625" y2="65.39250625" width="0.1524" layer="1"/>
-<wire x1="76.408" y1="65.2" x2="76.35" y2="65.34" width="0" layer="19" extent="1-16"/>
+<contactref element="L3" pad="2"/>
+<contactref element="Z1" pad="P$2"/>
+<via x="25.45" y="47.29" extent="1-16" drill="0.35"/>
+<wire x1="25.55" y1="47.29" x2="25.45" y2="47.29" width="0.254" layer="16"/>
+<wire x1="24.85" y1="47.89" x2="25.45" y2="47.29" width="0.254" layer="16"/>
+<wire x1="24.8" y1="47.89" x2="24.85" y2="47.89" width="0.254" layer="16"/>
+<via x="24.8" y="47.89" extent="1-16" drill="0.35"/>
+<wire x1="24.85" y1="47.89" x2="24.8" y2="47.89" width="0.254" layer="1"/>
+<wire x1="24.95" y1="47.79" x2="26.15" y2="47.79" width="0.254" layer="1"/>
+<via x="26.15" y="47.79" extent="1-16" drill="0.35"/>
+<wire x1="24.85" y1="47.89" x2="25.45" y2="47.29" width="0.254" layer="1"/>
+<via x="26.2" y="46.54" extent="1-16" drill="0.35"/>
+<wire x1="25.45" y1="47.29" x2="25.75" y2="46.99" width="0.254" layer="1"/>
+<wire x1="25.75" y1="46.99" x2="26.2" y2="46.54" width="0.254" layer="1"/>
+<wire x1="24.95" y1="47.79" x2="24.95" y2="46.54" width="0.254" layer="1"/>
+<via x="24.95" y="46.54" extent="1-16" drill="0.35"/>
+<wire x1="27.2" y1="45.34" x2="25.75" y2="46.79" width="0.1524" layer="1"/>
+<wire x1="27.2" y1="44.94" x2="27.2" y2="45.34" width="0.1524" layer="1"/>
+<wire x1="25.75" y1="46.79" x2="25.75" y2="46.99" width="0.1524" layer="1"/>
+<wire x1="23.7" y1="49.64" x2="23.7214" y2="49.5686" width="0.1524" layer="1"/>
+<wire x1="23.7214" y1="49.5686" x2="23.7214" y2="49.12166875" width="0.1524" layer="1"/>
+<wire x1="23.7214" y1="49.12166875" x2="23.78166875" y2="49.0614" width="0.1524" layer="1"/>
+<wire x1="23.78166875" y1="49.0614" x2="23.8286" y2="49.0614" width="0.1524" layer="1"/>
+<wire x1="23.8286" y1="49.0614" x2="25.45" y2="47.44" width="0.1524" layer="1"/>
+<wire x1="25.45" y1="47.44" x2="25.45" y2="47.29" width="0.1524" layer="1"/>
+<contactref element="U$1" pad="P$2"/>
+<wire x1="25.85" y1="43.39" x2="25.9" y2="43.84" width="0.254" layer="1"/>
+<wire x1="25.9" y1="42.99" x2="25.85" y2="43.39" width="0.1524" layer="1"/>
+<via x="25.85" y="43.39" extent="1-16" drill="0.35"/>
+<contactref element="N1" pad="P5"/>
+<contactref element="N1" pad="P$11"/>
+<via x="33.25" y="51.74" extent="1-16" drill="0.35"/>
+<via x="34.85" y="51.74" extent="1-16" drill="0.35"/>
+<via x="36.5" y="51.74" extent="1-16" drill="0.35"/>
+<via x="33.2" y="42.19" extent="1-16" drill="0.35"/>
+<via x="35.05" y="42.09" extent="1-16" drill="0.35"/>
+<via x="36.7" y="42.14" extent="1-16" drill="0.35"/>
+<via x="24.47" y="50.85" extent="1-16" drill="0.3"/>
+<via x="28.3464" y="52.13" extent="1-16" drill="0.35"/>
+<wire x1="42.948225" y1="52.07" x2="43.986" y2="52.07" width="0.1524" layer="1"/>
+<wire x1="40.188" y1="49.08" x2="40.193065625" y2="49.08250625" width="0.1524" layer="1"/>
+<via x="40.188" y="49.08" extent="1-16" drill="0.35"/>
+<wire x1="24.27" y1="51.05" x2="24.47" y2="50.85" width="0.3048" layer="16"/>
+<wire x1="28.1964" y1="51.98" x2="25.6" y2="51.98" width="0.3048" layer="16"/>
+<wire x1="24.47" y1="50.85" x2="25.6" y2="51.98" width="0.3048" layer="16"/>
+<wire x1="28.1964" y1="51.98" x2="28.3464" y2="52.13" width="0.3048" layer="16"/>
+<wire x1="32.95" y1="51.44" x2="28.9664" y2="51.44" width="0.3048" layer="16"/>
+<wire x1="28.9664" y1="51.44" x2="28.3464" y2="52.06" width="0.3048" layer="16"/>
+<wire x1="28.3464" y1="52.13" x2="28.3464" y2="52.06" width="0.3048" layer="16"/>
+<wire x1="33.25" y1="51.74" x2="32.95" y2="51.44" width="0.3048" layer="16"/>
+<wire x1="34.85" y1="51.74" x2="33.25" y2="51.74" width="0.3048" layer="16"/>
+<wire x1="36.5" y1="51.74" x2="34.85" y2="51.74" width="0.3048" layer="16"/>
+<wire x1="35.05" y1="42.09" x2="36.65" y2="42.09" width="0.3048" layer="16"/>
+<wire x1="36.65" y1="42.09" x2="36.7" y2="42.14" width="0.3048" layer="16"/>
+<wire x1="35.05" y1="42.09" x2="33.3" y2="42.09" width="0.3048" layer="16"/>
+<wire x1="33.3" y1="42.09" x2="33.2" y2="42.19" width="0.3048" layer="16"/>
+<wire x1="33.2" y1="42.19" x2="34.2" y2="43.19" width="0.3048" layer="16"/>
+<wire x1="34.2" y1="43.19" x2="34.2" y2="43.79" width="0.3048" layer="16"/>
+<wire x1="26.65" y1="46.09" x2="26.65" y2="44.19" width="0.3048" layer="16"/>
+<wire x1="25.85" y1="43.39" x2="26.65" y2="44.19" width="0.3048" layer="16"/>
+<wire x1="26.2" y1="46.54" x2="26.65" y2="46.09" width="0.3048" layer="16"/>
+<wire x1="25.45" y1="47.29" x2="26.2" y2="46.54" width="0.3048" layer="16"/>
+<wire x1="24.95" y1="46.54" x2="25.45" y2="47.04" width="0.3048" layer="16"/>
+<wire x1="25.45" y1="47.04" x2="25.45" y2="47.29" width="0.3048" layer="16"/>
+<wire x1="26.15" y1="47.79" x2="25.65" y2="47.29" width="0.3048" layer="16"/>
+<wire x1="25.65" y1="47.29" x2="25.55" y2="47.29" width="0.3048" layer="16"/>
+<wire x1="26.2" y1="46.54" x2="27.9" y2="44.84" width="0.3048" layer="16"/>
+<wire x1="30.55" y1="44.84" x2="33.2" y2="42.19" width="0.3048" layer="16"/>
+<wire x1="27.9" y1="44.84" x2="30.55" y2="44.84" width="0.3048" layer="16"/>
+<wire x1="24.8" y1="47.89" x2="28.3464" y2="51.4364" width="0.3048" layer="16"/>
+<wire x1="28.3464" y1="51.4364" x2="28.3464" y2="52.13" width="0.3048" layer="16"/>
+<wire x1="25.5" y1="49.82" x2="25.5" y2="48.59" width="0.3048" layer="16"/>
+<wire x1="24.8" y1="47.89" x2="25.5" y2="48.59" width="0.3048" layer="16"/>
+<wire x1="25.5" y1="49.82" x2="24.47" y2="50.85" width="0.3048" layer="16"/>
+<wire x1="36.5" y1="51.74" x2="37.528" y2="51.74" width="0.3048" layer="16"/>
+<wire x1="37.528" y1="51.74" x2="40.188" y2="49.08" width="0.3048" layer="16"/>
+<wire x1="34.65" y1="51.29" x2="34.85" y2="51.49" width="0.3048" layer="1"/>
+<wire x1="34.85" y1="51.49" x2="34.85" y2="51.74" width="0.3048" layer="1"/>
+<wire x1="40.848" y1="49.52" x2="40.408" y2="49.08" width="0.3048" layer="1"/>
+<wire x1="40.188" y1="49.08" x2="40.408" y2="49.08" width="0.3048" layer="1"/>
+<wire x1="40.848" y1="49.52" x2="41.63" y2="49.52" width="0.3048" layer="1"/>
+<wire x1="41.63" y1="49.52" x2="42.758" y2="50.648" width="0.3048" layer="1"/>
+<wire x1="42.758" y1="50.648" x2="42.353" y2="51.053" width="0.3048" layer="1"/>
+<wire x1="42.386" y1="51.17" x2="42.563778125" y2="51.17" width="0.3048" layer="1"/>
+<wire x1="24.47" y1="50.85" x2="24.3275" y2="50.9925" width="0.254" layer="1"/>
+<wire x1="24.895" y1="51.63" x2="24.965" y2="51.63" width="0.254" layer="1"/>
+<via x="23.31" y="51.75" extent="1-16" drill="0.3"/>
+<wire x1="24.47" y1="50.85" x2="23.57" y2="51.75" width="0.254" layer="16"/>
+<wire x1="23.57" y1="51.75" x2="23.31" y2="51.75" width="0.254" layer="16"/>
+<contactref element="C3" pad="2"/>
+<contactref element="C7" pad="2"/>
+<contactref element="C8" pad="2"/>
+<contactref element="C9" pad="2"/>
+<wire x1="26.02" y1="42.12" x2="26.02" y2="41.27" width="0.3048" layer="1"/>
+<wire x1="26" y1="41.25" x2="26.02" y2="41.27" width="0.3048" layer="1"/>
+<wire x1="25.9" y1="42.99" x2="26.02" y2="42.87" width="0.3048" layer="1"/>
+<wire x1="26.02" y1="42.87" x2="26.02" y2="42.12" width="0.3048" layer="1"/>
+<wire x1="27.64" y1="53.03" x2="27.24" y2="53.03" width="0.25" layer="1"/>
+<wire x1="28.3464" y1="52.13" x2="28.3464" y2="52.3236" width="0.25" layer="1"/>
+<wire x1="28.3464" y1="52.3236" x2="27.64" y2="53.03" width="0.25" layer="1"/>
+<wire x1="27.23" y1="52.19" x2="28.2864" y2="52.19" width="0.25" layer="1"/>
+<wire x1="28.2864" y1="52.19" x2="28.3464" y2="52.13" width="0.25" layer="1"/>
+<wire x1="21.42" y1="51.75" x2="23.31" y2="51.75" width="0.25" layer="1"/>
+<wire x1="24.895" y1="51.63" x2="24.895" y2="51.275" width="0.25" layer="1"/>
+<wire x1="24.895" y1="51.275" x2="24.47" y2="50.85" width="0.25" layer="1"/>
+<wire x1="42.353" y1="51.053" x2="42.428" y2="51.128" width="0.1524" layer="1"/>
+<wire x1="42.428" y1="51.128" x2="42.45" y2="51.15" width="0.1524" layer="1"/>
+<wire x1="42.615" y1="51.315" x2="42.948225" y2="51.648225" width="0.1524" layer="1"/>
+<wire x1="42.948225" y1="51.648225" x2="42.948225" y2="52.07" width="0.1524" layer="1"/>
+<via x="42.38" y="51.15" extent="1-16" drill="0.35"/>
+<wire x1="42.386" y1="51.17" x2="42.428" y2="51.128" width="0.1524" layer="1"/>
+<wire x1="42.386" y1="51.17" x2="42.531" y2="51.315" width="0.1524" layer="1"/>
+<wire x1="42.531" y1="51.315" x2="42.615" y2="51.315" width="0.1524" layer="1"/>
+<wire x1="42.615" y1="51.315" x2="42.45" y2="51.15" width="0.1524" layer="1"/>
+<wire x1="42.45" y1="51.15" x2="42.38" y2="51.15" width="0.1524" layer="1"/>
+<wire x1="21.6" y1="44.9" x2="21.6" y2="45.74" width="0.2032" layer="1"/>
+<wire x1="20.88" y1="48.3" x2="20.88" y2="49.205" width="0.25" layer="1"/>
+<wire x1="20.88" y1="49.205" x2="20.9" y2="49.225" width="0.25" layer="1"/>
+<wire x1="20.9" y1="49.225" x2="20.9" y2="50.13" width="0.25" layer="1"/>
+<wire x1="20.9" y1="50.13" x2="20.93" y2="50.16" width="0.25" layer="1"/>
+<wire x1="20.93" y1="50.16" x2="20.93" y2="50.98" width="0.25" layer="1"/>
+<wire x1="20.93" y1="50.98" x2="20.94" y2="50.99" width="0.25" layer="1"/>
+<wire x1="20.94" y1="50.99" x2="21.42" y2="51.47" width="0.25" layer="1"/>
+<wire x1="21.42" y1="51.47" x2="21.42" y2="51.75" width="0.25" layer="1"/>
+<wire x1="20.93" y1="50.16" x2="20.39" y2="50.7" width="0.4064" layer="1"/>
+<wire x1="20.39" y1="50.7" x2="15.5" y2="50.7" width="0.4064" layer="1"/>
+<wire x1="15.5" y1="50.7" x2="12.6" y2="50.7" width="0.4064" layer="1"/>
+<wire x1="15.5" y1="50.3" x2="15.8" y2="50" width="0.4064" layer="16"/>
+<wire x1="15.8" y1="50" x2="15.8" y2="43.8" width="0.4064" layer="16"/>
+<wire x1="17" y1="42.5" x2="17" y2="42.6" width="0.4064" layer="16"/>
+<wire x1="17" y1="42.6" x2="15.8" y2="43.8" width="0.4064" layer="16"/>
+<via x="17" y="42.5" extent="1-16" drill="0.35"/>
+<wire x1="18.75" y1="42.5" x2="17" y2="42.5" width="0.4064" layer="1"/>
+<wire x1="21.6" y1="44.9" x2="21.15" y2="44.9" width="0.4064" layer="1"/>
+<wire x1="21.15" y1="44.9" x2="18.75" y2="42.5" width="0.4064" layer="1"/>
+<via x="15.5" y="50.3" extent="1-16" drill="0.35"/>
+<wire x1="15.5" y1="50.3" x2="15.5" y2="50.7" width="0.4064" layer="1"/>
 </signal>
 <signal name="+5V">
-<wire x1="54.1611125" y1="58.7" x2="54.05" y2="58.7" width="0.254" layer="1"/>
-<wire x1="52.35" y1="57" x2="54.05" y2="58.7" width="0.508" layer="1"/>
 <contactref element="U1" pad="5V"/>
-<wire x1="43.05" y1="57" x2="52.35" y2="57" width="0.508" layer="1"/>
-<via x="55.25" y="65.2" extent="1-16" drill="0.35"/>
-<wire x1="55.2144" y1="61.2644" x2="55.2144" y2="65.1644" width="0.254" layer="16"/>
-<wire x1="54.7" y1="59.35" x2="54.7" y2="60.75" width="0.254" layer="16"/>
-<wire x1="54.7" y1="60.75" x2="55.2144" y2="61.2644" width="0.254" layer="16"/>
-<wire x1="55.25" y1="65.2" x2="55.2144" y2="65.1644" width="0.254" layer="16"/>
-<wire x1="54.1" y1="58.7" x2="54.05" y2="58.7" width="0.3048" layer="1"/>
-<wire x1="54.05" y1="58.7" x2="54.7" y2="59.35" width="0.3048" layer="16"/>
-<contactref element="C8" pad="1"/>
-<contactref element="C7" pad="1"/>
+<wire x1="8.7" y1="43.5" x2="16.5" y2="43.5" width="0.508" layer="1"/>
+<contactref element="C2" pad="1"/>
+<contactref element="C1" pad="1"/>
 <contactref element="+5V1" pad="TP"/>
-<contactref element="L4" pad="4"/>
-<contactref element="L4" pad="3"/>
-<wire x1="58.35" y1="66.56" x2="58.29" y2="66.550003125" width="0.2032" layer="1"/>
-<wire x1="56.45" y1="65.275" x2="56.45" y2="65.3" width="0.1524" layer="1"/>
-<wire x1="56.45" y1="65.3" x2="56.45" y2="65.3334125" width="0.1524" layer="1"/>
-<wire x1="56.45" y1="65.2334125" x2="56.45" y2="65.275" width="0.1524" layer="1"/>
-<wire x1="56.45" y1="64.625" x2="56.45" y2="64.680665625" width="0.2032" layer="1"/>
-<wire x1="56.5" y1="64.575" x2="56.45" y2="64.625" width="0.2032" layer="1"/>
-<wire x1="56.45" y1="64.625" x2="56.45" y2="64.644746875" width="0.254" layer="1"/>
-<wire x1="56.45" y1="64.644746875" x2="56.260478125" y2="64.83426875" width="0.254" layer="1"/>
-<wire x1="56.260478125" y1="64.83426875" x2="56.260478125" y2="65.06573125" width="0.254" layer="1"/>
-<wire x1="56.260478125" y1="65.06573125" x2="56.45" y2="65.255253125" width="0.254" layer="1"/>
-<wire x1="56.45" y1="65.255253125" x2="56.45" y2="65.3" width="0.254" layer="1"/>
-<wire x1="56.45" y1="65.275" x2="56.425" y2="65.3" width="0.254" layer="1"/>
-<wire x1="56.425" y1="65.3" x2="55.4" y2="65.3" width="0.254" layer="1"/>
-<via x="55.25" y="65.15" extent="1-16" drill="0.35"/>
-<wire x1="58.35" y1="66.56" x2="58.35" y2="65.23" width="0.254" layer="1"/>
-<wire x1="58.39" y1="65.19" x2="58.35" y2="65.23" width="0.254" layer="1"/>
-<wire x1="56.45" y1="65.3" x2="56.45" y2="66.1" width="0.254" layer="1"/>
-<wire x1="56.45" y1="66.1" x2="57.15" y2="66.8" width="0.254" layer="1"/>
-<wire x1="58.35" y1="66.56" x2="58.11" y2="66.8" width="0.254" layer="1"/>
-<wire x1="58.11" y1="66.8" x2="57.15" y2="66.8" width="0.254" layer="1"/>
-<contactref element="Z2" pad="P$1"/>
-<via x="54.05" y="58.7" extent="1-16" drill="0.3"/>
-<wire x1="55.4" y1="65" x2="55.25" y2="65.15" width="0.254" layer="16"/>
-<wire x1="55.2144" y1="61.2144" x2="55.2144" y2="65.1144" width="0.254" layer="16"/>
-<wire x1="54.7" y1="60.5" x2="54.7" y2="60.7" width="0.254" layer="16"/>
-<wire x1="54.7" y1="60.7" x2="55.2144" y2="61.2144" width="0.254" layer="16"/>
-<wire x1="54.6" y1="59.2" x2="54.15555625" y2="58.7" width="0.254" layer="1"/>
-<wire x1="54.15555625" y1="58.7" x2="54.05" y2="58.7" width="0.254" layer="1"/>
-<wire x1="55.25" y1="65.15" x2="55.2144" y2="65.1144" width="0.254" layer="16"/>
-<wire x1="55.4" y1="65.3" x2="55.25" y2="65.15" width="0.254" layer="1"/>
-<wire x1="55.25" y1="65.1" x2="55.25" y2="65.15" width="0.1524" layer="16"/>
-<wire x1="55.25" y1="65.2" x2="55.25" y2="65.15" width="0" layer="19" extent="1-1"/>
+<contactref element="L3" pad="4"/>
+<contactref element="L3" pad="3"/>
+<wire x1="16.5" y1="43.5" x2="18.2" y2="43.5" width="0.508" layer="1"/>
+<wire x1="25.98" y1="53.020003125" x2="26.04" y2="53.03" width="0.2032" layer="1"/>
+<contactref element="Z1" pad="P$1"/>
+<wire x1="24.4875" y1="52.8625" x2="24.425" y2="52.8" width="0.254" layer="1"/>
+<wire x1="24.5375" y1="52.8125" x2="24.4875" y2="52.8625" width="0.254" layer="1"/>
+<wire x1="24.4875" y1="52.8625" x2="24.445" y2="52.905" width="0.254" layer="1"/>
+<wire x1="24.445" y1="52.905" x2="23.3" y2="54.05" width="0.254" layer="1"/>
+<wire x1="23.3" y1="54.05" x2="20.17" y2="54.05" width="0.254" layer="1"/>
+<wire x1="17.82" y1="53.7" x2="18.37" y2="53.7" width="0.1524" layer="16"/>
+<wire x1="24.245" y1="52.63" x2="24.445" y2="52.83" width="0.25" layer="1"/>
+<wire x1="24.445" y1="52.83" x2="24.445" y2="52.905" width="0.25" layer="1"/>
+<wire x1="24.5375" y1="52.8125" x2="24.73808125" y2="52.8125" width="0.25" layer="1"/>
+<wire x1="24.895" y1="52.63" x2="24.895" y2="52.65558125" width="0.25" layer="1"/>
+<wire x1="24.895" y1="52.65558125" x2="24.73808125" y2="52.8125" width="0.25" layer="1"/>
+<wire x1="24.895" y1="52.63" x2="25.285003125" y2="53.020003125" width="0.25" layer="1"/>
+<wire x1="25.285003125" y1="53.020003125" x2="25.98" y2="53.020003125" width="0.25" layer="1"/>
+<wire x1="26.03" y1="52.19" x2="26.03" y2="53.02" width="0.25" layer="1"/>
+<wire x1="26.03" y1="53.02" x2="26.04" y2="53.03" width="0.25" layer="1"/>
+<wire x1="20.17" y1="54.05" x2="19.54" y2="54.05" width="0.25" layer="1"/>
+<via x="19.54" y="54.05" extent="1-16" drill="0.3"/>
+<wire x1="17.82" y1="53.7" x2="18.17" y2="54.05" width="0.1524" layer="16"/>
+<wire x1="18.17" y1="54.05" x2="19.54" y2="54.05" width="0.1524" layer="16"/>
+<wire x1="18.2" y1="43.5" x2="20.44" y2="45.74" width="0.35" layer="1"/>
+<wire x1="20.44" y1="45.74" x2="21.05" y2="45.74" width="0.35" layer="1"/>
+<wire x1="16.5" y1="43.5" x2="16.9" y2="43.9" width="0.35" layer="1"/>
+<wire x1="16.9" y1="44.5" x2="17.1" y2="44.7" width="0.35" layer="1"/>
+<wire x1="16.9" y1="44.5" x2="16.9" y2="43.9" width="0.35" layer="1"/>
+<via x="17.1" y="44.7" extent="1-16" drill="0.35"/>
+<wire x1="17" y1="51.3" x2="17" y2="44.8" width="0.35" layer="16"/>
+<wire x1="17.1" y1="44.7" x2="17" y2="44.8" width="0.35" layer="16"/>
+<wire x1="19.54" y1="53.84" x2="19.54" y2="54.05" width="0.35" layer="16"/>
+<wire x1="17" y1="51.3" x2="19.54" y2="53.84" width="0.35" layer="16"/>
 </signal>
 <signal name="D+">
 <contactref element="U1" pad="D+"/>
-<wire x1="43.3" y1="61.7" x2="51.7" y2="61.7" width="0.1524" layer="1"/>
-<wire x1="51.7" y1="61.7" x2="53.5" y2="59.9" width="0.1524" layer="1"/>
-<contactref element="D+1" pad="TP"/>
+<wire x1="8.95" y1="48.2" x2="17.35" y2="48.2" width="0.1524" layer="1"/>
 <contactref element="ST2" pad="22"/>
-<contactref element="Z2" pad="P$3"/>
-<wire x1="55.7" y1="59.25" x2="56" y2="59.55" width="0.1524" layer="1"/>
-<wire x1="56" y1="59.55" x2="56" y2="60" width="0.1524" layer="1"/>
-<wire x1="56" y1="60" x2="56.65" y2="60" width="0.1524" layer="1"/>
-<wire x1="55.7286" y1="59.19143125" x2="55.7286" y2="57.6786" width="0.1524" layer="1"/>
-<via x="55.5" y="57.45" extent="1-16" drill="0.35"/>
-<wire x1="55.7" y1="59.2" x2="55.7286" y2="59.19143125" width="0.1524" layer="1"/>
-<wire x1="55.7286" y1="57.6786" x2="55.5" y2="57.45" width="0.1524" layer="1"/>
-<wire x1="55.8" y1="57.45" x2="55.5" y2="57.45" width="0.254" layer="16"/>
-<wire x1="55.7786" y1="59.2786" x2="55.7786" y2="59.4946875" width="0.1524" layer="1"/>
-<wire x1="55.7786" y1="59.4946875" x2="55.4232875" y2="59.85" width="0.1524" layer="1"/>
-<wire x1="54.1" y1="59.85" x2="55.4232875" y2="59.85" width="0.1524" layer="1"/>
-<wire x1="55.7" y1="59.2" x2="55.7" y2="59.25" width="0.1524" layer="1"/>
-<wire x1="55.7" y1="59.2" x2="55.7786" y2="59.2786" width="0.1524" layer="1"/>
-<wire x1="53.5" y1="59.9" x2="54.05" y2="59.9" width="0.1524" layer="1"/>
-<wire x1="54.05" y1="59.9" x2="54.1" y2="59.85" width="0.1524" layer="1"/>
+<contactref element="Z1" pad="P$3"/>
+<wire x1="22.15" y1="45.79" x2="22.23" y2="45.87" width="0.1524" layer="1"/>
+<wire x1="22.23" y1="45.87" x2="22.45" y2="46.09" width="0.1524" layer="1"/>
+<wire x1="22.45" y1="46.09" x2="22.45" y2="46.54" width="0.1524" layer="1"/>
+<wire x1="22.45" y1="46.54" x2="23.1" y2="46.54" width="0.1524" layer="1"/>
+<wire x1="22.15" y1="45.74" x2="22.1786" y2="45.73143125" width="0.1524" layer="1"/>
+<wire x1="22.15" y1="45.74" x2="22.15" y2="45.79" width="0.1524" layer="1"/>
+<wire x1="17.35" y1="48.2" x2="19.15" y2="46.4" width="0.1524" layer="1"/>
+<wire x1="21.7" y1="46.4" x2="22.23" y2="45.87" width="0.1524" layer="1"/>
+<wire x1="19.15" y1="46.4" x2="21.7" y2="46.4" width="0.1524" layer="1"/>
 </signal>
 <signal name="D-">
-<via x="52.8" y="59.6" extent="1-16" drill="0.35"/>
-<wire x1="53.6774" y1="60.4774" x2="52.8" y2="59.6" width="0.1524" layer="16"/>
 <contactref element="U1" pad="D-"/>
-<wire x1="43.3" y1="59.35" x2="52.55" y2="59.35" width="0.1524" layer="1"/>
-<wire x1="52.55" y1="59.35" x2="52.8" y2="59.6" width="0.1524" layer="1"/>
-<wire x1="54.00254375" y1="61.30254375" x2="54.00254375" y2="61.35254375" width="0.1524" layer="16"/>
-<wire x1="54.00254375" y1="60.5274" x2="54.00254375" y2="60.327475" width="0.1524" layer="1"/>
-<wire x1="53.90254375" y1="60.4774" x2="53.6774" y2="60.4774" width="0.1524" layer="16"/>
-<wire x1="54.00254375" y1="60.5774" x2="53.90254375" y2="60.4774" width="0.1524" layer="16"/>
-<contactref element="D-1" pad="TP"/>
+<wire x1="8.95" y1="45.85" x2="17.3" y2="45.85" width="0.1524" layer="1"/>
+<wire x1="17.3" y1="45.85" x2="18.05" y2="46.6" width="0.1524" layer="1"/>
 <contactref element="ST2" pad="21"/>
-<contactref element="Z2" pad="P$4"/>
-<wire x1="55.872728125" y1="60.677271875" x2="56.29375" y2="60.5" width="0.1524" layer="1"/>
-<wire x1="55.55" y1="60.9" x2="54.927246875" y2="60.277246875" width="0.1524" layer="1"/>
-<wire x1="54.00254375" y1="60.277475" x2="54.09999375" y2="60.27745" width="0.1524" layer="1"/>
-<via x="54.00254375" y="60.5274" extent="1-16" drill="0.3"/>
-<wire x1="54.09999375" y1="60.27745" x2="54.927246875" y2="60.277246875" width="0.1524" layer="1"/>
-<wire x1="54.00254375" y1="60.5774" x2="54.00254375" y2="61.30254375" width="0.1524" layer="16"/>
-<wire x1="54.00254375" y1="61.30254375" x2="54.3" y2="61.6" width="0.1524" layer="16"/>
-<wire x1="56.29375" y1="60.5" x2="56.65" y2="60.5" width="0.1524" layer="1"/>
-<wire x1="55.65" y1="60.9" x2="55.872728125" y2="60.677271875" width="0.1524" layer="1"/>
-<wire x1="55.65" y1="60.9" x2="55.55" y2="60.9" width="0.1524" layer="1"/>
-<wire x1="54.00254375" y1="60.5274" x2="54.00254375" y2="60.5774" width="0.1524" layer="1"/>
-<wire x1="54.00254375" y1="60.5274" x2="54.00254375" y2="60.5774" width="0.1524" layer="16"/>
-<wire x1="54.00254375" y1="60.5274" x2="54.00254375" y2="60.3749" width="0.1524" layer="1"/>
-<wire x1="54.00254375" y1="60.3749" x2="54.09999375" y2="60.27745" width="0.1524" layer="1"/>
+<contactref element="Z1" pad="P$4"/>
+<wire x1="22.322728125" y1="47.217271875" x2="22.74375" y2="47.04" width="0.1524" layer="1"/>
+<wire x1="22.74375" y1="47.04" x2="23.1" y2="47.04" width="0.1524" layer="1"/>
+<wire x1="22.1" y1="47.44" x2="22.322728125" y2="47.217271875" width="0.1524" layer="1"/>
+<wire x1="22" y1="47.44" x2="22.1" y2="47.44" width="0.1524" layer="1"/>
+<wire x1="21.5173625" y1="46.9573625" x2="22" y2="47.44" width="0.1524" layer="1"/>
+<via x="18.05" y="46.6" extent="1-16" drill="0.35"/>
+<wire x1="18.9" y1="47.4" x2="18.85" y2="47.4" width="0.1524" layer="16"/>
+<wire x1="18.85" y1="47.4" x2="18.05" y2="46.6" width="0.1524" layer="16"/>
+<via x="18.9" y="47.4" extent="1-16" drill="0.35"/>
+<wire x1="21.5173625" y1="46.9573625" x2="19.3426375" y2="46.9573625" width="0.1524" layer="1"/>
+<wire x1="18.9" y1="47.4" x2="19.3426375" y2="46.9573625" width="0.1524" layer="1"/>
 </signal>
 <signal name="+3V3">
 <contactref element="3V1" pad="TP"/>
-<contactref element="R2" pad="2"/>
-<contactref element="C10" pad="1"/>
-<contactref element="C9" pad="1"/>
+<contactref element="R1" pad="2"/>
+<contactref element="C5" pad="1"/>
+<contactref element="C4" pad="1"/>
 <contactref element="ST2" pad="17"/>
-<contactref element="L4" pad="1"/>
-<wire x1="56.95" y1="56.3" x2="57.1" y2="56.4" width="0.254" layer="1"/>
-<contactref element="C12" pad="1"/>
-<contactref element="C11" pad="1"/>
+<contactref element="L3" pad="1"/>
+<wire x1="23.54" y1="43.22" x2="23.69" y2="43.32" width="0.254" layer="1"/>
+<contactref element="C13" pad="1"/>
+<contactref element="C6" pad="1"/>
 <contactref element="ST2" pad="1"/>
 <contactref element="ST2" pad="5"/>
-<wire x1="61.3" y1="57.4" x2="61.25" y2="57.4" width="0.2032" layer="1"/>
-<wire x1="62.125" y1="58.725" x2="61.85" y2="59" width="0.2032" layer="1"/>
-<wire x1="61.85" y1="59" x2="61.35" y2="59" width="0.2032" layer="1"/>
-<wire x1="61.35" y1="61" x2="62.05" y2="61" width="0.2032" layer="1"/>
-<wire x1="62.05" y1="61" x2="62.8" y2="60.25" width="0.2032" layer="1"/>
-<wire x1="62.8" y1="59.05" x2="62.8" y2="60.25" width="0.2032" layer="1"/>
-<via x="57.6" y="55.35" extent="1-16" drill="0.35"/>
-<wire x1="60.92875625" y1="53.8356" x2="61.6" y2="54.50684375" width="0.254" layer="16"/>
-<wire x1="57.6" y1="55.3" x2="59.0644" y2="53.8356" width="0.254" layer="16"/>
-<wire x1="59.0644" y1="53.8356" x2="60.92875625" y2="53.8356" width="0.254" layer="16"/>
-<wire x1="61.6" y1="54.50684375" x2="61.6" y2="56.2" width="0.254" layer="16"/>
-<via x="62.25" y="56.85" extent="1-16" drill="0.35"/>
-<wire x1="57.6" y1="55.35" x2="57.05" y2="55.9" width="0.254" layer="1"/>
-<wire x1="57.05" y1="55.9" x2="57.1" y2="56.4" width="0.254" layer="1"/>
-<wire x1="53.85" y1="55.35" x2="56.75" y2="55.35" width="0.254" layer="16"/>
-<wire x1="56.75" y1="55.35" x2="57.6" y2="55.35" width="0.254" layer="16"/>
-<wire x1="52.45" y1="53.95" x2="53.85" y2="55.35" width="0.254" layer="16"/>
-<wire x1="55.39" y1="61.76" x2="55.44" y2="62.625" width="0.254" layer="1"/>
-<wire x1="55.645" y1="62.5" x2="55.43" y2="62.665" width="0.254" layer="1"/>
-<wire x1="55.645" y1="62.5" x2="56.65" y2="62.5" width="0.254" layer="1"/>
-<wire x1="55.565" y1="62.665" x2="56.7" y2="63.8" width="0.254" layer="1"/>
-<wire x1="56.95" y1="64.05" x2="57.3" y2="64.05" width="0.254" layer="1"/>
-<wire x1="57.3" y1="64.05" x2="57.45" y2="64.2" width="0.254" layer="1"/>
-<wire x1="57.45" y1="64.2" x2="57.45" y2="64.625" width="0.254" layer="1"/>
-<wire x1="55.43" y1="62.665" x2="55.48" y2="63.38" width="0.254" layer="1"/>
-<wire x1="55.48" y1="63.38" x2="55.9" y2="63.8" width="0.254" layer="1"/>
-<via x="55.9" y="63.8" extent="1-16" drill="0.35"/>
-<wire x1="55.9" y1="63.8" x2="56.75" y2="62.95" width="0.254" layer="16"/>
-<wire x1="56.75" y1="62.95" x2="56.75" y2="55.35" width="0.254" layer="16"/>
-<wire x1="55.9" y1="63.8" x2="56.7" y2="63.8" width="0.254" layer="1"/>
-<wire x1="56.7" y1="63.8" x2="56.95" y2="64.05" width="0.254" layer="1"/>
-<contactref element="Z2" pad="P$5"/>
-<wire x1="55.25376875" y1="61.50376875" x2="55.44" y2="61.582028125" width="0.254" layer="1"/>
-<wire x1="55.44" y1="61.582028125" x2="55.39" y2="61.76" width="0.254" layer="1"/>
-<wire x1="55.44" y1="62.625" x2="55.43" y2="62.665" width="0.254" layer="1"/>
-<wire x1="55.43" y1="62.665" x2="55.565" y2="62.665" width="0.254" layer="1"/>
-<wire x1="54.65" y1="60.9" x2="55.25376875" y2="61.50376875" width="0.254" layer="1"/>
+<wire x1="27.75" y1="43.94" x2="27.7" y2="43.94" width="0.2032" layer="1"/>
+<wire x1="28.575" y1="45.265" x2="28.3" y2="45.54" width="0.2032" layer="1"/>
+<wire x1="28.3" y1="45.54" x2="27.8" y2="45.54" width="0.2032" layer="1"/>
+<wire x1="27.8" y1="47.54" x2="28.5" y2="47.54" width="0.2032" layer="1"/>
+<wire x1="28.5" y1="47.54" x2="29.25" y2="46.79" width="0.2032" layer="1"/>
+<wire x1="29.25" y1="45.59" x2="29.25" y2="46.79" width="0.2032" layer="1"/>
+<via x="23.55" y="44.15" extent="1-16" drill="0.35"/>
+<wire x1="23.65" y1="43.71" x2="24.7844" y2="42.5756" width="0.254" layer="16"/>
+<via x="27.98" y="43.41" extent="1-16" drill="0.35"/>
+<wire x1="23.69" y1="43.83" x2="23.75" y2="43.89" width="0.254" layer="1"/>
+<wire x1="23.69" y1="43.83" x2="23.69" y2="43.32" width="0.254" layer="1"/>
+<wire x1="23.75" y1="43.89" x2="23.75" y2="43.95" width="0.254" layer="1"/>
+<wire x1="23.75" y1="43.95" x2="23.55" y2="44.15" width="0.254" layer="1"/>
+<wire x1="29.66" y1="42.89" x2="29.46" y2="42.89" width="0.254" layer="16"/>
+<wire x1="22.08" y1="48.3" x2="22.127171875" y2="49.1163125" width="0.254" layer="1"/>
+<wire x1="22.341059375" y1="49.04" x2="22.1" y2="49.225" width="0.254" layer="1"/>
+<wire x1="22.341059375" y1="49.04" x2="23.1" y2="49.04" width="0.254" layer="1"/>
+<wire x1="22.099996875" y1="49.289996875" x2="22.55" y2="49.74" width="0.254" layer="1"/>
+<wire x1="22.55" y1="49.74" x2="22.9" y2="50.09" width="0.254" layer="1"/>
+<wire x1="22.1" y1="49.225" x2="22.185" y2="49.225" width="0.254" layer="1"/>
+<via x="23.28" y="50.59" extent="1-16" drill="0.35"/>
+<wire x1="23.6" y1="48.14" x2="23.28" y2="48.46" width="0.254" layer="16"/>
+<wire x1="23.28" y1="50.59" x2="23.28" y2="48.46" width="0.254" layer="16"/>
+<wire x1="23.6" y1="48.14" x2="23.6" y2="44.4" width="0.254" layer="16"/>
+<wire x1="23.28" y1="50.325" x2="22.18" y2="49.225" width="0.254" layer="1"/>
+<wire x1="22.1" y1="49.225" x2="22.18" y2="49.225" width="0.254" layer="1"/>
+<wire x1="23.28" y1="50.59" x2="23.28" y2="50.325" width="0.254" layer="1"/>
+<contactref element="Z1" pad="P$5"/>
+<wire x1="22.10465625" y1="48.212234375" x2="22.08" y2="48.3" width="0.254" layer="1"/>
+<wire x1="22.127171875" y1="49.1163125" x2="22.1" y2="49.225" width="0.254" layer="1"/>
+<wire x1="22.1" y1="49.225" x2="22.099996875" y2="49.289996875" width="0.254" layer="1"/>
 <contactref element="ST2" pad="31"/>
-<wire x1="60.25" y1="58.4" x2="60.1857" y2="58.3857" width="0.1524" layer="1"/>
-<wire x1="61.25" y1="57.4" x2="62.125" y2="58.275" width="0.254" layer="1"/>
-<wire x1="62.125" y1="58.275" x2="62.125" y2="58.725" width="0.254" layer="1"/>
-<wire x1="60.8" y1="57.4" x2="60.9" y2="57.5" width="0.254" layer="1"/>
-<wire x1="60.75" y1="57.35" x2="60.8" y2="57.4" width="0.254" layer="1"/>
-<wire x1="60.8" y1="57.4" x2="61.25" y2="57.4" width="0.254" layer="1"/>
-<wire x1="60.65" y1="57.3" x2="61.8" y2="57.3" width="0.254" layer="1"/>
-<wire x1="61.8" y1="57.3" x2="62.25" y2="56.85" width="0.254" layer="1"/>
-<wire x1="60.65" y1="56.45" x2="60.65" y2="57.3" width="0.254" layer="1"/>
-<wire x1="60.25" y1="58.4" x2="60.25" y2="58.15" width="0.1524" layer="1"/>
-<wire x1="60.25" y1="58.15" x2="60.9" y2="57.5" width="0.1524" layer="1"/>
-<wire x1="60.65" y1="57.3" x2="60.75" y2="57.35" width="0.254" layer="1"/>
-<wire x1="57.6" y1="55.35" x2="57.6" y2="55.3" width="0.254" layer="16"/>
-<wire x1="61.6" y1="56.2" x2="62.25" y2="56.85" width="0.254" layer="16"/>
-<contactref element="N2" pad="P2"/>
-<wire x1="62.65" y1="58.8" x2="62.7" y2="58.8" width="0.3048" layer="1"/>
-<wire x1="62.65" y1="58.8" x2="62.125" y2="58.275" width="0.3048" layer="1"/>
-<wire x1="62.7" y1="58.8" x2="62.7" y2="58.95" width="0.3048" layer="1"/>
-<wire x1="62.7" y1="58.95" x2="62.8" y2="59.05" width="0.3048" layer="1"/>
-<wire x1="57.6" y1="55.35" x2="58.1452" y2="54.8048" width="0.3048" layer="1"/>
-<wire x1="58.1452" y1="54.8048" x2="58.1452" y2="54.79948125" width="0.3048" layer="1"/>
-<wire x1="58.1452" y1="54.79948125" x2="59.14468125" y2="53.8" width="0.3048" layer="1"/>
-<wire x1="59.14468125" y1="53.8" x2="73.5" y2="53.8" width="0.3048" layer="1"/>
-<wire x1="77.95" y1="64.74" x2="77.9428" y2="64.7328" width="0.3048" layer="1"/>
-<wire x1="77.9428" y1="64.7328" x2="77.9428" y2="63.6878" width="0.3048" layer="1"/>
-<wire x1="77.9428" y1="63.6878" x2="75.83311875" y2="63.6878" width="0.3048" layer="1"/>
-<wire x1="73.7122" y1="59.13311875" x2="74.772659375" y2="58.072659375" width="0.3048" layer="1"/>
-<contactref element="N2" pad="P1"/>
-<wire x1="75.83311875" y1="63.6878" x2="73.7122" y2="61.56688125" width="0.3048" layer="1"/>
-<wire x1="73.7122" y1="61.56688125" x2="73.7122" y2="59.13311875" width="0.3048" layer="1"/>
-<wire x1="73.5" y1="53.8" x2="74.772659375" y2="55.072659375" width="0.3048" layer="1"/>
-<wire x1="74.772659375" y1="55.072659375" x2="74.772659375" y2="58.072659375" width="0.3048" layer="1"/>
-<wire x1="77.9528" y1="64.79" x2="77.95" y2="64.7872" width="0.1524" layer="1"/>
-<wire x1="77.95" y1="64.24" x2="77.95" y2="64.7872" width="0.1524" layer="1"/>
-<wire x1="77.95" y1="64.74" x2="77.9528" y2="64.79" width="0" layer="19" extent="1-1"/>
+<wire x1="26.7" y1="44.94" x2="26.6357" y2="44.9257" width="0.1524" layer="1"/>
+<wire x1="27.7" y1="43.94" x2="28.575" y2="44.815" width="0.254" layer="1"/>
+<wire x1="28.575" y1="44.815" x2="28.575" y2="45.265" width="0.254" layer="1"/>
+<wire x1="27.2" y1="43.89" x2="27.24" y2="43.93" width="0.254" layer="1"/>
+<wire x1="27.25" y1="43.94" x2="27.7" y2="43.94" width="0.254" layer="1"/>
+<wire x1="27.1" y1="43.84" x2="27.55" y2="43.84" width="0.254" layer="1"/>
+<wire x1="27.55" y1="43.84" x2="27.98" y2="43.41" width="0.254" layer="1"/>
+<wire x1="27.1" y1="42.99" x2="27.1" y2="43.84" width="0.254" layer="1"/>
+<wire x1="27.155" y1="44.015" x2="27.24" y2="43.93" width="0.1524" layer="1"/>
+<wire x1="27.1" y1="43.84" x2="27.2" y2="43.89" width="0.254" layer="1"/>
+<wire x1="23.55" y1="44.15" x2="23.65" y2="44.15" width="0.254" layer="16"/>
+<wire x1="23.65" y1="44.15" x2="23.65" y2="43.71" width="0.254" layer="16"/>
+<contactref element="N1" pad="P2"/>
+<wire x1="29.1" y1="45.34" x2="29.15" y2="45.34" width="0.3048" layer="1"/>
+<wire x1="29.1" y1="45.34" x2="28.575" y2="44.815" width="0.3048" layer="1"/>
+<wire x1="29.15" y1="45.34" x2="29.15" y2="45.49" width="0.3048" layer="1"/>
+<wire x1="29.15" y1="45.49" x2="29.25" y2="45.59" width="0.3048" layer="1"/>
+<wire x1="23.75" y1="43.89" x2="23.75" y2="43.43468125" width="0.3048" layer="1"/>
+<contactref element="N1" pad="P1"/>
+<wire x1="24.245" y1="51.63" x2="22.9" y2="50.285" width="0.254" layer="1"/>
+<wire x1="22.9" y1="50.285" x2="22.9" y2="50.09" width="0.254" layer="1"/>
+<wire x1="23.55" y1="44.15" x2="23.6" y2="44.4" width="0.3048" layer="16"/>
+<wire x1="43.986" y1="50.57" x2="43.986" y2="50.07" width="0.3048" layer="1"/>
+<wire x1="21.1" y1="47.44" x2="21.96" y2="48.3" width="0.254" layer="1"/>
+<wire x1="21.96" y1="48.3" x2="22.08" y2="48.3" width="0.254" layer="1"/>
+<contactref element="C3" pad="1"/>
+<contactref element="C7" pad="1"/>
+<contactref element="C8" pad="1"/>
+<contactref element="C9" pad="1"/>
+<wire x1="23.75" y1="43.43468125" x2="24.53" y2="42.65468125" width="0.3048" layer="1"/>
+<wire x1="24.53" y1="42.65468125" x2="24.53" y2="41.12" width="0.3048" layer="1"/>
+<wire x1="24.53" y1="41.12" x2="25.58" y2="40.07" width="0.3048" layer="1"/>
+<wire x1="27.33" y1="40.07" x2="27.35" y2="40.05" width="0.3048" layer="1"/>
+<wire x1="27.33" y1="40.07" x2="25.58" y2="40.07" width="0.3048" layer="1"/>
+<wire x1="27.35" y1="40.05" x2="39.33" y2="40.05" width="0.3048" layer="1"/>
+<wire x1="26.7" y1="44.94" x2="26.7" y2="44.47" width="0.254" layer="1"/>
+<wire x1="26.7" y1="44.47" x2="27.155" y2="44.015" width="0.254" layer="1"/>
+<wire x1="27.1" y1="42.99" x2="27.1" y2="42.24" width="0.254" layer="1"/>
+<wire x1="27.1" y1="42.24" x2="27.22" y2="42.12" width="0.254" layer="1"/>
+<wire x1="27.2" y1="41.25" x2="27.2" y2="42.1" width="0.254" layer="1"/>
+<wire x1="27.2" y1="42.1" x2="27.22" y2="42.12" width="0.254" layer="1"/>
+<wire x1="22.14" y1="50.99" x2="22.14" y2="50.17" width="0.2" layer="1"/>
+<wire x1="22.14" y1="50.17" x2="22.13" y2="50.16" width="0.2" layer="1"/>
+<wire x1="22.13" y1="50.16" x2="22.55" y2="49.74" width="0.2" layer="1"/>
+<wire x1="44.57" y1="45.29" x2="44.57" y2="48.82" width="0.3048" layer="1"/>
+<wire x1="39.33" y1="40.05" x2="44.57" y2="45.29" width="0.3048" layer="1"/>
+<wire x1="44.57" y1="48.82" x2="43.986" y2="49.404" width="0.3048" layer="1"/>
+<wire x1="43.986" y1="50.07" x2="43.986" y2="49.404" width="0.3048" layer="1"/>
+<wire x1="43.9388" y1="50.59" x2="43.9388" y2="50.11590625" width="0.3048" layer="1"/>
+<wire x1="27.1" y1="43.84" x2="27.15" y2="43.84" width="0.1524" layer="1"/>
+<wire x1="27.15" y1="43.84" x2="27.25" y2="43.94" width="0.1524" layer="1"/>
+<wire x1="43.986" y1="50.57" x2="43.9588" y2="50.57" width="0.1524" layer="1"/>
+<wire x1="43.9588" y1="50.57" x2="43.9388" y2="50.59" width="0.1524" layer="1"/>
+<wire x1="24.7844" y1="42.5756" x2="27.1456" y2="42.5756" width="0.25" layer="16"/>
+<wire x1="27.1456" y1="42.5756" x2="27.98" y2="43.41" width="0.25" layer="16"/>
+<wire x1="27.98" y1="43.41" x2="28.5" y2="42.89" width="0.1524" layer="16"/>
+<wire x1="28.5" y1="42.89" x2="29.66" y2="42.89" width="0.1524" layer="16"/>
 </signal>
-<signal name="N$15">
-<contactref element="R2" pad="1"/>
-<contactref element="L2" pad="P$4"/>
-<wire x1="68.9" y1="60.9" x2="69" y2="60.9" width="0.1524" layer="1"/>
-<via x="68.9" y="60.9" extent="1-16" drill="0.3"/>
-<via x="73.7" y="55.5" extent="1-16" drill="0.2032"/>
-<wire x1="71.35" y1="60.9" x2="68.9" y2="60.9" width="0.2" layer="16"/>
-<wire x1="58.3" y1="56.4" x2="60.35" y2="54.4" width="0.254" layer="1"/>
-<wire x1="60.35" y1="54.4" x2="72.65" y2="54.4" width="0.254" layer="1"/>
-<wire x1="74" y1="58.25" x2="74" y2="55.8" width="0.254" layer="16"/>
-<wire x1="73.7" y1="55.5" x2="74" y2="55.8" width="0.254" layer="16"/>
-<wire x1="74" y1="58.25" x2="71.35" y2="60.9" width="0.254" layer="16"/>
-<wire x1="72.65" y1="54.4" x2="72.65" y2="54.45" width="0.254" layer="1"/>
-<wire x1="72.65" y1="54.45" x2="73.7" y2="55.5" width="0.254" layer="1"/>
+<signal name="N$1">
+<contactref element="R1" pad="1"/>
+<via x="40.83" y="42.88" extent="1-16" drill="0.3"/>
+<wire x1="35.35" y1="47.44" x2="37.87" y2="47.44" width="0.2" layer="16"/>
+<wire x1="41.35" y1="43.96" x2="41.35" y2="42.99" width="0.254" layer="16"/>
+<wire x1="41.35" y1="42.99" x2="40.83" y2="42.99" width="0.254" layer="16"/>
+<wire x1="40.83" y1="42.88" x2="40.83" y2="42.99" width="0.254" layer="16"/>
+<wire x1="41.35" y1="43.96" x2="37.87" y2="47.44" width="0.254" layer="16"/>
+<wire x1="40.83" y1="42.88" x2="40.83" y2="42.99" width="0.2032" layer="1"/>
+<wire x1="40.83" y1="42.99" x2="40.76" y2="43.06" width="0.2032" layer="1"/>
+<wire x1="40.815" y1="42.895" x2="40.83" y2="42.88" width="0.2032" layer="1"/>
+<wire x1="40.815" y1="42.895" x2="38.92" y2="41" width="0.2032" layer="1"/>
+<wire x1="28.94736875" y1="41" x2="38.92" y2="41" width="0.2032" layer="1"/>
+<wire x1="24.89" y1="43.32" x2="24.89" y2="42.8812125" width="0.2" layer="1"/>
+<wire x1="24.89" y1="42.8812125" x2="25.3824" y2="42.3888125" width="0.2" layer="1"/>
+<wire x1="25.3824" y1="40.8682375" x2="25.77031875" y2="40.48031875" width="0.2" layer="1"/>
+<wire x1="25.3824" y1="42.3888125" x2="25.3824" y2="40.8682375" width="0.2" layer="1"/>
+<wire x1="25.77031875" y1="40.48031875" x2="28.4276875" y2="40.48031875" width="0.2" layer="1"/>
+<wire x1="28.4276875" y1="40.48031875" x2="28.94736875" y2="41" width="0.2" layer="1"/>
+<contactref element="L1" pad="P$4"/>
+<via x="35.36" y="47.44" extent="1-16" drill="0.3"/>
+<wire x1="35.36" y1="47.45" x2="35.36" y2="47.44" width="0.1524" layer="1"/>
+<wire x1="35.36" y1="47.44" x2="35.35" y2="47.44" width="0.1524" layer="16"/>
 </signal>
 <signal name="SWCLK">
 <contactref element="SWCLK1" pad="TP"/>
 <contactref element="ST2" pad="24"/>
-<via x="57.55" y="54.1" extent="1-16" drill="0.35"/>
-<wire x1="57.55" y1="54.1" x2="57.5" y2="54.15" width="0.1524" layer="16"/>
-<wire x1="57.55" y1="54.1" x2="57.55" y2="54.55" width="0.1524" layer="1"/>
-<wire x1="57.55" y1="54.55" x2="56.5" y2="55.6" width="0.1524" layer="1"/>
-<wire x1="56.5" y1="55.6" x2="56.5" y2="58.2" width="0.1524" layer="1"/>
-<wire x1="56.7" y1="58.4" x2="56.65" y2="59" width="0.1524" layer="1"/>
-<wire x1="56.5" y1="58.2" x2="56.7" y2="58.4" width="0.1524" layer="1"/>
-<wire x1="57.6" y1="54.1" x2="57.45" y2="53.95" width="0.254" layer="16"/>
-<wire x1="57.6" y1="54.1" x2="57.55" y2="54.1" width="0.254" layer="16"/>
+<via x="23.366" y="42.43" extent="1-16" drill="0.35"/>
+<wire x1="23.366" y1="42.43" x2="23.316" y2="42.48" width="0.1524" layer="16"/>
+<wire x1="22.944" y1="45.384" x2="22.944" y2="42.852" width="0.1524" layer="1"/>
+<wire x1="23.366" y1="42.43" x2="22.944" y2="42.852" width="0.1524" layer="1"/>
+<wire x1="22.944" y1="45.384" x2="23.1" y2="45.54" width="0.1524" layer="1"/>
+<wire x1="23.366" y1="42.43" x2="23.456" y2="42.34" width="0.254" layer="16"/>
+<wire x1="23.456" y1="42.34" x2="23.65" y2="42.34" width="0.254" layer="16"/>
 </signal>
 <signal name="STX-&gt;">
 <contactref element="STX-&gt;1" pad="TP"/>
 <contactref element="ST2" pad="29"/>
-<wire x1="59.25" y1="58.4" x2="59.2286" y2="58.3874125" width="0.1524" layer="1"/>
-<wire x1="59.2286" y1="58.3874125" x2="59.2286" y2="58.03166875" width="0.1524" layer="1"/>
-<wire x1="59.2286" y1="58.03166875" x2="58.648465625" y2="57.451534375" width="0.1524" layer="1"/>
-<wire x1="58.648465625" y1="57.451534375" x2="58.498465625" y2="57.451534375" width="0.1524" layer="1"/>
-<wire x1="58.39693125" y1="57.35" x2="58.498465625" y2="57.451534375" width="0.1524" layer="1"/>
-<via x="58.498465625" y="57.451534375" extent="1-16" drill="0.3"/>
-<wire x1="58.2" y1="57.5" x2="58.248465625" y2="57.451534375" width="0.1524" layer="16"/>
-<wire x1="58.248465625" y1="57.451534375" x2="58.498465625" y2="57.451534375" width="0.1524" layer="16"/>
-</signal>
-<signal name="SRX&lt;-">
-<contactref element="SRX&lt;-1" pad="TP"/>
-<contactref element="ST2" pad="30"/>
-<wire x1="59.75" y1="58.4" x2="59.7714" y2="58.4286" width="0.1524" layer="1"/>
-<via x="63" y="55.45" extent="1-16" drill="0.3"/>
-<wire x1="59.7714" y1="58.09754375" x2="60.0952" y2="57.77374375" width="0.1524" layer="1"/>
-<wire x1="60.0952" y1="57.77374375" x2="60.0952" y2="56.0815125" width="0.1524" layer="1"/>
-<wire x1="59.7714" y1="58.4286" x2="59.7714" y2="58.09754375" width="0.1524" layer="1"/>
-<wire x1="60.0952" y1="56.0815125" x2="60.7267125" y2="55.45" width="0.1524" layer="1"/>
-<wire x1="60.7267125" y1="55.45" x2="63" y2="55.45" width="0.1524" layer="1"/>
-<wire x1="63" y1="55.45" x2="63.6" y2="56.05" width="0.1524" layer="16"/>
-<wire x1="63.6" y1="56.05" x2="63.6" y2="56.1" width="0.1524" layer="16"/>
+<wire x1="25.7" y1="44.94" x2="25.6786" y2="44.9274125" width="0.1524" layer="1"/>
+<wire x1="25.6786" y1="44.9274125" x2="25.6786" y2="44.57166875" width="0.1524" layer="1"/>
+<wire x1="25.6786" y1="44.57166875" x2="25.258465625" y2="44.151534375" width="0.1524" layer="1"/>
+<wire x1="25.258465625" y1="44.151534375" x2="24.958465625" y2="44.151534375" width="0.1524" layer="1"/>
+<wire x1="24.85693125" y1="44.05" x2="24.958465625" y2="44.151534375" width="0.1524" layer="1"/>
+<via x="24.958465625" y="44.151534375" extent="1-16" drill="0.3"/>
+<wire x1="24.91" y1="44.3" x2="24.958465625" y2="44.151534375" width="0.1524" layer="16"/>
 </signal>
 <signal name="SWDIO">
 <contactref element="ST2" pad="23"/>
 <contactref element="SWDIO1" pad="TP"/>
-<wire x1="56.65" y1="59.5" x2="56.6786" y2="59.4786" width="0.1524" layer="1"/>
-<wire x1="56.6786" y1="59.4786" x2="56.38166875" y2="59.4786" width="0.1524" layer="1"/>
-<wire x1="56.38166875" y1="59.4786" x2="56.1214" y2="59.21833125" width="0.1524" layer="1"/>
-<wire x1="55.1" y1="54.2" x2="55.1" y2="54.25" width="0.1524" layer="16"/>
-<wire x1="56.1214" y1="59.21833125" x2="56.1214" y2="55.2214" width="0.1524" layer="1"/>
-<wire x1="56.1214" y1="55.2214" x2="55.1" y2="54.2" width="0.1524" layer="1"/>
-<via x="55.1" y="54.2" extent="1-16" drill="0.35"/>
-<wire x1="55.1" y1="54.05" x2="55.1" y2="54.2" width="0.1524" layer="16"/>
+<via x="19.22" y="39.94" extent="1-16" drill="0.35"/>
+<wire x1="19.22" y1="39.94" x2="18.6" y2="39.94" width="0.1524" layer="16"/>
+<wire x1="18.16" y1="40.38" x2="18.6" y2="39.94" width="0.1524" layer="16"/>
+<wire x1="23.1" y1="46.04" x2="22.9278" y2="45.8678" width="0.1524" layer="1"/>
+<wire x1="22.9278" y1="45.8678" x2="22.7527125" y2="45.8678" width="0.1524" layer="1"/>
+<wire x1="22.7527125" y1="45.8678" x2="22.54" y2="45.6550875" width="0.1524" layer="1"/>
+<wire x1="22.54" y1="45.6550875" x2="22.54" y2="41.87" width="0.1524" layer="1"/>
+<wire x1="22.54" y1="41.87" x2="20.31" y2="41.87" width="0.1524" layer="1"/>
+<wire x1="20.31" y1="41.87" x2="19.22" y2="40.78" width="0.1524" layer="1"/>
+<wire x1="19.22" y1="40.78" x2="19.22" y2="39.94" width="0.1524" layer="1"/>
 </signal>
-<signal name="SWO">
-<contactref element="ST2" pad="26"/>
-<contactref element="SWO1" pad="TP"/>
-<wire x1="57.7214" y1="58.4214" x2="57.7214" y2="58.23166875" width="0.1524" layer="1"/>
-<wire x1="57.7214" y1="58.23166875" x2="57.75" y2="58.20306875" width="0.1524" layer="1"/>
-<wire x1="57.75" y1="58.4" x2="57.7214" y2="58.4214" width="0.1524" layer="1"/>
-<wire x1="57.75" y1="58.4" x2="57.75" y2="56" width="0.1524" layer="1"/>
-<wire x1="58.7" y1="55.05" x2="58.75" y2="55.05" width="0.1524" layer="1"/>
-<wire x1="58.7" y1="55.05" x2="57.75" y2="56" width="0.1524" layer="1"/>
-<via x="58.75" y="55.05" extent="1-16" drill="0.3"/>
-<wire x1="58.75" y1="55.05" x2="60.1" y2="55.05" width="0.1524" layer="16"/>
-<wire x1="60.1" y1="55.05" x2="60.2" y2="55.15" width="0.1524" layer="16"/>
-</signal>
-<signal name="N$16">
-<contactref element="L2" pad="P$2"/>
+<signal name="N$10">
 <contactref element="ST2" pad="8"/>
-<wire x1="61.35" y1="62.5" x2="62.05" y2="62.5" width="0.1524" layer="1"/>
-<wire x1="62.05" y1="62.5" x2="62.25" y2="62.7" width="0.1524" layer="1"/>
-<via x="62.25" y="62.7" extent="1-16" drill="0.3"/>
-<wire x1="62.25" y1="62.7" x2="63.9" y2="62.7" width="0.1524" layer="16"/>
-<wire x1="63.9" y1="62.7" x2="66.75" y2="59.85" width="0.1524" layer="16"/>
-<wire x1="66.75" y1="59.85" x2="67.9" y2="59.85" width="0.1524" layer="16"/>
-<wire x1="67.9" y1="59.85" x2="67.95" y2="59.9" width="0.1524" layer="16"/>
-<wire x1="67.95" y1="59.9" x2="67.95" y2="59.95" width="0.1524" layer="16"/>
-<wire x1="67.95" y1="59.95" x2="68.05" y2="60.05" width="0.1524" layer="16"/>
-<via x="68.05" y="60.05" extent="1-16" drill="0.3"/>
+<wire x1="27.8" y1="49.04" x2="28.5" y2="49.04" width="0.1524" layer="1"/>
+<wire x1="28.5" y1="49.04" x2="28.7" y2="49.24" width="0.1524" layer="1"/>
+<via x="28.7" y="49.24" extent="1-16" drill="0.3"/>
+<wire x1="28.7" y1="49.24" x2="28.78" y2="49.24" width="0.1524" layer="16"/>
+<via x="35.34" y="46.6" extent="1-16" drill="0.3"/>
+<wire x1="28.7" y1="49.24" x2="29.1714" y2="48.7686" width="0.1524" layer="16"/>
+<wire x1="29.1714" y1="48.7686" x2="29.1714" y2="48.48104375" width="0.1524" layer="16"/>
+<wire x1="29.1714" y1="48.48104375" x2="31.66244375" y2="45.99" width="0.1524" layer="16"/>
+<wire x1="31.66244375" y1="45.99" x2="35.24" y2="45.99" width="0.1524" layer="16"/>
+<wire x1="35.24" y1="45.99" x2="35.24" y2="46.24" width="0.1524" layer="16"/>
+<contactref element="L1" pad="P$3"/>
+<wire x1="35.24" y1="46.24" x2="35.34" y2="46.34" width="0.1524" layer="16"/>
+<wire x1="35.34" y1="46.34" x2="35.34" y2="46.6" width="0.1524" layer="16"/>
+<wire x1="35.36" y1="46.6" x2="35.34" y2="46.6" width="0.1524" layer="1"/>
 </signal>
-<signal name="N$17">
-<contactref element="L2" pad="P$1"/>
+<signal name="N$13">
 <contactref element="ST2" pad="9"/>
-<wire x1="60.75" y1="63.5" x2="61.2" y2="63.95" width="0.1524" layer="1"/>
-<wire x1="61.2" y1="63.95" x2="61.7" y2="63.95" width="0.1524" layer="1"/>
-<via x="61.7" y="63.95" extent="1-16" drill="0.35"/>
-<wire x1="61.7" y1="63.95" x2="65" y2="63.95" width="0.1524" layer="16"/>
-<wire x1="65" y1="63.95" x2="68.05" y2="60.9" width="0.1524" layer="16"/>
-<via x="68.05" y="60.9" extent="1-16" drill="0.3"/>
-<wire x1="60.75" y1="63.1" x2="60.75" y2="63.5" width="0.1524" layer="1"/>
+<wire x1="27.2" y1="50.04" x2="27.55" y2="50.39" width="0.1524" layer="1"/>
+<wire x1="28.61" y1="50.39" x2="28.61" y2="50.37" width="0.1524" layer="1"/>
+<wire x1="28.61" y1="50.39" x2="27.55" y2="50.39" width="0.1524" layer="1"/>
+<via x="28.61" y="50.37" extent="1-16" drill="0.35"/>
+<wire x1="27.2" y1="49.64" x2="27.2" y2="50.04" width="0.1524" layer="1"/>
+<via x="34.512" y="46.604" extent="1-16" drill="0.3"/>
+<contactref element="L1" pad="P$2"/>
+<wire x1="28.61" y1="50.37" x2="29.7858" y2="49.1942" width="0.1524" layer="16"/>
+<wire x1="29.7858" y1="49.1942" x2="29.7858" y2="48.5545625" width="0.1524" layer="16"/>
+<wire x1="29.7858" y1="48.5545625" x2="31.7363625" y2="46.604" width="0.1524" layer="16"/>
+<wire x1="31.7363625" y1="46.604" x2="34.512" y2="46.604" width="0.1524" layer="16"/>
+<wire x1="34.512" y1="46.604" x2="34.51" y2="46.6" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="N$18">
+<signal name="N$14">
 <contactref element="ST2" pad="7"/>
-<contactref element="L2" pad="P$3"/>
-<wire x1="61.35" y1="62" x2="62.55" y2="62" width="0.1524" layer="1"/>
-<wire x1="62.55" y1="62" x2="62.6" y2="61.95" width="0.1524" layer="1"/>
-<via x="62.6" y="61.95" extent="1-16" drill="0.3"/>
-<wire x1="62.6" y1="61.95" x2="65.4" y2="59.15" width="0.1524" layer="16"/>
-<wire x1="65.4" y1="59.15" x2="68.65" y2="59.15" width="0.1524" layer="16"/>
-<wire x1="68.65" y1="59.15" x2="68.9" y2="59.4" width="0.1524" layer="16"/>
-<wire x1="68.9" y1="59.4" x2="68.9" y2="60.05" width="0.1524" layer="16"/>
-<via x="68.9" y="60.05" extent="1-16" drill="0.3"/>
+<wire x1="27.8" y1="48.54" x2="30.481" y2="48.54" width="0.1524" layer="1"/>
+<wire x1="30.481" y1="48.54" x2="30.481" y2="48.664" width="0.1524" layer="1"/>
+<via x="30.481" y="48.664" extent="1-16" drill="0.3"/>
+<wire x1="30.481" y1="48.664" x2="30.905" y2="48.24" width="0.1524" layer="16"/>
+<wire x1="30.905" y1="48.24" x2="32.28" y2="48.24" width="0.1524" layer="16"/>
+<via x="34.509" y="47.45" extent="1-16" drill="0.3"/>
+<contactref element="L1" pad="P$1"/>
+<wire x1="32.28" y1="48.24" x2="33.07" y2="47.45" width="0.1524" layer="16"/>
+<wire x1="33.07" y1="47.45" x2="34.509" y2="47.45" width="0.1524" layer="16"/>
+<wire x1="34.509" y1="47.45" x2="34.51" y2="47.45" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="N$19">
+<signal name="N$15">
 <contactref element="ST2" pad="6"/>
-<wire x1="61.35" y1="61.5" x2="61.3214" y2="61.4786" width="0.1524" layer="1"/>
-<wire x1="61.3214" y1="61.4786" x2="62.21833125" y2="61.4786" width="0.1524" layer="1"/>
-<wire x1="62.52693125" y1="61.17" x2="63.0738" y2="61.17" width="0.1524" layer="1"/>
-<wire x1="62.21833125" y1="61.4786" x2="62.52693125" y2="61.17" width="0.1524" layer="1"/>
-<wire x1="63.7" y1="60.4" x2="63.72" y2="60.42" width="0.1524" layer="1"/>
-<wire x1="63.72" y1="60.42" x2="63.773" y2="60.42" width="0.1524" layer="1"/>
-<wire x1="63.773" y1="60.42" x2="63.8238" y2="60.42" width="0.1524" layer="1"/>
-<wire x1="63.0738" y1="61.17" x2="63.5469" y2="60.6969" width="0.1524" layer="1"/>
-<wire x1="63.7938" y1="60.45" x2="63.8238" y2="60.42" width="0.1524" layer="1"/>
-<wire x1="63.5469" y1="60.6969" x2="63.773" y2="60.4708" width="0.254" layer="1"/>
-<wire x1="63.773" y1="60.4708" x2="63.773" y2="60.42" width="0.254" layer="1"/>
-<wire x1="64.4131" y1="60.6969" x2="63.5469" y2="60.6969" width="0.1524" layer="1"/>
-<contactref element="U$2" pad="P$1"/>
-<wire x1="64.4" y1="60.45" x2="63.7938" y2="60.45" width="0.1524" layer="1"/>
-<wire x1="63.7938" y1="60.45" x2="63.773" y2="60.4708" width="0.1524" layer="1"/>
+<wire x1="27.8" y1="48.04" x2="27.7714" y2="48.0186" width="0.1524" layer="1"/>
+<wire x1="27.7714" y1="48.0186" x2="28.66833125" y2="48.0186" width="0.1524" layer="1"/>
+<wire x1="28.97693125" y1="47.71" x2="29.5238" y2="47.71" width="0.1524" layer="1"/>
+<wire x1="28.66833125" y1="48.0186" x2="28.97693125" y2="47.71" width="0.1524" layer="1"/>
+<wire x1="30.15" y1="46.94" x2="30.17" y2="46.96" width="0.1524" layer="1"/>
+<wire x1="30.17" y1="46.96" x2="30.223" y2="46.96" width="0.1524" layer="1"/>
+<wire x1="30.223" y1="46.96" x2="30.2738" y2="46.96" width="0.1524" layer="1"/>
+<wire x1="29.5238" y1="47.71" x2="29.9969" y2="47.2369" width="0.1524" layer="1"/>
+<wire x1="30.2438" y1="46.99" x2="30.2738" y2="46.96" width="0.1524" layer="1"/>
+<wire x1="29.9969" y1="47.2369" x2="30.223" y2="47.0108" width="0.254" layer="1"/>
+<wire x1="30.223" y1="47.0108" x2="30.223" y2="46.96" width="0.254" layer="1"/>
+<wire x1="30.8631" y1="47.2369" x2="29.9969" y2="47.2369" width="0.1524" layer="1"/>
+<contactref element="U$1" pad="P$1"/>
+<wire x1="30.85" y1="46.99" x2="30.2438" y2="46.99" width="0.1524" layer="1"/>
+<wire x1="30.2438" y1="46.99" x2="30.223" y2="47.0108" width="0.1524" layer="1"/>
 </signal>
 <signal name="SCLK">
-<contactref element="N2" pad="P7"/>
+<contactref element="N1" pad="P7"/>
 <contactref element="ST2" pad="11"/>
-<wire x1="72.40165625" y1="66.5234" x2="62.91563125" y2="66.5234" width="0.1524" layer="1"/>
-<wire x1="73.02865625" y1="65.9964" x2="72.986215625" y2="66.038840625" width="0.1524" layer="1"/>
-<wire x1="72.971096875" y1="66.038840625" x2="72.986215625" y2="66.038840625" width="0.1524" layer="1"/>
-<wire x1="72.971096875" y1="65.953959375" x2="72.40165625" y2="66.5234" width="0.1524" layer="1"/>
-<wire x1="62.91563125" y1="66.5234" x2="59.75" y2="63.35776875" width="0.1524" layer="1"/>
-<wire x1="59.75" y1="63.35776875" x2="59.75" y2="63.1" width="0.1524" layer="1"/>
-<wire x1="74.95" y1="65.74" x2="74.89" y2="65.8" width="0.1524" layer="1"/>
-<wire x1="74.89" y1="65.8" x2="74.4" y2="65.8" width="0.1524" layer="1"/>
-<wire x1="74.4" y1="65.8" x2="74.4" y2="66.9" width="0.1524" layer="1"/>
-<via x="74.4" y="66.9" extent="1-16" drill="0.35"/>
-<wire x1="74.4" y1="66.9" x2="74.35" y2="66.9" width="0.1524" layer="16"/>
-<wire x1="74.35" y1="66.9" x2="74.4" y2="66.85" width="0.1524" layer="16"/>
-<wire x1="74.4" y1="66.85" x2="74.4" y2="66.1" width="0.1524" layer="16"/>
-<wire x1="74.4" y1="66.1" x2="74.338840625" y2="66.038840625" width="0.1524" layer="16"/>
-<wire x1="74.338840625" y1="66.038840625" x2="72.971096875" y2="66.038840625" width="0.1524" layer="16"/>
-<via x="72.971096875" y="66.038840625" extent="1-16" drill="0.35"/>
-<wire x1="72.971096875" y1="66.038840625" x2="72.971096875" y2="65.953959375" width="0.1524" layer="1"/>
+<wire x1="40.986" y1="51.57" x2="40.926" y2="51.63" width="0.1524" layer="1"/>
+<wire x1="40.986" y1="51.57" x2="40.437" y2="51.57" width="0.1524" layer="1"/>
+<wire x1="40.437" y1="51.57" x2="40.367" y2="51.64" width="0.1524" layer="1"/>
+<wire x1="40.257" y1="51.64" x2="40.367" y2="51.64" width="0.1524" layer="1"/>
+<via x="40.257" y="51.64" extent="1-16" drill="0.35"/>
+<via x="29.98" y="52.1192" extent="1-16" drill="0.35"/>
+<wire x1="40.257" y1="51.64" x2="39.667" y2="51.64" width="0.1524" layer="16"/>
+<wire x1="39.667" y1="51.64" x2="38.9488" y2="52.3582" width="0.1524" layer="16"/>
+<wire x1="38.9488" y1="52.3582" x2="30.229" y2="52.3582" width="0.1524" layer="16"/>
+<wire x1="30.229" y1="52.3582" x2="29.99" y2="52.1192" width="0.1524" layer="16"/>
+<wire x1="29.98" y1="52.1192" x2="29.99" y2="52.1192" width="0.1524" layer="16"/>
+<wire x1="27.0885125" y1="50.9536" x2="28.8144" y2="50.9536" width="0.1524" layer="1"/>
+<wire x1="27.0885125" y1="50.9536" x2="26.2" y2="50.0650875" width="0.1524" layer="1"/>
+<wire x1="26.2" y1="49.64" x2="26.2" y2="50.0650875" width="0.1524" layer="1"/>
+<wire x1="29.98" y1="52.1192" x2="28.8144" y2="50.9536" width="0.1524" layer="1"/>
 </signal>
 <signal name="MOSI">
-<contactref element="N2" pad="P8"/>
+<contactref element="N1" pad="P8"/>
 <contactref element="ST2" pad="13"/>
-<wire x1="74.95" y1="65.24" x2="74.9028" y2="65.2872" width="0.1524" layer="1"/>
-<wire x1="74.9028" y1="65.2872" x2="74.47635" y2="65.2872" width="0.1524" layer="1"/>
-<wire x1="74.47635" y1="65.2872" x2="73.9" y2="65.86355" width="0.1524" layer="1"/>
-<wire x1="73.9" y1="65.86355" x2="73.9" y2="66.7" width="0.1524" layer="1"/>
-<wire x1="73.9" y1="66.7" x2="73.5" y2="67.1" width="0.1524" layer="1"/>
-<wire x1="73.5" y1="67.1" x2="62.35145" y2="67.1" width="0.1524" layer="1"/>
-<wire x1="62.35145" y1="67.1" x2="58.75" y2="63.49855" width="0.1524" layer="1"/>
-<wire x1="58.75" y1="63.49855" x2="58.75" y2="63.1" width="0.1524" layer="1"/>
+<wire x1="40.986" y1="51.07" x2="40.946" y2="51.03" width="0.1524" layer="1"/>
+<wire x1="40.946" y1="51.03" x2="39.866" y2="51.03" width="0.1524" layer="1"/>
+<wire x1="39.866" y1="51.03" x2="39.8632" y2="51.0272" width="0.1524" layer="1"/>
+<wire x1="39.8632" y1="51.0272" x2="39.40335" y2="51.0272" width="0.1524" layer="1"/>
+<wire x1="39.40335" y1="51.0272" x2="36.98055" y2="53.45" width="0.1524" layer="1"/>
+<wire x1="36.98055" y1="53.45" x2="29.73145" y2="53.45" width="0.1524" layer="1"/>
+<wire x1="29.73145" y1="53.45" x2="29.09" y2="52.80855" width="0.1524" layer="1"/>
+<wire x1="29.09" y1="52.80855" x2="29.09" y2="52.0606875" width="0.1524" layer="1"/>
+<wire x1="26.6716" y1="51.5516" x2="25.2" y2="50.08" width="0.1524" layer="1"/>
+<wire x1="29.09" y1="52.0606875" x2="28.5809125" y2="51.5516" width="0.1524" layer="1"/>
+<wire x1="28.5809125" y1="51.5516" x2="26.6716" y2="51.5516" width="0.1524" layer="1"/>
+<wire x1="25.2" y1="50.08" x2="25.2" y2="49.64" width="0.1524" layer="1"/>
 </signal>
 <signal name="MISO">
-<contactref element="N2" pad="P9"/>
+<contactref element="N1" pad="P9"/>
 <contactref element="ST2" pad="12"/>
-<wire x1="74.95" y1="64.74" x2="74.4821625" y2="64.74" width="0.1524" layer="1"/>
-<wire x1="74.4821625" y1="64.74" x2="73.59930625" y2="65.62285625" width="0.1524" layer="1"/>
-<wire x1="73.59930625" y1="65.62285625" x2="73.59930625" y2="66.4576375" width="0.1524" layer="1"/>
-<wire x1="73.59930625" y1="66.4576375" x2="73.27954375" y2="66.7774" width="0.1524" layer="1"/>
-<wire x1="73.27954375" y1="66.7774" x2="62.4774" y2="66.7774" width="0.1524" layer="1"/>
-<wire x1="59.25" y1="63.55" x2="59.25" y2="63.1" width="0.1524" layer="1"/>
-<wire x1="62.4774" y1="66.7774" x2="59.25" y2="63.55" width="0.1524" layer="1"/>
+<wire x1="39.2721625" y1="50.62" x2="39.986" y2="50.62" width="0.1524" layer="1"/>
+<wire x1="39.2721625" y1="50.62" x2="36.7447625" y2="53.1474" width="0.1524" layer="1"/>
+<wire x1="36.7447625" y1="53.1474" x2="29.8174" y2="53.1474" width="0.1524" layer="1"/>
+<wire x1="29.8174" y1="53.1474" x2="29.425" y2="52.755" width="0.1524" layer="1"/>
+<wire x1="29.425" y1="52.755" x2="29.425" y2="51.985" width="0.1524" layer="1"/>
+<wire x1="29.425" y1="51.985" x2="28.7076" y2="51.2676" width="0.1524" layer="1"/>
+<wire x1="28.7076" y1="51.2676" x2="26.9133" y2="51.2676" width="0.1524" layer="1"/>
+<wire x1="26.9133" y1="51.2676" x2="25.7" y2="50.0543" width="0.1524" layer="1"/>
+<wire x1="25.7" y1="50.0543" x2="25.7" y2="49.64" width="0.1524" layer="1"/>
+<wire x1="39.986" y1="50.62" x2="40.036" y2="50.57" width="0.1524" layer="1"/>
+<wire x1="40.036" y1="50.57" x2="40.986" y2="50.57" width="0.1524" layer="1"/>
 </signal>
-<signal name="AMS_CS">
-<contactref element="N2" pad="P6"/>
+<signal name="AMS_CS2">
+<contactref element="N1" pad="P6"/>
 <contactref element="ST2" pad="14"/>
-<wire x1="58.25" y1="63.9" x2="58.25" y2="63.1" width="0.1524" layer="1"/>
-<wire x1="58.25" y1="63.9" x2="58.9614" y2="64.6114" width="0.1524" layer="1"/>
-<wire x1="58.9614" y1="64.6114" x2="58.9614" y2="66.9114" width="0.1524" layer="1"/>
-<wire x1="58.9614" y1="66.9114" x2="59.55" y2="67.5" width="0.1524" layer="1"/>
-<wire x1="59.55" y1="67.5" x2="74.8" y2="67.5" width="0.1524" layer="1"/>
-<wire x1="74.8" y1="67.5" x2="74.95" y2="67.35" width="0.1524" layer="1"/>
-<wire x1="74.95" y1="67.35" x2="74.95" y2="66.24" width="0.1524" layer="1"/>
+<wire x1="24.7" y1="50.24" x2="24.7" y2="49.64" width="0.1524" layer="1"/>
+<wire x1="27.03" y1="53.74" x2="26.6814" y2="53.3914" width="0.1524" layer="1"/>
+<wire x1="27.03" y1="53.74" x2="40.19" y2="53.74" width="0.1524" layer="1"/>
+<wire x1="40.986" y1="52.07" x2="40.986" y2="52.944" width="0.1524" layer="1"/>
+<wire x1="40.986" y1="52.944" x2="40.19" y2="53.74" width="0.1524" layer="1"/>
+<wire x1="26.40365" y1="51.7122" x2="26.1722" y2="51.7122" width="0.1524" layer="1"/>
+<wire x1="26.6814" y1="53.3914" x2="26.6814" y2="51.98995" width="0.1524" layer="1"/>
+<wire x1="26.6814" y1="51.98995" x2="26.40365" y2="51.7122" width="0.1524" layer="1"/>
+<wire x1="26.1722" y1="51.7122" x2="24.7" y2="50.24" width="0.1524" layer="1"/>
 </signal>
-<signal name="N$25">
-<contactref element="N2" pad="P4"/>
-<via x="78.746165625" y="66.017" extent="1-16" drill="0.35"/>
-<wire x1="78.746165625" y1="66.017" x2="78.46645625" y2="65.737203125" width="0.1524" layer="1"/>
-<wire x1="78.46645625" y1="65.737203125" x2="77.95280625" y2="65.73719375" width="0.1524" layer="1"/>
-<wire x1="77.95" y1="65.74" x2="77.95280625" y2="65.73719375" width="0.1524" layer="1"/>
-<polygon width="0.05" layer="16">
-<vertex x="78.1" y="65.9"/>
-<vertex x="78.7" y="66.5"/>
-<vertex x="79.1" y="66.1"/>
-<vertex x="78.4" y="65.5"/>
-</polygon>
-<contactref element="MID" pad="2"/>
-<contactref element="C2" pad="1"/>
-<wire x1="77.6" y1="67" x2="78.1428125" y2="67" width="0.1524" layer="1"/>
-<wire x1="78.1428125" y1="67" x2="78.5881625" y2="66.6881625" width="0.1524" layer="1"/>
-<wire x1="78.5881625" y1="66.6881625" x2="78.9" y2="66.2427875" width="0.1524" layer="1"/>
-<wire x1="78.9" y1="66.2427875" x2="78.9" y2="65.9" width="0.1524" layer="1"/>
-<wire x1="78.746165625" y1="66.017" x2="78.9" y2="65.9" width="0" layer="19" extent="1-1"/>
+<signal name="N$16">
+<contactref element="N1" pad="P4"/>
+<contactref element="C19" pad="2"/>
+<contactref element="C20" pad="2"/>
+<wire x1="43.986" y1="51.57" x2="44.016" y2="51.57" width="0.1524" layer="1"/>
+<wire x1="44.82" y1="51.67" x2="45.766040625" y2="51.67" width="0.1524" layer="1"/>
+<via x="44.08" y="53.8" extent="1-16" drill="0.35"/>
+<wire x1="44.96425625" y1="51.52574375" x2="44.82" y2="51.67" width="0.1524" layer="1"/>
+<wire x1="45.59" y1="51.67" x2="44.82" y2="51.67" width="0.1524" layer="1"/>
+<wire x1="45.766040625" y1="51.67" x2="44.85474375" y2="53.02525625" width="0.1524" layer="1"/>
+<wire x1="44.08" y1="53.8" x2="44.85474375" y2="53.02525625" width="0.1524" layer="1"/>
+<wire x1="43.986" y1="51.57" x2="44.086" y2="51.67" width="0.1524" layer="1"/>
+<wire x1="44.086" y1="51.67" x2="44.82" y2="51.67" width="0.1524" layer="1"/>
 </signal>
-<signal name="N$26">
-<contactref element="N2" pad="P3"/>
-<wire x1="77.95" y1="65.24" x2="77.9528" y2="65.2428" width="0.1524" layer="1"/>
-<via x="79.15" y="64.55" extent="1-16" drill="0.35"/>
-<wire x1="77.95" y1="65.24" x2="77.9528" y2="65.2372" width="0.1524" layer="1"/>
-<wire x1="79.15" y1="64.55" x2="78.4628" y2="65.2372" width="0.1524" layer="1"/>
-<wire x1="78.4628" y1="65.2372" x2="77.9528" y2="65.2372" width="0.1524" layer="1"/>
-<polygon width="0.05" layer="16">
-<vertex x="78.9" y="64.8"/>
-<vertex x="79.6" y="65.15"/>
-<vertex x="79.85" y="64.7"/>
-<vertex x="79.15" y="64.35"/>
-</polygon>
-<contactref element="MID" pad="1"/>
-<contactref element="C3" pad="2"/>
-<wire x1="79.1" y1="63.6" x2="79.1" y2="64.5" width="0.1524" layer="1"/>
-<wire x1="79.1" y1="64.5" x2="78.9" y2="64.7" width="0.1524" layer="1"/>
-<wire x1="79.15" y1="64.55" x2="79.1" y2="64.5" width="0" layer="19" extent="1-1"/>
+<signal name="N$17">
+<contactref element="N1" pad="P3"/>
+<wire x1="43.9888" y1="51.0728" x2="43.986" y2="51.07" width="0.1524" layer="1"/>
+<contactref element="C19" pad="1"/>
+<contactref element="C20" pad="1"/>
+<wire x1="45.59" y1="50.47" x2="44.82" y2="50.47" width="0.1524" layer="1"/>
+<via x="43.333428125" y="42.05625625" extent="1-16" drill="0.35"/>
+<wire x1="45.5102" y1="50.3867625" x2="45.5102" y2="44.123028125" width="0.25" layer="1"/>
+<wire x1="45.5102" y1="44.123028125" x2="43.493428125" y2="42.10625625" width="0.25" layer="1"/>
+<wire x1="43.493428125" y1="42.10625625" x2="43.383428125" y2="42.10625625" width="0.25" layer="1"/>
+<wire x1="43.383428125" y1="42.10625625" x2="43.333428125" y2="42.05625625" width="0.25" layer="1"/>
+<wire x1="45.59" y1="50.47" x2="45.5102" y2="50.3867625" width="0.1524" layer="1"/>
+<wire x1="44.82" y1="50.47" x2="44.8" y2="50.49" width="0.1524" layer="1"/>
+<wire x1="44.8" y1="50.49" x2="44.8" y2="50.77" width="0.1524" layer="1"/>
+<wire x1="44.8" y1="50.77" x2="44.4972" y2="51.0728" width="0.1524" layer="1"/>
+<wire x1="44.4972" y1="51.0728" x2="43.9888" y2="51.0728" width="0.1524" layer="1"/>
 </signal>
 <signal name="AMS_IRQ">
 <contactref element="ST2" pad="3"/>
-<wire x1="73.2" y1="58.15" x2="73.2" y2="62.85" width="0.1524" layer="1"/>
-<wire x1="73.2" y1="58.15" x2="73.35" y2="58" width="0.1524" layer="1"/>
-<via x="73.35" y="58" extent="1-16" drill="0.35"/>
-<wire x1="71.2192875" y1="57.7706" x2="70.7807125" y2="57.7706" width="0.1524" layer="16"/>
-<wire x1="73.35" y1="58" x2="71.4486875" y2="58" width="0.1524" layer="16"/>
-<wire x1="65.5513125" y1="58.15" x2="65.05" y2="58.15" width="0.1524" layer="16"/>
-<wire x1="71.4486875" y1="58" x2="71.2192875" y2="57.7706" width="0.1524" layer="16"/>
-<wire x1="65.8807125" y1="58.4794" x2="65.5513125" y2="58.15" width="0.1524" layer="16"/>
-<wire x1="70.7807125" y1="57.7706" x2="70.0719125" y2="58.4794" width="0.1524" layer="16"/>
-<wire x1="70.0719125" y1="58.4794" x2="65.8807125" y2="58.4794" width="0.1524" layer="16"/>
-<wire x1="63.25" y1="59.95" x2="62.221" y2="59.95" width="0.1524" layer="16"/>
-<via x="62.221" y="59.95" extent="1-16" drill="0.35"/>
-<wire x1="65.05" y1="58.15" x2="63.25" y2="59.95" width="0.1524" layer="16"/>
-<wire x1="62.221" y1="59.95" x2="62.171" y2="60" width="0.1524" layer="1"/>
-<wire x1="62.171" y1="60" x2="61.35" y2="60" width="0.1524" layer="1"/>
-<contactref element="N2" pad="P10"/>
-<wire x1="73.2" y1="62.85" x2="74.59" y2="64.24" width="0.1524" layer="1"/>
-<wire x1="74.59" y1="64.24" x2="74.95" y2="64.24" width="0.1524" layer="1"/>
+<wire x1="39.57" y1="44.87" x2="39.57" y2="49.44" width="0.1524" layer="1"/>
+<wire x1="39.57" y1="44.87" x2="40.73" y2="43.71" width="0.1524" layer="1"/>
+<via x="40.73" y="43.71" extent="1-16" drill="0.3"/>
+<wire x1="40.73" y1="43.71" x2="37.8313125" y2="43.71" width="0.1524" layer="16"/>
+<wire x1="36.6219125" y1="44.9194" x2="31.4306" y2="44.9194" width="0.1524" layer="16"/>
+<wire x1="37.8313125" y1="43.71" x2="36.6219125" y2="44.9194" width="0.1524" layer="16"/>
+<wire x1="29.86" y1="46.49" x2="28.671" y2="46.49" width="0.1524" layer="16"/>
+<via x="28.671" y="46.49" extent="1-16" drill="0.35"/>
+<wire x1="31.4306" y1="44.9194" x2="29.86" y2="46.49" width="0.1524" layer="16"/>
+<wire x1="28.671" y1="46.49" x2="28.621" y2="46.54" width="0.1524" layer="1"/>
+<wire x1="28.621" y1="46.54" x2="27.8" y2="46.54" width="0.1524" layer="1"/>
+<contactref element="N1" pad="P10"/>
+<wire x1="39.57" y1="49.44" x2="40.2" y2="50.07" width="0.1524" layer="1"/>
+<wire x1="40.2" y1="50.07" x2="40.986" y2="50.07" width="0.1524" layer="1"/>
+</signal>
+<signal name="N$2">
+<wire x1="42.25" y1="54.7" x2="20.55" y2="54.7" width="0.152" layer="16"/>
+<wire x1="20.55" y1="54.7" x2="20.55" y2="39.3" width="0.152" layer="16"/>
+<wire x1="20.55" y1="39.3" x2="42.25" y2="39.3" width="0.152" layer="16"/>
+<wire x1="45.95" y1="43" x2="45.95" y2="51" width="0.152" layer="16"/>
+<wire x1="42.25" y1="39.3" x2="45.95" y2="43" width="0.152" layer="16" curve="90"/>
+<wire x1="45.95" y1="51" x2="42.25" y2="54.3952" width="0.152" layer="16"/>
+<wire x1="42.25" y1="54.7" x2="44.0853" y2="53.7553" width="0.152" layer="16"/>
+<wire x1="42.25" y1="54.3952" x2="20.8548" y2="54.3952" width="0.152" layer="16"/>
+<wire x1="20.8548" y1="54.3952" x2="20.8548" y2="39.6048" width="0.152" layer="16"/>
+<wire x1="20.8548" y1="39.6048" x2="42.25" y2="39.6048" width="0.152" layer="16"/>
+<wire x1="45.6452" y1="43" x2="45.6452" y2="50.866009375" width="0.152" layer="16"/>
+<wire x1="45.6452" y1="50.866009375" x2="42.13135" y2="54.0904" width="0.152" layer="16"/>
+<wire x1="42.13135" y1="54.0904" x2="21.1596" y2="54.0904" width="0.152" layer="16"/>
+<wire x1="21.1596" y1="54.0904" x2="21.1596" y2="39.9096" width="0.152" layer="16"/>
+<wire x1="21.1596" y1="39.9096" x2="42.25" y2="39.9096" width="0.152" layer="16"/>
+<wire x1="42.25" y1="39.6048" x2="45.6452" y2="43" width="0.152" layer="16" curve="90"/>
+<wire x1="45.3404" y1="43" x2="45.3404" y2="50.73203125" width="0.152" layer="16"/>
+<wire x1="45.3404" y1="50.73203125" x2="42.012690625" y2="53.7856" width="0.152" layer="16"/>
+<wire x1="42.012690625" y1="53.7856" x2="21.4644" y2="53.7856" width="0.152" layer="16"/>
+<wire x1="21.4644" y1="53.7856" x2="21.4644" y2="40.2144" width="0.152" layer="16"/>
+<wire x1="21.4644" y1="40.2144" x2="42.25" y2="40.2144" width="0.152" layer="16"/>
+<wire x1="42.25" y1="39.9096" x2="45.3404" y2="43" width="0.152" layer="16" curve="90"/>
+<wire x1="45.0356" y1="43" x2="45.0356" y2="50.598040625" width="0.152" layer="16"/>
+<wire x1="45.0356" y1="50.598040625" x2="41.894040625" y2="53.4808" width="0.152" layer="16"/>
+<wire x1="41.894040625" y1="53.4808" x2="21.7692" y2="53.4808" width="0.152" layer="16"/>
+<wire x1="21.7692" y1="53.4808" x2="21.7692" y2="40.5192" width="0.152" layer="16"/>
+<wire x1="21.7692" y1="40.5192" x2="42.25" y2="40.5192" width="0.152" layer="16"/>
+<wire x1="42.25" y1="40.2144" x2="45.0356" y2="43" width="0.152" layer="16" curve="90"/>
+<wire x1="44.7308" y1="43" x2="44.7308" y2="50.46405" width="0.152" layer="16"/>
+<wire x1="44.7308" y1="50.46405" x2="41.775390625" y2="53.176" width="0.152" layer="16"/>
+<wire x1="41.775390625" y1="53.176" x2="22.074" y2="53.176" width="0.152" layer="16"/>
+<wire x1="22.074" y1="53.176" x2="22.074" y2="40.824" width="0.152" layer="16"/>
+<wire x1="22.074" y1="40.824" x2="42.25" y2="40.824" width="0.152" layer="16"/>
+<wire x1="42.25" y1="40.5192" x2="44.7308" y2="43" width="0.152" layer="16" curve="90"/>
+<wire x1="42.25" y1="40.824" x2="43.354759375" y2="42.086859375" width="0.152" layer="16"/>
 </signal>
 </signals>
 <mfgpreviewcolors>
diff --git a/solo/USB-A.sch b/solo/USB-A.sch
index 6aa608b..821e4b8 100644
--- a/solo/USB-A.sch
+++ b/solo/USB-A.sch
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="9.2.2">
+<eagle version="9.3.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="no"/>
@@ -9,6 +9,8 @@
 <grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="no" active="no"/>
+<layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
+<layer number="15" name="Route15" color="4" fill="6" visible="no" active="no"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="no" active="no"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="no" active="no"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="no" active="no"/>
@@ -73,16 +75,7 @@
 <rectangle x1="-4.15" y1="-2.25" x2="5.45" y2="-0.05" layer="29"/>
 <rectangle x1="-4.15" y1="-4.6" x2="5.95" y2="-2.4" layer="29"/>
 </package>
-<package name="B1,27" urn="urn:adsk.eagle:footprint:27900/1" library_version="2" library_locally_modified="yes">
-<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
-<wire x1="-0.635" y1="0" x2="0.635" y2="0" width="0.0024" layer="37"/>
-<wire x1="0" y1="0.635" x2="0" y2="-0.635" width="0.0024" layer="37"/>
-<smd name="TP" x="0" y="0" dx="1.27" dy="1.27" layer="1" roundness="100" cream="no"/>
-<text x="-0.635" y="1.016" size="1.27" layer="25" ratio="10">&gt;NAME</text>
-<text x="-0.635" y="-0.762" size="0.0254" layer="27">&gt;VALUE</text>
-<text x="-0.635" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
-</package>
-<package name="R0402" urn="urn:adsk.eagle:footprint:4245803/4" library_version="49" library_locally_modified="yes">
+<package name="R0402" urn="urn:adsk.eagle:footprint:4245803/4" library_version="48">
 <description>&lt;b&gt;RESISTOR&lt;/b&gt;</description>
 <wire x1="-0.245" y1="0.224" x2="0.245" y2="0.224" width="0.1524" layer="51"/>
 <wire x1="0.245" y1="-0.224" x2="-0.245" y2="-0.224" width="0.1524" layer="51"/>
@@ -98,6 +91,15 @@
 <rectangle x1="0.2588" y1="-0.3048" x2="0.5588" y2="0.2951" layer="51"/>
 <rectangle x1="-0.1999" y1="-0.4001" x2="0.1999" y2="0.4001" layer="35"/>
 </package>
+<package name="B1,27" urn="urn:adsk.eagle:footprint:27900/1" library_version="2" library_locally_modified="yes">
+<description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
+<wire x1="-0.635" y1="0" x2="0.635" y2="0" width="0.0024" layer="37"/>
+<wire x1="0" y1="0.635" x2="0" y2="-0.635" width="0.0024" layer="37"/>
+<smd name="TP" x="0" y="0" dx="1.27" dy="1.27" layer="1" roundness="100" cream="no"/>
+<text x="-0.635" y="1.016" size="1.27" layer="25" ratio="10">&gt;NAME</text>
+<text x="-0.635" y="-0.762" size="0.0254" layer="27">&gt;VALUE</text>
+<text x="-0.635" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
+</package>
 <package name="C0402" urn="urn:adsk.eagle:footprint:4894774/3" library_version="49" library_locally_modified="yes">
 <description>&lt;b&gt;CAPACITOR&lt;/b&gt;</description>
 <wire x1="-0.245" y1="0.224" x2="0.245" y2="0.224" width="0.1524" layer="51"/>
@@ -114,31 +116,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="EAST1616RGBA3-RGB-LED" urn="urn:adsk.eagle:footprint:4245357/1" library_version="13" library_locally_modified="yes">
-<smd name="P$4" x="-0.7" y="-0.45" dx="0.7" dy="0.65" layer="1"/>
-<smd name="P$2" x="-0.7" y="0.45" dx="0.7" dy="0.65" layer="1"/>
-<smd name="P$3" x="0.7" y="-0.45" dx="0.7" dy="0.65" layer="1"/>
-<smd name="P$1" x="0.7" y="0.45" dx="0.7" dy="0.65" layer="1"/>
-<circle x="0.5" y="0" radius="0.1" width="0" layer="21"/>
-<wire x1="-0.75" y1="0.85" x2="-0.75" y2="-0.9" width="0.127" layer="51"/>
-<wire x1="-0.75" y1="-0.9" x2="0.8" y2="-0.9" width="0.127" layer="51"/>
-<wire x1="0.8" y1="-0.9" x2="0.8" y2="0.85" width="0.127" layer="51"/>
-<wire x1="0.8" y1="0.85" x2="-0.75" y2="0.85" width="0.127" layer="51"/>
-<wire x1="-0.75" y1="0.85" x2="0.8" y2="0.85" width="0.127" layer="21"/>
-<wire x1="0.8" y1="-0.9" x2="-0.75" y2="-0.9" width="0.127" layer="21"/>
-<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="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"/>
-<smd name="P$4" x="0" y="0" dx="0.4" dy="0.4" layer="1"/>
-<smd name="P$3" x="0" y="0.85" dx="0.4" dy="0.4" layer="1"/>
-<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/3" library_version="62">
+<package name="QFN32" urn="urn:adsk.eagle:footprint:6434393/4" library_version="66">
 <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"/>
@@ -615,14 +593,14 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-1.675" y="2.125"/>
 <vertex x="-1.675" y="2.575"/>
 </polygon>
-<polygon width="0.127" layer="1" spacing="0.6" pour="hatch">
+<polygon width="0.127" layer="1" spacing="0.7112" pour="hatch">
 <vertex x="-1.5" y="1.5"/>
 <vertex x="1.5" y="1.5"/>
 <vertex x="1.5" y="-1.5"/>
 <vertex x="-1.5" y="-1.5"/>
 </polygon>
 </package>
-<package name="REG_NCP114AMX330TCG" urn="urn:adsk.eagle:footprint:5621085/2" library_version="57">
+<package name="REG_NCP114AMX330TCG" urn="urn:adsk.eagle:footprint:5621085/3" library_version="66">
 <polygon width="0.001" layer="1">
 <vertex x="-0.475" y="0.65"/>
 <vertex x="-0.475" y="0.22"/>
@@ -705,7 +683,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-0.475" y="-0.05"/>
 <vertex x="-0.525" y="-0.05"/>
 </polygon>
-<circle x="-0.64" y="-0.648" radius="0.0508" width="0.1016" layer="21"/>
+<circle x="-0.74" y="-0.848" radius="0.14" width="0.1016" layer="21"/>
 <wire x1="-0.5" y1="0.5" x2="-0.5" y2="-0.5" width="0.1" layer="51"/>
 <wire x1="-0.5" y1="-0.5" x2="0.5" y2="-0.5" width="0.1" layer="51"/>
 <wire x1="0.5" y1="-0.5" x2="0.5" y2="0.5" width="0.1" layer="51"/>
@@ -883,7 +861,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/5" library_version="60">
+<package name="DOME-BL-12MM" urn="urn:adsk.eagle:footprint:5648518/7" library_version="70">
 <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"/>
@@ -1145,19 +1123,19 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <wire x1="-1.3" y1="-1.2" x2="-1.5" y2="-1" width="0.127" layer="1"/>
 <wire x1="-1.5" y1="-1" x2="-1.7" y2="-0.6" width="0.127" layer="1"/>
 <wire x1="-1.7" y1="-0.6" x2="-1.8" y2="-0.3" width="0.127" layer="1"/>
-<polygon width="0.1" layer="1" spacing="0.508" pour="hatch">
+<polygon width="0.1" layer="1" spacing="0.75" pour="hatch">
 <vertex x="-3.74" y="2.4937"/>
 <vertex x="-5.59" y="2.4937"/>
 <vertex x="-5.59" y="3.76"/>
 <vertex x="-3.76" y="5.59"/>
-<vertex x="3.76" y="5.59"/>
-<vertex x="5.59" y="3.76"/>
-<vertex x="4.4" y="2.96"/>
-<vertex x="4.3" y="-2.9"/>
-<vertex x="5.3" y="-3.3"/>
-<vertex x="5.39" y="-3.96"/>
+<vertex x="1.7788" y="5.6154"/>
+<vertex x="3.1088" y="4.1854"/>
+<vertex x="4.2" y="3.06"/>
+<vertex x="4.2" y="-3.9"/>
+<vertex x="4.7" y="-4"/>
+<vertex x="5.19" y="-4.16"/>
 <vertex x="3.76" y="-5.59"/>
-<vertex x="-3.76" y="-5.59"/>
+<vertex x="-3.86" y="-5.59"/>
 <vertex x="-5.59" y="-3.76"/>
 <vertex x="-5.59" y="-2.4937"/>
 <vertex x="-3.74" y="-2.4937"/>
@@ -1171,14 +1149,13 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-3.74" y="2.9937"/>
 </polygon>
 <polygon width="0.1524" layer="29">
-<vertex x="-3.8" y="5.6"/>
-<vertex x="-5.6" y="3.8"/>
-<vertex x="-5.6" y="2.5"/>
+<vertex x="-3.8" y="5.7"/>
+<vertex x="-5.7" y="3.8"/>
+<vertex x="-5.6" y="2.4"/>
 <vertex x="-3.7" y="2.5"/>
-<vertex x="-3.7" y="3"/>
-<vertex x="-3" y="3.7"/>
-<vertex x="3" y="3.7"/>
-<vertex x="3.7" y="3"/>
+<vertex x="-2.9" y="3.7"/>
+<vertex x="2.9" y="3.7"/>
+<vertex x="3.7" y="2.8"/>
 <vertex x="3.7" y="-3"/>
 <vertex x="3" y="-3.7"/>
 <vertex x="-3" y="-3.7"/>
@@ -1188,14 +1165,17 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-5.6" y="-3.8"/>
 <vertex x="-3.8" y="-5.6"/>
 <vertex x="3.8" y="-5.6"/>
-<vertex x="5.6" y="-3.8"/>
-<vertex x="5.6" y="3.8"/>
-<vertex x="3.8" y="5.6"/>
+<vertex x="4.6" y="-5"/>
+<vertex x="5.2" y="-4.1"/>
+<vertex x="4.2" y="-3.9"/>
+<vertex x="4.2" y="3"/>
+<vertex x="3.1172" y="4.2254"/>
+<vertex x="1.8172" y="5.6254"/>
 </polygon>
 <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.3" y="4.3" dx="0.5" dy="0.5" layer="1" stop="no" cream="no"/>
 </package>
-<package name="MLPD3X3" urn="urn:adsk.eagle:footprint:5825737/4" library_version="61">
+<package name="MLPD3X3" urn="urn:adsk.eagle:footprint:5825737/7" library_version="77">
 <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"/>
@@ -1209,12 +1189,43 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <smd name="P$11" x="1.6" y="-1.64" dx="0.2" dy="0.2" 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>
-<polygon width="0.127" layer="1" spacing="0.58" pour="hatch">
+<polygon width="0.127" layer="1" spacing="0.7366" pour="hatch">
 <vertex x="0.7" y="-0.4"/>
 <vertex x="2.3" y="-0.4"/>
 <vertex x="2.3" y="-2.7"/>
 <vertex x="0.7" y="-2.7"/>
 </polygon>
+<polygon width="0.127" layer="29">
+<vertex x="0.7" y="-0.4"/>
+<vertex x="2.3" y="-0.4"/>
+<vertex x="2.3" y="-2.7"/>
+<vertex x="0.7" y="-2.7"/>
+</polygon>
+<circle x="-0.5588" y="0.2286" radius="0.1626375" width="0.3556" layer="25"/>
+</package>
+<package name="EAST1616RGBA3-RGB-LED" urn="urn:adsk.eagle:footprint:4245357/1" library_version="78">
+<smd name="P$4" x="-0.7" y="-0.45" dx="0.7" dy="0.65" layer="1"/>
+<smd name="P$2" x="-0.7" y="0.45" dx="0.7" dy="0.65" layer="1"/>
+<smd name="P$3" x="0.7" y="-0.45" dx="0.7" dy="0.65" layer="1"/>
+<smd name="P$1" x="0.7" y="0.45" dx="0.7" dy="0.65" layer="1"/>
+<circle x="0.5" y="0" radius="0.1" width="0" layer="21"/>
+<wire x1="-0.75" y1="0.85" x2="-0.75" y2="-0.9" width="0.127" layer="51"/>
+<wire x1="-0.75" y1="-0.9" x2="0.8" y2="-0.9" width="0.127" layer="51"/>
+<wire x1="0.8" y1="-0.9" x2="0.8" y2="0.85" width="0.127" layer="51"/>
+<wire x1="0.8" y1="0.85" x2="-0.75" y2="0.85" width="0.127" layer="51"/>
+<wire x1="-0.75" y1="0.85" x2="0.8" y2="0.85" width="0.127" layer="21"/>
+<wire x1="0.8" y1="-0.9" x2="-0.75" y2="-0.9" width="0.127" layer="21"/>
+<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/5" library_version="78">
+<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"/>
+<smd name="P$4" x="0" y="0" dx="0.4" dy="0.4" layer="1"/>
+<smd name="P$3" x="0" y="0.85" dx="0.4" dy="0.4" layer="1"/>
+<text x="-0.4" y="1.4" size="0.4" layer="21">&gt;NAME</text>
+<circle x="1.2508" y="-0.4002" radius="0.1" width="0.2032" layer="21"/>
 </package>
 </packages>
 <packages3d>
@@ -1223,43 +1234,32 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <packageinstance name="USB_TRACES"/>
 </packageinstances>
 </package3d>
+<package3d name="R0402" urn="urn:adsk.eagle:package:4245807/6" type="model" library_version="48">
+<description>&lt;b&gt;RESISTOR&lt;/b&gt;</description>
+<packageinstances>
+<packageinstance name="R0402"/>
+</packageinstances>
+</package3d>
 <package3d name="B1,27" urn="urn:adsk.eagle:package:4245792/4" type="box" library_version="7" library_locally_modified="yes">
 <description>TEST PAD</description>
 <packageinstances>
 <packageinstance name="B1,27"/>
 </packageinstances>
 </package3d>
-<package3d name="R0402" urn="urn:adsk.eagle:package:4245807/6" type="model" library_version="49" library_locally_modified="yes">
-<description>&lt;b&gt;RESISTOR&lt;/b&gt;</description>
-<packageinstances>
-<packageinstance name="R0402"/>
-</packageinstances>
-</package3d>
 <package3d name="C0402" urn="urn:adsk.eagle:package:4245806/7" type="model" library_version="49" library_locally_modified="yes">
 <description>&lt;b&gt;CAPACITOR&lt;/b&gt;</description>
 <packageinstances>
 <packageinstance name="C0402"/>
 </packageinstances>
 </package3d>
-<package3d name="EAST1616RGBA3-RGB-LED" urn="urn:adsk.eagle:package:4245370/5" type="model" library_version="13" library_locally_modified="yes">
-<packageinstances>
-<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="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/7" type="model" library_version="62">
+<package3d name="QFN50P500X500X50-32" urn="urn:adsk.eagle:package:4245373/8" type="model" library_version="66">
 <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/3" type="model" library_version="57">
+<package3d name="DFN100X100X60-4" urn="urn:adsk.eagle:package:5621121/4" type="model" library_version="66">
 <packageinstances>
 <packageinstance name="REG_NCP114AMX330TCG"/>
 </packageinstances>
@@ -1275,16 +1275,27 @@ 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/7" type="model" library_version="60">
+<package3d name="DOME-BL-12MM" urn="urn:adsk.eagle:package:5648519/9" type="model" library_version="70">
 <packageinstances>
 <packageinstance name="DOME-BL-12MM"/>
 </packageinstances>
 </package3d>
-<package3d name="MLPD3X3" urn="urn:adsk.eagle:package:5825738/4" type="box" library_version="61">
+<package3d name="MLPD3X3" urn="urn:adsk.eagle:package:5825738/7" type="box" library_version="77">
 <packageinstances>
 <packageinstance name="MLPD3X3"/>
 </packageinstances>
 </package3d>
+<package3d name="EAST1616RGBA3-RGB-LED" urn="urn:adsk.eagle:package:4245370/5" type="model" library_version="78">
+<packageinstances>
+<packageinstance name="EAST1616RGBA3-RGB-LED"/>
+</packageinstances>
+</package3d>
+<package3d name="CL-505S-X-SD-T" urn="urn:adsk.eagle:package:4878740/7" type="box" library_version="78">
+<description>CL-505S-X-SD-T</description>
+<packageinstances>
+<packageinstance name="CL-505S-X-SD-T"/>
+</packageinstances>
+</package3d>
 </packages3d>
 <symbols>
 <symbol name="USB4" urn="urn:adsk.eagle:symbol:4245360/2" library_version="36">
@@ -1314,14 +1325,6 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="1.27" y="5.842"/>
 </polygon>
 </symbol>
-<symbol name="TP" urn="urn:adsk.eagle:symbol:4245791/1" library_version="3" library_locally_modified="yes">
-<wire x1="-0.762" y1="-0.762" x2="0" y2="0" width="0.254" layer="94"/>
-<wire x1="0" y1="0" x2="0.762" y2="-0.762" width="0.254" layer="94"/>
-<wire x1="0.762" y1="-0.762" x2="0" y2="-1.524" width="0.254" layer="94"/>
-<wire x1="0" y1="-1.524" x2="-0.762" y2="-0.762" width="0.254" layer="94"/>
-<text x="-1.27" y="1.27" size="1.778" layer="95">&gt;NAME</text>
-<pin name="TP" x="0" y="-2.54" visible="off" length="short" direction="in" rot="R90"/>
-</symbol>
 <symbol name="R-EU" urn="urn:adsk.eagle:symbol:4245805/1" library_version="4" library_locally_modified="yes">
 <wire x1="-2.54" y1="-0.889" x2="2.54" y2="-0.889" width="0.254" layer="94"/>
 <wire x1="2.54" y1="0.889" x2="-2.54" y2="0.889" width="0.254" layer="94"/>
@@ -1334,6 +1337,14 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <pin name="2" x="5.08" y="0" visible="off" length="short" direction="pas" swaplevel="1" rot="R180"/>
 <pin name="1" x="-5.08" y="0" visible="off" length="short" direction="pas" swaplevel="1"/>
 </symbol>
+<symbol name="TP" urn="urn:adsk.eagle:symbol:4245791/1" library_version="3" library_locally_modified="yes">
+<wire x1="-0.762" y1="-0.762" x2="0" y2="0" width="0.254" layer="94"/>
+<wire x1="0" y1="0" x2="0.762" y2="-0.762" width="0.254" layer="94"/>
+<wire x1="0.762" y1="-0.762" x2="0" y2="-1.524" width="0.254" layer="94"/>
+<wire x1="0" y1="-1.524" x2="-0.762" y2="-0.762" width="0.254" layer="94"/>
+<text x="-1.27" y="1.27" size="1.778" layer="95">&gt;NAME</text>
+<pin name="TP" x="0" y="-2.54" visible="off" length="short" direction="in" rot="R90"/>
+</symbol>
 <symbol name="C-EU" urn="urn:adsk.eagle:symbol:4245804/1" library_version="4" library_locally_modified="yes">
 <wire x1="0" y1="0" x2="0" y2="-0.508" width="0.1524" layer="94"/>
 <wire x1="0" y1="-2.54" x2="0" y2="-2.032" width="0.1524" layer="94"/>
@@ -1346,71 +1357,6 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <pin name="1" x="0" y="2.54" visible="off" length="short" direction="pas" swaplevel="1" rot="R270"/>
 <pin name="2" x="0" y="-5.08" visible="off" length="short" direction="pas" swaplevel="1" rot="R90"/>
 </symbol>
-<symbol name="LED-RGB" urn="urn:adsk.eagle:symbol:4245364/1" library_version="13" library_locally_modified="yes">
-<wire x1="6.35" y1="1.778" x2="5.08" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="5.08" y1="-0.254" x2="3.81" y2="1.778" width="0.254" layer="94"/>
-<wire x1="6.35" y1="-0.254" x2="5.08" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="5.08" y1="-0.254" x2="3.81" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="6.35" y1="1.778" x2="3.81" y2="1.778" width="0.254" layer="94"/>
-<wire x1="3.048" y1="1.524" x2="2.159" y2="0.635" width="0.1524" layer="94"/>
-<wire x1="3.81" y1="0.762" x2="2.921" y2="-0.127" width="0.1524" layer="94"/>
-<wire x1="1.27" y1="1.778" x2="0" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="0" y1="-0.254" x2="-1.27" y2="1.778" width="0.254" layer="94"/>
-<wire x1="1.27" y1="-0.254" x2="0" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="0" y1="-0.254" x2="-1.27" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="1.27" y1="1.778" x2="-1.27" y2="1.778" width="0.254" layer="94"/>
-<wire x1="-2.032" y1="1.524" x2="-2.921" y2="0.635" width="0.1524" layer="94"/>
-<wire x1="-1.27" y1="0.762" x2="-2.159" y2="-0.127" width="0.1524" layer="94"/>
-<wire x1="-3.81" y1="1.778" x2="-5.08" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="-5.08" y1="-0.254" x2="-6.35" y2="1.778" width="0.254" layer="94"/>
-<wire x1="-3.81" y1="-0.254" x2="-5.08" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="-5.08" y1="-0.254" x2="-6.35" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="-3.81" y1="1.778" x2="-6.35" y2="1.778" width="0.254" layer="94"/>
-<wire x1="-7.112" y1="1.524" x2="-8.001" y2="0.635" width="0.1524" layer="94"/>
-<wire x1="-6.35" y1="0.762" x2="-7.239" y2="-0.127" width="0.1524" layer="94"/>
-<wire x1="-5.08" y1="2.54" x2="0" y2="2.54" width="0.1524" layer="94"/>
-<wire x1="0" y1="2.54" x2="0" y2="0" width="0.1524" layer="94"/>
-<wire x1="0" y1="2.54" x2="5.08" y2="2.54" width="0.1524" layer="94"/>
-<wire x1="5.08" y1="2.54" x2="5.08" y2="0" width="0.1524" layer="94"/>
-<circle x="-5.08" y="2.54" radius="0.1796" width="0.254" layer="94"/>
-<circle x="0" y="2.54" radius="0.1796" width="0.254" layer="94"/>
-<text x="-2.54" y="3.302" size="1.778" layer="95">&gt;NAME</text>
-<text x="-2.54" y="5.461" size="1.778" layer="96">&gt;VALUE</text>
-<pin name="CGREEN" x="5.08" y="-2.54" visible="pad" length="short" direction="pas" rot="R90"/>
-<pin name="CBLUE" x="0" y="-2.54" visible="pad" length="short" direction="pas" rot="R90"/>
-<pin name="CRED" x="-5.08" y="-2.54" visible="pad" length="short" direction="pas" rot="R90"/>
-<pin name="A2" x="-5.08" y="5.08" visible="pad" length="middle" direction="pas" rot="R270"/>
-<polygon width="0.1524" layer="94">
-<vertex x="2.032" y="1.016"/>
-<vertex x="1.778" y="0.254"/>
-<vertex x="2.54" y="0.508"/>
-</polygon>
-<polygon width="0.1524" layer="94">
-<vertex x="2.794" y="0.254"/>
-<vertex x="2.54" y="-0.508"/>
-<vertex x="3.302" y="-0.254"/>
-</polygon>
-<polygon width="0.1524" layer="94">
-<vertex x="-3.048" y="1.016"/>
-<vertex x="-3.302" y="0.254"/>
-<vertex x="-2.54" y="0.508"/>
-</polygon>
-<polygon width="0.1524" layer="94">
-<vertex x="-2.286" y="0.254"/>
-<vertex x="-2.54" y="-0.508"/>
-<vertex x="-1.778" y="-0.254"/>
-</polygon>
-<polygon width="0.1524" layer="94">
-<vertex x="-8.128" y="1.016"/>
-<vertex x="-8.382" y="0.254"/>
-<vertex x="-7.62" y="0.508"/>
-</polygon>
-<polygon width="0.1524" layer="94">
-<vertex x="-7.366" y="0.254"/>
-<vertex x="-7.62" y="-0.508"/>
-<vertex x="-6.858" y="-0.254"/>
-</polygon>
-</symbol>
 <symbol name="STM32L432KCU6" urn="urn:adsk.eagle:symbol:5621081/1" library_version="28">
 <pin name="VDD2" x="20.32" y="-7.62" length="middle" rot="R180"/>
 <pin name="PA8" x="20.32" y="-5.08" length="middle" rot="R180"/>
@@ -1538,6 +1484,71 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <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="LED-RGB" urn="urn:adsk.eagle:symbol:4245364/1" library_version="78">
+<wire x1="6.35" y1="1.778" x2="5.08" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="5.08" y1="-0.254" x2="3.81" y2="1.778" width="0.254" layer="94"/>
+<wire x1="6.35" y1="-0.254" x2="5.08" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="5.08" y1="-0.254" x2="3.81" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="6.35" y1="1.778" x2="3.81" y2="1.778" width="0.254" layer="94"/>
+<wire x1="3.048" y1="1.524" x2="2.159" y2="0.635" width="0.1524" layer="94"/>
+<wire x1="3.81" y1="0.762" x2="2.921" y2="-0.127" width="0.1524" layer="94"/>
+<wire x1="1.27" y1="1.778" x2="0" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="0" y1="-0.254" x2="-1.27" y2="1.778" width="0.254" layer="94"/>
+<wire x1="1.27" y1="-0.254" x2="0" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="0" y1="-0.254" x2="-1.27" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="1.27" y1="1.778" x2="-1.27" y2="1.778" width="0.254" layer="94"/>
+<wire x1="-2.032" y1="1.524" x2="-2.921" y2="0.635" width="0.1524" layer="94"/>
+<wire x1="-1.27" y1="0.762" x2="-2.159" y2="-0.127" width="0.1524" layer="94"/>
+<wire x1="-3.81" y1="1.778" x2="-5.08" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="-5.08" y1="-0.254" x2="-6.35" y2="1.778" width="0.254" layer="94"/>
+<wire x1="-3.81" y1="-0.254" x2="-5.08" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="-5.08" y1="-0.254" x2="-6.35" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="-3.81" y1="1.778" x2="-6.35" y2="1.778" width="0.254" layer="94"/>
+<wire x1="-7.112" y1="1.524" x2="-8.001" y2="0.635" width="0.1524" layer="94"/>
+<wire x1="-6.35" y1="0.762" x2="-7.239" y2="-0.127" width="0.1524" layer="94"/>
+<wire x1="-5.08" y1="2.54" x2="0" y2="2.54" width="0.1524" layer="94"/>
+<wire x1="0" y1="2.54" x2="0" y2="0" width="0.1524" layer="94"/>
+<wire x1="0" y1="2.54" x2="5.08" y2="2.54" width="0.1524" layer="94"/>
+<wire x1="5.08" y1="2.54" x2="5.08" y2="0" width="0.1524" layer="94"/>
+<circle x="-5.08" y="2.54" radius="0.1796" width="0.254" layer="94"/>
+<circle x="0" y="2.54" radius="0.1796" width="0.254" layer="94"/>
+<text x="-2.54" y="3.302" size="1.778" layer="95">&gt;NAME</text>
+<text x="-2.54" y="5.461" size="1.778" layer="96">&gt;VALUE</text>
+<pin name="CGREEN" x="5.08" y="-2.54" visible="pad" length="short" direction="pas" rot="R90"/>
+<pin name="CBLUE" x="0" y="-2.54" visible="pad" length="short" direction="pas" rot="R90"/>
+<pin name="CRED" x="-5.08" y="-2.54" visible="pad" length="short" direction="pas" rot="R90"/>
+<pin name="A2" x="-5.08" y="5.08" visible="pad" length="middle" direction="pas" rot="R270"/>
+<polygon width="0.1524" layer="94">
+<vertex x="2.032" y="1.016"/>
+<vertex x="1.778" y="0.254"/>
+<vertex x="2.54" y="0.508"/>
+</polygon>
+<polygon width="0.1524" layer="94">
+<vertex x="2.794" y="0.254"/>
+<vertex x="2.54" y="-0.508"/>
+<vertex x="3.302" y="-0.254"/>
+</polygon>
+<polygon width="0.1524" layer="94">
+<vertex x="-3.048" y="1.016"/>
+<vertex x="-3.302" y="0.254"/>
+<vertex x="-2.54" y="0.508"/>
+</polygon>
+<polygon width="0.1524" layer="94">
+<vertex x="-2.286" y="0.254"/>
+<vertex x="-2.54" y="-0.508"/>
+<vertex x="-1.778" y="-0.254"/>
+</polygon>
+<polygon width="0.1524" layer="94">
+<vertex x="-8.128" y="1.016"/>
+<vertex x="-8.382" y="0.254"/>
+<vertex x="-7.62" y="0.508"/>
+</polygon>
+<polygon width="0.1524" layer="94">
+<vertex x="-7.366" y="0.254"/>
+<vertex x="-7.62" y="-0.508"/>
+<vertex x="-6.858" y="-0.254"/>
+</polygon>
+</symbol>
 </symbols>
 <devicesets>
 <deviceset name="USB_TRACES" urn="urn:adsk.eagle:component:4245374/10" prefix="U" library_version="40">
@@ -1560,25 +1571,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="TEST_POINT" urn="urn:adsk.eagle:component:4245793/3" prefix="T" library_version="8" library_locally_modified="yes">
-<gates>
-<gate name="G$1" symbol="TP" x="0" y="0"/>
-</gates>
-<devices>
-<device name="" package="B1,27">
-<connects>
-<connect gate="G$1" pin="TP" pad="TP"/>
-</connects>
-<package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:4245792/4"/>
-</package3dinstances>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
-<deviceset name="RESISTOR" urn="urn:adsk.eagle:component:4245809/5" prefix="R" library_version="49" library_locally_modified="yes">
+<deviceset name="RESISTOR" urn="urn:adsk.eagle:component:4245809/5" prefix="R" library_version="48">
 <gates>
 <gate name="G$1" symbol="R-EU" x="0" y="0"/>
 </gates>
@@ -1597,6 +1590,24 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 </device>
 </devices>
 </deviceset>
+<deviceset name="TEST_POINT" urn="urn:adsk.eagle:component:4245793/3" prefix="T" library_version="8" library_locally_modified="yes">
+<gates>
+<gate name="G$1" symbol="TP" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="B1,27">
+<connects>
+<connect gate="G$1" pin="TP" pad="TP"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:4245792/4"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
 <deviceset name="CAPACITOR" urn="urn:adsk.eagle:component:4245808/5" prefix="C" library_version="49" library_locally_modified="yes">
 <gates>
 <gate name="G$1" symbol="C-EU" x="0" y="2.54"/>
@@ -1616,45 +1627,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="57">
-<description>EAST1616RGBA3</description>
-<gates>
-<gate name="G$1" symbol="LED-RGB" x="0" y="-2.54"/>
-</gates>
-<devices>
-<device name="" package="EAST1616RGBA3-RGB-LED">
-<connects>
-<connect gate="G$1" pin="A2" pad="P$3"/>
-<connect gate="G$1" pin="CBLUE" pad="P$1"/>
-<connect gate="G$1" pin="CGREEN" pad="P$2"/>
-<connect gate="G$1" pin="CRED" pad="P$4"/>
-</connects>
-<package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:4245370/5"/>
-</package3dinstances>
-<technologies>
-<technology name="">
-<attribute name="MPN" value="123t" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="CL-505S-X-SD-T" package="CL-505S-X-SD-T">
-<connects>
-<connect gate="G$1" pin="A2" pad="P$4"/>
-<connect gate="G$1" pin="CBLUE" pad="P$1"/>
-<connect gate="G$1" pin="CGREEN" pad="P$3"/>
-<connect gate="G$1" pin="CRED" pad="P$2"/>
-</connects>
-<package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:4878740/6"/>
-</package3dinstances>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
-<deviceset name="STM32L432KCU6" urn="urn:adsk.eagle:component:5621128/5" prefix="ST" library_version="62">
+<deviceset name="STM32L432KCU6" urn="urn:adsk.eagle:component:5621128/6" prefix="ST" library_version="66">
 <gates>
 <gate name="G$1" symbol="STM32L432KCU6" x="0" y="0"/>
 </gates>
@@ -1696,7 +1669,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/7"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:4245373/8"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -1704,7 +1677,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="NCP114AMX330TCG" urn="urn:adsk.eagle:component:5621125/3" prefix="L" library_version="57">
+<deviceset name="NCP114AMX330TCG" urn="urn:adsk.eagle:component:5621125/4" prefix="L" library_version="66">
 <description>CMOS Low Dropout Regulator, 300 mA 3.3V, Active Discharge</description>
 <gates>
 <gate name="G$1" symbol="NCP114AMX330TCG" x="0" y="0"/>
@@ -1719,7 +1692,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/3"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:5621121/4"/>
 </package3dinstances>
 <technologies>
 <technology name="">
@@ -1756,7 +1729,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/13" library_version="60">
+<deviceset name="DOME_BUTTON" urn="urn:adsk.eagle:component:4878737/15" library_version="70">
 <gates>
 <gate name="G$1" symbol="SWITCH-NO" x="0" y="0"/>
 </gates>
@@ -1779,7 +1752,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <connect gate="G$1" pin="2" pad="P$2"/>
 </connects>
 <package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:5648519/7"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:5648519/9"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -1787,7 +1760,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="AMS3956" urn="urn:adsk.eagle:component:5825739/6" prefix="N" library_version="61">
+<deviceset name="AMS3956" urn="urn:adsk.eagle:component:5825739/9" prefix="N" library_version="77">
 <gates>
 <gate name="G$1" symbol="AS3956" x="0" y="0"/>
 </gates>
@@ -1806,7 +1779,45 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <connect gate="G$1" pin="VSS" pad="P$11 P5"/>
 </connects>
 <package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:5825738/4"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:5825738/7"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+<deviceset name="RGB_LED_1X1" urn="urn:adsk.eagle:component:4245376/10" prefix="L" library_version="78">
+<description>EAST1616RGBA3</description>
+<gates>
+<gate name="G$1" symbol="LED-RGB" x="0" y="-2.54"/>
+</gates>
+<devices>
+<device name="" package="EAST1616RGBA3-RGB-LED">
+<connects>
+<connect gate="G$1" pin="A2" pad="P$3"/>
+<connect gate="G$1" pin="CBLUE" pad="P$1"/>
+<connect gate="G$1" pin="CGREEN" pad="P$2"/>
+<connect gate="G$1" pin="CRED" pad="P$4"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:4245370/5"/>
+</package3dinstances>
+<technologies>
+<technology name="">
+<attribute name="MPN" value="123t" constant="no"/>
+</technology>
+</technologies>
+</device>
+<device name="CL-505S-X-SD-T" package="CL-505S-X-SD-T">
+<connects>
+<connect gate="G$1" pin="A2" pad="P$4"/>
+<connect gate="G$1" pin="CBLUE" pad="P$1"/>
+<connect gate="G$1" pin="CGREEN" pad="P$3"/>
+<connect gate="G$1" pin="CRED" pad="P$2"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:4878740/7"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -1913,230 +1924,224 @@ In this library the device names are the same as the pin names of the symbols, t
 <class number="0" name="default" width="0.1524" drill="0.2032">
 <clearance class="0" value="0.1016"/>
 </class>
+<class number="1" name="nfc" width="0.0889" drill="0.2032">
+<clearance class="1" value="0.0889"/>
+</class>
 </classes>
 <parts>
 <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="SUPPLY10" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="C1" 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="SUPPLY2" 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="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="C2" 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="SUPPLY3" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="C4" 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="C5" 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="+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="SUPPLY10" 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="SUPPLY11" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
 <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"/>
 <part name="+5V1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="TEST_POINT" device="" package3d_urn="urn:adsk.eagle:package:4245792/4"/>
 <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="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="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="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="+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="SUPPLY12" 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="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/7"/>
-<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/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="SUPPLY13" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="C6" 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="C13" 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="SUPPLY14" 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/8"/>
+<part name="L3" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="NCP114AMX330TCG" device="" package3d_urn="urn:adsk.eagle:package:5621121/4"/>
+<part name="Z1" 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="SUPPLY17" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="SUPPLY15" 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/7"/>
-<part name="N2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="AMS3956" device="" package3d_urn="urn:adsk.eagle:package:5825738/4"/>
-<part name="SUPPLY18" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="U$1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="DOME_BUTTON" device="12MM" package3d_urn="urn:adsk.eagle:package:5648519/9"/>
+<part name="N1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="AMS3956" device="" package3d_urn="urn:adsk.eagle:package:5825738/7"/>
+<part name="SUPPLY16" 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="MID" 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="C2" 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="C3" 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="SUPPLY1" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
-<part name="SUPPLY2" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="C19" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="CAPACITOR" device="" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".5p"/>
+<part name="C20" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="CAPACITOR" device="" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".5p"/>
+<part name="C3" 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="C7" 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="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="C9" 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="L1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="RGB_LED_1X1" device="CL-505S-X-SD-T" package3d_urn="urn:adsk.eagle:package:4878740/7"/>
 </parts>
 <sheets>
 <sheet>
 <plain>
 </plain>
 <instances>
-<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 part="P+1" gate="1" x="66.04" y="116.84" smashed="yes" rot="R180">
+<attribute name="VALUE" x="68.58" y="116.84" size="1.778" layer="96"/>
 </instance>
-<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 part="U1" gate="G$1" x="55.88" y="137.16" smashed="yes" rot="R180">
+<attribute name="NAME" x="58.42" y="128.27" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="58.42" y="144.78" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="C1" gate="G$1" x="88.9" y="73.66" smashed="yes" rot="R180">
+<attribute name="NAME" x="87.376" y="73.279" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="87.376" y="78.359" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="SUPPLY2" gate="PE" x="134.62" y="154.94" smashed="yes" rot="R180">
+<attribute name="VALUE" x="139.065" y="159.639" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="P+5" gate="1" x="78.74" y="86.36" smashed="yes">
+<attribute name="VALUE" x="76.2" y="86.36" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="C2" gate="G$1" x="96.52" y="73.66" smashed="yes" rot="R180">
+<attribute name="NAME" x="94.996" y="73.279" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="94.996" y="78.359" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="SUPPLY3" gate="PE" x="93.98" y="86.36" smashed="yes" rot="R180">
+<attribute name="VALUE" x="98.425" y="91.059" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="C4" gate="G$1" x="132.08" y="142.24" smashed="yes" rot="R180">
+<attribute name="NAME" x="130.556" y="141.859" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="130.556" y="146.939" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="C5" gate="G$1" x="139.7" y="142.24" smashed="yes" rot="R180">
+<attribute name="NAME" x="138.176" y="141.859" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="138.176" y="146.939" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="+3V9" gate="G$1" x="152.4" y="20.32" smashed="yes">
+<attribute name="VALUE" x="154.94" y="22.86" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="P+6" gate="1" x="142.24" y="20.32" smashed="yes">
+<attribute name="VALUE" x="144.78" y="22.86" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="SUPPLY10" gate="PE" x="132.08" y="17.78" smashed="yes" rot="R180">
+<attribute name="VALUE" x="136.525" y="22.479" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="+3V10" gate="G$1" x="251.46" y="124.46" smashed="yes" rot="R270">
+<attribute name="VALUE" x="246.38" y="127" size="1.778" layer="96"/>
 </instance>
-<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 part="SUPPLY11" gate="PE" x="259.08" y="99.06" smashed="yes">
+<attribute name="VALUE" x="254.635" y="94.361" size="1.778" layer="96"/>
 </instance>
-<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 part="GND1" gate="G$1" x="132.08" y="7.62" smashed="yes" rot="R180">
+<attribute name="NAME" x="133.35" y="6.35" size="1.778" layer="95" rot="R180"/>
 </instance>
-<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 part="+5V1" gate="G$1" x="142.24" y="7.62" smashed="yes" rot="R180">
+<attribute name="NAME" x="143.51" y="6.35" size="1.778" layer="95" rot="R180"/>
 </instance>
-<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 part="3V1" gate="G$1" x="152.4" y="7.62" smashed="yes" rot="R180">
+<attribute name="NAME" x="153.67" y="6.35" size="1.778" layer="95" rot="R180"/>
 </instance>
-<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 part="SWDIO1" gate="G$1" x="198.12" y="7.62" smashed="yes" rot="R180">
+<attribute name="NAME" x="199.39" y="6.35" size="1.778" layer="95" rot="R180"/>
 </instance>
-<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 part="SWCLK1" gate="G$1" x="210.82" y="7.62" smashed="yes" rot="R180">
+<attribute name="NAME" x="212.09" y="6.35" size="1.778" layer="95" rot="R180"/>
 </instance>
-<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 part="R1" gate="G$1" x="238.76" y="124.46" smashed="yes">
+<attribute name="NAME" x="234.95" y="125.9586" size="1.778" layer="95"/>
+<attribute name="VALUE" x="234.95" y="121.158" size="1.778" layer="96"/>
 </instance>
-<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 part="STX-&gt;1" gate="G$1" x="231.14" y="7.62" smashed="yes" rot="R180">
+<attribute name="NAME" x="232.41" y="6.35" size="1.778" layer="95" rot="R180"/>
 </instance>
-<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 part="+3V11" gate="G$1" x="139.7" y="73.66" smashed="yes">
+<attribute name="VALUE" x="137.16" y="68.58" size="1.778" layer="96" rot="R90"/>
 </instance>
-<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 part="SUPPLY12" gate="PE" x="139.7" y="50.8" smashed="yes">
+<attribute name="VALUE" x="135.255" y="46.101" size="1.778" layer="96"/>
 </instance>
-<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 part="+3V12" gate="G$1" x="121.92" y="129.54" smashed="yes" rot="R90">
+<attribute name="VALUE" x="127" y="127" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="SUPPLY13" gate="PE" x="241.3" y="93.98" smashed="yes" rot="R90">
+<attribute name="VALUE" x="245.999" y="89.535" size="1.778" layer="96" rot="R90"/>
 </instance>
-<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 part="C6" gate="G$1" x="218.44" y="96.52" smashed="yes" rot="R90">
+<attribute name="NAME" x="218.059" y="98.044" size="1.778" layer="95" rot="R90"/>
+<attribute name="VALUE" x="223.139" y="98.044" size="1.778" layer="96" rot="R90"/>
 </instance>
-<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 part="C13" gate="G$1" x="218.44" y="88.9" smashed="yes" rot="R90">
+<attribute name="NAME" x="218.059" y="90.424" size="1.778" layer="95" rot="R90"/>
+<attribute name="VALUE" x="223.139" y="90.424" size="1.778" layer="96" rot="R90"/>
 </instance>
-<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 part="SUPPLY14" gate="PE" x="198.12" y="71.12" smashed="yes" rot="R90">
+<attribute name="VALUE" x="202.819" y="66.675" size="1.778" layer="96" rot="R90"/>
 </instance>
-<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 part="ST2" gate="G$1" x="167.64" y="104.14" smashed="yes" rot="R180">
+<attribute name="NAME" x="195.58" y="124.46" size="1.27" layer="95" rot="R180"/>
+<attribute name="VALUE" x="200.66" y="127" size="1.27" layer="96" rot="R180"/>
 </instance>
-<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 part="L3" gate="G$1" x="116.84" y="60.96" smashed="yes">
+<attribute name="NAME" x="106.6531" y="66.05345" size="1.782709375" layer="95"/>
+<attribute name="VALUE" x="106.6485" y="53.316340625" size="1.78353125" layer="96"/>
 </instance>
-<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 part="Z1" gate="G$1" x="256.54" y="68.58" smashed="yes" rot="R180">
+<attribute name="NAME" x="259.4864" y="53.2384" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="268.6304" y="80.6958" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="P+7" gate="1" x="241.3" y="71.12" smashed="yes">
+<attribute name="VALUE" x="238.76" y="71.12" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="SUPPLY15" gate="PE" x="274.32" y="63.5" smashed="yes">
+<attribute name="VALUE" x="269.875" y="58.801" size="1.778" layer="96"/>
 </instance>
-<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 part="+3V13" gate="G$1" x="241.3" y="63.5" smashed="yes" rot="R90">
+<attribute name="VALUE" x="246.38" y="60.96" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="+3V14" gate="G$1" x="210.82" y="60.96" smashed="yes" rot="R180">
+<attribute name="VALUE" x="213.36" y="66.04" size="1.778" layer="96" rot="R270"/>
 </instance>
-<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 part="+3V15" gate="G$1" x="182.88" y="58.42" smashed="yes" rot="R180">
+<attribute name="VALUE" x="185.42" y="63.5" size="1.778" layer="96" rot="R270"/>
 </instance>
-<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 part="U$1" gate="G$1" x="246.38" y="101.6" smashed="yes">
+<attribute name="NAME" x="242.57" y="104.14" size="1.778" layer="95"/>
+<attribute name="VALUE" x="234.95" y="107.95" size="1.778" layer="96"/>
 </instance>
-<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 part="N1" gate="G$1" x="213.36" y="154.94" smashed="yes" rot="R180">
+<attribute name="NAME" x="218.44" y="139.7" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="218.44" y="172.72" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="SUPPLY16" gate="PE" x="241.3" y="175.26" smashed="yes" rot="R180">
+<attribute name="VALUE" x="245.745" y="179.959" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="+3V16" gate="G$1" x="248.92" y="137.16" smashed="yes" rot="R180">
+<attribute name="VALUE" x="251.46" y="142.24" size="1.778" layer="96" rot="R270"/>
 </instance>
-<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 part="C19" gate="G$1" x="271.78" y="160.02" smashed="yes" rot="R180">
+<attribute name="NAME" x="270.256" y="159.639" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="270.256" y="164.719" size="1.778" layer="96" rot="R180"/>
 </instance>
-<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 part="C20" gate="G$1" x="279.4" y="160.02" smashed="yes" rot="R180">
+<attribute name="NAME" x="277.876" y="159.639" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="277.876" y="164.719" size="1.778" layer="96" rot="R180"/>
 </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 part="C3" gate="G$1" x="218.44" y="81.28" smashed="yes" rot="R90">
+<attribute name="NAME" x="218.059" y="82.804" size="1.778" layer="95" rot="R90"/>
+<attribute name="VALUE" x="223.139" y="82.804" size="1.778" layer="96" rot="R90"/>
 </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 part="C7" gate="G$1" x="218.44" y="73.66" smashed="yes" rot="R90">
+<attribute name="NAME" x="218.059" y="75.184" size="1.778" layer="95" rot="R90"/>
+<attribute name="VALUE" x="223.139" y="75.184" size="1.778" layer="96" rot="R90"/>
 </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 part="C8" gate="G$1" x="147.32" y="142.24" smashed="yes" rot="R180">
+<attribute name="NAME" x="145.796" y="141.859" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="145.796" y="146.939" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="MID" gate="G$1" x="314.96" y="157.48" smashed="yes" rot="R180">
-<attribute name="NAME" x="313.436" y="157.099" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="313.436" y="162.179" size="1.778" layer="96" rot="R180"/>
+<instance part="C9" gate="G$1" x="154.94" y="142.24" smashed="yes" rot="R180">
+<attribute name="NAME" x="153.416" y="141.859" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="153.416" y="146.939" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="C2" gate="G$1" x="314.96" y="172.72" smashed="yes" rot="R180">
-<attribute name="NAME" x="313.436" y="172.339" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="313.436" y="177.419" size="1.778" layer="96" rot="R180"/>
-</instance>
-<instance part="C3" gate="G$1" x="317.5" y="142.24" smashed="yes" rot="R180">
-<attribute name="NAME" x="315.976" y="141.859" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="315.976" y="146.939" size="1.778" layer="96" rot="R180"/>
-</instance>
-<instance part="SUPPLY1" gate="PE" x="317.5" y="134.62" smashed="yes">
-<attribute name="VALUE" x="313.055" y="129.921" size="1.778" layer="96"/>
-</instance>
-<instance part="SUPPLY2" gate="PE" x="314.96" y="182.88" smashed="yes" rot="R180">
-<attribute name="VALUE" x="319.405" y="187.579" size="1.778" layer="96" rot="R180"/>
+<instance part="L1" gate="G$1" x="220.98" y="119.38" smashed="yes" rot="R270">
+<attribute name="NAME" x="224.282" y="121.92" size="1.778" layer="95" rot="R270"/>
+<attribute name="VALUE" x="226.441" y="121.92" size="1.778" layer="96" rot="R270"/>
 </instance>
 </instances>
 <busses>
@@ -2144,437 +2149,422 @@ 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="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="137.16" y1="119.38" x2="137.16" y2="132.08" width="0.1524" layer="91"/>
-<junction x="137.16" y="132.08"/>
+<wire x1="66.04" y1="119.38" x2="66.04" y2="132.08" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="1"/>
-<wire x1="132.08" y1="132.08" x2="137.16" y2="132.08" width="0.1524" layer="91"/>
+<wire x1="60.96" y1="132.08" x2="66.04" y2="132.08" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="P+5" gate="1" pin="+5V"/>
-<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="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="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"/>
+<wire x1="78.74" y1="83.82" x2="78.74" y2="66.04" width="0.1524" layer="91"/>
+<pinref part="C2" gate="G$1" pin="1"/>
+<wire x1="96.52" y1="71.12" x2="96.52" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="96.52" y1="66.04" x2="88.9" y2="66.04" width="0.1524" layer="91"/>
+<pinref part="C1" gate="G$1" pin="1"/>
+<wire x1="88.9" y1="66.04" x2="78.74" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="88.9" y1="71.12" x2="88.9" y2="66.04" width="0.1524" layer="91"/>
+<junction x="88.9" y="66.04"/>
+<wire x1="101.6" y1="63.5" x2="96.52" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="96.52" y1="63.5" x2="96.52" y2="66.04" width="0.1524" layer="91"/>
+<junction x="96.52" y="66.04"/>
+<wire x1="101.6" y1="58.42" x2="96.52" y2="58.42" width="0.1524" layer="91"/>
+<wire x1="96.52" y1="58.42" x2="96.52" y2="63.5" width="0.1524" layer="91"/>
+<junction x="96.52" y="63.5"/>
+<pinref part="L3" gate="G$1" pin="IN"/>
+<pinref part="L3" gate="G$1" pin="EN"/>
 </segment>
 <segment>
 <pinref part="P+6" gate="1" pin="+5V"/>
-<wire x1="185.42" y1="7.62" x2="185.42" y2="15.24" width="0.1524" layer="91"/>
+<wire x1="142.24" y1="10.16" x2="142.24" y2="17.78" 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="Z1" gate="G$1" pin="C"/>
 <pinref part="P+7" gate="1" pin="+5V"/>
-<wire x1="297.18" y1="66.04" x2="284.48" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="254" y1="68.58" x2="241.3" y2="68.58" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="D+" class="0">
 <segment>
-<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"/>
+<wire x1="68.58" y1="134.62" x2="68.58" y2="154.94" width="0.1524" layer="91"/>
+<wire x1="60.96" y1="134.62" x2="68.58" y2="134.62" width="0.1524" layer="91"/>
+<label x="66.04" y="154.94" size="1.778" layer="95"/>
 <pinref part="U1" gate="G$1" pin="2"/>
 </segment>
 <segment>
-<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="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"/>
+<wire x1="114.3" y1="104.14" x2="114.3" y2="114.3" width="0.1524" layer="91"/>
+<label x="114.3" y="114.3" size="1.778" layer="95"/>
 <pinref part="ST2" gate="G$1" pin="D+"/>
-<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"/>
+<wire x1="147.32" y1="99.06" x2="114.3" y2="99.06" width="0.1524" layer="91"/>
+<wire x1="114.3" y1="99.06" x2="114.3" y2="104.14" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<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="292.1" y1="55.88" x2="297.18" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="248.92" y1="58.42" x2="248.92" y2="40.64" width="0.1524" layer="91"/>
+<label x="248.92" y="40.64" size="1.778" layer="95" rot="R180"/>
+<pinref part="Z1" gate="G$1" pin="C3"/>
+<wire x1="248.92" y1="58.42" x2="254" y2="58.42" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="D-" class="0">
 <segment>
-<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"/>
+<wire x1="71.12" y1="137.16" x2="71.12" y2="154.94" width="0.1524" layer="91"/>
+<wire x1="60.96" y1="137.16" x2="71.12" y2="137.16" width="0.1524" layer="91"/>
+<label x="73.66" y="154.94" size="1.778" layer="95"/>
 <pinref part="U1" gate="G$1" pin="3"/>
 </segment>
 <segment>
-<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="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"/>
+<wire x1="121.92" y1="104.14" x2="121.92" y2="114.3" width="0.1524" layer="91"/>
+<label x="121.92" y="114.3" size="1.778" layer="95"/>
 <pinref part="ST2" gate="G$1" pin="D-"/>
-<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"/>
+<wire x1="147.32" y1="101.6" x2="121.92" y2="101.6" width="0.1524" layer="91"/>
+<wire x1="121.92" y1="101.6" x2="121.92" y2="104.14" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<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="297.18" y1="71.12" x2="289.56" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="246.38" y1="73.66" x2="246.38" y2="86.36" width="0.1524" layer="91"/>
+<label x="246.38" y="86.36" size="1.778" layer="95"/>
+<pinref part="Z1" gate="G$1" pin="C2"/>
+<wire x1="254" y1="73.66" x2="246.38" y2="73.66" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="PE" class="0">
 <segment>
-<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="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="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"/>
+<pinref part="SUPPLY3" gate="PE" pin="PE"/>
+<wire x1="93.98" y1="83.82" x2="93.98" y2="81.28" width="0.1524" layer="91"/>
+<pinref part="C1" gate="G$1" pin="2"/>
+<wire x1="93.98" y1="81.28" x2="88.9" y2="81.28" width="0.1524" layer="91"/>
+<wire x1="88.9" y1="81.28" x2="88.9" y2="78.74" width="0.1524" layer="91"/>
+<pinref part="C2" gate="G$1" pin="2"/>
+<wire x1="96.52" y1="78.74" x2="96.52" y2="81.28" width="0.1524" layer="91"/>
+<wire x1="96.52" y1="81.28" x2="93.98" y2="81.28" width="0.1524" layer="91"/>
+<junction x="93.98" y="81.28"/>
 </segment>
 <segment>
-<pinref part="C10" gate="G$1" pin="2"/>
-<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="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="C5" gate="G$1" pin="2"/>
+<wire x1="139.7" y1="147.32" x2="139.7" y2="149.86" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="149.86" x2="134.62" y2="149.86" width="0.1524" layer="91"/>
+<pinref part="C4" gate="G$1" pin="2"/>
+<wire x1="134.62" y1="149.86" x2="132.08" y2="149.86" width="0.1524" layer="91"/>
+<wire x1="132.08" y1="149.86" x2="132.08" y2="147.32" width="0.1524" layer="91"/>
+<pinref part="SUPPLY2" gate="PE" pin="PE"/>
+<wire x1="134.62" y1="152.4" x2="134.62" y2="149.86" width="0.1524" layer="91"/>
+<junction x="134.62" y="149.86"/>
+<wire x1="162.56" y1="127" x2="162.56" y2="149.86" width="0.1524" layer="91"/>
+<wire x1="162.56" y1="149.86" x2="154.94" y2="149.86" width="0.1524" layer="91"/>
+<junction x="139.7" y="149.86"/>
 <pinref part="ST2" gate="G$1" pin="VSS"/>
+<pinref part="C8" gate="G$1" pin="2"/>
+<wire x1="154.94" y1="149.86" x2="147.32" y2="149.86" width="0.1524" layer="91"/>
+<wire x1="147.32" y1="149.86" x2="139.7" y2="149.86" width="0.1524" layer="91"/>
+<wire x1="147.32" y1="147.32" x2="147.32" y2="149.86" width="0.1524" layer="91"/>
+<junction x="147.32" y="149.86"/>
+<pinref part="C9" gate="G$1" pin="2"/>
+<wire x1="154.94" y1="147.32" x2="154.94" y2="149.86" width="0.1524" layer="91"/>
+<junction x="154.94" y="149.86"/>
 </segment>
 <segment>
-<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="SUPPLY10" gate="PE" pin="PE"/>
+<wire x1="132.08" y1="10.16" x2="132.08" y2="15.24" width="0.1524" layer="91"/>
 <pinref part="GND1" gate="G$1" pin="TP"/>
 </segment>
 <segment>
-<wire x1="302.26" y1="99.06" x2="294.64" y2="99.06" width="0.1524" layer="91"/>
+<wire x1="259.08" y1="101.6" x2="251.46" y2="101.6" width="0.1524" layer="91"/>
+<pinref part="SUPPLY11" gate="PE" pin="PE"/>
+<pinref part="U$1" gate="G$1" pin="2"/>
+</segment>
+<segment>
+<pinref part="SUPPLY12" gate="PE" pin="PE"/>
+<wire x1="139.7" y1="60.96" x2="139.7" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="L3" gate="G$1" pin="GND"/>
+<wire x1="132.08" y1="60.96" x2="139.7" y2="60.96" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<pinref part="C13" gate="G$1" pin="2"/>
+<wire x1="223.52" y1="88.9" x2="226.06" y2="88.9" width="0.1524" layer="91"/>
+<wire x1="226.06" y1="88.9" x2="226.06" y2="93.98" width="0.1524" layer="91"/>
+<pinref part="C6" gate="G$1" pin="2"/>
+<wire x1="226.06" y1="93.98" x2="226.06" y2="96.52" width="0.1524" layer="91"/>
+<wire x1="226.06" y1="96.52" x2="223.52" y2="96.52" width="0.1524" layer="91"/>
 <pinref part="SUPPLY13" gate="PE" pin="PE"/>
-<pinref part="U$2" gate="G$1" pin="2"/>
+<wire x1="238.76" y1="93.98" x2="226.06" y2="93.98" width="0.1524" layer="91"/>
+<junction x="226.06" y="93.98"/>
+<pinref part="C3" gate="G$1" pin="2"/>
+<wire x1="223.52" y1="81.28" x2="226.06" y2="81.28" width="0.1524" layer="91"/>
+<wire x1="226.06" y1="81.28" x2="226.06" y2="88.9" width="0.1524" layer="91"/>
+<junction x="226.06" y="88.9"/>
+<pinref part="C7" gate="G$1" pin="2"/>
+<wire x1="223.52" y1="73.66" x2="226.06" y2="73.66" width="0.1524" layer="91"/>
+<wire x1="226.06" y1="73.66" x2="226.06" y2="81.28" width="0.1524" layer="91"/>
+<junction x="226.06" y="81.28"/>
 </segment>
 <segment>
+<wire x1="182.88" y1="78.74" x2="182.88" y2="71.12" 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="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="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="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="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"/>
+<wire x1="182.88" y1="71.12" x2="195.58" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="180.34" y1="78.74" x2="180.34" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="180.34" y1="71.12" x2="182.88" y2="71.12" width="0.1524" layer="91"/>
+<junction x="182.88" y="71.12"/>
 <pinref part="ST2" gate="G$1" pin="VSS2"/>
 <pinref part="ST2" gate="G$1" pin="VSS3"/>
 </segment>
 <segment>
-<pinref part="SUPPLY17" gate="PE" pin="PE"/>
-<pinref part="Z2" gate="G$1" pin="P$1"/>
-<wire x1="317.5" y1="63.5" x2="309.88" y2="63.5" width="0.1524" layer="91"/>
+<pinref part="SUPPLY15" gate="PE" pin="PE"/>
+<pinref part="Z1" gate="G$1" pin="P$1"/>
+<wire x1="274.32" y1="66.04" x2="266.7" y2="66.04" 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>
-<segment>
-<pinref part="C2" gate="G$1" pin="2"/>
-<pinref part="SUPPLY2" gate="PE" pin="PE"/>
-<wire x1="314.96" y1="177.8" x2="314.96" y2="180.34" width="0.1524" layer="91"/>
-</segment>
-<segment>
-<pinref part="C3" gate="G$1" pin="1"/>
-<pinref part="SUPPLY1" gate="PE" pin="PE"/>
-<wire x1="317.5" y1="139.7" x2="317.5" y2="137.16" width="0.1524" layer="91"/>
+<pinref part="N1" gate="G$1" pin="VSS"/>
+<wire x1="228.6" y1="165.1" x2="241.3" y2="165.1" width="0.1524" layer="91"/>
+<wire x1="241.3" y1="165.1" x2="241.3" y2="172.72" width="0.1524" layer="91"/>
+<pinref part="SUPPLY16" gate="PE" pin="PE"/>
 </segment>
 </net>
 <net name="+3V3" class="0">
 <segment>
 <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"/>
+<wire x1="152.4" y1="10.16" x2="152.4" y2="17.78" width="0.1524" layer="91"/>
 <pinref part="3V1" gate="G$1" pin="TP"/>
 </segment>
 <segment>
 <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"/>
+<wire x1="243.84" y1="124.46" x2="248.92" y2="124.46" width="0.1524" layer="91"/>
+<pinref part="R1" gate="G$1" pin="2"/>
 </segment>
 <segment>
 <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"/>
+<wire x1="132.08" y1="63.5" x2="139.7" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="63.5" x2="139.7" y2="71.12" width="0.1524" layer="91"/>
+<pinref part="L3" gate="G$1" pin="OUT"/>
 </segment>
 <segment>
-<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="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="180.34" y1="137.16" x2="180.34" y2="127" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="129.54" x2="134.62" y2="129.54" width="0.1524" layer="91"/>
+<pinref part="C5" gate="G$1" pin="1"/>
+<wire x1="134.62" y1="129.54" x2="132.08" y2="129.54" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="139.7" x2="139.7" y2="129.54" width="0.1524" layer="91"/>
+<pinref part="C4" gate="G$1" pin="1"/>
+<wire x1="132.08" y1="139.7" x2="132.08" y2="129.54" 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"/>
+<wire x1="124.46" y1="129.54" x2="132.08" y2="129.54" width="0.1524" layer="91"/>
+<junction x="132.08" y="129.54"/>
+<wire x1="147.32" y1="111.76" x2="134.62" y2="111.76" width="0.1524" layer="91"/>
+<wire x1="134.62" y1="111.76" x2="134.62" y2="129.54" width="0.1524" layer="91"/>
+<junction x="134.62" y="129.54"/>
 <pinref part="ST2" gate="G$1" pin="VDD2"/>
+<pinref part="C8" gate="G$1" pin="1"/>
+<wire x1="147.32" y1="139.7" x2="147.32" y2="129.54" width="0.1524" layer="91"/>
+<wire x1="147.32" y1="129.54" x2="139.7" y2="129.54" width="0.1524" layer="91"/>
+<junction x="139.7" y="129.54"/>
+<pinref part="C9" gate="G$1" pin="1"/>
+<wire x1="154.94" y1="139.7" x2="154.94" y2="129.54" width="0.1524" layer="91"/>
+<wire x1="154.94" y1="129.54" x2="147.32" y2="129.54" width="0.1524" layer="91"/>
+<junction x="147.32" y="129.54"/>
 </segment>
 <segment>
-<pinref part="C12" gate="G$1" pin="1"/>
-<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="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="C13" gate="G$1" pin="1"/>
+<wire x1="215.9" y1="88.9" x2="210.82" y2="88.9" width="0.1524" layer="91"/>
+<pinref part="C6" gate="G$1" pin="1"/>
+<wire x1="215.9" y1="96.52" x2="210.82" y2="96.52" width="0.1524" layer="91"/>
+<wire x1="210.82" y1="96.52" x2="210.82" y2="93.98" width="0.1524" layer="91"/>
+<wire x1="210.82" y1="93.98" x2="210.82" y2="88.9" width="0.1524" layer="91"/>
+<wire x1="195.58" y1="93.98" x2="210.82" y2="93.98" width="0.1524" layer="91"/>
+<junction x="210.82" y="93.98"/>
+<wire x1="195.58" y1="104.14" x2="210.82" y2="104.14" width="0.1524" layer="91"/>
+<wire x1="210.82" y1="104.14" x2="210.82" y2="96.52" width="0.1524" layer="91"/>
+<junction x="210.82" y="96.52"/>
 <pinref part="ST2" gate="G$1" pin="VDD"/>
 <pinref part="ST2" gate="G$1" pin="VDDA/VREF"/>
 <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"/>
+<wire x1="210.82" y1="63.5" x2="210.82" y2="73.66" width="0.1524" layer="91"/>
+<junction x="210.82" y="88.9"/>
+<pinref part="C3" gate="G$1" pin="1"/>
+<wire x1="210.82" y1="73.66" x2="210.82" y2="81.28" width="0.1524" layer="91"/>
+<wire x1="210.82" y1="81.28" x2="210.82" y2="88.9" width="0.1524" layer="91"/>
+<wire x1="215.9" y1="81.28" x2="210.82" y2="81.28" width="0.1524" layer="91"/>
+<junction x="210.82" y="81.28"/>
+<pinref part="C7" gate="G$1" pin="1"/>
+<wire x1="215.9" y1="73.66" x2="210.82" y2="73.66" width="0.1524" layer="91"/>
+<junction x="210.82" y="73.66"/>
 </segment>
 <segment>
 <pinref part="+3V13" gate="G$1" pin="+3V3"/>
-<pinref part="Z2" gate="G$1" pin="C1"/>
-<wire x1="287.02" y1="60.96" x2="297.18" y2="60.96" width="0.1524" layer="91"/>
+<pinref part="Z1" gate="G$1" pin="C1"/>
+<wire x1="243.84" y1="63.5" x2="254" y2="63.5" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="ST2" gate="G$1" pin="PH3/BOOT0"/>
-<wire x1="220.98" y1="76.2" x2="220.98" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="177.8" y1="78.74" x2="177.8" y2="63.5" 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"/>
+<wire x1="177.8" y1="63.5" x2="182.88" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="182.88" y1="63.5" x2="182.88" y2="60.96" 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="N1" gate="G$1" pin="VP_REG"/>
+<wire x1="228.6" y1="149.86" x2="248.92" y2="149.86" 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"/>
-<wire x1="292.1" y1="142.24" x2="292.1" y2="147.32" width="0.1524" layer="91"/>
-<junction x="292.1" y="142.24"/>
-<pinref part="N2" gate="G$1" pin="VP_IO"/>
-<wire x1="271.78" y1="142.24" x2="292.1" y2="142.24" width="0.1524" layer="91"/>
+<wire x1="248.92" y1="139.7" x2="248.92" y2="144.78" width="0.1524" layer="91"/>
+<wire x1="248.92" y1="144.78" x2="248.92" y2="149.86" width="0.1524" layer="91"/>
+<junction x="248.92" y="144.78"/>
+<pinref part="N1" gate="G$1" pin="VP_IO"/>
+<wire x1="228.6" y1="144.78" x2="248.92" y2="144.78" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="N$15" class="0">
+<net name="N$1" class="0">
 <segment>
-<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"/>
+<wire x1="233.68" y1="124.46" x2="226.06" y2="124.46" width="0.1524" layer="91"/>
+<pinref part="R1" gate="G$1" pin="1"/>
+<pinref part="L1" gate="G$1" pin="A2"/>
 </segment>
 </net>
 <net name="SWCLK" class="0">
 <segment>
-<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"/>
+<wire x1="210.82" y1="10.16" x2="210.82" y2="20.32" width="0.1524" layer="91"/>
+<label x="210.82" y="20.32" 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="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"/>
+<wire x1="147.32" y1="93.98" x2="142.24" y2="93.98" width="0.1524" layer="91"/>
+<label x="134.62" y="91.44" size="1.778" layer="95"/>
 </segment>
 </net>
 <net name="STX-&gt;" class="0">
 <segment>
-<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"/>
+<wire x1="231.14" y1="10.16" x2="231.14" y2="20.32" width="0.1524" layer="91"/>
+<label x="231.14" y="20.32" size="1.778" layer="95"/>
 <pinref part="STX-&gt;1" gate="G$1" pin="TP"/>
 </segment>
 <segment>
-<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"/>
+<wire x1="165.1" y1="53.34" x2="167.64" y2="53.34" width="0.1524" layer="91"/>
+<label x="162.56" y="55.88" size="1.778" layer="95"/>
+<wire x1="165.1" y1="53.34" x2="172.72" y2="53.34" width="0.1524" layer="91"/>
+<wire x1="172.72" y1="53.34" x2="172.72" y2="55.88" width="0.1524" layer="91"/>
 <pinref part="ST2" gate="G$1" pin="PB6"/>
-<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="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="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="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"/>
+<wire x1="172.72" y1="55.88" x2="172.72" y2="78.74" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="SWDIO" class="0">
 <segment>
 <pinref part="ST2" gate="G$1" pin="SWDIO"/>
-<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"/>
+<wire x1="147.32" y1="96.52" x2="142.24" y2="96.52" width="0.1524" layer="91"/>
+<label x="132.08" y="93.98" size="1.778" layer="95"/>
 </segment>
 <segment>
-<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"/>
+<wire x1="198.12" y1="10.16" x2="198.12" y2="20.32" width="0.1524" layer="91"/>
+<label x="198.12" y="20.32" size="1.778" layer="95"/>
 <pinref part="SWDIO1" gate="G$1" pin="TP"/>
 </segment>
 </net>
-<net name="SWO" class="0">
+<net name="N$10" class="0">
 <segment>
-<pinref part="ST2" gate="G$1" pin="PB3/SWO"/>
-<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="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="223.52" y="17.78" size="1.778" layer="95"/>
-</segment>
-</net>
-<net name="N$16" class="0">
-<segment>
-<pinref part="L2" gate="G$1" pin="CRED"/>
-<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="248.92" y1="109.22" x2="238.76" y2="109.22" width="0.1524" layer="91"/>
+<wire x1="205.74" y1="114.3" x2="205.74" y2="111.76" width="0.1524" layer="91"/>
+<wire x1="205.74" y1="111.76" x2="195.58" y2="111.76" width="0.1524" layer="91"/>
+<wire x1="218.44" y1="114.3" x2="205.74" y2="114.3" width="0.1524" layer="91"/>
+<pinref part="L1" gate="G$1" pin="CGREEN"/>
 </segment>
 </net>
-<net name="N$17" class="0">
+<net name="N$13" class="0">
 <segment>
-<pinref part="L2" gate="G$1" pin="CBLUE"/>
-<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"/>
+<wire x1="218.44" y1="132.08" x2="180.34" y2="132.08" width="0.1524" layer="91"/>
 <pinref part="ST2" gate="G$1" pin="PA3"/>
-<wire x1="223.52" y1="129.54" x2="223.52" y2="124.46" width="0.1524" layer="91"/>
+<wire x1="180.34" y1="132.08" x2="180.34" y2="127" width="0.1524" layer="91"/>
+<pinref part="L1" gate="G$1" pin="CRED"/>
+<wire x1="218.44" y1="124.46" x2="218.44" y2="132.08" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="N$18" class="0">
+<net name="N$14" class="0">
 <segment>
 <pinref part="ST2" gate="G$1" pin="PA1"/>
-<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="259.08" y1="111.76" x2="261.62" y2="111.76" width="0.1524" layer="91"/>
+<wire x1="195.58" y1="109.22" x2="210.82" y2="109.22" width="0.1524" layer="91"/>
+<pinref part="L1" gate="G$1" pin="CBLUE"/>
+<wire x1="218.44" y1="119.38" x2="210.82" y2="119.38" width="0.1524" layer="91"/>
+<wire x1="210.82" y1="119.38" x2="210.82" y2="109.22" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="N$19" class="0">
+<net name="N$15" class="0">
 <segment>
 <pinref part="ST2" gate="G$1" pin="PA0"/>
-<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"/>
+<wire x1="195.58" y1="106.68" x2="213.36" y2="106.68" width="0.1524" layer="91"/>
+<wire x1="213.36" y1="106.68" x2="213.36" y2="104.14" width="0.1524" layer="91"/>
+<wire x1="213.36" y1="104.14" x2="233.68" y2="104.14" width="0.1524" layer="91"/>
+<wire x1="233.68" y1="104.14" x2="233.68" y2="101.6" width="0.1524" layer="91"/>
+<wire x1="233.68" y1="101.6" x2="241.3" y2="101.6" width="0.1524" layer="91"/>
+<pinref part="U$1" gate="G$1" pin="1"/>
 </segment>
 </net>
 <net name="SCLK" class="0">
 <segment>
-<pinref part="N2" gate="G$1" pin="SCLK"/>
+<pinref part="N1" 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"/>
+<wire x1="198.12" y1="160.02" x2="175.26" y2="160.02" width="0.1524" layer="91"/>
+<wire x1="175.26" y1="160.02" x2="175.26" y2="127" width="0.1524" layer="91"/>
+<label x="180.34" y="160.02" size="1.778" layer="95"/>
 </segment>
 </net>
 <net name="MOSI" class="0">
 <segment>
-<pinref part="N2" gate="G$1" pin="MOSI"/>
+<pinref part="N1" 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"/>
+<wire x1="198.12" y1="154.94" x2="170.18" y2="154.94" width="0.1524" layer="91"/>
+<wire x1="170.18" y1="154.94" x2="170.18" y2="127" width="0.1524" layer="91"/>
+<label x="180.34" y="154.94" size="1.778" layer="95"/>
 </segment>
 </net>
 <net name="MISO" class="0">
 <segment>
-<pinref part="N2" gate="G$1" pin="MISO"/>
+<pinref part="N1" 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"/>
+<wire x1="198.12" y1="149.86" x2="172.72" y2="149.86" width="0.1524" layer="91"/>
+<wire x1="172.72" y1="149.86" x2="172.72" y2="127" width="0.1524" layer="91"/>
+<label x="180.34" y="149.86" size="1.778" layer="95"/>
 </segment>
 </net>
-<net name="AMS_CS" class="0">
+<net name="AMS_CS2" class="0">
 <segment>
-<pinref part="N2" gate="G$1" pin="SS"/>
+<pinref part="N1" 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"/>
+<wire x1="167.64" y1="127" x2="167.64" y2="165.1" width="0.1524" layer="91"/>
+<wire x1="167.64" y1="165.1" x2="198.12" y2="165.1" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="N$25" class="0">
+<net name="N$16" 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"/>
-<wire x1="297.18" y1="165.1" x2="314.96" y2="165.1" width="0.1524" layer="91"/>
-<pinref part="MID" gate="G$1" pin="2"/>
-<wire x1="314.96" y1="162.56" x2="314.96" y2="165.1" width="0.1524" layer="91"/>
-<pinref part="C2" gate="G$1" pin="1"/>
-<wire x1="314.96" y1="170.18" x2="314.96" y2="165.1" width="0.1524" layer="91"/>
-<junction x="314.96" y="165.1"/>
+<pinref part="N1" gate="G$1" pin="LC2"/>
+<wire x1="228.6" y1="160.02" x2="254" y2="160.02" width="0.1524" layer="91"/>
+<wire x1="254" y1="160.02" x2="254" y2="167.64" width="0.1524" layer="91"/>
+<wire x1="254" y1="167.64" x2="271.78" y2="167.64" width="0.1524" layer="91"/>
+<pinref part="C19" gate="G$1" pin="2"/>
+<wire x1="271.78" y1="165.1" x2="271.78" y2="167.64" width="0.1524" layer="91"/>
+<junction x="271.78" y="167.64"/>
+<wire x1="271.78" y1="167.64" x2="279.4" y2="167.64" width="0.1524" layer="91"/>
+<pinref part="C20" gate="G$1" pin="2"/>
+<wire x1="279.4" y1="167.64" x2="279.4" y2="165.1" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="N$26" class="0">
+<net name="N$17" 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"/>
-<wire x1="297.18" y1="149.86" x2="314.96" y2="149.86" width="0.1524" layer="91"/>
-<pinref part="MID" gate="G$1" pin="1"/>
-<wire x1="314.96" y1="149.86" x2="314.96" y2="154.94" width="0.1524" layer="91"/>
-<pinref part="C3" gate="G$1" pin="2"/>
-<wire x1="314.96" y1="149.86" x2="314.96" y2="147.32" width="0.1524" layer="91"/>
-<wire x1="314.96" y1="147.32" x2="317.5" y2="147.32" width="0.1524" layer="91"/>
-<junction x="314.96" y="149.86"/>
+<pinref part="N1" gate="G$1" pin="LC1"/>
+<wire x1="228.6" y1="154.94" x2="254" y2="154.94" width="0.1524" layer="91"/>
+<wire x1="254" y1="154.94" x2="254" y2="152.4" width="0.1524" layer="91"/>
+<wire x1="254" y1="152.4" x2="271.78" y2="152.4" width="0.1524" layer="91"/>
+<pinref part="C19" gate="G$1" pin="1"/>
+<wire x1="271.78" y1="152.4" x2="271.78" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="271.78" y1="152.4" x2="271.78" y2="149.86" width="0.1524" layer="91"/>
+<junction x="271.78" y="152.4"/>
+<pinref part="C20" gate="G$1" pin="1"/>
+<wire x1="271.78" y1="149.86" x2="279.4" y2="149.86" width="0.1524" layer="91"/>
+<wire x1="279.4" y1="149.86" x2="279.4" y2="157.48" 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"/>
+<wire x1="195.58" y1="99.06" x2="198.12" y2="99.06" width="0.1524" layer="91"/>
+<label x="198.12" y="99.06" 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"/>
+<pinref part="N1" gate="G$1" pin="IRQ"/>
+<wire x1="198.12" y1="144.78" x2="190.5" y2="144.78" width="0.1524" layer="91"/>
+<label x="190.5" y="142.24" size="1.778" layer="95"/>
 </segment>
 </net>
 </nets>
diff --git a/solo/USB-C.brd b/solo/USB-C.brd
index d98481d..2b3152d 100644
--- a/solo/USB-C.brd
+++ b/solo/USB-C.brd
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="9.2.2">
+<eagle version="9.3.0">
 <drawing>
 <settings>
-<setting alwaysvectorfont="no"/>
+<setting alwaysvectorfont="yes"/>
 <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"/>
+<grid distance="0.01" unitdist="mm" unit="mm" style="lines" multiple="1" display="no" altdistance="0.05" altunitdist="mm" altunit="mm"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
+<layer number="2" name="Route2" color="1" fill="3" visible="yes" active="yes"/>
+<layer number="15" name="Route15" color="4" fill="6" visible="yes" active="yes"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
@@ -30,7 +32,7 @@
 <layer number="34" name="bFinish" color="6" fill="6" visible="no" active="yes"/>
 <layer number="35" name="tGlue" color="7" fill="4" visible="no" active="yes"/>
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="yes"/>
-<layer number="37" name="tTest" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="37" name="tTest" color="7" fill="1" visible="no" active="yes"/>
 <layer number="38" name="bTest" color="7" fill="1" visible="no" active="yes"/>
 <layer number="39" name="tKeepout" color="4" fill="11" visible="yes" active="yes"/>
 <layer number="40" name="bKeepout" color="1" fill="11" visible="yes" active="yes"/>
@@ -40,7 +42,7 @@
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
 <layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
-<layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
+<layer number="47" name="Measures" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="49" name="Reference" color="7" fill="1" visible="no" active="yes"/>
 <layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
@@ -59,98 +61,41 @@
 <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:weNIOFNJQ7WQdbs-7Cwz6Q" pcbguid="f3b1db15-27e8-4af3-8bdd-a250920546ab" lastpulledtime="2018-08-19T19:01:10Z" lastsyncedchangeguid="1751bdbe-9e6e-99f7-a684-beeff8aa06b5"/>
+<fusionsync huburn="a.cGVyc29uYWw6dWUyYjdlZTY2" projecturn="a.cGVyc29uYWw6dWUyYjdlZTY2IzIwMTgwNDI5MTI5NzYxOTgx" f3durn="urn:adsk.wipprod:dm.lineage:weNIOFNJQ7WQdbs-7Cwz6Q" pcbguid="f3b1db15-27e8-4af3-8bdd-a250920546ab" lastpulledtime="2018-08-19T19:01:10Z" lastsyncedchangeguid="52de892d-cd7b-379f-df74-80031018e186"/>
 <plain>
-<wire x1="46.9" y1="61.75" x2="72.6" y2="61.75" width="0.1016" layer="47"/>
-<wire x1="76.4" y1="57.3" x2="76.4" y2="50.9" width="0.1016" layer="47"/>
-<wire x1="70.7" y1="46.75" x2="47.25" y2="46.75" width="0.1016" layer="47"/>
-<wire x1="46.4" y1="47.55" x2="46.4" y2="60.9" width="0.1016" layer="47"/>
-<wire x1="69.9" y1="46.8" x2="75.7" y2="61.4" width="0.1524" layer="47"/>
-<wire x1="76.1" y1="46.6" x2="69.4" y2="62.4" width="0.1524" layer="47"/>
-<wire x1="74.4" y1="54.25" x2="35.45" y2="54.25" width="0.1524" layer="49"/>
-<wire x1="60.95" y1="61.75" x2="69.95" y2="61.75" width="0.1524" layer="48"/>
-<wire x1="76.4" y1="52.9" x2="76.4" y2="56.6" width="0.1524" layer="48"/>
-<wire x1="59.55" y1="46.75" x2="67.45" y2="46.75" width="0.1524" layer="48"/>
-<wire x1="74.4" y1="54.25" x2="35.45" y2="54.25" width="0.1524" layer="49"/>
-<wire x1="60.95" y1="61.75" x2="69.95" y2="61.75" width="0.1524" layer="48"/>
-<wire x1="76.4" y1="52.9" x2="76.4" y2="56.6" width="0.1524" layer="48"/>
-<wire x1="59.55" y1="46.75" x2="67.45" y2="46.75" width="0.1524" layer="48"/>
-<wire x1="74.4" y1="54.25" x2="35.45" y2="54.25" width="0.1524" layer="49"/>
-<wire x1="60.95" y1="61.75" x2="69.95" y2="61.75" width="0.1524" layer="48"/>
-<wire x1="76.4" y1="52.9" x2="76.4" y2="56.6" width="0.1524" layer="48"/>
-<wire x1="59.55" y1="46.75" x2="67.45" y2="46.75" width="0.1524" layer="48"/>
-<wire x1="74.45" y1="54.25" x2="35.5" y2="54.25" width="0.1524" layer="49"/>
-<wire x1="60.95" y1="61.75" x2="69.95" y2="61.75" width="0.1524" layer="48"/>
-<wire x1="76.4" y1="52.9" x2="76.4" y2="56.6" width="0.1524" layer="48"/>
-<wire x1="59.55" y1="46.75" x2="67.45" y2="46.75" width="0.1524" layer="48"/>
 <rectangle x1="46.4" y1="58.4" x2="49.2" y2="59.2" layer="29"/>
 <rectangle x1="46.4" y1="49.4" x2="49.2" y2="50.1" layer="29"/>
 <rectangle x1="46.4" y1="49.4" x2="49.2" y2="50.1" layer="30"/>
 <rectangle x1="46.4" y1="58.4" x2="49.2" y2="59.2" layer="30"/>
-<wire x1="60.95" y1="61.75" x2="69.95" y2="61.75" width="0.1524" layer="48"/>
-<wire x1="76.4" y1="52.9" x2="76.4" y2="56.6" width="0.1524" layer="48"/>
-<wire x1="59.55" y1="46.75" x2="67.45" y2="46.75" width="0.1524" layer="48"/>
-<wire x1="60.95" y1="61.8" x2="69.95" y2="61.8" width="0.1524" layer="48"/>
-<wire x1="76.4" y1="52.95" x2="76.4" y2="56.65" width="0.1524" layer="48"/>
-<wire x1="59.55" y1="46.8" x2="67.45" y2="46.8" width="0.1524" layer="48"/>
-<text x="70.5" y="48.2" size="1.4224" layer="21">Solo</text>
-<text x="70.7" y="59" size="1.4224" layer="21">v1.2</text>
-<hole x="62.4" y="51.75" drill="0.5"/>
-<wire x1="60.95" y1="61.75" x2="69.95" y2="61.75" width="0.1524" layer="48"/>
-<wire x1="76.4" y1="52.9" x2="76.4" y2="56.6" width="0.1524" layer="48"/>
-<wire x1="59.55" y1="46.75" x2="67.45" y2="46.75" width="0.1524" layer="48"/>
-<hole x="67.3" y="52.1" drill="0.5"/>
-<hole x="67.3" y="56.95" drill="0.5"/>
-<hole x="63.35" y="57.2" drill="0.5"/>
-<wire x1="72.37013125" y1="61.75463125" x2="53.01658125" y2="61.75463125" width="0.1" layer="20"/>
-<wire x1="53.01658125" y1="61.75463125" x2="46.87013125" y2="61.75463125" width="0.1" layer="20"/>
-<wire x1="46.87013125" y1="61.75463125" x2="46.37013125" y2="61.25463125" width="0.1" layer="20" curve="90"/>
-<wire x1="46.37013125" y1="61.25463125" x2="46.37013125" y2="60.191809375" width="0.1" layer="20"/>
-<wire x1="46.37013125" y1="60.191809375" x2="46.37013125" y2="58.95463125" width="0.1" layer="20"/>
-<wire x1="46.37013125" y1="58.95463125" x2="50.47013125" y2="58.95463125" width="0.1" layer="20"/>
-<wire x1="50.47013125" y1="58.95463125" x2="50.47013125" y2="58.15463125" width="0.1" layer="20"/>
-<wire x1="50.47013125" y1="58.15463125" x2="49.67013125" y2="58.15463125" width="0.1" layer="20"/>
-<wire x1="49.67013125" y1="58.15463125" x2="47.87013125" y2="58.15463125" width="0.1" layer="20"/>
-<wire x1="47.87013125" y1="58.15463125" x2="47.02013125" y2="57.85463125" width="0.1" layer="20"/>
-<wire x1="47.02013125" y1="57.85463125" x2="47.02013125" y2="57.22113125" width="0.1" layer="20"/>
-<wire x1="47.02013125" y1="57.22113125" x2="47.02013125" y2="57.1464" width="0.1" layer="20"/>
-<wire x1="47.02013125" y1="57.1464" x2="47.02013125" y2="57.22113125" width="0.1" layer="20"/>
-<wire x1="47.02013125" y1="57.22113125" x2="46.93013125" y2="57.13113125" width="0.1" layer="20" curve="-90"/>
-<wire x1="46.93013125" y1="57.13113125" x2="46.66013125" y2="57.13113125" width="0.1" layer="20"/>
-<wire x1="46.66013125" y1="57.13113125" x2="46.57013125" y2="57.04113125" width="0.1" layer="20" curve="90"/>
-<wire x1="46.57013125" y1="57.04113125" x2="46.57013125" y2="56.7464" width="0.1" layer="20"/>
-<wire x1="46.57013125" y1="56.7464" x2="46.57013125" y2="55.49463125" width="0.1" layer="20"/>
-<wire x1="46.57013125" y1="55.49463125" x2="46.57013125" y2="55.4199" width="0.1" layer="20"/>
-<wire x1="46.57013125" y1="55.4199" x2="46.57013125" y2="55.49463125" width="0.1" layer="20"/>
-<wire x1="46.57013125" y1="55.49463125" x2="46.66013125" y2="55.40463125" width="0.1" layer="20" curve="90"/>
-<wire x1="46.66013125" y1="55.40463125" x2="46.93013125" y2="55.40463125" width="0.1" layer="20"/>
-<wire x1="46.93013125" y1="55.40463125" x2="47.02013125" y2="55.31463125" width="0.1" layer="20" curve="-90"/>
-<wire x1="47.02013125" y1="55.31463125" x2="47.02013125" y2="55.0199" width="0.1" layer="20"/>
-<wire x1="47.02013125" y1="55.0199" x2="47.02013125" y2="54.57545" width="0.1" layer="20"/>
-<wire x1="47.02013125" y1="54.57545" x2="47.02013125" y2="54.09463125" width="0.1" layer="20"/>
-<wire x1="47.02013125" y1="54.09463125" x2="46.93013125" y2="54.00463125" width="0.1" layer="20" curve="-90"/>
-<wire x1="46.93013125" y1="54.00463125" x2="46.66013125" y2="54.00463125" width="0.1" layer="20"/>
-<wire x1="46.66013125" y1="54.00463125" x2="46.57013125" y2="53.91463125" width="0.1" layer="20" curve="90"/>
-<wire x1="46.57013125" y1="53.91463125" x2="46.57013125" y2="53.6199" width="0.1" layer="20"/>
-<wire x1="46.57013125" y1="53.6199" x2="46.57013125" y2="51.52463125" width="0.1" layer="20"/>
-<wire x1="46.57013125" y1="51.52463125" x2="46.66013125" y2="51.43463125" width="0.1" layer="20" curve="90"/>
-<wire x1="46.66013125" y1="51.43463125" x2="46.93013125" y2="51.43463125" width="0.1" layer="20"/>
-<wire x1="46.93013125" y1="51.43463125" x2="47.02013125" y2="51.34463125" width="0.1" layer="20" curve="-90"/>
-<wire x1="47.02013125" y1="51.34463125" x2="47.02013125" y2="50.8464" width="0.1" layer="20"/>
-<wire x1="47.02013125" y1="50.8464" x2="47.02013125" y2="50.65463125" width="0.1" layer="20"/>
-<wire x1="47.02013125" y1="50.65463125" x2="47.8554" y2="50.35463125" width="0.1" layer="20"/>
-<wire x1="47.8554" y1="50.35463125" x2="49.67013125" y2="50.35463125" width="0.1" layer="20"/>
-<wire x1="49.67013125" y1="50.35463125" x2="49.67013125" y2="49.80463125" width="0.1" layer="20"/>
-<wire x1="49.67013125" y1="49.80463125" x2="49.67013125" y2="49.55463125" width="0.1" layer="20"/>
-<wire x1="49.67013125" y1="49.55463125" x2="46.37013125" y2="49.55463125" width="0.1" layer="20"/>
-<wire x1="46.37013125" y1="49.55463125" x2="46.37013125" y2="48.31745" width="0.1" layer="20"/>
-<wire x1="46.37013125" y1="48.31745" x2="46.37013125" y2="47.25463125" width="0.1" layer="20"/>
-<wire x1="46.37013125" y1="47.25463125" x2="46.87013125" y2="46.75463125" width="0.1" layer="20" curve="90"/>
-<wire x1="46.87013125" y1="46.75463125" x2="53.01658125" y2="46.75463125" width="0.1" layer="20"/>
-<wire x1="53.01658125" y1="46.75463125" x2="72.37013125" y2="46.75463125" width="0.1" layer="20"/>
-<wire x1="72.37013125" y1="46.75463125" x2="76.37013125" y2="50.75463125" width="0.1" layer="20" curve="90"/>
-<wire x1="76.37013125" y1="50.75463125" x2="76.37013125" y2="57.75463125" width="0.1" layer="20"/>
-<wire x1="76.37013125" y1="57.75463125" x2="72.37013125" y2="61.75463125" width="0.1" layer="20" curve="90"/>
+<text x="31.99" y="39.43" size="1.4224" layer="21" ratio="15">Solo</text>
+<hole x="37.25" y="49.44" drill="0.5"/>
+<text x="32.09" y="53.22" size="1.4224" layer="21" ratio="15">v2.1</text>
+<hole x="32.75" y="44.19" drill="0.5"/>
+<wire x1="71.63" y1="51.04" x2="54.53" y2="51.04" width="0.152" layer="49"/>
+<wire x1="54.53" y1="51.04" x2="54.53" y2="40.04" width="0.152" layer="49"/>
+<wire x1="54.53" y1="40.04" x2="71.63" y2="40.04" width="0.152" layer="49"/>
+<wire x1="40.93" y1="45.321" x2="77.413" y2="45.242" width="0.2" layer="49"/>
+<wire x1="42.22273125" y1="54.995790625" x2="15.72273125" y2="54.995790625" width="0.1" layer="20"/>
+<wire x1="15.72273125" y1="54.995790625" x2="15.22273125" y2="54.495790625" width="0.1" layer="20" curve="90"/>
+<wire x1="15.22273125" y1="54.495790625" x2="15.22273125" y2="51.395790625" width="0.1" layer="20"/>
+<wire x1="15.22273125" y1="51.395790625" x2="17.02273125" y2="51.395790625" width="0.1" layer="20"/>
+<wire x1="17.02273125" y1="51.395790625" x2="17.82273125" y2="51.395790625" width="0.1" layer="20" curve="-180"/>
+<wire x1="17.82273125" y1="51.395790625" x2="17.82273125" y2="47.945790625" width="0.1" layer="20"/>
+<wire x1="17.82273125" y1="47.945790625" x2="17.52273125" y2="47.645790625" width="0.1" layer="20" curve="-90"/>
+<wire x1="17.52273125" y1="47.645790625" x2="16.62273125" y2="47.645790625" width="0.1" layer="20"/>
+<wire x1="16.62273125" y1="47.645790625" x2="16.62273125" y2="46.345790625" width="0.1" layer="20"/>
+<wire x1="16.62273125" y1="46.345790625" x2="17.52273125" y2="46.345790625" width="0.1" layer="20"/>
+<wire x1="17.52273125" y1="46.345790625" x2="17.82273125" y2="46.045790625" width="0.1" layer="20" curve="-90"/>
+<wire x1="17.82273125" y1="46.045790625" x2="17.82273125" y2="42.595790625" width="0.1" layer="20"/>
+<wire x1="17.82273125" y1="42.595790625" x2="17.02273125" y2="42.595790625" width="0.1" layer="20" curve="-180"/>
+<wire x1="17.02273125" y1="42.595790625" x2="15.22273125" y2="42.595790625" width="0.1" layer="20"/>
+<wire x1="15.22273125" y1="42.595790625" x2="15.22273125" y2="39.495790625" width="0.1" layer="20"/>
+<wire x1="15.22273125" y1="39.495790625" x2="15.72273125" y2="38.995790625" width="0.1" layer="20" curve="90"/>
+<wire x1="15.72273125" y1="38.995790625" x2="42.22273125" y2="38.995790625" width="0.1" layer="20"/>
+<wire x1="42.22273125" y1="38.995790625" x2="46.22273125" y2="42.995790625" width="0.1" layer="20" curve="90"/>
+<circle x="41.97273125" y="46.995790625" radius="2.125" width="0.1" layer="20"/>
+<wire x1="46.22273125" y1="42.995790625" x2="46.22273125" y2="50.995790625" width="0.1" layer="20"/>
+<wire x1="46.22273125" y1="50.995790625" x2="42.22273125" y2="54.995790625" width="0.1" layer="20" curve="90"/>
 </plain>
 <libraries>
 <library name="efm-fido" urn="urn:adsk.eagle:library:4245354">
@@ -171,224 +116,6 @@
 <rectangle x1="0.2588" y1="-0.3048" x2="0.5588" y2="0.2951" layer="51"/>
 <rectangle x1="-0.1999" y1="-0.4001" x2="0.1999" y2="0.4001" layer="35"/>
 </package>
-<package name="DX07P024AJ5R1500" urn="urn:adsk.eagle:footprint:5621084/5" library_version="53">
-<polygon width="0.1" layer="1">
-<vertex x="0.55008125" y="2.193890625"/>
-<vertex x="0.55008125" y="3.293890625"/>
-<vertex x="-0.24991875" y="3.293890625"/>
-<vertex x="-0.24991875" y="2.193890625"/>
-</polygon>
-<polygon width="0.1" layer="1">
-<vertex x="0.96508125" y="1.543890625"/>
-<vertex x="0.96508125" y="0.293890625"/>
-<vertex x="0.55508125" y="0.293890625"/>
-<vertex x="0.55508125" y="1.543890625"/>
-</polygon>
-<polygon width="0.1" layer="1">
-<vertex x="1.96508125" y="1.543890625"/>
-<vertex x="1.96508125" y="0.293890625"/>
-<vertex x="1.70508125" y="0.293890625"/>
-<vertex x="1.70508125" y="1.543890625"/>
-</polygon>
-<polygon width="0.1" layer="1">
-<vertex x="2.46508125" y="1.543890625"/>
-<vertex x="2.46508125" y="0.293890625"/>
-<vertex x="2.20508125" y="0.293890625"/>
-<vertex x="2.20508125" y="1.543890625"/>
-</polygon>
-<polygon width="0.1" layer="1">
-<vertex x="2.96508125" y="1.543890625"/>
-<vertex x="2.96508125" y="0.293890625"/>
-<vertex x="2.70508125" y="0.293890625"/>
-<vertex x="2.70508125" y="1.543890625"/>
-</polygon>
-<polygon width="0.1" layer="1">
-<vertex x="3.46508125" y="1.543890625"/>
-<vertex x="3.46508125" y="0.293890625"/>
-<vertex x="3.20508125" y="0.293890625"/>
-<vertex x="3.20508125" y="1.543890625"/>
-</polygon>
-<polygon width="0.1" layer="1">
-<vertex x="3.96508125" y="0.293890625"/>
-<vertex x="3.96508125" y="1.543890625"/>
-<vertex x="3.70508125" y="1.543890625"/>
-<vertex x="3.70508125" y="0.293890625"/>
-</polygon>
-<polygon width="0.1" layer="1">
-<vertex x="4.46508125" y="0.293890625"/>
-<vertex x="4.46508125" y="1.543890625"/>
-<vertex x="4.20508125" y="1.543890625"/>
-<vertex x="4.20508125" y="0.293890625"/>
-</polygon>
-<polygon width="0.1" layer="1">
-<vertex x="4.96508125" y="0.293890625"/>
-<vertex x="4.96508125" y="1.543890625"/>
-<vertex x="4.70508125" y="1.543890625"/>
-<vertex x="4.70508125" y="0.293890625"/>
-</polygon>
-<polygon width="0.1" layer="1">
-<vertex x="5.46508125" y="0.293890625"/>
-<vertex x="5.46508125" y="1.543890625"/>
-<vertex x="5.20508125" y="1.543890625"/>
-<vertex x="5.20508125" y="0.293890625"/>
-</polygon>
-<polygon width="0.1" layer="1">
-<vertex x="5.96508125" y="0.293890625"/>
-<vertex x="5.96508125" y="1.543890625"/>
-<vertex x="5.70508125" y="1.543890625"/>
-<vertex x="5.70508125" y="0.293890625"/>
-</polygon>
-<polygon width="0.1" layer="1">
-<vertex x="6.61508125" y="0.293890625"/>
-<vertex x="6.61508125" y="1.543890625"/>
-<vertex x="6.20508125" y="1.543890625"/>
-<vertex x="6.20508125" y="0.293890625"/>
-</polygon>
-<polygon width="0.1" layer="1">
-<vertex x="7.65008125" y="2.193890625"/>
-<vertex x="7.65008125" y="3.293890625"/>
-<vertex x="6.81008125" y="3.293890625"/>
-<vertex x="6.81008125" y="2.193890625"/>
-</polygon>
-<polygon width="0.1" layer="16">
-<vertex x="6.82491875" y="2.193890625"/>
-<vertex x="6.82491875" y="3.293890625"/>
-<vertex x="7.64991875" y="3.293890625"/>
-<vertex x="7.64991875" y="2.193890625"/>
-</polygon>
-<polygon width="0.1" layer="1">
-<vertex x="6.81491875" y="1.893890625"/>
-<vertex x="6.81491875" y="0.143890625"/>
-<vertex x="7.17491875" y="0.143890625"/>
-<vertex x="7.17491875" y="1.893890625"/>
-</polygon>
-<polygon width="0.1" layer="16">
-<vertex x="6.20991875" y="1.543890625"/>
-<vertex x="6.20991875" y="0.293890625"/>
-<vertex x="6.61991875" y="0.293890625"/>
-<vertex x="6.61991875" y="1.543890625"/>
-</polygon>
-<polygon width="0.1" layer="16">
-<vertex x="5.70991875" y="1.543890625"/>
-<vertex x="5.70991875" y="0.293890625"/>
-<vertex x="5.96991875" y="0.293890625"/>
-<vertex x="5.96991875" y="1.543890625"/>
-</polygon>
-<polygon width="0.1" layer="16">
-<vertex x="5.20991875" y="1.543890625"/>
-<vertex x="5.20991875" y="0.293890625"/>
-<vertex x="5.46991875" y="0.293890625"/>
-<vertex x="5.46991875" y="1.543890625"/>
-</polygon>
-<polygon width="0.1" layer="16">
-<vertex x="4.70991875" y="1.543890625"/>
-<vertex x="4.70991875" y="0.293890625"/>
-<vertex x="4.96991875" y="0.293890625"/>
-<vertex x="4.96991875" y="1.543890625"/>
-</polygon>
-<polygon width="0.1" layer="16">
-<vertex x="4.20991875" y="1.543890625"/>
-<vertex x="4.20991875" y="0.293890625"/>
-<vertex x="4.46991875" y="0.293890625"/>
-<vertex x="4.46991875" y="1.543890625"/>
-</polygon>
-<polygon width="0.1" layer="16">
-<vertex x="3.70991875" y="1.543890625"/>
-<vertex x="3.70991875" y="0.293890625"/>
-<vertex x="3.96991875" y="0.293890625"/>
-<vertex x="3.96991875" y="1.543890625"/>
-</polygon>
-<polygon width="0.1" layer="16">
-<vertex x="3.20991875" y="0.293890625"/>
-<vertex x="3.20991875" y="1.543890625"/>
-<vertex x="3.46991875" y="1.543890625"/>
-<vertex x="3.46991875" y="0.293890625"/>
-</polygon>
-<polygon width="0.1" layer="16">
-<vertex x="2.70991875" y="0.293890625"/>
-<vertex x="2.70991875" y="1.543890625"/>
-<vertex x="2.96991875" y="1.543890625"/>
-<vertex x="2.96991875" y="0.293890625"/>
-</polygon>
-<polygon width="0.1" layer="16">
-<vertex x="2.20991875" y="0.293890625"/>
-<vertex x="2.20991875" y="1.543890625"/>
-<vertex x="2.46991875" y="1.543890625"/>
-<vertex x="2.46991875" y="0.293890625"/>
-</polygon>
-<polygon width="0.1" layer="16">
-<vertex x="1.70991875" y="0.293890625"/>
-<vertex x="1.70991875" y="1.543890625"/>
-<vertex x="1.96991875" y="1.543890625"/>
-<vertex x="1.96991875" y="0.293890625"/>
-</polygon>
-<polygon width="0.1" layer="16">
-<vertex x="1.20991875" y="0.293890625"/>
-<vertex x="1.20991875" y="1.543890625"/>
-<vertex x="1.46991875" y="1.543890625"/>
-<vertex x="1.46991875" y="0.293890625"/>
-</polygon>
-<polygon width="0.1" layer="16">
-<vertex x="0.55991875" y="0.293890625"/>
-<vertex x="0.55991875" y="1.543890625"/>
-<vertex x="0.96991875" y="1.543890625"/>
-<vertex x="0.96991875" y="0.293890625"/>
-</polygon>
-<polygon width="0.1" layer="1">
-<vertex x="0.00491875" y="1.893890625"/>
-<vertex x="0.00491875" y="0.143890625"/>
-<vertex x="0.36491875" y="0.143890625"/>
-<vertex x="0.36491875" y="1.893890625"/>
-</polygon>
-<polygon width="0.1" layer="16">
-<vertex x="-0.25008125" y="2.193890625"/>
-<vertex x="-0.25008125" y="3.293890625"/>
-<vertex x="0.56491875" y="3.293890625"/>
-<vertex x="0.56491875" y="2.193890625"/>
-</polygon>
-<polygon width="0.1" layer="1">
-<vertex x="1.20491875" y="0.296390625"/>
-<vertex x="1.20491875" y="1.546390625"/>
-<vertex x="1.46491875" y="1.546390625"/>
-<vertex x="1.46491875" y="0.296390625"/>
-</polygon>
-<smd name="A12" x="0.7625" y="0.925" dx="0.35" dy="1.2" layer="1"/>
-<smd name="A11" x="1.3375" y="0.925" dx="0.2" dy="1.2" layer="1"/>
-<smd name="A10" x="1.8375" y="0.925" dx="0.2" dy="1.2" layer="1"/>
-<smd name="A9" x="2.3375" y="0.925" dx="0.2" dy="1.2" layer="1"/>
-<smd name="A8" x="2.8375" y="0.925" dx="0.2" dy="1.2" layer="1"/>
-<smd name="A7" x="3.3375" y="0.9125" dx="0.2" dy="1.2" layer="1"/>
-<smd name="A6" x="3.8375" y="0.9125" dx="0.2" dy="1.2" layer="1"/>
-<smd name="A5" x="4.3375" y="0.9125" dx="0.2" dy="1.2" layer="1"/>
-<smd name="A4" x="4.8375" y="0.9125" dx="0.2" dy="1.2" layer="1"/>
-<smd name="A3" x="5.3375" y="0.9125" dx="0.2" dy="1.2" layer="1"/>
-<smd name="A2" x="5.8375" y="0.9125" dx="0.2" dy="1.2" layer="1"/>
-<smd name="A1" x="6.4125" y="0.9125" dx="0.35" dy="1.2" layer="1"/>
-<smd name="P_GND3" x="7" y="1.025" dx="0.3" dy="1.7" layer="1" rot="R180"/>
-<smd name="P_GND4" x="0.175" y="1.025" dx="0.3" dy="1.7" layer="1" rot="R180"/>
-<smd name="B12" x="6.4125" y="0.925" dx="0.35" dy="1.2" layer="16" rot="R180"/>
-<smd name="B11" x="5.8375" y="0.925" dx="0.2" dy="1.2" layer="16" rot="R180"/>
-<smd name="B10" x="5.3375" y="0.925" dx="0.2" dy="1.2" layer="16" rot="R180"/>
-<smd name="B9" x="4.8375" y="0.925" dx="0.2" dy="1.2" layer="16" rot="R180"/>
-<smd name="B8" x="4.3375" y="0.925" dx="0.2" dy="1.2" layer="16" rot="R180"/>
-<smd name="B7" x="3.8375" y="0.9125" dx="0.2" dy="1.2" layer="16" rot="R180"/>
-<smd name="B6" x="3.3375" y="0.9125" dx="0.2" dy="1.2" layer="16" rot="R180"/>
-<smd name="B5" x="2.8375" y="0.9125" dx="0.2" dy="1.2" layer="16" rot="R180"/>
-<smd name="B4" x="2.3375" y="0.9125" dx="0.2" dy="1.2" layer="16" rot="R180"/>
-<smd name="B3" x="1.8375" y="0.9125" dx="0.2" dy="1.2" layer="16" rot="R180"/>
-<smd name="B2" x="1.3375" y="0.9125" dx="0.2" dy="1.2" layer="16" rot="R180"/>
-<smd name="B1" x="0.7625" y="0.9125" dx="0.35" dy="1.2" layer="16" rot="R180"/>
-<rectangle x1="-0.325" y1="2.125" x2="0.625" y2="3.35" layer="29"/>
-<rectangle x1="6.75" y1="2.125" x2="7.725" y2="3.375" layer="29"/>
-<rectangle x1="-0.325" y1="2.125" x2="0.625" y2="3.375" layer="30"/>
-<rectangle x1="6.725" y1="2.125" x2="7.725" y2="3.375" layer="30"/>
-<wire x1="-0.315" y1="1.15" x2="-0.315" y2="-0.55" width="0.1" layer="47"/>
-<wire x1="-0.315" y1="-0.55" x2="-0.315" y2="-1.15" width="0.1" layer="47"/>
-<wire x1="-0.315" y1="-1.15" x2="7.485" y2="-1.15" width="0.1" layer="47"/>
-<wire x1="7.485" y1="-1.15" x2="7.485" y2="-0.55" width="0.1" layer="47"/>
-<wire x1="7.485" y1="-0.55" x2="7.485" y2="1.75" width="0.1" layer="47"/>
-<wire x1="-0.315" y1="-0.55" x2="7.485" y2="-0.55" width="0.1" layer="47"/>
-</package>
 <package name="B1,27" urn="urn:adsk.eagle:footprint:27900/1" library_version="2" library_locally_modified="yes">
 <description>&lt;b&gt;TEST PAD&lt;/b&gt;</description>
 <wire x1="-0.635" y1="0" x2="0.635" y2="0" width="0.0024" layer="37"/>
@@ -398,7 +125,7 @@
 <text x="-0.635" y="-0.762" size="0.0254" layer="27">&gt;VALUE</text>
 <text x="-0.635" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
 </package>
-<package name="C0402" urn="urn:adsk.eagle:footprint:4894774/3" library_version="48">
+<package name="C0402" urn="urn:adsk.eagle:footprint:4894774/3" library_version="49" library_locally_modified="yes">
 <description>&lt;b&gt;CAPACITOR&lt;/b&gt;</description>
 <wire x1="-0.245" y1="0.224" x2="0.245" y2="0.224" width="0.1524" layer="51"/>
 <wire x1="0.245" y1="-0.224" x2="-0.245" y2="-0.224" width="0.1524" layer="51"/>
@@ -414,16 +141,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" library_locally_modified="yes">
-<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"/>
-<smd name="P$4" x="0" y="0" dx="0.4" dy="0.4" layer="1"/>
-<smd name="P$3" x="0" y="0.85" dx="0.4" dy="0.4" layer="1"/>
-<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/2" library_version="53">
+<package name="QFN32" urn="urn:adsk.eagle:footprint:6434393/4" library_version="66">
 <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"/>
@@ -439,7 +157,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <wire x1="-2.05" y1="-2.45" x2="-2.45" y2="-2.4" width="0.1016" layer="21"/>
 <wire x1="-2.45" y1="-2.4" x2="-2.45" y2="-2.05" width="0.1016" layer="21"/>
 <circle x="-2.425" y="2.475" radius="0.3" width="0" layer="21"/>
-<smd name="EXP" x="0" y="0" dx="3.2" dy="3.2" layer="1" roundness="20" stop="no" cream="no"/>
+<smd name="EXP" x="0" y="0" dx="0.2" dy="0.2" layer="1" roundness="20" stop="no" cream="no"/>
 <smd name="1" x="-2.35" y="1.75" dx="0.6" dy="0.3" layer="1" roundness="30" stop="no" cream="no"/>
 <smd name="2" x="-2.35" y="1.25" dx="0.6" dy="0.3" layer="1" roundness="30" stop="no" cream="no"/>
 <smd name="3" x="-2.35" y="0.75" dx="0.6" dy="0.3" layer="1" roundness="30" stop="no" cream="no"/>
@@ -900,8 +618,14 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-1.675" y="2.125"/>
 <vertex x="-1.675" y="2.575"/>
 </polygon>
+<polygon width="0.127" layer="1" spacing="0.7112" pour="hatch">
+<vertex x="-1.5" y="1.5"/>
+<vertex x="1.5" y="1.5"/>
+<vertex x="1.5" y="-1.5"/>
+<vertex x="-1.5" y="-1.5"/>
+</polygon>
 </package>
-<package name="REG_NCP114AMX330TCG" urn="urn:adsk.eagle:footprint:5621085/2" library_version="53">
+<package name="REG_NCP114AMX330TCG" urn="urn:adsk.eagle:footprint:5621085/3" library_version="66">
 <polygon width="0.001" layer="1">
 <vertex x="-0.475" y="0.65"/>
 <vertex x="-0.475" y="0.22"/>
@@ -984,7 +708,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-0.475" y="-0.05"/>
 <vertex x="-0.525" y="-0.05"/>
 </polygon>
-<circle x="-0.64" y="-0.648" radius="0.0508" width="0.1016" layer="21"/>
+<circle x="-0.74" y="-0.848" radius="0.14" width="0.1016" layer="21"/>
 <wire x1="-0.5" y1="0.5" x2="-0.5" y2="-0.5" width="0.1" layer="51"/>
 <wire x1="-0.5" y1="-0.5" x2="0.5" y2="-0.5" width="0.1" layer="51"/>
 <wire x1="0.5" y1="-0.5" x2="0.5" y2="0.5" width="0.1" layer="51"/>
@@ -1010,7 +734,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="50">
+<package name="DOME-BL-12MM" urn="urn:adsk.eagle:footprint:5648518/7" library_version="70">
 <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"/>
@@ -1020,48 +744,13 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <circle x="0" y="0" radius="1.1" width="0.1524" layer="41"/>
 <circle x="0" y="0" radius="1.0049875" width="0.1524" layer="41"/>
 <circle x="0" y="0" radius="0.9055375" width="0.1524" layer="41"/>
-<wire x1="-2.315709375" y1="0.8" x2="-2.315709375" y2="-0.8" width="0.1" layer="1" curve="-321.88"/>
-<wire x1="-2.315709375" y1="-0.8" x2="-4.96331875" y2="-0.8" width="0.1" layer="1"/>
-<wire x1="-4.96331875" y1="-0.8" x2="-4.96331875" y2="0.8" width="0.1" layer="1"/>
-<wire x1="-4.96331875" y1="0.8" x2="-2.315709375" y2="0.8" width="0.1" layer="1"/>
-<wire x1="-2.315709375" y1="-0.8" x2="-2.315709375" y2="0.8" width="0.1" layer="1" curve="321.883368"/>
-<wire x1="-2.315709375" y1="-0.8" x2="-4.96331875" y2="-0.8" width="0.1" layer="1"/>
-<wire x1="-4.96331875" y1="-0.8" x2="-4.96331875" y2="0.8" width="0.1" layer="1"/>
-<wire x1="-2.315709375" y1="0.8" x2="-4.96331875" y2="0.8" width="0.1" layer="1"/>
+<circle x="0" y="0" radius="1.878828125" width="0.127" layer="1"/>
 <wire x1="-3.74" y1="-2.4937" x2="-5.59" y2="-2.4937" width="0.1" layer="1"/>
 <wire x1="-2.9937" y1="3.74" x2="2.9937" y2="3.74" width="0.1" layer="1"/>
 <wire x1="-2.9937" y1="-3.74" x2="-3.74" y2="-2.9937" width="0.1" layer="1"/>
-<wire x1="-1.8" y1="0.6" x2="-2.1" y2="0.8" width="0.4064" layer="1"/>
-<wire x1="-2.1" y1="0.8" x2="-1.9" y2="1.2" width="0.4064" layer="1"/>
-<wire x1="-1.9" y1="1.2" x2="-1.6" y2="1.6" width="0.4064" layer="1"/>
-<wire x1="-1.6" y1="1.6" x2="-1.3" y2="1.9" width="0.4064" layer="1"/>
-<wire x1="-1.3" y1="1.9" x2="-0.7" y2="2.1" width="0.4064" layer="1"/>
-<wire x1="-0.7" y1="2.1" x2="-0.2" y2="2.2" width="0.4064" layer="1"/>
-<wire x1="-0.2" y1="2.2" x2="0.1" y2="2.2" width="0.4064" layer="1"/>
-<wire x1="0.1" y1="2.2" x2="0.5" y2="2.2" width="0.4064" layer="1"/>
-<wire x1="0.5" y1="2.2" x2="1" y2="2.05" width="0.4064" layer="1"/>
-<wire x1="1" y1="2.05" x2="1.4" y2="1.75" width="0.4064" layer="1"/>
-<wire x1="1.4" y1="1.75" x2="1.8" y2="1.3" width="0.4064" layer="1"/>
-<wire x1="1.8" y1="1.3" x2="2.15" y2="0.75" width="0.4064" layer="1"/>
-<wire x1="2.15" y1="0.75" x2="2.25" y2="0.25" width="0.4064" layer="1"/>
-<wire x1="2.25" y1="0.25" x2="2.25" y2="-0.15" width="0.4064" layer="1"/>
-<wire x1="2.25" y1="-0.15" x2="2.1" y2="-0.75" width="0.4064" layer="1"/>
-<wire x1="2.1" y1="-0.75" x2="1.95" y2="-1.05" width="0.4064" layer="1"/>
-<wire x1="1.95" y1="-1.05" x2="1.85" y2="-1.3" width="0.4064" layer="1"/>
-<wire x1="1.85" y1="-1.3" x2="1.3" y2="-1.85" width="0.4064" layer="1"/>
-<wire x1="1.3" y1="-1.85" x2="0.9" y2="-2.05" width="0.4064" layer="1"/>
-<wire x1="0.9" y1="-2.05" x2="0.4" y2="-2.2" width="0.4064" layer="1"/>
-<wire x1="0.4" y1="-2.2" x2="-0.05" y2="-2.25" width="0.4064" layer="1"/>
-<wire x1="-0.05" y1="-2.25" x2="-0.4" y2="-2.2" width="0.4064" layer="1"/>
-<wire x1="-0.4" y1="-2.2" x2="-0.9" y2="-2.05" width="0.4064" layer="1"/>
-<wire x1="-0.9" y1="-2.05" x2="-1.45" y2="-1.75" width="0.4064" layer="1"/>
-<wire x1="-1.45" y1="-1.75" x2="-1.8" y2="-1.4" width="0.4064" layer="1"/>
-<wire x1="-1.8" y1="-1.4" x2="-2.15" y2="-0.7" width="0.4064" layer="1"/>
-<wire x1="-2.15" y1="-0.7" x2="-2.35" y2="-0.6" width="0.4064" layer="1"/>
-<wire x1="-2.35" y1="-0.6" x2="-4.8" y2="-0.6" width="0.4064" layer="1"/>
-<wire x1="-4.8" y1="-0.6" x2="-4.8" y2="0.65" width="0.4064" layer="1"/>
-<wire x1="-4.8" y1="0.65" x2="-1.95" y2="0.65" width="0.4064" layer="1"/>
-<wire x1="-1.95" y1="0.65" x2="-1.5" y2="0.55" width="0.4064" layer="1"/>
+<wire x1="-2.35" y1="-0.1" x2="-4.8" y2="-0.1" width="0.4064" layer="1"/>
+<wire x1="-4.8" y1="-0.1" x2="-4.8" y2="0.35" width="0.4064" layer="1"/>
+<wire x1="-4.8" y1="0.35" x2="-1.95" y2="0.35" width="0.4064" layer="1"/>
 <wire x1="-1.5" y1="0.55" x2="-1.1" y2="1.2" width="0.4064" layer="1"/>
 <wire x1="-1.1" y1="1.2" x2="-0.75" y2="1.4" width="0.4064" layer="1"/>
 <wire x1="-0.75" y1="1.4" x2="-0.2" y2="1.6" width="0.4064" layer="1"/>
@@ -1081,41 +770,13 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <wire x1="-1" y1="-1.25" x2="-1.25" y2="-1" width="0.4064" layer="1"/>
 <wire x1="-1.25" y1="-1" x2="-1.4" y2="-0.75" width="0.4064" layer="1"/>
 <wire x1="-1.4" y1="-0.75" x2="-1.6" y2="-0.35" width="0.4064" layer="1"/>
-<wire x1="-1.6" y1="-0.35" x2="-1.6" y2="-0.05" width="0.4064" layer="1"/>
-<wire x1="-1.6" y1="-0.05" x2="-1.6" y2="0.35" width="0.4064" layer="1"/>
-<wire x1="-1.6" y1="0.35" x2="-1.5" y2="0.45" width="0.4064" layer="1"/>
-<wire x1="-1.5" y1="0.45" x2="-4.55" y2="0.35" width="0.4064" layer="1"/>
-<wire x1="-4.55" y1="0.35" x2="-4.5" y2="-0.4" width="0.4064" layer="1"/>
-<wire x1="-4.5" y1="-0.4" x2="-1.85" y2="-0.35" width="0.4064" layer="1"/>
-<wire x1="-1.85" y1="-0.35" x2="-1.85" y2="0.2" width="0.4064" layer="1"/>
+<wire x1="-1.6" y1="-0.35" x2="-1.6" y2="0.35" width="0.4064" layer="1"/>
+<wire x1="-1.6" y1="0.35" x2="-1.5" y2="0.35" width="0.4064" layer="1"/>
+<wire x1="-1.5" y1="0.35" x2="-4.55" y2="0.25" width="0.4064" layer="1"/>
+<wire x1="-4.55" y1="0.25" x2="-4.5" y2="-0.1" width="0.4064" layer="1"/>
+<wire x1="-4.5" y1="-0.1" x2="-1.85" y2="-0.05" width="0.4064" layer="1"/>
+<wire x1="-1.85" y1="-0.05" x2="-1.85" y2="0.2" width="0.4064" layer="1"/>
 <wire x1="-1.85" y1="0.2" x2="-4.25" y2="0.1" width="0.4064" layer="1"/>
-<wire x1="-4.25" y1="0.1" x2="-4.3" y2="-0.15" width="0.4064" layer="1"/>
-<wire x1="-4.3" y1="-0.15" x2="-2.1" y2="-0.1" width="0.4064" layer="1"/>
-<wire x1="-2.1" y1="-0.1" x2="-1.8" y2="-0.8" width="0.4064" layer="1"/>
-<wire x1="-1.8" y1="-0.8" x2="-1.25" y2="-1.7" width="0.4064" layer="1"/>
-<wire x1="-1.25" y1="-1.7" x2="-0.3" y2="-1.9" width="0.4064" layer="1"/>
-<wire x1="-0.3" y1="-1.9" x2="0.5" y2="-1.9" width="0.4064" layer="1"/>
-<wire x1="0.5" y1="-1.9" x2="1.45" y2="-1.35" width="0.4064" layer="1"/>
-<wire x1="1.45" y1="-1.35" x2="1.7" y2="-0.95" width="0.4064" layer="1"/>
-<wire x1="1.7" y1="-0.95" x2="2" y2="-0.1" width="0.4064" layer="1"/>
-<wire x1="2" y1="-0.1" x2="1.85" y2="0.35" width="0.4064" layer="1"/>
-<wire x1="1.85" y1="0.35" x2="1.75" y2="0.8" width="0.4064" layer="1"/>
-<wire x1="1.75" y1="0.8" x2="1.3" y2="1.4" width="0.4064" layer="1"/>
-<wire x1="1.3" y1="1.4" x2="0.9" y2="1.75" width="0.4064" layer="1"/>
-<wire x1="0.9" y1="1.75" x2="0.15" y2="1.95" width="0.4064" layer="1"/>
-<wire x1="0.15" y1="1.95" x2="-0.5" y2="1.8" width="0.4064" layer="1"/>
-<wire x1="-0.5" y1="1.8" x2="-1" y2="1.75" width="0.4064" layer="1"/>
-<wire x1="-1" y1="1.75" x2="-1.3" y2="1.45" width="0.4064" layer="1"/>
-<wire x1="-1.3" y1="1.45" x2="-1.75" y2="1.05" width="0.4064" layer="1"/>
-<wire x1="-1.75" y1="1.05" x2="-1.7" y2="0.95" width="0.4064" layer="1"/>
-<wire x1="-1.7" y1="0.95" x2="-1.65" y2="0.85" width="0.4064" layer="1"/>
-<wire x1="-1.65" y1="0.85" x2="-1.5" y2="1" width="0.4064" layer="1"/>
-<wire x1="-1.5" y1="1" x2="-0.9" y2="1.6" width="0.4064" layer="1"/>
-<wire x1="-0.9" y1="1.6" x2="-1.7" y2="0.95" width="0.4064" layer="1"/>
-<wire x1="-1.7" y1="0.95" x2="-1.85" y2="-0.6" width="0.4064" layer="1"/>
-<wire x1="-1.85" y1="-0.6" x2="-0.95" y2="-1.65" width="0.4064" layer="1"/>
-<wire x1="-0.95" y1="-1.65" x2="0.7" y2="-1.9" width="0.4064" layer="1"/>
-<wire x1="0.7" y1="-1.9" x2="1.8" y2="-0.7" width="0.4064" layer="1"/>
 <wire x1="-5" y1="0.8" x2="-2.4" y2="0.8" width="0.1524" layer="29"/>
 <wire x1="-2.4" y1="0.8" x2="-2.4" y2="-0.9" width="0.1524" layer="29"/>
 <wire x1="-2.4" y1="-0.9" x2="-5" y2="-0.9" width="0.1524" layer="29"/>
@@ -1155,7 +816,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <wire x1="-2.3" y1="0.4" x2="-1.3" y2="1.2" width="0.4064" layer="29"/>
 <wire x1="-1.3" y1="1.2" x2="-1.6" y2="1.2" width="0.4064" layer="29"/>
 <wire x1="-1.6" y1="1.2" x2="-1.3" y2="1.5" width="0.4064" layer="29"/>
-<wire x1="-1.3" y1="1.5" x2="-1.9" y2="0.9" width="0.4064" layer="29"/>
+<wire x1="-1.6" y1="1.2" x2="-1.9" y2="0.9" width="0.4064" layer="29"/>
 <wire x1="-1.9" y1="0.9" x2="-0.8" y2="1.8" width="0.4064" layer="29"/>
 <wire x1="-0.8" y1="1.8" x2="0" y2="2" width="0.4064" layer="29"/>
 <wire x1="0" y1="2" x2="0.9" y2="1.8" width="0.4064" layer="29"/>
@@ -1298,8 +959,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <wire x1="-0.7" y1="2.7" x2="-1.1" y2="2.6" width="0.508" layer="41"/>
 <wire x1="-1.1" y1="2.6" x2="-1.5" y2="2.4" width="0.508" layer="41"/>
 <wire x1="-1.5" y1="2.4" x2="-1.8" y2="2.2" width="0.508" layer="41"/>
-<wire x1="-1.8" y1="2.2" x2="-2" y2="2" width="0.508" layer="41"/>
-<wire x1="-2" y1="2" x2="-2.3" y2="1.7" width="0.508" layer="41"/>
+<wire x1="-1.8" y1="2.2" x2="-2.3" y2="1.7" width="0.508" layer="41"/>
 <wire x1="-2.3" y1="1.7" x2="-2.4" y2="1.5" width="0.508" layer="41"/>
 <wire x1="-2.4" y1="1.5" x2="-2.5" y2="1.2" width="0.508" layer="41"/>
 <wire x1="-2.5" y1="1.2" x2="-2.6" y2="1.1" width="0.508" layer="41"/>
@@ -1311,19 +971,44 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <wire x1="-2.2" y1="2.3" x2="-1.9" y2="2.5" width="0.508" layer="41"/>
 <wire x1="-1.9" y1="2.5" x2="-1.4" y2="2.5" width="0.508" layer="41"/>
 <wire x1="-1.4" y1="2.5" x2="-2.1" y2="3" width="0.508" layer="41"/>
-<polygon width="0.1" layer="1">
+<wire x1="-1.7" y1="0.6" x2="-1.7" y2="0.7" width="0.127" layer="1"/>
+<wire x1="-1.5" y1="0.9" x2="-1.7" y2="0.7" width="0.127" layer="1"/>
+<wire x1="-1.5" y1="0.9" x2="-1.3" y2="1.2" width="0.127" layer="1"/>
+<wire x1="-1.3" y1="1.2" x2="-1.6" y2="0.9" width="0.127" layer="1"/>
+<wire x1="-1.6" y1="0.9" x2="-1.1" y2="1.5" width="0.127" layer="1"/>
+<wire x1="-1.1" y1="1.5" x2="-0.9" y2="1.6" width="0.127" layer="1"/>
+<wire x1="-0.9" y1="1.6" x2="-0.3" y2="1.8" width="0.127" layer="1"/>
+<wire x1="-0.3" y1="1.8" x2="0.3" y2="1.8" width="0.127" layer="1"/>
+<wire x1="0.3" y1="1.8" x2="0.7" y2="1.7" width="0.127" layer="1"/>
+<wire x1="0.7" y1="1.7" x2="0.9" y2="1.6" width="0.127" layer="1"/>
+<wire x1="0.9" y1="1.6" x2="1.1" y2="1.4" width="0.127" layer="1"/>
+<wire x1="1.1" y1="1.4" x2="1.3" y2="1.3" width="0.127" layer="1"/>
+<wire x1="1.3" y1="1.3" x2="1.7" y2="0.6" width="0.127" layer="1"/>
+<wire x1="1.7" y1="0.6" x2="1.8" y2="0.1" width="0.127" layer="1"/>
+<wire x1="1.8" y1="0.1" x2="1.8" y2="-0.4" width="0.127" layer="1"/>
+<wire x1="1.8" y1="-0.4" x2="1.5" y2="-1" width="0.127" layer="1"/>
+<wire x1="1.5" y1="-1" x2="0.9" y2="-1.6" width="0.127" layer="1"/>
+<wire x1="0.9" y1="-1.6" x2="0.4" y2="-1.8" width="0.127" layer="1"/>
+<wire x1="0.4" y1="-1.8" x2="-0.3" y2="-1.8" width="0.127" layer="1"/>
+<wire x1="-0.3" y1="-1.8" x2="-0.7" y2="-1.7" width="0.127" layer="1"/>
+<wire x1="-0.7" y1="-1.7" x2="-1.2" y2="-1.4" width="0.127" layer="1"/>
+<wire x1="-1.2" y1="-1.4" x2="-1.3" y2="-1.2" width="0.127" layer="1"/>
+<wire x1="-1.3" y1="-1.2" x2="-1.5" y2="-1" width="0.127" layer="1"/>
+<wire x1="-1.5" y1="-1" x2="-1.7" y2="-0.6" width="0.127" layer="1"/>
+<wire x1="-1.7" y1="-0.6" x2="-1.8" y2="-0.3" width="0.127" layer="1"/>
+<polygon width="0.1" layer="1" spacing="0.75" pour="hatch">
 <vertex x="-3.74" y="2.4937"/>
 <vertex x="-5.59" y="2.4937"/>
 <vertex x="-5.59" y="3.76"/>
 <vertex x="-3.76" y="5.59"/>
-<vertex x="3.76" y="5.59"/>
-<vertex x="5.59" y="3.76"/>
-<vertex x="4.4" y="2.96"/>
-<vertex x="4.3" y="-2.9"/>
-<vertex x="5.5" y="-3.1"/>
-<vertex x="5.59" y="-3.76"/>
+<vertex x="1.7788" y="5.6154"/>
+<vertex x="3.1088" y="4.1854"/>
+<vertex x="4.2" y="3.06"/>
+<vertex x="4.2" y="-3.9"/>
+<vertex x="4.7" y="-4"/>
+<vertex x="5.19" y="-4.16"/>
 <vertex x="3.76" y="-5.59"/>
-<vertex x="-3.76" y="-5.59"/>
+<vertex x="-3.86" y="-5.59"/>
 <vertex x="-5.59" y="-3.76"/>
 <vertex x="-5.59" y="-2.4937"/>
 <vertex x="-3.74" y="-2.4937"/>
@@ -1337,14 +1022,13 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-3.74" y="2.9937"/>
 </polygon>
 <polygon width="0.1524" layer="29">
-<vertex x="-3.8" y="5.6"/>
-<vertex x="-5.6" y="3.8"/>
-<vertex x="-5.6" y="2.5"/>
+<vertex x="-3.8" y="5.7"/>
+<vertex x="-5.7" y="3.8"/>
+<vertex x="-5.6" y="2.4"/>
 <vertex x="-3.7" y="2.5"/>
-<vertex x="-3.7" y="3"/>
-<vertex x="-3" y="3.7"/>
-<vertex x="3" y="3.7"/>
-<vertex x="3.7" y="3"/>
+<vertex x="-2.9" y="3.7"/>
+<vertex x="2.9" y="3.7"/>
+<vertex x="3.7" y="2.8"/>
 <vertex x="3.7" y="-3"/>
 <vertex x="3" y="-3.7"/>
 <vertex x="-3" y="-3.7"/>
@@ -1354,12 +1038,263 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-5.6" y="-3.8"/>
 <vertex x="-3.8" y="-5.6"/>
 <vertex x="3.8" y="-5.6"/>
-<vertex x="5.6" y="-3.8"/>
-<vertex x="5.6" y="3.8"/>
-<vertex x="3.8" y="5.6"/>
+<vertex x="4.6" y="-5"/>
+<vertex x="5.2" y="-4.1"/>
+<vertex x="4.2" y="-3.9"/>
+<vertex x="4.2" y="3"/>
+<vertex x="3.1172" y="4.2254"/>
+<vertex x="1.8172" y="5.6254"/>
 </polygon>
 <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"/>
+<smd name="P$2" x="-0.3" y="4.3" dx="0.5" dy="0.5" layer="1" stop="no" cream="no"/>
+</package>
+<package name="MLPD3X3" urn="urn:adsk.eagle:footprint:5825737/7" library_version="77">
+<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.6" y="-1.64" dx="0.2" dy="0.2" 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>
+<polygon width="0.127" layer="1" spacing="0.7366" pour="hatch">
+<vertex x="0.7" y="-0.4"/>
+<vertex x="2.3" y="-0.4"/>
+<vertex x="2.3" y="-2.7"/>
+<vertex x="0.7" y="-2.7"/>
+</polygon>
+<polygon width="0.127" layer="29">
+<vertex x="0.7" y="-0.4"/>
+<vertex x="2.3" y="-0.4"/>
+<vertex x="2.3" y="-2.7"/>
+<vertex x="0.7" y="-2.7"/>
+</polygon>
+<circle x="-0.5588" y="0.2286" radius="0.1626375" width="0.3556" layer="25"/>
+</package>
+<package name="WüRTH_632712000112" urn="urn:adsk.eagle:footprint:9339181/5" library_version="75">
+<smd name="A12" x="0.154525" y="1.01879375" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A11" x="0.65488125" y="1.016203125" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A10" x="1.158565625" y="1.023003125" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A9" x="1.654875" y="1.0210125" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A8" x="2.15640625" y="1.016634375" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A7" x="2.654875" y="1.016765625" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A6" x="3.15690625" y="1.021084375" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A5" x="3.653228125" y="1.02091875" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A4" x="4.161096875" y="1.020959375" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A3" x="4.648653125" y="1.02311875" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A2" x="5.1519375" y="1.0209" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A1" x="5.6505" y="1.01689375" dx="0.2" dy="1.2" layer="1"/>
+<smd name="P_GND3" x="6.353828125" y="1.1464125" dx="0.45" dy="1.45" layer="1" rot="R180"/>
+<smd name="P_GND4" x="-0.523228125" y="1.145934375" dx="0.45" dy="1.45" layer="1" rot="R180"/>
+<smd name="B12" x="5.6464375" y="1.0147875" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B11" x="5.15690625" y="1.023171875" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B10" x="4.644715625" y="1.020990625" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B1" x="0.154653125" y="1.0185625" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B2" x="0.65200625" y="1.018671875" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B3" x="1.15769375" y="1.023403125" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B4" x="1.65549375" y="1.02088125" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B5" x="2.155321875" y="1.01668125" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B6" x="2.65775" y="1.01414375" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B7" x="3.155375" y="1.02145" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B8" x="3.65476875" y="1.01905625" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B9" x="4.1600125" y="1.01905625" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="P_GND1" x="-0.523771875" y="1.145934375" dx="0.45" dy="1.45" layer="16"/>
+<smd name="P_GND2" x="6.339828125" y="1.145934375" dx="0.45" dy="1.45" layer="16"/>
+<polygon width="0.025" layer="1">
+<vertex x="-0.23291875" y="0.343890625"/>
+<vertex x="-0.822" y="0.348"/>
+<vertex x="-0.822" y="2.223290625"/>
+<vertex x="-0.23291875" y="2.223290625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="0.00508125" y="1.693890625"/>
+<vertex x="0.00508125" y="0.343890625"/>
+<vertex x="0.30508125" y="0.343890625"/>
+<vertex x="0.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="0.50508125" y="1.693890625"/>
+<vertex x="0.50508125" y="0.343890625"/>
+<vertex x="0.80508125" y="0.343890625"/>
+<vertex x="0.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="1.00508125" y="1.693890625"/>
+<vertex x="1.00508125" y="0.343890625"/>
+<vertex x="1.30508125" y="0.343890625"/>
+<vertex x="1.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="1.50508125" y="1.693890625"/>
+<vertex x="1.50508125" y="0.343890625"/>
+<vertex x="1.80508125" y="0.343890625"/>
+<vertex x="1.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="2.00508125" y="1.693890625"/>
+<vertex x="2.00508125" y="0.343890625"/>
+<vertex x="2.30508125" y="0.343890625"/>
+<vertex x="2.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="2.50508125" y="1.693890625"/>
+<vertex x="2.50508125" y="0.343890625"/>
+<vertex x="2.80508125" y="0.343890625"/>
+<vertex x="2.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="3.30508125" y="0.343890625"/>
+<vertex x="3.00508125" y="0.343890625"/>
+<vertex x="3.00508125" y="1.693890625"/>
+<vertex x="3.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="3.80508125" y="0.343890625"/>
+<vertex x="3.50508125" y="0.343890625"/>
+<vertex x="3.50508125" y="1.693890625"/>
+<vertex x="3.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="4.00508125" y="1.693890625"/>
+<vertex x="4.00508125" y="0.343890625"/>
+<vertex x="4.30508125" y="0.343890625"/>
+<vertex x="4.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="4.50508125" y="1.693890625"/>
+<vertex x="4.50508125" y="0.343890625"/>
+<vertex x="4.80508125" y="0.343890625"/>
+<vertex x="4.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="5.30508125" y="0.343890625"/>
+<vertex x="5.00508125" y="0.343890625"/>
+<vertex x="5.00508125" y="1.693890625"/>
+<vertex x="5.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="5.80508125" y="0.343890625"/>
+<vertex x="5.50508125" y="0.343890625"/>
+<vertex x="5.50508125" y="1.693890625"/>
+<vertex x="5.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="6.04308125" y="2.223290625"/>
+<vertex x="6.04308125" y="0.343890625"/>
+<vertex x="6.62448125" y="0.343890625"/>
+<vertex x="6.62448125" y="2.223290625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="-0.23291875" y="0.343890625"/>
+<vertex x="-0.81431875" y="0.343890625"/>
+<vertex x="-0.81431875" y="2.223290625"/>
+<vertex x="-0.23291875" y="2.223290625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="0.00508125" y="1.693890625"/>
+<vertex x="0.00508125" y="0.343890625"/>
+<vertex x="0.30508125" y="0.343890625"/>
+<vertex x="0.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="0.50508125" y="1.693890625"/>
+<vertex x="0.50508125" y="0.343890625"/>
+<vertex x="0.80508125" y="0.343890625"/>
+<vertex x="0.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="1.00508125" y="1.693890625"/>
+<vertex x="1.00508125" y="0.343890625"/>
+<vertex x="1.30508125" y="0.343890625"/>
+<vertex x="1.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="1.50508125" y="1.693890625"/>
+<vertex x="1.50508125" y="0.343890625"/>
+<vertex x="1.80508125" y="0.343890625"/>
+<vertex x="1.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="2.00508125" y="1.693890625"/>
+<vertex x="2.00508125" y="0.343890625"/>
+<vertex x="2.30508125" y="0.343890625"/>
+<vertex x="2.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="2.50508125" y="1.693890625"/>
+<vertex x="2.50508125" y="0.343890625"/>
+<vertex x="2.80508125" y="0.343890625"/>
+<vertex x="2.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="3.30508125" y="0.343890625"/>
+<vertex x="3.00508125" y="0.343890625"/>
+<vertex x="3.00508125" y="1.693890625"/>
+<vertex x="3.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="3.80508125" y="0.343890625"/>
+<vertex x="3.50508125" y="0.343890625"/>
+<vertex x="3.50508125" y="1.693890625"/>
+<vertex x="3.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="4.00508125" y="1.693890625"/>
+<vertex x="4.00508125" y="0.343890625"/>
+<vertex x="4.30508125" y="0.343890625"/>
+<vertex x="4.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="4.50508125" y="1.693890625"/>
+<vertex x="4.50508125" y="0.343890625"/>
+<vertex x="4.80508125" y="0.343890625"/>
+<vertex x="4.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="5.30508125" y="0.343890625"/>
+<vertex x="5.00508125" y="0.343890625"/>
+<vertex x="5.00508125" y="1.693890625"/>
+<vertex x="5.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="5.80508125" y="0.343890625"/>
+<vertex x="5.50508125" y="0.343890625"/>
+<vertex x="5.50508125" y="1.693890625"/>
+<vertex x="5.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="6.04308125" y="2.223290625"/>
+<vertex x="6.04308125" y="0.343890625"/>
+<vertex x="6.62448125" y="0.343890625"/>
+<vertex x="6.62448125" y="2.223290625"/>
+</polygon>
+<wire x1="-1.34491875" y1="1.918490625" x2="-1.34491875" y2="0.138490625" width="0.025" layer="25"/>
+<wire x1="-1.34491875" y1="0.138490625" x2="2.90508125" y2="0.138490625" width="0.025" layer="25"/>
+<wire x1="2.90508125" y1="0.138490625" x2="7.15508125" y2="0.138490625" width="0.025" layer="25"/>
+<wire x1="7.15508125" y1="1.918490625" x2="7.15508125" y2="0.138490625" width="0.025" layer="25"/>
+<wire x1="2.90508125" y1="0.138490625" x2="2.90508125" y2="3.70436875" width="0.025" layer="25"/>
+<rectangle x1="-2.32" y1="0.2718" x2="-1.044" y2="1.8378" layer="1"/>
+<rectangle x1="6.844" y1="0.29" x2="8.12" y2="1.856" layer="1"/>
+<rectangle x1="-2.32" y1="0.2718" x2="-1.044" y2="1.8378" layer="16"/>
+<rectangle x1="6.844" y1="0.29" x2="8.12" y2="1.856" layer="16"/>
+<rectangle x1="-2.32" y1="0.2718" x2="-1.044" y2="1.8378" layer="29"/>
+<rectangle x1="6.844" y1="0.29" x2="8.12" y2="1.856" layer="29"/>
+<rectangle x1="-2.32" y1="0.2718" x2="-1.044" y2="1.8378" layer="30"/>
+<rectangle x1="6.844" y1="0.29" x2="8.12" y2="1.856" layer="30"/>
+</package>
+<package name="CL-505S-X-SD-T" urn="urn:adsk.eagle:footprint:4878738/5" library_version="78">
+<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"/>
+<smd name="P$4" x="0" y="0" dx="0.4" dy="0.4" layer="1"/>
+<smd name="P$3" x="0" y="0.85" dx="0.4" dy="0.4" layer="1"/>
+<text x="-0.4" y="1.4" size="0.4" layer="21">&gt;NAME</text>
+<circle x="1.2508" y="-0.4002" radius="0.1" width="0.2032" layer="21"/>
 </package>
 </packages>
 <packages3d>
@@ -1369,37 +1304,26 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <packageinstance name="R0402"/>
 </packageinstances>
 </package3d>
-<package3d name="DX07P024AJ5R1500" urn="urn:adsk.eagle:package:5621122/11" type="model" library_version="53">
-<packageinstances>
-<packageinstance name="DX07P024AJ5R1500"/>
-</packageinstances>
-</package3d>
 <package3d name="B1,27" urn="urn:adsk.eagle:package:4245792/4" type="box" library_version="7" library_locally_modified="yes">
 <description>TEST PAD</description>
 <packageinstances>
 <packageinstance name="B1,27"/>
 </packageinstances>
 </package3d>
-<package3d name="C0402" urn="urn:adsk.eagle:package:4245806/7" type="model" library_version="48">
+<package3d name="C0402" urn="urn:adsk.eagle:package:4245806/7" type="model" library_version="49" library_locally_modified="yes">
 <description>&lt;b&gt;CAPACITOR&lt;/b&gt;</description>
 <packageinstances>
 <packageinstance name="C0402"/>
 </packageinstances>
 </package3d>
-<package3d name="CL-505S-X-SD-T" urn="urn:adsk.eagle:package:4878740/6" type="box" library_version="51" library_locally_modified="yes">
-<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/6" type="model" library_version="53">
+<package3d name="QFN50P500X500X50-32" urn="urn:adsk.eagle:package:4245373/8" type="model" library_version="66">
 <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/3" type="model" library_version="53">
+<package3d name="DFN100X100X60-4" urn="urn:adsk.eagle:package:5621121/4" type="model" library_version="66">
 <packageinstances>
 <packageinstance name="REG_NCP114AMX330TCG"/>
 </packageinstances>
@@ -1409,11 +1333,27 @@ 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="50">
+<package3d name="DOME-BL-12MM" urn="urn:adsk.eagle:package:5648519/9" type="model" library_version="70">
 <packageinstances>
 <packageinstance name="DOME-BL-12MM"/>
 </packageinstances>
 </package3d>
+<package3d name="MLPD3X3" urn="urn:adsk.eagle:package:5825738/7" type="box" library_version="77">
+<packageinstances>
+<packageinstance name="MLPD3X3"/>
+</packageinstances>
+</package3d>
+<package3d name="WüRTH_632712000112" urn="urn:adsk.eagle:package:9339182/7" type="model" library_version="75">
+<packageinstances>
+<packageinstance name="WüRTH_632712000112"/>
+</packageinstances>
+</package3d>
+<package3d name="CL-505S-X-SD-T" urn="urn:adsk.eagle:package:4878740/7" type="box" library_version="78">
+<description>CL-505S-X-SD-T</description>
+<packageinstances>
+<packageinstance name="CL-505S-X-SD-T"/>
+</packageinstances>
+</package3d>
 </packages3d>
 </library>
 </libraries>
@@ -1610,100 +1550,103 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="USBC1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="DX07P024AJ5R1500" package3d_urn="urn:adsk.eagle:package:5621122/11" value="DX07P024AJ5R1500" x="47.55" y="57.85" smashed="yes" rot="R270"/>
-<element name="R2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="R0402" package3d_urn="urn:adsk.eagle:package:4245807/6" value="5k" x="51" y="49.4" smashed="yes" rot="R180">
-<attribute name="NAME" x="51.435" y="48.865" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="51.535" y="50.605" size="0.6096" layer="27" rot="R180"/>
+<element name="USBC1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="WüRTH_632712000112" package3d_urn="urn:adsk.eagle:package:9339182/7" value="DX07P024AJ5R1500WURTH" x="17.69" y="49.9" smashed="yes" rot="R270"/>
+<element name="R2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="R0402" package3d_urn="urn:adsk.eagle:package:4245807/6" value="5k" x="20.99" y="44.06" smashed="yes" rot="R270">
+<attribute name="NAME" x="21.545" y="44.725" size="0.6096" layer="25" ratio="15" rot="R270"/>
+<attribute name="VALUE" x="19.785" y="44.595" size="0.6096" layer="27" rot="R270"/>
 </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.75" y="59.41" smashed="yes">
-<attribute name="NAME" x="56.965" y="59.195" size="0.6096" layer="25"/>
-<attribute name="VALUE" x="58.515" y="59.305" size="0.6096" layer="27"/>
+<element name="C1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u" x="26.64" y="53.03" smashed="yes">
+<attribute name="NAME" x="26.545" y="53.715" size="0.6096" layer="25" ratio="15"/>
+<attribute name="VALUE" x="27.905" y="52.825" 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.69" y="58.39" smashed="yes">
-<attribute name="NAME" x="56.905" y="58.175" size="0.6096" layer="25"/>
-<attribute name="VALUE" x="58.255" y="58.385" size="0.6096" layer="27"/>
+<element name="C2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="26.63" y="52.19" smashed="yes">
+<attribute name="NAME" x="26.665" y="51.055" size="0.6096" layer="25" ratio="15"/>
+<attribute name="VALUE" x="28.095" y="51.985" 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="51.13" y="56.465" smashed="yes" rot="R180">
-<attribute name="NAME" x="51.665" y="57.53" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="48.265" y="56.77" size="0.6096" layer="27" rot="R180"/>
+<element name="C4" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u" x="21.5" y="49.225" smashed="yes" rot="R180">
+<attribute name="NAME" x="20.445" y="49.42" size="0.6096" layer="25" ratio="15" 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="51.09" y="55.56" smashed="yes" rot="R180">
-<attribute name="NAME" x="50.225" y="55.825" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="48.425" y="55.765" size="0.6096" layer="27" rot="R180"/>
+<element name="C5" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="21.48" y="48.3" smashed="yes" rot="R180">
+<attribute name="NAME" x="20.635" y="47.805" size="0.6096" layer="25" ratio="15" 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="52.1" y="51.25" smashed="yes" rot="MR0">
-<attribute name="NAME" x="51.285" y="51.116" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="52.735" y="50.488" size="0.0254" layer="28" rot="MR0"/>
+<element name="GND2" 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="34.2" y="43.79" smashed="yes" rot="MR0">
+<attribute name="NAME" x="36.635" y="44.206" size="0.6096" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="34.835" y="43.028" 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.6" y="55.4" smashed="yes" rot="MR0">
-<attribute name="NAME" x="52.635" y="55.616" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="50.735" y="54.688" size="0.0254" layer="28" rot="MR0"/>
+<element name="+5V2" 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="17.82" y="53.7" smashed="yes" rot="MR0">
+<attribute name="NAME" x="20.055" y="53.716" size="0.6096" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="18.455" y="52.938" 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="64.05" y="51.05" smashed="yes" rot="MR0">
-<attribute name="NAME" x="66.485" y="51.466" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="64.685" y="50.288" size="0.0254" layer="28" rot="MR0"/>
+<element name="3V2" 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="29.46" y="42.89" smashed="yes" rot="MR0">
+<attribute name="NAME" x="31.655" y="41.916" size="0.6096" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="29.595" y="42.628" 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.55" y="58.9" smashed="yes" rot="MR0">
-<attribute name="NAME" x="53.785" y="58.916" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="52.185" y="58.138" size="0.0254" layer="28" rot="MR0"/>
+<element name="SWDIO2" 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="18.16" y="40.38" smashed="yes" rot="MR0">
+<attribute name="NAME" x="19.595" y="41.496" size="0.6096" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="18.795" y="39.618" 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.95" y="47.8" smashed="yes" rot="MR0">
-<attribute name="NAME" x="49.885" y="48.566" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="49.085" y="47.538" size="0.0254" layer="28" rot="MR0"/>
+<element name="SWCLK2" 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="23.65" y="42.34" smashed="yes" rot="MR0">
+<attribute name="NAME" x="25.065" y="40.686" size="0.6096" layer="26" ratio="15" rot="MR0"/>
+<attribute name="VALUE" x="24.285" y="41.578" 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.5" y="47.95" smashed="yes" rot="MR0">
-<attribute name="NAME" x="52.935" y="48.866" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="52.135" y="47.188" size="0.0254" layer="28" rot="MR0"/>
+<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="24.29" y="43.32" smashed="yes" rot="R180">
+<attribute name="NAME" x="23.055" y="43.525" size="0.6096" layer="25" ratio="15" rot="R180"/>
 </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.75" y="47.75" smashed="yes" rot="MR0">
-<attribute name="NAME" x="57.785" y="47.166" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="54.385" y="46.988" size="0.0254" layer="28" rot="MR0"/>
+<element name="STX-&gt;2" 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="24.91" y="44.3" smashed="yes" rot="MR0">
+<attribute name="NAME" x="25.945" y="45.066" size="0.8128" layer="26" ratio="10" rot="MR0"/>
+<attribute name="VALUE" x="25.545" y="43.538" 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="54" y="50.2" smashed="yes" rot="R180">
-<attribute name="NAME" x="54.335" y="51.265" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="54.535" y="49.755" size="0.6096" layer="27" rot="R180"/>
+<element name="C6" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".1u" x="26.5" y="43.84" smashed="yes" rot="R180">
+<attribute name="NAME" x="28.915" y="44.455" size="0.6096" layer="25" ratio="15" rot="R180"/>
+<attribute name="VALUE" x="29.785" y="45.195" 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="65.2" y="54.7" smashed="yes" rot="R180">
-<attribute name="NAME" x="65.1" y="55.5" size="0.4" layer="21" rot="R180"/>
+<element name="C13" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="26.5" y="42.99" smashed="yes" rot="R180">
+<attribute name="NAME" x="29.185" y="43.015" size="0.6096" layer="25" ratio="15" 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.5" y="51.3" smashed="yes" rot="MR0">
-<attribute name="NAME" x="55.535" y="52.066" size="0.8128" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="55.135" y="50.538" size="0.0254" layer="28" rot="MR0"/>
+<element name="ST1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="QFN32" package3d_urn="urn:adsk.eagle:package:4245373/8" value="STM32L432KCU6" x="25.45" y="47.29" smashed="yes" rot="R180">
+<attribute name="NAME" x="26.34" y="50.72" size="0.6096" layer="25" ratio="15" rot="R180"/>
+<attribute name="VALUE" x="29.5" y="51.64" size="1.27" layer="27" rot="R180" display="off"/>
 </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.9" y="49.9" smashed="yes" rot="MR0">
-<attribute name="NAME" x="61.635" y="50.616" size="0.8128" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="60.535" y="49.138" size="0.0254" layer="28" rot="MR0"/>
+<element name="L3" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="REG_NCP114AMX330TCG" package3d_urn="urn:adsk.eagle:package:5621121/4" value="NCP114AMX330TCG" x="24.57" y="52.13" smashed="yes">
+<attribute name="AVAILABILITY" value="Unavailable" x="24.57" y="52.13" size="1.778" layer="27" font="vector" display="off"/>
+<attribute name="DESCRIPTION" value=" CMOS Low Dropout Regulator _LDO_, 300 mA 3.3V, Active Discharge " x="24.57" y="52.13" size="1.778" layer="27" font="vector" display="off"/>
+<attribute name="MF" value="ON Semiconductor" x="24.57" y="52.13" size="1.778" layer="27" font="vector" display="off"/>
+<attribute name="MP" value="NCP114AMX330TCG" x="24.57" y="52.13" size="1.778" layer="27" font="vector" display="off"/>
+<attribute name="NAME" x="23.427009375" y="52.42771875" size="0.6" layer="25" ratio="15" rot="R90"/>
+<attribute name="PACKAGE" value="UDFN-4 ON Semiconductor" x="24.57" y="52.13" size="1.778" layer="27" font="vector" display="off"/>
+<attribute name="PRICE" value="None" x="24.57" y="52.13" size="1.778" layer="27" font="vector" display="off"/>
+<attribute name="VALUE" x="26.5149" y="50.137078125" size="0.306003125" layer="27" rot="R90" display="off"/>
 </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="56.35" y="51.1" smashed="yes" rot="R180">
-<attribute name="NAME" x="58.785" y="51.715" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="59.135" y="52.655" size="0.6096" layer="27" rot="R180"/>
+<element name="Z1" 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="21.1" y="45.74" smashed="yes">
+<attribute name="NAME" x="21.1" y="46.28" size="0.7" layer="25" ratio="14"/>
 </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="56.35" y="50.25" smashed="yes" rot="R180">
-<attribute name="NAME" x="57.135" y="49.665" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="57.785" y="49.505" size="0.6096" layer="27" rot="R180"/>
+<element name="U$1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="DOME-BL-12MM" package3d_urn="urn:adsk.eagle:package:5648519/9" value="DOME_BUTTON12MM" x="34.95" y="46.99" smashed="yes"/>
+<element name="N1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="MLPD3X3" package3d_urn="urn:adsk.eagle:package:5825738/7" value="AMS3956" x="43.986" y="49.53" smashed="yes" rot="R180">
+<attribute name="NAME" x="41.97" y="52.696" size="0.8" layer="25" ratio="15"/>
+<attribute name="VALUE" x="44.256" y="48.92" size="0.6096" layer="27" ratio="15" 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/6" value="STM32L432KCU6" x="55.3" y="54.55" smashed="yes" rot="R180">
-<attribute name="NAME" x="56.1" y="57.95" size="0.6096" layer="25" rot="R180"/>
-<attribute name="VALUE" x="59.35" y="58.9" size="1.27" layer="27" rot="R180" display="off"/>
+<element name="C15" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".5p" x="44.82" y="51.07" smashed="yes" rot="R90">
+<attribute name="NAME" x="44.965" y="46.935" size="0.8" layer="25" ratio="15" rot="R90"/>
 </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.5" y="48.95" smashed="yes" rot="MR0">
-<attribute name="NAME" x="57.385" y="50.016" size="0.6096" layer="26" ratio="10" rot="MR0"/>
-<attribute name="VALUE" x="57.135" y="48.188" size="0.0254" layer="28" rot="MR0"/>
+<element name="C14" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".5p" x="45.59" y="51.07" smashed="yes" rot="R90">
+<attribute name="NAME" x="45.935" y="46.995" size="0.8" layer="25" ratio="15" rot="R90"/>
 </element>
-<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="53.25" y="58.75" smashed="yes" rot="R90">
-<attribute name="AVAILABILITY" value="Unavailable" x="53.25" y="58.75" 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="53.25" y="58.75" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
-<attribute name="MF" value="ON Semiconductor" x="53.25" y="58.75" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
-<attribute name="MP" value="NCP114AMX330TCG" x="53.25" y="58.75" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
-<attribute name="NAME" x="53.69228125" y="60.277009375" size="0.6" layer="25" rot="R180"/>
-<attribute name="PACKAGE" value="UDFN-4 ON Semiconductor" x="53.25" y="58.75" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
-<attribute name="PRICE" value="None" x="53.25" y="58.75" size="1.778" layer="27" font="vector" rot="R90" display="off"/>
-<attribute name="VALUE" x="54.592921875" y="60.4949" size="0.306003125" layer="27" rot="R180" display="off"/>
+<element name="C3" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="26.62" y="42.12" smashed="yes" rot="R180">
+<attribute name="NAME" x="28.795" y="42.215" size="0.6096" layer="25" ratio="15" rot="R180"/>
+<attribute name="VALUE" x="27.255" y="44.025" size="1.27" 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.95" y="53" smashed="yes">
-<attribute name="NAME" x="50.95" y="53.65" size="0.6" layer="25"/>
+<element name="C7" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="C0402" package3d_urn="urn:adsk.eagle:package:4245806/7" value="4.7u" x="26.6" y="41.25" smashed="yes" rot="R180">
+<attribute name="NAME" x="29.025" y="41.345" size="0.7" layer="25" ratio="15" rot="R180"/>
+</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="21.53" y="50.16" smashed="yes" rot="R180">
+<attribute name="NAME" x="20.575" y="50.225" size="0.7" layer="25" ratio="15" rot="R180"/>
+</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="4.7u" x="21.54" y="50.99" smashed="yes" rot="R180">
+<attribute name="NAME" x="20.615" y="51.765" size="0.7" layer="25" ratio="15" rot="R180"/>
+</element>
+<element name="L1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" package="CL-505S-X-SD-T" package3d_urn="urn:adsk.eagle:package:4878740/7" value="RGB_LED_1X1CL-505S-X-SD-T" x="35.36" y="47.45" smashed="yes" rot="R180">
+<attribute name="NAME" x="35.76" y="46.05" size="0.4" layer="21" rot="R180"/>
 </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.8" y="54.25" smashed="yes"/>
 </elements>
 <signals>
 <signal name="+5V">
@@ -1711,89 +1654,88 @@ design rules under a new name.</description>
 <contactref element="USBC1" pad="B4"/>
 <contactref element="USBC1" pad="B9"/>
 <contactref element="USBC1" pad="A9"/>
-<wire x1="51.7" y1="58.85" x2="51.55" y2="59" width="0.254" layer="16"/>
-<wire x1="51.5144" y1="54.9644" x2="51.5144" y2="55.2" width="0.254" layer="16"/>
-<wire x1="51.5144" y1="55.2" x2="51.5144" y2="56.3" width="0.254" layer="16"/>
-<wire x1="50.8625" y1="53.0125" x2="51" y2="53.15" width="0.254" layer="16"/>
-<wire x1="51" y1="53.15" x2="51" y2="54.45" width="0.254" layer="16"/>
-<wire x1="51" y1="54.45" x2="51.5144" y2="54.9644" width="0.254" layer="16"/>
-<wire x1="51.5144" y1="58.9644" x2="51.55" y2="59" width="0.254" layer="16"/>
-<wire x1="48.4625" y1="55.5125" x2="49.5125" y2="55.5125" width="0.1524" layer="16"/>
-<wire x1="49.5125" y1="55.5125" x2="50.3" y2="56.3" width="0.1524" layer="16"/>
-<wire x1="48.475" y1="53.0125" x2="50.5536" y2="53.0125" width="0.1524" layer="16"/>
-<wire x1="50.5536" y1="53.0125" x2="50.8625" y2="53.0125" width="0.1524" layer="16"/>
-<wire x1="48.4625" y1="53.0125" x2="47.1125" y2="53.0125" width="0.1524" layer="1"/>
-<wire x1="47.1125" y1="53.0125" x2="47.1" y2="53" width="0.1524" layer="1"/>
-<via x="47.1" y="53" extent="1-16" drill="0.35"/>
-<wire x1="47.1" y1="53" x2="47.1125" y2="53.0125" width="0.1524" layer="16"/>
-<wire x1="47.1125" y1="53.0125" x2="48.475" y2="53.0125" width="0.1524" layer="16"/>
-<wire x1="48.475" y1="55.5125" x2="47.49191875" y2="55.5125" width="0.1524" layer="1"/>
-<wire x1="47.49191875" y1="55.5125" x2="47.052209375" y2="55.952209375" width="0.1524" layer="1"/>
-<via x="47.052209375" y="55.952209375" extent="1-16" drill="0.35"/>
-<wire x1="47.052209375" y1="55.952209375" x2="47.49191875" y2="55.5125" width="0.1524" layer="16"/>
-<wire x1="47.49191875" y1="55.5125" x2="48.4625" y2="55.5125" width="0.1524" layer="16"/>
-<wire x1="51.5144" y1="58.6144" x2="51.5144" y2="58.9644" width="0.254" layer="16"/>
-<wire x1="50.3" y1="56.3" x2="51.5144" y2="56.3" width="0.1524" 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="55.15" y1="59.41" x2="55.09" y2="59.400003125" width="0.2032" layer="1"/>
-<wire x1="52.75" y1="59.1" x2="52.75" y2="59.1334125" width="0.1524" layer="1"/>
-<wire x1="52.75" y1="58.444746875" x2="52.560478125" y2="58.63426875" width="0.254" layer="1"/>
-<wire x1="52.560478125" y1="58.63426875" x2="52.560478125" y2="58.86573125" width="0.254" layer="1"/>
-<via x="51.65" y="58.95" extent="1-16" drill="0.35"/>
-<wire x1="55.04" y1="59.35" x2="55.09" y2="58.39" width="0.254" layer="1"/>
-<wire x1="52.75" y1="59.1" x2="52.75" y2="59.45" width="0.254" layer="1"/>
-<wire x1="52.75" y1="59.45" x2="53.05" y2="59.75" width="0.254" layer="1"/>
-<wire x1="54.76" y1="59.75" x2="55.15" y2="59.41" width="0.254" layer="1"/>
-<wire x1="53.05" y1="59.75" x2="54.76" y2="59.75" width="0.254" layer="1"/>
-<contactref element="Z2" pad="P$1"/>
-<via x="50.35" y="52.6" extent="1-16" drill="0.3"/>
-<wire x1="51.8" y1="58.8" x2="51.65" y2="58.95" width="0.254" layer="16"/>
-<wire x1="50.35" y1="52.6" x2="50.9" y2="53.15" width="0.254" layer="16"/>
-<wire x1="51.5144" y1="56.3" x2="51.5144" y2="58.6144" width="0.254" layer="16"/>
-<wire x1="50.9" y1="53.15" x2="51" y2="53.15" width="0.254" layer="16"/>
-<wire x1="51" y1="54.45" x2="51" y2="54.5" width="0.254" layer="16"/>
-<wire x1="51.4" y1="54.9" x2="51" y2="54.5" width="0.254" layer="16"/>
-<wire x1="50.9" y1="53" x2="50.54444375" y2="52.6" width="0.254" layer="1"/>
-<wire x1="50.54444375" y1="52.6" x2="50.35" y2="52.6" width="0.254" layer="1"/>
-<wire x1="51.65" y1="58.75" x2="51.5144" y2="58.6144" width="0.254" layer="16"/>
-<wire x1="51.65" y1="58.95" x2="51.6" y2="58.95" width="0.1524" layer="16"/>
-<wire x1="51.65" y1="58.95" x2="51.65" y2="58.75" width="0.254" layer="16"/>
-<wire x1="51.6" y1="58.95" x2="51.55" y2="58.9" width="0.1524" layer="16"/>
-<wire x1="51.5144" y1="55.2" x2="51.5128" y2="55.1984" width="0.1524" layer="16"/>
-<wire x1="51.5128" y1="55.0128" x2="51.4" y2="54.9" width="0.1524" layer="16"/>
-<wire x1="51.5128" y1="55.1984" x2="51.5128" y2="55.0128" width="0.1524" layer="16"/>
-<wire x1="51.8" y1="59.1" x2="51.65" y2="58.95" width="0.254" layer="1"/>
-<wire x1="52.75" y1="59.075" x2="52.725" y2="59.1" width="0.254" layer="1"/>
-<wire x1="52.725" y1="59.1" x2="51.8" y2="59.1" width="0.254" layer="1"/>
-<wire x1="52.75" y1="58.425" x2="52.560478125" y2="58.614521875" width="0.254" layer="1"/>
-<wire x1="52.560478125" y1="58.614521875" x2="52.560478125" y2="58.63426875" width="0.254" layer="1"/>
-<wire x1="52.560478125" y1="58.86573125" x2="52.75" y2="59.055253125" width="0.254" layer="1"/>
-<wire x1="52.75" y1="59.055253125" x2="52.75" y2="59.075" width="0.254" layer="1"/>
-<wire x1="55.15" y1="59.41" x2="55.09" y2="59.35" width="0.254" layer="1"/>
-<wire x1="55.09" y1="59.35" x2="55.04" y2="59.35" width="0.254" layer="1"/>
-<wire x1="52.75" y1="59.075" x2="52.75" y2="59.1" width="0.254" layer="1"/>
+<contactref element="C2" pad="1"/>
+<contactref element="C1" pad="1"/>
+<contactref element="+5V2" pad="TP"/>
+<contactref element="L3" pad="4"/>
+<contactref element="L3" pad="3"/>
+<wire x1="25.98" y1="53.020003125" x2="26.04" y2="53.03" width="0.2032" layer="1"/>
+<contactref element="Z1" pad="P$1"/>
+<wire x1="19.81" y1="48.24450625" x2="19.81" y2="46.522" width="0.3048" layer="16"/>
+<wire x1="19.81" y1="46.522" x2="19.794003125" y2="46.538003125" width="0.3048" layer="16"/>
+<wire x1="24.4875" y1="52.8625" x2="24.425" y2="52.8" width="0.254" layer="1"/>
+<wire x1="24.5375" y1="52.8125" x2="24.4875" y2="52.8625" width="0.254" layer="1"/>
+<wire x1="24.4875" y1="52.8625" x2="24.445" y2="52.905" width="0.254" layer="1"/>
+<wire x1="24.445" y1="52.905" x2="23.3" y2="54.05" width="0.254" layer="1"/>
+<wire x1="23.3" y1="54.05" x2="20.17" y2="54.05" width="0.254" layer="1"/>
+<wire x1="19.98" y1="54.05" x2="19.54" y2="54.05" width="0.254" layer="1"/>
+<wire x1="19.54" y1="54.05" x2="19.45" y2="54.05" width="0.254" layer="1"/>
+<wire x1="19.45" y1="54.05" x2="19.41" y2="54.05" width="0.254" layer="1"/>
+<wire x1="17.82" y1="53.7" x2="18.37" y2="53.7" width="0.1524" layer="16"/>
+<wire x1="24.245" y1="52.63" x2="24.445" y2="52.83" width="0.25" layer="1"/>
+<wire x1="24.445" y1="52.83" x2="24.445" y2="52.905" width="0.25" layer="1"/>
+<wire x1="24.5375" y1="52.8125" x2="24.73808125" y2="52.8125" width="0.25" layer="1"/>
+<wire x1="24.895" y1="52.63" x2="24.895" y2="52.65558125" width="0.25" layer="1"/>
+<wire x1="24.895" y1="52.65558125" x2="24.73808125" y2="52.8125" width="0.25" layer="1"/>
+<wire x1="24.895" y1="52.63" x2="25.285003125" y2="53.020003125" width="0.25" layer="1"/>
+<wire x1="25.285003125" y1="53.020003125" x2="25.98" y2="53.020003125" width="0.25" layer="1"/>
+<wire x1="26.03" y1="52.19" x2="26.03" y2="53.02" width="0.25" layer="1"/>
+<wire x1="26.03" y1="53.02" x2="26.04" y2="53.03" width="0.25" layer="1"/>
+<wire x1="18.48" y1="45.735" x2="18.483903125" y2="45.738903125" width="0.254" layer="1"/>
+<wire x1="18.7110125" y1="48.245125" x2="18.565125" y2="48.245125" width="0.25" layer="1"/>
+<wire x1="18.552209375" y1="48.232209375" x2="18.565125" y2="48.245125" width="0.25" layer="1"/>
+<via x="19.701221875" y="45.741221875" extent="1-16" drill="0.3"/>
+<wire x1="19.401221875" y1="45.741221875" x2="19.701221875" y2="45.741221875" width="0.2" layer="1"/>
+<wire x1="19.401221875" y1="45.741221875" x2="19.39341875" y2="45.749025" width="0.2" layer="1"/>
+<wire x1="19.27" y1="45.7399875" x2="19.3800125" y2="45.7399875" width="0.2" layer="16"/>
+<via x="19.7" y="48.24" extent="1-16" drill="0.3"/>
+<wire x1="19.7" y1="48.24" x2="19.94" y2="48.48" width="0.25" layer="1"/>
+<wire x1="20.17" y1="54.05" x2="19.54" y2="54.05" width="0.25" layer="1"/>
+<via x="19.54" y="54.05" extent="1-16" drill="0.3"/>
+<wire x1="17.82" y1="53.7" x2="18.17" y2="54.05" width="0.1524" layer="16"/>
+<wire x1="18.17" y1="54.05" x2="19.54" y2="54.05" width="0.1524" layer="16"/>
+<wire x1="19.7" y1="48.24" x2="20.22" y2="48.76" width="0.25" layer="1"/>
+<wire x1="20.22" y1="48.76" x2="20.22" y2="52.12" width="0.25" layer="1"/>
+<wire x1="20.22" y1="52.12" x2="19.24" y2="53.1" width="0.25" layer="1"/>
+<wire x1="19.24" y1="53.84" x2="19.45" y2="54.05" width="0.25" layer="1"/>
+<wire x1="19.24" y1="53.1" x2="19.24" y2="53.84" width="0.25" layer="1"/>
+<wire x1="19.701221875" y1="45.741221875" x2="19.81" y2="46.522" width="0.254" layer="16"/>
+<wire x1="21.4678" y1="45.04365" x2="21.4678" y2="44.17635" width="0.1524" layer="1"/>
+<wire x1="21.4678" y1="44.17635" x2="21.36365" y2="44.0722" width="0.1524" layer="1"/>
+<wire x1="21.36365" y1="44.0722" x2="20.61635" y2="44.0722" width="0.1524" layer="1"/>
+<wire x1="20.61635" y1="44.0722" x2="20.4922" y2="44.19635" width="0.1524" layer="1"/>
+<wire x1="20.4922" y1="44.19635" x2="20.4922" y2="44.6185875" width="0.1524" layer="1"/>
+<wire x1="20.4922" y1="44.6185875" x2="20.18583125" y2="44.92495625" width="0.1524" layer="1"/>
+<wire x1="20.18583125" y1="44.92495625" x2="20.18583125" y2="45.2566125" width="0.1524" layer="1"/>
+<wire x1="21.05" y1="45.74" x2="21.05" y2="45.46145" width="0.1524" layer="1"/>
+<wire x1="21.05" y1="45.46145" x2="21.4678" y2="45.04365" width="0.1524" layer="1"/>
+<wire x1="20.18583125" y1="45.2566125" x2="19.701221875" y2="45.741221875" width="0.1524" layer="1"/>
+<wire x1="19.7" y1="48.24" x2="18.7161375" y2="48.24" width="0.1524" layer="1"/>
+<wire x1="18.7161375" y1="48.24" x2="18.7110125" y2="48.245125" width="0.1524" layer="1"/>
+<wire x1="18.71088125" y1="48.24450625" x2="19.81" y2="48.24450625" width="0.1524" layer="16"/>
+<wire x1="19.7" y1="48.24" x2="18.7153875" y2="48.24" width="0.1524" layer="16"/>
+<wire x1="18.7153875" y1="48.24" x2="18.71088125" y2="48.24450625" width="0.1524" layer="16"/>
+<wire x1="18.70905625" y1="45.7399875" x2="18.4849875" y2="45.7399875" width="0.1524" layer="16"/>
+<wire x1="18.4849875" y1="45.7399875" x2="18.48" y2="45.735" width="0.1524" layer="16"/>
+<wire x1="18.4849875" y1="45.7399875" x2="18.486221875" y2="45.741221875" width="0.1524" layer="16"/>
+<wire x1="18.486221875" y1="45.741221875" x2="19.43" y2="45.741221875" width="0.1524" layer="16"/>
+<wire x1="19.02" y1="45.738903125" x2="19.398903125" y2="45.738903125" width="0.1524" layer="1"/>
+<wire x1="19.398903125" y1="45.738903125" x2="19.401221875" y2="45.741221875" width="0.1524" layer="1"/>
+<wire x1="19.02231875" y1="45.741221875" x2="19.02" y2="45.738903125" width="0.1524" layer="1"/>
+<wire x1="18.710959375" y1="45.738903125" x2="18.70705625" y2="45.735" width="0.1524" layer="1"/>
+<wire x1="18.70705625" y1="45.735" x2="18.48" y2="45.735" width="0.1524" layer="1"/>
+<wire x1="19.698903125" y1="45.738903125" x2="19.398903125" y2="45.738903125" width="0.1524" layer="1"/>
+<wire x1="18.710959375" y1="45.738903125" x2="19.02" y2="45.738903125" width="0.1524" layer="1"/>
+<wire x1="19.698903125" y1="45.738903125" x2="19.701221875" y2="45.741221875" width="0.1524" layer="1"/>
+<wire x1="19.701221875" y1="45.741221875" x2="19.02231875" y2="45.741221875" width="0.1524" layer="1"/>
+<wire x1="18.70905625" y1="45.7399875" x2="19.27" y2="45.7399875" width="0.1524" layer="16"/>
+<wire x1="19.27" y1="45.7399875" x2="19.428765625" y2="45.7399875" width="0.1524" layer="16"/>
+<wire x1="19.428765625" y1="45.7399875" x2="19.43" y2="45.741221875" width="0.1524" layer="16"/>
+<wire x1="19.701221875" y1="45.741221875" x2="19.43" y2="45.741221875" width="0.1524" layer="16"/>
+<wire x1="19.701221875" y1="45.741221875" x2="19.271234375" y2="45.741221875" width="0.1524" layer="16"/>
+<wire x1="19.271234375" y1="45.741221875" x2="19.27" y2="45.7399875" width="0.1524" layer="16"/>
 </signal>
 <signal name="PE">
-<polygon width="0.1016" layer="1" isolate="0.254">
-<vertex x="47.8" y="57.15"/>
-<vertex x="47.8" y="63.8"/>
-<vertex x="83.35" y="63.8"/>
-<vertex x="83.35" y="50.3"/>
-<vertex x="83.35" y="43"/>
-<vertex x="40.65" y="43"/>
-<vertex x="47.8" y="50.15"/>
-</polygon>
-<polygon width="0.1016" layer="16">
-<vertex x="47.7" y="50.616284375"/>
-<vertex x="47.7" y="63.7"/>
-<vertex x="78.2" y="63.7"/>
-<vertex x="78.2" y="43"/>
-<vertex x="42.811940625" y="43"/>
-</polygon>
 <contactref element="R2" pad="2"/>
 <contactref element="USBC1" pad="A1"/>
 <contactref element="USBC1" pad="B12"/>
@@ -1801,326 +1743,622 @@ design rules under a new name.</description>
 <contactref element="USBC1" pad="B1"/>
 <contactref element="USBC1" pad="P_GND3"/>
 <contactref element="USBC1" pad="A12"/>
-<wire x1="48.4625" y1="51.4375" x2="47.59341875" y2="51.4375" width="0.1524" layer="1"/>
-<wire x1="47.59341875" y1="51.4375" x2="47.115459375" y2="51.915459375" width="0.1524" layer="1"/>
-<via x="47.115459375" y="51.915459375" extent="1-16" drill="0.35"/>
-<wire x1="49.9475" y1="56.7475" x2="49.695" y2="57" width="0.254" layer="1"/>
-<wire x1="49.695" y1="57" x2="48.5625" y2="57" width="0.254" layer="1"/>
-<via x="49.9475" y="56.7475" extent="1-16" drill="0.3"/>
-<wire x1="49.9475" y1="56.7475" x2="49.8525" y2="56.7475" width="0.254" layer="16"/>
-<wire x1="49.8525" y1="56.7475" x2="49.5" y2="57.1" width="0.254" layer="16"/>
-<wire x1="49.5" y1="57.1" x2="48.475" y2="57.1" width="0.254" layer="16"/>
-<wire x1="48.475" y1="57.1" x2="48.4625" y2="57.0875" width="0.254" layer="16"/>
-<wire x1="48.475" y1="51.4375" x2="47.59341875" y2="51.4375" width="0.254" layer="16"/>
-<wire x1="47.59341875" y1="51.4375" x2="47.115459375" y2="51.915459375" width="0.254" layer="16"/>
-<wire x1="50.2475" y1="56.7475" x2="49.9475" y2="56.7475" width="0.254" layer="1"/>
-<wire x1="48.475" y1="57.0875" x2="48.475" y2="57.575" width="0.254" layer="1"/>
-<wire x1="48.475" y1="57.575" x2="48.575" y2="57.675" width="0.254" layer="1"/>
-<wire x1="48.4625" y1="51.4375" x2="48.4625" y2="50.9625" width="0.254" layer="1"/>
-<wire x1="48.4625" y1="50.9625" x2="48.575" y2="50.85" width="0.254" layer="1"/>
-<via x="47.3" y="47.8" extent="1-16" drill="0.35"/>
-<wire x1="48.5625" y1="57" x2="48.475" y2="57.0875" width="0.254" layer="1"/>
+<wire x1="18.70615" y1="49.73" x2="18.7085625" y2="49.745346875" width="0.254" layer="16"/>
+<contactref element="C1" pad="2"/>
+<contactref element="C2" pad="2"/>
+<contactref element="C5" pad="2"/>
+<contactref element="C4" pad="2"/>
+<contactref element="GND2" pad="TP"/>
+<contactref element="C13" pad="2"/>
+<contactref element="C6" pad="2"/>
+<contactref element="ST1" pad="16"/>
+<contactref element="ST1" pad="32"/>
+<contactref element="ST1" pad="EXP"/>
+<contactref element="L3" pad="2"/>
+<contactref element="Z1" pad="P$2"/>
+<via x="25.45" y="47.29" extent="1-16" drill="0.35"/>
+<wire x1="25.55" y1="47.29" x2="25.45" y2="47.29" width="0.254" layer="16"/>
+<wire x1="24.85" y1="47.89" x2="25.45" y2="47.29" width="0.254" layer="16"/>
+<wire x1="24.8" y1="47.89" x2="24.85" y2="47.89" width="0.254" layer="16"/>
+<via x="24.8" y="47.89" extent="1-16" drill="0.35"/>
+<wire x1="24.85" y1="47.89" x2="24.8" y2="47.89" width="0.254" layer="1"/>
+<wire x1="24.95" y1="47.79" x2="26.15" y2="47.79" width="0.254" layer="1"/>
+<via x="26.15" y="47.79" extent="1-16" drill="0.35"/>
+<wire x1="24.85" y1="47.89" x2="25.45" y2="47.29" width="0.254" layer="1"/>
+<via x="26.2" y="46.54" extent="1-16" drill="0.35"/>
+<wire x1="25.45" y1="47.29" x2="25.75" y2="46.99" width="0.254" layer="1"/>
+<wire x1="25.75" y1="46.99" x2="26.2" y2="46.54" width="0.254" layer="1"/>
+<wire x1="24.95" y1="47.79" x2="24.95" y2="46.54" width="0.254" layer="1"/>
+<via x="24.95" y="46.54" extent="1-16" drill="0.35"/>
+<wire x1="27.2" y1="45.34" x2="25.75" y2="46.79" width="0.1524" layer="1"/>
+<wire x1="27.2" y1="44.94" x2="27.2" y2="45.34" width="0.1524" layer="1"/>
+<wire x1="25.75" y1="46.79" x2="25.75" y2="46.99" width="0.1524" layer="1"/>
+<wire x1="23.7" y1="49.64" x2="23.7214" y2="49.5686" width="0.1524" layer="1"/>
+<wire x1="23.7214" y1="49.5686" x2="23.7214" y2="49.12166875" width="0.1524" layer="1"/>
+<wire x1="23.7214" y1="49.12166875" x2="23.78166875" y2="49.0614" width="0.1524" layer="1"/>
+<wire x1="23.78166875" y1="49.0614" x2="23.8286" y2="49.0614" width="0.1524" layer="1"/>
+<wire x1="23.8286" y1="49.0614" x2="25.45" y2="47.44" width="0.1524" layer="1"/>
+<wire x1="25.45" y1="47.44" x2="25.45" y2="47.29" width="0.1524" layer="1"/>
+<contactref element="U$1" pad="P$2"/>
+<wire x1="25.85" y1="43.39" x2="25.9" y2="43.84" width="0.254" layer="1"/>
+<wire x1="25.9" y1="42.99" x2="25.85" y2="43.39" width="0.1524" layer="1"/>
+<via x="25.85" y="43.39" extent="1-16" drill="0.35"/>
+<contactref element="N1" pad="P5"/>
+<contactref element="N1" pad="P$11"/>
+<via x="33.25" y="51.74" extent="1-16" drill="0.35"/>
+<via x="34.85" y="51.74" extent="1-16" drill="0.35"/>
+<via x="36.5" y="51.74" extent="1-16" drill="0.35"/>
+<via x="33.2" y="42.19" extent="1-16" drill="0.35"/>
+<via x="35.05" y="42.09" extent="1-16" drill="0.35"/>
+<via x="36.7" y="42.14" extent="1-16" drill="0.35"/>
+<via x="24.47" y="50.85" extent="1-16" drill="0.3"/>
+<via x="28.3464" y="52.13" extent="1-16" drill="0.35"/>
+<wire x1="42.948225" y1="52.07" x2="43.986" y2="52.07" width="0.1524" layer="1"/>
+<wire x1="40.188" y1="49.08" x2="40.193065625" y2="49.08250625" width="0.1524" layer="1"/>
+<via x="40.188" y="49.08" extent="1-16" drill="0.35"/>
+<wire x1="20.7675" y1="49.3575" x2="20.9" y2="49.225" width="0.3048" layer="1"/>
+<wire x1="24.27" y1="51.05" x2="24.47" y2="50.85" width="0.3048" layer="16"/>
+<wire x1="28.1964" y1="51.98" x2="25.6" y2="51.98" width="0.3048" layer="16"/>
+<wire x1="24.47" y1="50.85" x2="25.6" y2="51.98" width="0.3048" layer="16"/>
+<wire x1="28.1964" y1="51.98" x2="28.3464" y2="52.13" width="0.3048" layer="16"/>
+<wire x1="32.95" y1="51.44" x2="28.9664" y2="51.44" width="0.3048" layer="16"/>
+<wire x1="28.9664" y1="51.44" x2="28.3464" y2="52.06" width="0.3048" layer="16"/>
+<wire x1="28.3464" y1="52.13" x2="28.3464" y2="52.06" width="0.3048" layer="16"/>
+<wire x1="33.25" y1="51.74" x2="32.95" y2="51.44" width="0.3048" layer="16"/>
+<wire x1="34.85" y1="51.74" x2="33.25" y2="51.74" width="0.3048" layer="16"/>
+<wire x1="36.5" y1="51.74" x2="34.85" y2="51.74" width="0.3048" layer="16"/>
+<wire x1="35.05" y1="42.09" x2="36.65" y2="42.09" width="0.3048" layer="16"/>
+<wire x1="36.65" y1="42.09" x2="36.7" y2="42.14" width="0.3048" layer="16"/>
+<wire x1="35.05" y1="42.09" x2="33.3" y2="42.09" width="0.3048" layer="16"/>
+<wire x1="33.3" y1="42.09" x2="33.2" y2="42.19" width="0.3048" layer="16"/>
+<wire x1="33.2" y1="42.19" x2="34.2" y2="43.19" width="0.3048" layer="16"/>
+<wire x1="34.2" y1="43.19" x2="34.2" y2="43.79" width="0.3048" layer="16"/>
+<wire x1="26.65" y1="46.09" x2="26.65" y2="44.19" width="0.3048" layer="16"/>
+<wire x1="25.85" y1="43.39" x2="26.65" y2="44.19" width="0.3048" layer="16"/>
+<wire x1="26.2" y1="46.54" x2="26.65" y2="46.09" width="0.3048" layer="16"/>
+<wire x1="25.45" y1="47.29" x2="26.2" y2="46.54" width="0.3048" layer="16"/>
+<wire x1="24.95" y1="46.54" x2="25.45" y2="47.04" width="0.3048" layer="16"/>
+<wire x1="25.45" y1="47.04" x2="25.45" y2="47.29" width="0.3048" layer="16"/>
+<wire x1="26.15" y1="47.79" x2="25.65" y2="47.29" width="0.3048" layer="16"/>
+<wire x1="25.65" y1="47.29" x2="25.55" y2="47.29" width="0.3048" layer="16"/>
+<wire x1="26.2" y1="46.54" x2="27.9" y2="44.84" width="0.3048" layer="16"/>
+<wire x1="30.55" y1="44.84" x2="33.2" y2="42.19" width="0.3048" layer="16"/>
+<wire x1="27.9" y1="44.84" x2="30.55" y2="44.84" width="0.3048" layer="16"/>
+<wire x1="24.8" y1="47.89" x2="28.3464" y2="51.4364" width="0.3048" layer="16"/>
+<wire x1="28.3464" y1="51.4364" x2="28.3464" y2="52.13" width="0.3048" layer="16"/>
+<wire x1="25.5" y1="49.82" x2="25.5" y2="48.59" width="0.3048" layer="16"/>
+<wire x1="24.8" y1="47.89" x2="25.5" y2="48.59" width="0.3048" layer="16"/>
+<wire x1="25.5" y1="49.82" x2="24.47" y2="50.85" width="0.3048" layer="16"/>
+<wire x1="36.5" y1="51.74" x2="37.528" y2="51.74" width="0.3048" layer="16"/>
+<wire x1="37.528" y1="51.74" x2="40.188" y2="49.08" width="0.3048" layer="16"/>
+<wire x1="34.65" y1="51.29" x2="34.85" y2="51.49" width="0.3048" layer="1"/>
+<wire x1="34.85" y1="51.49" x2="34.85" y2="51.74" width="0.3048" layer="1"/>
+<wire x1="40.848" y1="49.52" x2="40.408" y2="49.08" width="0.3048" layer="1"/>
+<wire x1="40.188" y1="49.08" x2="40.408" y2="49.08" width="0.3048" layer="1"/>
+<wire x1="40.848" y1="49.52" x2="41.63" y2="49.52" width="0.3048" layer="1"/>
+<wire x1="41.63" y1="49.52" x2="42.758" y2="50.648" width="0.3048" layer="1"/>
+<wire x1="42.758" y1="50.648" x2="42.353" y2="51.053" width="0.3048" layer="1"/>
+<wire x1="42.386" y1="51.17" x2="42.563778125" y2="51.17" width="0.3048" layer="1"/>
+<wire x1="24.47" y1="50.85" x2="24.3275" y2="50.9925" width="0.254" layer="1"/>
+<wire x1="24.895" y1="51.63" x2="24.965" y2="51.63" width="0.254" layer="1"/>
+<via x="19.96" y="44.29" extent="1-16" drill="0.3"/>
+<wire x1="20.9" y1="49.225" x2="20.88" y2="49.205" width="0.254" layer="1"/>
+<wire x1="20.88" y1="49.205" x2="20.88" y2="48.3" width="0.254" layer="1"/>
+<via x="23.31" y="51.75" extent="1-16" drill="0.3"/>
+<wire x1="20.9" y1="49.225" x2="20.74" y2="49.065" width="0.254" layer="1"/>
+<wire x1="20.74" y1="49.265" x2="20.87" y2="49.395" width="0.254" layer="1"/>
+<wire x1="24.47" y1="50.85" x2="23.57" y2="51.75" width="0.254" layer="16"/>
+<wire x1="23.57" y1="51.75" x2="23.31" y2="51.75" width="0.254" layer="16"/>
+<contactref element="C3" pad="2"/>
 <contactref element="C7" pad="2"/>
 <contactref element="C8" pad="2"/>
-<contactref element="C10" pad="2"/>
 <contactref element="C9" pad="2"/>
-<contactref element="GND1" pad="TP"/>
-<via x="68" y="47.9" extent="1-16" drill="0.35"/>
-<via x="68.2" y="60.65" extent="1-16" drill="0.35"/>
-<via x="63.8" y="60.65" extent="1-16" drill="0.35"/>
-<via x="63.4" y="47.45" extent="1-16" drill="0.35"/>
-<contactref element="C12" pad="2"/>
-<contactref element="C11" pad="2"/>
-<contactref element="ST2" pad="16"/>
-<contactref element="ST2" pad="32"/>
-<contactref element="ST2" pad="EXP"/>
-<contactref element="L4" pad="2"/>
-<contactref element="Z2" pad="P$2"/>
-<via x="55.3" y="54.55" extent="1-16" drill="0.35"/>
-<wire x1="55.3" y1="54.55" x2="55.4" y2="54.55" width="0.254" layer="16"/>
-<wire x1="54.7" y1="55.15" x2="55.3" y2="54.55" width="0.254" layer="16"/>
-<wire x1="54.65" y1="55.15" x2="54.7" y2="55.15" width="0.254" layer="16"/>
-<via x="54.65" y="55.15" extent="1-16" drill="0.35"/>
-<wire x1="54.7" y1="55.15" x2="54.65" y2="55.15" width="0.254" layer="1"/>
-<wire x1="54.8" y1="55.05" x2="56" y2="55.05" width="0.254" layer="1"/>
-<via x="56" y="55.05" extent="1-16" drill="0.35"/>
-<wire x1="54.7" y1="55.15" x2="55.3" y2="54.55" width="0.254" layer="1"/>
-<via x="56.05" y="53.8" extent="1-16" drill="0.35"/>
-<wire x1="55.3" y1="54.55" x2="55.6" y2="54.25" width="0.254" layer="1"/>
-<wire x1="55.6" y1="54.25" x2="56.05" y2="53.8" width="0.254" layer="1"/>
-<wire x1="54.8" y1="55.05" x2="54.8" y2="53.8" width="0.254" layer="1"/>
-<via x="54.8" y="53.8" extent="1-16" drill="0.35"/>
-<wire x1="57.05" y1="52.6" x2="55.6" y2="54.05" width="0.1524" layer="1"/>
-<wire x1="57.05" y1="52.2" x2="57.05" y2="52.6" width="0.1524" layer="1"/>
-<wire x1="55.6" y1="54.05" x2="55.6" y2="54.25" width="0.1524" layer="1"/>
-<wire x1="53.55" y1="56.9" x2="53.5714" y2="56.8286" width="0.1524" layer="1"/>
-<wire x1="53.5714" y1="56.8286" x2="53.5714" y2="56.38166875" width="0.1524" layer="1"/>
-<wire x1="53.5714" y1="56.38166875" x2="55.3" y2="54.65306875" width="0.1524" layer="1"/>
-<wire x1="55.3" y1="54.65306875" x2="55.3" y2="54.55" width="0.1524" layer="1"/>
-<contactref element="U$2" pad="P$2"/>
-<wire x1="55.7" y1="50.65" x2="55.75" y2="51.1" width="0.254" layer="1"/>
-<wire x1="55.75" y1="50.25" x2="55.7" y2="50.65" width="0.1524" layer="1"/>
-<via x="55.7" y="50.65" extent="1-16" drill="0.3"/>
-<wire x1="51.45" y1="53" x2="51.45" y2="52.25" width="0.1524" layer="1"/>
-<wire x1="51.45" y1="52.25" x2="51.17960625" y2="51.97960625" width="0.1524" layer="1"/>
-<via x="51.17960625" y="51.97960625" extent="1-16" drill="0.35"/>
-<wire x1="48.475" y1="51.4375" x2="49.9" y2="51.4" width="0.1524" layer="16"/>
-<wire x1="49.9475" y1="56.7475" x2="50.8475" y2="56.7475" width="0.254" layer="1"/>
-<wire x1="51.3" y1="57.2" x2="51.3" y2="57.6" width="0.254" layer="1"/>
-<wire x1="50.8475" y1="56.7475" x2="51.3" y2="57.2" width="0.254" layer="1"/>
+<wire x1="26.02" y1="42.12" x2="26.02" y2="41.27" width="0.3048" layer="1"/>
+<wire x1="26" y1="41.25" x2="26.02" y2="41.27" width="0.3048" layer="1"/>
+<wire x1="25.9" y1="42.99" x2="26.02" y2="42.87" width="0.3048" layer="1"/>
+<wire x1="26.02" y1="42.87" x2="26.02" y2="42.12" width="0.3048" layer="1"/>
+<wire x1="20.94" y1="50.99" x2="20.94" y2="50.93" width="0.2" layer="1"/>
+<wire x1="20.94" y1="50.93" x2="20.94" y2="50.39" width="0.2" layer="1"/>
+<wire x1="20.94" y1="50.39" x2="20.94" y2="50.17" width="0.2" layer="1"/>
+<wire x1="20.93" y1="50.16" x2="20.94" y2="50.17" width="0.2" layer="1"/>
+<wire x1="20.93" y1="50.16" x2="20.74" y2="49.97" width="0.2" layer="1"/>
+<wire x1="20.74" y1="49.97" x2="20.74" y2="49.265" width="0.2" layer="1"/>
+<wire x1="20.74" y1="49.265" x2="20.74" y2="49.065" width="0.2" layer="1"/>
+<wire x1="27.64" y1="53.03" x2="27.24" y2="53.03" width="0.25" layer="1"/>
+<wire x1="28.3464" y1="52.13" x2="28.3464" y2="52.3236" width="0.25" layer="1"/>
+<wire x1="28.3464" y1="52.3236" x2="27.64" y2="53.03" width="0.25" layer="1"/>
+<wire x1="27.23" y1="52.19" x2="28.2864" y2="52.19" width="0.25" layer="1"/>
+<wire x1="28.2864" y1="52.19" x2="28.3464" y2="52.13" width="0.25" layer="1"/>
+<wire x1="23.31" y1="51.75" x2="21.42" y2="51.75" width="0.25" layer="1"/>
+<wire x1="21.42" y1="51.75" x2="21.335" y2="51.665" width="0.25" layer="1"/>
+<wire x1="21.335" y1="51.665" x2="20.94" y2="51.27" width="0.25" layer="1"/>
+<wire x1="20.94" y1="51.27" x2="20.94" y2="50.99" width="0.25" layer="1"/>
+<wire x1="24.895" y1="51.63" x2="24.895" y2="51.275" width="0.25" layer="1"/>
+<wire x1="24.895" y1="51.275" x2="24.47" y2="50.85" width="0.25" layer="1"/>
+<wire x1="42.353" y1="51.053" x2="42.428" y2="51.128" width="0.1524" layer="1"/>
+<wire x1="42.428" y1="51.128" x2="42.45" y2="51.15" width="0.1524" layer="1"/>
+<wire x1="42.615" y1="51.315" x2="42.948225" y2="51.648225" width="0.1524" layer="1"/>
+<wire x1="42.948225" y1="51.648225" x2="42.948225" y2="52.07" width="0.1524" layer="1"/>
+<via x="42.38" y="51.15" extent="1-16" drill="0.35"/>
+<wire x1="18.70879375" y1="49.745475" x2="18.835934375" y2="49.872615625" width="0.1524" layer="1"/>
+<wire x1="18.835934375" y1="49.872615625" x2="18.835934375" y2="50.423228125" width="0.1524" layer="1"/>
+<wire x1="18.8364125" y1="43.546171875" x2="18.8364125" y2="44.11998125" width="0.1524" layer="1"/>
+<wire x1="18.8364125" y1="44.11998125" x2="18.70689375" y2="44.2495" width="0.1524" layer="1"/>
+<wire x1="42.386" y1="51.17" x2="42.428" y2="51.128" width="0.1524" layer="1"/>
+<wire x1="42.386" y1="51.17" x2="42.531" y2="51.315" width="0.1524" layer="1"/>
+<wire x1="42.531" y1="51.315" x2="42.615" y2="51.315" width="0.1524" layer="1"/>
+<wire x1="42.615" y1="51.315" x2="42.45" y2="51.15" width="0.1524" layer="1"/>
+<wire x1="42.45" y1="51.15" x2="42.38" y2="51.15" width="0.1524" layer="1"/>
+<wire x1="19.96" y1="44.29" x2="18.94" y2="44.29" width="0.1524" layer="16"/>
+<wire x1="18.91" y1="44.26" x2="18.711225" y2="44.26" width="0.1524" layer="16"/>
+<wire x1="18.7047875" y1="44.2535625" x2="18.711225" y2="44.26" width="0.1524" layer="16"/>
+<contactref element="USBC1" pad="P_GND1"/>
+<contactref element="USBC1" pad="P_GND2"/>
+<wire x1="19.96" y1="44.29" x2="19.9195" y2="44.2495" width="0.254" layer="1"/>
+<wire x1="18.70689375" y1="44.2495" x2="19.9195" y2="44.2495" width="0.254" layer="1"/>
+<wire x1="19.96" y1="44.29" x2="20.79" y2="43.46" width="0.25" layer="1"/>
+<wire x1="20.79" y1="43.46" x2="20.99" y2="43.46" width="0.25" layer="1"/>
+<wire x1="20.99" y1="43.46" x2="21.31" y2="43.46" width="0.25" layer="1"/>
+<wire x1="21.62" y1="43.77" x2="21.31" y2="43.46" width="0.25" layer="1"/>
+<wire x1="21.62" y1="45.72" x2="21.6" y2="45.74" width="0.25" layer="1"/>
+<wire x1="20.906771875" y1="50.423228125" x2="20.94" y2="50.39" width="0.25" layer="1"/>
+<wire x1="19.96" y1="44.29" x2="20.23" y2="44.56" width="0.1524" layer="16"/>
+<wire x1="18.835934375" y1="50.423771875" x2="18.835934375" y2="49.87271875" width="0.1524" layer="16"/>
+<wire x1="18.835934375" y1="49.87271875" x2="18.7085625" y2="49.745346875" width="0.1524" layer="16"/>
+<wire x1="18.835934375" y1="50.423771875" x2="19.593771875" y2="50.423771875" width="0.1524" layer="16"/>
+<wire x1="19.593771875" y1="50.423771875" x2="19.79" y2="50.62" width="0.1524" layer="16"/>
+<wire x1="19.79" y1="50.68" x2="19.95" y2="50.84" width="0.1524" layer="16"/>
+<wire x1="19.95" y1="50.84" x2="19.8426" y2="50.9474" width="0.1524" layer="16"/>
+<wire x1="20.79" y1="51.08" x2="20.94" y2="50.93" width="0.1524" layer="1"/>
+<wire x1="19.79" y1="50.62" x2="19.79" y2="50.68" width="0.1524" layer="16"/>
+<wire x1="19.79" y1="50.68" x2="19.79" y2="53.15" width="0.1524" layer="16"/>
+<wire x1="19.79" y1="53.15" x2="19.93" y2="53.29" width="0.1524" layer="16"/>
+<via x="19.93" y="53.29" extent="1-16" drill="0.3"/>
+<wire x1="19.93" y1="53.29" x2="21.335" y2="51.885" width="0.1524" layer="1"/>
+<wire x1="21.335" y1="51.885" x2="21.335" y2="51.665" width="0.1524" layer="1"/>
+<wire x1="18.835934375" y1="50.423228125" x2="19.593228125" y2="50.423228125" width="0.1524" layer="1"/>
+<wire x1="19.593228125" y1="50.423228125" x2="19.593771875" y2="50.423771875" width="0.1524" layer="1"/>
+<via x="19.593771875" y="50.423771875" extent="1-16" drill="0.3"/>
+<wire x1="20.23" y1="49.78754375" x2="19.593771875" y2="50.423771875" width="0.1524" layer="16"/>
+<wire x1="20.23" y1="49.78754375" x2="20.23" y2="44.56" width="0.1524" layer="16"/>
+<wire x1="18.835934375" y1="43.560171875" x2="18.835934375" y2="44.185934375" width="0.1524" layer="16"/>
+<wire x1="18.835934375" y1="44.185934375" x2="18.91" y2="44.26" width="0.1524" layer="16"/>
+<wire x1="18.91" y1="44.26" x2="18.94" y2="44.29" width="0.1524" layer="16"/>
+<wire x1="21.6" y1="45.74" x2="21.6" y2="45.41" width="0.2032" layer="1"/>
+<wire x1="21.6" y1="45.41" x2="21.83" y2="45.18" width="0.2032" layer="1"/>
+<wire x1="21.83" y1="45.18" x2="21.83" y2="43.98" width="0.2032" layer="1"/>
+<wire x1="21.83" y1="43.98" x2="21.62" y2="43.77" width="0.2032" layer="1"/>
 </signal>
 <signal name="D+">
 <contactref element="USBC1" pad="A6"/>
-<wire x1="48.4625" y1="54.0125" x2="48.502275" y2="53.972725" width="0.1524" layer="1"/>
-<wire x1="48.502275" y1="53.972725" x2="49.73825625" y2="53.972725" width="0.1524" layer="1"/>
-<wire x1="49.73825625" y1="53.972725" x2="50.06098125" y2="53.65" width="0.1524" layer="1"/>
-<contactref element="D+1" pad="TP"/>
-<contactref element="ST2" pad="22"/>
-<contactref element="Z2" pad="P$3"/>
-<wire x1="52.0036" y1="53.1036" x2="52.3" y2="53.4" width="0.1524" layer="1"/>
-<wire x1="52.3" y1="53.4" x2="52.3" y2="53.8" width="0.1524" layer="1"/>
-<wire x1="52.3" y1="53.8" x2="52.95" y2="53.8" width="0.1524" layer="1"/>
-<wire x1="52.0286" y1="52.99143125" x2="52.0286" y2="51.4786" width="0.1524" layer="1"/>
-<via x="51.8" y="51.25" extent="1-16" drill="0.35"/>
-<wire x1="52.0286" y1="52.99143125" x2="52" y2="53" width="0.1524" layer="1"/>
-<wire x1="52.0286" y1="51.4786" x2="51.8" y2="51.25" width="0.1524" layer="1"/>
-<wire x1="52.1" y1="51.25" x2="51.8" y2="51.25" width="0.254" layer="16"/>
-<wire x1="51.9286" y1="52.8786" x2="51.9286" y2="53.4446875" width="0.1524" layer="1"/>
-<wire x1="51.9286" y1="53.4446875" x2="51.7232875" y2="53.65" width="0.1524" layer="1"/>
-<wire x1="50.06098125" y1="53.65" x2="51.7232875" y2="53.65" width="0.1524" layer="1"/>
-<wire x1="52" y1="53" x2="52.0536" y2="53.0536" width="0.1524" layer="1"/>
-<wire x1="51.9286" y1="52.8786" x2="52.0786" y2="53.0286" width="0.1524" layer="1"/>
-<wire x1="52.0786" y1="53.0286" x2="52.0536" y2="53.0536" width="0.1524" layer="1"/>
-<wire x1="52.0536" y1="53.0536" x2="52.0036" y2="53.1036" width="0.1524" layer="1"/>
+<contactref element="ST1" pad="22"/>
+<contactref element="Z1" pad="P$3"/>
+<wire x1="22.15" y1="45.79" x2="22.45" y2="46.09" width="0.1524" layer="1"/>
+<wire x1="22.45" y1="46.09" x2="22.45" y2="46.54" width="0.1524" layer="1"/>
+<wire x1="22.45" y1="46.54" x2="23.1" y2="46.54" width="0.1524" layer="1"/>
+<wire x1="22.15" y1="45.74" x2="22.1786" y2="45.73143125" width="0.1524" layer="1"/>
+<wire x1="22.23164375" y1="45.82164375" x2="21.3532875" y2="46.7" width="0.1524" layer="1"/>
+<wire x1="22.15" y1="45.74" x2="22.15" y2="45.79" width="0.1524" layer="1"/>
+<wire x1="22.15" y1="45.74" x2="22.23164375" y2="45.82164375" width="0.1524" layer="1"/>
+<wire x1="18.711084375" y1="46.74309375" x2="18.711084375" y2="46.83" width="0.1524" layer="1"/>
+<wire x1="21.3532875" y1="46.7" x2="20.60955625" y2="46.7" width="0.1524" layer="1"/>
+<wire x1="20.60955625" y1="46.7" x2="20.22795625" y2="47.0816" width="0.1524" layer="1"/>
+<wire x1="20.22795625" y1="47.0816" x2="19.74004375" y2="47.0816" width="0.1524" layer="1"/>
+<wire x1="19.74004375" y1="47.0816" x2="19.47844375" y2="46.82" width="0.1524" layer="1"/>
+<wire x1="19.47844375" y1="46.82" x2="18.787990625" y2="46.82" width="0.1524" layer="1"/>
+<wire x1="18.711084375" y1="46.74309375" x2="18.787990625" y2="46.82" width="0.1524" layer="1"/>
 </signal>
 <signal name="D-">
 <contactref element="USBC1" pad="A7"/>
-<via x="50.20254375" y="54.3774" extent="1-16" drill="0.3"/>
-<wire x1="50.9276875" y1="55.10254375" x2="50.20254375" y2="55.10254375" width="0.1524" layer="16"/>
-<wire x1="50.06744375" y1="54.5125" x2="48.4625" y2="54.5125" width="0.1524" layer="1"/>
-<contactref element="D-1" pad="TP"/>
-<contactref element="ST2" pad="21"/>
-<contactref element="Z2" pad="P$4"/>
-<wire x1="52.172728125" y1="54.477271875" x2="52.59375" y2="54.3" width="0.1524" layer="1"/>
-<wire x1="51.8" y1="54.7" x2="51.227196875" y2="54.127196875" width="0.1524" layer="1"/>
-<wire x1="50.45255625" y1="54.1273875" x2="51.227196875" y2="54.127196875" width="0.1524" layer="1"/>
-<wire x1="50.9276875" y1="55.10254375" x2="50.30254375" y2="55.10254375" width="0.1524" layer="16"/>
-<wire x1="50.30254375" y1="55.10254375" x2="50.6" y2="55.4" width="0.1524" layer="16"/>
-<wire x1="52.59375" y1="54.3" x2="52.95" y2="54.3" width="0.1524" layer="1"/>
-<wire x1="51.95" y1="54.7" x2="52.172728125" y2="54.477271875" width="0.1524" layer="1"/>
-<wire x1="51.95" y1="54.7" x2="51.8" y2="54.7" width="0.1524" layer="1"/>
-<wire x1="50.20254375" y1="54.3774" x2="50.45255625" y2="54.1273875" width="0.1524" layer="1"/>
-<wire x1="50.20254375" y1="54.3774" x2="50.06744375" y2="54.5125" width="0.1524" layer="1"/>
-<wire x1="50.20254375" y1="54.3774" x2="50.20254375" y2="55.00254375" width="0.1524" layer="16"/>
-<wire x1="50.20254375" y1="55.00254375" x2="50.6" y2="55.4" width="0.1524" layer="16"/>
+<contactref element="ST1" pad="21"/>
+<contactref element="Z1" pad="P$4"/>
+<wire x1="22.322728125" y1="47.217271875" x2="22.74375" y2="47.04" width="0.1524" layer="1"/>
+<wire x1="22.74375" y1="47.04" x2="23.1" y2="47.04" width="0.1524" layer="1"/>
+<wire x1="22.1" y1="47.44" x2="22.322728125" y2="47.217271875" width="0.1524" layer="1"/>
+<wire x1="22" y1="47.44" x2="22.1" y2="47.44" width="0.1524" layer="1"/>
+<wire x1="22" y1="47.44" x2="21.5173625" y2="46.9573625" width="0.1524" layer="1"/>
+<wire x1="18.716765625" y1="47.235125" x2="18.706765625" y2="47.245125" width="0.1524" layer="1"/>
+<wire x1="20.87" y1="46.9573625" x2="21.5173625" y2="46.9573625" width="0.1524" layer="1"/>
+<wire x1="18.801640625" y1="47.34" x2="18.706765625" y2="47.245125" width="0.1524" layer="1"/>
+<wire x1="20.87" y1="46.9573625" x2="20.55" y2="47.2773625" width="0.1524" layer="1"/>
+<wire x1="18.864278125" y1="47.2773625" x2="18.801640625" y2="47.34" width="0.1524" layer="1"/>
+<wire x1="20.55" y1="47.2773625" x2="20.39140625" y2="47.2773625" width="0.1524" layer="1"/>
+<wire x1="20.39140625" y1="47.2773625" x2="20.33316875" y2="47.3356" width="0.1524" layer="1"/>
+<wire x1="19.63483125" y1="47.3356" x2="19.57659375" y2="47.2773625" width="0.1524" layer="1"/>
+<wire x1="19.57659375" y1="47.2773625" x2="18.864278125" y2="47.2773625" width="0.1524" layer="1"/>
+<wire x1="20.33316875" y1="47.3356" x2="19.63483125" y2="47.3356" width="0.1524" layer="1"/>
 </signal>
 <signal name="N$1">
 <contactref element="USBC1" pad="A5"/>
 <contactref element="R2" pad="1"/>
-<wire x1="48.4625" y1="53.5125" x2="49.5875" y2="53.5125" width="0.1524" layer="1"/>
-<wire x1="51.2464" y1="50.9206875" x2="52.026140625" y2="50.140946875" width="0.1524" layer="1"/>
-<wire x1="52.026140625" y1="50.140946875" x2="52.01463125" y2="49.81463125" width="0.1524" layer="1"/>
-<wire x1="51.2464" y1="51.4" x2="51.2464" y2="50.9206875" width="0.1524" layer="1"/>
-<wire x1="49.5875" y1="53.5125" x2="49.8" y2="53.3" width="0.1524" layer="1"/>
-<wire x1="50.8" y1="51.4" x2="51.2464" y2="51.4" width="0.1524" layer="1"/>
-<wire x1="49.8" y1="53.3" x2="49.8" y2="52.4" width="0.1524" layer="1"/>
-<wire x1="49.8" y1="52.4" x2="50.8" y2="51.4" width="0.1524" layer="1"/>
-<wire x1="52.01463125" y1="49.81463125" x2="51.6" y2="49.4" width="0.1524" layer="1"/>
+<wire x1="18.71091875" y1="46.246771875" x2="18.802465625" y2="46.155225" width="0.1524" layer="1"/>
+<wire x1="20.99" y1="44.75" x2="20.99" y2="44.66" width="0.1524" layer="1"/>
+<wire x1="20.003240625" y1="46.286771875" x2="18.75091875" y2="46.286771875" width="0.1524" layer="1"/>
+<wire x1="18.71091875" y1="46.246771875" x2="18.75091875" y2="46.286771875" width="0.1524" layer="1"/>
+<wire x1="20.85" y1="44.75" x2="20.99" y2="44.75" width="0.1524" layer="1"/>
+<wire x1="20.43983125" y1="45.85018125" x2="20.43983125" y2="45.16016875" width="0.1524" layer="1"/>
+<wire x1="20.43983125" y1="45.16016875" x2="20.85" y2="44.75" width="0.1524" layer="1"/>
+<wire x1="20.003240625" y1="46.286771875" x2="20.43983125" y2="45.85018125" width="0.1524" layer="1"/>
 </signal>
 <signal name="+3V3">
-<contactref element="3V1" pad="TP"/>
+<contactref element="3V2" pad="TP"/>
 <contactref element="R1" pad="2"/>
-<contactref element="C10" pad="1"/>
+<contactref element="C5" pad="1"/>
+<contactref element="C4" pad="1"/>
+<contactref element="ST1" pad="17"/>
+<contactref element="L3" pad="1"/>
+<wire x1="23.54" y1="43.22" x2="23.69" y2="43.32" width="0.254" layer="1"/>
+<contactref element="C13" pad="1"/>
+<contactref element="C6" pad="1"/>
+<contactref element="ST1" pad="1"/>
+<contactref element="ST1" pad="5"/>
+<wire x1="27.75" y1="43.94" x2="27.7" y2="43.94" width="0.2032" layer="1"/>
+<wire x1="28.575" y1="45.265" x2="28.3" y2="45.54" width="0.2032" layer="1"/>
+<wire x1="28.3" y1="45.54" x2="27.8" y2="45.54" width="0.2032" layer="1"/>
+<wire x1="27.8" y1="47.54" x2="28.5" y2="47.54" width="0.2032" layer="1"/>
+<wire x1="28.5" y1="47.54" x2="29.25" y2="46.79" width="0.2032" layer="1"/>
+<wire x1="29.25" y1="45.59" x2="29.25" y2="46.79" width="0.2032" layer="1"/>
+<via x="23.55" y="44.15" extent="1-16" drill="0.35"/>
+<wire x1="23.65" y1="43.71" x2="24.7844" y2="42.5756" width="0.254" layer="16"/>
+<via x="27.98" y="43.41" extent="1-16" drill="0.35"/>
+<wire x1="23.69" y1="43.83" x2="23.75" y2="43.89" width="0.254" layer="1"/>
+<wire x1="23.69" y1="43.83" x2="23.69" y2="43.32" width="0.254" layer="1"/>
+<wire x1="23.75" y1="43.89" x2="23.75" y2="43.95" width="0.254" layer="1"/>
+<wire x1="23.75" y1="43.95" x2="23.55" y2="44.15" width="0.254" layer="1"/>
+<wire x1="29.66" y1="42.89" x2="29.46" y2="42.89" width="0.254" layer="16"/>
+<wire x1="22.08" y1="48.3" x2="22.127171875" y2="49.1163125" width="0.254" layer="1"/>
+<wire x1="22.341059375" y1="49.04" x2="22.1" y2="49.225" width="0.254" layer="1"/>
+<wire x1="22.341059375" y1="49.04" x2="23.1" y2="49.04" width="0.254" layer="1"/>
+<wire x1="22.099996875" y1="49.289996875" x2="22.55" y2="49.74" width="0.254" layer="1"/>
+<wire x1="22.55" y1="49.74" x2="22.9" y2="50.09" width="0.254" layer="1"/>
+<wire x1="22.1" y1="49.225" x2="22.185" y2="49.225" width="0.254" layer="1"/>
+<via x="23.28" y="50.59" extent="1-16" drill="0.35"/>
+<wire x1="23.6" y1="48.14" x2="23.28" y2="48.46" width="0.254" layer="16"/>
+<wire x1="23.28" y1="50.59" x2="23.28" y2="48.46" width="0.254" layer="16"/>
+<wire x1="23.6" y1="48.14" x2="23.6" y2="44.4" width="0.254" layer="16"/>
+<wire x1="23.28" y1="50.325" x2="22.18" y2="49.225" width="0.254" layer="1"/>
+<wire x1="22.1" y1="49.225" x2="22.18" y2="49.225" width="0.254" layer="1"/>
+<wire x1="23.28" y1="50.59" x2="23.28" y2="50.325" width="0.254" layer="1"/>
+<contactref element="Z1" pad="P$5"/>
+<wire x1="21.70376875" y1="48.04376875" x2="22.10465625" y2="48.212234375" width="0.254" layer="1"/>
+<wire x1="22.10465625" y1="48.212234375" x2="22.08" y2="48.3" width="0.254" layer="1"/>
+<wire x1="22.127171875" y1="49.1163125" x2="22.1" y2="49.225" width="0.254" layer="1"/>
+<wire x1="22.1" y1="49.225" x2="22.099996875" y2="49.289996875" width="0.254" layer="1"/>
+<contactref element="ST1" pad="31"/>
+<wire x1="26.7" y1="44.94" x2="26.6357" y2="44.9257" width="0.1524" layer="1"/>
+<wire x1="27.7" y1="43.94" x2="28.575" y2="44.815" width="0.254" layer="1"/>
+<wire x1="28.575" y1="44.815" x2="28.575" y2="45.265" width="0.254" layer="1"/>
+<wire x1="27.2" y1="43.89" x2="27.24" y2="43.93" width="0.254" layer="1"/>
+<wire x1="27.25" y1="43.94" x2="27.7" y2="43.94" width="0.254" layer="1"/>
+<wire x1="27.1" y1="43.84" x2="27.55" y2="43.84" width="0.254" layer="1"/>
+<wire x1="27.55" y1="43.84" x2="27.98" y2="43.41" width="0.254" layer="1"/>
+<wire x1="27.1" y1="42.99" x2="27.1" y2="43.84" width="0.254" layer="1"/>
+<wire x1="27.155" y1="44.015" x2="27.24" y2="43.93" width="0.1524" layer="1"/>
+<wire x1="27.1" y1="43.84" x2="27.2" y2="43.89" width="0.254" layer="1"/>
+<wire x1="23.55" y1="44.15" x2="23.65" y2="44.15" width="0.254" layer="16"/>
+<wire x1="23.65" y1="44.15" x2="23.65" y2="43.71" width="0.254" layer="16"/>
+<contactref element="N1" pad="P2"/>
+<wire x1="29.1" y1="45.34" x2="29.15" y2="45.34" width="0.3048" layer="1"/>
+<wire x1="29.1" y1="45.34" x2="28.575" y2="44.815" width="0.3048" layer="1"/>
+<wire x1="29.15" y1="45.34" x2="29.15" y2="45.49" width="0.3048" layer="1"/>
+<wire x1="29.15" y1="45.49" x2="29.25" y2="45.59" width="0.3048" layer="1"/>
+<wire x1="23.75" y1="43.89" x2="23.75" y2="43.43468125" width="0.3048" layer="1"/>
+<contactref element="N1" pad="P1"/>
+<wire x1="24.245" y1="51.63" x2="22.9" y2="50.285" width="0.254" layer="1"/>
+<wire x1="22.9" y1="50.285" x2="22.9" y2="50.09" width="0.254" layer="1"/>
+<wire x1="23.55" y1="44.15" x2="23.6" y2="44.4" width="0.3048" layer="16"/>
+<wire x1="43.986" y1="50.57" x2="43.986" y2="50.07" width="0.3048" layer="1"/>
+<wire x1="21.1" y1="47.44" x2="21.96" y2="48.3" width="0.254" layer="1"/>
+<wire x1="21.96" y1="48.3" x2="22.08" y2="48.3" width="0.254" layer="1"/>
+<contactref element="C3" pad="1"/>
+<contactref element="C7" pad="1"/>
+<contactref element="C8" pad="1"/>
 <contactref element="C9" pad="1"/>
-<contactref element="ST2" pad="17"/>
-<contactref element="L4" pad="1"/>
-<wire x1="53.25" y1="50.1" x2="53.4" y2="50.2" 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.6" y1="51.2" x2="57.55" y2="51.2" width="0.2032" layer="1"/>
-<wire x1="58.5" y1="52.45" x2="58.425" y2="52.525" width="0.2032" layer="1"/>
-<wire x1="58.425" y1="52.525" x2="58.15" y2="52.8" width="0.2032" layer="1"/>
-<wire x1="58.15" y1="52.8" x2="57.65" y2="52.8" width="0.2032" layer="1"/>
-<wire x1="57.65" y1="54.8" x2="58.35" y2="54.8" width="0.2032" layer="1"/>
-<wire x1="58.35" y1="54.8" x2="58.5" y2="54.65" width="0.2032" layer="1"/>
-<wire x1="58.5" y1="54.65" x2="58.5" y2="52.45" width="0.2032" layer="1"/>
-<via x="53.9" y="49.15" extent="1-16" drill="0.35"/>
-<wire x1="57.22875625" y1="47.6356" x2="57.9" y2="48.30684375" width="0.254" layer="16"/>
-<wire x1="53.9" y1="49.1" x2="55.3644" y2="47.6356" width="0.254" layer="16"/>
-<wire x1="55.3644" y1="47.6356" x2="57.22875625" y2="47.6356" width="0.254" layer="16"/>
-<wire x1="57.9" y1="48.30684375" x2="57.9" y2="50" width="0.254" layer="16"/>
-<via x="58.55" y="50.65" extent="1-16" drill="0.35"/>
-<wire x1="53.9" y1="49.15" x2="53.35" y2="49.7" width="0.254" layer="1"/>
-<wire x1="53.35" y1="49.7" x2="53.4" y2="50.2" width="0.254" layer="1"/>
-<wire x1="50.15" y1="49.15" x2="53.05" y2="49.15" width="0.254" layer="16"/>
-<wire x1="53.05" y1="49.15" x2="53.9" y2="49.15" width="0.254" layer="16"/>
-<wire x1="48.95" y1="47.95" x2="50.15" y2="49.15" width="0.254" layer="16"/>
-<wire x1="51.69" y1="55.56" x2="51.74" y2="56.425" width="0.254" layer="1"/>
-<wire x1="51.945" y1="56.3" x2="51.73" y2="56.465" width="0.254" layer="1"/>
-<wire x1="51.945" y1="56.3" x2="52.95" y2="56.3" width="0.254" layer="1"/>
-<wire x1="51.865" y1="56.465" x2="53" y2="57.6" width="0.254" layer="1"/>
-<wire x1="53.25" y1="57.85" x2="53.6" y2="57.85" width="0.254" layer="1"/>
-<wire x1="53.6" y1="57.85" x2="53.75" y2="58" width="0.254" layer="1"/>
-<wire x1="53.75" y1="58" x2="53.75" y2="58.425" width="0.254" layer="1"/>
-<wire x1="51.73" y1="56.465" x2="51.78" y2="57.18" width="0.254" layer="1"/>
-<wire x1="51.78" y1="57.18" x2="52.2" y2="57.6" width="0.254" layer="1"/>
-<via x="52.2" y="57.6" extent="1-16" drill="0.35"/>
-<wire x1="52.2" y1="57.6" x2="53.05" y2="56.75" width="0.254" layer="16"/>
-<wire x1="53.05" y1="56.75" x2="53.05" y2="49.15" width="0.254" layer="16"/>
-<wire x1="52.2" y1="57.6" x2="53" y2="57.6" width="0.254" layer="1"/>
-<wire x1="53" y1="57.6" x2="53.25" y2="57.85" width="0.254" layer="1"/>
-<contactref element="Z2" pad="P$5"/>
-<wire x1="51.55376875" y1="55.30376875" x2="51.74" y2="55.382028125" width="0.254" layer="1"/>
-<wire x1="51.74" y1="55.382028125" x2="51.69" y2="55.56" width="0.254" layer="1"/>
-<wire x1="51.74" y1="56.425" x2="51.73" y2="56.465" width="0.254" layer="1"/>
-<wire x1="48.95" y1="47.95" x2="48.95" y2="47.8" width="0.254" layer="16"/>
-<wire x1="51.73" y1="56.465" x2="51.865" y2="56.465" width="0.254" layer="1"/>
-<wire x1="50.95" y1="54.7" x2="51.55376875" y2="55.30376875" width="0.254" layer="1"/>
-<contactref element="ST2" pad="31"/>
-<wire x1="56.55" y1="52.2" x2="56.4857" y2="52.1857" width="0.1524" layer="1"/>
-<wire x1="57.55" y1="51.2" x2="58.425" y2="52.075" width="0.254" layer="1"/>
-<wire x1="58.425" y1="52.075" x2="58.425" y2="52.525" width="0.254" layer="1"/>
-<wire x1="57.1" y1="51.2" x2="57.2" y2="51.3" width="0.254" layer="1"/>
-<wire x1="57.05" y1="51.15" x2="57.1" y2="51.2" width="0.254" layer="1"/>
-<wire x1="57.1" y1="51.2" x2="57.55" y2="51.2" width="0.254" layer="1"/>
-<wire x1="56.95" y1="51.1" x2="58.1" y2="51.1" width="0.254" layer="1"/>
-<wire x1="58.1" y1="51.1" x2="58.55" y2="50.65" width="0.254" layer="1"/>
-<wire x1="56.95" y1="50.25" x2="56.95" y2="51.1" width="0.254" layer="1"/>
-<wire x1="56.55" y1="52.2" x2="56.55" y2="51.95" width="0.1524" layer="1"/>
-<wire x1="56.55" y1="51.95" x2="57.2" y2="51.3" width="0.1524" layer="1"/>
-<wire x1="56.95" y1="51.1" x2="57.05" y2="51.15" width="0.254" layer="1"/>
-<wire x1="53.9" y1="49.15" x2="53.9" y2="49.1" width="0.254" layer="16"/>
-<wire x1="57.9" y1="50" x2="58.55" y2="50.65" width="0.254" layer="16"/>
+<wire x1="23.75" y1="43.43468125" x2="24.53" y2="42.65468125" width="0.3048" layer="1"/>
+<wire x1="24.53" y1="42.65468125" x2="24.53" y2="41.12" width="0.3048" layer="1"/>
+<wire x1="24.53" y1="41.12" x2="25.58" y2="40.07" width="0.3048" layer="1"/>
+<wire x1="27.33" y1="40.07" x2="27.35" y2="40.05" width="0.3048" layer="1"/>
+<wire x1="27.33" y1="40.07" x2="25.58" y2="40.07" width="0.3048" layer="1"/>
+<wire x1="27.35" y1="40.05" x2="39.33" y2="40.05" width="0.3048" layer="1"/>
+<wire x1="26.7" y1="44.94" x2="26.7" y2="44.47" width="0.254" layer="1"/>
+<wire x1="26.7" y1="44.47" x2="27.155" y2="44.015" width="0.254" layer="1"/>
+<wire x1="27.1" y1="42.99" x2="27.1" y2="42.24" width="0.254" layer="1"/>
+<wire x1="27.1" y1="42.24" x2="27.22" y2="42.12" width="0.254" layer="1"/>
+<wire x1="27.2" y1="41.25" x2="27.2" y2="42.1" width="0.254" layer="1"/>
+<wire x1="27.2" y1="42.1" x2="27.22" y2="42.12" width="0.254" layer="1"/>
+<wire x1="22.14" y1="50.99" x2="22.14" y2="50.17" width="0.2" layer="1"/>
+<wire x1="22.14" y1="50.17" x2="22.13" y2="50.16" width="0.2" layer="1"/>
+<wire x1="22.13" y1="50.16" x2="22.55" y2="49.74" width="0.2" layer="1"/>
+<wire x1="44.57" y1="45.29" x2="44.57" y2="48.82" width="0.3048" layer="1"/>
+<wire x1="39.33" y1="40.05" x2="44.57" y2="45.29" width="0.3048" layer="1"/>
+<wire x1="44.57" y1="48.82" x2="43.986" y2="49.404" width="0.3048" layer="1"/>
+<wire x1="43.986" y1="50.07" x2="43.986" y2="49.404" width="0.3048" layer="1"/>
+<wire x1="43.9388" y1="50.59" x2="43.9388" y2="50.11590625" width="0.3048" layer="1"/>
+<wire x1="27.1" y1="43.84" x2="27.15" y2="43.84" width="0.1524" layer="1"/>
+<wire x1="27.15" y1="43.84" x2="27.25" y2="43.94" width="0.1524" layer="1"/>
+<wire x1="43.986" y1="50.57" x2="43.9588" y2="50.57" width="0.1524" layer="1"/>
+<wire x1="43.9588" y1="50.57" x2="43.9388" y2="50.59" width="0.1524" layer="1"/>
+<wire x1="24.7844" y1="42.5756" x2="27.1456" y2="42.5756" width="0.25" layer="16"/>
+<wire x1="27.1456" y1="42.5756" x2="27.98" y2="43.41" width="0.25" layer="16"/>
+<wire x1="27.98" y1="43.41" x2="28.5" y2="42.89" width="0.1524" layer="16"/>
+<wire x1="28.5" y1="42.89" x2="29.66" y2="42.89" width="0.1524" layer="16"/>
 </signal>
-<signal name="N$8">
+<signal name="N$2">
 <contactref element="R1" pad="1"/>
-<contactref element="L2" pad="P$4"/>
-<wire x1="65.2" y1="54.7" x2="65.3" y2="54.7" width="0.1524" layer="1"/>
-<via x="65.2" y="54.7" extent="1-16" drill="0.3"/>
-<via x="66.3" y="48.15" extent="1-16" drill="0.2032"/>
-<wire x1="65.35" y1="54.7" x2="65.2" y2="54.7" width="0.2" layer="16"/>
-<wire x1="54.6" y1="50.2" x2="56.65" y2="48.2" width="0.254" layer="1"/>
-<wire x1="56.65" y1="48.2" x2="66.25" y2="48.2" width="0.254" layer="1"/>
-<wire x1="66.3" y1="48.15" x2="66.3" y2="53.75" width="0.254" layer="16"/>
-<wire x1="66.3" y1="53.75" x2="65.35" y2="54.7" width="0.254" layer="16"/>
-<wire x1="66.25" y1="48.2" x2="66.3" y2="48.15" width="0.254" layer="1"/>
+<via x="40.83" y="42.88" extent="1-16" drill="0.3"/>
+<wire x1="35.35" y1="47.44" x2="37.87" y2="47.44" width="0.2" layer="16"/>
+<wire x1="41.35" y1="43.96" x2="41.35" y2="42.99" width="0.254" layer="16"/>
+<wire x1="41.35" y1="42.99" x2="40.83" y2="42.99" width="0.254" layer="16"/>
+<wire x1="40.83" y1="42.88" x2="40.83" y2="42.99" width="0.254" layer="16"/>
+<wire x1="41.35" y1="43.96" x2="37.87" y2="47.44" width="0.254" layer="16"/>
+<wire x1="40.83" y1="42.88" x2="40.83" y2="42.99" width="0.2032" layer="1"/>
+<wire x1="40.83" y1="42.99" x2="40.76" y2="43.06" width="0.2032" layer="1"/>
+<wire x1="40.815" y1="42.895" x2="40.83" y2="42.88" width="0.2032" layer="1"/>
+<wire x1="40.815" y1="42.895" x2="38.92" y2="41" width="0.2032" layer="1"/>
+<wire x1="28.94736875" y1="41" x2="38.92" y2="41" width="0.2032" layer="1"/>
+<wire x1="24.89" y1="43.32" x2="24.89" y2="42.8812125" width="0.2" layer="1"/>
+<wire x1="24.89" y1="42.8812125" x2="25.3824" y2="42.3888125" width="0.2" layer="1"/>
+<wire x1="25.3824" y1="40.8682375" x2="25.77031875" y2="40.48031875" width="0.2" layer="1"/>
+<wire x1="25.3824" y1="42.3888125" x2="25.3824" y2="40.8682375" width="0.2" layer="1"/>
+<wire x1="25.77031875" y1="40.48031875" x2="28.4276875" y2="40.48031875" width="0.2" layer="1"/>
+<wire x1="28.4276875" y1="40.48031875" x2="28.94736875" y2="41" width="0.2" layer="1"/>
+<contactref element="L1" pad="P$4"/>
+<via x="35.36" y="47.44" extent="1-16" drill="0.3"/>
+<wire x1="35.36" y1="47.45" x2="35.36" y2="47.44" width="0.1524" layer="1"/>
+<wire x1="35.36" y1="47.44" x2="35.35" y2="47.44" width="0.1524" layer="16"/>
 </signal>
 <signal name="SWCLK">
-<contactref element="SWCLK1" pad="TP"/>
-<contactref element="ST2" pad="24"/>
-<via x="53.85" y="47.9" extent="1-16" drill="0.35"/>
-<wire x1="53.85" y1="47.9" x2="53.85" y2="48.35" width="0.1524" layer="1"/>
-<wire x1="53.85" y1="48.35" x2="52.8" y2="49.4" width="0.1524" layer="1"/>
-<wire x1="52.8" y1="49.4" x2="52.8" y2="52" width="0.1524" layer="1"/>
-<wire x1="52.8" y1="52" x2="52.90769375" y2="52.10769375" width="0.1524" layer="1"/>
-<wire x1="53.9" y1="47.9" x2="53.75" y2="47.75" width="0.254" layer="16"/>
-<wire x1="53.9" y1="47.9" x2="53.85" y2="47.9" width="0.254" layer="16"/>
-<wire x1="52.90769375" y1="52.75769375" x2="52.95" y2="52.8" width="0.1524" layer="1"/>
-<wire x1="52.90769375" y1="52.10769375" x2="52.90769375" y2="52.75769375" width="0.1524" layer="1"/>
-</signal>
-<signal name="N$13">
-<via x="72.85" y="54.25" extent="1-16" drill="4.25"/>
+<contactref element="SWCLK2" pad="TP"/>
+<contactref element="ST1" pad="24"/>
+<via x="23.366" y="42.43" extent="1-16" drill="0.35"/>
+<wire x1="23.366" y1="42.43" x2="23.316" y2="42.48" width="0.1524" layer="16"/>
+<wire x1="22.944" y1="45.384" x2="22.944" y2="42.852" width="0.1524" layer="1"/>
+<wire x1="23.366" y1="42.43" x2="22.944" y2="42.852" width="0.1524" layer="1"/>
+<wire x1="22.944" y1="45.384" x2="23.1" y2="45.54" width="0.1524" layer="1"/>
+<wire x1="23.366" y1="42.43" x2="23.456" y2="42.34" width="0.254" layer="16"/>
+<wire x1="23.456" y1="42.34" x2="23.65" y2="42.34" 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.55" y1="52.2" x2="55.5286" y2="52.1874125" width="0.1524" layer="1"/>
-<wire x1="55.5286" y1="52.1874125" x2="55.5286" y2="51.88166875" width="0.1524" layer="1"/>
-<wire x1="55.5286" y1="51.88166875" x2="54.898465625" y2="51.251534375" width="0.1524" layer="1"/>
-<via x="54.798465625" y="51.251534375" extent="1-16" drill="0.35"/>
-<wire x1="54.5" y1="51.3" x2="54.548465625" y2="51.251534375" width="0.1524" layer="16"/>
-<wire x1="54.548465625" y1="51.251534375" x2="54.798465625" y2="51.251534375" width="0.1524" layer="16"/>
-<wire x1="54.898465625" y1="51.251534375" x2="54.798465625" y2="51.251534375" width="0.1524" layer="1"/>
-</signal>
-<signal name="SRX&lt;-">
-<contactref element="SRX&lt;-1" pad="TP"/>
-<contactref element="ST2" pad="30"/>
-<wire x1="56.05" y1="52.2" x2="56.0714" y2="52.2286" width="0.1524" layer="1"/>
-<via x="59.3" y="49.25" extent="1-16" drill="0.35"/>
-<wire x1="56.0714" y1="51.94754375" x2="56.4452" y2="51.57374375" width="0.1524" layer="1"/>
-<wire x1="56.4452" y1="51.57374375" x2="56.4452" y2="49.8815125" width="0.1524" layer="1"/>
-<wire x1="56.0714" y1="52.2286" x2="56.0714" y2="51.94754375" width="0.1524" layer="1"/>
-<wire x1="56.4452" y1="49.8815125" x2="57.0767125" y2="49.25" width="0.1524" layer="1"/>
-<wire x1="57.0767125" y1="49.25" x2="59.3" y2="49.25" width="0.1524" layer="1"/>
-<wire x1="59.3" y1="49.25" x2="59.9" y2="49.85" width="0.1524" layer="16"/>
-<wire x1="59.9" y1="49.85" x2="59.9" y2="49.9" width="0.1524" layer="16"/>
+<contactref element="STX-&gt;2" pad="TP"/>
+<contactref element="ST1" pad="29"/>
+<wire x1="25.7" y1="44.94" x2="25.6786" y2="44.9274125" width="0.1524" layer="1"/>
+<wire x1="25.6786" y1="44.9274125" x2="25.6786" y2="44.57166875" width="0.1524" layer="1"/>
+<wire x1="25.6786" y1="44.57166875" x2="25.258465625" y2="44.151534375" width="0.1524" layer="1"/>
+<wire x1="25.258465625" y1="44.151534375" x2="24.958465625" y2="44.151534375" width="0.1524" layer="1"/>
+<wire x1="24.85693125" y1="44.05" x2="24.958465625" y2="44.151534375" width="0.1524" layer="1"/>
+<via x="24.958465625" y="44.151534375" extent="1-16" drill="0.3"/>
+<wire x1="24.91" y1="44.3" x2="24.958465625" y2="44.151534375" width="0.1524" layer="16"/>
 </signal>
 <signal name="SWDIO">
-<contactref element="ST2" pad="23"/>
-<contactref element="SWDIO1" pad="TP"/>
-<wire x1="52.95" y1="53.3" x2="52.9786" y2="53.2786" width="0.1524" layer="1"/>
-<wire x1="52.9786" y1="53.2786" x2="52.63166875" y2="53.2786" width="0.1524" layer="1"/>
-<wire x1="52.63166875" y1="53.2786" x2="52.4214" y2="53.06833125" width="0.1524" layer="1"/>
-<wire x1="51.5" y1="47.95" x2="51.5" y2="48" width="0.1524" layer="16"/>
-<wire x1="52.4214" y1="53.06833125" x2="52.4214" y2="48.7714" width="0.1524" layer="1"/>
-<wire x1="52.4214" y1="48.7714" x2="51.6" y2="47.95" width="0.1524" layer="1"/>
-<via x="51.6" y="47.95" extent="1-16" drill="0.35"/>
-<wire x1="51.5" y1="47.95" x2="51.6" y2="47.95" width="0.1524" layer="16"/>
+<contactref element="ST1" pad="23"/>
+<contactref element="SWDIO2" pad="TP"/>
+<via x="19.22" y="39.94" extent="1-16" drill="0.35"/>
+<wire x1="19.22" y1="39.94" x2="18.6" y2="39.94" width="0.1524" layer="16"/>
+<wire x1="18.16" y1="40.38" x2="18.6" y2="39.94" width="0.1524" layer="16"/>
+<wire x1="23.1" y1="46.04" x2="22.9278" y2="45.8678" width="0.1524" layer="1"/>
+<wire x1="22.9278" y1="45.8678" x2="22.7527125" y2="45.8678" width="0.1524" layer="1"/>
+<wire x1="22.7527125" y1="45.8678" x2="22.54" y2="45.6550875" width="0.1524" layer="1"/>
+<wire x1="22.54" y1="45.6550875" x2="22.54" y2="41.87" width="0.1524" layer="1"/>
+<wire x1="22.54" y1="41.87" x2="20.61" y2="41.87" width="0.1524" layer="1"/>
+<wire x1="20.61" y1="41.87" x2="19.22" y2="40.48" width="0.1524" layer="1"/>
+<wire x1="19.22" y1="40.48" x2="19.22" y2="39.94" width="0.1524" layer="1"/>
 </signal>
-<signal name="SWO">
-<contactref element="ST2" pad="26"/>
-<contactref element="SWO1" pad="TP"/>
-<wire x1="54.0214" y1="52.2214" x2="54.0214" y2="52.03166875" width="0.1524" layer="1"/>
-<wire x1="54.0214" y1="52.03166875" x2="54.05" y2="52.00306875" width="0.1524" layer="1"/>
-<wire x1="54.05" y1="52.2" x2="54.0214" y2="52.2214" width="0.1524" layer="1"/>
-<wire x1="54.05" y1="52.2" x2="54.05" y2="49.85" width="0.1524" layer="1"/>
-<wire x1="54.05" y1="49.85" x2="55.05" y2="48.85" width="0.1524" layer="1"/>
-<via x="55.05" y="48.85" extent="1-16" drill="0.3"/>
-<wire x1="55.05" y1="48.85" x2="56.4" y2="48.85" width="0.1524" layer="16"/>
-<wire x1="56.4" y1="48.85" x2="56.5" y2="48.95" width="0.1524" layer="16"/>
+<signal name="N$3">
+<contactref element="ST1" pad="8"/>
+<wire x1="27.8" y1="49.04" x2="28.5" y2="49.04" width="0.1524" layer="1"/>
+<wire x1="28.5" y1="49.04" x2="28.7" y2="49.24" width="0.1524" layer="1"/>
+<via x="28.7" y="49.24" extent="1-16" drill="0.3"/>
+<wire x1="28.7" y1="49.24" x2="28.78" y2="49.24" width="0.1524" layer="16"/>
+<via x="35.34" y="46.6" extent="1-16" drill="0.3"/>
+<wire x1="28.7" y1="49.24" x2="29.1714" y2="48.7686" width="0.1524" layer="16"/>
+<wire x1="29.1714" y1="48.7686" x2="29.1714" y2="48.48104375" width="0.1524" layer="16"/>
+<wire x1="29.1714" y1="48.48104375" x2="31.66244375" y2="45.99" width="0.1524" layer="16"/>
+<wire x1="31.66244375" y1="45.99" x2="35.24" y2="45.99" width="0.1524" layer="16"/>
+<wire x1="35.24" y1="45.99" x2="35.24" y2="46.24" width="0.1524" layer="16"/>
+<contactref element="L1" pad="P$3"/>
+<wire x1="35.24" y1="46.24" x2="35.34" y2="46.34" width="0.1524" layer="16"/>
+<wire x1="35.34" y1="46.34" x2="35.34" y2="46.6" width="0.1524" layer="16"/>
+<wire x1="35.36" y1="46.6" x2="35.34" y2="46.6" width="0.1524" layer="1"/>
+</signal>
+<signal name="N$4">
+<contactref element="ST1" pad="9"/>
+<wire x1="27.2" y1="50.04" x2="27.55" y2="50.39" width="0.1524" layer="1"/>
+<wire x1="28.61" y1="50.39" x2="28.61" y2="50.37" width="0.1524" layer="1"/>
+<wire x1="28.61" y1="50.39" x2="27.55" y2="50.39" width="0.1524" layer="1"/>
+<via x="28.61" y="50.37" extent="1-16" drill="0.35"/>
+<wire x1="27.2" y1="49.64" x2="27.2" y2="50.04" width="0.1524" layer="1"/>
+<via x="34.51" y="46.6" extent="1-16" drill="0.3"/>
+<contactref element="L1" pad="P$2"/>
+<wire x1="28.61" y1="50.37" x2="29.8014" y2="49.1786" width="0.1524" layer="16"/>
+<wire x1="29.8014" y1="49.1786" x2="29.8014" y2="48.62104375" width="0.1524" layer="16"/>
+<wire x1="29.8014" y1="48.62104375" x2="31.82244375" y2="46.6" width="0.1524" layer="16"/>
+<wire x1="31.82244375" y1="46.6" x2="34.51" y2="46.6" width="0.1524" layer="16"/>
+</signal>
+<signal name="N$5">
+<contactref element="ST1" pad="7"/>
+<wire x1="27.8" y1="48.54" x2="30.64" y2="48.54" width="0.1524" layer="1"/>
+<wire x1="30.64" y1="48.54" x2="30.64" y2="48.69" width="0.1524" layer="1"/>
+<via x="30.64" y="48.69" extent="1-16" drill="0.3"/>
+<wire x1="31.3" y1="48.24" x2="30.85" y2="48.69" width="0.1524" layer="16"/>
+<wire x1="30.64" y1="48.69" x2="30.85" y2="48.69" width="0.1524" layer="16"/>
+<wire x1="31.3" y1="48.24" x2="32.26" y2="48.24" width="0.1524" layer="16"/>
+<via x="34.51" y="47.45" extent="1-16" drill="0.3"/>
+<contactref element="L1" pad="P$1"/>
+<wire x1="32.26" y1="48.24" x2="32.28" y2="48.24" width="0.1524" layer="16"/>
+<wire x1="32.26" y1="48.24" x2="33.05" y2="47.45" width="0.1524" layer="16"/>
+<wire x1="33.05" y1="47.45" x2="34.51" y2="47.45" width="0.1524" layer="16"/>
+</signal>
+<signal name="N$6">
+<contactref element="ST1" pad="6"/>
+<wire x1="27.8" y1="48.04" x2="27.7714" y2="48.0186" width="0.1524" layer="1"/>
+<wire x1="27.7714" y1="48.0186" x2="28.66833125" y2="48.0186" width="0.1524" layer="1"/>
+<wire x1="28.97693125" y1="47.71" x2="29.5238" y2="47.71" width="0.1524" layer="1"/>
+<wire x1="28.66833125" y1="48.0186" x2="28.97693125" y2="47.71" width="0.1524" layer="1"/>
+<wire x1="30.15" y1="46.94" x2="30.17" y2="46.96" width="0.1524" layer="1"/>
+<wire x1="30.17" y1="46.96" x2="30.223" y2="46.96" width="0.1524" layer="1"/>
+<wire x1="30.223" y1="46.96" x2="30.2738" y2="46.96" width="0.1524" layer="1"/>
+<wire x1="29.5238" y1="47.71" x2="29.9969" y2="47.2369" width="0.1524" layer="1"/>
+<wire x1="30.2438" y1="46.99" x2="30.2738" y2="46.96" width="0.1524" layer="1"/>
+<wire x1="29.9969" y1="47.2369" x2="30.223" y2="47.0108" width="0.254" layer="1"/>
+<wire x1="30.223" y1="47.0108" x2="30.223" y2="46.96" width="0.254" layer="1"/>
+<wire x1="30.8631" y1="47.2369" x2="29.9969" y2="47.2369" width="0.1524" layer="1"/>
+<contactref element="U$1" pad="P$1"/>
+<wire x1="30.85" y1="46.99" x2="30.2438" y2="46.99" width="0.1524" layer="1"/>
+<wire x1="30.2438" y1="46.99" x2="30.223" y2="47.0108" width="0.1524" layer="1"/>
+</signal>
+<signal name="SCLK">
+<contactref element="N1" pad="P7"/>
+<contactref element="ST1" pad="11"/>
+<wire x1="40.986" y1="51.57" x2="40.926" y2="51.63" width="0.1524" layer="1"/>
+<wire x1="40.986" y1="51.57" x2="40.437" y2="51.57" width="0.1524" layer="1"/>
+<wire x1="40.437" y1="51.57" x2="40.367" y2="51.64" width="0.1524" layer="1"/>
+<wire x1="40.257" y1="51.64" x2="40.367" y2="51.64" width="0.1524" layer="1"/>
+<via x="40.257" y="51.64" extent="1-16" drill="0.35"/>
+<via x="29.98" y="52.1192" extent="1-16" drill="0.35"/>
+<wire x1="40.257" y1="51.64" x2="39.667" y2="51.64" width="0.1524" layer="16"/>
+<wire x1="39.667" y1="51.64" x2="38.9488" y2="52.3582" width="0.1524" layer="16"/>
+<wire x1="38.9488" y1="52.3582" x2="30.229" y2="52.3582" width="0.1524" layer="16"/>
+<wire x1="30.229" y1="52.3582" x2="29.99" y2="52.1192" width="0.1524" layer="16"/>
+<wire x1="29.98" y1="52.1192" x2="29.99" y2="52.1192" width="0.1524" layer="16"/>
+<wire x1="27.0885125" y1="50.9536" x2="28.8144" y2="50.9536" width="0.1524" layer="1"/>
+<wire x1="27.0885125" y1="50.9536" x2="26.2" y2="50.0650875" width="0.1524" layer="1"/>
+<wire x1="26.2" y1="49.64" x2="26.2" y2="50.0650875" width="0.1524" layer="1"/>
+<wire x1="29.98" y1="52.1192" x2="28.8144" y2="50.9536" width="0.1524" layer="1"/>
+</signal>
+<signal name="MOSI">
+<contactref element="N1" pad="P8"/>
+<contactref element="ST1" pad="13"/>
+<wire x1="40.986" y1="51.07" x2="40.946" y2="51.03" width="0.1524" layer="1"/>
+<wire x1="40.946" y1="51.03" x2="39.866" y2="51.03" width="0.1524" layer="1"/>
+<wire x1="39.866" y1="51.03" x2="39.8632" y2="51.0272" width="0.1524" layer="1"/>
+<wire x1="39.8632" y1="51.0272" x2="39.40335" y2="51.0272" width="0.1524" layer="1"/>
+<wire x1="39.40335" y1="51.0272" x2="36.98055" y2="53.45" width="0.1524" layer="1"/>
+<wire x1="36.98055" y1="53.45" x2="29.73145" y2="53.45" width="0.1524" layer="1"/>
+<wire x1="29.73145" y1="53.45" x2="29.09" y2="52.80855" width="0.1524" layer="1"/>
+<wire x1="29.09" y1="52.80855" x2="29.09" y2="52.0606875" width="0.1524" layer="1"/>
+<wire x1="26.6716" y1="51.5516" x2="25.2" y2="50.08" width="0.1524" layer="1"/>
+<wire x1="29.09" y1="52.0606875" x2="28.5809125" y2="51.5516" width="0.1524" layer="1"/>
+<wire x1="28.5809125" y1="51.5516" x2="26.6716" y2="51.5516" width="0.1524" layer="1"/>
+<wire x1="25.2" y1="50.08" x2="25.2" y2="49.64" width="0.1524" layer="1"/>
+</signal>
+<signal name="MISO">
+<contactref element="N1" pad="P9"/>
+<contactref element="ST1" pad="12"/>
+<wire x1="39.2721625" y1="50.62" x2="39.986" y2="50.62" width="0.1524" layer="1"/>
+<wire x1="39.2721625" y1="50.62" x2="36.7447625" y2="53.1474" width="0.1524" layer="1"/>
+<wire x1="36.7447625" y1="53.1474" x2="29.8174" y2="53.1474" width="0.1524" layer="1"/>
+<wire x1="29.8174" y1="53.1474" x2="29.425" y2="52.755" width="0.1524" layer="1"/>
+<wire x1="29.425" y1="52.755" x2="29.425" y2="51.985" width="0.1524" layer="1"/>
+<wire x1="29.425" y1="51.985" x2="28.7076" y2="51.2676" width="0.1524" layer="1"/>
+<wire x1="28.7076" y1="51.2676" x2="26.9133" y2="51.2676" width="0.1524" layer="1"/>
+<wire x1="26.9133" y1="51.2676" x2="25.7" y2="50.0543" width="0.1524" layer="1"/>
+<wire x1="25.7" y1="50.0543" x2="25.7" y2="49.64" width="0.1524" layer="1"/>
+<wire x1="39.986" y1="50.62" x2="40.036" y2="50.57" width="0.1524" layer="1"/>
+<wire x1="40.036" y1="50.57" x2="40.986" y2="50.57" width="0.1524" layer="1"/>
+</signal>
+<signal name="AMS_CS1">
+<contactref element="N1" pad="P6"/>
+<contactref element="ST1" pad="14"/>
+<wire x1="24.7" y1="50.24" x2="24.7" y2="49.64" width="0.1524" layer="1"/>
+<wire x1="27.03" y1="53.74" x2="26.6814" y2="53.3914" width="0.1524" layer="1"/>
+<wire x1="27.03" y1="53.74" x2="40.19" y2="53.74" width="0.1524" layer="1"/>
+<wire x1="40.986" y1="52.07" x2="40.986" y2="52.944" width="0.1524" layer="1"/>
+<wire x1="40.986" y1="52.944" x2="40.19" y2="53.74" width="0.1524" layer="1"/>
+<wire x1="26.40365" y1="51.7122" x2="26.1722" y2="51.7122" width="0.1524" layer="1"/>
+<wire x1="26.6814" y1="53.3914" x2="26.6814" y2="51.98995" width="0.1524" layer="1"/>
+<wire x1="26.6814" y1="51.98995" x2="26.40365" y2="51.7122" width="0.1524" layer="1"/>
+<wire x1="26.1722" y1="51.7122" x2="24.7" y2="50.24" width="0.1524" layer="1"/>
+</signal>
+<signal name="N$8">
+<contactref element="N1" pad="P4"/>
+<contactref element="C15" pad="2"/>
+<contactref element="C14" pad="2"/>
+<wire x1="43.986" y1="51.57" x2="44.016" y2="51.57" width="0.1524" layer="1"/>
+<wire x1="44.82" y1="51.67" x2="45.766040625" y2="51.67" width="0.1524" layer="1"/>
+<via x="44.08" y="53.8" extent="1-16" drill="0.35"/>
+<wire x1="44.96425625" y1="51.52574375" x2="44.82" y2="51.67" width="0.1524" layer="1"/>
+<wire x1="45.59" y1="51.67" x2="44.82" y2="51.67" width="0.1524" layer="1"/>
+<wire x1="45.766040625" y1="51.67" x2="44.85474375" y2="53.02525625" width="0.1524" layer="1"/>
+<wire x1="44.08" y1="53.8" x2="44.85474375" y2="53.02525625" width="0.1524" layer="1"/>
+<wire x1="43.986" y1="51.57" x2="44.086" y2="51.67" width="0.1524" layer="1"/>
+<wire x1="44.086" y1="51.67" x2="44.82" y2="51.67" width="0.1524" layer="1"/>
 </signal>
 <signal name="N$9">
-<contactref element="L2" pad="P$2"/>
-<contactref element="ST2" pad="8"/>
-<wire x1="57.65" y1="56.3" x2="58.35" y2="56.3" width="0.1524" layer="1"/>
-<wire x1="58.35" y1="56.3" x2="58.55" y2="56.5" width="0.1524" layer="1"/>
-<via x="58.55" y="56.5" extent="1-16" drill="0.3"/>
-<wire x1="58.55" y1="56.5" x2="60.2" y2="56.5" width="0.1524" layer="16"/>
-<wire x1="60.2" y1="56.5" x2="63.05" y2="53.65" width="0.1524" layer="16"/>
-<wire x1="63.05" y1="53.65" x2="64.2" y2="53.65" width="0.1524" layer="16"/>
-<wire x1="64.2" y1="53.65" x2="64.25" y2="53.7" width="0.1524" layer="16"/>
-<wire x1="64.25" y1="53.7" x2="64.25" y2="53.75" width="0.1524" layer="16"/>
-<wire x1="64.25" y1="53.75" x2="64.35" y2="53.85" width="0.1524" layer="16"/>
-<via x="64.35" y="53.85" extent="1-16" drill="0.3"/>
+<contactref element="N1" pad="P3"/>
+<wire x1="43.9888" y1="51.0728" x2="43.986" y2="51.07" width="0.1524" layer="1"/>
+<contactref element="C15" pad="1"/>
+<contactref element="C14" pad="1"/>
+<wire x1="45.59" y1="50.47" x2="44.82" y2="50.47" width="0.1524" layer="1"/>
+<via x="43.333428125" y="42.05625625" extent="1-16" drill="0.35"/>
+<wire x1="45.5102" y1="50.3867625" x2="45.5102" y2="44.123028125" width="0.25" layer="1"/>
+<wire x1="45.5102" y1="44.123028125" x2="43.493428125" y2="42.10625625" width="0.25" layer="1"/>
+<wire x1="43.493428125" y1="42.10625625" x2="43.383428125" y2="42.10625625" width="0.25" layer="1"/>
+<wire x1="43.383428125" y1="42.10625625" x2="43.333428125" y2="42.05625625" width="0.25" layer="1"/>
+<wire x1="45.59" y1="50.47" x2="45.5102" y2="50.3867625" width="0.1524" layer="1"/>
+<wire x1="44.82" y1="50.47" x2="44.8" y2="50.49" width="0.1524" layer="1"/>
+<wire x1="44.8" y1="50.49" x2="44.8" y2="50.77" width="0.1524" layer="1"/>
+<wire x1="44.8" y1="50.77" x2="44.4972" y2="51.0728" width="0.1524" layer="1"/>
+<wire x1="44.4972" y1="51.0728" x2="43.9888" y2="51.0728" width="0.1524" layer="1"/>
 </signal>
-<signal name="N$10">
-<contactref element="L2" pad="P$1"/>
-<contactref element="ST2" pad="9"/>
-<wire x1="57.05" y1="57.3" x2="57.5" y2="57.75" width="0.1524" layer="1"/>
-<wire x1="57.5" y1="57.75" x2="58" y2="57.75" width="0.1524" layer="1"/>
-<via x="58" y="57.75" extent="1-16" drill="0.35"/>
-<wire x1="58" y1="57.75" x2="61.3" y2="57.75" width="0.1524" layer="16"/>
-<wire x1="61.3" y1="57.75" x2="64.35" y2="54.7" width="0.1524" layer="16"/>
-<via x="64.35" y="54.7" extent="1-16" drill="0.3"/>
-<wire x1="57.05" y1="56.9" x2="57.05" y2="57.3" width="0.1524" layer="1"/>
+<signal name="AMS_IRQ">
+<contactref element="ST1" pad="3"/>
+<wire x1="39.57" y1="44.87" x2="39.57" y2="49.44" width="0.1524" layer="1"/>
+<wire x1="39.57" y1="44.87" x2="40.73" y2="43.71" width="0.1524" layer="1"/>
+<via x="40.73" y="43.71" extent="1-16" drill="0.3"/>
+<wire x1="40.73" y1="43.71" x2="37.8313125" y2="43.71" width="0.1524" layer="16"/>
+<wire x1="36.6219125" y1="44.9194" x2="31.4306" y2="44.9194" width="0.1524" layer="16"/>
+<wire x1="37.8313125" y1="43.71" x2="36.6219125" y2="44.9194" width="0.1524" layer="16"/>
+<wire x1="29.86" y1="46.49" x2="28.671" y2="46.49" width="0.1524" layer="16"/>
+<via x="28.671" y="46.49" extent="1-16" drill="0.35"/>
+<wire x1="31.4306" y1="44.9194" x2="29.86" y2="46.49" width="0.1524" layer="16"/>
+<wire x1="28.671" y1="46.49" x2="28.621" y2="46.54" width="0.1524" layer="1"/>
+<wire x1="28.621" y1="46.54" x2="27.8" y2="46.54" width="0.1524" layer="1"/>
+<contactref element="N1" pad="P10"/>
+<wire x1="39.57" y1="49.44" x2="40.2" y2="50.07" width="0.1524" layer="1"/>
+<wire x1="40.2" y1="50.07" x2="40.986" y2="50.07" width="0.1524" layer="1"/>
 </signal>
 <signal name="N$11">
-<contactref element="ST2" pad="7"/>
-<contactref element="L2" pad="P$3"/>
-<wire x1="57.65" y1="55.8" x2="58.85" y2="55.8" width="0.1524" layer="1"/>
-<wire x1="58.85" y1="55.8" x2="58.9" y2="55.75" width="0.1524" layer="1"/>
-<via x="58.9" y="55.75" extent="1-16" drill="0.3"/>
-<wire x1="58.9" y1="55.75" x2="61.7" y2="52.95" width="0.1524" layer="16"/>
-<wire x1="61.7" y1="52.95" x2="64.95" y2="52.95" width="0.1524" layer="16"/>
-<wire x1="64.95" y1="52.95" x2="65.2" y2="53.2" width="0.1524" layer="16"/>
-<wire x1="65.2" y1="53.2" x2="65.2" y2="53.85" width="0.1524" layer="16"/>
-<via x="65.2" y="53.85" extent="1-16" drill="0.3"/>
+<wire x1="42.25" y1="54.3952" x2="42.25" y2="54.7" width="0" layer="19" extent="2-2"/>
 </signal>
 <signal name="N$12">
-<contactref element="ST2" pad="6"/>
-<wire x1="57.65" y1="55.3" x2="57.6214" y2="55.2786" width="0.1524" layer="1"/>
-<wire x1="57.6214" y1="55.2786" x2="58.51833125" y2="55.2786" width="0.1524" layer="1"/>
-<wire x1="58.82693125" y1="54.97" x2="59.3738" y2="54.97" width="0.1524" layer="1"/>
-<wire x1="58.51833125" y1="55.2786" x2="58.82693125" y2="54.97" width="0.1524" layer="1"/>
-<wire x1="59.3738" y1="54.97" x2="59.8469" y2="54.4969" width="0.1524" layer="1"/>
-<wire x1="60.0938" y1="54.25" x2="60.1238" y2="54.22" width="0.1524" layer="1"/>
-<wire x1="59.8469" y1="54.4969" x2="60.073" y2="54.2708" width="0.254" layer="1"/>
-<wire x1="60.7131" y1="54.4969" x2="59.8469" y2="54.4969" width="0.1524" layer="1"/>
-<contactref element="U$2" pad="P$1"/>
-<wire x1="60.7" y1="54.25" x2="60.0938" y2="54.25" width="0.1524" layer="1"/>
-<wire x1="60.0938" y1="54.25" x2="60.073" y2="54.2708" width="0.1524" layer="1"/>
+<wire x1="42.25" y1="39.9096" x2="42.25" y2="39.6048" width="0" layer="19" extent="2-2"/>
+</signal>
+<signal name="N$7">
+<wire x1="42.25" y1="54.7" x2="20.55" y2="54.7" width="0.15" layer="16"/>
+<wire x1="20.55" y1="54.7" x2="20.55" y2="39.3" width="0.15" layer="16"/>
+<wire x1="20.55" y1="39.3" x2="42.25" y2="39.3" width="0.15" layer="16"/>
+<wire x1="45.95" y1="43" x2="45.95" y2="51" width="0.15" layer="16"/>
+<wire x1="42.25" y1="39.3" x2="45.95" y2="43" width="0.15" layer="16" curve="90"/>
+<wire x1="45.95" y1="51" x2="42.25" y2="54.3952" width="0.15" layer="16"/>
+<wire x1="42.25" y1="54.7" x2="44.0853" y2="53.7553" width="0.15" layer="16"/>
+<wire x1="42.25" y1="54.3952" x2="20.8548" y2="54.3952" width="0.15" layer="16"/>
+<wire x1="20.8548" y1="54.3952" x2="20.8548" y2="39.6048" width="0.15" layer="16"/>
+<wire x1="20.8548" y1="39.6048" x2="42.25" y2="39.6048" width="0.15" layer="16"/>
+<wire x1="45.6452" y1="43" x2="45.6452" y2="50.866009375" width="0.15" layer="16"/>
+<wire x1="45.6452" y1="50.866009375" x2="42.13135" y2="54.0904" width="0.15" layer="16"/>
+<wire x1="42.13135" y1="54.0904" x2="21.1596" y2="54.0904" width="0.15" layer="16"/>
+<wire x1="21.1596" y1="54.0904" x2="21.1596" y2="39.9096" width="0.15" layer="16"/>
+<wire x1="21.1596" y1="39.9096" x2="42.25" y2="39.9096" width="0.15" layer="16"/>
+<wire x1="42.25" y1="39.6048" x2="45.6452" y2="43" width="0.15" layer="16" curve="90"/>
+<wire x1="45.3404" y1="43" x2="45.3404" y2="50.73203125" width="0.15" layer="16"/>
+<wire x1="45.3404" y1="50.73203125" x2="42.012690625" y2="53.7856" width="0.15" layer="16"/>
+<wire x1="42.012690625" y1="53.7856" x2="21.4644" y2="53.7856" width="0.15" layer="16"/>
+<wire x1="21.4644" y1="53.7856" x2="21.4644" y2="40.2144" width="0.15" layer="16"/>
+<wire x1="21.4644" y1="40.2144" x2="42.25" y2="40.2144" width="0.15" layer="16"/>
+<wire x1="42.25" y1="39.9096" x2="45.3404" y2="43" width="0.15" layer="16" curve="90"/>
+<wire x1="45.0356" y1="43" x2="45.0356" y2="50.598040625" width="0.15" layer="16"/>
+<wire x1="45.0356" y1="50.598040625" x2="41.894040625" y2="53.4808" width="0.15" layer="16"/>
+<wire x1="41.894040625" y1="53.4808" x2="21.7692" y2="53.4808" width="0.15" layer="16"/>
+<wire x1="21.7692" y1="53.4808" x2="21.7692" y2="40.5192" width="0.15" layer="16"/>
+<wire x1="21.7692" y1="40.5192" x2="42.25" y2="40.5192" width="0.15" layer="16"/>
+<wire x1="42.25" y1="40.2144" x2="45.0356" y2="43" width="0.15" layer="16" curve="90"/>
+<wire x1="44.7308" y1="43" x2="44.7308" y2="50.46405" width="0.15" layer="16"/>
+<wire x1="44.7308" y1="50.46405" x2="41.775390625" y2="53.176" width="0.15" layer="16"/>
+<wire x1="41.775390625" y1="53.176" x2="22.074" y2="53.176" width="0.15" layer="16"/>
+<wire x1="22.074" y1="53.176" x2="22.074" y2="40.824" width="0.15" layer="16"/>
+<wire x1="22.074" y1="40.824" x2="42.25" y2="40.824" width="0.15" layer="16"/>
+<wire x1="42.25" y1="40.5192" x2="44.7308" y2="43" width="0.15" layer="16" curve="90"/>
+<wire x1="42.25" y1="40.824" x2="43.354759375" y2="42.086859375" width="0.15" layer="16"/>
 </signal>
 </signals>
 <mfgpreviewcolors>
diff --git a/solo/USB-C.sch b/solo/USB-C.sch
index b121ae7..3160b5e 100644
--- a/solo/USB-C.sch
+++ b/solo/USB-C.sch
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="9.2.2">
+<eagle version="9.3.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="no"/>
@@ -9,6 +9,8 @@
 <grid distance="0.1" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="inch" altunit="inch"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="no" active="no"/>
+<layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
+<layer number="15" name="Route15" color="4" fill="6" visible="no" active="no"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="no" active="no"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="no" active="no"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="no" active="no"/>
@@ -393,7 +395,7 @@ In this library the device names are the same as the pin names of the symbols, t
 <text x="-0.635" y="-0.762" size="0.0254" layer="27">&gt;VALUE</text>
 <text x="-0.635" y="-1.905" size="1" layer="37">&gt;TP_SIGNAL_NAME</text>
 </package>
-<package name="C0402" urn="urn:adsk.eagle:footprint:4894774/3" library_version="48">
+<package name="C0402" urn="urn:adsk.eagle:footprint:4894774/3" library_version="49" library_locally_modified="yes">
 <description>&lt;b&gt;CAPACITOR&lt;/b&gt;</description>
 <wire x1="-0.245" y1="0.224" x2="0.245" y2="0.224" width="0.1524" layer="51"/>
 <wire x1="0.245" y1="-0.224" x2="-0.245" y2="-0.224" width="0.1524" layer="51"/>
@@ -409,31 +411,7 @@ In this library the device names are the same as the pin names of the symbols, t
 <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="EAST1616RGBA3-RGB-LED" urn="urn:adsk.eagle:footprint:4245357/1" library_version="13" library_locally_modified="yes">
-<smd name="P$4" x="-0.7" y="-0.45" dx="0.7" dy="0.65" layer="1"/>
-<smd name="P$2" x="-0.7" y="0.45" dx="0.7" dy="0.65" layer="1"/>
-<smd name="P$3" x="0.7" y="-0.45" dx="0.7" dy="0.65" layer="1"/>
-<smd name="P$1" x="0.7" y="0.45" dx="0.7" dy="0.65" layer="1"/>
-<circle x="0.5" y="0" radius="0.1" width="0" layer="21"/>
-<wire x1="-0.75" y1="0.85" x2="-0.75" y2="-0.9" width="0.127" layer="51"/>
-<wire x1="-0.75" y1="-0.9" x2="0.8" y2="-0.9" width="0.127" layer="51"/>
-<wire x1="0.8" y1="-0.9" x2="0.8" y2="0.85" width="0.127" layer="51"/>
-<wire x1="0.8" y1="0.85" x2="-0.75" y2="0.85" width="0.127" layer="51"/>
-<wire x1="-0.75" y1="0.85" x2="0.8" y2="0.85" width="0.127" layer="21"/>
-<wire x1="0.8" y1="-0.9" x2="-0.75" y2="-0.9" width="0.127" layer="21"/>
-<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" library_locally_modified="yes">
-<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"/>
-<smd name="P$4" x="0" y="0" dx="0.4" dy="0.4" layer="1"/>
-<smd name="P$3" x="0" y="0.85" dx="0.4" dy="0.4" layer="1"/>
-<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/2" library_version="53">
+<package name="QFN32" urn="urn:adsk.eagle:footprint:6434393/4" library_version="66">
 <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"/>
@@ -449,7 +427,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <wire x1="-2.05" y1="-2.45" x2="-2.45" y2="-2.4" width="0.1016" layer="21"/>
 <wire x1="-2.45" y1="-2.4" x2="-2.45" y2="-2.05" width="0.1016" layer="21"/>
 <circle x="-2.425" y="2.475" radius="0.3" width="0" layer="21"/>
-<smd name="EXP" x="0" y="0" dx="3.2" dy="3.2" layer="1" roundness="20" stop="no" cream="no"/>
+<smd name="EXP" x="0" y="0" dx="0.2" dy="0.2" layer="1" roundness="20" stop="no" cream="no"/>
 <smd name="1" x="-2.35" y="1.75" dx="0.6" dy="0.3" layer="1" roundness="30" stop="no" cream="no"/>
 <smd name="2" x="-2.35" y="1.25" dx="0.6" dy="0.3" layer="1" roundness="30" stop="no" cream="no"/>
 <smd name="3" x="-2.35" y="0.75" dx="0.6" dy="0.3" layer="1" roundness="30" stop="no" cream="no"/>
@@ -910,8 +888,14 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-1.675" y="2.125"/>
 <vertex x="-1.675" y="2.575"/>
 </polygon>
+<polygon width="0.127" layer="1" spacing="0.7112" pour="hatch">
+<vertex x="-1.5" y="1.5"/>
+<vertex x="1.5" y="1.5"/>
+<vertex x="1.5" y="-1.5"/>
+<vertex x="-1.5" y="-1.5"/>
+</polygon>
 </package>
-<package name="REG_NCP114AMX330TCG" urn="urn:adsk.eagle:footprint:5621085/2" library_version="53">
+<package name="REG_NCP114AMX330TCG" urn="urn:adsk.eagle:footprint:5621085/3" library_version="66">
 <polygon width="0.001" layer="1">
 <vertex x="-0.475" y="0.65"/>
 <vertex x="-0.475" y="0.22"/>
@@ -994,7 +978,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-0.475" y="-0.05"/>
 <vertex x="-0.525" y="-0.05"/>
 </polygon>
-<circle x="-0.64" y="-0.648" radius="0.0508" width="0.1016" layer="21"/>
+<circle x="-0.74" y="-0.848" radius="0.14" width="0.1016" layer="21"/>
 <wire x1="-0.5" y1="0.5" x2="-0.5" y2="-0.5" width="0.1" layer="51"/>
 <wire x1="-0.5" y1="-0.5" x2="0.5" y2="-0.5" width="0.1" layer="51"/>
 <wire x1="0.5" y1="-0.5" x2="0.5" y2="0.5" width="0.1" layer="51"/>
@@ -1172,7 +1156,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="50">
+<package name="DOME-BL-12MM" urn="urn:adsk.eagle:footprint:5648518/7" library_version="70">
 <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"/>
@@ -1182,48 +1166,13 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <circle x="0" y="0" radius="1.1" width="0.1524" layer="41"/>
 <circle x="0" y="0" radius="1.0049875" width="0.1524" layer="41"/>
 <circle x="0" y="0" radius="0.9055375" width="0.1524" layer="41"/>
-<wire x1="-2.315709375" y1="0.8" x2="-2.315709375" y2="-0.8" width="0.1" layer="1" curve="-321.88"/>
-<wire x1="-2.315709375" y1="-0.8" x2="-4.96331875" y2="-0.8" width="0.1" layer="1"/>
-<wire x1="-4.96331875" y1="-0.8" x2="-4.96331875" y2="0.8" width="0.1" layer="1"/>
-<wire x1="-4.96331875" y1="0.8" x2="-2.315709375" y2="0.8" width="0.1" layer="1"/>
-<wire x1="-2.315709375" y1="-0.8" x2="-2.315709375" y2="0.8" width="0.1" layer="1" curve="321.883368"/>
-<wire x1="-2.315709375" y1="-0.8" x2="-4.96331875" y2="-0.8" width="0.1" layer="1"/>
-<wire x1="-4.96331875" y1="-0.8" x2="-4.96331875" y2="0.8" width="0.1" layer="1"/>
-<wire x1="-2.315709375" y1="0.8" x2="-4.96331875" y2="0.8" width="0.1" layer="1"/>
+<circle x="0" y="0" radius="1.878828125" width="0.127" layer="1"/>
 <wire x1="-3.74" y1="-2.4937" x2="-5.59" y2="-2.4937" width="0.1" layer="1"/>
 <wire x1="-2.9937" y1="3.74" x2="2.9937" y2="3.74" width="0.1" layer="1"/>
 <wire x1="-2.9937" y1="-3.74" x2="-3.74" y2="-2.9937" width="0.1" layer="1"/>
-<wire x1="-1.8" y1="0.6" x2="-2.1" y2="0.8" width="0.4064" layer="1"/>
-<wire x1="-2.1" y1="0.8" x2="-1.9" y2="1.2" width="0.4064" layer="1"/>
-<wire x1="-1.9" y1="1.2" x2="-1.6" y2="1.6" width="0.4064" layer="1"/>
-<wire x1="-1.6" y1="1.6" x2="-1.3" y2="1.9" width="0.4064" layer="1"/>
-<wire x1="-1.3" y1="1.9" x2="-0.7" y2="2.1" width="0.4064" layer="1"/>
-<wire x1="-0.7" y1="2.1" x2="-0.2" y2="2.2" width="0.4064" layer="1"/>
-<wire x1="-0.2" y1="2.2" x2="0.1" y2="2.2" width="0.4064" layer="1"/>
-<wire x1="0.1" y1="2.2" x2="0.5" y2="2.2" width="0.4064" layer="1"/>
-<wire x1="0.5" y1="2.2" x2="1" y2="2.05" width="0.4064" layer="1"/>
-<wire x1="1" y1="2.05" x2="1.4" y2="1.75" width="0.4064" layer="1"/>
-<wire x1="1.4" y1="1.75" x2="1.8" y2="1.3" width="0.4064" layer="1"/>
-<wire x1="1.8" y1="1.3" x2="2.15" y2="0.75" width="0.4064" layer="1"/>
-<wire x1="2.15" y1="0.75" x2="2.25" y2="0.25" width="0.4064" layer="1"/>
-<wire x1="2.25" y1="0.25" x2="2.25" y2="-0.15" width="0.4064" layer="1"/>
-<wire x1="2.25" y1="-0.15" x2="2.1" y2="-0.75" width="0.4064" layer="1"/>
-<wire x1="2.1" y1="-0.75" x2="1.95" y2="-1.05" width="0.4064" layer="1"/>
-<wire x1="1.95" y1="-1.05" x2="1.85" y2="-1.3" width="0.4064" layer="1"/>
-<wire x1="1.85" y1="-1.3" x2="1.3" y2="-1.85" width="0.4064" layer="1"/>
-<wire x1="1.3" y1="-1.85" x2="0.9" y2="-2.05" width="0.4064" layer="1"/>
-<wire x1="0.9" y1="-2.05" x2="0.4" y2="-2.2" width="0.4064" layer="1"/>
-<wire x1="0.4" y1="-2.2" x2="-0.05" y2="-2.25" width="0.4064" layer="1"/>
-<wire x1="-0.05" y1="-2.25" x2="-0.4" y2="-2.2" width="0.4064" layer="1"/>
-<wire x1="-0.4" y1="-2.2" x2="-0.9" y2="-2.05" width="0.4064" layer="1"/>
-<wire x1="-0.9" y1="-2.05" x2="-1.45" y2="-1.75" width="0.4064" layer="1"/>
-<wire x1="-1.45" y1="-1.75" x2="-1.8" y2="-1.4" width="0.4064" layer="1"/>
-<wire x1="-1.8" y1="-1.4" x2="-2.15" y2="-0.7" width="0.4064" layer="1"/>
-<wire x1="-2.15" y1="-0.7" x2="-2.35" y2="-0.6" width="0.4064" layer="1"/>
-<wire x1="-2.35" y1="-0.6" x2="-4.8" y2="-0.6" width="0.4064" layer="1"/>
-<wire x1="-4.8" y1="-0.6" x2="-4.8" y2="0.65" width="0.4064" layer="1"/>
-<wire x1="-4.8" y1="0.65" x2="-1.95" y2="0.65" width="0.4064" layer="1"/>
-<wire x1="-1.95" y1="0.65" x2="-1.5" y2="0.55" width="0.4064" layer="1"/>
+<wire x1="-2.35" y1="-0.1" x2="-4.8" y2="-0.1" width="0.4064" layer="1"/>
+<wire x1="-4.8" y1="-0.1" x2="-4.8" y2="0.35" width="0.4064" layer="1"/>
+<wire x1="-4.8" y1="0.35" x2="-1.95" y2="0.35" width="0.4064" layer="1"/>
 <wire x1="-1.5" y1="0.55" x2="-1.1" y2="1.2" width="0.4064" layer="1"/>
 <wire x1="-1.1" y1="1.2" x2="-0.75" y2="1.4" width="0.4064" layer="1"/>
 <wire x1="-0.75" y1="1.4" x2="-0.2" y2="1.6" width="0.4064" layer="1"/>
@@ -1243,41 +1192,13 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <wire x1="-1" y1="-1.25" x2="-1.25" y2="-1" width="0.4064" layer="1"/>
 <wire x1="-1.25" y1="-1" x2="-1.4" y2="-0.75" width="0.4064" layer="1"/>
 <wire x1="-1.4" y1="-0.75" x2="-1.6" y2="-0.35" width="0.4064" layer="1"/>
-<wire x1="-1.6" y1="-0.35" x2="-1.6" y2="-0.05" width="0.4064" layer="1"/>
-<wire x1="-1.6" y1="-0.05" x2="-1.6" y2="0.35" width="0.4064" layer="1"/>
-<wire x1="-1.6" y1="0.35" x2="-1.5" y2="0.45" width="0.4064" layer="1"/>
-<wire x1="-1.5" y1="0.45" x2="-4.55" y2="0.35" width="0.4064" layer="1"/>
-<wire x1="-4.55" y1="0.35" x2="-4.5" y2="-0.4" width="0.4064" layer="1"/>
-<wire x1="-4.5" y1="-0.4" x2="-1.85" y2="-0.35" width="0.4064" layer="1"/>
-<wire x1="-1.85" y1="-0.35" x2="-1.85" y2="0.2" width="0.4064" layer="1"/>
+<wire x1="-1.6" y1="-0.35" x2="-1.6" y2="0.35" width="0.4064" layer="1"/>
+<wire x1="-1.6" y1="0.35" x2="-1.5" y2="0.35" width="0.4064" layer="1"/>
+<wire x1="-1.5" y1="0.35" x2="-4.55" y2="0.25" width="0.4064" layer="1"/>
+<wire x1="-4.55" y1="0.25" x2="-4.5" y2="-0.1" width="0.4064" layer="1"/>
+<wire x1="-4.5" y1="-0.1" x2="-1.85" y2="-0.05" width="0.4064" layer="1"/>
+<wire x1="-1.85" y1="-0.05" x2="-1.85" y2="0.2" width="0.4064" layer="1"/>
 <wire x1="-1.85" y1="0.2" x2="-4.25" y2="0.1" width="0.4064" layer="1"/>
-<wire x1="-4.25" y1="0.1" x2="-4.3" y2="-0.15" width="0.4064" layer="1"/>
-<wire x1="-4.3" y1="-0.15" x2="-2.1" y2="-0.1" width="0.4064" layer="1"/>
-<wire x1="-2.1" y1="-0.1" x2="-1.8" y2="-0.8" width="0.4064" layer="1"/>
-<wire x1="-1.8" y1="-0.8" x2="-1.25" y2="-1.7" width="0.4064" layer="1"/>
-<wire x1="-1.25" y1="-1.7" x2="-0.3" y2="-1.9" width="0.4064" layer="1"/>
-<wire x1="-0.3" y1="-1.9" x2="0.5" y2="-1.9" width="0.4064" layer="1"/>
-<wire x1="0.5" y1="-1.9" x2="1.45" y2="-1.35" width="0.4064" layer="1"/>
-<wire x1="1.45" y1="-1.35" x2="1.7" y2="-0.95" width="0.4064" layer="1"/>
-<wire x1="1.7" y1="-0.95" x2="2" y2="-0.1" width="0.4064" layer="1"/>
-<wire x1="2" y1="-0.1" x2="1.85" y2="0.35" width="0.4064" layer="1"/>
-<wire x1="1.85" y1="0.35" x2="1.75" y2="0.8" width="0.4064" layer="1"/>
-<wire x1="1.75" y1="0.8" x2="1.3" y2="1.4" width="0.4064" layer="1"/>
-<wire x1="1.3" y1="1.4" x2="0.9" y2="1.75" width="0.4064" layer="1"/>
-<wire x1="0.9" y1="1.75" x2="0.15" y2="1.95" width="0.4064" layer="1"/>
-<wire x1="0.15" y1="1.95" x2="-0.5" y2="1.8" width="0.4064" layer="1"/>
-<wire x1="-0.5" y1="1.8" x2="-1" y2="1.75" width="0.4064" layer="1"/>
-<wire x1="-1" y1="1.75" x2="-1.3" y2="1.45" width="0.4064" layer="1"/>
-<wire x1="-1.3" y1="1.45" x2="-1.75" y2="1.05" width="0.4064" layer="1"/>
-<wire x1="-1.75" y1="1.05" x2="-1.7" y2="0.95" width="0.4064" layer="1"/>
-<wire x1="-1.7" y1="0.95" x2="-1.65" y2="0.85" width="0.4064" layer="1"/>
-<wire x1="-1.65" y1="0.85" x2="-1.5" y2="1" width="0.4064" layer="1"/>
-<wire x1="-1.5" y1="1" x2="-0.9" y2="1.6" width="0.4064" layer="1"/>
-<wire x1="-0.9" y1="1.6" x2="-1.7" y2="0.95" width="0.4064" layer="1"/>
-<wire x1="-1.7" y1="0.95" x2="-1.85" y2="-0.6" width="0.4064" layer="1"/>
-<wire x1="-1.85" y1="-0.6" x2="-0.95" y2="-1.65" width="0.4064" layer="1"/>
-<wire x1="-0.95" y1="-1.65" x2="0.7" y2="-1.9" width="0.4064" layer="1"/>
-<wire x1="0.7" y1="-1.9" x2="1.8" y2="-0.7" width="0.4064" layer="1"/>
 <wire x1="-5" y1="0.8" x2="-2.4" y2="0.8" width="0.1524" layer="29"/>
 <wire x1="-2.4" y1="0.8" x2="-2.4" y2="-0.9" width="0.1524" layer="29"/>
 <wire x1="-2.4" y1="-0.9" x2="-5" y2="-0.9" width="0.1524" layer="29"/>
@@ -1317,7 +1238,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <wire x1="-2.3" y1="0.4" x2="-1.3" y2="1.2" width="0.4064" layer="29"/>
 <wire x1="-1.3" y1="1.2" x2="-1.6" y2="1.2" width="0.4064" layer="29"/>
 <wire x1="-1.6" y1="1.2" x2="-1.3" y2="1.5" width="0.4064" layer="29"/>
-<wire x1="-1.3" y1="1.5" x2="-1.9" y2="0.9" width="0.4064" layer="29"/>
+<wire x1="-1.6" y1="1.2" x2="-1.9" y2="0.9" width="0.4064" layer="29"/>
 <wire x1="-1.9" y1="0.9" x2="-0.8" y2="1.8" width="0.4064" layer="29"/>
 <wire x1="-0.8" y1="1.8" x2="0" y2="2" width="0.4064" layer="29"/>
 <wire x1="0" y1="2" x2="0.9" y2="1.8" width="0.4064" layer="29"/>
@@ -1460,8 +1381,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <wire x1="-0.7" y1="2.7" x2="-1.1" y2="2.6" width="0.508" layer="41"/>
 <wire x1="-1.1" y1="2.6" x2="-1.5" y2="2.4" width="0.508" layer="41"/>
 <wire x1="-1.5" y1="2.4" x2="-1.8" y2="2.2" width="0.508" layer="41"/>
-<wire x1="-1.8" y1="2.2" x2="-2" y2="2" width="0.508" layer="41"/>
-<wire x1="-2" y1="2" x2="-2.3" y2="1.7" width="0.508" layer="41"/>
+<wire x1="-1.8" y1="2.2" x2="-2.3" y2="1.7" width="0.508" layer="41"/>
 <wire x1="-2.3" y1="1.7" x2="-2.4" y2="1.5" width="0.508" layer="41"/>
 <wire x1="-2.4" y1="1.5" x2="-2.5" y2="1.2" width="0.508" layer="41"/>
 <wire x1="-2.5" y1="1.2" x2="-2.6" y2="1.1" width="0.508" layer="41"/>
@@ -1473,19 +1393,44 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <wire x1="-2.2" y1="2.3" x2="-1.9" y2="2.5" width="0.508" layer="41"/>
 <wire x1="-1.9" y1="2.5" x2="-1.4" y2="2.5" width="0.508" layer="41"/>
 <wire x1="-1.4" y1="2.5" x2="-2.1" y2="3" width="0.508" layer="41"/>
-<polygon width="0.1" layer="1">
+<wire x1="-1.7" y1="0.6" x2="-1.7" y2="0.7" width="0.127" layer="1"/>
+<wire x1="-1.5" y1="0.9" x2="-1.7" y2="0.7" width="0.127" layer="1"/>
+<wire x1="-1.5" y1="0.9" x2="-1.3" y2="1.2" width="0.127" layer="1"/>
+<wire x1="-1.3" y1="1.2" x2="-1.6" y2="0.9" width="0.127" layer="1"/>
+<wire x1="-1.6" y1="0.9" x2="-1.1" y2="1.5" width="0.127" layer="1"/>
+<wire x1="-1.1" y1="1.5" x2="-0.9" y2="1.6" width="0.127" layer="1"/>
+<wire x1="-0.9" y1="1.6" x2="-0.3" y2="1.8" width="0.127" layer="1"/>
+<wire x1="-0.3" y1="1.8" x2="0.3" y2="1.8" width="0.127" layer="1"/>
+<wire x1="0.3" y1="1.8" x2="0.7" y2="1.7" width="0.127" layer="1"/>
+<wire x1="0.7" y1="1.7" x2="0.9" y2="1.6" width="0.127" layer="1"/>
+<wire x1="0.9" y1="1.6" x2="1.1" y2="1.4" width="0.127" layer="1"/>
+<wire x1="1.1" y1="1.4" x2="1.3" y2="1.3" width="0.127" layer="1"/>
+<wire x1="1.3" y1="1.3" x2="1.7" y2="0.6" width="0.127" layer="1"/>
+<wire x1="1.7" y1="0.6" x2="1.8" y2="0.1" width="0.127" layer="1"/>
+<wire x1="1.8" y1="0.1" x2="1.8" y2="-0.4" width="0.127" layer="1"/>
+<wire x1="1.8" y1="-0.4" x2="1.5" y2="-1" width="0.127" layer="1"/>
+<wire x1="1.5" y1="-1" x2="0.9" y2="-1.6" width="0.127" layer="1"/>
+<wire x1="0.9" y1="-1.6" x2="0.4" y2="-1.8" width="0.127" layer="1"/>
+<wire x1="0.4" y1="-1.8" x2="-0.3" y2="-1.8" width="0.127" layer="1"/>
+<wire x1="-0.3" y1="-1.8" x2="-0.7" y2="-1.7" width="0.127" layer="1"/>
+<wire x1="-0.7" y1="-1.7" x2="-1.2" y2="-1.4" width="0.127" layer="1"/>
+<wire x1="-1.2" y1="-1.4" x2="-1.3" y2="-1.2" width="0.127" layer="1"/>
+<wire x1="-1.3" y1="-1.2" x2="-1.5" y2="-1" width="0.127" layer="1"/>
+<wire x1="-1.5" y1="-1" x2="-1.7" y2="-0.6" width="0.127" layer="1"/>
+<wire x1="-1.7" y1="-0.6" x2="-1.8" y2="-0.3" width="0.127" layer="1"/>
+<polygon width="0.1" layer="1" spacing="0.75" pour="hatch">
 <vertex x="-3.74" y="2.4937"/>
 <vertex x="-5.59" y="2.4937"/>
 <vertex x="-5.59" y="3.76"/>
 <vertex x="-3.76" y="5.59"/>
-<vertex x="3.76" y="5.59"/>
-<vertex x="5.59" y="3.76"/>
-<vertex x="4.4" y="2.96"/>
-<vertex x="4.3" y="-2.9"/>
-<vertex x="5.5" y="-3.1"/>
-<vertex x="5.59" y="-3.76"/>
+<vertex x="1.7788" y="5.6154"/>
+<vertex x="3.1088" y="4.1854"/>
+<vertex x="4.2" y="3.06"/>
+<vertex x="4.2" y="-3.9"/>
+<vertex x="4.7" y="-4"/>
+<vertex x="5.19" y="-4.16"/>
 <vertex x="3.76" y="-5.59"/>
-<vertex x="-3.76" y="-5.59"/>
+<vertex x="-3.86" y="-5.59"/>
 <vertex x="-5.59" y="-3.76"/>
 <vertex x="-5.59" y="-2.4937"/>
 <vertex x="-3.74" y="-2.4937"/>
@@ -1499,14 +1444,13 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-3.74" y="2.9937"/>
 </polygon>
 <polygon width="0.1524" layer="29">
-<vertex x="-3.8" y="5.6"/>
-<vertex x="-5.6" y="3.8"/>
-<vertex x="-5.6" y="2.5"/>
+<vertex x="-3.8" y="5.7"/>
+<vertex x="-5.7" y="3.8"/>
+<vertex x="-5.6" y="2.4"/>
 <vertex x="-3.7" y="2.5"/>
-<vertex x="-3.7" y="3"/>
-<vertex x="-3" y="3.7"/>
-<vertex x="3" y="3.7"/>
-<vertex x="3.7" y="3"/>
+<vertex x="-2.9" y="3.7"/>
+<vertex x="2.9" y="3.7"/>
+<vertex x="3.7" y="2.8"/>
 <vertex x="3.7" y="-3"/>
 <vertex x="3" y="-3.7"/>
 <vertex x="-3" y="-3.7"/>
@@ -1516,12 +1460,278 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <vertex x="-5.6" y="-3.8"/>
 <vertex x="-3.8" y="-5.6"/>
 <vertex x="3.8" y="-5.6"/>
-<vertex x="5.6" y="-3.8"/>
-<vertex x="5.6" y="3.8"/>
-<vertex x="3.8" y="5.6"/>
+<vertex x="4.6" y="-5"/>
+<vertex x="5.2" y="-4.1"/>
+<vertex x="4.2" y="-3.9"/>
+<vertex x="4.2" y="3"/>
+<vertex x="3.1172" y="4.2254"/>
+<vertex x="1.8172" y="5.6254"/>
 </polygon>
 <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"/>
+<smd name="P$2" x="-0.3" y="4.3" dx="0.5" dy="0.5" layer="1" stop="no" cream="no"/>
+</package>
+<package name="MLPD3X3" urn="urn:adsk.eagle:footprint:5825737/7" library_version="77">
+<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.6" y="-1.64" dx="0.2" dy="0.2" 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>
+<polygon width="0.127" layer="1" spacing="0.7366" pour="hatch">
+<vertex x="0.7" y="-0.4"/>
+<vertex x="2.3" y="-0.4"/>
+<vertex x="2.3" y="-2.7"/>
+<vertex x="0.7" y="-2.7"/>
+</polygon>
+<polygon width="0.127" layer="29">
+<vertex x="0.7" y="-0.4"/>
+<vertex x="2.3" y="-0.4"/>
+<vertex x="2.3" y="-2.7"/>
+<vertex x="0.7" y="-2.7"/>
+</polygon>
+<circle x="-0.5588" y="0.2286" radius="0.1626375" width="0.3556" layer="25"/>
+</package>
+<package name="WüRTH_632712000112" urn="urn:adsk.eagle:footprint:9339181/5" library_version="75">
+<smd name="A12" x="0.154525" y="1.01879375" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A11" x="0.65488125" y="1.016203125" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A10" x="1.158565625" y="1.023003125" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A9" x="1.654875" y="1.0210125" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A8" x="2.15640625" y="1.016634375" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A7" x="2.654875" y="1.016765625" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A6" x="3.15690625" y="1.021084375" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A5" x="3.653228125" y="1.02091875" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A4" x="4.161096875" y="1.020959375" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A3" x="4.648653125" y="1.02311875" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A2" x="5.1519375" y="1.0209" dx="0.2" dy="1.2" layer="1"/>
+<smd name="A1" x="5.6505" y="1.01689375" dx="0.2" dy="1.2" layer="1"/>
+<smd name="P_GND3" x="6.353828125" y="1.1464125" dx="0.45" dy="1.45" layer="1" rot="R180"/>
+<smd name="P_GND4" x="-0.523228125" y="1.145934375" dx="0.45" dy="1.45" layer="1" rot="R180"/>
+<smd name="B12" x="5.6464375" y="1.0147875" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B11" x="5.15690625" y="1.023171875" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B10" x="4.644715625" y="1.020990625" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B1" x="0.154653125" y="1.0185625" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B2" x="0.65200625" y="1.018671875" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B3" x="1.15769375" y="1.023403125" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B4" x="1.65549375" y="1.02088125" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B5" x="2.155321875" y="1.01668125" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B6" x="2.65775" y="1.01414375" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B7" x="3.155375" y="1.02145" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B8" x="3.65476875" y="1.01905625" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="B9" x="4.1600125" y="1.01905625" dx="0.2" dy="1.2" layer="16" rot="R180"/>
+<smd name="P_GND1" x="-0.523771875" y="1.145934375" dx="0.45" dy="1.45" layer="16"/>
+<smd name="P_GND2" x="6.339828125" y="1.145934375" dx="0.45" dy="1.45" layer="16"/>
+<polygon width="0.025" layer="1">
+<vertex x="-0.23291875" y="0.343890625"/>
+<vertex x="-0.822" y="0.348"/>
+<vertex x="-0.822" y="2.223290625"/>
+<vertex x="-0.23291875" y="2.223290625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="0.00508125" y="1.693890625"/>
+<vertex x="0.00508125" y="0.343890625"/>
+<vertex x="0.30508125" y="0.343890625"/>
+<vertex x="0.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="0.50508125" y="1.693890625"/>
+<vertex x="0.50508125" y="0.343890625"/>
+<vertex x="0.80508125" y="0.343890625"/>
+<vertex x="0.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="1.00508125" y="1.693890625"/>
+<vertex x="1.00508125" y="0.343890625"/>
+<vertex x="1.30508125" y="0.343890625"/>
+<vertex x="1.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="1.50508125" y="1.693890625"/>
+<vertex x="1.50508125" y="0.343890625"/>
+<vertex x="1.80508125" y="0.343890625"/>
+<vertex x="1.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="2.00508125" y="1.693890625"/>
+<vertex x="2.00508125" y="0.343890625"/>
+<vertex x="2.30508125" y="0.343890625"/>
+<vertex x="2.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="2.50508125" y="1.693890625"/>
+<vertex x="2.50508125" y="0.343890625"/>
+<vertex x="2.80508125" y="0.343890625"/>
+<vertex x="2.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="3.30508125" y="0.343890625"/>
+<vertex x="3.00508125" y="0.343890625"/>
+<vertex x="3.00508125" y="1.693890625"/>
+<vertex x="3.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="3.80508125" y="0.343890625"/>
+<vertex x="3.50508125" y="0.343890625"/>
+<vertex x="3.50508125" y="1.693890625"/>
+<vertex x="3.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="4.00508125" y="1.693890625"/>
+<vertex x="4.00508125" y="0.343890625"/>
+<vertex x="4.30508125" y="0.343890625"/>
+<vertex x="4.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="4.50508125" y="1.693890625"/>
+<vertex x="4.50508125" y="0.343890625"/>
+<vertex x="4.80508125" y="0.343890625"/>
+<vertex x="4.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="5.30508125" y="0.343890625"/>
+<vertex x="5.00508125" y="0.343890625"/>
+<vertex x="5.00508125" y="1.693890625"/>
+<vertex x="5.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="5.80508125" y="0.343890625"/>
+<vertex x="5.50508125" y="0.343890625"/>
+<vertex x="5.50508125" y="1.693890625"/>
+<vertex x="5.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="1">
+<vertex x="6.04308125" y="2.223290625"/>
+<vertex x="6.04308125" y="0.343890625"/>
+<vertex x="6.62448125" y="0.343890625"/>
+<vertex x="6.62448125" y="2.223290625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="-0.23291875" y="0.343890625"/>
+<vertex x="-0.81431875" y="0.343890625"/>
+<vertex x="-0.81431875" y="2.223290625"/>
+<vertex x="-0.23291875" y="2.223290625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="0.00508125" y="1.693890625"/>
+<vertex x="0.00508125" y="0.343890625"/>
+<vertex x="0.30508125" y="0.343890625"/>
+<vertex x="0.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="0.50508125" y="1.693890625"/>
+<vertex x="0.50508125" y="0.343890625"/>
+<vertex x="0.80508125" y="0.343890625"/>
+<vertex x="0.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="1.00508125" y="1.693890625"/>
+<vertex x="1.00508125" y="0.343890625"/>
+<vertex x="1.30508125" y="0.343890625"/>
+<vertex x="1.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="1.50508125" y="1.693890625"/>
+<vertex x="1.50508125" y="0.343890625"/>
+<vertex x="1.80508125" y="0.343890625"/>
+<vertex x="1.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="2.00508125" y="1.693890625"/>
+<vertex x="2.00508125" y="0.343890625"/>
+<vertex x="2.30508125" y="0.343890625"/>
+<vertex x="2.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="2.50508125" y="1.693890625"/>
+<vertex x="2.50508125" y="0.343890625"/>
+<vertex x="2.80508125" y="0.343890625"/>
+<vertex x="2.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="3.30508125" y="0.343890625"/>
+<vertex x="3.00508125" y="0.343890625"/>
+<vertex x="3.00508125" y="1.693890625"/>
+<vertex x="3.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="3.80508125" y="0.343890625"/>
+<vertex x="3.50508125" y="0.343890625"/>
+<vertex x="3.50508125" y="1.693890625"/>
+<vertex x="3.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="4.00508125" y="1.693890625"/>
+<vertex x="4.00508125" y="0.343890625"/>
+<vertex x="4.30508125" y="0.343890625"/>
+<vertex x="4.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="4.50508125" y="1.693890625"/>
+<vertex x="4.50508125" y="0.343890625"/>
+<vertex x="4.80508125" y="0.343890625"/>
+<vertex x="4.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="5.30508125" y="0.343890625"/>
+<vertex x="5.00508125" y="0.343890625"/>
+<vertex x="5.00508125" y="1.693890625"/>
+<vertex x="5.30508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="5.80508125" y="0.343890625"/>
+<vertex x="5.50508125" y="0.343890625"/>
+<vertex x="5.50508125" y="1.693890625"/>
+<vertex x="5.80508125" y="1.693890625"/>
+</polygon>
+<polygon width="0.025" layer="16">
+<vertex x="6.04308125" y="2.223290625"/>
+<vertex x="6.04308125" y="0.343890625"/>
+<vertex x="6.62448125" y="0.343890625"/>
+<vertex x="6.62448125" y="2.223290625"/>
+</polygon>
+<wire x1="-1.34491875" y1="1.918490625" x2="-1.34491875" y2="0.138490625" width="0.025" layer="25"/>
+<wire x1="-1.34491875" y1="0.138490625" x2="2.90508125" y2="0.138490625" width="0.025" layer="25"/>
+<wire x1="2.90508125" y1="0.138490625" x2="7.15508125" y2="0.138490625" width="0.025" layer="25"/>
+<wire x1="7.15508125" y1="1.918490625" x2="7.15508125" y2="0.138490625" width="0.025" layer="25"/>
+<wire x1="2.90508125" y1="0.138490625" x2="2.90508125" y2="3.70436875" width="0.025" layer="25"/>
+<rectangle x1="-2.32" y1="0.2718" x2="-1.044" y2="1.8378" layer="1"/>
+<rectangle x1="6.844" y1="0.29" x2="8.12" y2="1.856" layer="1"/>
+<rectangle x1="-2.32" y1="0.2718" x2="-1.044" y2="1.8378" layer="16"/>
+<rectangle x1="6.844" y1="0.29" x2="8.12" y2="1.856" layer="16"/>
+<rectangle x1="-2.32" y1="0.2718" x2="-1.044" y2="1.8378" layer="29"/>
+<rectangle x1="6.844" y1="0.29" x2="8.12" y2="1.856" layer="29"/>
+<rectangle x1="-2.32" y1="0.2718" x2="-1.044" y2="1.8378" layer="30"/>
+<rectangle x1="6.844" y1="0.29" x2="8.12" y2="1.856" layer="30"/>
+</package>
+<package name="EAST1616RGBA3-RGB-LED" urn="urn:adsk.eagle:footprint:4245357/1" library_version="78">
+<smd name="P$4" x="-0.7" y="-0.45" dx="0.7" dy="0.65" layer="1"/>
+<smd name="P$2" x="-0.7" y="0.45" dx="0.7" dy="0.65" layer="1"/>
+<smd name="P$3" x="0.7" y="-0.45" dx="0.7" dy="0.65" layer="1"/>
+<smd name="P$1" x="0.7" y="0.45" dx="0.7" dy="0.65" layer="1"/>
+<circle x="0.5" y="0" radius="0.1" width="0" layer="21"/>
+<wire x1="-0.75" y1="0.85" x2="-0.75" y2="-0.9" width="0.127" layer="51"/>
+<wire x1="-0.75" y1="-0.9" x2="0.8" y2="-0.9" width="0.127" layer="51"/>
+<wire x1="0.8" y1="-0.9" x2="0.8" y2="0.85" width="0.127" layer="51"/>
+<wire x1="0.8" y1="0.85" x2="-0.75" y2="0.85" width="0.127" layer="51"/>
+<wire x1="-0.75" y1="0.85" x2="0.8" y2="0.85" width="0.127" layer="21"/>
+<wire x1="0.8" y1="-0.9" x2="-0.75" y2="-0.9" width="0.127" layer="21"/>
+<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/5" library_version="78">
+<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"/>
+<smd name="P$4" x="0" y="0" dx="0.4" dy="0.4" layer="1"/>
+<smd name="P$3" x="0" y="0.85" dx="0.4" dy="0.4" layer="1"/>
+<text x="-0.4" y="1.4" size="0.4" layer="21">&gt;NAME</text>
+<circle x="1.2508" y="-0.4002" radius="0.1" width="0.2032" layer="21"/>
 </package>
 </packages>
 <packages3d>
@@ -1542,31 +1752,20 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <packageinstance name="B1,27"/>
 </packageinstances>
 </package3d>
-<package3d name="C0402" urn="urn:adsk.eagle:package:4245806/7" type="model" library_version="48">
+<package3d name="C0402" urn="urn:adsk.eagle:package:4245806/7" type="model" library_version="49" library_locally_modified="yes">
 <description>&lt;b&gt;CAPACITOR&lt;/b&gt;</description>
 <packageinstances>
 <packageinstance name="C0402"/>
 </packageinstances>
 </package3d>
-<package3d name="EAST1616RGBA3-RGB-LED" urn="urn:adsk.eagle:package:4245370/5" type="model" library_version="13" library_locally_modified="yes">
-<packageinstances>
-<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" library_locally_modified="yes">
-<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/6" type="model" library_version="53">
+<package3d name="QFN50P500X500X50-32" urn="urn:adsk.eagle:package:4245373/8" type="model" library_version="66">
 <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/3" type="model" library_version="53">
+<package3d name="DFN100X100X60-4" urn="urn:adsk.eagle:package:5621121/4" type="model" library_version="66">
 <packageinstances>
 <packageinstance name="REG_NCP114AMX330TCG"/>
 </packageinstances>
@@ -1582,11 +1781,32 @@ 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="50">
+<package3d name="DOME-BL-12MM" urn="urn:adsk.eagle:package:5648519/9" type="model" library_version="70">
 <packageinstances>
 <packageinstance name="DOME-BL-12MM"/>
 </packageinstances>
 </package3d>
+<package3d name="MLPD3X3" urn="urn:adsk.eagle:package:5825738/7" type="box" library_version="77">
+<packageinstances>
+<packageinstance name="MLPD3X3"/>
+</packageinstances>
+</package3d>
+<package3d name="WüRTH_632712000112" urn="urn:adsk.eagle:package:9339182/7" type="model" library_version="75">
+<packageinstances>
+<packageinstance name="WüRTH_632712000112"/>
+</packageinstances>
+</package3d>
+<package3d name="EAST1616RGBA3-RGB-LED" urn="urn:adsk.eagle:package:4245370/5" type="model" library_version="78">
+<packageinstances>
+<packageinstance name="EAST1616RGBA3-RGB-LED"/>
+</packageinstances>
+</package3d>
+<package3d name="CL-505S-X-SD-T" urn="urn:adsk.eagle:package:4878740/7" type="box" library_version="78">
+<description>CL-505S-X-SD-T</description>
+<packageinstances>
+<packageinstance name="CL-505S-X-SD-T"/>
+</packageinstances>
+</package3d>
 </packages3d>
 <symbols>
 <symbol name="R-EU" urn="urn:adsk.eagle:symbol:4245805/1" library_version="4" library_locally_modified="yes">
@@ -1645,71 +1865,6 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <pin name="1" x="0" y="2.54" visible="off" length="short" direction="pas" swaplevel="1" rot="R270"/>
 <pin name="2" x="0" y="-5.08" visible="off" length="short" direction="pas" swaplevel="1" rot="R90"/>
 </symbol>
-<symbol name="LED-RGB" urn="urn:adsk.eagle:symbol:4245364/1" library_version="13" library_locally_modified="yes">
-<wire x1="6.35" y1="1.778" x2="5.08" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="5.08" y1="-0.254" x2="3.81" y2="1.778" width="0.254" layer="94"/>
-<wire x1="6.35" y1="-0.254" x2="5.08" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="5.08" y1="-0.254" x2="3.81" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="6.35" y1="1.778" x2="3.81" y2="1.778" width="0.254" layer="94"/>
-<wire x1="3.048" y1="1.524" x2="2.159" y2="0.635" width="0.1524" layer="94"/>
-<wire x1="3.81" y1="0.762" x2="2.921" y2="-0.127" width="0.1524" layer="94"/>
-<wire x1="1.27" y1="1.778" x2="0" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="0" y1="-0.254" x2="-1.27" y2="1.778" width="0.254" layer="94"/>
-<wire x1="1.27" y1="-0.254" x2="0" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="0" y1="-0.254" x2="-1.27" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="1.27" y1="1.778" x2="-1.27" y2="1.778" width="0.254" layer="94"/>
-<wire x1="-2.032" y1="1.524" x2="-2.921" y2="0.635" width="0.1524" layer="94"/>
-<wire x1="-1.27" y1="0.762" x2="-2.159" y2="-0.127" width="0.1524" layer="94"/>
-<wire x1="-3.81" y1="1.778" x2="-5.08" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="-5.08" y1="-0.254" x2="-6.35" y2="1.778" width="0.254" layer="94"/>
-<wire x1="-3.81" y1="-0.254" x2="-5.08" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="-5.08" y1="-0.254" x2="-6.35" y2="-0.254" width="0.254" layer="94"/>
-<wire x1="-3.81" y1="1.778" x2="-6.35" y2="1.778" width="0.254" layer="94"/>
-<wire x1="-7.112" y1="1.524" x2="-8.001" y2="0.635" width="0.1524" layer="94"/>
-<wire x1="-6.35" y1="0.762" x2="-7.239" y2="-0.127" width="0.1524" layer="94"/>
-<wire x1="-5.08" y1="2.54" x2="0" y2="2.54" width="0.1524" layer="94"/>
-<wire x1="0" y1="2.54" x2="0" y2="0" width="0.1524" layer="94"/>
-<wire x1="0" y1="2.54" x2="5.08" y2="2.54" width="0.1524" layer="94"/>
-<wire x1="5.08" y1="2.54" x2="5.08" y2="0" width="0.1524" layer="94"/>
-<circle x="-5.08" y="2.54" radius="0.1796" width="0.254" layer="94"/>
-<circle x="0" y="2.54" radius="0.1796" width="0.254" layer="94"/>
-<text x="-2.54" y="3.302" size="1.778" layer="95">&gt;NAME</text>
-<text x="-2.54" y="5.461" size="1.778" layer="96">&gt;VALUE</text>
-<pin name="CGREEN" x="5.08" y="-2.54" visible="pad" length="short" direction="pas" rot="R90"/>
-<pin name="CBLUE" x="0" y="-2.54" visible="pad" length="short" direction="pas" rot="R90"/>
-<pin name="CRED" x="-5.08" y="-2.54" visible="pad" length="short" direction="pas" rot="R90"/>
-<pin name="A2" x="-5.08" y="5.08" visible="pad" length="middle" direction="pas" rot="R270"/>
-<polygon width="0.1524" layer="94">
-<vertex x="2.032" y="1.016"/>
-<vertex x="1.778" y="0.254"/>
-<vertex x="2.54" y="0.508"/>
-</polygon>
-<polygon width="0.1524" layer="94">
-<vertex x="2.794" y="0.254"/>
-<vertex x="2.54" y="-0.508"/>
-<vertex x="3.302" y="-0.254"/>
-</polygon>
-<polygon width="0.1524" layer="94">
-<vertex x="-3.048" y="1.016"/>
-<vertex x="-3.302" y="0.254"/>
-<vertex x="-2.54" y="0.508"/>
-</polygon>
-<polygon width="0.1524" layer="94">
-<vertex x="-2.286" y="0.254"/>
-<vertex x="-2.54" y="-0.508"/>
-<vertex x="-1.778" y="-0.254"/>
-</polygon>
-<polygon width="0.1524" layer="94">
-<vertex x="-8.128" y="1.016"/>
-<vertex x="-8.382" y="0.254"/>
-<vertex x="-7.62" y="0.508"/>
-</polygon>
-<polygon width="0.1524" layer="94">
-<vertex x="-7.366" y="0.254"/>
-<vertex x="-7.62" y="-0.508"/>
-<vertex x="-6.858" y="-0.254"/>
-</polygon>
-</symbol>
 <symbol name="STM32L432KCU6" urn="urn:adsk.eagle:symbol:5621081/1" library_version="28">
 <pin name="VDD2" x="20.32" y="-7.62" length="middle" rot="R180"/>
 <pin name="PA8" x="20.32" y="-5.08" length="middle" rot="R180"/>
@@ -1819,6 +1974,89 @@ 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="LED-RGB" urn="urn:adsk.eagle:symbol:4245364/1" library_version="78">
+<wire x1="6.35" y1="1.778" x2="5.08" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="5.08" y1="-0.254" x2="3.81" y2="1.778" width="0.254" layer="94"/>
+<wire x1="6.35" y1="-0.254" x2="5.08" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="5.08" y1="-0.254" x2="3.81" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="6.35" y1="1.778" x2="3.81" y2="1.778" width="0.254" layer="94"/>
+<wire x1="3.048" y1="1.524" x2="2.159" y2="0.635" width="0.1524" layer="94"/>
+<wire x1="3.81" y1="0.762" x2="2.921" y2="-0.127" width="0.1524" layer="94"/>
+<wire x1="1.27" y1="1.778" x2="0" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="0" y1="-0.254" x2="-1.27" y2="1.778" width="0.254" layer="94"/>
+<wire x1="1.27" y1="-0.254" x2="0" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="0" y1="-0.254" x2="-1.27" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="1.27" y1="1.778" x2="-1.27" y2="1.778" width="0.254" layer="94"/>
+<wire x1="-2.032" y1="1.524" x2="-2.921" y2="0.635" width="0.1524" layer="94"/>
+<wire x1="-1.27" y1="0.762" x2="-2.159" y2="-0.127" width="0.1524" layer="94"/>
+<wire x1="-3.81" y1="1.778" x2="-5.08" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="-5.08" y1="-0.254" x2="-6.35" y2="1.778" width="0.254" layer="94"/>
+<wire x1="-3.81" y1="-0.254" x2="-5.08" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="-5.08" y1="-0.254" x2="-6.35" y2="-0.254" width="0.254" layer="94"/>
+<wire x1="-3.81" y1="1.778" x2="-6.35" y2="1.778" width="0.254" layer="94"/>
+<wire x1="-7.112" y1="1.524" x2="-8.001" y2="0.635" width="0.1524" layer="94"/>
+<wire x1="-6.35" y1="0.762" x2="-7.239" y2="-0.127" width="0.1524" layer="94"/>
+<wire x1="-5.08" y1="2.54" x2="0" y2="2.54" width="0.1524" layer="94"/>
+<wire x1="0" y1="2.54" x2="0" y2="0" width="0.1524" layer="94"/>
+<wire x1="0" y1="2.54" x2="5.08" y2="2.54" width="0.1524" layer="94"/>
+<wire x1="5.08" y1="2.54" x2="5.08" y2="0" width="0.1524" layer="94"/>
+<circle x="-5.08" y="2.54" radius="0.1796" width="0.254" layer="94"/>
+<circle x="0" y="2.54" radius="0.1796" width="0.254" layer="94"/>
+<text x="-2.54" y="3.302" size="1.778" layer="95">&gt;NAME</text>
+<text x="-2.54" y="5.461" size="1.778" layer="96">&gt;VALUE</text>
+<pin name="CGREEN" x="5.08" y="-2.54" visible="pad" length="short" direction="pas" rot="R90"/>
+<pin name="CBLUE" x="0" y="-2.54" visible="pad" length="short" direction="pas" rot="R90"/>
+<pin name="CRED" x="-5.08" y="-2.54" visible="pad" length="short" direction="pas" rot="R90"/>
+<pin name="A2" x="-5.08" y="5.08" visible="pad" length="middle" direction="pas" rot="R270"/>
+<polygon width="0.1524" layer="94">
+<vertex x="2.032" y="1.016"/>
+<vertex x="1.778" y="0.254"/>
+<vertex x="2.54" y="0.508"/>
+</polygon>
+<polygon width="0.1524" layer="94">
+<vertex x="2.794" y="0.254"/>
+<vertex x="2.54" y="-0.508"/>
+<vertex x="3.302" y="-0.254"/>
+</polygon>
+<polygon width="0.1524" layer="94">
+<vertex x="-3.048" y="1.016"/>
+<vertex x="-3.302" y="0.254"/>
+<vertex x="-2.54" y="0.508"/>
+</polygon>
+<polygon width="0.1524" layer="94">
+<vertex x="-2.286" y="0.254"/>
+<vertex x="-2.54" y="-0.508"/>
+<vertex x="-1.778" y="-0.254"/>
+</polygon>
+<polygon width="0.1524" layer="94">
+<vertex x="-8.128" y="1.016"/>
+<vertex x="-8.382" y="0.254"/>
+<vertex x="-7.62" y="0.508"/>
+</polygon>
+<polygon width="0.1524" layer="94">
+<vertex x="-7.366" y="0.254"/>
+<vertex x="-7.62" y="-0.508"/>
+<vertex x="-6.858" y="-0.254"/>
+</polygon>
+</symbol>
 </symbols>
 <devicesets>
 <deviceset name="RESISTOR" urn="urn:adsk.eagle:component:4245809/5" prefix="R" library_version="48">
@@ -1840,7 +2078,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="DX07P024AJ5R1500" urn="urn:adsk.eagle:component:5621126/11" prefix="USBC" library_version="53">
+<deviceset name="DX07P024AJ5R1500" urn="urn:adsk.eagle:component:5621126/18" prefix="USBC" library_version="75">
 <gates>
 <gate name="G$1" symbol="USB-C" x="0" y="2.54"/>
 </gates>
@@ -1871,6 +2109,32 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <technology name=""/>
 </technologies>
 </device>
+<device name="WURTH" package="WüRTH_632712000112">
+<connects>
+<connect gate="G$1" pin="CC" pad="A5"/>
+<connect gate="G$1" pin="D+" pad="A6"/>
+<connect gate="G$1" pin="D-" pad="A7"/>
+<connect gate="G$1" pin="GND" pad="A1 A12 B1 B12 P_GND1 P_GND2 P_GND3 P_GND4"/>
+<connect gate="G$1" pin="RX1+" pad="B11"/>
+<connect gate="G$1" pin="RX1-" pad="B10"/>
+<connect gate="G$1" pin="RX2+" pad="A11"/>
+<connect gate="G$1" pin="RX2-" pad="A10"/>
+<connect gate="G$1" pin="SBU1" pad="A8"/>
+<connect gate="G$1" pin="SBU2" pad="B8"/>
+<connect gate="G$1" pin="TX1+" pad="A2"/>
+<connect gate="G$1" pin="TX1-" pad="A3"/>
+<connect gate="G$1" pin="TX2+" pad="B2"/>
+<connect gate="G$1" pin="TX2-" pad="B3"/>
+<connect gate="G$1" pin="VBUS" pad="A4 A9 B4 B9"/>
+<connect gate="G$1" pin="VCONN" pad="B5"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:9339182/7"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
 </devices>
 </deviceset>
 <deviceset name="TEST_POINT" urn="urn:adsk.eagle:component:4245793/3" prefix="T" library_version="8" library_locally_modified="yes">
@@ -1891,7 +2155,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="CAPACITOR" urn="urn:adsk.eagle:component:4245808/5" prefix="C" library_version="48">
+<deviceset name="CAPACITOR" urn="urn:adsk.eagle:component:4245808/5" prefix="C" library_version="49" library_locally_modified="yes">
 <gates>
 <gate name="G$1" symbol="C-EU" x="0" y="2.54"/>
 </gates>
@@ -1910,45 +2174,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" library_locally_modified="yes">
-<description>EAST1616RGBA3</description>
-<gates>
-<gate name="G$1" symbol="LED-RGB" x="0" y="-2.54"/>
-</gates>
-<devices>
-<device name="" package="EAST1616RGBA3-RGB-LED">
-<connects>
-<connect gate="G$1" pin="A2" pad="P$3"/>
-<connect gate="G$1" pin="CBLUE" pad="P$1"/>
-<connect gate="G$1" pin="CGREEN" pad="P$2"/>
-<connect gate="G$1" pin="CRED" pad="P$4"/>
-</connects>
-<package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:4245370/5"/>
-</package3dinstances>
-<technologies>
-<technology name="">
-<attribute name="MPN" value="123t" constant="no"/>
-</technology>
-</technologies>
-</device>
-<device name="CL-505S-X-SD-T" package="CL-505S-X-SD-T">
-<connects>
-<connect gate="G$1" pin="A2" pad="P$4"/>
-<connect gate="G$1" pin="CBLUE" pad="P$1"/>
-<connect gate="G$1" pin="CGREEN" pad="P$3"/>
-<connect gate="G$1" pin="CRED" pad="P$2"/>
-</connects>
-<package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:4878740/6"/>
-</package3dinstances>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
-<deviceset name="STM32L432KCU6" urn="urn:adsk.eagle:component:5621128/4" prefix="ST" library_version="53">
+<deviceset name="STM32L432KCU6" urn="urn:adsk.eagle:component:5621128/6" prefix="ST" library_version="66">
 <gates>
 <gate name="G$1" symbol="STM32L432KCU6" x="0" y="0"/>
 </gates>
@@ -1990,7 +2216,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/6"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:4245373/8"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -1998,7 +2224,7 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="NCP114AMX330TCG" urn="urn:adsk.eagle:component:5621125/3" prefix="L" library_version="53">
+<deviceset name="NCP114AMX330TCG" urn="urn:adsk.eagle:component:5621125/4" prefix="L" library_version="66">
 <description>CMOS Low Dropout Regulator, 300 mA 3.3V, Active Discharge</description>
 <gates>
 <gate name="G$1" symbol="NCP114AMX330TCG" x="0" y="0"/>
@@ -2013,7 +2239,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/3"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:5621121/4"/>
 </package3dinstances>
 <technologies>
 <technology name="">
@@ -2050,7 +2276,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="50">
+<deviceset name="DOME_BUTTON" urn="urn:adsk.eagle:component:4878737/15" library_version="70">
 <gates>
 <gate name="G$1" symbol="SWITCH-NO" x="0" y="0"/>
 </gates>
@@ -2073,7 +2299,72 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <connect gate="G$1" pin="2" pad="P$2"/>
 </connects>
 <package3dinstances>
-<package3dinstance package3d_urn="urn:adsk.eagle:package:5648519/5"/>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:5648519/9"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+<deviceset name="AMS3956" urn="urn:adsk.eagle:component:5825739/9" prefix="N" library_version="77">
+<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/7"/>
+</package3dinstances>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
+<deviceset name="RGB_LED_1X1" urn="urn:adsk.eagle:component:4245376/10" prefix="L" library_version="78">
+<description>EAST1616RGBA3</description>
+<gates>
+<gate name="G$1" symbol="LED-RGB" x="0" y="-2.54"/>
+</gates>
+<devices>
+<device name="" package="EAST1616RGBA3-RGB-LED">
+<connects>
+<connect gate="G$1" pin="A2" pad="P$3"/>
+<connect gate="G$1" pin="CBLUE" pad="P$1"/>
+<connect gate="G$1" pin="CGREEN" pad="P$2"/>
+<connect gate="G$1" pin="CRED" pad="P$4"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:4245370/5"/>
+</package3dinstances>
+<technologies>
+<technology name="">
+<attribute name="MPN" value="123t" constant="no"/>
+</technology>
+</technologies>
+</device>
+<device name="CL-505S-X-SD-T" package="CL-505S-X-SD-T">
+<connects>
+<connect gate="G$1" pin="A2" pad="P$4"/>
+<connect gate="G$1" pin="CBLUE" pad="P$1"/>
+<connect gate="G$1" pin="CGREEN" pad="P$3"/>
+<connect gate="G$1" pin="CRED" pad="P$2"/>
+</connects>
+<package3dinstances>
+<package3dinstance package3d_urn="urn:adsk.eagle:package:4878740/7"/>
 </package3dinstances>
 <technologies>
 <technology name=""/>
@@ -2094,205 +2385,232 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 </class>
 </classes>
 <parts>
-<part name="USBC1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="DX07P024AJ5R1500" device="" package3d_urn="urn:adsk.eagle:package:5621122/11"/>
+<part name="USBC1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="DX07P024AJ5R1500" device="WURTH" package3d_urn="urn:adsk.eagle:package:9339182/7" value="DX07P024AJ5R1500WURTH"/>
 <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="5k"/>
 <part name="SUPPLY2" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
 <part name="P+1" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+5V" device=""/>
 <part name="SUPPLY3" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
-<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="SUPPLY11" 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="SUPPLY12" 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="SUPPLY13" 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="SUPPLY14" 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"/>
-<part name="+5V1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="TEST_POINT" device="" package3d_urn="urn:adsk.eagle:package:4245792/4"/>
-<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="C1" 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="SUPPLY1" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="P+2" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+5V" device=""/>
+<part name="C2" 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="SUPPLY4" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="C4" 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="C5" 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="+3V1" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="P+3" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+5V" device=""/>
+<part name="SUPPLY5" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="+3V2" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="SUPPLY6" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="GND2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="TEST_POINT" device="" package3d_urn="urn:adsk.eagle:package:4245792/4"/>
+<part name="+5V2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="TEST_POINT" device="" package3d_urn="urn:adsk.eagle:package:4245792/4"/>
+<part name="3V2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="TEST_POINT" device="" package3d_urn="urn:adsk.eagle:package:4245792/4"/>
+<part name="SWDIO2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="TEST_POINT" device="" package3d_urn="urn:adsk.eagle:package:4245792/4"/>
+<part name="SWCLK2" 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="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="SUPPLY15" 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="SUPPLY16" 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="SUPPLY17" 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/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="SUPPLY18" 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="+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="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="STX-&gt;2" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="TEST_POINT" device="" package3d_urn="urn:adsk.eagle:package:4245792/4"/>
+<part name="+3V3" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="SUPPLY7" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="+3V4" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="SUPPLY8" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="C6" 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="C13" 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="SUPPLY9" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="ST1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="STM32L432KCU6" device="" package3d_urn="urn:adsk.eagle:package:4245373/8"/>
+<part name="L3" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="NCP114AMX330TCG" device="" package3d_urn="urn:adsk.eagle:package:5621121/4"/>
+<part name="Z1" 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+4" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+5V" device=""/>
+<part name="SUPPLY19" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="+3V5" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="+3V6" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="+3V7" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="U$1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="DOME_BUTTON" device="12MM" package3d_urn="urn:adsk.eagle:package:5648519/9"/>
+<part name="N1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="AMS3956" device="" package3d_urn="urn:adsk.eagle:package:5825738/7"/>
+<part name="SUPPLY20" library="supply2" library_urn="urn:adsk.eagle:library:372" deviceset="PE" device="" value="GND"/>
+<part name="+3V8" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
+<part name="C15" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="CAPACITOR" device="" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".5p"/>
+<part name="C14" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="CAPACITOR" device="" package3d_urn="urn:adsk.eagle:package:4245806/7" value=".5p"/>
+<part name="C3" 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="C7" 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="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="C9" 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="L1" library="efm-fido" library_urn="urn:adsk.eagle:library:4245354" deviceset="RGB_LED_1X1" device="CL-505S-X-SD-T" package3d_urn="urn:adsk.eagle:package:4878740/7"/>
 </parts>
 <sheets>
 <sheet>
 <plain>
 </plain>
 <instances>
-<instance part="USBC1" gate="G$1" x="-10.16" y="2.54" smashed="yes">
-<attribute name="NAME" x="-17.78" y="20.32" size="1.27" layer="95" font="vector"/>
-<attribute name="VALUE" x="-20.32" y="-27.94" size="1.27" layer="96" font="vector"/>
+<instance part="USBC1" gate="G$1" x="-35.56" y="12.7" smashed="yes">
+<attribute name="NAME" x="-43.18" y="30.48" size="1.27" layer="95" font="vector"/>
+<attribute name="VALUE" x="-45.72" y="-17.78" size="1.27" layer="96" font="vector"/>
 </instance>
-<instance part="R2" gate="G$1" x="-50.8" y="2.54" smashed="yes" rot="R180">
-<attribute name="NAME" x="-46.99" y="1.0414" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="-46.99" y="5.842" size="1.778" layer="96" rot="R180"/>
+<instance part="R2" gate="G$1" x="-76.2" y="12.7" smashed="yes" rot="R180">
+<attribute name="NAME" x="-72.39" y="11.2014" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="-72.39" y="16.002" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="SUPPLY2" gate="PE" x="-66.04" y="2.54" smashed="yes" rot="R270">
-<attribute name="VALUE" x="-70.739" y="6.985" size="1.778" layer="96" rot="R270"/>
+<instance part="SUPPLY2" gate="PE" x="-91.44" y="12.7" smashed="yes" rot="R270">
+<attribute name="VALUE" x="-96.139" y="17.145" size="1.778" layer="96" rot="R270"/>
 </instance>
-<instance part="P+1" gate="1" x="15.24" y="15.24" smashed="yes" rot="R270">
-<attribute name="VALUE" x="15.24" y="17.78" size="1.778" layer="96" rot="R90"/>
+<instance part="P+1" gate="1" x="-10.16" y="25.4" smashed="yes" rot="R270">
+<attribute name="VALUE" x="-10.16" y="27.94" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="SUPPLY3" gate="PE" x="15.24" y="-2.54" smashed="yes" rot="R90">
-<attribute name="VALUE" x="19.939" y="-6.985" size="1.778" layer="96" rot="R90"/>
+<instance part="SUPPLY3" gate="PE" x="-10.16" y="7.62" smashed="yes" rot="R90">
+<attribute name="VALUE" x="-5.461" y="3.175" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="C7" gate="G$1" x="58.42" y="-27.94" smashed="yes" rot="R180">
-<attribute name="NAME" x="56.896" y="-28.321" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="56.896" y="-23.241" size="1.778" layer="96" rot="R180"/>
+<instance part="C1" gate="G$1" x="38.1" y="-43.18" smashed="yes" rot="R180">
+<attribute name="NAME" x="36.576" y="-43.561" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="36.576" y="-38.481" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="SUPPLY11" gate="PE" x="106.68" y="60.96" smashed="yes" rot="R180">
-<attribute name="VALUE" x="111.125" y="65.659" size="1.778" layer="96" rot="R180"/>
+<instance part="SUPPLY1" gate="PE" x="83.82" y="38.1" smashed="yes" rot="R180">
+<attribute name="VALUE" x="88.265" y="42.799" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="P+5" gate="1" x="48.26" y="-15.24" smashed="yes">
-<attribute name="VALUE" x="45.72" y="-15.24" size="1.778" layer="96" rot="R180"/>
+<instance part="P+2" gate="1" x="27.94" y="-30.48" smashed="yes">
+<attribute name="VALUE" x="25.4" y="-30.48" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="C8" gate="G$1" x="66.04" y="-27.94" smashed="yes" rot="R180">
-<attribute name="NAME" x="64.516" y="-28.321" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="64.516" y="-23.241" size="1.778" layer="96" rot="R180"/>
+<instance part="C2" gate="G$1" x="45.72" y="-43.18" smashed="yes" rot="R180">
+<attribute name="NAME" x="44.196" y="-43.561" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="44.196" y="-38.481" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="SUPPLY12" gate="PE" x="63.5" y="-15.24" smashed="yes" rot="R180">
-<attribute name="VALUE" x="67.945" y="-10.541" size="1.778" layer="96" rot="R180"/>
+<instance part="SUPPLY4" gate="PE" x="43.18" y="-30.48" smashed="yes" rot="R180">
+<attribute name="VALUE" x="47.625" y="-25.781" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="C9" gate="G$1" x="104.14" y="48.26" smashed="yes" rot="R180">
-<attribute name="NAME" x="102.616" y="47.879" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="102.616" y="52.959" size="1.778" layer="96" rot="R180"/>
+<instance part="C4" gate="G$1" x="81.28" y="25.4" smashed="yes" rot="R180">
+<attribute name="NAME" x="79.756" y="25.019" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="79.756" y="30.099" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="C10" gate="G$1" x="111.76" y="48.26" smashed="yes" rot="R180">
-<attribute name="NAME" x="110.236" y="47.879" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="110.236" y="52.959" size="1.778" layer="96" rot="R180"/>
+<instance part="C5" gate="G$1" x="88.9" y="25.4" smashed="yes" rot="R180">
+<attribute name="NAME" x="87.376" y="25.019" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="87.376" y="30.099" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="+3V8" gate="G$1" x="119.38" y="-73.66" smashed="yes">
-<attribute name="VALUE" x="121.92" y="-71.12" size="1.778" layer="96" rot="R180"/>
+<instance part="+3V1" gate="G$1" x="101.6" y="-96.52" smashed="yes">
+<attribute name="VALUE" x="104.14" y="-93.98" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="P+6" gate="1" x="109.22" y="-73.66" smashed="yes">
-<attribute name="VALUE" x="111.76" y="-71.12" size="1.778" layer="96" rot="R180"/>
+<instance part="P+3" gate="1" x="91.44" y="-96.52" smashed="yes">
+<attribute name="VALUE" x="93.98" y="-93.98" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="SUPPLY13" gate="PE" x="99.06" y="-76.2" smashed="yes" rot="R180">
-<attribute name="VALUE" x="103.505" y="-71.501" size="1.778" layer="96" rot="R180"/>
+<instance part="SUPPLY5" gate="PE" x="81.28" y="-99.06" smashed="yes" rot="R180">
+<attribute name="VALUE" x="85.725" y="-94.361" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="+3V9" gate="G$1" x="218.44" y="22.86" smashed="yes" rot="R270">
-<attribute name="VALUE" x="213.36" y="25.4" size="1.778" layer="96"/>
+<instance part="+3V2" gate="G$1" x="200.66" y="7.62" smashed="yes" rot="R270">
+<attribute name="VALUE" x="195.58" y="10.16" size="1.778" layer="96"/>
 </instance>
-<instance part="SUPPLY14" gate="PE" x="226.06" y="5.08" smashed="yes">
-<attribute name="VALUE" x="221.615" y="0.381" size="1.778" layer="96"/>
+<instance part="SUPPLY6" gate="PE" x="208.28" y="-17.78" smashed="yes">
+<attribute name="VALUE" x="203.835" y="-22.479" size="1.778" layer="96"/>
 </instance>
-<instance part="D+1" gate="G$1" x="68.58" y="-86.36" smashed="yes" rot="R180">
-<attribute name="NAME" x="69.85" y="-87.63" size="1.778" layer="95" rot="R180"/>
+<instance part="GND2" gate="G$1" x="81.28" y="-109.22" smashed="yes" rot="R180">
+<attribute name="NAME" x="82.55" y="-110.49" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="D-1" gate="G$1" x="81.28" y="-86.36" smashed="yes" rot="R180">
-<attribute name="NAME" x="82.55" y="-87.63" size="1.778" layer="95" rot="R180"/>
+<instance part="+5V2" gate="G$1" x="91.44" y="-109.22" smashed="yes" rot="R180">
+<attribute name="NAME" x="92.71" y="-110.49" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="GND1" gate="G$1" x="99.06" y="-86.36" smashed="yes" rot="R180">
-<attribute name="NAME" x="100.33" y="-87.63" size="1.778" layer="95" rot="R180"/>
+<instance part="3V2" gate="G$1" x="101.6" y="-109.22" smashed="yes" rot="R180">
+<attribute name="NAME" x="102.87" y="-110.49" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="+5V1" gate="G$1" x="109.22" y="-86.36" smashed="yes" rot="R180">
-<attribute name="NAME" x="110.49" y="-87.63" size="1.778" layer="95" rot="R180"/>
+<instance part="SWDIO2" gate="G$1" x="147.32" y="-109.22" smashed="yes" rot="R180">
+<attribute name="NAME" x="148.59" y="-110.49" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="3V1" gate="G$1" x="119.38" y="-86.36" smashed="yes" rot="R180">
-<attribute name="NAME" x="120.65" y="-87.63" size="1.778" layer="95" rot="R180"/>
+<instance part="SWCLK2" gate="G$1" x="160.02" y="-109.22" smashed="yes" rot="R180">
+<attribute name="NAME" x="161.29" y="-110.49" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="SWDIO1" gate="G$1" x="167.64" y="-86.36" smashed="yes" rot="R180">
-<attribute name="NAME" x="168.91" y="-87.63" size="1.778" layer="95" rot="R180"/>
+<instance part="R1" gate="G$1" x="187.96" y="7.62" smashed="yes">
+<attribute name="NAME" x="184.15" y="9.1186" size="1.778" layer="95"/>
+<attribute name="VALUE" x="184.15" y="4.318" size="1.778" layer="96"/>
 </instance>
-<instance part="SWCLK1" gate="G$1" x="177.8" y="-86.36" smashed="yes" rot="R180">
-<attribute name="NAME" x="179.07" y="-87.63" size="1.778" layer="95" rot="R180"/>
+<instance part="STX-&gt;2" gate="G$1" x="180.34" y="-109.22" smashed="yes" rot="R180">
+<attribute name="NAME" x="181.61" y="-110.49" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="R1" gate="G$1" x="205.74" y="22.86" smashed="yes">
-<attribute name="NAME" x="201.93" y="24.3586" size="1.778" layer="95"/>
-<attribute name="VALUE" x="201.93" y="19.558" size="1.778" layer="96"/>
+<instance part="+3V3" gate="G$1" x="88.9" y="-43.18" smashed="yes">
+<attribute name="VALUE" x="86.36" y="-48.26" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="L2" gate="G$1" x="187.96" y="17.78" smashed="yes" rot="R270">
-<attribute name="NAME" x="191.262" y="20.32" size="1.778" layer="95" rot="R270"/>
-<attribute name="VALUE" x="193.421" y="20.32" size="1.778" layer="96" rot="R270" display="off"/>
+<instance part="SUPPLY7" gate="PE" x="88.9" y="-66.04" smashed="yes">
+<attribute name="VALUE" x="84.455" y="-70.739" size="1.778" layer="96"/>
 </instance>
-<instance part="STX-&gt;1" gate="G$1" x="198.12" y="-86.36" smashed="yes" rot="R180">
-<attribute name="NAME" x="199.39" y="-87.63" size="1.778" layer="95" rot="R180"/>
+<instance part="+3V4" gate="G$1" x="71.12" y="12.7" smashed="yes" rot="R90">
+<attribute name="VALUE" x="76.2" y="10.16" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="SRX&lt;-1" gate="G$1" x="208.28" y="-86.36" smashed="yes" rot="R180">
-<attribute name="NAME" x="209.55" y="-87.63" size="1.778" layer="95" rot="R180"/>
+<instance part="SUPPLY8" gate="PE" x="190.5" y="-22.86" smashed="yes" rot="R90">
+<attribute name="VALUE" x="195.199" y="-27.305" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="+3V10" gate="G$1" x="109.22" y="-27.94" smashed="yes">
-<attribute name="VALUE" x="106.68" y="-33.02" size="1.778" layer="96" rot="R90"/>
+<instance part="C6" gate="G$1" x="167.64" y="-20.32" smashed="yes" rot="R90">
+<attribute name="NAME" x="167.259" y="-18.796" size="1.778" layer="95" rot="R90"/>
+<attribute name="VALUE" x="172.339" y="-18.796" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="SUPPLY15" gate="PE" x="109.22" y="-50.8" smashed="yes">
-<attribute name="VALUE" x="104.775" y="-55.499" size="1.778" layer="96"/>
+<instance part="C13" gate="G$1" x="167.64" y="-27.94" smashed="yes" rot="R90">
+<attribute name="NAME" x="167.259" y="-26.416" size="1.778" layer="95" rot="R90"/>
+<attribute name="VALUE" x="172.339" y="-26.416" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="+3V11" gate="G$1" x="91.44" y="35.56" smashed="yes" rot="R90">
-<attribute name="VALUE" x="96.52" y="33.02" size="1.778" layer="96" rot="R180"/>
+<instance part="SUPPLY9" gate="PE" x="147.32" y="-45.72" smashed="yes" rot="R90">
+<attribute name="VALUE" x="152.019" y="-50.165" size="1.778" layer="96" rot="R90"/>
 </instance>
-<instance part="SUPPLY16" gate="PE" x="193.04" y="0" smashed="yes" rot="R90">
-<attribute name="VALUE" x="197.739" y="-4.445" size="1.778" layer="96" rot="R90"/>
+<instance part="ST1" gate="G$1" x="116.84" y="-12.7" smashed="yes" rot="R180">
+<attribute name="NAME" x="144.78" y="7.62" size="1.27" layer="95" rot="R180"/>
+<attribute name="VALUE" x="149.86" y="10.16" size="1.27" layer="96" rot="R180"/>
 </instance>
-<instance part="C11" gate="G$1" x="180.34" y="2.54" smashed="yes" rot="R90">
-<attribute name="NAME" x="179.959" y="4.064" size="1.778" layer="95" rot="R90"/>
-<attribute name="VALUE" x="185.039" y="4.064" size="1.778" layer="96" rot="R90"/>
+<instance part="L3" gate="G$1" x="66.04" y="-55.88" smashed="yes">
+<attribute name="NAME" x="55.8531" y="-50.78655" size="1.782709375" layer="95"/>
+<attribute name="VALUE" x="55.8485" y="-63.523659375" size="1.78353125" layer="96"/>
 </instance>
-<instance part="C12" gate="G$1" x="180.34" y="-5.08" smashed="yes" rot="R90">
-<attribute name="NAME" x="179.959" y="-3.556" size="1.778" layer="95" rot="R90"/>
-<attribute name="VALUE" x="185.039" y="-3.556" size="1.778" layer="96" rot="R90"/>
+<instance part="Z1" gate="G$1" x="205.74" y="-48.26" smashed="yes" rot="R180">
+<attribute name="NAME" x="208.6864" y="-63.6016" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="217.8304" y="-36.1442" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="SUPPLY17" gate="PE" x="165.1" y="-22.86" smashed="yes" rot="R90">
-<attribute name="VALUE" x="169.799" y="-27.305" size="1.778" layer="96" rot="R90"/>
+<instance part="P+4" gate="1" x="190.5" y="-45.72" smashed="yes">
+<attribute name="VALUE" x="187.96" y="-45.72" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="ST2" gate="G$1" x="134.62" y="10.16" smashed="yes" rot="R180">
-<attribute name="NAME" x="162.56" y="30.48" size="1.27" layer="95" rot="R180"/>
-<attribute name="VALUE" x="167.64" y="33.02" size="1.27" layer="96" rot="R180"/>
+<instance part="SUPPLY19" gate="PE" x="223.52" y="-53.34" smashed="yes">
+<attribute name="VALUE" x="219.075" y="-58.039" size="1.778" layer="96"/>
 </instance>
-<instance part="SWO1" gate="G$1" x="147.32" y="-86.36" smashed="yes" rot="R180">
-<attribute name="NAME" x="148.59" y="-87.63" size="1.778" layer="95" rot="R180"/>
+<instance part="+3V5" gate="G$1" x="190.5" y="-53.34" smashed="yes" rot="R90">
+<attribute name="VALUE" x="195.58" y="-55.88" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="L4" gate="G$1" x="86.36" y="-40.64" smashed="yes">
-<attribute name="NAME" x="76.1731" y="-35.54655" size="1.782709375" layer="95"/>
-<attribute name="VALUE" x="76.1685" y="-48.283659375" size="1.78353125" layer="96"/>
+<instance part="+3V6" gate="G$1" x="160.02" y="-55.88" smashed="yes" rot="R180">
+<attribute name="VALUE" x="162.56" y="-50.8" size="1.778" layer="96" rot="R270"/>
 </instance>
-<instance part="Z2" gate="G$1" x="228.6" y="-33.02" smashed="yes" rot="R180">
-<attribute name="NAME" x="231.5464" y="-48.3616" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="233.0704" y="-20.9042" size="1.778" layer="96" rot="R180"/>
+<instance part="+3V7" gate="G$1" x="132.08" y="-58.42" smashed="yes" rot="R180">
+<attribute name="VALUE" x="134.62" y="-53.34" size="1.778" layer="96" rot="R270"/>
 </instance>
-<instance part="P+7" gate="1" x="213.36" y="-30.48" smashed="yes">
-<attribute name="VALUE" x="210.82" y="-30.48" size="1.778" layer="96" rot="R180"/>
+<instance part="U$1" gate="G$1" x="195.58" y="-15.24" smashed="yes">
+<attribute name="NAME" x="191.77" y="-12.7" size="1.778" layer="95"/>
+<attribute name="VALUE" x="184.15" y="-8.89" size="1.778" layer="96"/>
 </instance>
-<instance part="SUPPLY18" gate="PE" x="246.38" y="-38.1" smashed="yes">
-<attribute name="VALUE" x="241.935" y="-42.799" size="1.778" layer="96"/>
+<instance part="N1" gate="G$1" x="162.56" y="38.1" smashed="yes" rot="R180">
+<attribute name="NAME" x="167.64" y="22.86" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="167.64" y="55.88" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="+3V12" gate="G$1" x="213.36" y="-38.1" smashed="yes" rot="R90">
-<attribute name="VALUE" x="218.44" y="-40.64" size="1.778" layer="96" rot="R180"/>
+<instance part="SUPPLY20" gate="PE" x="190.5" y="58.42" smashed="yes" rot="R180">
+<attribute name="VALUE" x="194.945" y="63.119" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="+3V13" gate="G$1" x="172.72" y="-15.24" smashed="yes" rot="R180">
-<attribute name="VALUE" x="175.26" y="-10.16" size="1.778" layer="96" rot="R270"/>
+<instance part="+3V8" gate="G$1" x="198.12" y="20.32" smashed="yes" rot="R180">
+<attribute name="VALUE" x="200.66" y="25.4" size="1.778" layer="96" rot="R270"/>
 </instance>
-<instance part="+3V14" gate="G$1" x="149.86" y="-35.56" smashed="yes" rot="R180">
-<attribute name="VALUE" x="152.4" y="-30.48" size="1.778" layer="96" rot="R270"/>
+<instance part="C15" gate="G$1" x="220.98" y="43.18" smashed="yes" rot="R180">
+<attribute name="NAME" x="219.456" y="42.799" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="219.456" y="47.879" size="1.778" layer="96" rot="R180"/>
 </instance>
-<instance part="U$2" gate="G$1" x="213.36" y="7.62" smashed="yes">
-<attribute name="NAME" x="209.55" y="10.16" size="1.778" layer="95"/>
-<attribute name="VALUE" x="209.55" y="3.81" size="1.778" layer="96"/>
+<instance part="C14" gate="G$1" x="228.6" y="43.18" smashed="yes" rot="R180">
+<attribute name="NAME" x="227.076" y="42.799" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="227.076" y="47.879" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="C3" gate="G$1" x="167.64" y="-35.56" smashed="yes" rot="R90">
+<attribute name="NAME" x="167.259" y="-34.036" size="1.778" layer="95" rot="R90"/>
+<attribute name="VALUE" x="172.339" y="-34.036" size="1.778" layer="96" rot="R90"/>
+</instance>
+<instance part="C7" gate="G$1" x="167.64" y="-43.18" smashed="yes" rot="R90">
+<attribute name="NAME" x="167.259" y="-41.656" size="1.778" layer="95" rot="R90"/>
+<attribute name="VALUE" x="172.339" y="-41.656" size="1.778" layer="96" rot="R90"/>
+</instance>
+<instance part="C8" gate="G$1" x="96.52" y="25.4" smashed="yes" rot="R180">
+<attribute name="NAME" x="94.996" y="25.019" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="94.996" y="30.099" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="C9" gate="G$1" x="104.14" y="25.4" smashed="yes" rot="R180">
+<attribute name="NAME" x="102.616" y="25.019" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="102.616" y="30.099" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="L1" gate="G$1" x="170.18" y="2.54" smashed="yes" rot="R270">
+<attribute name="NAME" x="173.482" y="5.08" size="1.778" layer="95" rot="R270"/>
+<attribute name="VALUE" x="175.641" y="5.08" size="1.778" layer="96" rot="R270"/>
 </instance>
 </instances>
 <busses>
@@ -2302,358 +2620,441 @@ Source: http://datasheets.maxim-ic.com/en/ds/MAX7042.pdf</description>
 <segment>
 <pinref part="USBC1" gate="G$1" pin="VBUS"/>
 <pinref part="P+1" gate="1" pin="+5V"/>
-<wire x1="5.08" y1="15.24" x2="12.7" y2="15.24" width="0.1524" layer="91"/>
+<wire x1="-20.32" y1="25.4" x2="-12.7" y2="25.4" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="P+5" gate="1" pin="+5V"/>
-<wire x1="48.26" y1="-17.78" x2="48.26" y2="-35.56" width="0.1524" layer="91"/>
-<pinref part="C8" gate="G$1" pin="1"/>
-<wire x1="66.04" y1="-30.48" x2="66.04" y2="-35.56" width="0.1524" layer="91"/>
-<wire x1="66.04" y1="-35.56" x2="58.42" y2="-35.56" width="0.1524" layer="91"/>
-<pinref part="C7" gate="G$1" pin="1"/>
-<wire x1="58.42" y1="-35.56" x2="48.26" y2="-35.56" width="0.1524" layer="91"/>
-<wire x1="58.42" y1="-30.48" x2="58.42" y2="-35.56" width="0.1524" layer="91"/>
-<junction x="58.42" y="-35.56"/>
-<wire x1="71.12" y1="-38.1" x2="66.04" y2="-38.1" width="0.1524" layer="91"/>
-<wire x1="66.04" y1="-38.1" x2="66.04" y2="-35.56" width="0.1524" layer="91"/>
-<junction x="66.04" y="-35.56"/>
-<wire x1="71.12" y1="-43.18" x2="66.04" y2="-43.18" width="0.1524" layer="91"/>
-<wire x1="66.04" y1="-43.18" x2="66.04" y2="-38.1" width="0.1524" layer="91"/>
-<junction x="66.04" y="-38.1"/>
-<pinref part="L4" gate="G$1" pin="IN"/>
-<pinref part="L4" gate="G$1" pin="EN"/>
+<pinref part="P+2" gate="1" pin="+5V"/>
+<wire x1="27.94" y1="-33.02" x2="27.94" y2="-50.8" width="0.1524" layer="91"/>
+<pinref part="C2" gate="G$1" pin="1"/>
+<wire x1="45.72" y1="-45.72" x2="45.72" y2="-50.8" width="0.1524" layer="91"/>
+<wire x1="45.72" y1="-50.8" x2="38.1" y2="-50.8" width="0.1524" layer="91"/>
+<pinref part="C1" gate="G$1" pin="1"/>
+<wire x1="38.1" y1="-50.8" x2="27.94" y2="-50.8" width="0.1524" layer="91"/>
+<wire x1="38.1" y1="-45.72" x2="38.1" y2="-50.8" width="0.1524" layer="91"/>
+<junction x="38.1" y="-50.8"/>
+<wire x1="50.8" y1="-53.34" x2="45.72" y2="-53.34" width="0.1524" layer="91"/>
+<wire x1="45.72" y1="-53.34" x2="45.72" y2="-50.8" width="0.1524" layer="91"/>
+<junction x="45.72" y="-50.8"/>
+<wire x1="50.8" y1="-58.42" x2="45.72" y2="-58.42" width="0.1524" layer="91"/>
+<wire x1="45.72" y1="-58.42" x2="45.72" y2="-53.34" width="0.1524" layer="91"/>
+<junction x="45.72" y="-53.34"/>
+<pinref part="L3" gate="G$1" pin="IN"/>
+<pinref part="L3" gate="G$1" pin="EN"/>
 </segment>
 <segment>
-<pinref part="P+6" gate="1" pin="+5V"/>
-<wire x1="109.22" y1="-83.82" x2="109.22" y2="-76.2" width="0.1524" layer="91"/>
-<pinref part="+5V1" gate="G$1" pin="TP"/>
+<pinref part="P+3" gate="1" pin="+5V"/>
+<wire x1="91.44" y1="-106.68" x2="91.44" y2="-99.06" width="0.1524" layer="91"/>
+<pinref part="+5V2" 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="226.06" y1="-33.02" x2="213.36" y2="-33.02" width="0.1524" layer="91"/>
+<pinref part="Z1" gate="G$1" pin="C"/>
+<pinref part="P+4" gate="1" pin="+5V"/>
+<wire x1="203.2" y1="-48.26" x2="190.5" y2="-48.26" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="PE" class="0">
 <segment>
 <pinref part="R2" gate="G$1" pin="2"/>
-<wire x1="-55.88" y1="2.54" x2="-60.96" y2="2.54" width="0.1524" layer="91"/>
+<wire x1="-81.28" y1="12.7" x2="-88.9" y2="12.7" width="0.1524" layer="91"/>
 <pinref part="SUPPLY2" gate="PE" pin="PE"/>
-<wire x1="-60.96" y1="2.54" x2="-63.5" y2="2.54" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="SUPPLY3" gate="PE" pin="PE"/>
 <pinref part="USBC1" gate="G$1" pin="GND"/>
-<wire x1="12.7" y1="-2.54" x2="5.08" y2="-2.54" width="0.1524" layer="91"/>
+<wire x1="-12.7" y1="7.62" x2="-20.32" y2="7.62" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="SUPPLY12" gate="PE" pin="PE"/>
-<wire x1="63.5" y1="-17.78" x2="63.5" y2="-20.32" width="0.1524" layer="91"/>
-<pinref part="C7" gate="G$1" pin="2"/>
-<wire x1="63.5" y1="-20.32" x2="58.42" y2="-20.32" width="0.1524" layer="91"/>
-<wire x1="58.42" y1="-20.32" x2="58.42" y2="-22.86" width="0.1524" layer="91"/>
+<pinref part="SUPPLY4" gate="PE" pin="PE"/>
+<wire x1="43.18" y1="-33.02" x2="43.18" y2="-35.56" width="0.1524" layer="91"/>
+<pinref part="C1" gate="G$1" pin="2"/>
+<wire x1="43.18" y1="-35.56" x2="38.1" y2="-35.56" width="0.1524" layer="91"/>
+<wire x1="38.1" y1="-35.56" x2="38.1" y2="-38.1" width="0.1524" layer="91"/>
+<pinref part="C2" gate="G$1" pin="2"/>
+<wire x1="45.72" y1="-38.1" x2="45.72" y2="-35.56" width="0.1524" layer="91"/>
+<wire x1="45.72" y1="-35.56" x2="43.18" y2="-35.56" width="0.1524" layer="91"/>
+<junction x="43.18" y="-35.56"/>
+</segment>
+<segment>
+<pinref part="C5" gate="G$1" pin="2"/>
+<wire x1="88.9" y1="30.48" x2="88.9" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="88.9" y1="33.02" x2="83.82" y2="33.02" width="0.1524" layer="91"/>
+<pinref part="C4" gate="G$1" pin="2"/>
+<wire x1="83.82" y1="33.02" x2="81.28" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="81.28" y1="33.02" x2="81.28" y2="30.48" width="0.1524" layer="91"/>
+<pinref part="SUPPLY1" gate="PE" pin="PE"/>
+<wire x1="83.82" y1="35.56" x2="83.82" y2="33.02" width="0.1524" layer="91"/>
+<junction x="83.82" y="33.02"/>
+<wire x1="111.76" y1="10.16" x2="111.76" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="111.76" y1="33.02" x2="104.14" y2="33.02" width="0.1524" layer="91"/>
+<junction x="88.9" y="33.02"/>
+<pinref part="ST1" gate="G$1" pin="VSS"/>
 <pinref part="C8" gate="G$1" pin="2"/>
-<wire x1="66.04" y1="-22.86" x2="66.04" y2="-20.32" width="0.1524" layer="91"/>
-<wire x1="66.04" y1="-20.32" x2="63.5" y2="-20.32" width="0.1524" layer="91"/>
-<junction x="63.5" y="-20.32"/>
-</segment>
-<segment>
-<pinref part="C10" gate="G$1" pin="2"/>
-<wire x1="111.76" y1="53.34" x2="111.76" y2="55.88" width="0.1524" layer="91"/>
-<wire x1="111.76" y1="55.88" x2="106.68" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="104.14" y1="33.02" x2="96.52" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="96.52" y1="33.02" x2="88.9" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="96.52" y1="30.48" x2="96.52" y2="33.02" width="0.1524" layer="91"/>
+<junction x="96.52" y="33.02"/>
 <pinref part="C9" gate="G$1" pin="2"/>
-<wire x1="106.68" y1="55.88" x2="104.14" y2="55.88" width="0.1524" layer="91"/>
-<wire x1="104.14" y1="55.88" x2="104.14" y2="53.34" width="0.1524" layer="91"/>
-<pinref part="SUPPLY11" gate="PE" pin="PE"/>
-<wire x1="106.68" y1="58.42" x2="106.68" y2="55.88" width="0.1524" layer="91"/>
-<junction x="106.68" y="55.88"/>
-<wire x1="129.54" y1="33.02" x2="129.54" y2="55.88" width="0.1524" layer="91"/>
-<wire x1="129.54" y1="55.88" x2="111.76" y2="55.88" width="0.1524" layer="91"/>
-<junction x="111.76" y="55.88"/>
-<pinref part="ST2" gate="G$1" pin="VSS"/>
+<wire x1="104.14" y1="30.48" x2="104.14" y2="33.02" width="0.1524" layer="91"/>
+<junction x="104.14" y="33.02"/>
 </segment>
 <segment>
-<pinref part="SUPPLY13" gate="PE" pin="PE"/>
-<wire x1="99.06" y1="-83.82" x2="99.06" y2="-78.74" width="0.1524" layer="91"/>
-<pinref part="GND1" gate="G$1" pin="TP"/>
+<pinref part="SUPPLY5" gate="PE" pin="PE"/>
+<wire x1="81.28" y1="-106.68" x2="81.28" y2="-101.6" width="0.1524" layer="91"/>
+<pinref part="GND2" gate="G$1" pin="TP"/>
 </segment>
 <segment>
-<wire x1="226.06" y1="7.62" x2="218.44" y2="7.62" width="0.1524" layer="91"/>
-<pinref part="SUPPLY14" gate="PE" pin="PE"/>
-<pinref part="U$2" gate="G$1" pin="2"/>
+<wire x1="208.28" y1="-15.24" x2="200.66" y2="-15.24" width="0.1524" layer="91"/>
+<pinref part="SUPPLY6" gate="PE" pin="PE"/>
+<pinref part="U$1" gate="G$1" pin="2"/>
 </segment>
 <segment>
-<pinref part="SUPPLY15" gate="PE" pin="PE"/>
-<wire x1="109.22" y1="-43.18" x2="109.22" y2="-48.26" width="0.1524" layer="91"/>
-<pinref part="L4" gate="G$1" pin="GND"/>
-<wire x1="101.6" y1="-40.64" x2="109.22" y2="-40.64" width="0.1524" layer="91"/>
-<wire x1="109.22" y1="-40.64" x2="109.22" y2="-43.18" width="0.1524" layer="91"/>
+<pinref part="SUPPLY7" gate="PE" pin="PE"/>
+<wire x1="88.9" y1="-55.88" x2="88.9" y2="-63.5" width="0.1524" layer="91"/>
+<pinref part="L3" gate="G$1" pin="GND"/>
+<wire x1="81.28" y1="-55.88" x2="88.9" y2="-55.88" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="C12" gate="G$1" pin="2"/>
-<wire x1="185.42" y1="-5.08" x2="187.96" y2="-5.08" width="0.1524" layer="91"/>
-<wire x1="187.96" y1="-5.08" x2="187.96" y2="0" width="0.1524" layer="91"/>
-<pinref part="C11" gate="G$1" pin="2"/>
-<wire x1="187.96" y1="0" x2="187.96" y2="2.54" width="0.1524" layer="91"/>
-<wire x1="187.96" y1="2.54" x2="185.42" y2="2.54" width="0.1524" layer="91"/>
-<pinref part="SUPPLY16" gate="PE" pin="PE"/>
-<wire x1="190.5" y1="0" x2="187.96" y2="0" width="0.1524" layer="91"/>
-<junction x="187.96" y="0"/>
+<pinref part="C13" gate="G$1" pin="2"/>
+<wire x1="172.72" y1="-27.94" x2="175.26" y2="-27.94" width="0.1524" layer="91"/>
+<wire x1="175.26" y1="-27.94" x2="175.26" y2="-22.86" width="0.1524" layer="91"/>
+<pinref part="C6" gate="G$1" pin="2"/>
+<wire x1="175.26" y1="-22.86" x2="175.26" y2="-20.32" width="0.1524" layer="91"/>
+<wire x1="175.26" y1="-20.32" x2="172.72" y2="-20.32" width="0.1524" layer="91"/>
+<pinref part="SUPPLY8" gate="PE" pin="PE"/>
+<wire x1="187.96" y1="-22.86" x2="175.26" y2="-22.86" width="0.1524" layer="91"/>
+<junction x="175.26" y="-22.86"/>
+<pinref part="C3" gate="G$1" pin="2"/>
+<wire x1="172.72" y1="-35.56" x2="175.26" y2="-35.56" width="0.1524" layer="91"/>
+<wire x1="175.26" y1="-35.56" x2="175.26" y2="-27.94" width="0.1524" layer="91"/>
+<junction x="175.26" y="-27.94"/>
+<pinref part="C7" gate="G$1" pin="2"/>
+<wire x1="172.72" y1="-43.18" x2="175.26" y2="-43.18" width="0.1524" layer="91"/>
+<wire x1="175.26" y1="-43.18" x2="175.26" y2="-35.56" width="0.1524" layer="91"/>
+<junction x="175.26" y="-35.56"/>
 </segment>
 <segment>
-<wire x1="149.86" y1="-15.24" x2="149.86" y2="-22.86" width="0.1524" layer="91"/>
-<pinref part="SUPPLY17" gate="PE" pin="PE"/>
-<wire x1="149.86" y1="-22.86" x2="162.56" y2="-22.86" width="0.1524" layer="91"/>
-<wire x1="147.32" y1="-15.24" x2="147.32" y2="-22.86" width="0.1524" layer="91"/>
-<wire x1="147.32" y1="-22.86" x2="149.86" y2="-22.86" width="0.1524" layer="91"/>
-<junction x="149.86" y="-22.86"/>
-<pinref part="ST2" gate="G$1" pin="VSS2"/>
-<pinref part="ST2" gate="G$1" pin="VSS3"/>
+<wire x1="132.08" y1="-38.1" x2="132.08" y2="-45.72" width="0.1524" layer="91"/>
+<pinref part="SUPPLY9" gate="PE" pin="PE"/>
+<wire x1="132.08" y1="-45.72" x2="144.78" y2="-45.72" width="0.1524" layer="91"/>
+<wire x1="129.54" y1="-38.1" x2="129.54" y2="-45.72" width="0.1524" layer="91"/>
+<wire x1="129.54" y1="-45.72" x2="132.08" y2="-45.72" width="0.1524" layer="91"/>
+<junction x="132.08" y="-45.72"/>
+<pinref part="ST1" gate="G$1" pin="VSS2"/>
+<pinref part="ST1" gate="G$1" pin="VSS3"/>
 </segment>
 <segment>
-<pinref part="SUPPLY18" gate="PE" pin="PE"/>
-<pinref part="Z2" gate="G$1" pin="P$1"/>
-<wire x1="246.38" y1="-35.56" x2="238.76" y2="-35.56" width="0.1524" layer="91"/>
+<pinref part="SUPPLY19" gate="PE" pin="PE"/>
+<pinref part="Z1" gate="G$1" pin="P$1"/>
+<wire x1="223.52" y1="-50.8" x2="215.9" y2="-50.8" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<pinref part="N1" gate="G$1" pin="VSS"/>
+<wire x1="177.8" y1="48.26" x2="190.5" y2="48.26" width="0.1524" layer="91"/>
+<wire x1="190.5" y1="48.26" x2="190.5" y2="55.88" width="0.1524" layer="91"/>
+<pinref part="SUPPLY20" gate="PE" pin="PE"/>
 </segment>
 </net>
 <net name="D+" class="0">
 <segment>
-<wire x1="-53.34" y1="-7.62" x2="-68.58" y2="-7.62" width="0.1524" layer="91"/>
-<label x="-71.12" y="-7.62" size="1.778" layer="95" rot="R270"/>
-<wire x1="-53.34" y1="-7.62" x2="-53.34" y2="-2.54" width="0.1524" layer="91"/>
-<wire x1="-53.34" y1="-2.54" x2="-35.56" y2="-2.54" width="0.1524" layer="91"/>
+<wire x1="-78.74" y1="2.54" x2="-93.98" y2="2.54" width="0.1524" layer="91"/>
+<label x="-96.52" y="2.54" size="1.778" layer="95" rot="R270"/>
+<wire x1="-78.74" y1="2.54" x2="-78.74" y2="7.62" width="0.1524" layer="91"/>
+<wire x1="-78.74" y1="7.62" x2="-50.8" y2="7.62" width="0.1524" layer="91"/>
 <pinref part="USBC1" gate="G$1" pin="D+"/>
-<wire x1="-35.56" y1="-2.54" x2="-25.4" y2="-2.54" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<wire x1="68.58" y1="-83.82" x2="68.58" y2="-73.66" width="0.1524" layer="91"/>
-<label x="68.58" y="-73.66" size="1.778" layer="95"/>
-<pinref part="D+1" gate="G$1" pin="TP"/>
+<wire x1="63.5" y1="-12.7" x2="63.5" y2="-2.54" width="0.1524" layer="91"/>
+<label x="63.5" y="-2.54" size="1.778" layer="95"/>
+<pinref part="ST1" gate="G$1" pin="D+"/>
+<wire x1="96.52" y1="-17.78" x2="63.5" y2="-17.78" width="0.1524" layer="91"/>
+<wire x1="63.5" y1="-17.78" x2="63.5" y2="-12.7" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<wire x1="81.28" y1="10.16" x2="81.28" y2="20.32" width="0.1524" layer="91"/>
-<label x="81.28" y="20.32" size="1.778" layer="95"/>
-<pinref part="ST2" gate="G$1" pin="D+"/>
-<wire x1="114.3" y1="5.08" x2="81.28" y2="5.08" width="0.1524" layer="91"/>
-<wire x1="81.28" y1="5.08" x2="81.28" y2="10.16" width="0.1524" layer="91"/>
-</segment>
-<segment>
-<wire x1="220.98" y1="-50.8" x2="220.98" y2="-60.96" width="0.1524" layer="91"/>
-<label x="220.98" y="-60.96" size="1.778" layer="95" rot="R180"/>
-<wire x1="220.98" y1="-43.18" x2="220.98" y2="-50.8" width="0.1524" layer="91"/>
-<pinref part="Z2" gate="G$1" pin="C3"/>
-<wire x1="220.98" y1="-43.18" x2="226.06" y2="-43.18" width="0.1524" layer="91"/>
+<wire x1="198.12" y1="-58.42" x2="198.12" y2="-76.2" width="0.1524" layer="91"/>
+<label x="198.12" y="-76.2" size="1.778" layer="95" rot="R180"/>
+<pinref part="Z1" gate="G$1" pin="C3"/>
+<wire x1="198.12" y1="-58.42" x2="203.2" y2="-58.42" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="D-" class="0">
 <segment>
-<wire x1="-50.8" y1="-15.24" x2="-68.58" y2="-15.24" width="0.1524" layer="91"/>
-<label x="-71.12" y="-15.24" size="1.778" layer="95" rot="R270"/>
+<wire x1="-76.2" y1="-5.08" x2="-93.98" y2="-5.08" width="0.1524" layer="91"/>
+<label x="-96.52" y="-5.08" size="1.778" layer="95" rot="R270"/>
 <pinref part="USBC1" gate="G$1" pin="D-"/>
-<wire x1="-25.4" y1="-5.08" x2="-50.8" y2="-5.08" width="0.1524" layer="91"/>
-<wire x1="-50.8" y1="-5.08" x2="-50.8" y2="-15.24" width="0.1524" layer="91"/>
+<wire x1="-50.8" y1="5.08" x2="-76.2" y2="5.08" width="0.1524" layer="91"/>
+<wire x1="-76.2" y1="5.08" x2="-76.2" y2="-5.08" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<wire x1="81.28" y1="-83.82" x2="81.28" y2="-73.66" width="0.1524" layer="91"/>
-<label x="81.28" y="-73.66" size="1.778" layer="95"/>
-<pinref part="D-1" gate="G$1" pin="TP"/>
+<wire x1="71.12" y1="-12.7" x2="71.12" y2="-2.54" width="0.1524" layer="91"/>
+<label x="71.12" y="-2.54" size="1.778" layer="95"/>
+<pinref part="ST1" gate="G$1" pin="D-"/>
+<wire x1="96.52" y1="-15.24" x2="71.12" y2="-15.24" width="0.1524" layer="91"/>
+<wire x1="71.12" y1="-15.24" x2="71.12" y2="-12.7" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<wire x1="88.9" y1="10.16" x2="88.9" y2="20.32" width="0.1524" layer="91"/>
-<label x="88.9" y="20.32" size="1.778" layer="95"/>
-<pinref part="ST2" gate="G$1" pin="D-"/>
-<wire x1="114.3" y1="7.62" x2="88.9" y2="7.62" width="0.1524" layer="91"/>
-<wire x1="88.9" y1="7.62" x2="88.9" y2="10.16" width="0.1524" layer="91"/>
-</segment>
-<segment>
-<wire x1="218.44" y1="-25.4" x2="218.44" y2="-15.24" width="0.1524" layer="91"/>
-<label x="218.44" y="-15.24" size="1.778" layer="95"/>
-<pinref part="Z2" gate="G$1" pin="C2"/>
-<wire x1="226.06" y1="-27.94" x2="218.44" y2="-27.94" width="0.1524" layer="91"/>
-<wire x1="218.44" y1="-27.94" x2="218.44" y2="-25.4" width="0.1524" layer="91"/>
+<wire x1="195.58" y1="-43.18" x2="195.58" y2="-30.48" width="0.1524" layer="91"/>
+<label x="195.58" y="-30.48" size="1.778" layer="95"/>
+<pinref part="Z1" gate="G$1" pin="C2"/>
+<wire x1="203.2" y1="-43.18" x2="195.58" y2="-43.18" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$1" class="0">
 <segment>
 <pinref part="USBC1" gate="G$1" pin="CC"/>
-<wire x1="-33.02" y1="0" x2="-25.4" y2="0" width="0.1524" layer="91"/>
+<wire x1="-58.42" y1="10.16" x2="-50.8" y2="10.16" width="0.1524" layer="91"/>
 <pinref part="R2" gate="G$1" pin="1"/>
-<wire x1="-45.72" y1="2.54" x2="-33.02" y2="2.54" width="0.1524" layer="91"/>
-<wire x1="-33.02" y1="2.54" x2="-33.02" y2="0" width="0.1524" layer="91"/>
+<wire x1="-71.12" y1="12.7" x2="-58.42" y2="12.7" width="0.1524" layer="91"/>
+<wire x1="-58.42" y1="12.7" x2="-58.42" y2="10.16" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="+3V3" class="0">
 <segment>
-<pinref part="+3V8" gate="G$1" pin="+3V3"/>
-<wire x1="119.38" y1="-83.82" x2="119.38" y2="-76.2" width="0.1524" layer="91"/>
-<pinref part="3V1" gate="G$1" pin="TP"/>
+<pinref part="+3V1" gate="G$1" pin="+3V3"/>
+<wire x1="101.6" y1="-106.68" x2="101.6" y2="-99.06" width="0.1524" layer="91"/>
+<pinref part="3V2" gate="G$1" pin="TP"/>
 </segment>
 <segment>
-<pinref part="+3V9" gate="G$1" pin="+3V3"/>
-<wire x1="210.82" y1="22.86" x2="215.9" y2="22.86" width="0.1524" layer="91"/>
+<pinref part="+3V2" gate="G$1" pin="+3V3"/>
+<wire x1="193.04" y1="7.62" x2="198.12" y2="7.62" width="0.1524" layer="91"/>
 <pinref part="R1" gate="G$1" pin="2"/>
 </segment>
 <segment>
-<pinref part="+3V10" gate="G$1" pin="+3V3"/>
-<wire x1="101.6" y1="-38.1" x2="109.22" y2="-38.1" width="0.1524" layer="91"/>
-<wire x1="109.22" y1="-38.1" x2="109.22" y2="-30.48" width="0.1524" layer="91"/>
-<pinref part="L4" gate="G$1" pin="OUT"/>
+<pinref part="+3V3" gate="G$1" pin="+3V3"/>
+<wire x1="81.28" y1="-53.34" x2="88.9" y2="-53.34" width="0.1524" layer="91"/>
+<wire x1="88.9" y1="-53.34" x2="88.9" y2="-45.72" width="0.1524" layer="91"/>
+<pinref part="L3" gate="G$1" pin="OUT"/>
 </segment>
 <segment>
-<wire x1="111.76" y1="35.56" x2="109.22" y2="35.56" width="0.1524" layer="91"/>
-<pinref part="C10" gate="G$1" pin="1"/>
-<wire x1="109.22" y1="35.56" x2="104.14" y2="35.56" width="0.1524" layer="91"/>
-<wire x1="111.76" y1="45.72" x2="111.76" y2="35.56" width="0.1524" layer="91"/>
+<wire x1="88.9" y1="12.7" x2="83.82" y2="12.7" width="0.1524" layer="91"/>
+<pinref part="C5" gate="G$1" pin="1"/>
+<wire x1="83.82" y1="12.7" x2="81.28" y2="12.7" width="0.1524" layer="91"/>
+<wire x1="88.9" y1="22.86" x2="88.9" y2="12.7" width="0.1524" layer="91"/>
+<pinref part="C4" gate="G$1" pin="1"/>
+<wire x1="81.28" y1="22.86" x2="81.28" y2="12.7" width="0.1524" layer="91"/>
+<pinref part="+3V4" gate="G$1" pin="+3V3"/>
+<wire x1="73.66" y1="12.7" x2="81.28" y2="12.7" width="0.1524" layer="91"/>
+<junction x="81.28" y="12.7"/>
+<wire x1="96.52" y1="-5.08" x2="83.82" y2="-5.08" width="0.1524" layer="91"/>
+<wire x1="83.82" y1="-5.08" x2="83.82" y2="12.7" width="0.1524" layer="91"/>
+<junction x="83.82" y="12.7"/>
+<pinref part="ST1" gate="G$1" pin="VDD2"/>
+<pinref part="C8" gate="G$1" pin="1"/>
+<wire x1="96.52" y1="22.86" x2="96.52" y2="12.7" width="0.1524" layer="91"/>
+<wire x1="96.52" y1="12.7" x2="88.9" y2="12.7" width="0.1524" layer="91"/>
+<junction x="88.9" y="12.7"/>
 <pinref part="C9" gate="G$1" pin="1"/>
-<wire x1="104.14" y1="45.72" x2="104.14" y2="35.56" width="0.1524" layer="91"/>
-<pinref part="+3V11" gate="G$1" pin="+3V3"/>
-<wire x1="93.98" y1="35.56" x2="104.14" y2="35.56" width="0.1524" layer="91"/>
-<junction x="104.14" y="35.56"/>
-<wire x1="114.3" y1="17.78" x2="109.22" y2="17.78" width="0.1524" layer="91"/>
-<wire x1="109.22" y1="17.78" x2="109.22" y2="35.56" width="0.1524" layer="91"/>
-<junction x="109.22" y="35.56"/>
-<pinref part="ST2" gate="G$1" pin="VDD2"/>
+<wire x1="104.14" y1="22.86" x2="104.14" y2="12.7" width="0.1524" layer="91"/>
+<wire x1="104.14" y1="12.7" x2="96.52" y2="12.7" width="0.1524" layer="91"/>
+<junction x="96.52" y="12.7"/>
 </segment>
 <segment>
-<pinref part="C12" gate="G$1" pin="1"/>
-<wire x1="177.8" y1="-5.08" x2="172.72" y2="-5.08" width="0.1524" layer="91"/>
-<pinref part="C11" gate="G$1" pin="1"/>
-<wire x1="177.8" y1="2.54" x2="172.72" y2="2.54" width="0.1524" layer="91"/>
-<wire x1="172.72" y1="2.54" x2="172.72" y2="0" width="0.1524" layer="91"/>
-<wire x1="172.72" y1="0" x2="172.72" y2="-5.08" width="0.1524" layer="91"/>
-<wire x1="162.56" y1="0" x2="172.72" y2="0" width="0.1524" layer="91"/>
-<junction x="172.72" y="0"/>
-<wire x1="162.56" y1="10.16" x2="172.72" y2="10.16" width="0.1524" layer="91"/>
-<wire x1="172.72" y1="10.16" x2="172.72" y2="2.54" width="0.1524" layer="91"/>
-<junction x="172.72" y="2.54"/>
-<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="172.72" y1="-12.7" x2="172.72" y2="-5.08" width="0.1524" layer="91"/>
-<junction x="172.72" y="-5.08"/>
+<pinref part="C13" gate="G$1" pin="1"/>
+<wire x1="165.1" y1="-27.94" x2="160.02" y2="-27.94" width="0.1524" layer="91"/>
+<pinref part="C6" gate="G$1" pin="1"/>
+<wire x1="165.1" y1="-20.32" x2="160.02" y2="-20.32" width="0.1524" layer="91"/>
+<wire x1="160.02" y1="-20.32" x2="160.02" y2="-22.86" width="0.1524" layer="91"/>
+<wire x1="160.02" y1="-22.86" x2="160.02" y2="-27.94" width="0.1524" layer="91"/>
+<wire x1="144.78" y1="-22.86" x2="160.02" y2="-22.86" width="0.1524" layer="91"/>
+<junction x="160.02" y="-22.86"/>
+<wire x1="144.78" y1="-12.7" x2="160.02" y2="-12.7" width="0.1524" layer="91"/>
+<wire x1="160.02" y1="-12.7" x2="160.02" y2="-20.32" width="0.1524" layer="91"/>
+<junction x="160.02" y="-20.32"/>
+<pinref part="ST1" gate="G$1" pin="VDD"/>
+<pinref part="ST1" gate="G$1" pin="VDDA/VREF"/>
+<pinref part="+3V6" gate="G$1" pin="+3V3"/>
+<wire x1="160.02" y1="-53.34" x2="160.02" y2="-43.18" width="0.1524" layer="91"/>
+<junction x="160.02" y="-27.94"/>
+<pinref part="C3" gate="G$1" pin="1"/>
+<wire x1="160.02" y1="-43.18" x2="160.02" y2="-35.56" width="0.1524" layer="91"/>
+<wire x1="160.02" y1="-35.56" x2="160.02" y2="-27.94" width="0.1524" layer="91"/>
+<wire x1="165.1" y1="-35.56" x2="160.02" y2="-35.56" width="0.1524" layer="91"/>
+<junction x="160.02" y="-35.56"/>
+<pinref part="C7" gate="G$1" pin="1"/>
+<wire x1="165.1" y1="-43.18" x2="160.02" y2="-43.18" width="0.1524" layer="91"/>
+<junction x="160.02" y="-43.18"/>
 </segment>
 <segment>
-<pinref part="+3V12" gate="G$1" pin="+3V3"/>
-<pinref part="Z2" gate="G$1" pin="C1"/>
-<wire x1="215.9" y1="-38.1" x2="226.06" y2="-38.1" width="0.1524" layer="91"/>
+<pinref part="+3V5" gate="G$1" pin="+3V3"/>
+<pinref part="Z1" gate="G$1" pin="C1"/>
+<wire x1="193.04" y1="-53.34" x2="203.2" y2="-53.34" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="ST2" gate="G$1" pin="PH3/BOOT0"/>
-<wire x1="144.78" y1="-15.24" x2="144.78" y2="-30.48" width="0.1524" layer="91"/>
-<pinref part="+3V14" gate="G$1" pin="+3V3"/>
-<wire x1="144.78" y1="-30.48" x2="149.86" y2="-30.48" width="0.1524" layer="91"/>
-<wire x1="149.86" y1="-30.48" x2="149.86" y2="-33.02" width="0.1524" layer="91"/>
+<pinref part="ST1" gate="G$1" pin="PH3/BOOT0"/>
+<wire x1="127" y1="-38.1" x2="127" y2="-53.34" width="0.1524" layer="91"/>
+<pinref part="+3V7" gate="G$1" pin="+3V3"/>
+<wire x1="127" y1="-53.34" x2="132.08" y2="-53.34" width="0.1524" layer="91"/>
+<wire x1="132.08" y1="-53.34" x2="132.08" y2="-55.88" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<pinref part="N1" gate="G$1" pin="VP_REG"/>
+<wire x1="177.8" y1="33.02" x2="198.12" y2="33.02" width="0.1524" layer="91"/>
+<pinref part="+3V8" gate="G$1" pin="+3V3"/>
+<wire x1="198.12" y1="22.86" x2="198.12" y2="27.94" width="0.1524" layer="91"/>
+<wire x1="198.12" y1="27.94" x2="198.12" y2="33.02" width="0.1524" layer="91"/>
+<junction x="198.12" y="27.94"/>
+<pinref part="N1" gate="G$1" pin="VP_IO"/>
+<wire x1="177.8" y1="27.94" x2="198.12" y2="27.94" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="N$8" class="0">
+<net name="N$2" class="0">
 <segment>
-<wire x1="200.66" y1="22.86" x2="193.04" y2="22.86" width="0.1524" layer="91"/>
+<wire x1="182.88" y1="7.62" x2="175.26" y2="7.62" width="0.1524" layer="91"/>
 <pinref part="R1" gate="G$1" pin="1"/>
-<pinref part="L2" gate="G$1" pin="A2"/>
+<pinref part="L1" gate="G$1" pin="A2"/>
 </segment>
 </net>
 <net name="SWCLK" class="0">
 <segment>
-<wire x1="177.8" y1="-83.82" x2="177.8" y2="-73.66" width="0.1524" layer="91"/>
-<label x="177.8" y="-73.66" size="1.778" layer="95"/>
-<pinref part="SWCLK1" gate="G$1" pin="TP"/>
+<wire x1="160.02" y1="-106.68" x2="160.02" y2="-96.52" width="0.1524" layer="91"/>
+<label x="160.02" y="-96.52" size="1.778" layer="95"/>
+<pinref part="SWCLK2" gate="G$1" pin="TP"/>
 </segment>
 <segment>
-<pinref part="ST2" gate="G$1" pin="SWCLK"/>
-<wire x1="114.3" y1="0" x2="109.22" y2="0" width="0.1524" layer="91"/>
-<label x="101.6" y="-2.54" size="1.778" layer="95"/>
+<pinref part="ST1" gate="G$1" pin="SWCLK"/>
+<wire x1="96.52" y1="-22.86" x2="91.44" y2="-22.86" width="0.1524" layer="91"/>
+<label x="83.82" y="-25.4" size="1.778" layer="95"/>
 </segment>
 </net>
 <net name="STX-&gt;" class="0">
 <segment>
-<wire x1="198.12" y1="-83.82" x2="198.12" y2="-73.66" width="0.1524" layer="91"/>
-<label x="198.12" y="-73.66" size="1.778" layer="95"/>
-<pinref part="STX-&gt;1" gate="G$1" pin="TP"/>
+<wire x1="180.34" y1="-106.68" x2="180.34" y2="-96.52" width="0.1524" layer="91"/>
+<label x="180.34" y="-96.52" size="1.778" layer="95"/>
+<pinref part="STX-&gt;2" gate="G$1" pin="TP"/>
 </segment>
 <segment>
-<wire x1="132.08" y1="-40.64" x2="134.62" y2="-40.64" width="0.1524" layer="91"/>
-<label x="129.54" y="-38.1" size="1.778" layer="95"/>
-<wire x1="132.08" y1="-40.64" x2="139.7" y2="-40.64" width="0.1524" layer="91"/>
-<wire x1="139.7" y1="-40.64" x2="139.7" y2="-38.1" width="0.1524" layer="91"/>
-<pinref part="ST2" gate="G$1" pin="PB6"/>
-<wire x1="139.7" y1="-38.1" x2="139.7" y2="-15.24" width="0.1524" layer="91"/>
-</segment>
-</net>
-<net name="SRX&lt;-" class="0">
-<segment>
-<wire x1="208.28" y1="-83.82" x2="208.28" y2="-73.66" width="0.1524" layer="91"/>
-<label x="208.28" y="-73.66" size="1.778" layer="95"/>
-<pinref part="SRX&lt;-1" gate="G$1" pin="TP"/>
-</segment>
-<segment>
-<wire x1="137.16" y1="-43.18" x2="139.7" y2="-43.18" width="0.1524" layer="91"/>
-<label x="134.62" y="-43.18" size="1.778" layer="95" rot="R180"/>
-<pinref part="ST2" gate="G$1" pin="PB7"/>
-<wire x1="137.16" y1="-43.18" x2="142.24" y2="-43.18" width="0.1524" layer="91"/>
-<wire x1="142.24" y1="-43.18" x2="142.24" y2="-15.24" width="0.1524" layer="91"/>
+<wire x1="114.3" y1="-63.5" x2="116.84" y2="-63.5" width="0.1524" layer="91"/>
+<label x="111.76" y="-60.96" size="1.778" layer="95"/>
+<wire x1="114.3" y1="-63.5" x2="121.92" y2="-63.5" width="0.1524" layer="91"/>
+<wire x1="121.92" y1="-63.5" x2="121.92" y2="-60.96" width="0.1524" layer="91"/>
+<pinref part="ST1" gate="G$1" pin="PB6"/>
+<wire x1="121.92" y1="-60.96" x2="121.92" y2="-38.1" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="SWDIO" class="0">
 <segment>
-<pinref part="ST2" gate="G$1" pin="SWDIO"/>
-<wire x1="114.3" y1="2.54" x2="109.22" y2="2.54" width="0.1524" layer="91"/>
-<label x="99.06" y="0" size="1.778" layer="95"/>
+<pinref part="ST1" gate="G$1" pin="SWDIO"/>
+<wire x1="96.52" y1="-20.32" x2="91.44" y2="-20.32" width="0.1524" layer="91"/>
+<label x="81.28" y="-22.86" size="1.778" layer="95"/>
 </segment>
 <segment>
-<wire x1="167.64" y1="-83.82" x2="167.64" y2="-73.66" width="0.1524" layer="91"/>
-<label x="167.64" y="-73.66" size="1.778" layer="95"/>
-<pinref part="SWDIO1" gate="G$1" pin="TP"/>
+<wire x1="147.32" y1="-106.68" x2="147.32" y2="-96.52" width="0.1524" layer="91"/>
+<label x="147.32" y="-96.52" size="1.778" layer="95"/>
+<pinref part="SWDIO2" gate="G$1" pin="TP"/>
 </segment>
 </net>
-<net name="SWO" class="0">
+<net name="N$3" class="0">
 <segment>
-<pinref part="ST2" gate="G$1" pin="PB3/SWO"/>
-<wire x1="132.08" y1="-15.24" x2="132.08" y2="-20.32" width="0.1524" layer="91"/>
-<label x="132.08" y="-22.86" size="1.778" layer="95"/>
+<pinref part="ST1" gate="G$1" pin="PA2"/>
+<wire x1="154.94" y1="-2.54" x2="154.94" y2="-5.08" width="0.1524" layer="91"/>
+<wire x1="154.94" y1="-5.08" x2="144.78" y2="-5.08" width="0.1524" layer="91"/>
+<wire x1="167.64" y1="-2.54" x2="154.94" y2="-2.54" width="0.1524" layer="91"/>
+<pinref part="L1" gate="G$1" pin="CGREEN"/>
 </segment>
+</net>
+<net name="N$4" class="0">
 <segment>
-<wire x1="147.32" y1="-83.82" x2="147.32" y2="-73.66" width="0.1524" layer="91"/>
-<pinref part="SWO1" gate="G$1" pin="TP"/>
-<label x="147.32" y="-73.66" size="1.778" layer="95"/>
+<pinref part="ST1" gate="G$1" pin="PA3"/>
+<wire x1="129.54" y1="15.24" x2="129.54" y2="10.16" width="0.1524" layer="91"/>
+<pinref part="L1" gate="G$1" pin="CRED"/>
+<wire x1="167.64" y1="7.62" x2="149.86" y2="7.62" width="0.1524" layer="91"/>
+<wire x1="149.86" y1="7.62" x2="149.86" y2="15.24" width="0.1524" layer="91"/>
+<wire x1="149.86" y1="15.24" x2="129.54" y2="15.24" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$5" class="0">
+<segment>
+<pinref part="ST1" gate="G$1" pin="PA1"/>
+<wire x1="144.78" y1="-7.62" x2="160.02" y2="-7.62" width="0.1524" layer="91"/>
+<pinref part="L1" gate="G$1" pin="CBLUE"/>
+<wire x1="167.64" y1="2.54" x2="160.02" y2="2.54" width="0.1524" layer="91"/>
+<wire x1="160.02" y1="2.54" x2="160.02" y2="-7.62" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$6" class="0">
+<segment>
+<pinref part="ST1" gate="G$1" pin="PA0"/>
+<wire x1="144.78" y1="-10.16" x2="162.56" y2="-10.16" width="0.1524" layer="91"/>
+<wire x1="162.56" y1="-10.16" x2="162.56" y2="-12.7" width="0.1524" layer="91"/>
+<wire x1="162.56" y1="-12.7" x2="182.88" y2="-12.7" width="0.1524" layer="91"/>
+<wire x1="182.88" y1="-12.7" x2="182.88" y2="-15.24" width="0.1524" layer="91"/>
+<wire x1="182.88" y1="-15.24" x2="190.5" y2="-15.24" width="0.1524" layer="91"/>
+<pinref part="U$1" gate="G$1" pin="1"/>
+</segment>
+</net>
+<net name="SCLK" class="0">
+<segment>
+<pinref part="N1" gate="G$1" pin="SCLK"/>
+<pinref part="ST1" gate="G$1" pin="PA5"/>
+<wire x1="147.32" y1="43.18" x2="124.46" y2="43.18" width="0.1524" layer="91"/>
+<wire x1="124.46" y1="43.18" x2="124.46" y2="10.16" width="0.1524" layer="91"/>
+<label x="129.54" y="43.18" size="1.778" layer="95"/>
+</segment>
+</net>
+<net name="MOSI" class="0">
+<segment>
+<pinref part="N1" gate="G$1" pin="MOSI"/>
+<pinref part="ST1" gate="G$1" pin="PA7"/>
+<wire x1="147.32" y1="38.1" x2="119.38" y2="38.1" width="0.1524" layer="91"/>
+<wire x1="119.38" y1="38.1" x2="119.38" y2="10.16" width="0.1524" layer="91"/>
+<label x="129.54" y="38.1" size="1.778" layer="95"/>
+</segment>
+</net>
+<net name="MISO" class="0">
+<segment>
+<pinref part="N1" gate="G$1" pin="MISO"/>
+<pinref part="ST1" gate="G$1" pin="PA6"/>
+<wire x1="147.32" y1="33.02" x2="121.92" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="121.92" y1="33.02" x2="121.92" y2="10.16" width="0.1524" layer="91"/>
+<label x="129.54" y="33.02" size="1.778" layer="95"/>
+</segment>
+</net>
+<net name="AMS_CS1" class="0">
+<segment>
+<pinref part="N1" gate="G$1" pin="SS"/>
+<pinref part="ST1" gate="G$1" pin="PB0"/>
+<wire x1="116.84" y1="10.16" x2="116.84" y2="48.26" width="0.1524" layer="91"/>
+<wire x1="116.84" y1="48.26" x2="147.32" y2="48.26" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$8" class="0">
+<segment>
+<pinref part="N1" gate="G$1" pin="LC2"/>
+<wire x1="177.8" y1="43.18" x2="203.2" y2="43.18" width="0.1524" layer="91"/>
+<wire x1="203.2" y1="43.18" x2="203.2" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="203.2" y1="50.8" x2="220.98" y2="50.8" width="0.1524" layer="91"/>
+<pinref part="C15" gate="G$1" pin="2"/>
+<wire x1="220.98" y1="48.26" x2="220.98" y2="50.8" width="0.1524" layer="91"/>
+<junction x="220.98" y="50.8"/>
+<wire x1="220.98" y1="50.8" x2="228.6" y2="50.8" width="0.1524" layer="91"/>
+<pinref part="C14" gate="G$1" pin="2"/>
+<wire x1="228.6" y1="50.8" x2="228.6" y2="48.26" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$9" class="0">
 <segment>
-<pinref part="L2" gate="G$1" pin="CRED"/>
-<wire x1="172.72" y1="22.86" x2="185.42" y2="22.86" width="0.1524" layer="91"/>
-<wire x1="172.72" y1="22.86" x2="172.72" y2="17.78" width="0.1524" layer="91"/>
-<pinref part="ST2" gate="G$1" pin="PA2"/>
-<wire x1="172.72" y1="17.78" x2="162.56" y2="17.78" width="0.1524" layer="91"/>
+<pinref part="N1" gate="G$1" pin="LC1"/>
+<wire x1="177.8" y1="38.1" x2="203.2" y2="38.1" width="0.1524" layer="91"/>
+<wire x1="203.2" y1="38.1" x2="203.2" y2="35.56" width="0.1524" layer="91"/>
+<wire x1="203.2" y1="35.56" x2="220.98" y2="35.56" width="0.1524" layer="91"/>
+<pinref part="C15" gate="G$1" pin="1"/>
+<wire x1="220.98" y1="35.56" x2="220.98" y2="40.64" width="0.1524" layer="91"/>
+<wire x1="220.98" y1="35.56" x2="220.98" y2="33.02" width="0.1524" layer="91"/>
+<junction x="220.98" y="35.56"/>
+<pinref part="C14" gate="G$1" pin="1"/>
+<wire x1="220.98" y1="33.02" x2="228.6" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="228.6" y1="33.02" x2="228.6" y2="40.64" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="N$10" class="0">
+<net name="AMS_IRQ" class="0">
 <segment>
-<pinref part="L2" gate="G$1" pin="CBLUE"/>
-<wire x1="185.42" y1="17.78" x2="175.26" y2="17.78" width="0.1524" layer="91"/>
-<wire x1="175.26" y1="17.78" x2="175.26" y2="38.1" width="0.1524" layer="91"/>
-<wire x1="175.26" y1="38.1" x2="147.32" y2="38.1" width="0.1524" layer="91"/>
-<pinref part="ST2" gate="G$1" pin="PA3"/>
-<wire x1="147.32" y1="38.1" x2="147.32" y2="33.02" width="0.1524" layer="91"/>
+<pinref part="ST1" gate="G$1" pin="PC15"/>
+<wire x1="144.78" y1="-17.78" x2="147.32" y2="-17.78" width="0.1524" layer="91"/>
+<label x="147.32" y="-17.78" size="1.778" layer="95"/>
 </segment>
-</net>
-<net name="N$11" class="0">
 <segment>
-<pinref part="ST2" gate="G$1" pin="PA1"/>
-<wire x1="162.56" y1="15.24" x2="182.88" y2="15.24" width="0.1524" layer="91"/>
-<wire x1="182.88" y1="15.24" x2="182.88" y2="12.7" width="0.1524" layer="91"/>
-<pinref part="L2" gate="G$1" pin="CGREEN"/>
-<wire x1="182.88" y1="12.7" x2="185.42" y2="12.7" width="0.1524" layer="91"/>
-</segment>
-</net>
-<net name="N$12" class="0">
-<segment>
-<pinref part="ST2" gate="G$1" pin="PA0"/>
-<wire x1="162.56" y1="12.7" x2="177.8" y2="12.7" width="0.1524" layer="91"/>
-<wire x1="177.8" y1="12.7" x2="177.8" y2="10.16" width="0.1524" layer="91"/>
-<wire x1="177.8" y1="10.16" x2="200.66" y2="10.16" width="0.1524" layer="91"/>
-<wire x1="200.66" y1="10.16" x2="200.66" y2="7.62" width="0.1524" layer="91"/>
-<wire x1="200.66" y1="7.62" x2="208.28" y2="7.62" width="0.1524" layer="91"/>
-<pinref part="U$2" gate="G$1" pin="1"/>
+<pinref part="N1" gate="G$1" pin="IRQ"/>
+<wire x1="147.32" y1="27.94" x2="139.7" y2="27.94" width="0.1524" layer="91"/>
+<label x="139.7" y="25.4" size="1.778" layer="95"/>
 </segment>
 </net>
 </nets>