From: rickb44 <rickb44@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Fri, 31 Oct 2014 17:54:42 +0000 (+0000)
Subject: Resolve conflicts
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=d1eb273443a6f45afe0c1f3f3e7347bc038f27d8;p=freetel-svn-tracking.git

Resolve conflicts


git-svn-id: https://svn.code.sf.net/p/freetel/code@1922 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/smartmic/SM1000-C/SM1000-C.brd b/smartmic/SM1000-C/SM1000-C.brd
index cf2b6897..848d0fab 100644
--- a/smartmic/SM1000-C/SM1000-C.brd
+++ b/smartmic/SM1000-C/SM1000-C.brd
@@ -8,7 +8,7 @@
 </settings>
 <grid distance="0.5" unitdist="mm" unit="mm" style="dots" multiple="1" display="yes" altdistance="0.1" altunitdist="mm" altunit="mm"/>
 <layers>
-<layer number="1" name="Top" color="4" fill="1" visible="no" active="yes"/>
+<layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="GND" color="3" fill="1" visible="no" active="yes"/>
 <layer number="3" name="Route3" color="4" fill="3" visible="no" active="no"/>
 <layer number="4" name="Route4" color="1" fill="4" visible="no" active="no"/>
@@ -23,42 +23,42 @@
 <layer number="13" name="Route13" color="4" fill="5" visible="no" active="no"/>
 <layer number="14" name="Route14" color="1" fill="6" visible="no" active="no"/>
 <layer number="15" name="VDD" color="6" fill="1" visible="no" active="yes"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="no" 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"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
 <layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
 <layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="26" name="bNames" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
-<layer number="29" name="tStop" color="7" fill="3" 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="no" active="yes"/>
-<layer number="31" name="tCream" color="7" fill="4" visible="yes" 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="yes" active="yes"/>
+<layer number="33" name="tFinish" color="6" fill="3" visible="no" active="yes"/>
 <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="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="39" name="tKeepout" color="4" fill="11" visible="no" active="yes"/>
 <layer number="40" name="bKeepout" color="1" fill="11" visible="no" active="yes"/>
-<layer number="41" name="tRestrict" color="4" fill="10" visible="yes" active="yes"/>
+<layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="yes"/>
 <layer number="42" name="bRestrict" color="1" fill="10" visible="no" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
 <layer number="45" name="Holes" color="7" fill="1" visible="no" 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="yes" 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="no" 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="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="yes"/>
 <layer number="52" name="bDocu" color="7" fill="1" visible="no" active="yes"/>
 <layer number="56" name="wert" color="7" fill="1" visible="no" active="no"/>
 <layer number="91" name="Nets" color="2" fill="1" visible="no" active="no"/>
@@ -1215,26 +1215,25 @@ Licensed under TAPR Open Hardware License</text>
 <text x="41" y="115" size="1.778" layer="203" ratio="10">17</text>
 <text x="21" y="-29.5" size="1.778" layer="203" ratio="10">TOP DIMENSION</text>
 <wire x1="40.5" y1="78.6" x2="40.5" y2="79.15" width="0.15" layer="21"/>
-<wire x1="18.5" y1="40.5" x2="34" y2="40.5" width="0.15" layer="205"/>
-<wire x1="34" y1="40.5" x2="34" y2="30.5" width="0.15" layer="205"/>
-<wire x1="34" y1="30.5" x2="18.5" y2="30.5" width="0.15" layer="205"/>
-<wire x1="18.5" y1="30.5" x2="18.5" y2="40.5" width="0.15" layer="205"/>
-<wire x1="35.5" y1="30.5" x2="62.5" y2="30.5" width="0.15" layer="205"/>
-<wire x1="62.5" y1="30.5" x2="62.5" y2="41" width="0.15" layer="205"/>
-<wire x1="62.5" y1="41" x2="35.5" y2="41" width="0.15" layer="205"/>
-<wire x1="35.5" y1="41" x2="35.5" y2="30.5" width="0.15" layer="205"/>
-<wire x1="39.5" y1="41.5" x2="64" y2="41.5" width="0.2" layer="205"/>
-<wire x1="64" y1="41.5" x2="64" y2="51.5" width="0.2" layer="205"/>
-<wire x1="64" y1="51.5" x2="39.5" y2="51.5" width="0.2" layer="205"/>
-<wire x1="39.5" y1="51.5" x2="39.5" y2="41.5" width="0.2" layer="205"/>
-<wire x1="38" y1="52.5" x2="35.5" y2="55" width="0.15" layer="205"/>
-<wire x1="35.5" y1="55" x2="35.5" y2="65" width="0.15" layer="205"/>
-<wire x1="35.5" y1="65" x2="41" y2="65" width="0.15" layer="205"/>
-<wire x1="41" y1="65" x2="41" y2="68" width="0.15" layer="205"/>
-<wire x1="41" y1="68" x2="64" y2="68" width="0.15" layer="205"/>
-<wire x1="64" y1="68" x2="64" y2="52" width="0.15" layer="205"/>
-<wire x1="64" y1="52" x2="38.5" y2="52" width="0.15" layer="205"/>
-<wire x1="38.5" y1="52" x2="38" y2="52.5" width="0.15" layer="205"/>
+<wire x1="18" y1="38" x2="33.5" y2="38" width="0.15" layer="205"/>
+<wire x1="33.5" y1="38" x2="33.5" y2="28" width="0.15" layer="205"/>
+<wire x1="33.5" y1="28" x2="18" y2="28" width="0.15" layer="205"/>
+<wire x1="18" y1="28" x2="18" y2="38" width="0.15" layer="205"/>
+<wire x1="36" y1="28" x2="63" y2="28" width="0.15" layer="205"/>
+<wire x1="63" y1="28" x2="63" y2="38" width="0.15" layer="205"/>
+<wire x1="63" y1="38" x2="36" y2="38" width="0.15" layer="205"/>
+<wire x1="36" y1="38" x2="36" y2="28" width="0.15" layer="205"/>
+<wire x1="38.5" y1="38.5" x2="63" y2="38.5" width="0.2" layer="205"/>
+<wire x1="63" y1="38.5" x2="63" y2="48.5" width="0.2" layer="205"/>
+<wire x1="63" y1="48.5" x2="38.5" y2="48.5" width="0.2" layer="205"/>
+<wire x1="38.5" y1="48.5" x2="38.5" y2="38.5" width="0.2" layer="205"/>
+<wire x1="39" y1="51" x2="35.5" y2="54.5" width="0.15" layer="205"/>
+<wire x1="35.5" y1="54.5" x2="35.5" y2="64.5" width="0.15" layer="205"/>
+<wire x1="35.5" y1="64.5" x2="41" y2="64.5" width="0.15" layer="205"/>
+<wire x1="41" y1="64.5" x2="64" y2="64.5" width="0.15" layer="205"/>
+<wire x1="64" y1="64.5" x2="64" y2="49" width="0.15" layer="205"/>
+<wire x1="64" y1="49" x2="39" y2="49" width="0.15" layer="205"/>
+<wire x1="39" y1="49" x2="39" y2="51" width="0.15" layer="205"/>
 </plain>
 <libraries>
 <library name="AA-IC">
@@ -2058,38 +2057,6 @@ by exp-lbrs.ulp</description>
 <text x="-8.5" y="9.5" size="1" layer="25" ratio="10">&gt;NAME</text>
 <text x="-8.5" y="-10.5" size="1" layer="25" ratio="10">&gt;VALUE</text>
 </package>
-<package name="MOLEX-MINI-B-SMT">
-<smd name="1" x="-1.6" y="6.225" dx="2.25" dy="0.5" layer="1" rot="R90"/>
-<smd name="2" x="-0.8" y="6.225" dx="2.25" dy="0.5" layer="1" rot="R90"/>
-<smd name="3" x="0" y="6.225" dx="2.25" dy="0.5" layer="1" rot="R90"/>
-<smd name="4" x="0.8" y="6.225" dx="2.25" dy="0.5" layer="1" rot="R90"/>
-<smd name="5" x="1.6" y="6.225" dx="2.25" dy="0.5" layer="1" rot="R90"/>
-<smd name="6" x="-5.5" y="6.25" dx="3.5" dy="2.05" layer="1" rot="R90"/>
-<smd name="7" x="5.5" y="6.25" dx="3.5" dy="2.05" layer="1" rot="R90"/>
-<smd name="8" x="-5.5" y="2" dx="4" dy="2.05" layer="1" rot="R90"/>
-<smd name="9" x="5.5" y="2" dx="4" dy="2.05" layer="1" rot="R90"/>
-<hole x="-2.2" y="4.25" drill="0.9"/>
-<hole x="2.2" y="4.25" drill="0.9"/>
-<wire x1="-7" y1="0" x2="7" y2="0" width="0.15" layer="51"/>
-<text x="-4.5" y="-2" size="1" layer="51" ratio="10">BOARD EDGE</text>
-<wire x1="-3.1" y1="0" x2="-3.1" y2="1.2" width="0" layer="39"/>
-<wire x1="-3.1" y1="1.2" x2="-3" y2="1.2" width="0" layer="39"/>
-<wire x1="-3" y1="1.2" x2="3.1" y2="1.2" width="0" layer="39"/>
-<wire x1="3.1" y1="1.2" x2="3.1" y2="0" width="0" layer="39"/>
-<wire x1="3.1" y1="0" x2="-3.1" y2="0" width="0" layer="39"/>
-<wire x1="-7" y1="8.5" x2="7" y2="8.5" width="0" layer="39"/>
-<wire x1="7" y1="8.5" x2="7" y2="-0.5" width="0" layer="39"/>
-<wire x1="7" y1="-0.5" x2="4" y2="-0.5" width="0" layer="39"/>
-<wire x1="4" y1="-0.5" x2="4" y2="1.5" width="0" layer="39"/>
-<wire x1="4" y1="1.5" x2="-4" y2="1.5" width="0" layer="39"/>
-<wire x1="-4" y1="1.5" x2="-4" y2="-0.5" width="0" layer="39"/>
-<wire x1="-4" y1="-0.5" x2="-7" y2="-0.5" width="0" layer="39"/>
-<wire x1="-7" y1="-0.5" x2="-7" y2="8.5" width="0" layer="39"/>
-<text x="-6.5" y="9" size="1" layer="21" ratio="10">&gt;NAME</text>
-<wire x1="-4" y1="0" x2="-4" y2="8.5" width="0.15" layer="21"/>
-<wire x1="-4" y1="8.5" x2="4" y2="8.5" width="0.15" layer="21"/>
-<wire x1="4" y1="8.5" x2="4" y2="0" width="0.15" layer="21"/>
-</package>
 <package name="C1210">
 <wire x1="-2.35" y1="-1.6" x2="-2.35" y2="1.6" width="0" layer="39"/>
 <wire x1="-2.35" y1="1.6" x2="2.35" y2="1.6" width="0" layer="39"/>
@@ -2466,8 +2433,8 @@ design rules under a new name.</description>
 <element name="U4" library="AA-IC" package="ECOPACK-11" value="EMIF02-USB03F2" x="40.25" y="89" smashed="yes">
 <attribute name="NAME" x="39.5" y="90.5" size="0.8128" layer="25" ratio="10"/>
 </element>
-<element name="C39" library="_RoweTel" package="CAP-CHEMI-HA0" value="220uF,25V" x="59.5" y="75" smashed="yes">
-<attribute name="NAME" x="59.75" y="67.75" size="1" layer="25" font="vector" ratio="10"/>
+<element name="C39" library="_RoweTel" package="CAP-CHEMI-HA0" value="220uF,25V" x="60" y="72" smashed="yes">
+<attribute name="NAME" x="60.25" y="64.75" size="1" layer="25" font="vector" ratio="10"/>
 </element>
 <element name="C24" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="1uF,16V" x="6.8" y="67.5" smashed="yes" rot="R90">
 <attribute name="NAME" x="5.85" y="66.5" size="0.8128" layer="25" ratio="10" rot="R90"/>
@@ -2497,22 +2464,22 @@ design rules under a new name.</description>
 <attribute name="NAME" x="22.2" y="64" size="0.8128" layer="25" ratio="10"/>
 <attribute name="VALUE" x="21.25" y="68.2875" size="1" layer="27" font="vector" ratio="10" rot="R180"/>
 </element>
-<element name="R31" library="AA-ipc-7351-resistor" package="RESC2012X70N" value="0 Ohm" x="15.5" y="68.5" smashed="yes">
-<attribute name="NAME" x="11" y="68.5" size="0.8128" layer="25"/>
+<element name="R31" library="AA-ipc-7351-resistor" package="RESC2012X70N" value="0 Ohm" x="11.5" y="70.5" smashed="yes">
+<attribute name="NAME" x="7" y="70.5" size="0.8128" layer="25"/>
 </element>
-<element name="C12" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="1uF,16V" x="12.5" y="64" smashed="yes" rot="R270">
-<attribute name="NAME" x="11.65" y="66.5" size="0.8128" layer="25" ratio="10"/>
+<element name="C12" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="1uF,16V" x="9" y="63.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="8.15" y="66" size="0.8128" layer="25" ratio="10"/>
 </element>
-<element name="C10" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="1uF,16V" x="8.5" y="64" smashed="yes" rot="R270">
-<attribute name="NAME" x="7.45" y="66.65" size="0.8128" layer="25" ratio="10"/>
+<element name="C10" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="1uF,16V" x="4" y="63.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="2.95" y="66.15" size="0.8128" layer="25" ratio="10"/>
 </element>
-<element name="C11" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="6.5" y="64" smashed="yes" rot="R270">
-<attribute name="NAME" x="5.5" y="62.65" size="0.8128" layer="25" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="4.4625" y="65.25" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
+<element name="C11" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="1.5" y="63.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="0.5" y="62.15" size="0.8128" layer="25" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="-0.5375" y="64.75" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="C13" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="10.5" y="64" smashed="yes" rot="R270">
-<attribute name="NAME" x="11.1" y="61.1" size="0.8128" layer="25" ratio="10"/>
-<attribute name="VALUE" x="8.4625" y="65.25" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
+<element name="C13" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="6.5" y="63.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="7.1" y="60.6" size="0.8128" layer="25" ratio="10"/>
+<attribute name="VALUE" x="4.4625" y="64.75" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
 <element name="R2" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="4.7K,1%" x="15.5" y="74.5" smashed="yes">
 <attribute name="NAME" x="17.4" y="74.45" size="0.8128" layer="25"/>
@@ -2520,8 +2487,8 @@ design rules under a new name.</description>
 <element name="R5" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="4.7K,1%" x="15.5" y="70.5" smashed="yes">
 <attribute name="NAME" x="17.5" y="70.5" size="0.8128" layer="25"/>
 </element>
-<element name="R6" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="1K,1%" x="39.5" y="75.25" smashed="yes" rot="R180">
-<attribute name="NAME" x="38.3" y="73.4" size="0.8128" layer="25"/>
+<element name="R6" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="1K,1%" x="45" y="79.75" smashed="yes" rot="R180">
+<attribute name="NAME" x="43.8" y="77.9" size="0.8128" layer="25"/>
 </element>
 <element name="C14" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="2.2uF,16V" x="21" y="87.5" smashed="yes" rot="R270">
 <attribute name="NAME" x="21.4" y="89.2" size="0.8128" layer="25" ratio="10" rot="R90"/>
@@ -2659,32 +2626,32 @@ design rules under a new name.</description>
 <attribute name="NAME" x="6.3" y="47.7" size="0.8128" layer="25" ratio="10" rot="R270"/>
 <attribute name="VALUE" x="5.575" y="49.5375" size="1" layer="27" font="vector" ratio="10" rot="R180"/>
 </element>
-<element name="C34" library="AA-ipc-7351-capacitor" package="CAPC1005X60N" value="1nF,25V,0402" x="58" y="56.9" smashed="yes" rot="R90">
-<attribute name="NAME" x="57.35" y="55.95" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="60.0375" y="55.65" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C34" library="AA-ipc-7351-capacitor" package="CAPC1005X60N" value="1nF,25V,0402" x="58" y="53.9" smashed="yes" rot="R90">
+<attribute name="NAME" x="57.35" y="52.95" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="60.0375" y="52.65" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="R58" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="44.1" y="53.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="43.15" y="52.55" size="0.8128" layer="25" font="vector" rot="R90"/>
+<element name="R58" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="44.1" y="50.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="43.15" y="49.55" size="0.8128" layer="25" font="vector" rot="R90"/>
 </element>
-<element name="R40" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="60.5" y="57.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="59.5" y="56" size="0.8128" layer="25" font="vector" rot="R90"/>
+<element name="R40" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="60.5" y="54.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="59.5" y="53" size="0.8128" layer="25" font="vector" rot="R90"/>
 </element>
-<element name="R38" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="53.5" y="61.5" smashed="yes" rot="R180">
-<attribute name="NAME" x="52.5" y="62.5" size="0.8128" layer="25" font="vector"/>
+<element name="R38" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="53.5" y="58.5" smashed="yes" rot="R180">
+<attribute name="NAME" x="52.5" y="59.5" size="0.8128" layer="25" font="vector"/>
 </element>
-<element name="C37" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="98.25" y="86.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="98" y="88.5" size="1" layer="25" font="vector" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="100.2875" y="85.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C37" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="56.25" y="91.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="56" y="93.5" size="1" layer="25" font="vector" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="58.2875" y="90.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="C40" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="47nF,25V" x="94.75" y="90" smashed="yes" rot="R90">
-<attribute name="NAME" x="95.7" y="91.1" size="1" layer="25" font="vector" ratio="10" rot="R270"/>
-<attribute name="VALUE" x="96.7875" y="88.75" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C40" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="47nF,25V" x="62.75" y="81.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="63.7" y="82.6" size="1" layer="25" font="vector" ratio="10" rot="R270"/>
+<attribute name="VALUE" x="64.7875" y="80.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="R50" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="10,1%" x="94.75" y="82.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="94" y="84.4" size="1" layer="25" font="vector" rot="R90"/>
+<element name="R50" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="10,1%" x="56.75" y="81.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="56" y="83.4" size="1" layer="25" font="vector" rot="R90"/>
 </element>
-<element name="J3" library="_Coherix" package="JMPR-2PIN" value="JMP-2PIN" x="47" y="66.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="47.96" y="68.29" size="0.8128" layer="25" font="vector"/>
+<element name="J3" library="_Coherix" package="JMPR-2PIN" value="JMP-2PIN" x="47" y="62" smashed="yes" rot="R90">
+<attribute name="NAME" x="47.96" y="63.79" size="0.8128" layer="25" font="vector"/>
 </element>
 <element name="SH3" library="_Coherix" package="NOPACKAGE" value="SHUNT,0.1IN" x="1.5" y="-0.5" locked="yes" smashed="yes" rot="R180"/>
 <element name="R33" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="14" y="35.5" smashed="yes" rot="R90">
@@ -2693,11 +2660,11 @@ design rules under a new name.</description>
 <element name="LED8" library="_Coherix" package="LED-LTST" value="LED-RED,RA" x="14" y="38.5" smashed="yes" rot="R270">
 <attribute name="NAME" x="16" y="37" size="0.8128" layer="25" rot="R90"/>
 </element>
-<element name="LD2" library="_RoweTel" package="LTV-817S" value="LTV-817S" x="26" y="33.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="25.9" y="34.2" size="1" layer="25" font="vector" ratio="10"/>
+<element name="LD2" library="_RoweTel" package="LTV-817S" value="LTV-817S" x="25.5" y="31" smashed="yes" rot="R270">
+<attribute name="NAME" x="25.4" y="31.7" size="1" layer="25" font="vector" ratio="10"/>
 </element>
-<element name="R51" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="390,1%" x="20.5" y="38" smashed="yes">
-<attribute name="NAME" x="19.5" y="39.5" size="1" layer="25" font="vector"/>
+<element name="R51" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="390,1%" x="20" y="35.5" smashed="yes">
+<attribute name="NAME" x="19" y="37" size="1" layer="25" font="vector"/>
 </element>
 <element name="U1" library="SM1000" package="LQFP100-14" value="STM32F405" x="28.5" y="75.75" smashed="yes">
 <attribute name="NAME" x="32.7" y="66.25" size="0.8128" layer="25" ratio="10"/>
@@ -2713,105 +2680,102 @@ design rules under a new name.</description>
 <attribute name="NAME" x="39.72" y="86.61" size="0.8128" layer="25"/>
 </element>
 <element name="SH1" library="_Coherix" package="NOPACKAGE" value="SHUNT,0.1IN" x="3.5" y="-0.5" locked="yes" smashed="yes" rot="R90"/>
-<element name="C33" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="63" y="54" smashed="yes" rot="R270">
-<attribute name="NAME" x="62.1" y="52.5" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="60.9625" y="55.25" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
-</element>
-<element name="U7" library="_RoweTel" package="SOT23-6" value="LMV341" x="56" y="34.5" smashed="yes">
-<attribute name="NAME" x="56" y="37.5" size="1" layer="25" font="vector" ratio="9"/>
+<element name="C33" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="63" y="51" smashed="yes" rot="R270">
+<attribute name="NAME" x="62.1" y="49.5" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="60.9625" y="52.25" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="U6" library="_RoweTel" package="SOT23-6" value="LMV341" x="54.5" y="45" smashed="yes" rot="R180">
-<attribute name="NAME" x="52.2" y="45.3" size="0.8128" layer="25" font="vector" ratio="9" rot="R90"/>
+<element name="U7" library="_RoweTel" package="SOT23-6" value="LMV341" x="56.5" y="32" smashed="yes">
+<attribute name="NAME" x="56.5" y="35" size="1" layer="25" font="vector" ratio="9"/>
 </element>
-<element name="R44" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="10K,1%" x="61.5" y="49" smashed="yes" rot="R90">
-<attribute name="NAME" x="60.5" y="47.5" size="0.8128" layer="25" font="vector" rot="R90"/>
+<element name="U6" library="_RoweTel" package="SOT23-6" value="LMV341" x="53.5" y="42" smashed="yes" rot="R180">
+<attribute name="NAME" x="51.2" y="42.3" size="0.8128" layer="25" font="vector" ratio="9" rot="R90"/>
 </element>
-<element name="R45" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="10K,1%" x="58.5" y="49" smashed="yes" rot="R90">
-<attribute name="NAME" x="57.5" y="47.5" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
+<element name="R44" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="10K,1%" x="60.5" y="46" smashed="yes" rot="R90">
+<attribute name="NAME" x="59.5" y="44.5" size="0.8128" layer="25" font="vector" rot="R90"/>
 </element>
-<element name="R43" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="10K,1%" x="51" y="49" smashed="yes" rot="R90">
-<attribute name="NAME" x="50" y="47.55" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
+<element name="R45" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="10K,1%" x="57.5" y="46" smashed="yes" rot="R90">
+<attribute name="NAME" x="56.5" y="44.5" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="C38" library="SM1000" package="C1210" value="100uF,10V" x="60.5" y="34.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="59.25" y="37.4" size="1" layer="25" font="vector" ratio="10"/>
+<element name="R43" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="10K,1%" x="50" y="46" smashed="yes" rot="R90">
+<attribute name="NAME" x="49" y="44.55" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="R48" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="10K,1%" x="40.5" y="32.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="42" y="32" size="1" layer="25" font="vector"/>
+<element name="C38" library="SM1000" package="C1210" value="100uF,10V" x="61" y="32" smashed="yes" rot="R270">
+<attribute name="NAME" x="59.75" y="34.9" size="1" layer="25" font="vector" ratio="10"/>
 </element>
-<element name="R49" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="4.7,1%" x="40.5" y="37.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="40" y="39.5" size="1" layer="25" font="vector"/>
+<element name="R48" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="10K,1%" x="41" y="30" smashed="yes" rot="R90">
+<attribute name="NAME" x="42.5" y="29.5" size="1" layer="25" font="vector"/>
 </element>
-<element name="C36" library="SM1000" package="C1210" value="100uF,10V" x="47.1" y="47.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="46" y="50" size="0.8128" layer="25" font="vector" ratio="10"/>
+<element name="R49" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="4.7,1%" x="41" y="35" smashed="yes" rot="R270">
+<attribute name="NAME" x="40.5" y="37" size="1" layer="25" font="vector"/>
 </element>
-<element name="CN2" library="SM1000" package="MOLEX-MINI-B-SMT" value="MOLEX-MINI-B-SMT" x="33.5" y="120.5" smashed="yes" rot="MR180">
-<attribute name="NAME" x="38" y="111.75" size="1" layer="26" ratio="10" rot="MR180"/>
+<element name="C36" library="SM1000" package="C1210" value="100uF,10V" x="46.1" y="44.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="45" y="47" size="0.8128" layer="25" font="vector" ratio="10"/>
 </element>
 <element name="PCB1" library="_Coherix" package="NOPACKAGE" value="SM1000C" x="2.5" y="-0.5" locked="yes" smashed="yes"/>
-<element name="R47" library="_RoweTel" package="PAN-EVM1D" value="500,POT" x="48.5" y="35" smashed="yes">
-<attribute name="NAME" x="47.5" y="38.5" size="1" layer="25" font="vector" ratio="10"/>
+<element name="R47" library="_RoweTel" package="PAN-EVM1D" value="500,POT" x="49" y="32.5" smashed="yes">
+<attribute name="NAME" x="48" y="36" size="1" layer="25" font="vector" ratio="10"/>
 </element>
-<element name="R52" library="_RoweTel" package="PAN-EVM1D" value="1K,POT" x="42.5" y="47.5" smashed="yes">
-<attribute name="NAME" x="44.5" y="44" size="0.8128" layer="25" font="vector" ratio="10" rot="R180"/>
+<element name="R52" library="_RoweTel" package="PAN-EVM1D" value="1K,POT" x="41.5" y="44.5" smashed="yes">
+<attribute name="NAME" x="43.5" y="41" size="0.8128" layer="25" font="vector" ratio="10" rot="R180"/>
 </element>
-<element name="C22" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="49.8" y="61.65" smashed="yes" rot="R270">
-<attribute name="NAME" x="50.85" y="62.9" size="0.8128" layer="25" font="vector" ratio="10" rot="R270"/>
-<attribute name="VALUE" x="47.7625" y="62.9" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
+<element name="C22" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="49.8" y="58.65" smashed="yes" rot="R270">
+<attribute name="NAME" x="50.85" y="59.9" size="0.8128" layer="25" font="vector" ratio="10" rot="R270"/>
+<attribute name="VALUE" x="47.7625" y="59.9" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="C23" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,25V" x="91.75" y="81.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="91.45" y="78.9" size="0.8128" layer="25" font="vector" ratio="10"/>
-<attribute name="VALUE" x="93.7875" y="80.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C23" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,25V" x="54.25" y="81.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="53.95" y="78.9" size="0.8128" layer="25" font="vector" ratio="10"/>
+<attribute name="VALUE" x="56.2875" y="80.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="C41" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="59.5" y="44.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="58.5" y="43" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="61.5375" y="43.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C41" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="58.5" y="41.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="57.5" y="40" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="60.5375" y="40.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="C42" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="53" y="35" smashed="yes" rot="R270">
-<attribute name="NAME" x="51.5" y="32" size="1" layer="25" font="vector" ratio="10"/>
-<attribute name="VALUE" x="50.9625" y="36.25" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
+<element name="C42" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="53.5" y="32.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="52" y="29.5" size="1" layer="25" font="vector" ratio="10"/>
+<attribute name="VALUE" x="51.4625" y="33.75" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
 <element name="FB1" library="_RoweTel" package="FE0805" value="FB0805" x="54.5" y="23.5" smashed="yes" rot="R90">
 <attribute name="NAME" x="53.5" y="20.5" size="0.8128" layer="25" ratio="10"/>
 </element>
-<element name="FB2" library="_RoweTel" package="FE0805" value="FB0805" x="38" y="33" smashed="yes" rot="R270">
-<attribute name="NAME" x="35.8" y="34.3" size="1" layer="25" font="vector" ratio="10" rot="R270"/>
+<element name="FB2" library="_RoweTel" package="FE0805" value="FB0805" x="38.5" y="30.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="36.3" y="31.8" size="1" layer="25" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="FB3" library="_RoweTel" package="FE0805" value="FB0805" x="113.5" y="84.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="110" y="84" size="1" layer="25" font="vector" ratio="10"/>
+<element name="FB3" library="_RoweTel" package="FE0805" value="FB0805" x="39.5" y="22.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="36" y="22" size="1" layer="25" font="vector" ratio="10"/>
 </element>
-<element name="FB4" library="_RoweTel" package="FE0805" value="FB0805" x="38" y="55.5" smashed="yes">
-<attribute name="NAME" x="36.75" y="56.5" size="0.8128" layer="25" font="vector" ratio="10"/>
+<element name="FB4" library="_RoweTel" package="FE0805" value="FB0805" x="29" y="40" smashed="yes">
+<attribute name="NAME" x="27.75" y="41" size="0.8128" layer="25" font="vector" ratio="10"/>
 </element>
-<element name="FB6" library="_RoweTel" package="FE0805" value="FB0805" x="31" y="38" smashed="yes">
-<attribute name="NAME" x="29.5" y="39.5" size="1" layer="25" font="vector" ratio="10"/>
+<element name="FB6" library="_RoweTel" package="FE0805" value="FB0805" x="30.5" y="35.5" smashed="yes">
+<attribute name="NAME" x="29" y="37" size="1" layer="25" font="vector" ratio="10"/>
 </element>
-<element name="C43" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100pF,50V" x="38" y="37.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="36.25" y="39.6675" size="1" layer="25" font="vector" ratio="10"/>
-<attribute name="VALUE" x="40.0375" y="36.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C43" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100pF,50V" x="38.5" y="35" smashed="yes" rot="R90">
+<attribute name="NAME" x="36.75" y="37.1675" size="1" layer="25" font="vector" ratio="10"/>
+<attribute name="VALUE" x="40.5375" y="33.75" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="C44" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100pF,50V" x="51.5" y="27.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="52.15" y="25.7325" size="1" layer="25" font="vector" ratio="10" rot="R180"/>
-<attribute name="VALUE" x="53.5375" y="26.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C44" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100pF,50V" x="50" y="23.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="50.65" y="21.7325" size="1" layer="25" font="vector" ratio="10" rot="R180"/>
+<attribute name="VALUE" x="52.0375" y="22.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="C45" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100pF,50V" x="26" y="38" smashed="yes" rot="R180">
-<attribute name="NAME" x="25" y="39.5" size="1" layer="25" font="vector" ratio="10"/>
-<attribute name="VALUE" x="27.25" y="40.0375" size="1" layer="27" font="vector" ratio="10" rot="R180"/>
+<element name="C45" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100pF,50V" x="25.5" y="35.5" smashed="yes" rot="R180">
+<attribute name="NAME" x="24.5" y="37" size="1" layer="25" font="vector" ratio="10"/>
+<attribute name="VALUE" x="26.75" y="37.5375" size="1" layer="27" font="vector" ratio="10" rot="R180"/>
 </element>
-<element name="U8" library="_RoweTel" package="SO08" value="LM386M-1" x="89" y="87.25" smashed="yes">
-<attribute name="NAME" x="85.5" y="85.5" size="1" layer="25" font="vector" rot="R90"/>
+<element name="U8" library="_RoweTel" package="SO08" value="LM386M-1" x="51" y="88.25" smashed="yes">
+<attribute name="NAME" x="47.5" y="86.5" size="1" layer="25" font="vector" rot="R90"/>
 </element>
-<element name="T1" library="_RoweTel" package="SM-LP-5001" value="SM-LP-5001" x="53.75" y="12" smashed="yes" rot="R270">
+<element name="T1" library="_RoweTel" package="SM-LP-5001" value="SM-LP-5001" x="53.75" y="12" locked="yes" smashed="yes" rot="R270">
 <attribute name="NAME" x="51.75" y="20.5" size="0.8128" layer="25" ratio="10"/>
 </element>
-<element name="T2" library="_RoweTel" package="SM-LP-5001" value="SM-LP-5001" x="42.75" y="12" smashed="yes" rot="R270">
+<element name="T2" library="_RoweTel" package="SM-LP-5001" value="SM-LP-5001" x="42.75" y="12" locked="yes" smashed="yes" rot="R270">
 <attribute name="NAME" x="41.25" y="20.5" size="0.8128" layer="25" ratio="10"/>
 </element>
 <element name="C46" library="ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,25V" x="4.25" y="53.45" smashed="yes" rot="R180">
 <attribute name="NAME" x="0.41" y="52.94" size="0.8128" layer="25" ratio="10"/>
 <attribute name="VALUE" x="5.5" y="55.4875" size="1" layer="27" font="vector" ratio="10" rot="R180"/>
 </element>
-<element name="R10" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="47,1%" x="10.6" y="67.6" smashed="yes" rot="R90">
-<attribute name="NAME" x="9" y="69.3" size="0.8128" layer="25"/>
+<element name="R10" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="47,1%" x="9.1" y="67.1" smashed="yes" rot="R90">
+<attribute name="NAME" x="7.5" y="68.8" size="0.8128" layer="25"/>
 </element>
 <element name="D2" library="_RoweTel" package="SOD323R_INFINEON" value="BAT60J" x="2.1" y="27.8" smashed="yes" rot="R270">
 <attribute name="NAME" x="2.65" y="25.65" size="0.8128" layer="25" rot="R180"/>
@@ -2819,11 +2783,11 @@ design rules under a new name.</description>
 <element name="MIC1" library="_RoweTel" package="CMA-4544PF-W" value="CMA-4544PF-W" x="33" y="48.5" smashed="yes" rot="R90">
 <attribute name="NAME" x="29.5" y="44.2" size="0.8128" layer="25" ratio="10" rot="R180"/>
 </element>
-<element name="C47" library="SM1000" package="C1210" value="100uF,10V" x="43.7" y="35.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="43.2" y="38.6" size="1" layer="25" font="vector" ratio="10"/>
+<element name="C47" library="SM1000" package="C1210" value="100uF,10V" x="44.2" y="33" smashed="yes" rot="R270">
+<attribute name="NAME" x="43.7" y="36.1" size="1" layer="25" font="vector" ratio="10"/>
 </element>
-<element name="J4" library="_Coherix" package="JMPR-2PIN" value="JMP-2PIN" x="94" y="95.5" smashed="yes" rot="R180">
-<attribute name="NAME" x="96.54" y="92.96" size="0.8128" layer="25" font="vector" rot="R180"/>
+<element name="J4" library="_Coherix" package="JMPR-2PIN" value="JMP-2PIN" x="44.5" y="84" smashed="yes" rot="R180">
+<attribute name="NAME" x="47.04" y="81.46" size="0.8128" layer="25" font="vector" rot="R180"/>
 </element>
 <element name="C48" library="ipc-7351-capacitor" package="CAPC1608X92N" value="470nF,25V" x="22" y="48.5" smashed="yes">
 <attribute name="NAME" x="24" y="48" size="0.8128" layer="25" ratio="10"/>
@@ -2833,36 +2797,36 @@ design rules under a new name.</description>
 <attribute name="NAME" x="10.375" y="38.3175" size="0.8128" layer="25" font="vector" ratio="10"/>
 <attribute name="VALUE" x="14.1875" y="33.675" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="U9" library="_RoweTel" package="SOT23-6" value="LMV341" x="54.1" y="58.05" smashed="yes" rot="R180">
-<attribute name="NAME" x="51.25" y="60.45" size="0.8128" layer="25" font="vector" ratio="9" rot="R270"/>
+<element name="U9" library="_RoweTel" package="SOT23-6" value="LMV341" x="54.1" y="55.05" smashed="yes" rot="R180">
+<attribute name="NAME" x="51.25" y="57.45" size="0.8128" layer="25" font="vector" ratio="9" rot="R270"/>
 </element>
-<element name="R41" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="60.5" y="54" smashed="yes" rot="R90">
-<attribute name="NAME" x="59.5" y="53" size="0.8128" layer="25" font="vector" rot="R90"/>
+<element name="R41" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="60.5" y="51" smashed="yes" rot="R90">
+<attribute name="NAME" x="59.5" y="50" size="0.8128" layer="25" font="vector" rot="R90"/>
 </element>
-<element name="R42" library="_RoweTel" package="PAN-EVM1D" value="500K,POT" x="48.5" y="55.5" smashed="yes">
-<attribute name="NAME" x="46.5" y="59" size="0.8128" layer="21" font="vector" ratio="10"/>
+<element name="R42" library="_RoweTel" package="PAN-EVM1D" value="500K,POT" x="48.5" y="52.5" smashed="yes">
+<attribute name="NAME" x="46.5" y="56" size="0.8128" layer="21" font="vector" ratio="10"/>
 </element>
-<element name="R53" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="57.8" y="54.05" smashed="yes" rot="R270">
-<attribute name="NAME" x="56.811" y="51.811" size="0.8128" layer="25" font="vector" rot="R90"/>
+<element name="R53" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="57.8" y="51.05" smashed="yes" rot="R270">
+<attribute name="NAME" x="56.811" y="48.811" size="0.8128" layer="25" font="vector" rot="R90"/>
 </element>
-<element name="C62" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="44.2" y="59.9" smashed="yes" rot="R270">
-<attribute name="NAME" x="45.0675" y="60.925" size="0.8128" layer="25" font="vector" ratio="10" rot="R270"/>
-<attribute name="VALUE" x="41.9125" y="61.375" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
+<element name="C62" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="44.5" y="57" smashed="yes" rot="R270">
+<attribute name="NAME" x="45.3675" y="58.025" size="0.8128" layer="25" font="vector" ratio="10" rot="R270"/>
+<attribute name="VALUE" x="42.2125" y="58.475" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="C35" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="2.2uF,16V" x="46.8" y="61.8" smashed="yes" rot="R270">
-<attribute name="NAME" x="47.5675" y="63.025" size="0.8128" layer="25" font="vector" ratio="10" rot="R270"/>
-<attribute name="VALUE" x="44.5125" y="63.275" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
+<element name="C35" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="2.2uF,16V" x="46.8" y="58.8" smashed="yes" rot="R270">
+<attribute name="NAME" x="47.5675" y="60.025" size="0.8128" layer="25" font="vector" ratio="10" rot="R270"/>
+<attribute name="VALUE" x="44.5125" y="60.275" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="C50" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="2.2uF,16V" x="62.5" y="44.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="61.5" y="43" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="64.7875" y="43.025" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C50" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="2.2uF,16V" x="61.5" y="41.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="60.5" y="40" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="63.7875" y="40.025" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="R56" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="-12" y="86.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="-12.5" y="83.6" size="0.8128" layer="25"/>
+<element name="R56" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="-3.5" y="81.5" smashed="yes" rot="R180">
+<attribute name="NAME" x="-0.6" y="81" size="0.8128" layer="25" rot="R90"/>
 </element>
-<element name="C51" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="-9.5" y="86.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="-5.3" y="85.2" size="0.8128" layer="25" font="vector" ratio="10" rot="R180"/>
-<attribute name="VALUE" x="-7.4625" y="85.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C51" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="-3" y="84.5" smashed="yes" rot="R180">
+<attribute name="NAME" x="-1.7" y="88.7" size="0.8128" layer="25" font="vector" ratio="10" rot="R270"/>
+<attribute name="VALUE" x="-1.75" y="86.5375" size="1" layer="27" font="vector" ratio="10" rot="R180"/>
 </element>
 <element name="C52" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="37" y="83.25" smashed="yes">
 <attribute name="NAME" x="37.25" y="80.5" size="0.8128" layer="25" ratio="10"/>
@@ -2887,8 +2851,8 @@ design rules under a new name.</description>
 <element name="R8" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="10K,1%" x="7.25" y="93.25" smashed="yes" rot="R270">
 <attribute name="NAME" x="6" y="90.5" size="0.8128" layer="25"/>
 </element>
-<element name="CN11" library="_Coherix" package="HDR100-3" value="HDR100-3" x="44.2" y="89.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="43.7" y="91.7" size="0.8128" layer="21"/>
+<element name="CN11" library="_Coherix" package="HDR100-3" value="HDR100-3" x="39.7" y="75.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="39.2" y="77.7" size="0.8128" layer="21"/>
 </element>
 <element name="XTAL1" library="_RoweTel" package="XTAL-FY0800035" value="XTAL-FY0800035" x="29.5" y="59.5" smashed="yes" rot="R90">
 <attribute name="NAME" x="26.9" y="63.1" size="0.8128" layer="25" ratio="10"/>
@@ -2962,18 +2926,18 @@ design rules under a new name.</description>
 <attribute name="NAME" x="1.5" y="17" size="1" layer="25" font="vector" ratio="10"/>
 <attribute name="VALUE" x="3.75" y="18.0375" size="1" layer="27" font="vector" ratio="10" rot="R180"/>
 </element>
-<element name="R11" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="100,1%" x="41.2" y="53.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="40.3825" y="52.25" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="43.2875" y="52.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="R11" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="100,1%" x="41.2" y="50.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="40.3825" y="49.25" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="43.2875" y="49.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="C49" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="-5.5" y="93.5" rot="R180"/>
-<element name="FB7" library="_RoweTel" package="FE0805" value="FB0805" x="-21" y="84.5"/>
+<element name="C49" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="-2.5" y="92" rot="R180"/>
+<element name="FB7" library="_RoweTel" package="FE0805" value="FB0805" x="-3" y="70.5"/>
 <element name="R55" library="AA-ipc-7351-resistor" package="RESC2012X70N" value="0 Ohm" x="-6.5" y="74"/>
 <element name="R54" library="AA-ipc-7351-resistor" package="RESC2012X70N" value="0 Ohm" x="-2.5" y="74"/>
-<element name="C55" library="AA-ipc-7351-capacitor" package="CAPC1005X60N" value="1nF,25V,0402" x="-2.5" y="60" rot="R90"/>
-<element name="C56" library="AA-ipc-7351-capacitor" package="CAPC1005X60N" value="1nF,25V,0402" x="-2.5" y="62.5" rot="R90"/>
-<element name="R57" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="470,1%" x="-17" y="76"/>
-<element name="R18" library="AA-ipc-7351-resistor" package="RESC2012X70N" value="0 Ohm" x="-18" y="62.5"/>
+<element name="C55" library="AA-ipc-7351-capacitor" package="CAPC1005X60N" value="1nF,25V,0402" x="-4.5" y="61.5"/>
+<element name="C56" library="AA-ipc-7351-capacitor" package="CAPC1005X60N" value="1nF,25V,0402" x="-4.5" y="64"/>
+<element name="R57" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="470,1%" x="-3" y="68" rot="R180"/>
+<element name="R18" library="AA-ipc-7351-resistor" package="RESC2012X70N" value="0 Ohm" x="-4" y="58"/>
 <element name="FB5" library="_RoweTel" package="FE0805" value="FB0805" x="5.5" y="26.5" smashed="yes" rot="R180">
 <attribute name="NAME" x="4.5" y="25.5" size="0.8128" layer="25" ratio="10" rot="R180"/>
 </element>
@@ -2991,71 +2955,71 @@ design rules under a new name.</description>
 <element name="D1" library="_RoweTel" package="TUMD2" value="RSX051VA30" x="14" y="41.5" smashed="yes" rot="R270">
 <attribute name="NAME" x="14" y="39" size="0.8128" layer="21" ratio="10"/>
 </element>
-<element name="R37" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="10K,1%" x="-21" y="81"/>
-<element name="R29" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="1.5K,1%" x="52.5" y="54" smashed="yes" rot="R270">
-<attribute name="NAME" x="53.3175" y="55.25" size="0.8128" layer="25" font="vector" ratio="10" rot="R270"/>
-<attribute name="VALUE" x="50.4125" y="55.25" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
+<element name="R37" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="10K,1%" x="-3.5" y="78"/>
+<element name="R29" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="1.5K,1%" x="52.5" y="51" smashed="yes" rot="R270">
+<attribute name="NAME" x="53.3175" y="52.25" size="0.8128" layer="25" font="vector" ratio="10" rot="R270"/>
+<attribute name="VALUE" x="50.4125" y="52.25" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="C54" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100pF,25V" x="55" y="54" smashed="yes" rot="R270">
-<attribute name="NAME" x="55.7675" y="55.25" size="0.8128" layer="25" font="vector" ratio="10" rot="R270"/>
-<attribute name="VALUE" x="52.9625" y="55.25" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
+<element name="C54" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100pF,25V" x="55" y="51" smashed="yes" rot="R270">
+<attribute name="NAME" x="55.7675" y="52.25" size="0.8128" layer="25" font="vector" ratio="10" rot="R270"/>
+<attribute name="VALUE" x="52.9625" y="52.25" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="C58" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="63" y="57.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="62.3" y="56" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="65.0375" y="56.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C58" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="63" y="54.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="62.3" y="53" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="65.0375" y="53.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="C59" library="_RoweTel" package="NICHICON-WX-6.3" value="100uF,6.3V,EL" x="60" y="63.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="64.5" y="65.5" size="0.8128" layer="25" font="vector" ratio="10" rot="R270"/>
+<element name="C59" library="_RoweTel" package="NICHICON-WX-6.3" value="100uF,6.3V,EL" x="60" y="60.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="64.5" y="62.5" size="0.8128" layer="25" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="R32" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="100,1%" x="44.1" y="56.7" smashed="yes" rot="R90">
-<attribute name="NAME" x="43.2825" y="55.45" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="46.1875" y="55.45" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="R32" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="100,1%" x="44.5" y="53.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="43.6825" y="52.25" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="46.5875" y="52.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="C32" library="_RoweTel" package="NICHICON-WX-6.3" value="100uF,6.3V,EL" x="39" y="61" smashed="yes" rot="R270">
-<attribute name="NAME" x="43.5" y="63" size="0.8128" layer="25" font="vector" ratio="10" rot="R270"/>
+<element name="C32" library="_RoweTel" package="NICHICON-WX-6.3" value="100uF,6.3V,EL" x="39.5" y="58" smashed="yes" rot="R270">
+<attribute name="NAME" x="44" y="57" size="0.8128" layer="25" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="C60" library="_RoweTel" package="CAP-CHEMI-HA0" value="220uF,25V" x="50.3" y="75" smashed="yes">
-<attribute name="NAME" x="47.3" y="82" size="1" layer="21" font="vector" ratio="10"/>
+<element name="C60" library="_RoweTel" package="CAP-CHEMI-HA0" value="220uF,25V" x="48.5" y="73.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="55.5" y="76.5" size="1" layer="21" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="R39" library="AA-ipc-7351-resistor" package="RESC3115X70N" value="4.7,0.5W,1206" x="83.5" y="88.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="82.3825" y="86.5" size="1" layer="25" font="vector" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="85.8875" y="86.5" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="R39" library="AA-ipc-7351-resistor" package="RESC3115X70N" value="4.7,0.5W,1206" x="48.5" y="96.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="49.6175" y="98.5" size="1" layer="25" font="vector" ratio="10" rot="R270"/>
+<attribute name="VALUE" x="46.1125" y="98.5" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="C57" library="AA-ipc-7351-capacitor" package="CAPC1005X60N" value="3.9nF,16V,0402" x="89.5" y="82" smashed="yes" rot="R270">
-<attribute name="NAME" x="90.079" y="82.775" size="1" layer="25" font="vector" ratio="10" rot="R270"/>
-<attribute name="VALUE" x="87.651" y="82.775" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
+<element name="C57" library="AA-ipc-7351-capacitor" package="CAPC1005X60N" value="3.9nF,16V,0402" x="51.5" y="82" smashed="yes" rot="R270">
+<attribute name="NAME" x="52.079" y="82.775" size="1" layer="25" font="vector" ratio="10" rot="R270"/>
+<attribute name="VALUE" x="49.651" y="82.775" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="R22" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="22.1K,1%" x="97.5" y="82.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="98.3175" y="83.75" size="1" layer="25" font="vector" ratio="10" rot="R270"/>
-<attribute name="VALUE" x="95.4125" y="83.75" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
+<element name="R22" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="22.1K,1%" x="59" y="81.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="59.8175" y="82.75" size="1" layer="25" font="vector" ratio="10" rot="R270"/>
+<attribute name="VALUE" x="56.9125" y="82.75" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="R23" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="47K,1%" x="51" y="43.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="50" y="42" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="53.0875" y="42.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="R23" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="47K,1%" x="50" y="40.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="49" y="39" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="52.0875" y="39.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="C61" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="55.5" y="49" smashed="yes" rot="R90">
-<attribute name="NAME" x="54.5" y="47.5" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="57.5375" y="47.75" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C61" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="54.5" y="46" smashed="yes" rot="R90">
+<attribute name="NAME" x="53.5" y="44.5" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="56.5375" y="44.75" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="R9" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="1.5K,1%" x="48" y="43.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="47" y="42" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="45.9125" y="44.75" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
+<element name="R9" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="1.5K,1%" x="47" y="40.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="46" y="39" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="44.9125" y="41.75" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
 <element name="C63" library="_RoweTel" package="CAP-CHEMI-HA0" value="220uF,25V" x="13.5" y="23"/>
-<element name="FB8" library="_RoweTel" package="FE0805" value="FB0805" x="76.5" y="98.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="75" y="97" size="1" layer="25" font="vector" ratio="10" rot="R90"/>
+<element name="FB8" library="_RoweTel" package="FE0805" value="FB0805" x="42" y="66.5" smashed="yes" rot="R180">
+<attribute name="NAME" x="40.5" y="68" size="1" layer="25" font="vector" ratio="10"/>
 </element>
-<element name="C64" library="AA-ipc-7351-capacitor" package="CAPC3225X168N" value="22uF,25V,1210" x="80" y="99" smashed="yes" rot="R90">
-<attribute name="NAME" x="78.3325" y="96.925" size="1" layer="25" font="vector" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="82.9375" y="96.925" size="0.8128" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C64" library="AA-ipc-7351-capacitor" package="CAPC3225X168N" value="22uF,25V,1210" x="47" y="67" smashed="yes">
+<attribute name="NAME" x="44.925" y="68.6675" size="1" layer="25" font="vector" ratio="10"/>
+<attribute name="VALUE" x="44.925" y="64.0625" size="0.8128" layer="27" font="vector" ratio="10"/>
 </element>
-<element name="C65" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="1uF,16V" x="83.5" y="98.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="82.7325" y="97.25" size="1" layer="25" font="vector" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="85.5375" y="97.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C65" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="1uF,16V" x="51.5" y="67" smashed="yes" rot="R90">
+<attribute name="NAME" x="50.7325" y="65.75" size="1" layer="25" font="vector" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="53.5375" y="65.75" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="C66" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="86.5" y="98.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="85.7325" y="97.25" size="1" layer="25" font="vector" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="88.5375" y="97.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C66" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="54.5" y="67" smashed="yes" rot="R90">
+<attribute name="NAME" x="53.7325" y="65.75" size="1" layer="25" font="vector" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="56.5375" y="65.75" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
 <element name="CN7" library="_RoweTel" package="ST-3509" value="ST-3509" x="48.2" y="7.5" locked="yes" smashed="yes" rot="MR270">
 <attribute name="NAME" x="44.2" y="10" size="1" layer="26" ratio="10" rot="MR270"/>
@@ -3072,41 +3036,39 @@ design rules under a new name.</description>
 <element name="CN9" library="_RoweTel" package="ST-3509" value="ST-3509" x="36.9" y="7.5" locked="yes" smashed="yes" rot="MR270">
 <attribute name="NAME" x="32.9" y="10" size="1" layer="26" ratio="10" rot="MR270"/>
 </element>
-<element name="CN10" library="_RoweTel" package="ST-3509" value="ST-3509" x="-4.5" y="67.5" rot="MR0"/>
+<element name="CN10" library="_RoweTel" package="ST-3509" value="ST-3509" x="7" y="64.5" rot="MR0"/>
 <element name="CN12" library="_RoweTel" package="HRS-A3C-16DA" value="HRS-A3C-16DA" x="27.5" y="23" locked="yes" smashed="yes">
 <attribute name="NAME" x="19.5" y="25.5" size="0.8128" layer="25" ratio="10"/>
 </element>
-<element name="SW1" library="_RoweTel" package="TS-026" value="TS-026" x="-12.5" y="74" rot="R90"/>
+<element name="SW1" library="_RoweTel" package="TS-026" value="TS-026" x="3" y="71" rot="R90"/>
 <element name="SW2" library="_RoweTel" package="TS-026" value="TS-026" x="19" y="97.5"/>
 <element name="SW4" library="_RoweTel" package="TS-026" value="TS-026" x="12" y="97.5"/>
-<element name="SW5" library="_RoweTel" package="TS-02B" value="TS-02B" x="-4.5" y="80"/>
+<element name="SW5" library="_RoweTel" package="TS-02B" value="TS-02B" x="14.5" y="64.5"/>
 <element name="U$4" library="_RoweTel" package="SWPS-OTL" value="" x="0.5" y="30.5"/>
 <element name="CN3" library="_RoweTel" package="DS-0518" value="DS-0518" x="8" y="9" locked="yes" smashed="yes" rot="R90">
 <attribute name="NAME" x="2" y="0" size="0.8128" layer="25" ratio="10" rot="R90"/>
 </element>
 <element name="SPKR1" library="_RoweTel" package="NOPACKAGE" value="SPKR-HY4004M-001" x="-0.5" y="-0.5" locked="yes" smashed="yes"/>
-<element name="CN13" library="_RoweTel" package="JI-MU3-002" value="JS-MU3-002" x="28" y="94.7" rot="MR0"/>
+<element name="CN2" library="_RoweTel" package="JI-MU3-002" value="JS-MU3-002" x="28" y="94.7" rot="MR0"/>
 </elements>
 <signals>
 <signal name="N$2">
 <contactref element="C24" pad="1"/>
 <contactref element="R31" pad="2"/>
 <contactref element="U1" pad="6"/>
-<wire x1="16.3" y1="68.5" x2="16.3" y2="67.2" width="0.2" layer="1"/>
-<wire x1="16.45" y1="68.5" x2="25" y2="68.25" width="0" layer="19" extent="1-1"/>
-<wire x1="16.3" y1="68.5" x2="16.45" y2="68.5" width="0" layer="19" extent="1-1"/>
-<wire x1="6.8" y1="66.7" x2="16.3" y2="67.2" width="0" layer="19" extent="1-1"/>
+<wire x1="12.45" y1="70.5" x2="25" y2="68.25" width="0" layer="19" extent="1-1"/>
+<wire x1="6.8" y1="66.7" x2="12.45" y2="70.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$5">
 <contactref element="C12" pad="1"/>
 <contactref element="C13" pad="1"/>
 <contactref element="U1" pad="22"/>
 <contactref element="R10" pad="1"/>
-<wire x1="10.5" y1="64.8" x2="10.6" y2="66.8" width="0.4" layer="1"/>
 <contactref element="FB7" pad="2"/>
-<wire x1="12.5" y1="64.8" x2="33" y2="68.25" width="0" layer="19" extent="1-1"/>
-<wire x1="10.5" y1="64.8" x2="12.5" y2="64.8" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.025" y1="84.5" x2="10.6" y2="66.8" width="0" layer="19" extent="1-1"/>
+<wire x1="9.1" y1="66.3" x2="33" y2="68.25" width="0" layer="19" extent="1-1"/>
+<wire x1="9" y1="64.3" x2="9.1" y2="66.3" width="0" layer="19" extent="1-1"/>
+<wire x1="6.5" y1="64.3" x2="9" y2="64.3" width="0" layer="19" extent="1-1"/>
+<wire x1="-2.025" y1="70.5" x2="6.5" y2="64.3" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VDD">
 <contactref element="C21" pad="1"/>
@@ -3172,8 +3134,6 @@ design rules under a new name.</description>
 <contactref element="R37" pad="1"/>
 <contactref element="FB8" pad="1"/>
 <contactref element="SW1" pad="1"/>
-<wire x1="62.5" y1="97" x2="76.5" y2="99.475" width="0" layer="19" extent="1-1"/>
-<wire x1="36.55" y1="85.25" x2="62.5" y2="97" width="0" layer="19" extent="1-1"/>
 <wire x1="36.2" y1="83.25" x2="36.55" y2="85.25" width="0" layer="19" extent="1-1"/>
 <wire x1="36" y1="81.75" x2="36.2" y2="83.25" width="0" layer="19" extent="1-1"/>
 <wire x1="32" y1="88.3" x2="36.55" y2="85.25" width="0" layer="19" extent="1-1"/>
@@ -3183,8 +3143,8 @@ design rules under a new name.</description>
 <wire x1="19.4" y1="88.3" x2="18.25" y2="83.55" width="0" layer="19" extent="1-1"/>
 <wire x1="14.7" y1="74.5" x2="18.25" y2="83.55" width="0" layer="19" extent="1-1"/>
 <wire x1="14.7" y1="70.5" x2="14.7" y2="74.5" width="0" layer="19" extent="1-1"/>
-<wire x1="14.55" y1="68.5" x2="14.7" y2="70.5" width="0" layer="19" extent="1-1"/>
-<wire x1="20.45" y1="68.25" x2="14.55" y2="68.5" width="0" layer="19" extent="1-1"/>
+<wire x1="10.55" y1="70.5" x2="14.7" y2="70.5" width="0" layer="19" extent="1-1"/>
+<wire x1="20.45" y1="68.25" x2="14.7" y2="70.5" width="0" layer="19" extent="1-1"/>
 <wire x1="21" y1="69.75" x2="20.45" y2="68.25" width="0" layer="19" extent="1-1"/>
 <wire x1="21.25" y1="61.7" x2="20.8" y2="66.25" width="0" layer="19" extent="1-1"/>
 <wire x1="27.5" y1="68.25" x2="21" y2="69.75" width="0" layer="19" extent="1-1"/>
@@ -3192,20 +3152,22 @@ design rules under a new name.</description>
 <wire x1="36" y1="70.75" x2="31.5" y2="68.25" width="0" layer="19" extent="1-1"/>
 <wire x1="37.8" y1="68.25" x2="36" y2="70.75" width="0" layer="19" extent="1-1"/>
 <wire x1="37.45" y1="66.25" x2="37.8" y2="68.25" width="0" layer="19" extent="1-1"/>
+<wire x1="42.975" y1="66.5" x2="37.8" y2="68.25" width="0" layer="19" extent="1-1"/>
+<wire x1="2.075" y1="69.45" x2="10.55" y2="70.5" width="0" layer="19" extent="1-1"/>
+<wire x1="-3.975" y1="70.5" x2="2.075" y2="69.45" width="0" layer="19" extent="1-1"/>
+<wire x1="-4.3" y1="78" x2="-3.975" y2="70.5" width="0" layer="19" extent="1-1"/>
+<wire x1="-3.05" y1="58" x2="-3.975" y2="70.5" width="0" layer="19" extent="1-1"/>
 <wire x1="7.25" y1="92.45" x2="19.4" y2="88.3" width="0" layer="19" extent="1-1"/>
 <wire x1="7.5" y1="96.2" x2="7.25" y2="92.45" width="0" layer="19" extent="1-1"/>
 <wire x1="5.25" y1="96.45" x2="7.5" y2="96.2" width="0" layer="19" extent="1-1"/>
 <wire x1="1.5" y1="95.5" x2="5.25" y2="96.45" width="0" layer="19" extent="1-1"/>
-<wire x1="21.3" y1="38" x2="21.25" y2="61.7" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.975" y1="84.5" x2="1.5" y2="95.5" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.8" y1="81" x2="-21.975" y2="84.5" width="0" layer="19" extent="1-1"/>
-<wire x1="-13.425" y1="72.45" x2="-21.8" y2="81" width="0" layer="19" extent="1-1"/>
-<wire x1="-17.05" y1="62.5" x2="-13.425" y2="72.45" width="0" layer="19" extent="1-1"/>
+<wire x1="20.8" y1="35.5" x2="21.25" y2="61.7" width="0" layer="19" extent="1-1"/>
+<wire x1="62.5" y1="97" x2="36.55" y2="85.25" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="BOOT1">
 <contactref element="R6" pad="2"/>
 <contactref element="U1" pad="37"/>
-<wire x1="36" y1="75.25" x2="38.7" y2="75.25" width="0" layer="19" extent="1-1"/>
+<wire x1="36" y1="75.25" x2="44.2" y2="79.75" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="GND">
 <contactref element="C8" pad="2"/>
@@ -3219,11 +3181,6 @@ design rules under a new name.</description>
 <contactref element="LED4" pad="C"/>
 <contactref element="LED3" pad="C"/>
 <contactref element="LED2" pad="C"/>
-<contactref element="CN2" pad="5"/>
-<contactref element="CN2" pad="6"/>
-<contactref element="CN2" pad="7"/>
-<contactref element="CN2" pad="8"/>
-<contactref element="CN2" pad="9"/>
 <contactref element="U3" pad="2"/>
 <contactref element="C9" pad="2"/>
 <contactref element="U4" pad="D2"/>
@@ -3410,100 +3367,103 @@ design rules under a new name.</description>
 <wire x1="25" y1="47" x2="22.8" y2="47" width="0.6" layer="1"/>
 <via x="24" y="48.5" extent="1-16" drill="0.4" diameter="0.8"/>
 <wire x1="22.8" y1="48.5" x2="24" y2="48.5" width="0.6" layer="1"/>
-<wire x1="53" y1="34.2" x2="53.7" y2="34.2" width="0.3" layer="1"/>
-<wire x1="53.7" y1="34.2" x2="54" y2="34.5" width="0.3" layer="1"/>
-<wire x1="54" y1="34.5" x2="55.5" y2="34.5" width="0.3" layer="1"/>
-<wire x1="55.5" y1="34.5" x2="56" y2="34" width="0.3" layer="1"/>
-<wire x1="56" y1="33.3" x2="56" y2="31.5" width="0.3" layer="1"/>
-<via x="56" y="31.5" extent="1-16" drill="0.6" diameter="1.27"/>
-<wire x1="56" y1="34" x2="56" y2="33.3" width="0.3" layer="1"/>
-<wire x1="59.5" y1="45.3" x2="62.5" y2="45.3" width="0.3" layer="1"/>
-<wire x1="56.5" y1="45" x2="55" y2="45" width="0.3" layer="1"/>
-<wire x1="55" y1="45" x2="54.5" y2="45.5" width="0.3" layer="1"/>
-<wire x1="54.5" y1="45.5" x2="54.5" y2="46.2" width="0.3" layer="1"/>
-<via x="57" y="50.5" extent="1-16" drill="0.4" diameter="0.8"/>
-<wire x1="55.5" y1="49.8" x2="56.3" y2="49.8" width="0.3" layer="1"/>
-<wire x1="56.3" y1="49.8" x2="57" y2="50.5" width="0.3" layer="1"/>
-<wire x1="58.5" y1="49.8" x2="57.7" y2="49.8" width="0.3" layer="1"/>
-<wire x1="57.7" y1="49.8" x2="57" y2="50.5" width="0.3" layer="1"/>
-<wire x1="59.5" y1="45.3" x2="58.2" y2="45.3" width="0.3" layer="1"/>
-<wire x1="58.2" y1="45.3" x2="57.5" y2="46" width="0.3" layer="1"/>
-<via x="57.5" y="46" extent="1-16" drill="0.6" diameter="1.27"/>
-<wire x1="56.5" y1="45" x2="57.5" y2="46" width="0.3" layer="1"/>
-<wire x1="41.05" y1="45.65" x2="41.05" y2="43.55" width="0.3" layer="1"/>
-<wire x1="41.05" y1="43.55" x2="41" y2="43.5" width="0.3" layer="1"/>
-<via x="41" y="43.5" extent="1-16" drill="0.6" diameter="1.27"/>
-<wire x1="86.5" y1="99.3" x2="94" y2="96.77" width="0" layer="19" extent="1-1"/>
-<wire x1="83.5" y1="99.3" x2="86.5" y2="99.3" width="0" layer="19" extent="1-1"/>
-<wire x1="80" y1="100.5" x2="83.5" y2="99.3" width="0" layer="19" extent="1-1"/>
-<wire x1="90.905" y1="84.65" x2="94" y2="96.77" width="0" layer="19" extent="1-1"/>
-<wire x1="91.75" y1="82.3" x2="90.905" y2="84.65" width="0" layer="19" extent="1-1"/>
-<wire x1="89.5" y1="81.55" x2="91.75" y2="82.3" width="0" layer="19" extent="1-1"/>
-<wire x1="88.365" y1="84.65" x2="90.905" y2="84.65" width="0" layer="19" extent="1-1"/>
-<wire x1="94.75" y1="81.7" x2="91.75" y2="82.3" width="0" layer="19" extent="1-1"/>
-<wire x1="97.5" y1="81.7" x2="94.75" y2="81.7" width="0" layer="19" extent="1-1"/>
-<wire x1="62.5" y1="94" x2="80" y2="100.5" width="0" layer="19" extent="1-1"/>
+<wire x1="53.5" y1="31.7" x2="54.2" y2="31.7" width="0.3" layer="1"/>
+<wire x1="54.2" y1="31.7" x2="54.5" y2="32" width="0.3" layer="1"/>
+<wire x1="54.5" y1="32" x2="56" y2="32" width="0.3" layer="1"/>
+<wire x1="56" y1="32" x2="56.5" y2="31.5" width="0.3" layer="1"/>
+<wire x1="56.5" y1="30.8" x2="56.5" y2="29" width="0.3" layer="1"/>
+<via x="56.5" y="29" extent="1-16" drill="0.6" diameter="1.27"/>
+<wire x1="56.5" y1="31.5" x2="56.5" y2="30.8" width="0.3" layer="1"/>
+<wire x1="58.5" y1="42.3" x2="61.5" y2="42.3" width="0.3" layer="1"/>
+<wire x1="55.5" y1="42" x2="54" y2="42" width="0.3" layer="1"/>
+<wire x1="54" y1="42" x2="53.5" y2="42.5" width="0.3" layer="1"/>
+<wire x1="53.5" y1="42.5" x2="53.5" y2="43.2" width="0.3" layer="1"/>
+<via x="56" y="47.5" extent="1-16" drill="0.4" diameter="0.8"/>
+<wire x1="54.5" y1="46.8" x2="55.3" y2="46.8" width="0.3" layer="1"/>
+<wire x1="55.3" y1="46.8" x2="56" y2="47.5" width="0.3" layer="1"/>
+<wire x1="57.5" y1="46.8" x2="56.7" y2="46.8" width="0.3" layer="1"/>
+<wire x1="56.7" y1="46.8" x2="56" y2="47.5" width="0.3" layer="1"/>
+<wire x1="58.5" y1="42.3" x2="57.2" y2="42.3" width="0.3" layer="1"/>
+<wire x1="57.2" y1="42.3" x2="56.5" y2="43" width="0.3" layer="1"/>
+<via x="56.5" y="43" extent="1-16" drill="0.6" diameter="1.27"/>
+<wire x1="55.5" y1="42" x2="56.5" y2="43" width="0.3" layer="1"/>
+<wire x1="40.05" y1="42.65" x2="40.05" y2="40.55" width="0.3" layer="1"/>
+<wire x1="40.05" y1="40.55" x2="40" y2="40.5" width="0.3" layer="1"/>
+<via x="40" y="40.5" extent="1-16" drill="0.6" diameter="1.27"/>
+<contactref element="CN2" pad="5"/>
+<contactref element="CN2" pad="6"/>
+<contactref element="CN2" pad="7"/>
+<contactref element="CN2" pad="8"/>
+<contactref element="CN2" pad="9"/>
+<wire x1="39.55" y1="98.5" x2="45.25" y2="94.85" width="0" layer="19" extent="1-1"/>
+<wire x1="34.45" y1="98.5" x2="39.45" y2="98.5" width="0" layer="19" extent="1-1"/>
+<wire x1="32.45" y1="97.45" x2="34.45" y2="98.45" width="0" layer="19" extent="1-16"/>
+<wire x1="29.35" y1="98.5" x2="32.45" y2="97.45" width="0" layer="19" extent="1-16"/>
+<wire x1="24.25" y1="98.5" x2="29.35" y2="98.5" width="0" layer="19" extent="1-1"/>
+<wire x1="23.55" y1="97.45" x2="24.25" y2="98.5" width="0" layer="19" extent="1-16"/>
+<wire x1="20.55" y1="98.425" x2="23.55" y2="97.45" width="0" layer="19" extent="16-16"/>
+<wire x1="9" y1="62.7" x2="10" y2="59.95" width="0" layer="19" extent="1-1"/>
+<wire x1="6.5" y1="62.7" x2="9" y2="62.7" width="0" layer="19" extent="1-1"/>
+<wire x1="4" y1="62.7" x2="6.5" y2="62.7" width="0" layer="19" extent="1-1"/>
+<wire x1="1.5" y1="62.7" x2="4" y2="62.7" width="0" layer="19" extent="1-1"/>
 <wire x1="37.45" y1="85.25" x2="40.5" y2="85.02" width="0" layer="19" extent="1-1"/>
 <wire x1="37.8" y1="83.25" x2="37.45" y2="85.25" width="0" layer="19" extent="1-1"/>
 <wire x1="40.25" y1="88.25" x2="40.5" y2="85.02" width="0" layer="19" extent="1-1"/>
-<wire x1="12.5" y1="63.2" x2="11.75" y2="60.05" width="0" layer="19" extent="1-1"/>
-<wire x1="10.5" y1="63.2" x2="12.5" y2="63.2" width="0" layer="19" extent="1-1"/>
-<wire x1="8.5" y1="63.2" x2="10.5" y2="63.2" width="0" layer="19" extent="1-1"/>
-<wire x1="6.5" y1="63.2" x2="8.5" y2="63.2" width="0" layer="19" extent="1-1"/>
-<wire x1="24.25" y1="98.5" x2="20.55" y2="98.425" width="0" layer="19" extent="1-1"/>
+<wire x1="2.25" y1="67.95" x2="3.925" y2="71" width="0" layer="19" extent="16-16"/>
+<wire x1="10.9" y1="66" x2="9" y2="62.7" width="0" layer="19" extent="1-1"/>
+<wire x1="6.8" y1="68.3" x2="3.925" y2="71" width="0" layer="19" extent="1-1"/>
 <wire x1="36.15" y1="89.5" x2="40.25" y2="88.25" width="0" layer="19" extent="1-1"/>
+<wire x1="32.45" y1="91.95" x2="36.15" y2="89.5" width="0" layer="19" extent="1-16"/>
+<wire x1="29.6" y1="91.85" x2="32.45" y2="91.95" width="0" layer="19" extent="16-16"/>
+<wire x1="36" y1="70.25" x2="39.7" y2="72.96" width="0" layer="19" extent="1-1"/>
+<wire x1="36.2" y1="68.25" x2="36" y2="70.25" width="0" layer="19" extent="1-1"/>
+<wire x1="36.55" y1="66.25" x2="36.2" y2="68.25" width="0" layer="19" extent="1-1"/>
+<wire x1="32" y1="68.25" x2="36.2" y2="68.25" width="0" layer="19" extent="1-1"/>
 <wire x1="25.75" y1="56.25" x2="25" y2="51.5" width="0" layer="19" extent="1-1"/>
 <wire x1="28.3" y1="57.4" x2="25.75" y2="56.25" width="0" layer="19" extent="1-1"/>
 <wire x1="25.5" y1="60.7" x2="28.3" y2="57.4" width="0" layer="19" extent="1-1"/>
 <wire x1="30.7" y1="61.6" x2="28.3" y2="57.4" width="0" layer="19" extent="1-1"/>
 <wire x1="41.3" y1="79.85" x2="37.8" y2="83.25" width="0" layer="19" extent="1-1"/>
-<wire x1="40.3" y1="75.25" x2="41.3" y2="79.85" width="0" layer="19" extent="1-1"/>
-<wire x1="29.35" y1="98.5" x2="24.25" y2="98.5" width="0" layer="19" extent="1-1"/>
-<wire x1="34.45" y1="98.5" x2="29.35" y2="98.5" width="0" layer="19" extent="1-1"/>
-<wire x1="39.45" y1="98.5" x2="34.45" y2="98.5" width="0" layer="19" extent="1-1"/>
-<wire x1="6.8" y1="68.3" x2="6.5" y2="63.2" width="0" layer="19" extent="1-1"/>
+<wire x1="45.8" y1="79.75" x2="41.3" y2="79.85" width="0" layer="19" extent="1-1"/>
+<wire x1="27" y1="68.25" x2="32" y2="68.25" width="0" layer="19" extent="1-1"/>
+<wire x1="44.85" y1="73.5" x2="39.7" y2="72.96" width="0" layer="19" extent="1-1"/>
 <wire x1="14.7" y1="72.5" x2="12" y2="76.96" width="0" layer="19" extent="1-1"/>
 <wire x1="33.5" y1="56.7" x2="28.3" y2="57.4" width="0" layer="19" extent="1-1"/>
-<wire x1="36.7" y1="61" x2="33.5" y2="56.7" width="0" layer="19" extent="1-1"/>
-<wire x1="36.55" y1="66.25" x2="36.7" y2="61" width="0" layer="19" extent="1-1"/>
-<wire x1="36.2" y1="68.25" x2="36.55" y2="66.25" width="0" layer="19" extent="1-1"/>
-<wire x1="36" y1="70.25" x2="36.2" y2="68.25" width="0" layer="19" extent="1-1"/>
-<wire x1="32" y1="68.25" x2="36.2" y2="68.25" width="0" layer="19" extent="1-1"/>
-<wire x1="27" y1="68.25" x2="32" y2="68.25" width="0" layer="19" extent="1-1"/>
+<wire x1="37.2" y1="58" x2="33.5" y2="56.7" width="0" layer="19" extent="1-1"/>
+<wire x1="23.55" y1="91.95" x2="23.55" y2="97.45" width="0" layer="19" extent="16-16"/>
 <wire x1="20.25" y1="57.6" x2="22.5" y2="52.5" width="0" layer="19" extent="1-1"/>
+<wire x1="-4.05" y1="61.5" x2="1.5" y2="62.7" width="0" layer="19" extent="1-1"/>
+<wire x1="-4.05" y1="64" x2="-4.05" y2="61.5" width="0" layer="19" extent="1-1"/>
+<wire x1="21" y1="86.7" x2="23.55" y2="91.95" width="0" layer="19" extent="1-16"/>
+<wire x1="20.25" y1="84.8" x2="21" y2="86.7" width="0" layer="19" extent="1-1"/>
+<wire x1="18.25" y1="84.45" x2="20.25" y2="84.8" width="0" layer="19" extent="1-1"/>
+<wire x1="23" y1="83.25" x2="20.25" y2="84.8" width="0" layer="19" extent="1-1"/>
+<wire x1="50.365" y1="85.65" x2="44.5" y2="85.27" width="0" layer="19" extent="1-1"/>
+<wire x1="52.905" y1="85.65" x2="50.365" y2="85.65" width="0" layer="19" extent="1-1"/>
+<wire x1="54.25" y1="82.3" x2="52.905" y2="85.65" width="0" layer="19" extent="1-1"/>
+<wire x1="51.5" y1="81.55" x2="54.25" y2="82.3" width="0" layer="19" extent="1-1"/>
+<wire x1="56.75" y1="80.7" x2="54.25" y2="82.3" width="0" layer="19" extent="1-1"/>
+<wire x1="59" y1="80.7" x2="56.75" y2="80.7" width="0" layer="19" extent="1-1"/>
 <wire x1="21" y1="70.25" x2="27" y2="68.25" width="0" layer="19" extent="1-1"/>
 <wire x1="19.55" y1="68.25" x2="21" y2="70.25" width="0" layer="19" extent="1-1"/>
-<wire x1="45.25" y1="94.85" x2="39.55" y2="98.5" width="0" layer="19" extent="1-1"/>
-<wire x1="58" y1="57.35" x2="57" y2="50.5" width="0" layer="19" extent="1-1"/>
-<wire x1="60.5" y1="56.7" x2="58" y2="57.35" width="0" layer="19" extent="1-1"/>
-<wire x1="63" y1="56.7" x2="60.5" y2="56.7" width="0" layer="19" extent="1-1"/>
-<wire x1="54.1" y1="59.25" x2="58" y2="57.35" width="0" layer="19" extent="1-1"/>
-<wire x1="49.8" y1="60.85" x2="54.1" y2="59.25" width="0" layer="19" extent="1-1"/>
-<wire x1="46.8" y1="61" x2="49.8" y2="60.85" width="0" layer="19" extent="1-1"/>
-<wire x1="44.2" y1="59.1" x2="46.8" y2="61" width="0" layer="19" extent="1-1"/>
-<wire x1="57.7" y1="63.5" x2="54.1" y2="59.25" width="0" layer="19" extent="1-1"/>
-<wire x1="-2.5" y1="60.45" x2="5" y2="59.8" width="0" layer="19" extent="1-1"/>
-<wire x1="-2.5" y1="62.95" x2="-2.5" y2="60.45" width="0" layer="19" extent="1-1"/>
-<wire x1="-6.3" y1="93.5" x2="1.5" y2="98" width="0" layer="19" extent="1-1"/>
-<wire x1="-9.5" y1="87.3" x2="-6.3" y2="93.5" width="0" layer="19" extent="1-1"/>
-<wire x1="-8.1" y1="81.5" x2="-9.5" y2="87.3" width="0" layer="19" extent="1-1"/>
-<wire x1="-0.9" y1="81.5" x2="-8.1" y2="81.5" width="0" layer="19" extent="1-1"/>
-<wire x1="-11.575" y1="74" x2="-8.1" y2="81.5" width="0" layer="19" extent="1-1"/>
-<wire x1="-9.25" y1="70.95" x2="-11.575" y2="74" width="0" layer="19" extent="16-16"/>
-<wire x1="18.25" y1="84.45" x2="12" y2="76.96" width="0" layer="19" extent="1-1"/>
-<wire x1="20.25" y1="84.8" x2="18.25" y2="84.45" width="0" layer="19" extent="1-1"/>
-<wire x1="21" y1="86.7" x2="20.25" y2="84.8" width="0" layer="19" extent="1-1"/>
-<wire x1="23" y1="83.25" x2="20.25" y2="84.8" width="0" layer="19" extent="1-1"/>
-<wire x1="50.3" y1="71.35" x2="40.3" y2="75.25" width="0" layer="19" extent="1-1"/>
+<wire x1="18.1" y1="66" x2="19.2" y2="66.25" width="0" layer="19" extent="1-1"/>
+<wire x1="58" y1="54.35" x2="56" y2="47.5" width="0" layer="19" extent="1-1"/>
+<wire x1="60.5" y1="53.7" x2="58" y2="54.35" width="0" layer="19" extent="1-1"/>
+<wire x1="63" y1="53.7" x2="60.5" y2="53.7" width="0" layer="19" extent="1-1"/>
+<wire x1="54.1" y1="56.25" x2="58" y2="54.35" width="0" layer="19" extent="1-1"/>
+<wire x1="49.8" y1="57.85" x2="54.1" y2="56.25" width="0" layer="19" extent="1-1"/>
+<wire x1="46.8" y1="58" x2="49.8" y2="57.85" width="0" layer="19" extent="1-1"/>
+<wire x1="44.5" y1="56.2" x2="46.8" y2="58" width="0" layer="19" extent="1-1"/>
+<wire x1="57.7" y1="60.5" x2="54.1" y2="56.25" width="0" layer="19" extent="1-1"/>
+<wire x1="48.5" y1="67" x2="44.85" y2="73.5" width="0" layer="19" extent="1-1"/>
+<wire x1="51.5" y1="67.8" x2="48.5" y2="67" width="0" layer="19" extent="1-1"/>
+<wire x1="54.5" y1="67.8" x2="51.5" y2="67.8" width="0" layer="19" extent="1-1"/>
+<wire x1="-3.3" y1="92" x2="1.5" y2="98" width="0" layer="19" extent="1-1"/>
+<wire x1="-3.8" y1="84.5" x2="-3.3" y2="92" width="0" layer="19" extent="1-1"/>
+<wire x1="51.21" y1="18.25" x2="56.5" y2="29" width="0" layer="19" extent="1-1"/>
+<wire x1="40.21" y1="18.25" x2="51.21" y2="18.25" width="0" layer="19" extent="1-1"/>
 <wire x1="13.5" y1="19.35" x2="13.5" y2="6" width="0" layer="19" extent="1-1"/>
 <wire x1="1.7" y1="16" x2="13.5" y2="19.35" width="0" layer="19" extent="1-1"/>
-<wire x1="51.21" y1="18.25" x2="63.5" y2="13" width="0" layer="19" extent="1-1"/>
-<wire x1="40.21" y1="18.25" x2="51.21" y2="18.25" width="0" layer="19" extent="1-1"/>
-<wire x1="39" y1="114.25" x2="39.55" y2="98.5" width="0" layer="19" extent="1-16"/>
-<wire x1="35.1" y1="114.275" x2="39" y2="114.25" width="0" layer="19" extent="16-16"/>
-<wire x1="39" y1="118.5" x2="39" y2="114.25" width="0" layer="19" extent="16-16"/>
-<wire x1="28" y1="114.25" x2="35.1" y2="114.275" width="0" layer="19" extent="16-16"/>
-<wire x1="28" y1="118.5" x2="28" y2="114.25" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="NRST">
 <contactref element="U1" pad="14"/>
@@ -3512,9 +3472,9 @@ design rules under a new name.</description>
 <contactref element="SW5" pad="3"/>
 <contactref element="SW5" pad="4"/>
 <wire x1="21.25" y1="63.3" x2="29" y2="68.25" width="0" layer="19" extent="1-1"/>
-<wire x1="-0.9" y1="78.5" x2="21.25" y2="63.3" width="0" layer="19" extent="1-1"/>
-<wire x1="-8.1" y1="78.5" x2="-0.9" y2="78.5" width="0" layer="19" extent="1-1"/>
-<wire x1="-4.7" y1="93.5" x2="-8.1" y2="78.5" width="0" layer="19" extent="1-1"/>
+<wire x1="18.1" y1="63" x2="21.25" y2="63.3" width="0" layer="19" extent="1-1"/>
+<wire x1="10.9" y1="63" x2="18.1" y2="63" width="0" layer="19" extent="1-1"/>
+<wire x1="-1.7" y1="92" x2="10.9" y2="63" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$1">
 <contactref element="C14" pad="1"/>
@@ -3561,8 +3521,8 @@ design rules under a new name.</description>
 <contactref element="R9" pad="1"/>
 <contactref element="P1" pad="1"/>
 <wire x1="31.5" y1="70.5" x2="34" y2="68.25" width="0" layer="19" extent="1-1"/>
-<wire x1="48" y1="44.3" x2="34" y2="68.25" width="0" layer="19" extent="1-1"/>
-<wire x1="-2.5" y1="62.05" x2="31.5" y2="70.5" width="0" layer="19" extent="1-1"/>
+<wire x1="47" y1="41.3" x2="34" y2="68.25" width="0" layer="19" extent="1-1"/>
+<wire x1="-4.95" y1="64" x2="31.5" y2="70.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="+3.3V">
 <contactref element="U2" pad="5"/>
@@ -3573,7 +3533,7 @@ design rules under a new name.</description>
 <wire x1="11.75" y1="58.45" x2="13.75" y2="58.45" width="0.6" layer="1"/>
 <wire x1="13.75" y1="58.45" x2="19.3" y2="59.9" width="0" layer="19" extent="1-1"/>
 <wire x1="23.75" y1="55.2" x2="19.3" y2="59.9" width="0" layer="19" extent="1-1"/>
-<wire x1="-18.95" y1="62.5" x2="11.75" y2="58.45" width="0" layer="19" extent="1-1"/>
+<wire x1="-4.95" y1="58" x2="11.75" y2="58.45" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="+5V">
 <contactref element="U2" pad="1"/>
@@ -3702,34 +3662,34 @@ design rules under a new name.</description>
 <contactref element="R28" pad="1"/>
 <contactref element="U4" pad="C1"/>
 <contactref element="CN2" pad="3"/>
-<wire x1="39.75" y1="88.75" x2="33.5" y2="114.275" width="0" layer="19" extent="1-16"/>
-<wire x1="24.4" y1="88.3" x2="39.75" y2="88.75" width="0" layer="19" extent="1-1"/>
+<wire x1="28" y1="91.85" x2="39.75" y2="88.75" width="0" layer="19" extent="1-16"/>
+<wire x1="24.4" y1="88.3" x2="28" y2="91.85" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$23">
 <contactref element="R27" pad="1"/>
 <contactref element="U4" pad="D1"/>
 <contactref element="CN2" pad="2"/>
-<wire x1="26" y1="88.3" x2="32.7" y2="114.275" width="0" layer="19" extent="1-16"/>
-<wire x1="39.75" y1="88.25" x2="26" y2="88.3" width="0" layer="19" extent="1-1"/>
+<wire x1="27.2" y1="91.85" x2="39.75" y2="88.25" width="0" layer="19" extent="1-16"/>
+<wire x1="26" y1="88.3" x2="27.2" y2="91.85" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="VBUS">
 <contactref element="C9" pad="1"/>
 <contactref element="U3" pad="1"/>
-<contactref element="CN2" pad="1"/>
 <contactref element="U1" pad="68"/>
 <contactref element="U4" pad="B3"/>
 <wire x1="36.15" y1="88.55" x2="36.15" y2="88.15" width="0.2" layer="1"/>
-<wire x1="45.25" y1="97.85" x2="31.9" y2="114.275" width="0" layer="19" extent="1-16"/>
+<contactref element="CN2" pad="1"/>
 <wire x1="40.75" y1="89.25" x2="45.25" y2="97.85" width="0" layer="19" extent="1-1"/>
 <wire x1="36.15" y1="88.55" x2="40.75" y2="89.25" width="0" layer="19" extent="1-1"/>
-<wire x1="26" y1="83.25" x2="36.15" y2="88.15" width="0" layer="19" extent="1-1"/>
+<wire x1="26.4" y1="91.85" x2="36.15" y2="88.55" width="0" layer="19" extent="1-16"/>
+<wire x1="26" y1="83.25" x2="26.4" y2="91.85" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$28">
 <contactref element="U4" pad="A3"/>
 <contactref element="R30" pad="1"/>
 <contactref element="CN2" pad="4"/>
-<wire x1="40.75" y1="89.75" x2="34.3" y2="114.275" width="0" layer="19" extent="1-16"/>
-<wire x1="27.6" y1="88.45" x2="40.75" y2="89.75" width="0" layer="19" extent="1-1"/>
+<wire x1="28.8" y1="91.85" x2="40.75" y2="89.75" width="0" layer="19" extent="1-16"/>
+<wire x1="27.6" y1="88.45" x2="28.8" y2="91.85" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="OTG_DP">
 <contactref element="U4" pad="C3"/>
@@ -3774,17 +3734,17 @@ design rules under a new name.</description>
 <contactref element="C55" pad="1"/>
 <contactref element="R29" pad="1"/>
 <contactref element="P4" pad="1"/>
-<wire x1="34.5" y1="68.25" x2="52.5" y2="54.8" width="0" layer="19" extent="1-1"/>
+<wire x1="34.5" y1="68.25" x2="52.5" y2="51.8" width="0" layer="19" extent="1-1"/>
 <wire x1="33.5" y1="70.5" x2="34.5" y2="68.25" width="0" layer="19" extent="1-1"/>
-<wire x1="-2.5" y1="59.55" x2="33.5" y2="70.5" width="0" layer="19" extent="1-1"/>
+<wire x1="-4.95" y1="61.5" x2="33.5" y2="70.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="DAC2_OUT">
 <contactref element="C37" pad="1"/>
 <contactref element="R54" pad="2"/>
 <contactref element="R22" pad="1"/>
 <contactref element="P3" pad="1"/>
-<wire x1="97.5" y1="83.3" x2="98.25" y2="85.7" width="0" layer="19" extent="1-1"/>
-<wire x1="33.5" y1="74" x2="97.5" y2="83.3" width="0" layer="19" extent="1-1"/>
+<wire x1="59" y1="82.3" x2="56.25" y2="90.7" width="0" layer="19" extent="1-1"/>
+<wire x1="33.5" y1="74" x2="59" y2="82.3" width="0" layer="19" extent="1-1"/>
 <wire x1="-1.55" y1="74" x2="33.5" y2="74" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="DAC1_OUT">
@@ -3792,12 +3752,12 @@ design rules under a new name.</description>
 <contactref element="P2" pad="1"/>
 <contactref element="R55" pad="2"/>
 <wire x1="-5.55" y1="74" x2="31.5" y2="74" width="0" layer="19" extent="1-1"/>
-<wire x1="55.05" y1="33.3" x2="31.5" y2="74" width="0" layer="19" extent="1-1"/>
+<wire x1="55.55" y1="30.8" x2="31.5" y2="74" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="!CPPT!">
 <contactref element="U1" pad="57"/>
 <contactref element="LD2" pad="2"/>
-<wire x1="21" y1="32" x2="31.5" y2="83.25" width="0" layer="19" extent="1-1"/>
+<wire x1="20.5" y1="29.5" x2="31.5" y2="83.25" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="!TEST!">
 <contactref element="R4" pad="2"/>
@@ -3896,19 +3856,19 @@ design rules under a new name.</description>
 <contactref element="R58" pad="1"/>
 <contactref element="C33" pad="1"/>
 <contactref element="R11" pad="2"/>
-<wire x1="58" y1="56.45" x2="63" y2="54.8" width="0" layer="19" extent="1-1"/>
-<wire x1="44.1" y1="52.7" x2="58" y2="56.45" width="0" layer="19" extent="1-1"/>
-<wire x1="41.2" y1="54.3" x2="44.1" y2="52.7" width="0" layer="19" extent="1-1"/>
+<wire x1="58" y1="53.45" x2="63" y2="51.8" width="0" layer="19" extent="1-1"/>
+<wire x1="44.1" y1="49.7" x2="58" y2="53.45" width="0" layer="19" extent="1-1"/>
+<wire x1="41.2" y1="51.3" x2="44.1" y2="49.7" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$35">
 <contactref element="C33" pad="2"/>
 <contactref element="R41" pad="1"/>
-<wire x1="60.5" y1="53.2" x2="63" y2="53.2" width="0" layer="19" extent="1-1"/>
+<wire x1="60.5" y1="50.2" x2="63" y2="50.2" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$34">
 <contactref element="C37" pad="2"/>
 <contactref element="R46" pad="3"/>
-<wire x1="52.89" y1="95.08" x2="98.25" y2="87.3" width="0" layer="19" extent="1-1"/>
+<wire x1="52.89" y1="95.08" x2="56.25" y2="92.3" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="+VIN">
 <contactref element="C23" pad="1"/>
@@ -3918,8 +3878,8 @@ design rules under a new name.</description>
 <contactref element="SW3" pad="6"/>
 <contactref element="R21" pad="1"/>
 <contactref element="C63" pad="1"/>
-<wire x1="83.5" y1="87.05" x2="91.75" y2="80.7" width="0" layer="19" extent="1-1"/>
-<wire x1="7.25" y1="78.5" x2="83.5" y2="87.05" width="0" layer="19" extent="1-1"/>
+<wire x1="54.25" y1="80.7" x2="48.5" y2="97.95" width="0" layer="19" extent="1-1"/>
+<wire x1="7.25" y1="78.5" x2="48.5" y2="97.95" width="0" layer="19" extent="1-1"/>
 <wire x1="4.75" y1="78.5" x2="7.25" y2="78.5" width="0" layer="19" extent="1-1"/>
 <wire x1="7.31" y1="69.86" x2="7.25" y2="78.5" width="0" layer="19" extent="1-1"/>
 <wire x1="4.55" y1="29" x2="7.31" y2="69.86" width="0" layer="19" extent="1-1"/>
@@ -3928,23 +3888,23 @@ design rules under a new name.</description>
 <signal name="N$43">
 <contactref element="R50" pad="1"/>
 <contactref element="C40" pad="2"/>
-<wire x1="94.75" y1="83.3" x2="94.75" y2="90.8" width="0" layer="19" extent="1-1"/>
+<wire x1="56.75" y1="82.3" x2="62.75" y2="82.3" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$39">
 <contactref element="R46" pad="2"/>
 <contactref element="U8" pad="3"/>
 <contactref element="C57" pad="1"/>
-<wire x1="89.5" y1="82.45" x2="89.635" y2="84.65" width="0" layer="19" extent="1-1"/>
-<wire x1="55.43" y1="95.08" x2="89.635" y2="84.65" width="0" layer="19" extent="1-1"/>
+<wire x1="51.635" y1="85.65" x2="55.43" y2="95.08" width="0" layer="19" extent="1-1"/>
+<wire x1="51.5" y1="82.45" x2="51.635" y2="85.65" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$45">
 <contactref element="R58" pad="2"/>
 <contactref element="R32" pad="1"/>
 <contactref element="C62" pad="1"/>
 <contactref element="C32" pad="1"/>
-<wire x1="41.3" y1="61" x2="44.2" y2="60.7" width="0" layer="19" extent="1-1"/>
-<wire x1="44.1" y1="55.9" x2="44.2" y2="60.7" width="0" layer="19" extent="1-1"/>
-<wire x1="44.1" y1="54.3" x2="44.1" y2="55.9" width="0" layer="19" extent="1-1"/>
+<wire x1="41.8" y1="58" x2="44.5" y2="57.8" width="0" layer="19" extent="1-1"/>
+<wire x1="44.5" y1="52.7" x2="44.5" y2="57.8" width="0" layer="19" extent="1-1"/>
+<wire x1="44.1" y1="51.3" x2="44.5" y2="52.7" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$47">
 <contactref element="LED8" pad="A"/>
@@ -4021,39 +3981,39 @@ design rules under a new name.</description>
 <signal name="N$49">
 <contactref element="LD2" pad="1"/>
 <contactref element="R51" pad="1"/>
-<wire x1="19.7" y1="38" x2="21" y2="35" width="0" layer="19" extent="1-1"/>
+<wire x1="19.2" y1="35.5" x2="20.5" y2="32.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$59">
 <contactref element="U6" pad="1"/>
 <contactref element="R45" pad="1"/>
 <contactref element="R44" pad="1"/>
 <contactref element="C61" pad="1"/>
-<wire x1="61.5" y1="48.2" x2="58.5" y2="48.2" width="0.3" layer="1"/>
-<wire x1="58.5" y1="48.2" x2="55.5" y2="48.2" width="0.3" layer="1"/>
-<wire x1="55.5" y1="48.2" x2="55.5" y2="46.25" width="0.3" layer="1"/>
-<wire x1="55.5" y1="46.25" x2="55.45" y2="46.2" width="0.3" layer="1"/>
+<wire x1="60.5" y1="45.2" x2="57.5" y2="45.2" width="0.3" layer="1"/>
+<wire x1="57.5" y1="45.2" x2="54.5" y2="45.2" width="0.3" layer="1"/>
+<wire x1="54.5" y1="45.2" x2="54.5" y2="43.25" width="0.3" layer="1"/>
+<wire x1="54.5" y1="43.25" x2="54.45" y2="43.2" width="0.3" layer="1"/>
 </signal>
 <signal name="N$71">
 <contactref element="U7" pad="4"/>
 <contactref element="C38" pad="1"/>
 <contactref element="U7" pad="3"/>
-<wire x1="56.95" y1="35.7" x2="58.2" y2="35.7" width="0.3" layer="1"/>
-<wire x1="58.2" y1="35.7" x2="58.5" y2="36" width="0.3" layer="1"/>
-<wire x1="58.5" y1="36" x2="60.5" y2="36" width="0.3" layer="1"/>
-<wire x1="56.95" y1="33.3" x2="56.95" y2="35.7" width="0.2" layer="1"/>
+<wire x1="57.45" y1="33.2" x2="58.7" y2="33.2" width="0.3" layer="1"/>
+<wire x1="58.7" y1="33.2" x2="59" y2="33.5" width="0.3" layer="1"/>
+<wire x1="59" y1="33.5" x2="61" y2="33.5" width="0.3" layer="1"/>
+<wire x1="57.45" y1="30.8" x2="57.45" y2="33.2" width="0.2" layer="1"/>
 </signal>
 <signal name="N$50">
 <contactref element="R43" pad="2"/>
 <contactref element="C36" pad="1"/>
-<wire x1="47.1" y1="49" x2="49" y2="49" width="0.3" layer="1"/>
-<wire x1="49" y1="49" x2="49.5" y2="49.5" width="0.3" layer="1"/>
-<wire x1="49.5" y1="49.5" x2="49.8" y2="49.8" width="0.3" layer="1"/>
-<wire x1="49.8" y1="49.8" x2="51" y2="49.8" width="0.3" layer="1"/>
+<wire x1="46.1" y1="46" x2="48" y2="46" width="0.3" layer="1"/>
+<wire x1="48" y1="46" x2="48.5" y2="46.5" width="0.3" layer="1"/>
+<wire x1="48.5" y1="46.5" x2="48.8" y2="46.8" width="0.3" layer="1"/>
+<wire x1="48.8" y1="46.8" x2="50" y2="46.8" width="0.3" layer="1"/>
 </signal>
 <signal name="N$63">
 <contactref element="T1" pad="1"/>
 <contactref element="R52" pad="3"/>
-<wire x1="56.29" y1="18.25" x2="43.95" y2="45.65" width="0" layer="19" extent="1-1"/>
+<wire x1="56.29" y1="18.25" x2="42.95" y2="42.65" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$66">
 <via x="4.5" y="21.5" extent="1-16" drill="3.2" diameter="6.4516"/>
@@ -4084,7 +4044,7 @@ design rules under a new name.</description>
 <wire x1="57" y1="20.5" x2="55.5" y2="20.5" width="0.2" layer="1"/>
 <wire x1="55.5" y1="20.5" x2="54.5" y2="21.5" width="0.2" layer="1"/>
 <wire x1="54.5" y1="21.5" x2="54.5" y2="22.525" width="0.2" layer="1"/>
-<wire x1="54.5" y1="22.525" x2="51.5" y2="26.7" width="0" layer="19" extent="1-1"/>
+<wire x1="54.5" y1="22.525" x2="50" y2="22.7" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$64">
 <contactref element="FB1" pad="2"/>
@@ -4104,31 +4064,31 @@ design rules under a new name.</description>
 <signal name="N$73">
 <contactref element="FB6" pad="2"/>
 <contactref element="CN9" pad="C"/>
-<wire x1="33.45" y1="12" x2="31.975" y2="38" width="0" layer="19" extent="1-16"/>
+<wire x1="33.45" y1="12" x2="31.475" y2="35.5" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$74">
 <contactref element="FB6" pad="1"/>
 <contactref element="LD2" pad="4"/>
 <contactref element="C45" pad="1"/>
-<wire x1="31" y1="35" x2="30.025" y2="38" width="0" layer="19" extent="1-1"/>
-<wire x1="26.8" y1="38" x2="30.025" y2="38" width="0" layer="19" extent="1-1"/>
+<wire x1="30.5" y1="32.5" x2="29.525" y2="35.5" width="0" layer="19" extent="1-1"/>
+<wire x1="26.3" y1="35.5" x2="29.525" y2="35.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$44">
 <contactref element="FB3" pad="1"/>
 <contactref element="C39" pad="2"/>
-<wire x1="59.5" y1="71.35" x2="113.5" y2="85.475" width="0" layer="19" extent="1-1"/>
+<wire x1="39.5" y1="23.475" x2="60" y2="68.35" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$75">
 <contactref element="FB3" pad="2"/>
 <contactref element="CN8" pad="C"/>
 <contactref element="CN8" pad="B"/>
-<wire x1="29.05" y1="4.55" x2="113.5" y2="83.525" width="0" layer="19" extent="1-16"/>
-<wire x1="22.15" y1="12" x2="29.05" y2="4.55" width="0" layer="19" extent="16-16"/>
+<wire x1="22.15" y1="12" x2="39.5" y2="21.525" width="0" layer="19" extent="1-16"/>
+<wire x1="29.05" y1="4.55" x2="22.15" y2="12" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="N$76">
 <contactref element="FB4" pad="1"/>
 <contactref element="CN5" pad="C"/>
-<wire x1="10.85" y1="12" x2="37.025" y2="55.5" width="0" layer="19" extent="1-16"/>
+<wire x1="10.85" y1="12" x2="28.025" y2="40" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$77">
 <contactref element="C30" pad="1"/>
@@ -4142,9 +4102,9 @@ design rules under a new name.</description>
 <contactref element="C11" pad="1"/>
 <contactref element="U1" pad="21"/>
 <contactref element="R10" pad="2"/>
-<wire x1="10.6" y1="68.4" x2="32.5" y2="68.25" width="0" layer="19" extent="1-1"/>
-<wire x1="8.5" y1="64.8" x2="10.6" y2="68.4" width="0" layer="19" extent="1-1"/>
-<wire x1="6.5" y1="64.8" x2="8.5" y2="64.8" width="0" layer="19" extent="1-1"/>
+<wire x1="9.1" y1="67.9" x2="32.5" y2="68.25" width="0" layer="19" extent="1-1"/>
+<wire x1="4" y1="64.3" x2="9.1" y2="67.9" width="0" layer="19" extent="1-1"/>
+<wire x1="1.5" y1="64.3" x2="4" y2="64.3" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$24">
 <contactref element="D2" pad="A"/>
@@ -4159,46 +4119,46 @@ design rules under a new name.</description>
 <wire x1="43" y1="10.5" x2="43" y2="13.5" width="0.2" layer="1"/>
 <wire x1="43" y1="13.5" x2="44" y2="14.5" width="0.2" layer="1"/>
 <wire x1="44" y1="14.5" x2="44" y2="24" width="0.2" layer="1"/>
-<wire x1="44" y1="24" x2="40.5" y2="33.3" width="0" layer="19" extent="1-1"/>
+<wire x1="44" y1="24" x2="41" y2="30.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$82">
 <contactref element="R48" pad="1"/>
 <contactref element="R47" pad="3"/>
-<wire x1="49.95" y1="33.15" x2="50" y2="33.1" width="0.3" layer="1"/>
-<wire x1="50" y1="33.1" x2="50" y2="32" width="0.3" layer="1"/>
-<wire x1="50" y1="32" x2="49.7" y2="31.7" width="0.3" layer="1"/>
-<wire x1="49.7" y1="31.7" x2="40.5" y2="31.7" width="0.3" layer="1"/>
+<wire x1="50.45" y1="30.65" x2="50.5" y2="30.6" width="0.3" layer="1"/>
+<wire x1="50.5" y1="30.6" x2="50.5" y2="29.5" width="0.3" layer="1"/>
+<wire x1="50.5" y1="29.5" x2="50.2" y2="29.2" width="0.3" layer="1"/>
+<wire x1="50.2" y1="29.2" x2="41" y2="29.2" width="0.3" layer="1"/>
 </signal>
 <signal name="N$65">
 <contactref element="C38" pad="2"/>
 <contactref element="T2" pad="1"/>
-<wire x1="45.29" y1="18.25" x2="60.5" y2="33" width="0" layer="19" extent="1-1"/>
+<wire x1="45.29" y1="18.25" x2="61" y2="30.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$79">
 <contactref element="C47" pad="2"/>
 <contactref element="FB2" pad="1"/>
 <contactref element="C43" pad="1"/>
-<wire x1="38" y1="33.975" x2="38" y2="35.5" width="0.3" layer="1"/>
-<wire x1="38" y1="35.5" x2="38" y2="36.7" width="0.3" layer="1"/>
-<wire x1="43.7" y1="34" x2="42" y2="34" width="0.3" layer="1"/>
-<wire x1="42" y1="34" x2="41.5" y2="34.5" width="0.3" layer="1"/>
-<wire x1="41.5" y1="34.5" x2="40.5" y2="34.5" width="0.3" layer="1"/>
-<wire x1="40.5" y1="34.5" x2="39.5" y2="35.5" width="0.3" layer="1"/>
-<wire x1="39.5" y1="35.5" x2="38" y2="35.5" width="0.3" layer="1"/>
+<wire x1="38.5" y1="31.475" x2="38.5" y2="33" width="0.3" layer="1"/>
+<wire x1="38.5" y1="33" x2="38.5" y2="34.2" width="0.3" layer="1"/>
+<wire x1="44.2" y1="31.5" x2="42.5" y2="31.5" width="0.3" layer="1"/>
+<wire x1="42.5" y1="31.5" x2="42" y2="32" width="0.3" layer="1"/>
+<wire x1="42" y1="32" x2="41" y2="32" width="0.3" layer="1"/>
+<wire x1="41" y1="32" x2="40" y2="33" width="0.3" layer="1"/>
+<wire x1="40" y1="33" x2="38.5" y2="33" width="0.3" layer="1"/>
 </signal>
 <signal name="N$62">
 <contactref element="J4" pad="1"/>
 <contactref element="CN8" pad="D"/>
-<wire x1="26.35" y1="16" x2="94" y2="94.23" width="0" layer="19" extent="16-16"/>
+<wire x1="26.35" y1="16" x2="44.5" y2="82.73" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="N$41">
 <contactref element="R42" pad="1"/>
 <contactref element="R42" pad="2"/>
 <contactref element="R53" pad="2"/>
 <contactref element="C54" pad="1"/>
-<wire x1="55" y1="54.8" x2="57.8" y2="53.25" width="0" layer="19" extent="1-1"/>
-<wire x1="48.5" y1="57.45" x2="55" y2="54.8" width="0" layer="19" extent="1-1"/>
-<wire x1="47.05" y1="53.65" x2="48.5" y2="57.45" width="0" layer="19" extent="1-1"/>
+<wire x1="55" y1="51.8" x2="57.8" y2="50.25" width="0" layer="19" extent="1-1"/>
+<wire x1="48.5" y1="54.45" x2="55" y2="51.8" width="0" layer="19" extent="1-1"/>
+<wire x1="47.05" y1="50.65" x2="48.5" y2="54.45" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$46">
 <contactref element="R38" pad="1"/>
@@ -4206,22 +4166,22 @@ design rules under a new name.</description>
 <contactref element="R40" pad="1"/>
 <contactref element="C58" pad="2"/>
 <contactref element="C59" pad="1"/>
-<wire x1="63" y1="58.3" x2="62.3" y2="63.5" width="0" layer="19" extent="1-1"/>
-<wire x1="60.5" y1="58.3" x2="63" y2="58.3" width="0" layer="19" extent="1-1"/>
-<wire x1="55.05" y1="59.25" x2="60.5" y2="58.3" width="0" layer="19" extent="1-1"/>
-<wire x1="54.3" y1="61.5" x2="55.05" y2="59.25" width="0" layer="19" extent="1-1"/>
+<wire x1="63" y1="55.3" x2="62.3" y2="60.5" width="0" layer="19" extent="1-1"/>
+<wire x1="60.5" y1="55.3" x2="63" y2="55.3" width="0" layer="19" extent="1-1"/>
+<wire x1="55.05" y1="56.25" x2="60.5" y2="55.3" width="0" layer="19" extent="1-1"/>
+<wire x1="54.3" y1="58.5" x2="55.05" y2="56.25" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$87">
 <contactref element="R41" pad="2"/>
 <contactref element="U9" pad="3"/>
 <contactref element="R53" pad="1"/>
-<wire x1="57.8" y1="54.85" x2="60.5" y2="54.8" width="0" layer="19" extent="1-1"/>
-<wire x1="53.15" y1="59.25" x2="57.8" y2="54.85" width="0" layer="19" extent="1-1"/>
+<wire x1="57.8" y1="51.85" x2="60.5" y2="51.8" width="0" layer="19" extent="1-1"/>
+<wire x1="53.15" y1="56.25" x2="57.8" y2="51.85" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="!EXT-PTT!">
 <contactref element="U1" pad="55"/>
 <contactref element="R56" pad="2"/>
-<wire x1="-12" y1="87.3" x2="32.5" y2="83.25" width="0" layer="19" extent="1-1"/>
+<wire x1="-4.3" y1="81.5" x2="32.5" y2="83.25" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="APTT">
 <contactref element="CN9" pad="D"/>
@@ -4239,14 +4199,14 @@ design rules under a new name.</description>
 <contactref element="CN11" pad="3"/>
 <contactref element="U1" pad="48"/>
 <contactref element="R2" pad="2"/>
-<wire x1="36" y1="80.75" x2="44.2" y2="84.42" width="0" layer="19" extent="1-1"/>
+<wire x1="39.7" y1="70.42" x2="36" y2="80.75" width="0" layer="19" extent="1-1"/>
 <wire x1="16.3" y1="74.5" x2="36" y2="80.75" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="USART3_TX">
 <contactref element="CN11" pad="1"/>
 <contactref element="U1" pad="47"/>
 <contactref element="R5" pad="2"/>
-<wire x1="36" y1="80.25" x2="44.2" y2="89.5" width="0" layer="19" extent="1-1"/>
+<wire x1="39.7" y1="75.5" x2="36" y2="80.25" width="0" layer="19" extent="1-1"/>
 <wire x1="16.3" y1="70.5" x2="36" y2="80.25" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$7">
@@ -4258,19 +4218,19 @@ design rules under a new name.</description>
 <contactref element="U8" pad="5"/>
 <contactref element="C40" pad="1"/>
 <contactref element="C39" pad="1"/>
-<wire x1="90.905" y1="89.85" x2="94.75" y2="89.2" width="0" layer="19" extent="1-1"/>
-<wire x1="59.5" y1="78.65" x2="90.905" y2="89.85" width="0" layer="19" extent="1-1"/>
+<wire x1="62.75" y1="80.7" x2="52.905" y2="90.85" width="0" layer="19" extent="1-1"/>
+<wire x1="60" y1="75.65" x2="62.75" y2="80.7" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$9">
 <contactref element="R52" pad="2"/>
 <contactref element="C36" pad="2"/>
-<wire x1="42.5" y1="49.45" x2="42.5" y2="48.5" width="0.3" layer="1"/>
-<wire x1="42.5" y1="48.5" x2="43.5" y2="47.5" width="0.3" layer="1"/>
-<wire x1="43.5" y1="47.5" x2="44.5" y2="47.5" width="0.3" layer="1"/>
-<wire x1="44.5" y1="47.5" x2="46.5" y2="47.5" width="0.3" layer="1"/>
-<wire x1="46.5" y1="47.5" x2="47" y2="47" width="0.3" layer="1"/>
-<wire x1="47" y1="47" x2="47.1" y2="46.9" width="0.3" layer="1"/>
-<wire x1="47.1" y1="46.9" x2="47.1" y2="46" width="0.3" layer="1"/>
+<wire x1="41.5" y1="46.45" x2="41.5" y2="45.5" width="0.3" layer="1"/>
+<wire x1="41.5" y1="45.5" x2="42.5" y2="44.5" width="0.3" layer="1"/>
+<wire x1="42.5" y1="44.5" x2="43.5" y2="44.5" width="0.3" layer="1"/>
+<wire x1="43.5" y1="44.5" x2="45.5" y2="44.5" width="0.3" layer="1"/>
+<wire x1="45.5" y1="44.5" x2="46" y2="44" width="0.3" layer="1"/>
+<wire x1="46" y1="44" x2="46.1" y2="43.9" width="0.3" layer="1"/>
+<wire x1="46.1" y1="43.9" x2="46.1" y2="43" width="0.3" layer="1"/>
 </signal>
 <signal name="PE0">
 <contactref element="U1" pad="97"/>
@@ -4315,7 +4275,7 @@ design rules under a new name.</description>
 <signal name="N$26">
 <contactref element="FB4" pad="2"/>
 <contactref element="R11" pad="1"/>
-<wire x1="41.2" y1="52.7" x2="38.975" y2="55.5" width="0" layer="19" extent="1-1"/>
+<wire x1="29.975" y1="40" x2="41.2" y2="49.7" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$11">
 <contactref element="R55" pad="1"/>
@@ -4332,7 +4292,7 @@ design rules under a new name.</description>
 <contactref element="R57" pad="1"/>
 <contactref element="U1" pad="88"/>
 <wire x1="21" y1="72.75" x2="21" y2="75.75" width="0" layer="19" extent="1-1"/>
-<wire x1="-17.8" y1="76" x2="21" y2="75.75" width="0" layer="19" extent="1-1"/>
+<wire x1="-2.2" y1="68" x2="21" y2="72.75" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="!BACK!">
 <contactref element="U1" pad="82"/>
@@ -4352,17 +4312,17 @@ design rules under a new name.</description>
 <contactref element="R57" pad="2"/>
 <contactref element="R1" pad="2"/>
 <contactref element="SW1" pad="2"/>
-<wire x1="-13.425" y1="75.55" x2="16.3" y2="72.5" width="0" layer="19" extent="1-1"/>
-<wire x1="-16.2" y1="76" x2="-13.425" y2="75.55" width="0" layer="19" extent="1-1"/>
+<wire x1="2.075" y1="72.55" x2="16.3" y2="72.5" width="0" layer="19" extent="1-1"/>
+<wire x1="-3.8" y1="68" x2="2.075" y2="72.55" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$15">
 <contactref element="R56" pad="1"/>
 <contactref element="C51" pad="1"/>
 <contactref element="R37" pad="2"/>
 <contactref element="CN10" pad="C"/>
-<wire x1="-12" y1="85.7" x2="-9.5" y2="85.7" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.2" y1="81" x2="-12" y2="85.7" width="0" layer="19" extent="1-1"/>
-<wire x1="0" y1="70.95" x2="-9.5" y2="85.7" width="0" layer="19" extent="1-16"/>
+<wire x1="-2.7" y1="81.5" x2="-2.2" y2="84.5" width="0" layer="19" extent="1-1"/>
+<wire x1="-2.7" y1="78" x2="-2.7" y2="81.5" width="0" layer="19" extent="1-1"/>
+<wire x1="11.5" y1="67.95" x2="-2.7" y2="78" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="AVDD">
 <contactref element="C22" pad="1"/>
@@ -4383,55 +4343,55 @@ design rules under a new name.</description>
 <contactref element="C64" pad="1"/>
 <contactref element="C65" pad="1"/>
 <contactref element="C66" pad="1"/>
-<wire x1="55.05" y1="35.7" x2="55.05" y2="35.8" width="0.3" layer="1"/>
-<wire x1="55.05" y1="35.8" x2="53" y2="35.8" width="0.3" layer="1"/>
-<wire x1="56" y1="35.7" x2="55.05" y2="35.7" width="0.3" layer="1"/>
-<via x="55" y="37.5" extent="1-16" drill="0.6" diameter="1.27"/>
-<wire x1="55.05" y1="35.8" x2="55.05" y2="37.45" width="0.3" layer="1"/>
-<wire x1="55.05" y1="37.45" x2="55" y2="37.5" width="0.3" layer="1"/>
-<via x="57" y="42.5" extent="1-16" drill="0.6" diameter="1.27"/>
-<wire x1="54.5" y1="43.8" x2="55.45" y2="43.8" width="0.3" layer="1"/>
-<wire x1="58.4" y1="43.8" x2="59.5" y2="43.7" width="0.3" layer="1"/>
-<via x="60" y="50.5" extent="1-16" drill="0.4" diameter="0.8"/>
-<wire x1="61.5" y1="49.8" x2="60.7" y2="49.8" width="0.3" layer="1"/>
-<wire x1="60.7" y1="49.8" x2="60" y2="50.5" width="0.3" layer="1"/>
-<wire x1="62.5" y1="43.7" x2="59.5" y2="43.7" width="0.3" layer="1"/>
-<wire x1="58.4" y1="43.8" x2="57" y2="43.8" width="0.3" layer="1"/>
-<wire x1="57" y1="43.8" x2="55.45" y2="43.8" width="0.3" layer="1"/>
-<wire x1="57" y1="42.5" x2="57" y2="43.8" width="0.3" layer="1"/>
-<wire x1="83.5" y1="97.7" x2="86.5" y2="97.7" width="0" layer="19" extent="1-1"/>
-<wire x1="80" y1="97.5" x2="83.5" y2="97.7" width="0" layer="19" extent="1-1"/>
-<wire x1="76.5" y1="97.525" x2="80" y2="97.5" width="0" layer="19" extent="1-1"/>
-<wire x1="48.27" y1="66.5" x2="76.5" y2="97.525" width="0" layer="19" extent="1-1"/>
-<wire x1="46.8" y1="62.6" x2="48.27" y2="66.5" width="0" layer="19" extent="1-1"/>
-<wire x1="49.8" y1="62.45" x2="46.8" y2="62.6" width="0" layer="19" extent="1-1"/>
-<wire x1="52.7" y1="61.5" x2="49.8" y2="62.45" width="0" layer="19" extent="1-1"/>
-<wire x1="54.1" y1="56.85" x2="52.7" y2="61.5" width="0" layer="19" extent="1-1"/>
-<wire x1="55.05" y1="56.85" x2="54.1" y2="56.85" width="0" layer="19" extent="1-1"/>
-<wire x1="60" y1="50.5" x2="55.05" y2="56.85" width="0" layer="19" extent="1-1"/>
-<wire x1="62.5" y1="43.7" x2="61.5" y2="49.8" width="0" layer="19" extent="1-1"/>
-<wire x1="55" y1="37.5" x2="57" y2="42.5" width="0" layer="19" extent="1-1"/>
+<wire x1="55.55" y1="33.2" x2="55.55" y2="33.3" width="0.3" layer="1"/>
+<wire x1="55.55" y1="33.3" x2="53.5" y2="33.3" width="0.3" layer="1"/>
+<wire x1="56.5" y1="33.2" x2="55.55" y2="33.2" width="0.3" layer="1"/>
+<via x="55.5" y="35" extent="1-16" drill="0.6" diameter="1.27"/>
+<wire x1="55.55" y1="33.3" x2="55.55" y2="34.95" width="0.3" layer="1"/>
+<wire x1="55.55" y1="34.95" x2="55.5" y2="35" width="0.3" layer="1"/>
+<via x="56" y="39.5" extent="1-16" drill="0.6" diameter="1.27"/>
+<wire x1="53.5" y1="40.8" x2="54.45" y2="40.8" width="0.3" layer="1"/>
+<wire x1="57.4" y1="40.8" x2="58.5" y2="40.7" width="0.3" layer="1"/>
+<via x="59" y="47.5" extent="1-16" drill="0.4" diameter="0.8"/>
+<wire x1="60.5" y1="46.8" x2="59.7" y2="46.8" width="0.3" layer="1"/>
+<wire x1="59.7" y1="46.8" x2="59" y2="47.5" width="0.3" layer="1"/>
+<wire x1="61.5" y1="40.7" x2="58.5" y2="40.7" width="0.3" layer="1"/>
+<wire x1="57.4" y1="40.8" x2="56" y2="40.8" width="0.3" layer="1"/>
+<wire x1="56" y1="40.8" x2="54.45" y2="40.8" width="0.3" layer="1"/>
+<wire x1="56" y1="39.5" x2="56" y2="40.8" width="0.3" layer="1"/>
+<wire x1="51.5" y1="66.2" x2="54.5" y2="66.2" width="0" layer="19" extent="1-1"/>
+<wire x1="48.27" y1="62" x2="51.5" y2="66.2" width="0" layer="19" extent="1-1"/>
+<wire x1="46.8" y1="59.6" x2="48.27" y2="62" width="0" layer="19" extent="1-1"/>
+<wire x1="49.8" y1="59.45" x2="48.27" y2="62" width="0" layer="19" extent="1-1"/>
+<wire x1="52.7" y1="58.5" x2="49.8" y2="59.45" width="0" layer="19" extent="1-1"/>
+<wire x1="54.1" y1="53.85" x2="52.7" y2="58.5" width="0" layer="19" extent="1-1"/>
+<wire x1="55.05" y1="53.85" x2="54.1" y2="53.85" width="0" layer="19" extent="1-1"/>
+<wire x1="45.5" y1="67" x2="48.27" y2="62" width="0" layer="19" extent="1-1"/>
+<wire x1="41.025" y1="66.5" x2="45.5" y2="67" width="0" layer="19" extent="1-1"/>
+<wire x1="59" y1="47.5" x2="55.05" y2="53.85" width="0" layer="19" extent="1-1"/>
+<wire x1="61.5" y1="40.7" x2="60.5" y2="46.8" width="0" layer="19" extent="1-1"/>
+<wire x1="55.5" y1="35" x2="56" y2="39.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$27">
 <contactref element="R42" pad="3"/>
 <contactref element="U9" pad="4"/>
 <contactref element="R29" pad="2"/>
 <contactref element="C54" pad="2"/>
-<wire x1="52.5" y1="53.2" x2="53.15" y2="56.85" width="0" layer="19" extent="1-1"/>
-<wire x1="55" y1="53.2" x2="52.5" y2="53.2" width="0" layer="19" extent="1-1"/>
-<wire x1="49.95" y1="53.65" x2="52.5" y2="53.2" width="0" layer="19" extent="1-1"/>
+<wire x1="52.5" y1="50.2" x2="53.15" y2="53.85" width="0" layer="19" extent="1-1"/>
+<wire x1="55" y1="50.2" x2="52.5" y2="50.2" width="0" layer="19" extent="1-1"/>
+<wire x1="49.95" y1="50.65" x2="52.5" y2="50.2" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$29">
 <contactref element="J3" pad="1"/>
 <contactref element="R32" pad="2"/>
-<wire x1="44.1" y1="57.5" x2="45.73" y2="66.5" width="0" layer="19" extent="1-1"/>
+<wire x1="44.5" y1="54.3" x2="45.73" y2="62" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$48">
 <contactref element="U8" pad="6"/>
 <contactref element="C60" pad="1"/>
 <contactref element="R39" pad="2"/>
-<wire x1="83.5" y1="89.95" x2="89.635" y2="89.85" width="0" layer="19" extent="1-1"/>
-<wire x1="50.3" y1="78.65" x2="83.5" y2="89.95" width="0" layer="19" extent="1-1"/>
+<wire x1="51.635" y1="90.85" x2="48.5" y2="95.05" width="0" layer="19" extent="1-1"/>
+<wire x1="52.15" y1="73.5" x2="51.635" y2="90.85" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RF_MIC">
 <contactref element="T2" pad="4"/>
@@ -4453,8 +4413,8 @@ design rules under a new name.</description>
 <wire x1="28.5" y1="24" x2="30.5" y2="24" width="0.2" layer="16"/>
 <wire x1="30.5" y1="24" x2="31.5" y2="23" width="0.2" layer="16"/>
 <wire x1="31.5" y1="23" x2="36.5" y2="23" width="0.2" layer="16"/>
-<wire x1="38" y1="38.3" x2="40.5" y2="38.3" width="0.3" layer="1"/>
-<wire x1="36.5" y1="23" x2="38" y2="38.3" width="0" layer="19" extent="1-1"/>
+<wire x1="38.5" y1="35.8" x2="41" y2="35.8" width="0.3" layer="1"/>
+<wire x1="36.5" y1="23" x2="38.5" y2="35.8" width="0" layer="19" extent="1-1"/>
 <wire x1="36" y1="14.5" x2="36" y2="22.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RF_SPKR">
@@ -4476,7 +4436,7 @@ design rules under a new name.</description>
 <wire x1="32.5" y1="24" x2="34.5" y2="24" width="0.2" layer="16"/>
 <wire x1="34.5" y1="24" x2="51.5" y2="24" width="0.2" layer="16"/>
 <via x="51.5" y="24" extent="1-16" drill="0.4" diameter="0.8"/>
-<wire x1="51.5" y1="24" x2="51.5" y2="28.3" width="0" layer="19" extent="1-1"/>
+<wire x1="51.5" y1="24" x2="50" y2="24.3" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RF_PTT">
 <contactref element="C45" pad="2"/>
@@ -4485,44 +4445,44 @@ design rules under a new name.</description>
 <contactref element="CN12" pad="13"/>
 <wire x1="26.5" y1="24" x2="28" y2="25.5" width="0.2" layer="1"/>
 <wire x1="28" y1="25.5" x2="37" y2="25.5" width="0.2" layer="1"/>
-<wire x1="28" y1="25.5" x2="31" y2="32" width="0" layer="19" extent="1-1"/>
-<wire x1="25.2" y1="38" x2="31" y2="32" width="0" layer="19" extent="1-1"/>
+<wire x1="28" y1="25.5" x2="30.5" y2="29.5" width="0" layer="19" extent="1-1"/>
+<wire x1="24.7" y1="35.5" x2="30.5" y2="29.5" width="0" layer="19" extent="1-1"/>
 <wire x1="33.45" y1="2.75" x2="26.5" y2="24" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="N$32">
 <contactref element="U6" pad="3"/>
 <contactref element="R43" pad="1"/>
 <contactref element="R23" pad="2"/>
-<wire x1="53.55" y1="46.2" x2="51.7" y2="46.2" width="0.3" layer="1"/>
-<wire x1="51.7" y1="46.2" x2="51" y2="45.5" width="0.3" layer="1"/>
-<wire x1="51" y1="45.5" x2="51" y2="44.3" width="0.3" layer="1"/>
-<wire x1="51" y1="48.2" x2="51" y2="46.9" width="0.3" layer="1"/>
-<wire x1="51" y1="46.9" x2="51.7" y2="46.2" width="0.3" layer="1"/>
+<wire x1="52.55" y1="43.2" x2="50.7" y2="43.2" width="0.3" layer="1"/>
+<wire x1="50.7" y1="43.2" x2="50" y2="42.5" width="0.3" layer="1"/>
+<wire x1="50" y1="42.5" x2="50" y2="41.3" width="0.3" layer="1"/>
+<wire x1="50" y1="45.2" x2="50" y2="43.9" width="0.3" layer="1"/>
+<wire x1="50" y1="43.9" x2="50.7" y2="43.2" width="0.3" layer="1"/>
 </signal>
 <signal name="N$37">
 <contactref element="R23" pad="1"/>
 <contactref element="U6" pad="4"/>
 <contactref element="R9" pad="2"/>
-<wire x1="48" y1="42.7" x2="51" y2="42.7" width="0.3" layer="1"/>
-<wire x1="53.55" y1="43.8" x2="53.3" y2="43.8" width="0.3" layer="1"/>
-<wire x1="53.3" y1="43.8" x2="52.5" y2="43" width="0.3" layer="1"/>
-<wire x1="52.5" y1="43" x2="52.2" y2="42.7" width="0.3" layer="1"/>
-<wire x1="52.2" y1="42.7" x2="51" y2="42.7" width="0.3" layer="1"/>
+<wire x1="47" y1="39.7" x2="50" y2="39.7" width="0.3" layer="1"/>
+<wire x1="52.55" y1="40.8" x2="52.3" y2="40.8" width="0.3" layer="1"/>
+<wire x1="52.3" y1="40.8" x2="51.5" y2="40" width="0.3" layer="1"/>
+<wire x1="51.5" y1="40" x2="51.2" y2="39.7" width="0.3" layer="1"/>
+<wire x1="51.2" y1="39.7" x2="50" y2="39.7" width="0.3" layer="1"/>
 </signal>
 <signal name="N$61">
 <contactref element="R47" pad="1"/>
 <contactref element="R49" pad="2"/>
-<wire x1="40.5" y1="36.7" x2="40.5" y2="36" width="0.3" layer="1"/>
-<wire x1="40.5" y1="36" x2="41" y2="35.5" width="0.3" layer="1"/>
-<wire x1="41" y1="35.5" x2="46.5" y2="35.5" width="0.3" layer="1"/>
-<wire x1="46.5" y1="35.5" x2="47.05" y2="34.95" width="0.3" layer="1"/>
-<wire x1="47.05" y1="34.95" x2="47.05" y2="33.15" width="0.3" layer="1"/>
+<wire x1="41" y1="34.2" x2="41" y2="33.5" width="0.3" layer="1"/>
+<wire x1="41" y1="33.5" x2="41.5" y2="33" width="0.3" layer="1"/>
+<wire x1="41.5" y1="33" x2="47" y2="33" width="0.3" layer="1"/>
+<wire x1="47" y1="33" x2="47.55" y2="32.45" width="0.3" layer="1"/>
+<wire x1="47.55" y1="32.45" x2="47.55" y2="30.65" width="0.3" layer="1"/>
 </signal>
 <signal name="N$80">
 <contactref element="C47" pad="1"/>
 <contactref element="R47" pad="2"/>
-<wire x1="43.7" y1="37" x2="48.45" y2="37" width="0.3" layer="1"/>
-<wire x1="48.45" y1="37" x2="48.5" y2="36.95" width="0.3" layer="1"/>
+<wire x1="44.2" y1="34.5" x2="48.95" y2="34.5" width="0.3" layer="1"/>
+<wire x1="48.95" y1="34.5" x2="49" y2="34.45" width="0.3" layer="1"/>
 </signal>
 <signal name="N$81">
 <contactref element="SW3" pad="2"/>
@@ -4567,7 +4527,7 @@ design rules under a new name.</description>
 <signal name="N$70">
 <contactref element="FB2" pad="2"/>
 <contactref element="CN7" pad="C"/>
-<wire x1="44.75" y1="12" x2="38" y2="32.025" width="0" layer="19" extent="1-16"/>
+<wire x1="44.75" y1="12" x2="38.5" y2="29.525" width="0" layer="19" extent="1-16"/>
 </signal>
 </signals>
 <errors>
diff --git a/smartmic/SM1000-C/SM1000-C.sch b/smartmic/SM1000-C/SM1000-C.sch
index f7f60c79..2bb5c7d0 100644
--- a/smartmic/SM1000-C/SM1000-C.sch
+++ b/smartmic/SM1000-C/SM1000-C.sch
@@ -2648,38 +2648,6 @@ by exp-lbrs.ulp</description>
 <text x="-8.5" y="9.5" size="1" layer="25" ratio="10">&gt;NAME</text>
 <text x="-8.5" y="-10.5" size="1" layer="25" ratio="10">&gt;VALUE</text>
 </package>
-<package name="MOLEX-MINI-B-SMT">
-<smd name="1" x="-1.6" y="6.225" dx="2.25" dy="0.5" layer="1" rot="R90"/>
-<smd name="2" x="-0.8" y="6.225" dx="2.25" dy="0.5" layer="1" rot="R90"/>
-<smd name="3" x="0" y="6.225" dx="2.25" dy="0.5" layer="1" rot="R90"/>
-<smd name="4" x="0.8" y="6.225" dx="2.25" dy="0.5" layer="1" rot="R90"/>
-<smd name="5" x="1.6" y="6.225" dx="2.25" dy="0.5" layer="1" rot="R90"/>
-<smd name="6" x="-5.5" y="6.25" dx="3.5" dy="2.05" layer="1" rot="R90"/>
-<smd name="7" x="5.5" y="6.25" dx="3.5" dy="2.05" layer="1" rot="R90"/>
-<smd name="8" x="-5.5" y="2" dx="4" dy="2.05" layer="1" rot="R90"/>
-<smd name="9" x="5.5" y="2" dx="4" dy="2.05" layer="1" rot="R90"/>
-<hole x="-2.2" y="4.25" drill="0.9"/>
-<hole x="2.2" y="4.25" drill="0.9"/>
-<wire x1="-7" y1="0" x2="7" y2="0" width="0.15" layer="51"/>
-<text x="-4.5" y="-2" size="1" layer="51" ratio="10">BOARD EDGE</text>
-<wire x1="-3.1" y1="0" x2="-3.1" y2="1.2" width="0" layer="39"/>
-<wire x1="-3.1" y1="1.2" x2="-3" y2="1.2" width="0" layer="39"/>
-<wire x1="-3" y1="1.2" x2="3.1" y2="1.2" width="0" layer="39"/>
-<wire x1="3.1" y1="1.2" x2="3.1" y2="0" width="0" layer="39"/>
-<wire x1="3.1" y1="0" x2="-3.1" y2="0" width="0" layer="39"/>
-<wire x1="-7" y1="8.5" x2="7" y2="8.5" width="0" layer="39"/>
-<wire x1="7" y1="8.5" x2="7" y2="-0.5" width="0" layer="39"/>
-<wire x1="7" y1="-0.5" x2="4" y2="-0.5" width="0" layer="39"/>
-<wire x1="4" y1="-0.5" x2="4" y2="1.5" width="0" layer="39"/>
-<wire x1="4" y1="1.5" x2="-4" y2="1.5" width="0" layer="39"/>
-<wire x1="-4" y1="1.5" x2="-4" y2="-0.5" width="0" layer="39"/>
-<wire x1="-4" y1="-0.5" x2="-7" y2="-0.5" width="0" layer="39"/>
-<wire x1="-7" y1="-0.5" x2="-7" y2="8.5" width="0" layer="39"/>
-<text x="-6.5" y="9" size="1" layer="21" ratio="10">&gt;NAME</text>
-<wire x1="-4" y1="0" x2="-4" y2="8.5" width="0.15" layer="21"/>
-<wire x1="-4" y1="8.5" x2="4" y2="8.5" width="0.15" layer="21"/>
-<wire x1="4" y1="8.5" x2="4" y2="0" width="0.15" layer="21"/>
-</package>
 <package name="C1210">
 <wire x1="-2.35" y1="-1.6" x2="-2.35" y2="1.6" width="0" layer="39"/>
 <wire x1="-2.35" y1="1.6" x2="2.35" y2="1.6" width="0" layer="39"/>
@@ -2816,23 +2784,6 @@ by exp-lbrs.ulp</description>
 <text x="-10.16" y="-20.32" size="1.4224" layer="95" ratio="10">&gt;NAME</text>
 <text x="0" y="-20.32" size="1.4224" layer="96" ratio="10">&gt;VALUE</text>
 </symbol>
-<symbol name="MOLEX-MINI-B-SMT">
-<wire x1="-10.16" y1="20.32" x2="-10.16" y2="-7.62" width="0.1524" layer="94"/>
-<wire x1="-10.16" y1="-7.62" x2="5.08" y2="-7.62" width="0.1524" layer="94"/>
-<wire x1="5.08" y1="-7.62" x2="5.08" y2="20.32" width="0.1524" layer="94"/>
-<wire x1="5.08" y1="20.32" x2="-10.16" y2="20.32" width="0.1524" layer="94"/>
-<pin name="DM" x="-15.24" y="15.24" length="middle"/>
-<pin name="DP" x="-15.24" y="12.7" length="middle"/>
-<pin name="GND" x="-15.24" y="7.62" length="middle"/>
-<pin name="ID" x="-15.24" y="10.16" length="middle"/>
-<pin name="SHIELD1" x="-15.24" y="2.54" length="middle"/>
-<pin name="SHIELD2" x="-15.24" y="0" length="middle"/>
-<pin name="SHIELD3" x="-15.24" y="-2.54" length="middle"/>
-<pin name="SHIELD4" x="-15.24" y="-5.08" length="middle"/>
-<pin name="VBUS" x="-15.24" y="17.78" length="middle"/>
-<text x="-7.62" y="22.86" size="1.4224" layer="95" ratio="10">&gt;NAME</text>
-<text x="-7.62" y="-10.16" size="1.4224" layer="96" ratio="10">&gt;VALUE</text>
-</symbol>
 <symbol name="CAP">
 <wire x1="-2.54" y1="0" x2="2.54" y2="0" width="0.254" layer="94"/>
 <wire x1="0" y1="-1.016" x2="0" y2="-2.54" width="0.1524" layer="94"/>
@@ -2960,29 +2911,6 @@ by exp-lbrs.ulp</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="MOLEX-MINI-B-SMT" prefix="CN">
-<gates>
-<gate name="G$1" symbol="MOLEX-MINI-B-SMT" x="2.54" y="-7.62"/>
-</gates>
-<devices>
-<device name="" package="MOLEX-MINI-B-SMT">
-<connects>
-<connect gate="G$1" pin="DM" pad="2"/>
-<connect gate="G$1" pin="DP" pad="3"/>
-<connect gate="G$1" pin="GND" pad="5"/>
-<connect gate="G$1" pin="ID" pad="4"/>
-<connect gate="G$1" pin="SHIELD1" pad="6"/>
-<connect gate="G$1" pin="SHIELD2" pad="7"/>
-<connect gate="G$1" pin="SHIELD3" pad="8"/>
-<connect gate="G$1" pin="SHIELD4" pad="9"/>
-<connect gate="G$1" pin="VBUS" pad="1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
 <deviceset name="CAP-1210" prefix="C">
 <gates>
 <gate name="G$1" symbol="CAP" x="0" y="0"/>
@@ -4180,7 +4108,6 @@ http://www.weartronics.com/</description>
 <part name="C36" library="SM1000" deviceset="CAP-1210" device="" value="100uF,10V"/>
 <part name="B-FRAME3" library="_RoweTel" deviceset="GENERICL-B-SIZE" device=""/>
 <part name="B-FRAME2" library="_RoweTel" deviceset="GENERICL-B-SIZE" device=""/>
-<part name="CN2" library="SM1000" deviceset="MOLEX-MINI-B-SMT" device=""/>
 <part name="PCB1" library="_Coherix" deviceset="PCB" device="" value="SM1000C"/>
 <part name="V1" library="A-SUPPLY2" deviceset="GND" device=""/>
 <part name="R47" library="_RoweTel" deviceset="PAN-EVM1D" device="" value="500,POT"/>
@@ -4381,7 +4308,7 @@ http://www.weartronics.com/</description>
 <part name="SW5" library="_RoweTel" deviceset="TS-02B" device=""/>
 <part name="CN3" library="_RoweTel" deviceset="DS-0518" device=""/>
 <part name="SPKR1" library="_RoweTel" deviceset="SPKR-HY4004M-001" device=""/>
-<part name="CN13" library="_RoweTel" deviceset="JS-MU3-002" device=""/>
+<part name="CN2" library="_RoweTel" deviceset="JS-MU3-002" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -4697,7 +4624,6 @@ http://www.weartronics.com/</description>
 <instance part="B-FRAME2" gate="G$1" x="0" y="0"/>
 <instance part="B-FRAME2" gate="G$2" x="330.2" y="0"/>
 <instance part="B-FRAME2" gate="G$3" x="358.14" y="279.4"/>
-<instance part="CN2" gate="G$1" x="314.96" y="63.5"/>
 <instance part="PCB1" gate="G$1" x="332.74" y="48.26" smashed="yes">
 <attribute name="NAME" x="332.74" y="53.34" size="1.4224" layer="95" ratio="9"/>
 <attribute name="VALUE" x="332.74" y="50.8" size="1.4224" layer="95" ratio="9"/>
@@ -4859,7 +4785,7 @@ http://www.weartronics.com/</description>
 <attribute name="VALUE" x="292.1" y="241.3" size="1.4224" layer="95" ratio="10"/>
 </instance>
 <instance part="SW5" gate="G$1" x="33.02" y="109.22" rot="R90"/>
-<instance part="CN13" gate="G$1" x="347.98" y="73.66"/>
+<instance part="CN2" gate="G$1" x="314.96" y="63.5"/>
 </instances>
 <busses>
 </busses>
@@ -5650,11 +5576,11 @@ http://www.weartronics.com/</description>
 <pinref part="U3" gate="G$1" pin="OUT"/>
 <wire x1="284.48" y1="78.74" x2="284.48" y2="81.28" width="0.1524" layer="91"/>
 <junction x="284.48" y="81.28"/>
-<pinref part="CN2" gate="G$1" pin="VBUS"/>
 <pinref part="U4" gate="G$1" pin="VBUS"/>
 <wire x1="236.22" y1="30.48" x2="233.68" y2="30.48" width="0.1524" layer="91"/>
 <wire x1="233.68" y1="30.48" x2="233.68" y2="53.34" width="0.1524" layer="91"/>
 <junction x="233.68" y="53.34"/>
+<pinref part="CN2" gate="G$1" pin="VBUS"/>
 </segment>
 <segment>
 <wire x1="111.76" y1="195.58" x2="96.52" y2="195.58" width="0.1524" layer="91"/>