From: rickb44 <rickb44@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Fri, 24 Oct 2014 23:32:48 +0000 (+0000)
Subject: 10/24/2014 Update to Schematic, BOM & PCB - 10/24/2014  RGB
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=97a8cb14efa1954ddbc3f6ac2865203e20633551;p=freetel-svn-tracking.git

10/24/2014 Update to Schematic, BOM & PCB - 10/24/2014  RGB
Add Panasonic POTs
Add Hirose A3C-16DA 2 x 8 female box header.
Note: ST-3509 3.5mm connector cost unknown.
Parts yet to be selected show $0.00 cost.
Still need PTT switch selection.

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

diff --git a/smartmic/SM1000-C/BOM-SM1000-C.csv b/smartmic/SM1000-C/BOM-SM1000-C.csv
index acbdf3f3..b3ae64a1 100644
--- a/smartmic/SM1000-C/BOM-SM1000-C.csv
+++ b/smartmic/SM1000-C/BOM-SM1000-C.csv
@@ -1,4 +1,4 @@
-"Bill of Materials from SM1000-C.sch, 199 parts, grouped by values, as of 10/21/2014 3:10:31 PM"
+"Bill of Materials from SM1000-C.sch, 199 parts, grouped by values, as of 10/24/2014 7:05:44 PM"
 "Part","Qty","DEFINITION","MANUFACTURER","MFG_NUMBER","DISTRIBUTOR","DIST_NUMBER","GENERIC","ROHS","COST100",
 "C1, C34, C55, C56","4","CAP CER 1000PF 50V 10% X7R 0402","MURATA","GRM155R71H102KA01D","DIGIKEY","490-1303-1-ND","Y","Y","0.006"
 "C2, C3, C27","3","CAP CER 20PF 50V 5% NP0 0603","MURATA","GRM1885C1H200JA01D","DIGIKEY","490-1410-1-ND","Y","Y","0.021"
@@ -24,7 +24,7 @@
 "CN3","1","CONN JACK R/A .080" PIN SMD","SWITCHCRAFT","RASM722PX","DIGIKEY","RASM722PX-ND","N","N","1.133"
 "CN4","1","CONN MOD JACK R/A 8P8C","MOLEX","0441440003","DIGIKEY","WM4595CT-ND","N","Y","1.387"
 "CN5, CN6, CN7, CN8, CN9, CN10","6","3.5mm STEREO, SWITCHED SMT CONN.","JISEN","ST-3509"," "," ","N","Y","0.0"
-"CN12","1","2MM V PCB RECEPTACLE 16P DR THRU-HOLE TIN","HIROSE","DF11-16DS-2DSA(05)","MOUSER","798-DF11-16DS-2DSA05","N","Y",".924"
+"CN12","1","CONN RECEPT 16POS 2MM GOLD DIP","HIROSE","A3C-16DA-2DSA(71)","DIGIKEY","H10897-ND","Y","Y","1.638"
 "D1","1","DIODE SCHOTTKY 30V 0.5A 2TUMD","ROHM SEMI","RSX051VA-30TR","DIGIKEY","RSX051VA-30CT-ND","N","N","0.271"
 "D2","1","DIODE SCHOTTKY 10V 3A SOD323","STM","BAT60JFILM","DIGIKEY","497-3707-1-ND","Y","Y","0.240"
 "FB1, FB2, FB3, FB4, FB5, FB6, FB7, FB8","8","FERRITE 500MA 600 OHM 0805 SMD","lAIRD","HZ0805E601R-10","DIGIKEY","240-2399-1-ND","N","Y","0.0381"
@@ -37,7 +37,7 @@
 "LED5","1","LED 660NM SUPER RED DIFF 0603SMD","LITE-ON","SML-LX0603SRW-TR","DIGIKEY","67-1551-1-ND","Y","Y","0.169"
 "LED8","1","LED SUPR RED CLR RT ANG 0805","LITE-ON","LTST-S220KRKT","DIGIKEY","160-1469-1-ND","Y","Y","0.1151"
 "MIC1","1","MIC COND ANALOG OMNI -44DB","CUI","CMA-4544PF-W","DIGIKEY","102-1721-ND","N","Y","0.569"
-"P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20","20","TEST PAD, .050","NA","NA","NA","NA","NA","NA"," "
+"P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20","20","TEST PAD, .050","NA","NA","NA","NA","NA","NA","0.0"
 "PCB1","1","PCB - SM1000 REV. C","?","?"," "," ","N","Y","5.750"
 "R1, R7, R8, R25, R34, R37, R43, R44, R45, R48","10","RES 10.0K OHM 1/10W 1% 0603 SMD","VISHAY-DALE","CRCW060310K0FKEA","DIGIKEY","541-10.0KHCT-ND","Y","Y","0.025"
 "R2, R3, R4, R5","4","RES 4.70K OHM 1/10W 1% 0603 SMD","VISHAY-DALE","CRCW06034K70FKEA","DIGIKEY","541-4.70KHCT-ND","Y","Y","0.025"
@@ -54,13 +54,13 @@
 "R33, R38, R40, R41, R53, R56, R58","7","RES 2.20K OHM 1/10W 1% 0603 SMD","VISHAY-DALE","CRCW06032K20FKEA","DIGIKEY","541-2.20KHCT-ND","Y","Y","0.025"
 "R35","1","RES 124K OHM 1/10W 1% 0603 SMD","VISHAY-DALE","CRCW0603124KFKEA","DIGIKEY","541-124KHCT-ND","Y","Y","0.025"
 "R39","1","RES 4.70 OHM .5W 1% 1206 SMD","VISHAY DALE","CRCW12064R70FKEAHP","DIGIKEY","541-4.70UCT-ND","Y","Y","0.225"
-"R42","1","TRIMMER 500K OHM 0.5W SMD","BOURNS","3361P-1-504GLF","DIGIKEY","3361P-1-504GLFCT-ND","N","Y","0.969"
+"R42","1","TRIMMER 500K OHM 0.2W SMD","PANASONIC","EVM-1DSX30B55","DIGIKEY","P1D504CT-ND","Y","Y","0.339"
 "R46","1","POT 100K OHM 9MM SQ RTANG PLAST","BOURNS","3310C-001-104L","DIGIKEY","3310C-001-104L-ND","N","Y","1.920"
-"R47","1","TRIMMER 500 OHM 0.5W SMD","BOURNS","3361S-1-501GLF","DIGIKEY","3361S-501GLFCT-ND","N","Y","0.969"
+"R47","1","TRIMMER 500 OHM 0.2W SMD","PANASONIC","EVM-1DSX30B52","DIGIKEY","P1D501CT-ND","Y","Y","0.339"
 "R49","1","RES 4.70 OHM 1/10W 1% 0603 SMD","VISHAY-DALE","CRCW06034R70FKEA","DIGIKEY","541-4.70HHCT-ND","Y","Y","0.025"
 "R50","1","RES 10.0 OHM 1/10W 1% 0603 SMD","VISHAY-DALE","CRCW060310R0FKEA","DIGIKEY","541-10.0HCT-ND","Y","Y","0.025"
 "R51","1","RES 390 OHM 1/10W 1% 0603 SMD","VISHAY-DALE","CRCW0603390RFKEA","DIGIKEY","541-390HCT-ND","Y","Y","0.025"
-"R52","1","TRIMMER 1K OHM 0.5W SMD","BOURNS","3361P-1-102GLF","DIGIKEY","3361P-102GLFCT-ND","N","Y","0.969"
+"R52","1","TRIMMER 1K OHM 0.2W SMD","PANASONIC","EVM-1DSX30B13","DIGIKEY","P1D102CT-ND","Y","Y","0.339"
 "R57","1","RES 470 OHM 1/10W 1% 0603 SMD","VISHAY DALE","CRCW0603470RFKEA","DIGIKEY","541-470HCT-ND","Y","Y","0.035"
 "SH1, SH3","2","SHUNT LP 2 POS SN","TYCO AMP","1-382811-6","DIGIKEY","A26231-ND","Y","Y","0.210"
 "SPKR1","1"," "," "," "," "," "," "," ","0.0"
diff --git a/smartmic/SM1000-C/BOM-SM1000-C.pdf b/smartmic/SM1000-C/BOM-SM1000-C.pdf
index 121bd838..e3217d67 100644
Binary files a/smartmic/SM1000-C/BOM-SM1000-C.pdf and b/smartmic/SM1000-C/BOM-SM1000-C.pdf differ
diff --git a/smartmic/SM1000-C/BOM-SM1000-C.xls b/smartmic/SM1000-C/BOM-SM1000-C.xls
index fb4b010b..9f92b8e5 100644
Binary files a/smartmic/SM1000-C/BOM-SM1000-C.xls and b/smartmic/SM1000-C/BOM-SM1000-C.xls differ
diff --git a/smartmic/SM1000-C/SCH-SM1000-C.pdf b/smartmic/SM1000-C/SCH-SM1000-C.pdf
index 5835edbf..8f2e9923 100644
Binary files a/smartmic/SM1000-C/SCH-SM1000-C.pdf and b/smartmic/SM1000-C/SCH-SM1000-C.pdf differ
diff --git a/smartmic/SM1000-C/SM1000-C.brd b/smartmic/SM1000-C/SM1000-C.brd
index 156fcddd..ad4f4115 100644
--- a/smartmic/SM1000-C/SM1000-C.brd
+++ b/smartmic/SM1000-C/SM1000-C.brd
@@ -29,9 +29,9 @@
 <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="no" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
@@ -370,7 +370,6 @@ CONNECTOR</text>
 <wire x1="17.5" y1="41" x2="17.5" y2="29" width="0.2" layer="202"/>
 <dimension x1="0" y1="10" x2="65" y2="10" x3="32.5" y3="5.5" textsize="1.6764" textratio="10" layer="100" dtype="horizontal"/>
 <dimension x1="65" y1="10" x2="65" y2="100" x3="69" y3="55" textsize="1.778" textratio="10" layer="100" dtype="vertical"/>
-<text x="85" y="45.5" size="1.778" layer="144" ratio="10">SM1000-REV-B- DRILL TABLE</text>
 <text x="108.52" y="49.14" size="1" layer="22" ratio="10" rot="MR0">Copyright     2014
 Richard Barnich and David Rowe
 Licensed under TAPR Open Hardware License</text>
@@ -1517,20 +1516,19 @@ INFINEON, www.infineon.com/cmc_upload/0/000/010/257/eh_db_5b.pdf</description>
 <wire x1="-1.7" y1="-2.2" x2="-1.7" y2="2.2" width="0" layer="39"/>
 <rectangle x1="-1.4" y1="-0.4" x2="-0.9" y2="0" layer="21"/>
 </package>
-<package name="POT3361">
-<smd name="2" x="0" y="3.2" dx="3.3" dy="1.19" layer="1" rot="R90"/>
-<smd name="1" x="-2.54" y="-3.2" dx="3.3" dy="1.19" layer="1" rot="R90"/>
-<smd name="3" x="2.54" y="-3.2" dx="3.3" dy="1.19" layer="1" rot="R90"/>
-<wire x1="-1.5" y1="-3.52" x2="1.5" y2="-3.52" width="0.15" layer="21"/>
-<wire x1="-3.3" y1="3.5" x2="-1" y2="3.5" width="0.15" layer="21"/>
-<wire x1="-3.35" y1="3.5" x2="-3.35" y2="-1" width="0.15" layer="21"/>
-<wire x1="3.35" y1="3.5" x2="3.35" y2="-0.85" width="0.15" layer="21"/>
-<wire x1="1.1" y1="3.5" x2="3.3" y2="3.5" width="0.15" layer="21"/>
-<text x="-3" y="5.5" size="1" layer="25" ratio="10">&gt;NAME</text>
-<wire x1="-4" y1="-5.5" x2="-4" y2="5.5" width="0" layer="39"/>
-<wire x1="-4" y1="5.5" x2="4" y2="5.5" width="0" layer="39"/>
-<wire x1="4" y1="5.5" x2="4" y2="-5.5" width="0" layer="39"/>
-<wire x1="4" y1="-5.5" x2="-4" y2="-5.5" width="0" layer="39"/>
+<package name="PAN-EVM1D">
+<smd name="2" x="0" y="1.95" dx="2.4" dy="1.1" layer="1"/>
+<smd name="1" x="-1.45" y="-1.85" dx="1.5" dy="1.3" layer="1" rot="R90"/>
+<smd name="3" x="1.45" y="-1.85" dx="1.5" dy="1.3" layer="1" rot="R90"/>
+<wire x1="-2.3" y1="2.8" x2="2.3" y2="2.8" width="0.15" layer="21"/>
+<wire x1="2.3" y1="2.8" x2="2.3" y2="-2.9" width="0.15" layer="21"/>
+<wire x1="2.3" y1="-2.9" x2="-2.3" y2="-2.9" width="0.15" layer="21"/>
+<wire x1="-2.3" y1="-2.9" x2="-2.3" y2="2.8" width="0.15" layer="21"/>
+<wire x1="-2.5" y1="3" x2="2.5" y2="3" width="0" layer="39"/>
+<wire x1="2.5" y1="3" x2="2.5" y2="-3" width="0" layer="39"/>
+<wire x1="2.5" y1="-3" x2="-2.5" y2="-3" width="0" layer="39"/>
+<wire x1="-2.5" y1="-3" x2="-2.5" y2="3" width="0" layer="39"/>
+<text x="-2" y="3.5" size="0.8128" layer="25" ratio="10">&gt;NAME</text>
 </package>
 <package name="FE0805">
 <smd name="1" x="-0.975" y="0" dx="1.47" dy="1.28" layer="1" rot="R90"/>
@@ -1715,6 +1713,33 @@ NS Package M08A</description>
 <wire x1="1.6" y1="-2.1" x2="1.6" y2="-5" width="0" layer="39"/>
 <wire x1="1.6" y1="-5" x2="6.5" y2="-5" width="0" layer="39"/>
 </package>
+<package name="HRS-A3C-16DA">
+<wire x1="-8" y1="2" x2="8" y2="2" width="0.15" layer="21"/>
+<wire x1="8" y1="2" x2="8" y2="-2" width="0.15" layer="21"/>
+<wire x1="8" y1="-2" x2="-8" y2="-2" width="0.15" layer="21"/>
+<wire x1="-8" y1="-2" x2="-8" y2="2" width="0.15" layer="21"/>
+<pad name="1" x="-7" y="-1" drill="0.7" shape="square"/>
+<pad name="2" x="-5" y="-1" drill="0.7"/>
+<pad name="3" x="-3" y="-1" drill="0.7"/>
+<pad name="4" x="-1" y="-1" drill="0.7"/>
+<pad name="5" x="1" y="-1" drill="0.7"/>
+<pad name="6" x="3" y="-1" drill="0.7"/>
+<pad name="7" x="5" y="-1" drill="0.7"/>
+<pad name="8" x="7" y="-1" drill="0.7"/>
+<pad name="9" x="7" y="1" drill="0.7"/>
+<pad name="10" x="5" y="1" drill="0.7"/>
+<pad name="11" x="3" y="1" drill="0.7"/>
+<pad name="12" x="1" y="1" drill="0.7"/>
+<pad name="13" x="-1" y="1" drill="0.7"/>
+<pad name="14" x="-3" y="1" drill="0.7"/>
+<pad name="15" x="-5" y="1" drill="0.7"/>
+<pad name="16" x="-7" y="1" drill="0.7"/>
+<wire x1="-8.5" y1="2.5" x2="8.5" y2="2.5" width="0" layer="39"/>
+<wire x1="8.5" y1="2.5" x2="8.5" y2="-2.5" width="0" layer="39"/>
+<wire x1="8.5" y1="-2.5" x2="-8.5" y2="-2.5" width="0" layer="39"/>
+<wire x1="-8.5" y1="-2.5" x2="-8.5" y2="2.5" width="0" layer="39"/>
+<text x="-8.5" y="3" size="0.8128" layer="25" ratio="10">&gt;NAME</text>
+</package>
 </packages>
 </library>
 <library name="_Coherix">
@@ -1981,34 +2006,6 @@ by exp-lbrs.ulp</description>
 <rectangle x1="-1.6" y1="-1.25" x2="-1.095" y2="1.25" layer="51"/>
 <rectangle x1="1.095" y1="-1.25" x2="1.6" y2="1.25" layer="51"/>
 </package>
-<package name="HRS-DF11-16DS">
-<pad name="1" x="-1" y="7" drill="0.8" shape="square"/>
-<pad name="2" x="-1" y="5" drill="0.8"/>
-<pad name="3" x="-1" y="3" drill="0.8"/>
-<pad name="4" x="-1" y="1" drill="0.8"/>
-<pad name="5" x="-1" y="-1" drill="0.8"/>
-<pad name="6" x="-1" y="-3" drill="0.8"/>
-<pad name="7" x="-1" y="-5" drill="0.8"/>
-<pad name="8" x="-1" y="-7" drill="0.8"/>
-<pad name="9" x="1" y="-7" drill="0.8"/>
-<pad name="10" x="1" y="-5" drill="0.8"/>
-<pad name="11" x="1" y="-3" drill="0.8"/>
-<pad name="12" x="1" y="-1" drill="0.8"/>
-<pad name="13" x="1" y="1" drill="0.8"/>
-<pad name="14" x="1" y="3" drill="0.8"/>
-<pad name="15" x="1" y="5" drill="0.8"/>
-<pad name="16" x="1" y="7" drill="0.8"/>
-<wire x1="-2.5" y1="9" x2="-2.5" y2="-9" width="0.15" layer="21"/>
-<wire x1="-2.5" y1="-9" x2="2.5" y2="-9" width="0.15" layer="21"/>
-<wire x1="2.5" y1="-9" x2="2.5" y2="9" width="0.15" layer="21"/>
-<wire x1="2.5" y1="9" x2="-2.5" y2="9" width="0.15" layer="21"/>
-<rectangle x1="-2.5" y1="8" x2="-1.5" y2="9" layer="21"/>
-<text x="-2.5" y="9.5" size="1" layer="21" ratio="10">&gt;NAME</text>
-<wire x1="-3" y1="9.5" x2="-3" y2="-9.5" width="0" layer="39"/>
-<wire x1="-3" y1="-9.5" x2="3" y2="-9.5" width="0" layer="39"/>
-<wire x1="3" y1="-9.5" x2="3" y2="9.5" width="0" layer="39"/>
-<wire x1="3" y1="9.5" x2="-3" y2="9.5" width="0" layer="39"/>
-</package>
 <package name="SW-BOURNS-7914J">
 <smd name="4" x="1.27" y="1.9" dx="1.78" dy="1.27" layer="1" rot="R90"/>
 <smd name="1" x="-1.27" y="1.9" dx="1.78" dy="1.27" layer="1" rot="R90"/>
@@ -2222,225 +2219,6 @@ http://www.weartronics.com/</description>
 </package>
 </packages>
 </library>
-<library name="drilegend">
-<packages>
-<package name="DRILEGEND">
-<text x="0.6604" y="0.5588" size="1.778" layer="144" font="vector" ratio="5">Sym</text>
-<wire x1="0" y1="0" x2="5.842" y2="0" width="0.1016" layer="144"/>
-<wire x1="5.842" y1="0" x2="5.842" y2="2.921" width="0.1016" layer="144"/>
-<text x="6.2484" y="0.5588" size="1.778" layer="144" font="vector" ratio="5">N°</text>
-<wire x1="5.842" y1="0" x2="9.652" y2="0" width="0.1016" layer="144"/>
-<wire x1="9.652" y1="0" x2="9.652" y2="2.921" width="0.1016" layer="144"/>
-<text x="21.8694" y="0.5588" size="1.778" layer="144" font="vector" ratio="5">MM</text>
-<wire x1="17.526" y1="0" x2="29.21" y2="0" width="0.1016" layer="144"/>
-<wire x1="29.21" y1="0" x2="29.21" y2="2.921" width="0.1016" layer="144"/>
-<text x="10.5664" y="0.5588" size="1.778" layer="144" font="vector" ratio="5">Mils</text>
-<wire x1="9.652" y1="0" x2="17.526" y2="0" width="0.1016" layer="144"/>
-<wire x1="17.526" y1="0" x2="17.526" y2="2.921" width="0.1016" layer="144"/>
-<text x="29.8704" y="0.5588" size="1.778" layer="144" font="vector" ratio="5">Qty</text>
-<wire x1="29.21" y1="0" x2="35.052" y2="0" width="0.1016" layer="144"/>
-<wire x1="35.052" y1="0" x2="35.052" y2="2.921" width="0.1016" layer="144"/>
-<text x="36.3728" y="0.5588" size="1.778" layer="144" font="vector" ratio="5">Plated</text>
-<wire x1="35.052" y1="0" x2="46.736" y2="0" width="0.1016" layer="144"/>
-<wire x1="46.736" y1="0" x2="46.736" y2="2.921" width="0.1016" layer="144"/>
-<wire x1="2.8956" y1="-0.635" x2="2.8956" y2="-2.3622" width="0.1016" layer="144"/>
-<wire x1="2.032" y1="-1.4986" x2="3.7592" y2="-1.4986" width="0.1016" layer="144"/>
-<wire x1="0" y1="-2.921" x2="5.842" y2="-2.921" width="0.1016" layer="144"/>
-<wire x1="5.842" y1="-2.921" x2="5.842" y2="2.921" width="0.1016" layer="144"/>
-<text x="6.985" y="-2.3622" size="1.778" layer="144" font="vector" ratio="5">1</text>
-<wire x1="5.842" y1="-2.921" x2="9.652" y2="-2.921" width="0.1016" layer="144"/>
-<wire x1="9.652" y1="-2.921" x2="9.652" y2="2.921" width="0.1016" layer="144"/>
-<text x="19.5834" y="-2.3622" size="1.778" layer="144" font="vector" ratio="5">12.80</text>
-<wire x1="17.526" y1="-2.921" x2="29.21" y2="-2.921" width="0.1016" layer="144"/>
-<wire x1="29.21" y1="-2.921" x2="29.21" y2="2.921" width="0.1016" layer="144"/>
-<text x="11.3284" y="-2.3622" size="1.778" layer="144" font="vector" ratio="5">504</text>
-<wire x1="9.652" y1="-2.921" x2="17.526" y2="-2.921" width="0.1016" layer="144"/>
-<wire x1="17.526" y1="-2.921" x2="17.526" y2="2.921" width="0.1016" layer="144"/>
-<text x="29.8704" y="-2.3622" size="1.778" layer="144" font="vector" ratio="5">181</text>
-<wire x1="29.21" y1="-2.921" x2="35.052" y2="-2.921" width="0.1016" layer="144"/>
-<wire x1="35.052" y1="-2.921" x2="35.052" y2="2.921" width="0.1016" layer="144"/>
-<text x="38.6334" y="-2.3622" size="1.778" layer="144" font="vector" ratio="5">YES</text>
-<wire x1="35.052" y1="-2.921" x2="46.736" y2="-2.921" width="0.1016" layer="144"/>
-<wire x1="46.736" y1="-2.921" x2="46.736" y2="2.921" width="0.1016" layer="144"/>
-<wire x1="2.032" y1="-3.556" x2="3.7592" y2="-5.2832" width="0.1016" layer="144"/>
-<wire x1="3.7592" y1="-3.556" x2="2.032" y2="-5.2832" width="0.1016" layer="144"/>
-<wire x1="0" y1="-5.842" x2="5.842" y2="-5.842" width="0.1016" layer="144"/>
-<wire x1="5.842" y1="-5.842" x2="5.842" y2="2.921" width="0.1016" layer="144"/>
-<text x="6.985" y="-5.2832" size="1.778" layer="144" font="vector" ratio="5">2</text>
-<wire x1="5.842" y1="-5.842" x2="9.652" y2="-5.842" width="0.1016" layer="144"/>
-<wire x1="9.652" y1="-5.842" x2="9.652" y2="2.921" width="0.1016" layer="144"/>
-<text x="19.5834" y="-5.2832" size="1.778" layer="144" font="vector" ratio="5">16.00</text>
-<wire x1="17.526" y1="-5.842" x2="29.21" y2="-5.842" width="0.1016" layer="144"/>
-<wire x1="29.21" y1="-5.842" x2="29.21" y2="2.921" width="0.1016" layer="144"/>
-<text x="11.3284" y="-5.2832" size="1.778" layer="144" font="vector" ratio="5">630</text>
-<wire x1="9.652" y1="-5.842" x2="17.526" y2="-5.842" width="0.1016" layer="144"/>
-<wire x1="17.526" y1="-5.842" x2="17.526" y2="2.921" width="0.1016" layer="144"/>
-<text x="31.369" y="-5.2832" size="1.778" layer="144" font="vector" ratio="5">8</text>
-<wire x1="29.21" y1="-5.842" x2="35.052" y2="-5.842" width="0.1016" layer="144"/>
-<wire x1="35.052" y1="-5.842" x2="35.052" y2="2.921" width="0.1016" layer="144"/>
-<text x="38.6334" y="-5.2832" size="1.778" layer="144" font="vector" ratio="5">YES</text>
-<wire x1="35.052" y1="-5.842" x2="46.736" y2="-5.842" width="0.1016" layer="144"/>
-<wire x1="46.736" y1="-5.842" x2="46.736" y2="2.921" width="0.1016" layer="144"/>
-<wire x1="2.8956" y1="-7.3406" x2="2.8956" y2="-6.477" width="0.1016" layer="144"/>
-<wire x1="2.8956" y1="-6.477" x2="3.7592" y2="-6.477" width="0.1016" layer="144"/>
-<wire x1="3.7592" y1="-6.477" x2="3.7592" y2="-8.2042" width="0.1016" layer="144"/>
-<wire x1="3.7592" y1="-8.2042" x2="2.032" y2="-8.2042" width="0.1016" layer="144"/>
-<wire x1="2.032" y1="-8.2042" x2="2.032" y2="-6.477" width="0.1016" layer="144"/>
-<wire x1="2.032" y1="-6.477" x2="2.8956" y2="-6.477" width="0.1016" layer="144"/>
-<wire x1="0" y1="-8.763" x2="5.842" y2="-8.763" width="0.1016" layer="144"/>
-<wire x1="5.842" y1="-8.763" x2="5.842" y2="2.921" width="0.1016" layer="144"/>
-<text x="6.985" y="-8.2042" size="1.778" layer="144" font="vector" ratio="5">3</text>
-<wire x1="5.842" y1="-8.763" x2="9.652" y2="-8.763" width="0.1016" layer="144"/>
-<wire x1="9.652" y1="-8.763" x2="9.652" y2="2.921" width="0.1016" layer="144"/>
-<text x="19.5834" y="-8.2042" size="1.778" layer="144" font="vector" ratio="5">19.20</text>
-<wire x1="17.526" y1="-8.763" x2="29.21" y2="-8.763" width="0.1016" layer="144"/>
-<wire x1="29.21" y1="-8.763" x2="29.21" y2="2.921" width="0.1016" layer="144"/>
-<text x="11.3284" y="-8.2042" size="1.778" layer="144" font="vector" ratio="5">756</text>
-<wire x1="9.652" y1="-8.763" x2="17.526" y2="-8.763" width="0.1016" layer="144"/>
-<wire x1="17.526" y1="-8.763" x2="17.526" y2="2.921" width="0.1016" layer="144"/>
-<text x="30.6324" y="-8.2042" size="1.778" layer="144" font="vector" ratio="5">25</text>
-<wire x1="29.21" y1="-8.763" x2="35.052" y2="-8.763" width="0.1016" layer="144"/>
-<wire x1="35.052" y1="-8.763" x2="35.052" y2="2.921" width="0.1016" layer="144"/>
-<text x="38.6334" y="-8.2042" size="1.778" layer="144" font="vector" ratio="5">YES</text>
-<wire x1="35.052" y1="-8.763" x2="46.736" y2="-8.763" width="0.1016" layer="144"/>
-<wire x1="46.736" y1="-8.763" x2="46.736" y2="2.921" width="0.1016" layer="144"/>
-<wire x1="2.8956" y1="-10.2616" x2="2.8956" y2="-9.398" width="0.1016" layer="144"/>
-<wire x1="2.8956" y1="-9.398" x2="3.7592" y2="-10.2616" width="0.1016" layer="144"/>
-<wire x1="3.7592" y1="-10.2616" x2="2.8956" y2="-11.1252" width="0.1016" layer="144"/>
-<wire x1="2.8956" y1="-11.1252" x2="2.032" y2="-10.2616" width="0.1016" layer="144"/>
-<wire x1="2.032" y1="-10.2616" x2="2.8956" y2="-9.398" width="0.1016" layer="144"/>
-<wire x1="0" y1="-11.684" x2="5.842" y2="-11.684" width="0.1016" layer="144"/>
-<wire x1="5.842" y1="-11.684" x2="5.842" y2="2.921" width="0.1016" layer="144"/>
-<text x="6.985" y="-11.1252" size="1.778" layer="144" font="vector" ratio="5">4</text>
-<wire x1="5.842" y1="-11.684" x2="9.652" y2="-11.684" width="0.1016" layer="144"/>
-<wire x1="9.652" y1="-11.684" x2="9.652" y2="2.921" width="0.1016" layer="144"/>
-<text x="19.5834" y="-11.1252" size="1.778" layer="144" font="vector" ratio="5">22.40</text>
-<wire x1="17.526" y1="-11.684" x2="29.21" y2="-11.684" width="0.1016" layer="144"/>
-<wire x1="29.21" y1="-11.684" x2="29.21" y2="2.921" width="0.1016" layer="144"/>
-<text x="11.3284" y="-11.1252" size="1.778" layer="144" font="vector" ratio="5">882</text>
-<wire x1="9.652" y1="-11.684" x2="17.526" y2="-11.684" width="0.1016" layer="144"/>
-<wire x1="17.526" y1="-11.684" x2="17.526" y2="2.921" width="0.1016" layer="144"/>
-<text x="30.6324" y="-11.1252" size="1.778" layer="144" font="vector" ratio="5">16</text>
-<wire x1="29.21" y1="-11.684" x2="35.052" y2="-11.684" width="0.1016" layer="144"/>
-<wire x1="35.052" y1="-11.684" x2="35.052" y2="2.921" width="0.1016" layer="144"/>
-<text x="38.6334" y="-11.1252" size="1.778" layer="144" font="vector" ratio="5">YES</text>
-<wire x1="35.052" y1="-11.684" x2="46.736" y2="-11.684" width="0.1016" layer="144"/>
-<wire x1="46.736" y1="-11.684" x2="46.736" y2="2.921" width="0.1016" layer="144"/>
-<wire x1="2.032" y1="-12.319" x2="3.7592" y2="-12.319" width="0.1016" layer="144"/>
-<wire x1="3.7592" y1="-12.319" x2="2.032" y2="-14.0462" width="0.1016" layer="144"/>
-<wire x1="2.032" y1="-14.0462" x2="3.7592" y2="-14.0462" width="0.1016" layer="144"/>
-<wire x1="3.7592" y1="-14.0462" x2="2.032" y2="-12.319" width="0.1016" layer="144"/>
-<wire x1="0" y1="-14.605" x2="5.842" y2="-14.605" width="0.1016" layer="144"/>
-<wire x1="5.842" y1="-14.605" x2="5.842" y2="2.921" width="0.1016" layer="144"/>
-<text x="6.985" y="-14.0462" size="1.778" layer="144" font="vector" ratio="5">5</text>
-<wire x1="5.842" y1="-14.605" x2="9.652" y2="-14.605" width="0.1016" layer="144"/>
-<wire x1="9.652" y1="-14.605" x2="9.652" y2="2.921" width="0.1016" layer="144"/>
-<text x="19.5834" y="-14.0462" size="1.778" layer="144" font="vector" ratio="5">25.60</text>
-<wire x1="17.526" y1="-14.605" x2="29.21" y2="-14.605" width="0.1016" layer="144"/>
-<wire x1="29.21" y1="-14.605" x2="29.21" y2="2.921" width="0.1016" layer="144"/>
-<text x="10.5664" y="-14.0462" size="1.778" layer="144" font="vector" ratio="5">1008</text>
-<wire x1="9.652" y1="-14.605" x2="17.526" y2="-14.605" width="0.1016" layer="144"/>
-<wire x1="17.526" y1="-14.605" x2="17.526" y2="2.921" width="0.1016" layer="144"/>
-<text x="30.6324" y="-14.0462" size="1.778" layer="144" font="vector" ratio="5">36</text>
-<wire x1="29.21" y1="-14.605" x2="35.052" y2="-14.605" width="0.1016" layer="144"/>
-<wire x1="35.052" y1="-14.605" x2="35.052" y2="2.921" width="0.1016" layer="144"/>
-<text x="38.6334" y="-14.0462" size="1.778" layer="144" font="vector" ratio="5">YES</text>
-<wire x1="35.052" y1="-14.605" x2="46.736" y2="-14.605" width="0.1016" layer="144"/>
-<wire x1="46.736" y1="-14.605" x2="46.736" y2="2.921" width="0.1016" layer="144"/>
-<wire x1="2.032" y1="-15.24" x2="3.7592" y2="-16.9672" width="0.1016" layer="144"/>
-<wire x1="3.7592" y1="-16.9672" x2="3.7592" y2="-15.24" width="0.1016" layer="144"/>
-<wire x1="3.7592" y1="-15.24" x2="2.032" y2="-16.9672" width="0.1016" layer="144"/>
-<wire x1="2.032" y1="-16.9672" x2="2.032" y2="-15.24" width="0.1016" layer="144"/>
-<wire x1="0" y1="-17.526" x2="5.842" y2="-17.526" width="0.1016" layer="144"/>
-<wire x1="5.842" y1="-17.526" x2="5.842" y2="2.921" width="0.1016" layer="144"/>
-<text x="6.985" y="-16.9672" size="1.778" layer="144" font="vector" ratio="5">6</text>
-<wire x1="5.842" y1="-17.526" x2="9.652" y2="-17.526" width="0.1016" layer="144"/>
-<wire x1="9.652" y1="-17.526" x2="9.652" y2="2.921" width="0.1016" layer="144"/>
-<text x="19.5834" y="-16.9672" size="1.778" layer="144" font="vector" ratio="5">28.80</text>
-<wire x1="17.526" y1="-17.526" x2="29.21" y2="-17.526" width="0.1016" layer="144"/>
-<wire x1="29.21" y1="-17.526" x2="29.21" y2="2.921" width="0.1016" layer="144"/>
-<text x="10.5664" y="-16.9672" size="1.778" layer="144" font="vector" ratio="5">1134</text>
-<wire x1="9.652" y1="-17.526" x2="17.526" y2="-17.526" width="0.1016" layer="144"/>
-<wire x1="17.526" y1="-17.526" x2="17.526" y2="2.921" width="0.1016" layer="144"/>
-<text x="31.369" y="-16.9672" size="1.778" layer="144" font="vector" ratio="5">2</text>
-<wire x1="29.21" y1="-17.526" x2="35.052" y2="-17.526" width="0.1016" layer="144"/>
-<wire x1="35.052" y1="-17.526" x2="35.052" y2="2.921" width="0.1016" layer="144"/>
-<text x="38.6334" y="-16.9672" size="1.778" layer="144" font="vector" ratio="5">NOT</text>
-<wire x1="35.052" y1="-17.526" x2="46.736" y2="-17.526" width="0.1016" layer="144"/>
-<wire x1="46.736" y1="-17.526" x2="46.736" y2="2.921" width="0.1016" layer="144"/>
-<wire x1="2.032" y1="-19.0246" x2="3.7592" y2="-19.0246" width="0.1016" layer="144"/>
-<wire x1="3.7592" y1="-19.0246" x2="2.8956" y2="-18.161" width="0.1016" layer="144"/>
-<wire x1="2.8956" y1="-18.161" x2="2.8956" y2="-19.8882" width="0.1016" layer="144"/>
-<wire x1="2.8956" y1="-19.8882" x2="2.032" y2="-19.0246" width="0.1016" layer="144"/>
-<wire x1="0" y1="-20.447" x2="5.842" y2="-20.447" width="0.1016" layer="144"/>
-<wire x1="5.842" y1="-20.447" x2="5.842" y2="2.921" width="0.1016" layer="144"/>
-<text x="6.985" y="-19.8882" size="1.778" layer="144" font="vector" ratio="5">7</text>
-<wire x1="5.842" y1="-20.447" x2="9.652" y2="-20.447" width="0.1016" layer="144"/>
-<wire x1="9.652" y1="-20.447" x2="9.652" y2="2.921" width="0.1016" layer="144"/>
-<text x="19.5834" y="-19.8882" size="1.778" layer="144" font="vector" ratio="5">38.40</text>
-<wire x1="17.526" y1="-20.447" x2="29.21" y2="-20.447" width="0.1016" layer="144"/>
-<wire x1="29.21" y1="-20.447" x2="29.21" y2="2.921" width="0.1016" layer="144"/>
-<text x="10.5664" y="-19.8882" size="1.778" layer="144" font="vector" ratio="5">1512</text>
-<wire x1="9.652" y1="-20.447" x2="17.526" y2="-20.447" width="0.1016" layer="144"/>
-<wire x1="17.526" y1="-20.447" x2="17.526" y2="2.921" width="0.1016" layer="144"/>
-<text x="31.369" y="-19.8882" size="1.778" layer="144" font="vector" ratio="5">2</text>
-<wire x1="29.21" y1="-20.447" x2="35.052" y2="-20.447" width="0.1016" layer="144"/>
-<wire x1="35.052" y1="-20.447" x2="35.052" y2="2.921" width="0.1016" layer="144"/>
-<text x="38.6334" y="-19.8882" size="1.778" layer="144" font="vector" ratio="5">YES</text>
-<wire x1="35.052" y1="-20.447" x2="46.736" y2="-20.447" width="0.1016" layer="144"/>
-<wire x1="46.736" y1="-20.447" x2="46.736" y2="2.921" width="0.1016" layer="144"/>
-<wire x1="2.8956" y1="-21.082" x2="2.8956" y2="-22.8092" width="0.1016" layer="144"/>
-<wire x1="2.8956" y1="-22.8092" x2="3.7592" y2="-21.9456" width="0.1016" layer="144"/>
-<wire x1="3.7592" y1="-21.9456" x2="2.032" y2="-21.9456" width="0.1016" layer="144"/>
-<wire x1="2.032" y1="-21.9456" x2="2.8956" y2="-21.082" width="0.1016" layer="144"/>
-<wire x1="0" y1="-23.368" x2="5.842" y2="-23.368" width="0.1016" layer="144"/>
-<wire x1="5.842" y1="-23.368" x2="5.842" y2="2.921" width="0.1016" layer="144"/>
-<text x="6.985" y="-22.8092" size="1.778" layer="144" font="vector" ratio="5">8</text>
-<wire x1="5.842" y1="-23.368" x2="9.652" y2="-23.368" width="0.1016" layer="144"/>
-<wire x1="9.652" y1="-23.368" x2="9.652" y2="2.921" width="0.1016" layer="144"/>
-<text x="19.5834" y="-22.8092" size="1.778" layer="144" font="vector" ratio="5">64.00</text>
-<wire x1="17.526" y1="-23.368" x2="29.21" y2="-23.368" width="0.1016" layer="144"/>
-<wire x1="29.21" y1="-23.368" x2="29.21" y2="2.921" width="0.1016" layer="144"/>
-<text x="10.5664" y="-22.8092" size="1.778" layer="144" font="vector" ratio="5">2520</text>
-<wire x1="9.652" y1="-23.368" x2="17.526" y2="-23.368" width="0.1016" layer="144"/>
-<wire x1="17.526" y1="-23.368" x2="17.526" y2="2.921" width="0.1016" layer="144"/>
-<text x="31.369" y="-22.8092" size="1.778" layer="144" font="vector" ratio="5">1</text>
-<wire x1="29.21" y1="-23.368" x2="35.052" y2="-23.368" width="0.1016" layer="144"/>
-<wire x1="35.052" y1="-23.368" x2="35.052" y2="2.921" width="0.1016" layer="144"/>
-<text x="38.6334" y="-22.8092" size="1.778" layer="144" font="vector" ratio="5">NOT</text>
-<wire x1="35.052" y1="-23.368" x2="46.736" y2="-23.368" width="0.1016" layer="144"/>
-<wire x1="46.736" y1="-23.368" x2="46.736" y2="2.921" width="0.1016" layer="144"/>
-<wire x1="2.032" y1="-24.003" x2="3.7592" y2="-25.7302" width="0.1016" layer="144"/>
-<wire x1="3.7592" y1="-24.003" x2="2.032" y2="-25.7302" width="0.1016" layer="144"/>
-<wire x1="2.8956" y1="-24.003" x2="2.8956" y2="-25.7302" width="0.1016" layer="144"/>
-<wire x1="0" y1="-26.289" x2="5.842" y2="-26.289" width="0.1016" layer="144"/>
-<wire x1="5.842" y1="-26.289" x2="5.842" y2="2.921" width="0.1016" layer="144"/>
-<text x="6.985" y="-25.7302" size="1.778" layer="144" font="vector" ratio="5">9</text>
-<wire x1="5.842" y1="-26.289" x2="9.652" y2="-26.289" width="0.1016" layer="144"/>
-<wire x1="9.652" y1="-26.289" x2="9.652" y2="2.921" width="0.1016" layer="144"/>
-<text x="18.8468" y="-25.7302" size="1.778" layer="144" font="vector" ratio="5">102.40</text>
-<wire x1="17.526" y1="-26.289" x2="29.21" y2="-26.289" width="0.1016" layer="144"/>
-<wire x1="29.21" y1="-26.289" x2="29.21" y2="2.921" width="0.1016" layer="144"/>
-<text x="10.5664" y="-25.7302" size="1.778" layer="144" font="vector" ratio="5">4031</text>
-<wire x1="9.652" y1="-26.289" x2="17.526" y2="-26.289" width="0.1016" layer="144"/>
-<wire x1="17.526" y1="-26.289" x2="17.526" y2="2.921" width="0.1016" layer="144"/>
-<text x="31.369" y="-25.7302" size="1.778" layer="144" font="vector" ratio="5">4</text>
-<wire x1="29.21" y1="-26.289" x2="35.052" y2="-26.289" width="0.1016" layer="144"/>
-<wire x1="35.052" y1="-26.289" x2="35.052" y2="2.921" width="0.1016" layer="144"/>
-<text x="38.6334" y="-25.7302" size="1.778" layer="144" font="vector" ratio="5">YES</text>
-<wire x1="35.052" y1="-26.289" x2="46.736" y2="-26.289" width="0.1016" layer="144"/>
-<wire x1="46.736" y1="-26.289" x2="46.736" y2="2.921" width="0.1016" layer="144"/>
-<wire x1="0" y1="0" x2="46.736" y2="0" width="0.1016" layer="144"/>
-<wire x1="46.736" y1="0" x2="46.736" y2="2.921" width="0.1016" layer="144"/>
-<wire x1="46.736" y1="2.921" x2="0" y2="2.921" width="0.1016" layer="144"/>
-<wire x1="0" y1="2.921" x2="0" y2="0" width="0.1016" layer="144"/>
-<wire x1="0" y1="-26.289" x2="46.736" y2="-26.289" width="0.2032" layer="144"/>
-<wire x1="46.736" y1="-26.289" x2="46.736" y2="2.921" width="0.2032" layer="144"/>
-<wire x1="46.736" y1="2.921" x2="0" y2="2.921" width="0.2032" layer="144"/>
-<wire x1="0" y1="2.921" x2="0" y2="-26.289" width="0.2032" layer="144"/>
-</package>
-</packages>
-</library>
 </libraries>
 <attributes>
 </attributes>
@@ -2759,8 +2537,8 @@ design rules under a new name.</description>
 <element name="R16" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="680,1%" x="14" y="96.5" smashed="yes">
 <attribute name="NAME" x="12.6" y="93.5" size="0.8128" layer="25"/>
 </element>
-<element name="U5" library="_RoweTel" package="PSO-DDA" value="TPS54329E" x="16" y="49" smashed="yes">
-<attribute name="NAME" x="15.5" y="52.1" size="0.8128" layer="25" ratio="10"/>
+<element name="U5" library="_RoweTel" package="PSO-DDA" value="TPS54329E" x="-26" y="28" smashed="yes">
+<attribute name="NAME" x="-26.5" y="31.1" size="0.8128" layer="25" ratio="10"/>
 </element>
 <element name="R27" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="22,1%" x="26" y="87.5" smashed="yes" rot="R270">
 <attribute name="NAME" x="25.6" y="85.05" size="0.8128" layer="25"/>
@@ -2789,33 +2567,33 @@ design rules under a new name.</description>
 <element name="R46" library="_RoweTel" package="POT-3310C" value="100K,POT" x="55.43" y="98.99" smashed="yes" rot="R90">
 <attribute name="NAME" x="48.14" y="98.17" size="0.8128" layer="25" ratio="10"/>
 </element>
-<element name="SW3" library="_RoweTel" package="SW-PWR" value="DPDT" x="6" y="81" smashed="yes" rot="R90">
+<element name="SW3" library="_RoweTel" package="SW-PWR" value="DPDT" x="6" y="81" locked="yes" smashed="yes" rot="R90">
 <attribute name="NAME" x="3.2" y="90.2" size="0.8128" layer="25" ratio="10"/>
 </element>
-<element name="C26" library="ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,25V" x="12" y="53" smashed="yes" rot="R180">
-<attribute name="NAME" x="12.21" y="53.92" size="0.8128" layer="25" ratio="10"/>
-<attribute name="VALUE" x="13.25" y="55.0375" size="1" layer="27" font="vector" ratio="10" rot="R180"/>
+<element name="C26" library="ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,25V" x="-32" y="29" smashed="yes" rot="R270">
+<attribute name="NAME" x="-32.92" y="29.21" size="0.8128" layer="25" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="-34.0375" y="30.25" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="C27" library="ipc-7351-capacitor" package="CAPC1608X92N" value="20pF,16V" x="19.25" y="43.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="18.4" y="41.97" size="0.8128" layer="25" ratio="10" rot="R90"/>
-<attribute name="VALUE" x="21.2875" y="42.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C27" library="ipc-7351-capacitor" package="CAPC1608X92N" value="20pF,16V" x="-10.25" y="35.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="-11.1" y="33.97" size="0.8128" layer="25" ratio="10" rot="R90"/>
+<attribute name="VALUE" x="-8.2125" y="34.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="R35" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="124.0K,1%" x="22" y="43.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="20.2" y="44.6" size="0.8128" layer="25" rot="R270"/>
+<element name="R35" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="124.0K,1%" x="-7.5" y="35.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="-9.3" y="36.6" size="0.8128" layer="25" rot="R270"/>
 </element>
-<element name="R36" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="22.1K,1%" x="24.5" y="43.5" smashed="yes" rot="R90">
-<attribute name="NAME" x="25.5" y="44.6" size="0.8128" layer="25" rot="R270"/>
+<element name="R36" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="22.1K,1%" x="-5.5" y="35.5" smashed="yes" rot="R90">
+<attribute name="NAME" x="-4.5" y="36.6" size="0.8128" layer="25" rot="R270"/>
 </element>
-<element name="C31" library="ipc-7351-capacitor" package="CAPC1608X92N" value="8.2nF,25V" x="24.5" y="47.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="25.5" y="48.5" size="0.8128" layer="25" ratio="10" rot="R270"/>
-<attribute name="VALUE" x="22.4625" y="48.75" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
+<element name="C31" library="ipc-7351-capacitor" package="CAPC1608X92N" value="8.2nF,25V" x="-17.5" y="24.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="-16.5" y="25.5" size="0.8128" layer="25" ratio="10" rot="R270"/>
+<attribute name="VALUE" x="-19.5375" y="25.75" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="R34" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="10K,1%" x="5.55" y="54.2" smashed="yes" rot="R90">
-<attribute name="NAME" x="6.6" y="52.75" size="0.8128" layer="25"/>
+<element name="R34" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="10K,1%" x="-19.95" y="29.7" smashed="yes" rot="R90">
+<attribute name="NAME" x="-18.9" y="28.25" size="0.8128" layer="25"/>
 </element>
-<element name="C25" library="ipc-7351-capacitor" package="CAPC3225X168N" value="22uF,25V,1210" x="4.5" y="50" smashed="yes" rot="R270">
-<attribute name="NAME" x="2.4" y="52.8" size="0.8128" layer="25" ratio="10"/>
-<attribute name="VALUE" x="1.5625" y="52.075" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
+<element name="C25" library="ipc-7351-capacitor" package="CAPC3225X168N" value="22uF,25V,1210" x="-11.5" y="30" smashed="yes" rot="R270">
+<attribute name="NAME" x="-13.6" y="32.8" size="0.8128" layer="25" ratio="10"/>
+<attribute name="VALUE" x="-14.4375" y="32.075" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
 <element name="C34" library="AA-ipc-7351-capacitor" package="CAPC1005X60N" value="1nF,25V,0402" x="44.5" y="61.5" smashed="yes" rot="R270">
 <attribute name="NAME" x="44.05" y="63.45" size="0.8128" layer="25" ratio="10"/>
@@ -2845,18 +2623,14 @@ design rules under a new name.</description>
 <attribute name="NAME" x="51.46" y="67.54" size="0.8128" layer="25"/>
 </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="5" y="58" smashed="yes" rot="R270">
-<attribute name="NAME" x="4" y="59.7" size="0.8128" layer="25"/>
+<element name="R33" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="-18.5" y="35.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="-19.5" y="37.2" size="0.8128" layer="25"/>
 </element>
-<element name="LED8" library="_Coherix" package="LED-LTST" value="LED-RED,RA" x="2.5" y="58" smashed="yes" rot="R270">
-<attribute name="NAME" x="1.2" y="55.5" size="0.8128" layer="25"/>
+<element name="LED8" library="_Coherix" package="LED-LTST" value="LED-RED,RA" x="-20.5" y="35.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="-21.8" y="33" size="0.8128" layer="25"/>
 </element>
-<element name="CN12" library="SM1000" package="HRS-DF11-16DS" value="DF11-16DS" x="27.49" y="22.87" locked="yes" smashed="yes" rot="R90">
-<attribute name="VALUE" x="28.125" y="16.52" size="1.27" layer="27" ratio="10" rot="R90"/>
-<attribute name="NAME" x="21.443" y="19.956" size="0.8128" layer="25" ratio="10" rot="R180"/>
-</element>
-<element name="LD2" library="_RoweTel" package="LTV-817S" value="LTV-817S" x="26.5" y="29.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="28.1" y="26.8" size="0.8128" layer="25" ratio="10" rot="R180"/>
+<element name="LD2" library="_RoweTel" package="LTV-817S" value="LTV-817S" x="26.5" y="31" smashed="yes" rot="R270">
+<attribute name="NAME" x="28.1" y="28.3" size="0.8128" layer="25" ratio="10" rot="R180"/>
 </element>
 <element name="R51" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="390,1%" x="50.5" y="37.5" smashed="yes">
 <attribute name="NAME" x="49" y="38.5" size="0.8128" layer="25"/>
@@ -2913,10 +2687,10 @@ design rules under a new name.</description>
 <attribute name="NAME" x="44" y="90.75" size="1" layer="26" ratio="10" rot="MR180"/>
 </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="POT3361" value="500,POT" x="59" y="44" smashed="yes">
+<element name="R47" library="_RoweTel" package="PAN-EVM1D" value="500,POT" x="59" y="44" smashed="yes">
 <attribute name="NAME" x="62" y="48.5" size="0.8128" layer="25" ratio="10"/>
 </element>
-<element name="R52" library="_RoweTel" package="POT3361" value="1K,POT" x="59" y="67" smashed="yes">
+<element name="R52" library="_RoweTel" package="PAN-EVM1D" value="1K,POT" x="59" y="67" smashed="yes">
 <attribute name="NAME" x="62.5" y="71.5" size="0.8128" layer="25" ratio="10"/>
 </element>
 <element name="C22" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="49.5" y="57.75" smashed="yes" rot="R90">
@@ -2935,8 +2709,8 @@ design rules under a new name.</description>
 <attribute name="NAME" x="58.35" y="78.95" size="0.8128" layer="25" ratio="10" rot="R180"/>
 <attribute name="VALUE" x="56.9625" y="82" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="FB1" library="_RoweTel" package="FE0805" value="FB0805" x="60.5" y="21" smashed="yes" rot="R90">
-<attribute name="NAME" x="59.5" y="18" size="0.8128" layer="25" ratio="10"/>
+<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="48.5" y="21" smashed="yes" rot="R270">
 <attribute name="NAME" x="47.2" y="21.7" size="0.8128" layer="25" ratio="10" rot="R90"/>
@@ -2971,15 +2745,15 @@ design rules under a new name.</description>
 <element name="T2" library="_RoweTel" package="SM-LP-5001" value="SM-LP-5001" x="42.75" y="12" 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="7.05" y="50.25" smashed="yes" rot="R270">
-<attribute name="NAME" x="8.41" y="50.44" size="0.8128" layer="25" ratio="10"/>
-<attribute name="VALUE" x="5.0125" y="51.5" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
+<element name="C46" library="ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,25V" x="-6.45" y="29.25" smashed="yes" rot="R270">
+<attribute name="NAME" x="-5.09" y="29.44" size="0.8128" layer="25" ratio="10"/>
+<attribute name="VALUE" x="-8.4875" y="30.5" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
 <element name="R10" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="47,1%" x="12.6" y="65.6" smashed="yes" rot="R90">
 <attribute name="NAME" x="11" y="67.3" size="0.8128" layer="25"/>
 </element>
-<element name="D2" library="_RoweTel" package="SOD323R_INFINEON" value="BAT60J" x="9.4" y="30.7" smashed="yes" rot="R90">
-<attribute name="NAME" x="8.85" y="32.85" size="0.8128" layer="25"/>
+<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"/>
 </element>
 <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"/>
@@ -2990,13 +2764,13 @@ design rules under a new name.</description>
 <element name="J4" library="_Coherix" package="JMPR-2PIN" value="JMP-2PIN" x="29" y="40" smashed="yes" rot="R180">
 <attribute name="NAME" x="31.54" y="37.46" size="0.8128" layer="25" rot="R180"/>
 </element>
-<element name="C48" library="ipc-7351-capacitor" package="CAPC1608X92N" value="470nF,25V" x="22" y="47.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="21.65" y="49.1675" size="0.8128" layer="25" ratio="10"/>
-<attribute name="VALUE" x="19.9625" y="48.75" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
+<element name="C48" library="ipc-7351-capacitor" package="CAPC1608X92N" value="470nF,25V" x="-15" y="24.5" smashed="yes" rot="R270">
+<attribute name="NAME" x="-15.35" y="26.1675" size="0.8128" layer="25" ratio="10"/>
+<attribute name="VALUE" x="-17.0375" y="25.75" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="C29" library="AA-ipc-7351-capacitor" package="CAPC3225X168N" value="22uF,25V,1210" x="12.25" y="39.75" smashed="yes" rot="R90">
-<attribute name="NAME" x="11.375" y="42.3175" size="0.8128" layer="25" font="vector" ratio="10"/>
-<attribute name="VALUE" x="15.1875" y="37.675" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C29" library="AA-ipc-7351-capacitor" package="CAPC3225X168N" value="22uF,25V,1210" x="-14.75" y="35.25" smashed="yes" rot="R90">
+<attribute name="NAME" x="-15.625" y="37.8175" size="0.8128" layer="25" font="vector" ratio="10"/>
+<attribute name="VALUE" x="-11.8125" y="33.175" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
 <element name="U9" library="_RoweTel" package="SOT23-6" value="LMV341" x="42.5" y="57.25" smashed="yes" rot="R180">
 <attribute name="NAME" x="39.65" y="58.15" size="0.8128" layer="25" ratio="9" rot="R270"/>
@@ -3004,7 +2778,7 @@ design rules under a new name.</description>
 <element name="R41" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="41.5" y="61.5" smashed="yes" rot="R270">
 <attribute name="NAME" x="40.45" y="60.55" size="0.8128" layer="25" rot="R90"/>
 </element>
-<element name="R42" library="_RoweTel" package="POT3361" value="500K,POT" x="59" y="55.5" smashed="yes">
+<element name="R42" library="_RoweTel" package="PAN-EVM1D" value="500K,POT" x="59" y="55.5" smashed="yes">
 <attribute name="NAME" x="62" y="60" size="0.8128" layer="21" ratio="10"/>
 </element>
 <element name="R53" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="38.5" y="57.75" smashed="yes" rot="R270">
@@ -3116,11 +2890,11 @@ design rules under a new name.</description>
 <element name="P16" library="_Coherix" package="TPAD50" value="TPAD50" x="62.5" y="94" smashed="yes">
 <attribute name="NAME" x="61.59" y="95.12" size="0.8128" layer="25"/>
 </element>
-<element name="P17" library="_Coherix" package="TPAD50" value="TPAD50" x="61.5" y="7" smashed="yes">
-<attribute name="NAME" x="60.64" y="8.09" size="0.8128" layer="25"/>
+<element name="P17" library="_Coherix" package="TPAD50" value="TPAD50" x="63.5" y="18" smashed="yes" rot="R180">
+<attribute name="NAME" x="63.09" y="16.86" size="0.8128" layer="25" rot="R270"/>
 </element>
-<element name="P18" library="_Coherix" package="TPAD50" value="TPAD50" x="61.5" y="4" smashed="yes">
-<attribute name="NAME" x="60.56" y="5.09" size="0.8128" layer="25"/>
+<element name="P18" library="_Coherix" package="TPAD50" value="TPAD50" x="63.5" y="13" smashed="yes">
+<attribute name="NAME" x="63.91" y="10.06" size="0.8128" layer="25" rot="R90"/>
 </element>
 <element name="P19" library="_Coherix" package="TPAD50" value="TPAD50" x="27.77" y="53.51" smashed="yes">
 <attribute name="NAME" x="29.13" y="54.19" size="0.8128" layer="25"/>
@@ -3128,33 +2902,34 @@ design rules under a new name.</description>
 <element name="P20" library="_Coherix" package="TPAD50" value="TPAD50" x="7.31" y="69.86" smashed="yes">
 <attribute name="NAME" x="7.74" y="70.93" size="0.8128" layer="25"/>
 </element>
-<element name="C1" library="AA-ipc-7351-capacitor" package="CAPC1005X60N" value="1nF,25V,0402" x="1.9" y="50.3" smashed="yes" rot="R90">
-<attribute name="NAME" x="1.2" y="47.7" size="0.8128" layer="25" ratio="10"/>
-<attribute name="VALUE" x="3.9375" y="49.05" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
+<element name="C1" library="AA-ipc-7351-capacitor" package="CAPC1005X60N" value="1nF,25V,0402" x="-2.4" y="28.7" smashed="yes" rot="R270">
+<attribute name="NAME" x="-1.7" y="31.3" size="0.8128" layer="25" ratio="10" rot="R180"/>
+<attribute name="VALUE" x="-4.4375" y="29.95" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
 </element>
-<element name="C30" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="10nF,25V" x="3" y="21.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="1.75" y="23.2675" size="1" layer="25" font="vector" ratio="10"/>
-<attribute name="VALUE" x="0.9625" y="22.75" size="1" layer="27" font="vector" ratio="10" rot="R270"/>
+<element name="C30" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="10nF,25V" x="2.5" y="16" smashed="yes" rot="R180">
+<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="40.5" y="49.5" smashed="yes" rot="R90">
 <attribute name="NAME" x="39.6825" y="48.25" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
 <attribute name="VALUE" x="42.5875" y="48.25" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="DRILEGEND" library="drilegend" package="DRILEGEND" value="" x="78.766053125" y="38.843325"/>
 <element name="SW5" library="SM1000" package="SW-BOURNS-7914J" value="SW-BOURNS-7914J" x="-5" y="86"/>
-<element name="C49" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="-22" y="90"/>
+<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="R55" library="AA-ipc-7351-resistor" package="RESC2012X70N" value="0 Ohm" x="-22" y="81"/>
 <element name="R54" library="AA-ipc-7351-resistor" package="RESC2012X70N" value="0 Ohm" x="-22" y="76"/>
-<element name="C55" library="AA-ipc-7351-capacitor" package="CAPC1005X60N" value="1nF,25V,0402" x="-22" y="71"/>
+<element name="C55" library="AA-ipc-7351-capacitor" package="CAPC1005X60N" value="1nF,25V,0402" x="-22.5" y="70.5"/>
 <element name="C56" library="AA-ipc-7351-capacitor" package="CAPC1005X60N" value="1nF,25V,0402" x="-22" y="66"/>
 <element name="R57" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="470,1%" x="-22" y="61"/>
 <element name="R18" library="AA-ipc-7351-resistor" package="RESC2012X70N" value="0 Ohm" x="-22" y="56"/>
-<element name="FB5" library="_RoweTel" package="FE0805" value="FB0805" x="-29" y="78.5"/>
-<element name="R21" library="AA-ipc-7351-resistor" package="RESC2012X70N" value="0 Ohm" x="-30" y="75"/>
-<element name="C70" library="ipc-7351-capacitor" package="CAPC3225X168N" value="22uF,25V,1210" x="-35" y="76"/>
-<element name="L1" library="_RoweTel" package="SRR5028" value="4.2uH" x="-32.5" y="67"/>
-<element name="D1" library="_RoweTel" package="TUMD2" value="RSX051VA30" x="-39" y="65.5"/>
+<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>
+<element name="R21" library="AA-ipc-7351-resistor" package="RESC2012X70N" value="0 Ohm" x="-2.5" y="25.5" rot="R90"/>
+<element name="C70" library="ipc-7351-capacitor" package="CAPC3225X168N" value="22uF,25V,1210" x="-16" y="30" rot="R270"/>
+<element name="L1" library="_RoweTel" package="SRR5028" value="4.2uH" x="-26.5" y="20"/>
+<element name="D1" library="_RoweTel" package="TUMD2" value="RSX051VA30" x="-19" y="20.5" rot="R180"/>
 <element name="R37" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="10K,1%" x="-39" y="61"/>
 <element name="R29" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="1.5K,1%" x="-39" y="56"/>
 <element name="C54" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100pF,25V" x="-39" y="51"/>
@@ -3162,14 +2937,14 @@ design rules under a new name.</description>
 <element name="C59" library="_RoweTel" package="NICHICON-WX-6.3" value="100uF,6.3V,EL" x="-20.5" y="49"/>
 <element name="R32" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="100,1%" x="88" y="79.5"/>
 <element name="C32" library="_RoweTel" package="NICHICON-WX-6.3" value="100uF,6.3V,EL" x="-29.5" y="48"/>
-<element name="C60" library="_RoweTel" package="CAP-CHEMI-HA0" value="220uF,25V" x="-10" y="48.5"/>
+<element name="C60" library="_RoweTel" package="CAP-CHEMI-HA0" value="220uF,25V" x="50" y="108.5"/>
 <element name="R39" library="AA-ipc-7351-resistor" package="RESC3115X70N" value="4.7,0.5W,1206" x="-42" y="76"/>
-<element name="C57" library="AA-ipc-7351-capacitor" package="CAPC1005X60N" value="3.9nF,16V,0402" x="-11.5" y="76.5"/>
-<element name="R22" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="22.1K,1%" x="-17" y="75.5"/>
+<element name="C57" library="AA-ipc-7351-capacitor" package="CAPC1005X60N" value="3.9nF,16V,0402" x="-7" y="80.5"/>
+<element name="R22" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="22.1K,1%" x="-3.5" y="80"/>
 <element name="R23" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="47K,1%" x="74" y="87"/>
 <element name="C61" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="74" y="82"/>
 <element name="R9" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="1.5K,1%" x="74" y="77"/>
-<element name="C63" library="_RoweTel" package="CAP-CHEMI-HA0" value="220uF,25V" x="76.5" y="66"/>
+<element name="C63" library="_RoweTel" package="CAP-CHEMI-HA0" value="220uF,25V" x="13" y="24.5"/>
 <element name="FB8" library="_RoweTel" package="FE0805" value="FB0805" x="88" y="74"/>
 <element name="C64" library="AA-ipc-7351-capacitor" package="CAPC3225X168N" value="22uF,25V,1210" x="87.5" y="69.5"/>
 <element name="C65" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="1uF,16V" x="86.5" y="64.5"/>
@@ -3191,6 +2966,9 @@ design rules under a new name.</description>
 <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="-9.5" y="63.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>
 </elements>
 <signals>
 <signal name="N$2">
@@ -3249,10 +3027,8 @@ design rules under a new name.</description>
 <vertex x="40" y="52"/>
 <vertex x="40" y="42"/>
 <vertex x="37.5" y="42"/>
-<vertex x="37.5" y="20"/>
-<vertex x="18.5" y="20"/>
-<vertex x="18.5" y="11"/>
-<vertex x="1" y="11"/>
+<vertex x="37.5" y="27"/>
+<vertex x="1" y="27"/>
 </polygon>
 <wire x1="20.8" y1="66.25" x2="20.45" y2="68.25" width="0.4" layer="1"/>
 <wire x1="22.45" y1="83.2" x2="22.5" y2="83.25" width="0.2" layer="1"/>
@@ -3273,7 +3049,7 @@ design rules under a new name.</description>
 <contactref element="P13" pad="1"/>
 <contactref element="P15" pad="1"/>
 <contactref element="P17" pad="1"/>
-<wire x1="61.5" y1="7" x2="61.5" y2="20" width="0.4" layer="15"/>
+<wire x1="63.5" y1="18" x2="63.5" y2="20" width="0.4" layer="15"/>
 <contactref element="FB7" pad="1"/>
 <contactref element="R7" pad="2"/>
 <contactref element="R8" pad="2"/>
@@ -3281,7 +3057,7 @@ design rules under a new name.</description>
 <contactref element="R37" pad="1"/>
 <contactref element="FB8" pad="1"/>
 <wire x1="62.5" y1="97" x2="87.025" y2="74" width="0" layer="19" extent="1-1"/>
-<wire x1="51.3" y1="37.5" x2="61.5" y2="20" width="0" layer="19" extent="1-15"/>
+<wire x1="51.3" y1="37.5" x2="63.5" y2="20" width="0" layer="19" extent="1-15"/>
 <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"/>
@@ -3289,7 +3065,7 @@ design rules under a new name.</description>
 <wire x1="22.5" y1="83.25" x2="32" y2="88.3" width="0" layer="19" extent="1-1"/>
 <wire x1="20.25" y1="83.2" x2="22.45" y2="83.2" width="0" layer="19" extent="1-1"/>
 <wire x1="18.25" y1="83.55" x2="20.25" y2="83.2" width="0" layer="19" extent="1-1"/>
-<wire x1="19.4" y1="88.3" x2="20.25" y2="83.2" width="0" layer="19" extent="1-1"/>
+<wire x1="19.4" y1="88.3" x2="18.25" y2="83.55" width="0" layer="19" extent="1-1"/>
 <wire x1="19.5" y1="90.7" x2="19.4" y2="88.3" 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"/>
@@ -3397,15 +3173,13 @@ design rules under a new name.</description>
 <polygon width="0.2" layer="2" isolate="0.3">
 <vertex x="1" y="99"/>
 <vertex x="64" y="99"/>
-<vertex x="64" y="10"/>
-<vertex x="1" y="10"/>
+<vertex x="64" y="1"/>
+<vertex x="1" y="1"/>
 </polygon>
 <contactref element="C48" pad="2"/>
 <wire x1="51.405" y1="81.65" x2="51.405" y2="82.095" width="0.2" layer="1"/>
 <contactref element="XTAL1" pad="4"/>
 <contactref element="XTAL1" pad="2"/>
-<wire x1="13.125" y1="47.095" x2="16" y2="47.095" width="0.5" layer="1"/>
-<wire x1="16" y1="47.095" x2="16" y2="48" width="0.5" layer="1"/>
 <polygon width="0.2" layer="1" isolate="0.3" thermals="no">
 <vertex x="17.5" y="43.5"/>
 <vertex x="14.5" y="43.5"/>
@@ -3422,18 +3196,13 @@ design rules under a new name.</description>
 <vertex x="11.5" y="47.5"/>
 <vertex x="10.5" y="47.5"/>
 </polygon>
-<wire x1="16" y1="48" x2="16" y2="49" width="0.5" layer="1"/>
 <wire x1="21.25" y1="55.25" x2="21.25" y2="56.95" width="0.2" layer="1"/>
-<wire x1="13.125" y1="47.095" x2="11.095" y2="47.095" width="0.5" layer="1"/>
-<wire x1="11.095" y1="47.095" x2="11" y2="47" width="0.5" layer="1"/>
 <polygon width="0.2" layer="1" isolate="0.3">
 <vertex x="1" y="47"/>
 <vertex x="1" y="50"/>
 <vertex x="8" y="50"/>
 <vertex x="8" y="47"/>
 </polygon>
-<wire x1="11" y1="47" x2="10.75" y2="47.25" width="0.6" layer="1"/>
-<wire x1="10.75" y1="47.25" x2="7.55" y2="47.25" width="0.6" layer="1"/>
 <wire x1="7.5" y1="57.2" x2="9.5" y2="57.2" width="0.25" layer="1"/>
 <polygon width="0.2" layer="1" isolate="0.3" thermals="no">
 <vertex x="17.5" y="43"/>
@@ -3486,8 +3255,6 @@ design rules under a new name.</description>
 <contactref element="P14" pad="1"/>
 <contactref element="P16" pad="1"/>
 <contactref element="P18" pad="1"/>
-<wire x1="61.5" y1="4" x2="63.5" y2="16" width="0.4" layer="2"/>
-<wire x1="63.5" y1="16" x2="63.5" y2="20" width="0.4" layer="2"/>
 <contactref element="C1" pad="1"/>
 <contactref element="C30" pad="2"/>
 <wire x1="40.3" y1="75.25" x2="40.3" y2="74.9" width="0.2" layer="1"/>
@@ -3518,9 +3285,28 @@ design rules under a new name.</description>
 <contactref element="C66" pad="2"/>
 <contactref element="CN8" pad="A"/>
 <contactref element="CN5" pad="A"/>
+<wire x1="10.85" y1="2.75" x2="11" y2="2.9" width="1.27" layer="16"/>
+<wire x1="2.31" y1="6.76" x2="2.57" y2="6.5" width="1.8" layer="1"/>
+<wire x1="15.6" y1="6.76" x2="15.34" y2="6.5" width="1.8" layer="1"/>
+<polygon width="0.15" layer="16" isolate="0.3">
+<vertex x="1" y="1"/>
+<vertex x="31" y="1"/>
+<vertex x="31" y="8.5"/>
+<vertex x="10.5" y="8.5"/>
+<vertex x="1" y="8.5"/>
+</polygon>
+<polygon width="0.15" layer="1" isolate="0.3">
+<vertex x="1" y="11"/>
+<vertex x="36.5" y="11"/>
+<vertex x="36.5" y="1"/>
+<vertex x="1" y="1"/>
+</polygon>
+<via x="6.5" y="6.5" extent="1-16" drill="0.6" diameter="1.27"/>
+<via x="10" y="6.5" extent="1-16" drill="0.6" diameter="1.27"/>
+<via x="24.5" y="6.5" extent="1-16" drill="0.6" diameter="1.27"/>
+<via x="30.5" y="6.5" extent="1-16" drill="0.6" diameter="1.27"/>
 <wire x1="87.3" y1="64.5" x2="89" y2="69.5" width="0" layer="19" extent="1-1"/>
 <wire x1="87.3" y1="61" x2="87.3" y2="64.5" width="0" layer="19" extent="1-1"/>
-<wire x1="76.5" y1="62.35" x2="87.3" y2="61" width="0" layer="19" extent="1-1"/>
 <wire x1="74.8" y1="82" x2="89" y2="69.5" width="0" layer="19" extent="1-1"/>
 <wire x1="63" y1="77.05" x2="74.8" y2="82" width="0" layer="19" extent="1-1"/>
 <wire x1="60.5" y1="77.05" x2="63" y2="77.05" width="0" layer="19" extent="1-1"/>
@@ -3543,9 +3329,6 @@ design rules under a new name.</description>
 <wire x1="34" y1="97.5" x2="34" y2="93.25" width="0" layer="19" extent="16-16"/>
 <wire x1="41.95" y1="75.25" x2="41.3" y2="79.85" 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="24.5" y1="44.3" x2="29" y2="41.27" width="0" layer="19" extent="1-1"/>
-<wire x1="24.5" y1="46.7" x2="24.5" y2="44.3" width="0" layer="19" extent="1-1"/>
-<wire x1="22" y1="46.7" x2="24.5" y2="46.7" width="0" layer="19" extent="1-1"/>
 <wire x1="53.25" y1="91.8" x2="57.97" y2="95.08" width="0" layer="19" extent="1-1"/>
 <wire x1="50.75" y1="90.2" x2="53.25" y2="91.8" width="0" layer="19" extent="1-1"/>
 <wire x1="36" y1="70.25" x2="40.3" y2="74.1" width="0" layer="19" extent="1-1"/>
@@ -3553,60 +3336,65 @@ design rules under a new name.</description>
 <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="27" y1="68.25" x2="32" y2="68.25" width="0" layer="19" extent="1-1"/>
-<wire x1="16" y1="47.095" x2="22" y2="46.7" width="0" layer="19" extent="1-1"/>
-<wire x1="12.6" y1="61.7" x2="12.75" y2="58.4" width="0" layer="19" extent="1-1"/>
+<wire x1="28.05" y1="98.5" x2="34" y2="97.5" width="0" layer="19" extent="1-16"/>
+<wire x1="22.95" y1="98.5" x2="27.95" y2="98.5" width="0" layer="19" extent="1-1"/>
+<wire x1="21.77" y1="98.66" x2="22.95" y2="98.5" width="0" layer="19" extent="1-16"/>
+<wire x1="21.77" y1="96.34" x2="21.77" y2="98.66" width="0" layer="19" extent="16-16"/>
+<wire x1="17.85" y1="98.5" x2="21.77" y2="98.66" width="0" layer="19" extent="1-16"/>
+<wire x1="15.27" y1="98.66" x2="17.85" y2="98.5" width="0" layer="19" extent="1-16"/>
+<wire x1="15.27" y1="96.34" x2="15.27" y2="98.66" width="0" layer="19" extent="16-16"/>
+<wire x1="12.75" y1="98.5" x2="15.27" y2="98.66" width="0" layer="19" extent="1-16"/>
+<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="15.8" y1="62.2" x2="19.2" y2="66.25" width="0" layer="19" extent="1-1"/>
+<wire x1="12.6" y1="61.7" x2="15.8" y2="62.2" width="0" layer="19" extent="1-1"/>
 <wire x1="9.7" y1="62.2" x2="12.6" y2="61.7" width="0" layer="19" extent="1-1"/>
 <wire x1="6.75" y1="62.1" x2="9.7" y2="62.2" width="0" layer="19" extent="1-1"/>
-<wire x1="15.8" y1="62.2" x2="12.6" y2="61.7" width="0" layer="19" extent="1-1"/>
+<wire x1="12.75" y1="58.4" x2="12.6" y2="61.7" width="0" layer="19" extent="1-1"/>
 <wire x1="6.8" y1="66.8" x2="6.75" y2="62.1" width="0" layer="19" extent="1-1"/>
-<wire x1="19.2" y1="66.25" x2="15.8" y2="62.2" width="0" layer="19" extent="1-1"/>
-<wire x1="21" y1="70.25" x2="19.55" y2="68.25" width="0" layer="19" extent="1-1"/>
 <wire x1="18.7" y1="57" x2="12.8" y2="56.9" width="0" layer="19" extent="1-1"/>
 <wire x1="21.25" y1="56.95" x2="18.75" y2="56.95" width="0" layer="19" extent="1-1"/>
 <wire x1="25.5" y1="60.7" x2="21.25" y2="56.95" width="0" layer="19" extent="1-1"/>
 <wire x1="28.3" y1="57.4" x2="25.5" y2="60.7" 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="33.5" y1="56.7" x2="28.3" y2="57.4" width="0" layer="19" extent="1-1"/>
-<wire x1="28.05" y1="98.5" x2="34" y2="97.5" width="0" layer="19" extent="1-16"/>
-<wire x1="22.95" y1="98.5" x2="27.95" y2="98.5" width="0" layer="19" extent="1-1"/>
-<wire x1="21.77" y1="98.66" x2="22.95" y2="98.5" width="0" layer="19" extent="1-16"/>
-<wire x1="21.77" y1="96.34" x2="21.77" y2="98.66" width="0" layer="19" extent="16-16"/>
-<wire x1="17.85" y1="98.5" x2="21.77" y2="98.66" width="0" layer="19" extent="1-16"/>
-<wire x1="15.27" y1="98.66" x2="17.85" y2="98.5" width="0" layer="19" extent="1-16"/>
-<wire x1="15.27" y1="96.34" x2="15.27" y2="98.66" width="0" layer="19" extent="16-16"/>
-<wire x1="12.75" y1="98.5" x2="15.27" y2="98.66" width="0" layer="19" extent="1-16"/>
+<wire x1="50" y1="104.85" x2="45" y2="97.5" width="0" layer="19" extent="1-16"/>
 <wire x1="42.5" y1="58.45" x2="33.5" y2="56.7" width="0" layer="19" extent="1-1"/>
 <wire x1="44.5" y1="61.05" x2="42.5" y2="58.45" width="0" layer="19" extent="1-1"/>
 <wire x1="47.5" y1="60.7" x2="44.5" y2="61.05" width="0" layer="19" extent="1-1"/>
 <wire x1="49.5" y1="58.55" x2="47.5" y2="60.7" width="0" layer="19" extent="1-1"/>
 <wire x1="52.5" y1="58.55" x2="49.5" y2="58.55" width="0" layer="19" extent="1-1"/>
 <wire x1="53.5" y1="62.3" x2="52.5" y2="58.55" width="0" layer="19" extent="1-1"/>
-<wire x1="56.46" y1="63.8" x2="53.5" y2="62.3" width="0" layer="19" extent="1-1"/>
+<wire x1="57.55" y1="65.15" x2="53.5" y2="62.3" width="0" layer="19" extent="1-1"/>
+<wire x1="1.7" y1="16" x2="2.31" y2="6.76" width="0" layer="19" extent="1-1"/>
 <wire x1="21" y1="86.7" x2="21.77" y2="96.34" 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="51.21" y1="18.25" x2="63.5" y2="20" width="0" layer="19" extent="1-2"/>
+<wire x1="-6.3" y1="93.5" x2="3" y2="98" width="0" layer="19" extent="1-1"/>
+<wire x1="-6.27" y1="87.9" x2="-6.3" y2="93.5" width="0" layer="19" extent="1-1"/>
+<wire x1="-6.27" y1="84.1" x2="-6.27" y2="87.9" width="0" layer="19" extent="1-1"/>
+<wire x1="-6.55" y1="80.5" x2="-6.27" y2="84.1" width="0" layer="19" extent="1-1"/>
+<wire x1="-2.7" y1="80" x2="-6.55" y2="80.5" width="0" layer="19" extent="1-1"/>
+<wire x1="13" y1="20.85" x2="1.7" y2="16" 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="-10" y1="44.85" x2="1.9" y2="49.85" width="0" layer="19" extent="1-1"/>
-<wire x1="-20.5" y1="46.7" x2="-10" y2="44.85" width="0" layer="19" extent="1-1"/>
+<wire x1="-2.4" y1="29.15" x2="1.7" y2="16" width="0" layer="19" extent="1-1"/>
+<wire x1="-6.45" y1="28.45" x2="-2.4" y2="29.15" width="0" layer="19" extent="1-1"/>
+<wire x1="-11.5" y1="28.5" x2="-6.45" y2="28.45" width="0" layer="19" extent="1-1"/>
+<wire x1="-16" y1="28.5" x2="-11.5" y2="28.5" width="0" layer="19" extent="1-1"/>
+<wire x1="-15" y1="23.7" x2="-16" y2="28.5" width="0" layer="19" extent="1-1"/>
+<wire x1="-17.5" y1="23.7" x2="-15" y2="23.7" width="0" layer="19" extent="1-1"/>
+<wire x1="-5.5" y1="36.3" x2="-2.4" y2="29.15" width="0" layer="19" extent="1-1"/>
+<wire x1="-14.75" y1="36.75" x2="-16" y2="28.5" width="0" layer="19" extent="1-1"/>
+<wire x1="-20.5" y1="36.25" x2="-14.75" y2="36.75" width="0" layer="19" extent="1-1"/>
+<wire x1="-26" y1="28" x2="-17.5" y2="23.7" width="0" layer="19" extent="1-1"/>
+<wire x1="-28.875" y1="26.095" x2="-26" y2="28" width="0" layer="19" extent="1-1"/>
+<wire x1="-20.5" y1="46.7" x2="-20.5" y2="36.25" width="0" layer="19" extent="1-1"/>
 <wire x1="-29.5" y1="45.7" x2="-20.5" y2="46.7" width="0" layer="19" extent="1-1"/>
 <wire x1="-39.8" y1="46" x2="-29.5" y2="45.7" width="0" layer="19" extent="1-1"/>
-<wire x1="33.85" y1="6.21" x2="40.21" y2="18.25" width="0" layer="19" extent="1-1"/>
-<wire x1="22.15" y1="2.75" x2="33.85" y2="6.21" width="0" layer="19" extent="1-16"/>
-<wire x1="21.15" y1="6.21" x2="22.15" y2="2.75" width="0" layer="19" extent="1-16"/>
-<wire x1="15.6" y1="6.76" x2="21.15" y2="6.21" width="0" layer="19" extent="1-1"/>
-<wire x1="10.85" y1="2.75" x2="15.6" y2="6.76" width="0" layer="19" extent="1-16"/>
-<wire x1="2.31" y1="6.76" x2="10.85" y2="2.75" width="0" layer="19" extent="1-16"/>
-<wire x1="-6.27" y1="87.9" x2="3" y2="98" width="0" layer="19" extent="1-1"/>
-<wire x1="-6.27" y1="84.1" x2="-6.27" y2="87.9" width="0" layer="19" extent="1-1"/>
-<wire x1="-11.05" y1="76.5" x2="-6.27" y2="84.1" width="0" layer="19" extent="1-1"/>
-<wire x1="-16.2" y1="75.5" x2="-11.05" y2="76.5" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.55" y1="71" x2="-16.2" y2="75.5" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.55" y1="66" x2="-21.55" y2="71" width="0" layer="19" extent="1-1"/>
-<wire x1="-33.5" y1="76" x2="-21.55" y2="71" width="0" layer="19" extent="1-1"/>
-<wire x1="3" y1="20.7" x2="2.31" y2="6.76" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.2" y1="90" x2="-6.27" y2="87.9" width="0" layer="19" extent="1-1"/>
+<wire x1="-22.05" y1="70.5" x2="-6.55" y2="80.5" width="0" layer="19" extent="1-1"/>
+<wire x1="-21.55" y1="66" x2="-22.05" y2="70.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="NRST">
 <contactref element="U1" pad="14"/>
@@ -3617,7 +3405,7 @@ design rules under a new name.</description>
 <wire x1="21.25" y1="63.3" x2="29" y2="68.25" width="0" layer="19" extent="1-1"/>
 <wire x1="-3.73" y1="84.1" x2="21.25" y2="63.3" width="0" layer="19" extent="1-1"/>
 <wire x1="-3.73" y1="87.9" x2="-3.73" y2="84.1" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.8" y1="90" x2="-3.73" y2="87.9" width="0" layer="19" extent="1-1"/>
+<wire x1="-4.7" y1="93.5" x2="-3.73" y2="87.9" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$1">
 <contactref element="C14" pad="1"/>
@@ -3734,11 +3522,12 @@ design rules under a new name.</description>
 <wire x1="34" y1="87.6" x2="33.85" y2="88.55" width="0" layer="19" extent="1-15"/>
 <wire x1="9.5" y1="58.8" x2="10.6" y2="59.65" width="0" layer="19" extent="1-15"/>
 <wire x1="27.77" y1="53.51" x2="15.2" y2="59" width="0" layer="19" extent="1-15"/>
-<wire x1="22" y1="42.7" x2="27.77" y2="53.51" width="0" layer="19" extent="1-1"/>
-<wire x1="19.25" y1="42.7" x2="22" y2="42.7" width="0" layer="19" extent="1-1"/>
-<wire x1="12.25" y1="38.25" x2="19.25" y2="42.7" width="0" layer="19" extent="1-1"/>
-<wire x1="-29.4" y1="67" x2="5" y2="58.8" width="0" layer="19" extent="1-1"/>
-<wire x1="-39" y1="66.75" x2="-29.4" y2="67" width="0" layer="19" extent="1-1"/>
+<wire x1="-7.5" y1="34.7" x2="7.5" y2="58.8" width="0" layer="19" extent="1-1"/>
+<wire x1="-10.25" y1="34.7" x2="-7.5" y2="34.7" width="0" layer="19" extent="1-1"/>
+<wire x1="-14.75" y1="33.75" x2="-10.25" y2="34.7" width="0" layer="19" extent="1-1"/>
+<wire x1="-18.5" y1="36.3" x2="-14.75" y2="33.75" width="0" layer="19" extent="1-1"/>
+<wire x1="-19" y1="19.25" x2="-14.75" y2="33.75" width="0" layer="19" extent="1-1"/>
+<wire x1="-23.4" y1="20" x2="-19" y2="19.25" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$12">
 <contactref element="C8" pad="1"/>
@@ -3872,8 +3661,8 @@ design rules under a new name.</description>
 <contactref element="R29" pad="1"/>
 <contactref element="P4" pad="1"/>
 <wire x1="34.5" y1="68.25" x2="33.5" y2="70.5" width="0" layer="19" extent="1-1"/>
-<wire x1="-22.45" y1="71" x2="33.5" y2="70.5" width="0" layer="19" extent="1-1"/>
-<wire x1="-39.8" y1="56" x2="-22.45" y2="71" width="0" layer="19" extent="1-1"/>
+<wire x1="-22.95" y1="70.5" x2="33.5" y2="70.5" width="0" layer="19" extent="1-1"/>
+<wire x1="-39.8" y1="56" x2="-22.95" y2="70.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="DAC2_OUT">
 <contactref element="C37" pad="1"/>
@@ -3881,8 +3670,8 @@ design rules under a new name.</description>
 <contactref element="R22" pad="1"/>
 <contactref element="P3" pad="1"/>
 <wire x1="33.5" y1="74" x2="48.25" y2="90.2" width="0" layer="19" extent="1-1"/>
-<wire x1="-17.8" y1="75.5" x2="33.5" y2="74" width="0" layer="19" extent="1-1"/>
-<wire x1="-21.05" y1="76" x2="-17.8" y2="75.5" width="0" layer="19" extent="1-1"/>
+<wire x1="-4.3" y1="80" x2="33.5" y2="74" width="0" layer="19" extent="1-1"/>
+<wire x1="-21.05" y1="76" x2="-4.3" y2="80" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="DAC1_OUT">
 <contactref element="U7" pad="1"/>
@@ -3894,7 +3683,7 @@ design rules under a new name.</description>
 <signal name="!CPPT!">
 <contactref element="U1" pad="57"/>
 <contactref element="LD2" pad="2"/>
-<wire x1="21.5" y1="28" x2="31.5" y2="83.25" width="0" layer="19" extent="1-1"/>
+<wire x1="21.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"/>
@@ -3906,21 +3695,17 @@ design rules under a new name.</description>
 <signal name="N$21">
 <contactref element="U5" pad="1"/>
 <contactref element="C26" pad="1"/>
-<wire x1="13.125" y1="50.905" x2="12.8" y2="50.905" width="0.25" layer="1"/>
-<wire x1="12.8" y1="50.905" x2="12.8" y2="53" width="0.25" layer="1"/>
+<wire x1="-28.875" y1="29.905" x2="-32" y2="29.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SW">
 <contactref element="U5" pad="3"/>
 <contactref element="C26" pad="2"/>
-<wire x1="13.125" y1="48.365" x2="11" y2="48.365" width="0.5" layer="1"/>
-<wire x1="11" y1="48.365" x2="11" y2="48.5" width="0.5" layer="1"/>
 <polygon width="0.2" layer="1" isolate="0.3" thermals="no">
 <vertex x="11.5" y="49"/>
 <vertex x="8.5" y="49"/>
 <vertex x="8.5" y="48"/>
 <vertex x="11.5" y="48"/>
 </polygon>
-<wire x1="11.2" y1="53" x2="10" y2="53" width="0.25" layer="1"/>
 <polygon width="0.2" layer="1" isolate="0.3">
 <vertex x="10" y="41"/>
 <vertex x="1" y="41"/>
@@ -3936,8 +3721,8 @@ design rules under a new name.</description>
 <vertex x="12" y="44.5"/>
 </polygon>
 <contactref element="L1" pad="1"/>
-<wire x1="11" y1="48.5" x2="11.2" y2="53" width="0" layer="19" extent="1-1"/>
-<wire x1="-35.6" y1="67" x2="10" y2="53" width="0" layer="19" extent="1-1"/>
+<wire x1="-28.875" y1="27.365" x2="-29.6" y2="20" width="0" layer="19" extent="1-1"/>
+<wire x1="-32" y1="28.2" x2="-28.875" y2="27.365" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$30">
 <contactref element="U5" pad="5"/>
@@ -3945,26 +3730,25 @@ design rules under a new name.</description>
 <contactref element="R35" pad="2"/>
 <contactref element="R36" pad="1"/>
 <contactref element="D1" pad="A"/>
-<wire x1="19.25" y1="44.3" x2="18.875" y2="47.095" width="0" layer="19" extent="1-1"/>
-<wire x1="22" y1="44.3" x2="19.25" y2="44.3" width="0" layer="19" extent="1-1"/>
-<wire x1="24.5" y1="42.7" x2="22" y2="44.3" width="0" layer="19" extent="1-1"/>
-<wire x1="-39" y1="64.85" x2="18.875" y2="47.095" width="0" layer="19" extent="1-1"/>
+<wire x1="-5.5" y1="34.7" x2="-7.5" y2="36.3" width="0" layer="19" extent="1-1"/>
+<wire x1="-10.25" y1="36.3" x2="-7.5" y2="36.3" width="0" layer="19" extent="1-1"/>
+<wire x1="-23.125" y1="26.095" x2="-10.25" y2="36.3" width="0" layer="19" extent="1-1"/>
+<wire x1="-19" y1="21.15" x2="-23.125" y2="26.095" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$38">
 <contactref element="U5" pad="8"/>
 <contactref element="C31" pad="1"/>
-<wire x1="18.875" y1="50.905" x2="24.5" y2="48.3" width="0" layer="19" extent="1-1"/>
+<wire x1="-23.125" y1="29.905" x2="-17.5" y2="25.3" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$40">
 <contactref element="U5" pad="6"/>
 <contactref element="C48" pad="1"/>
-<wire x1="18.875" y1="48.365" x2="22" y2="48.3" width="0" layer="19" extent="1-1"/>
+<wire x1="-23.125" y1="27.365" x2="-15" y2="25.3" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$42">
 <contactref element="U5" pad="7"/>
 <contactref element="R34" pad="2"/>
-<wire x1="5.55" y1="55" x2="4" y2="55" width="0.2" layer="1"/>
-<wire x1="5.55" y1="55" x2="18.875" y2="49.635" width="0" layer="19" extent="1-1"/>
+<wire x1="-23.125" y1="28.635" x2="-19.95" y2="30.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$25">
 <contactref element="C34" pad="1"/>
@@ -4003,12 +3787,12 @@ design rules under a new name.</description>
 <contactref element="SW3" pad="6"/>
 <contactref element="R21" pad="1"/>
 <contactref element="C63" pad="1"/>
-<wire x1="53.25" y1="90.2" x2="76.5" y2="69.65" width="0" layer="19" extent="1-1"/>
 <wire x1="7.25" y1="78.5" x2="53.25" y2="90.2" 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="-30.95" y1="75" x2="4.75" y2="78.5" width="0" layer="19" extent="1-1"/>
-<wire x1="-43.45" y1="76" x2="-30.95" y2="75" width="0" layer="19" extent="1-1"/>
+<wire x1="13" y1="28.15" x2="7.31" y2="69.86" width="0" layer="19" extent="1-1"/>
+<wire x1="-2.5" y1="24.55" x2="13" y2="28.15" width="0" layer="19" extent="1-1"/>
+<wire x1="-43.45" y1="76" x2="4.75" y2="78.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$43">
 <contactref element="R50" pad="1"/>
@@ -4022,7 +3806,7 @@ design rules under a new name.</description>
 <contactref element="U8" pad="3"/>
 <contactref element="C57" pad="1"/>
 <wire x1="50.135" y1="81.65" x2="55.43" y2="95.08" width="0" layer="19" extent="1-1"/>
-<wire x1="-11.95" y1="76.5" x2="50.135" y2="81.65" width="0" layer="19" extent="1-1"/>
+<wire x1="-7.45" y1="80.5" x2="50.135" y2="81.65" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$45">
 <contactref element="R58" pad="2"/>
@@ -4036,79 +3820,79 @@ design rules under a new name.</description>
 <signal name="N$47">
 <contactref element="LED8" pad="A"/>
 <contactref element="R33" pad="2"/>
-<wire x1="2.5" y1="57.25" x2="2.55" y2="57.2" width="0.25" layer="1"/>
-<wire x1="2.55" y1="57.2" x2="5" y2="57.2" width="0.25" layer="1"/>
+<wire x1="-20.5" y1="34.75" x2="-18.5" y2="34.7" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$51">
-<contactref element="CN12" pad="8"/>
 <contactref element="CN4" pad="8"/>
 <wire x1="31.945" y1="18" x2="31.945" y2="19.325" width="0.2" layer="1"/>
-<wire x1="31.945" y1="19.325" x2="34.49" y2="21.87" width="0.2" layer="1"/>
+<contactref element="CN12" pad="8"/>
+<wire x1="34.5" y1="22" x2="31.945" y2="19.445" width="0.2" layer="1"/>
+<wire x1="31.945" y1="19.445" x2="31.945" y2="19.325" width="0.2" layer="1"/>
 </signal>
 <signal name="N$52">
-<contactref element="CN12" pad="7"/>
 <contactref element="CN4" pad="7"/>
-<wire x1="30.675" y1="18" x2="30.675" y2="20.055" width="0.2" layer="1"/>
-<wire x1="30.675" y1="20.055" x2="32.49" y2="21.87" width="0.2" layer="1"/>
+<contactref element="CN12" pad="7"/>
+<wire x1="30.675" y1="18" x2="30.675" y2="20.175" width="0.2" layer="1"/>
+<wire x1="30.675" y1="20.175" x2="32.5" y2="22" width="0.2" layer="1"/>
 </signal>
 <signal name="N$53">
-<contactref element="CN12" pad="6"/>
 <contactref element="CN4" pad="6"/>
-<wire x1="29.405" y1="18" x2="29.405" y2="20.785" width="0.2" layer="1"/>
-<wire x1="29.405" y1="20.785" x2="30.49" y2="21.87" width="0.2" layer="1"/>
+<contactref element="CN12" pad="6"/>
+<wire x1="30.5" y1="22" x2="29.405" y2="20.905" width="0.2" layer="1"/>
+<wire x1="29.405" y1="20.905" x2="29.405" y2="18" width="0.2" layer="1"/>
 </signal>
 <signal name="N$54">
-<contactref element="CN12" pad="5"/>
 <contactref element="CN4" pad="5"/>
-<wire x1="28.135" y1="18" x2="28.135" y2="21.515" width="0.2" layer="1"/>
-<wire x1="28.135" y1="21.515" x2="28.49" y2="21.87" width="0.2" layer="1"/>
+<contactref element="CN12" pad="5"/>
+<wire x1="28.5" y1="22" x2="28.135" y2="21.635" width="0.2" layer="1"/>
+<wire x1="28.135" y1="21.635" x2="28.135" y2="18" width="0.2" layer="1"/>
 </signal>
 <signal name="N$55">
-<contactref element="CN12" pad="4"/>
 <contactref element="CN4" pad="4"/>
-<wire x1="26.865" y1="18" x2="26.865" y2="21.495" width="0.2" layer="1"/>
-<wire x1="26.865" y1="21.495" x2="26.49" y2="21.87" width="0.2" layer="1"/>
+<contactref element="CN12" pad="4"/>
+<wire x1="26.865" y1="18" x2="26.865" y2="21.635" width="0.2" layer="1"/>
+<wire x1="26.865" y1="21.635" x2="26.5" y2="22" width="0.2" layer="1"/>
 </signal>
 <signal name="N$56">
-<contactref element="CN12" pad="3"/>
 <contactref element="CN4" pad="3"/>
-<wire x1="25.595" y1="18" x2="25.595" y2="20.765" width="0.2" layer="1"/>
-<wire x1="25.595" y1="20.765" x2="24.49" y2="21.87" width="0.2" layer="1"/>
+<contactref element="CN12" pad="3"/>
+<wire x1="24.5" y1="22" x2="24.5" y2="21" width="0.2" layer="1"/>
+<wire x1="24.5" y1="21" x2="25.5" y2="20" width="0.2" layer="1"/>
+<wire x1="25.5" y1="20" x2="25.595" y2="19.905" width="0.2" layer="1"/>
+<wire x1="25.595" y1="19.905" x2="25.595" y2="18" width="0.2" layer="1"/>
 </signal>
 <signal name="N$57">
-<contactref element="CN12" pad="2"/>
 <contactref element="CN4" pad="2"/>
-<wire x1="24.325" y1="18" x2="24.325" y2="20.035" width="0.2" layer="1"/>
-<wire x1="24.325" y1="20.035" x2="22.49" y2="21.87" width="0.2" layer="1"/>
+<contactref element="CN12" pad="2"/>
+<wire x1="24.325" y1="18" x2="24.325" y2="19.675" width="0.2" layer="1"/>
+<wire x1="24.325" y1="19.675" x2="22.5" y2="21.5" width="0.2" layer="1"/>
+<wire x1="22.5" y1="21.5" x2="22.5" y2="22" width="0.2" layer="1"/>
 </signal>
 <signal name="N$58">
-<contactref element="CN12" pad="1"/>
 <contactref element="CN4" pad="1"/>
-<wire x1="23.055" y1="18" x2="23" y2="19.5" width="0.2" layer="1"/>
-<wire x1="23" y1="19.5" x2="20.49" y2="21.87" width="0.2" layer="1"/>
+<contactref element="CN12" pad="1"/>
+<wire x1="23.055" y1="18" x2="23" y2="18.055" width="0.2" layer="1"/>
+<wire x1="23" y1="18.055" x2="23" y2="19.5" width="0.2" layer="1"/>
+<wire x1="23" y1="19.5" x2="20.5" y2="22" width="0.2" layer="1"/>
 </signal>
 <signal name="MIC">
-<contactref element="CN12" pad="15"/>
 <contactref element="CN7" pad="D"/>
-<wire x1="22.49" y1="23.87" x2="48.95" y2="16" width="0" layer="19" extent="16-16"/>
+<contactref element="CN12" pad="15"/>
+<wire x1="22.5" y1="24" x2="25" y2="26.5" width="0.2" layer="1"/>
+<wire x1="25" y1="26.5" x2="37" y2="26.5" width="0.2" layer="1"/>
+<wire x1="37" y1="26.5" x2="48.95" y2="16" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="SPKR">
-<contactref element="CN12" pad="16"/>
 <contactref element="CN6" pad="D"/>
-<wire x1="20.49" y1="23.87" x2="60.25" y2="16" width="0" layer="19" extent="16-16"/>
+<contactref element="CN12" pad="16"/>
+<wire x1="20.5" y1="24" x2="23.5" y2="27" width="0.2" layer="1"/>
+<wire x1="23.5" y1="27" x2="37" y2="27" width="0.2" layer="1"/>
+<wire x1="37" y1="27" x2="60.25" y2="16" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$49">
 <contactref element="LD2" pad="1"/>
 <contactref element="R51" pad="1"/>
-<wire x1="49.7" y1="37.5" x2="21.5" y2="31" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="RF">
-<polygon width="0.2" layer="2" isolate="0.3">
-<vertex x="19" y="1"/>
-<vertex x="19" y="9.5"/>
-<vertex x="64" y="9.5"/>
-<vertex x="64" y="1"/>
-</polygon>
+<wire x1="21.5" y1="32.5" x2="49.7" y2="37.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$59">
 <contactref element="U6" pad="1"/>
@@ -4134,13 +3918,13 @@ design rules under a new name.</description>
 <signal name="N$63">
 <contactref element="T1" pad="1"/>
 <contactref element="R52" pad="3"/>
-<wire x1="56.29" y1="18.25" x2="61.54" y2="63.8" width="0" layer="19" extent="1-1"/>
+<wire x1="56.29" y1="18.25" x2="60.45" y2="65.15" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$66">
-<via x="4.5" y="32" extent="1-16" drill="3.2" diameter="6.4516"/>
+<via x="4.5" y="21.5" extent="1-16" drill="3.2" diameter="6.4516"/>
 </signal>
 <signal name="N$67">
-<via x="60.5" y="32" extent="1-16" drill="3.2" diameter="6.4516"/>
+<via x="60.5" y="22.5" extent="1-16" drill="3.2" diameter="6.4516"/>
 </signal>
 <signal name="N$68">
 <via x="12.5" y="87.5" extent="1-16" drill="3.2" diameter="6.4516"/>
@@ -4157,13 +3941,30 @@ design rules under a new name.</description>
 <contactref element="FB1" pad="1"/>
 <contactref element="T1" pad="6"/>
 <contactref element="C44" pad="1"/>
-<wire x1="56.29" y1="5.75" x2="60.5" y2="20.025" width="0" layer="19" extent="1-1"/>
-<wire x1="23.5" y1="38.7" x2="60.5" y2="20.025" width="0" layer="19" extent="1-1"/>
+<wire x1="56.29" y1="5.75" x2="56.29" y2="7.29" width="0.2" layer="1"/>
+<wire x1="56.29" y1="7.29" x2="56.5" y2="7.5" width="0.2" layer="1"/>
+<wire x1="56.5" y1="7.5" x2="58" y2="9" width="0.2" layer="1"/>
+<wire x1="58" y1="9" x2="58" y2="19.5" width="0.2" layer="1"/>
+<wire x1="58" y1="19.5" x2="57" y2="20.5" width="0.2" layer="1"/>
+<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="23.5" y2="38.7" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$64">
 <contactref element="FB1" pad="2"/>
 <contactref element="CN6" pad="C"/>
-<wire x1="56.05" y1="12" x2="60.5" y2="21.975" width="0" layer="19" extent="1-16"/>
+<wire x1="54.5" y1="24.475" x2="54.475" y2="24.5" width="0.2" layer="1"/>
+<wire x1="54.475" y1="24.5" x2="53.5" y2="24.5" width="0.2" layer="1"/>
+<wire x1="53.5" y1="24.5" x2="53" y2="24" width="0.2" layer="1"/>
+<wire x1="53" y1="24" x2="53" y2="22" width="0.2" layer="1"/>
+<wire x1="53" y1="22" x2="55" y2="20" width="0.2" layer="1"/>
+<wire x1="55" y1="20" x2="55" y2="16.5" width="0.2" layer="1"/>
+<wire x1="55" y1="16.5" x2="56" y2="15.5" width="0.2" layer="1"/>
+<wire x1="56" y1="15.5" x2="56" y2="13.5" width="0.2" layer="1"/>
+<via x="56" y="13.5" extent="1-16" drill="0.4" diameter="0.8"/>
+<wire x1="56.05" y1="12" x2="56" y2="12.05" width="0.2" layer="16"/>
+<wire x1="56" y1="12.05" x2="56" y2="13.5" width="0.2" layer="16"/>
 </signal>
 <signal name="N$73">
 <contactref element="FB6" pad="2"/>
@@ -4174,8 +3975,8 @@ design rules under a new name.</description>
 <contactref element="FB6" pad="1"/>
 <contactref element="LD2" pad="4"/>
 <contactref element="C45" pad="1"/>
-<wire x1="38" y1="21.975" x2="31.5" y2="31" width="0" layer="19" extent="1-1"/>
-<wire x1="26" y1="38.7" x2="38" y2="21.975" width="0" layer="19" extent="1-1"/>
+<wire x1="31.5" y1="32.5" x2="26" y2="38.7" width="0" layer="19" extent="1-1"/>
+<wire x1="38" y1="21.975" x2="31.5" y2="32.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$44">
 <contactref element="FB3" pad="1"/>
@@ -4196,8 +3997,8 @@ design rules under a new name.</description>
 <contactref element="CN3" pad="2"/>
 <contactref element="C30" pad="1"/>
 <contactref element="FB5" pad="1"/>
-<wire x1="3" y1="22.3" x2="-29.975" y2="78.5" width="0" layer="19" extent="1-1"/>
-<wire x1="9.76" y1="15.9" x2="3" y2="22.3" width="0" layer="19" extent="1-1"/>
+<wire x1="3.3" y1="16" x2="6.475" y2="26.5" width="0" layer="19" extent="1-1"/>
+<wire x1="9.76" y1="15.9" x2="3.3" y2="16" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$4">
 <contactref element="C10" pad="1"/>
@@ -4210,19 +4011,23 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$24">
 <contactref element="D2" pad="A"/>
-<wire x1="9.45" y1="32" x2="9.4" y2="31.95" width="0.5" layer="1"/>
 <contactref element="FB5" pad="2"/>
-<wire x1="9.45" y1="32" x2="-28.025" y2="78.5" width="0" layer="19" extent="1-1"/>
+<wire x1="2.1" y1="26.55" x2="4.525" y2="26.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$78">
 <contactref element="R48" pad="2"/>
 <contactref element="T2" pad="6"/>
-<wire x1="45.29" y1="5.75" x2="53.7" y2="37.5" width="0" layer="19" extent="1-1"/>
+<wire x1="45.29" y1="5.75" x2="45.29" y2="8.21" width="0.2" layer="1"/>
+<wire x1="45.29" y1="8.21" x2="43" y2="10.5" width="0.2" layer="1"/>
+<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.5" width="0.2" layer="1"/>
+<wire x1="44" y1="24.5" x2="53.7" y2="37.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$82">
 <contactref element="R48" pad="1"/>
 <contactref element="R47" pad="3"/>
-<wire x1="55.3" y1="37.5" x2="61.54" y2="40.8" width="0" layer="19" extent="1-1"/>
+<wire x1="55.3" y1="37.5" x2="60.45" y2="42.15" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$65">
 <contactref element="C38" pad="2"/>
@@ -4246,8 +4051,8 @@ design rules under a new name.</description>
 <contactref element="R42" pad="2"/>
 <contactref element="R53" pad="2"/>
 <contactref element="C54" pad="1"/>
-<wire x1="56.46" y1="52.3" x2="59" y2="58.7" width="0" layer="19" extent="1-1"/>
-<wire x1="38.5" y1="56.95" x2="56.46" y2="52.3" width="0" layer="19" extent="1-1"/>
+<wire x1="57.55" y1="53.65" x2="59" y2="57.45" width="0" layer="19" extent="1-1"/>
+<wire x1="38.5" y1="56.95" x2="57.55" y2="53.65" width="0" layer="19" extent="1-1"/>
 <wire x1="-39.8" y1="51" x2="38.5" y2="56.95" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$46">
@@ -4278,9 +4083,11 @@ design rules under a new name.</description>
 <wire x1="32.5" y1="83.25" x2="44" y2="76.8" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="APTT">
-<contactref element="CN12" pad="14"/>
 <contactref element="CN9" pad="D"/>
-<wire x1="37.65" y1="16" x2="24.49" y2="23.87" width="0" layer="19" extent="16-16"/>
+<contactref element="CN12" pad="14"/>
+<wire x1="24.5" y1="24" x2="26.5" y2="26" width="0.2" layer="1"/>
+<wire x1="26.5" y1="26" x2="37" y2="26" width="0.2" layer="1"/>
+<wire x1="37" y1="26" x2="37.65" y2="16" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$6">
 <contactref element="R20" pad="2"/>
@@ -4316,7 +4123,7 @@ design rules under a new name.</description>
 <signal name="N$9">
 <contactref element="R52" pad="2"/>
 <contactref element="C36" pad="2"/>
-<wire x1="42.6" y1="37" x2="59" y2="70.2" width="0" layer="19" extent="1-1"/>
+<wire x1="42.6" y1="37" x2="59" y2="68.95" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PE0">
 <contactref element="U1" pad="97"/>
@@ -4458,7 +4265,7 @@ design rules under a new name.</description>
 <contactref element="U9" pad="4"/>
 <contactref element="R29" pad="2"/>
 <contactref element="C54" pad="2"/>
-<wire x1="41.55" y1="56.05" x2="61.54" y2="52.3" width="0" layer="19" extent="1-1"/>
+<wire x1="41.55" y1="56.05" x2="60.45" y2="53.65" width="0" layer="19" extent="1-1"/>
 <wire x1="-38.2" y1="56" x2="41.55" y2="56.05" width="0" layer="19" extent="1-1"/>
 <wire x1="-38.2" y1="51" x2="-38.2" y2="56" width="0" layer="19" extent="1-1"/>
 </signal>
@@ -4471,41 +4278,64 @@ design rules under a new name.</description>
 <contactref element="U8" pad="6"/>
 <contactref element="C60" pad="1"/>
 <contactref element="R39" pad="2"/>
-<wire x1="-10" y1="52.15" x2="50.135" y2="86.85" width="0" layer="19" extent="1-1"/>
-<wire x1="-40.55" y1="76" x2="-10" y2="52.15" width="0" layer="19" extent="1-1"/>
+<wire x1="50.135" y1="86.85" x2="50" y2="112.15" width="0" layer="19" extent="1-1"/>
+<wire x1="-40.55" y1="76" x2="50.135" y2="86.85" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RF_MIC">
 <contactref element="T2" pad="4"/>
 <contactref element="R49" pad="1"/>
 <contactref element="C43" pad="2"/>
+<contactref element="CN7" pad="A"/>
+<via x="42.4" y="3.1" extent="1-16" drill="0.6" diameter="1.27"/>
+<wire x1="42.4" y1="3.1" x2="40.21" y2="3.1" width="0.8" layer="1"/>
+<wire x1="40.21" y1="3.1" x2="40.21" y2="5.75" width="0.8" layer="1"/>
+<wire x1="44.75" y1="2.75" x2="42.4" y2="2.75" width="0.8" layer="16"/>
+<wire x1="42.4" y1="2.75" x2="42.4" y2="3.1" width="0.8" layer="16"/>
 <contactref element="CN12" pad="11"/>
 <contactref element="CN12" pad="12"/>
-<contactref element="CN7" pad="A"/>
-<wire x1="30.49" y1="23.87" x2="57.7" y2="37.5" width="0" layer="19" extent="1-1"/>
-<wire x1="28.49" y1="23.87" x2="30.49" y2="23.87" width="0" layer="19" extent="1-1"/>
-<wire x1="21" y1="40.3" x2="28.49" y2="23.87" width="0" layer="19" extent="1-1"/>
-<wire x1="40.21" y1="5.75" x2="30.49" y2="23.87" width="0" layer="19" extent="1-1"/>
-<wire x1="44.75" y1="2.75" x2="40.21" y2="5.75" width="0" layer="19" extent="1-16"/>
+<wire x1="40.21" y1="5.75" x2="40.21" y2="10.29" width="0.2" layer="1"/>
+<wire x1="40.21" y1="10.29" x2="36.5" y2="14" width="0.2" layer="1"/>
+<wire x1="36.5" y1="14" x2="36" y2="14.5" width="0.2" layer="1"/>
+<wire x1="36" y1="22.5" x2="36.5" y2="23" width="0.2" layer="1"/>
+<via x="36.5" y="23" extent="1-16" drill="0.4" diameter="0.8"/>
+<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="36.5" y1="23" x2="57.7" y2="37.5" 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"/>
+<wire x1="21" y1="40.3" x2="28.5" y2="24" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RF_SPKR">
 <contactref element="C44" pad="2"/>
 <contactref element="T1" pad="4"/>
+<contactref element="CN6" pad="A"/>
+<via x="53.7" y="3.1" extent="1-16" drill="0.6" diameter="1.27"/>
+<wire x1="56.05" y1="2.75" x2="53.7" y2="2.75" width="0.8" layer="16"/>
+<wire x1="53.7" y1="2.75" x2="53.7" y2="3.1" width="0.8" layer="16"/>
+<wire x1="53.7" y1="3.1" x2="51.21" y2="3.1" width="0.8" layer="1"/>
+<wire x1="51.21" y1="3.1" x2="51.21" y2="5.75" width="0.8" layer="1"/>
 <contactref element="CN12" pad="9"/>
 <contactref element="CN12" pad="10"/>
-<contactref element="CN6" pad="A"/>
-<wire x1="32.49" y1="23.87" x2="34.49" y2="23.87" width="0" layer="19" extent="1-1"/>
-<wire x1="23.5" y1="40.3" x2="32.49" y2="23.87" width="0" layer="19" extent="1-1"/>
-<wire x1="51.21" y1="5.75" x2="34.49" y2="23.87" width="0" layer="19" extent="1-1"/>
-<wire x1="56.05" y1="2.75" x2="51.21" y2="5.75" width="0" layer="19" extent="1-16"/>
+<wire x1="51.21" y1="5.75" x2="51.21" y2="7.71" width="0.2" layer="1"/>
+<wire x1="51.21" y1="7.71" x2="52.5" y2="9" width="0.2" layer="1"/>
+<wire x1="52.5" y1="9" x2="52.5" y2="21" width="0.2" layer="1"/>
+<wire x1="52.5" y1="21" x2="51.5" y2="22" width="0.2" layer="1"/>
+<wire x1="51.5" y1="22" x2="51.5" y2="24" width="0.2" layer="1"/>
+<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="32.5" y1="24" x2="23.5" y2="40.3" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RF_PTT">
 <contactref element="C45" pad="2"/>
-<contactref element="CN12" pad="13"/>
 <contactref element="LD2" pad="3"/>
 <contactref element="CN9" pad="A"/>
-<wire x1="26.49" y1="23.87" x2="31.5" y2="28" width="0" layer="19" extent="1-1"/>
-<wire x1="26" y1="40.3" x2="26.49" y2="23.87" width="0" layer="19" extent="1-1"/>
-<wire x1="33.45" y1="2.75" x2="26.49" y2="23.87" width="0" layer="19" extent="16-16"/>
+<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="31.5" y1="29.5" x2="26" y2="40.3" width="0" layer="19" extent="1-1"/>
+<wire x1="28" y1="25.5" x2="31.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"/>
@@ -4524,28 +4354,22 @@ design rules under a new name.</description>
 <signal name="N$61">
 <contactref element="R47" pad="1"/>
 <contactref element="R49" pad="2"/>
-<wire x1="59.3" y1="37.5" x2="56.46" y2="40.8" width="0" layer="19" extent="1-1"/>
+<wire x1="59.3" y1="37.5" x2="57.55" y2="42.15" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$80">
 <contactref element="C47" pad="1"/>
 <contactref element="R47" pad="2"/>
-<wire x1="38.7" y1="40" x2="59" y2="47.2" width="0" layer="19" extent="1-1"/>
+<wire x1="38.7" y1="40" x2="59" y2="45.95" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$81">
 <contactref element="SW3" pad="2"/>
 <contactref element="SW3" pad="5"/>
 <contactref element="D2" pad="C"/>
-<wire x1="7.25" y1="81" x2="9.5" y2="81" width="1.27" layer="15"/>
-<wire x1="9.5" y1="81" x2="9.5" y2="55.5" width="1.27" layer="15"/>
-<wire x1="9.5" y1="55.5" x2="7.5" y2="55.5" width="1.27" layer="15"/>
-<wire x1="7.5" y1="55.5" x2="7.5" y2="50.5" width="1.27" layer="15"/>
-<wire x1="7.5" y1="50.5" x2="13" y2="50.5" width="1.27" layer="15"/>
-<wire x1="13" y1="50.5" x2="13" y2="36.5" width="1.27" layer="15"/>
-<wire x1="13" y1="36.5" x2="13" y2="35.5" width="1.27" layer="15"/>
-<wire x1="13" y1="35.5" x2="13" y2="27.6" width="1.27" layer="15"/>
-<wire x1="13" y1="27.6" x2="7" y2="27.6" width="1.27" layer="15"/>
-<wire x1="7.25" y1="81" x2="4.75" y2="81" width="0" layer="19" extent="1-1"/>
-<wire x1="9.4" y1="29.45" x2="7" y2="27.6" width="0" layer="19" extent="1-15"/>
+<wire x1="2" y1="26.1" x2="2" y2="67" width="1.8" layer="15"/>
+<wire x1="2" y1="67" x2="2" y2="81" width="1.8" layer="15"/>
+<wire x1="2" y1="81" x2="4.75" y2="81" width="1.8" layer="15"/>
+<wire x1="4.75" y1="81" x2="7.25" y2="81" width="0" layer="19" extent="1-1"/>
+<wire x1="2.1" y1="29.05" x2="2" y2="26.1" width="0" layer="19" extent="1-15"/>
 </signal>
 <signal name="N$36">
 <contactref element="U5" pad="2"/>
@@ -4555,14 +4379,12 @@ design rules under a new name.</description>
 <contactref element="C1" pad="2"/>
 <contactref element="R21" pad="2"/>
 <contactref element="C70" pad="1"/>
-<wire x1="13.125" y1="49.635" x2="11.365" y2="49.635" width="0.5" layer="1"/>
-<wire x1="11.365" y1="49.635" x2="11" y2="50" width="0.5" layer="1"/>
-<wire x1="4.5" y1="51.5" x2="5.55" y2="53.4" width="0" layer="19" extent="1-1"/>
-<wire x1="7.05" y1="51.05" x2="4.5" y2="51.5" width="0" layer="19" extent="1-1"/>
-<wire x1="1.9" y1="50.75" x2="4.5" y2="51.5" width="0" layer="19" extent="1-1"/>
-<wire x1="11" y1="50" x2="7.05" y2="51.05" width="0" layer="19" extent="1-1"/>
-<wire x1="-29.05" y1="75" x2="1.9" y2="50.75" width="0" layer="19" extent="1-1"/>
-<wire x1="-36.5" y1="76" x2="-29.05" y2="75" width="0" layer="19" extent="1-1"/>
+<wire x1="-2.5" y1="26.45" x2="-2.4" y2="28.25" width="0" layer="19" extent="1-1"/>
+<wire x1="-6.45" y1="30.05" x2="-2.4" y2="28.25" width="0" layer="19" extent="1-1"/>
+<wire x1="-11.5" y1="31.5" x2="-6.45" y2="30.05" width="0" layer="19" extent="1-1"/>
+<wire x1="-16" y1="31.5" x2="-11.5" y2="31.5" width="0" layer="19" extent="1-1"/>
+<wire x1="-19.95" y1="28.9" x2="-16" y2="31.5" width="0" layer="19" extent="1-1"/>
+<wire x1="-28.875" y1="28.635" x2="-19.95" y2="28.9" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$70">
 <contactref element="FB2" pad="2"/>
diff --git a/smartmic/SM1000-C/SM1000-C.sch b/smartmic/SM1000-C/SM1000-C.sch
index fa46703f..b3606dda 100644
--- a/smartmic/SM1000-C/SM1000-C.sch
+++ b/smartmic/SM1000-C/SM1000-C.sch
@@ -486,20 +486,19 @@ INFINEON, www.infineon.com/cmc_upload/0/000/010/257/eh_db_5b.pdf</description>
 <wire x1="-1.7" y1="-2.2" x2="-1.7" y2="2.2" width="0" layer="39"/>
 <rectangle x1="-1.4" y1="-0.4" x2="-0.9" y2="0" layer="21"/>
 </package>
-<package name="POT3361">
-<smd name="2" x="0" y="3.2" dx="3.3" dy="1.19" layer="1" rot="R90"/>
-<smd name="1" x="-2.54" y="-3.2" dx="3.3" dy="1.19" layer="1" rot="R90"/>
-<smd name="3" x="2.54" y="-3.2" dx="3.3" dy="1.19" layer="1" rot="R90"/>
-<wire x1="-1.5" y1="-3.52" x2="1.5" y2="-3.52" width="0.15" layer="21"/>
-<wire x1="-3.3" y1="3.5" x2="-1" y2="3.5" width="0.15" layer="21"/>
-<wire x1="-3.35" y1="3.5" x2="-3.35" y2="-1" width="0.15" layer="21"/>
-<wire x1="3.35" y1="3.5" x2="3.35" y2="-0.85" width="0.15" layer="21"/>
-<wire x1="1.1" y1="3.5" x2="3.3" y2="3.5" width="0.15" layer="21"/>
-<text x="-3" y="5.5" size="1" layer="25" ratio="10">&gt;NAME</text>
-<wire x1="-4" y1="-5.5" x2="-4" y2="5.5" width="0" layer="39"/>
-<wire x1="-4" y1="5.5" x2="4" y2="5.5" width="0" layer="39"/>
-<wire x1="4" y1="5.5" x2="4" y2="-5.5" width="0" layer="39"/>
-<wire x1="4" y1="-5.5" x2="-4" y2="-5.5" width="0" layer="39"/>
+<package name="PAN-EVM1D">
+<smd name="2" x="0" y="1.95" dx="2.4" dy="1.1" layer="1"/>
+<smd name="1" x="-1.45" y="-1.85" dx="1.5" dy="1.3" layer="1" rot="R90"/>
+<smd name="3" x="1.45" y="-1.85" dx="1.5" dy="1.3" layer="1" rot="R90"/>
+<wire x1="-2.3" y1="2.8" x2="2.3" y2="2.8" width="0.15" layer="21"/>
+<wire x1="2.3" y1="2.8" x2="2.3" y2="-2.9" width="0.15" layer="21"/>
+<wire x1="2.3" y1="-2.9" x2="-2.3" y2="-2.9" width="0.15" layer="21"/>
+<wire x1="-2.3" y1="-2.9" x2="-2.3" y2="2.8" width="0.15" layer="21"/>
+<wire x1="-2.5" y1="3" x2="2.5" y2="3" width="0" layer="39"/>
+<wire x1="2.5" y1="3" x2="2.5" y2="-3" width="0" layer="39"/>
+<wire x1="2.5" y1="-3" x2="-2.5" y2="-3" width="0" layer="39"/>
+<wire x1="-2.5" y1="-3" x2="-2.5" y2="3" width="0" layer="39"/>
+<text x="-2" y="3.5" size="0.8128" layer="25" ratio="10">&gt;NAME</text>
 </package>
 <package name="FE0805">
 <smd name="1" x="-0.975" y="0" dx="1.47" dy="1.28" layer="1" rot="R90"/>
@@ -743,6 +742,33 @@ Source: http://cache.national.com/ds/LM/LM386.pdf</description>
 <wire x1="1.6" y1="-2.1" x2="1.6" y2="-5" width="0" layer="39"/>
 <wire x1="1.6" y1="-5" x2="6.5" y2="-5" width="0" layer="39"/>
 </package>
+<package name="HRS-A3C-16DA">
+<wire x1="-8" y1="2" x2="8" y2="2" width="0.15" layer="21"/>
+<wire x1="8" y1="2" x2="8" y2="-2" width="0.15" layer="21"/>
+<wire x1="8" y1="-2" x2="-8" y2="-2" width="0.15" layer="21"/>
+<wire x1="-8" y1="-2" x2="-8" y2="2" width="0.15" layer="21"/>
+<pad name="1" x="-7" y="-1" drill="0.7" shape="square"/>
+<pad name="2" x="-5" y="-1" drill="0.7"/>
+<pad name="3" x="-3" y="-1" drill="0.7"/>
+<pad name="4" x="-1" y="-1" drill="0.7"/>
+<pad name="5" x="1" y="-1" drill="0.7"/>
+<pad name="6" x="3" y="-1" drill="0.7"/>
+<pad name="7" x="5" y="-1" drill="0.7"/>
+<pad name="8" x="7" y="-1" drill="0.7"/>
+<pad name="9" x="7" y="1" drill="0.7"/>
+<pad name="10" x="5" y="1" drill="0.7"/>
+<pad name="11" x="3" y="1" drill="0.7"/>
+<pad name="12" x="1" y="1" drill="0.7"/>
+<pad name="13" x="-1" y="1" drill="0.7"/>
+<pad name="14" x="-3" y="1" drill="0.7"/>
+<pad name="15" x="-5" y="1" drill="0.7"/>
+<pad name="16" x="-7" y="1" drill="0.7"/>
+<wire x1="-8.5" y1="2.5" x2="8.5" y2="2.5" width="0" layer="39"/>
+<wire x1="8.5" y1="2.5" x2="8.5" y2="-2.5" width="0" layer="39"/>
+<wire x1="8.5" y1="-2.5" x2="-8.5" y2="-2.5" width="0" layer="39"/>
+<wire x1="-8.5" y1="-2.5" x2="-8.5" y2="2.5" width="0" layer="39"/>
+<text x="-8.5" y="3" size="0.8128" layer="25" ratio="10">&gt;NAME</text>
+</package>
 </packages>
 <symbols>
 <symbol name="CAP-POL">
@@ -1225,6 +1251,31 @@ Source: http://cache.national.com/ds/LM/LM386.pdf</description>
 <text x="-15.24" y="10.16" size="1.4224" layer="95" ratio="10">&gt;NAME</text>
 <text x="-15.24" y="-12.7" size="1.4224" layer="95" ratio="10">&gt;VALUE</text>
 </symbol>
+<symbol name="HRS-A3C-16DA">
+<pin name="1" x="7.62" y="-7.62" visible="pad" length="short" rot="R180"/>
+<pin name="2" x="7.62" y="-5.08" visible="pad" length="short" rot="R180"/>
+<pin name="3" x="7.62" y="-2.54" visible="pad" length="short" rot="R180"/>
+<pin name="4" x="7.62" y="0" visible="pad" length="short" rot="R180"/>
+<pin name="5" x="7.62" y="2.54" visible="pad" length="short" rot="R180"/>
+<pin name="6" x="7.62" y="5.08" visible="pad" length="short" rot="R180"/>
+<pin name="7" x="7.62" y="7.62" visible="pad" length="short" rot="R180"/>
+<pin name="8" x="7.62" y="10.16" visible="pad" length="short" rot="R180"/>
+<pin name="9" x="-7.62" y="10.16" visible="pad" length="short"/>
+<pin name="10" x="-7.62" y="7.62" visible="pad" length="short"/>
+<pin name="11" x="-7.62" y="5.08" visible="pad" length="short"/>
+<pin name="12" x="-7.62" y="2.54" visible="pad" length="short"/>
+<pin name="13" x="-7.62" y="0" visible="pad" length="short"/>
+<pin name="14" x="-7.62" y="-2.54" visible="pad" length="short"/>
+<pin name="15" x="-7.62" y="-5.08" visible="pad" length="short"/>
+<pin name="P16" x="-7.62" y="-7.62" visible="pad" length="short"/>
+<wire x1="-5.08" y1="12.7" x2="5.08" y2="12.7" width="0.1524" layer="94"/>
+<wire x1="5.08" y1="12.7" x2="5.08" y2="-10.16" width="0.1524" layer="94"/>
+<wire x1="5.08" y1="-10.16" x2="-5.08" y2="-10.16" width="0.1524" layer="94"/>
+<wire x1="-5.08" y1="-10.16" x2="-5.08" y2="12.7" width="0.1524" layer="94"/>
+<circle x="2.54" y="-7.62" radius="1.016" width="0" layer="94"/>
+<text x="-5.08" y="13.716" size="1.778" layer="95" ratio="10">&gt;NAME</text>
+<text x="-5.08" y="-12.7" size="1.778" layer="96" ratio="10">&gt;VALUE</text>
+</symbol>
 </symbols>
 <devicesets>
 <deviceset name="CAP-CHEMI-MVE-HA0" prefix="C">
@@ -1441,12 +1492,12 @@ Source: http://cache.national.com/ds/LM/LM386.pdf</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="POT3361" prefix="R">
+<deviceset name="PAN-EVM1D" prefix="R">
 <gates>
 <gate name="G$1" symbol="POT" x="0" y="0"/>
 </gates>
 <devices>
-<device name="" package="POT3361">
+<device name="" package="PAN-EVM1D">
 <connects>
 <connect gate="G$1" pin="1" pad="1"/>
 <connect gate="G$1" pin="2" pad="2"/>
@@ -1661,6 +1712,36 @@ Source: http://cache.national.com/ds/LM/LM386.pdf</description>
 </device>
 </devices>
 </deviceset>
+<deviceset name="HRS-A3C-16DA" prefix="CN">
+<gates>
+<gate name="G$1" symbol="HRS-A3C-16DA" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="HRS-A3C-16DA">
+<connects>
+<connect gate="G$1" pin="1" pad="1"/>
+<connect gate="G$1" pin="10" pad="10"/>
+<connect gate="G$1" pin="11" pad="11"/>
+<connect gate="G$1" pin="12" pad="12"/>
+<connect gate="G$1" pin="13" pad="13"/>
+<connect gate="G$1" pin="14" pad="14"/>
+<connect gate="G$1" pin="15" pad="15"/>
+<connect gate="G$1" pin="2" pad="2"/>
+<connect gate="G$1" pin="3" pad="3"/>
+<connect gate="G$1" pin="4" pad="4"/>
+<connect gate="G$1" pin="5" pad="5"/>
+<connect gate="G$1" pin="6" pad="6"/>
+<connect gate="G$1" pin="7" pad="7"/>
+<connect gate="G$1" pin="8" pad="8"/>
+<connect gate="G$1" pin="9" pad="9"/>
+<connect gate="G$1" pin="P16" pad="16"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
 </devicesets>
 </library>
 <library name="_Coherix">
@@ -2386,34 +2467,6 @@ by exp-lbrs.ulp</description>
 <rectangle x1="-1.6" y1="-1.25" x2="-1.095" y2="1.25" layer="51"/>
 <rectangle x1="1.095" y1="-1.25" x2="1.6" y2="1.25" layer="51"/>
 </package>
-<package name="HRS-DF11-16DS">
-<pad name="1" x="-1" y="7" drill="0.8" shape="square"/>
-<pad name="2" x="-1" y="5" drill="0.8"/>
-<pad name="3" x="-1" y="3" drill="0.8"/>
-<pad name="4" x="-1" y="1" drill="0.8"/>
-<pad name="5" x="-1" y="-1" drill="0.8"/>
-<pad name="6" x="-1" y="-3" drill="0.8"/>
-<pad name="7" x="-1" y="-5" drill="0.8"/>
-<pad name="8" x="-1" y="-7" drill="0.8"/>
-<pad name="9" x="1" y="-7" drill="0.8"/>
-<pad name="10" x="1" y="-5" drill="0.8"/>
-<pad name="11" x="1" y="-3" drill="0.8"/>
-<pad name="12" x="1" y="-1" drill="0.8"/>
-<pad name="13" x="1" y="1" drill="0.8"/>
-<pad name="14" x="1" y="3" drill="0.8"/>
-<pad name="15" x="1" y="5" drill="0.8"/>
-<pad name="16" x="1" y="7" drill="0.8"/>
-<wire x1="-2.5" y1="9" x2="-2.5" y2="-9" width="0.15" layer="21"/>
-<wire x1="-2.5" y1="-9" x2="2.5" y2="-9" width="0.15" layer="21"/>
-<wire x1="2.5" y1="-9" x2="2.5" y2="9" width="0.15" layer="21"/>
-<wire x1="2.5" y1="9" x2="-2.5" y2="9" width="0.15" layer="21"/>
-<rectangle x1="-2.5" y1="8" x2="-1.5" y2="9" layer="21"/>
-<text x="-2.5" y="9.5" size="1" layer="21" ratio="10">&gt;NAME</text>
-<wire x1="-3" y1="9.5" x2="-3" y2="-9.5" width="0" layer="39"/>
-<wire x1="-3" y1="-9.5" x2="3" y2="-9.5" width="0" layer="39"/>
-<wire x1="3" y1="-9.5" x2="3" y2="9.5" width="0" layer="39"/>
-<wire x1="3" y1="9.5" x2="-3" y2="9.5" width="0" layer="39"/>
-</package>
 <package name="SW-BOURNS-7914J">
 <smd name="4" x="1.27" y="1.9" dx="1.78" dy="1.27" layer="1" rot="R90"/>
 <smd name="1" x="-1.27" y="1.9" dx="1.78" dy="1.27" layer="1" rot="R90"/>
@@ -2575,38 +2628,6 @@ by exp-lbrs.ulp</description>
 <text x="1.016" y="0.635" size="1.4224" layer="95" ratio="9">&gt;NAME</text>
 <text x="1.016" y="-4.064" size="1.4224" layer="96" ratio="9">&gt;VALUE</text>
 </symbol>
-<symbol name="HRS-DF11-16DS">
-<pin name="1" x="-7.62" y="7.62" visible="pad" length="short"/>
-<pin name="2" x="-7.62" y="5.08" visible="pad" length="short"/>
-<pin name="3" x="-7.62" y="2.54" visible="pad" length="short"/>
-<pin name="4" x="-7.62" y="0" visible="pad" length="short"/>
-<pin name="5" x="-7.62" y="-2.54" visible="pad" length="short"/>
-<pin name="6" x="-7.62" y="-5.08" visible="pad" length="short"/>
-<pin name="7" x="-7.62" y="-7.62" visible="pad" length="short"/>
-<pin name="8" x="-7.62" y="-10.16" visible="pad" length="short"/>
-<pin name="9" x="7.62" y="-10.16" visible="pad" length="short" rot="R180"/>
-<pin name="10" x="7.62" y="-7.62" visible="pad" length="short" rot="R180"/>
-<pin name="11" x="7.62" y="-5.08" visible="pad" length="short" rot="R180"/>
-<pin name="12" x="7.62" y="-2.54" visible="pad" length="short" rot="R180"/>
-<pin name="13" x="7.62" y="0" visible="pad" length="short" rot="R180"/>
-<pin name="14" x="7.62" y="2.54" visible="pad" length="short" rot="R180"/>
-<pin name="15" x="7.62" y="5.08" visible="pad" length="short" rot="R180"/>
-<pin name="16" x="7.62" y="7.62" visible="pad" length="short" rot="R180"/>
-<wire x1="-5.08" y1="10.16" x2="-5.08" y2="8.89" width="0.1524" layer="94"/>
-<wire x1="-5.08" y1="8.89" x2="-5.08" y2="8.382" width="0.1524" layer="94"/>
-<wire x1="-5.08" y1="8.382" x2="-5.08" y2="6.35" width="0.1524" layer="94"/>
-<wire x1="-5.08" y1="6.35" x2="-5.08" y2="-12.7" width="0.1524" layer="94"/>
-<wire x1="-5.08" y1="-12.7" x2="5.08" y2="-12.7" width="0.1524" layer="94"/>
-<wire x1="5.08" y1="-12.7" x2="5.08" y2="10.16" width="0.1524" layer="94"/>
-<wire x1="5.08" y1="10.16" x2="-5.08" y2="10.16" width="0.1524" layer="94"/>
-<polygon width="0" layer="94">
-<vertex x="-4.826" y="8.89"/>
-<vertex x="-2.54" y="7.62"/>
-<vertex x="-4.826" y="6.35"/>
-</polygon>
-<text x="-5.08" y="12.7" size="1.27" layer="95" ratio="10">&gt;NAME</text>
-<text x="-5.08" y="-15.24" size="1.27" layer="96" ratio="10">&gt;VALUE</text>
-</symbol>
 <symbol name="SW-BOURNS-7914S">
 <pin name="P$1" x="-5.08" y="2.54" visible="pad" length="short" direction="pas"/>
 <pin name="P$2" x="-5.08" y="-2.54" visible="pad" length="short" direction="pas"/>
@@ -2786,36 +2807,6 @@ by exp-lbrs.ulp</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="HRS-DF11-16DS" prefix="CN">
-<gates>
-<gate name="G$1" symbol="HRS-DF11-16DS" x="0" y="0"/>
-</gates>
-<devices>
-<device name="" package="HRS-DF11-16DS">
-<connects>
-<connect gate="G$1" pin="1" pad="1"/>
-<connect gate="G$1" pin="10" pad="10"/>
-<connect gate="G$1" pin="11" pad="11"/>
-<connect gate="G$1" pin="12" pad="12"/>
-<connect gate="G$1" pin="13" pad="13"/>
-<connect gate="G$1" pin="14" pad="14"/>
-<connect gate="G$1" pin="15" pad="15"/>
-<connect gate="G$1" pin="16" pad="16"/>
-<connect gate="G$1" pin="2" pad="2"/>
-<connect gate="G$1" pin="3" pad="3"/>
-<connect gate="G$1" pin="4" pad="4"/>
-<connect gate="G$1" pin="5" pad="5"/>
-<connect gate="G$1" pin="6" pad="6"/>
-<connect gate="G$1" pin="7" pad="7"/>
-<connect gate="G$1" pin="8" pad="8"/>
-<connect gate="G$1" pin="9" pad="9"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
 <deviceset name="SW-BOURNS-7914J" prefix="SW">
 <gates>
 <gate name="G$1" symbol="SW-BOURNS-7914S" x="-7.62" y="0"/>
@@ -4055,7 +4046,6 @@ http://www.weartronics.com/</description>
 <part name="R33" library="AA-ipc-7351-resistor" deviceset="RESISTOR_" device="0603" value="2.2K,1%"/>
 <part name="LED8" library="_Coherix" deviceset="LTST-C" device="" value="LED-RED,RA"/>
 <part name="V58" library="A-SUPPLY2" deviceset="GND" device=""/>
-<part name="CN12" library="SM1000" deviceset="HRS-DF11-16DS" device="" value="DF11-16DS"/>
 <part name="LD2" library="_RoweTel" deviceset="LTV-817S" device=""/>
 <part name="R51" library="AA-ipc-7351-resistor" deviceset="RESISTOR_" device="0603" value="390,1%"/>
 <part name="V74" library="A-SUPPLY2" deviceset="VDD" device=""/>
@@ -4087,8 +4077,8 @@ http://www.weartronics.com/</description>
 <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="POT3361" device="" value="500,POT"/>
-<part name="R52" library="_RoweTel" deviceset="POT3361" device="" value="1K,POT"/>
+<part name="R47" library="_RoweTel" deviceset="PAN-EVM1D" device="" value="500,POT"/>
+<part name="R52" library="_RoweTel" deviceset="PAN-EVM1D" device="" value="1K,POT"/>
 <part name="C22" library="AA-ipc-7351-capacitor" deviceset="CAPACITOR_" device="0603" value="100nF,16V"/>
 <part name="C23" library="AA-ipc-7351-capacitor" deviceset="CAPACITOR_" device="0603" value="100nF,25V"/>
 <part name="C41" library="AA-ipc-7351-capacitor" deviceset="CAPACITOR_" device="0603" value="100nF,16V"/>
@@ -4123,7 +4113,7 @@ http://www.weartronics.com/</description>
 <part name="C29" library="AA-ipc-7351-capacitor" deviceset="CAPACITOR_" device="1210" value="22uF,25V,1210"/>
 <part name="U9" library="_RoweTel" deviceset="LMV341" device=""/>
 <part name="R41" library="AA-ipc-7351-resistor" deviceset="RESISTOR_" device="0603" value="2.2K,1%"/>
-<part name="R42" library="_RoweTel" deviceset="POT3361" device="" value="500K,POT"/>
+<part name="R42" library="_RoweTel" deviceset="PAN-EVM1D" device="" value="500K,POT"/>
 <part name="V62" library="A-SUPPLY2" deviceset="GND" device=""/>
 <part name="R53" library="AA-ipc-7351-resistor" deviceset="RESISTOR_" device="0603" value="2.2K,1%"/>
 <part name="V91" library="A-SUPPLY2" deviceset="GND" device=""/>
@@ -4282,6 +4272,7 @@ http://www.weartronics.com/</description>
 <part name="CN8" library="_RoweTel" deviceset="ST-3509" device=""/>
 <part name="CN9" library="_RoweTel" deviceset="ST-3509" device=""/>
 <part name="CN10" library="_RoweTel" deviceset="ST-3509" device=""/>
+<part name="CN12" library="_RoweTel" deviceset="HRS-A3C-16DA" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -6157,10 +6148,6 @@ http://www.weartronics.com/</description>
 <instance part="V58" gate="GND" x="248.92" y="218.44" smashed="yes">
 <attribute name="VALUE" x="246.38" y="215.138" size="1.4224" layer="96" ratio="9"/>
 </instance>
-<instance part="CN12" gate="G$1" x="317.5" y="180.34" smashed="yes" rot="R180">
-<attribute name="NAME" x="322.58" y="167.64" size="1.4224" layer="95" ratio="10" rot="R180"/>
-<attribute name="VALUE" x="322.58" y="195.58" size="1.4224" layer="96" ratio="10" rot="R180"/>
-</instance>
 <instance part="LD2" gate="G$1" x="279.4" y="60.96" smashed="yes">
 <attribute name="NAME" x="272.415" y="66.675" size="1.778" layer="95"/>
 <attribute name="VALUE" x="272.415" y="53.34" size="1.778" layer="96"/>
@@ -6247,8 +6234,8 @@ http://www.weartronics.com/</description>
 <attribute name="VALUE" x="274.32" y="101.6" size="1.4224" layer="96" ratio="9" rot="MR270"/>
 </instance>
 <instance part="R52" gate="G$1" x="264.16" y="142.24" smashed="yes" rot="R180">
-<attribute name="NAME" x="256.54" y="137.16" size="1.4224" layer="95" ratio="9"/>
-<attribute name="VALUE" x="256.54" y="134.62" size="1.4224" layer="96" ratio="9"/>
+<attribute name="NAME" x="259.08" y="152.4" size="1.4224" layer="95" ratio="9"/>
+<attribute name="VALUE" x="259.08" y="154.94" size="1.4224" layer="96" ratio="9"/>
 </instance>
 <instance part="C22" gate="G$1" x="124.46" y="175.26" smashed="yes" rot="R270">
 <attribute name="NAME" x="109.22" y="170.18" size="1.4224" layer="95"/>
@@ -6622,6 +6609,10 @@ http://www.weartronics.com/</description>
 <attribute name="VALUE" x="340.36" y="66.04" size="1.4224" layer="95" ratio="10"/>
 </instance>
 <instance part="CN10" gate="G$1" x="307.34" y="228.6" rot="MR180"/>
+<instance part="CN12" gate="G$1" x="317.5" y="180.34" smashed="yes">
+<attribute name="NAME" x="312.42" y="194.056" size="1.4224" layer="95" ratio="10"/>
+<attribute name="VALUE" x="312.42" y="167.64" size="1.4224" layer="96" ratio="10"/>
+</instance>
 </instances>
 <busses>
 </busses>
@@ -7104,58 +7095,58 @@ http://www.weartronics.com/</description>
 </net>
 <net name="N$51" class="0">
 <segment>
-<pinref part="CN12" gate="G$1" pin="8"/>
 <pinref part="CN4" gate="G$1" pin="8"/>
 <wire x1="327.66" y1="190.5" x2="325.12" y2="190.5" width="0.1524" layer="91"/>
+<pinref part="CN12" gate="G$1" pin="8"/>
 </segment>
 </net>
 <net name="N$52" class="0">
 <segment>
-<pinref part="CN12" gate="G$1" pin="7"/>
 <pinref part="CN4" gate="G$1" pin="7"/>
 <wire x1="327.66" y1="187.96" x2="325.12" y2="187.96" width="0.1524" layer="91"/>
+<pinref part="CN12" gate="G$1" pin="7"/>
 </segment>
 </net>
 <net name="N$53" class="0">
 <segment>
-<pinref part="CN12" gate="G$1" pin="6"/>
 <pinref part="CN4" gate="G$1" pin="6"/>
 <wire x1="327.66" y1="185.42" x2="325.12" y2="185.42" width="0.1524" layer="91"/>
+<pinref part="CN12" gate="G$1" pin="6"/>
 </segment>
 </net>
 <net name="N$54" class="0">
 <segment>
-<pinref part="CN12" gate="G$1" pin="5"/>
 <pinref part="CN4" gate="G$1" pin="5"/>
 <wire x1="327.66" y1="182.88" x2="325.12" y2="182.88" width="0.1524" layer="91"/>
+<pinref part="CN12" gate="G$1" pin="5"/>
 </segment>
 </net>
 <net name="N$55" class="0">
 <segment>
-<pinref part="CN12" gate="G$1" pin="4"/>
 <pinref part="CN4" gate="G$1" pin="4"/>
 <wire x1="327.66" y1="180.34" x2="325.12" y2="180.34" width="0.1524" layer="91"/>
+<pinref part="CN12" gate="G$1" pin="4"/>
 </segment>
 </net>
 <net name="N$56" class="0">
 <segment>
-<pinref part="CN12" gate="G$1" pin="3"/>
 <pinref part="CN4" gate="G$1" pin="3"/>
 <wire x1="327.66" y1="177.8" x2="325.12" y2="177.8" width="0.1524" layer="91"/>
+<pinref part="CN12" gate="G$1" pin="3"/>
 </segment>
 </net>
 <net name="N$57" class="0">
 <segment>
-<pinref part="CN12" gate="G$1" pin="2"/>
 <pinref part="CN4" gate="G$1" pin="2"/>
 <wire x1="327.66" y1="175.26" x2="325.12" y2="175.26" width="0.1524" layer="91"/>
+<pinref part="CN12" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="N$58" class="0">
 <segment>
-<pinref part="CN12" gate="G$1" pin="1"/>
 <pinref part="CN4" gate="G$1" pin="1"/>
 <wire x1="327.66" y1="172.72" x2="325.12" y2="172.72" width="0.1524" layer="91"/>
+<pinref part="CN12" gate="G$1" pin="1"/>
 </segment>
 </net>
 <net name="MIC" class="0">
@@ -7164,11 +7155,11 @@ http://www.weartronics.com/</description>
 <wire x1="297.18" y1="154.94" x2="294.64" y2="154.94" width="0.1524" layer="91"/>
 <wire x1="294.64" y1="154.94" x2="294.64" y2="157.48" width="0.1524" layer="91"/>
 <wire x1="294.64" y1="157.48" x2="294.64" y2="175.26" width="0.1524" layer="91"/>
-<pinref part="CN12" gate="G$1" pin="15"/>
 <wire x1="294.64" y1="175.26" x2="309.88" y2="175.26" width="0.1524" layer="91"/>
 <wire x1="297.18" y1="93.98" x2="325.12" y2="93.98" width="0.1524" layer="91"/>
 <pinref part="CN7" gate="G$1" pin="D"/>
 <wire x1="325.12" y1="93.98" x2="332.74" y2="93.98" width="0.1524" layer="91"/>
+<pinref part="CN12" gate="G$1" pin="15"/>
 </segment>
 </net>
 <net name="SPKR" class="0">
@@ -7177,11 +7168,11 @@ http://www.weartronics.com/</description>
 <wire x1="299.72" y1="157.48" x2="299.72" y2="139.7" width="0.1524" layer="91"/>
 <wire x1="299.72" y1="157.48" x2="297.18" y2="157.48" width="0.1524" layer="91"/>
 <wire x1="297.18" y1="157.48" x2="297.18" y2="172.72" width="0.1524" layer="91"/>
-<pinref part="CN12" gate="G$1" pin="16"/>
 <wire x1="309.88" y1="172.72" x2="302.26" y2="172.72" width="0.1524" layer="91"/>
 <wire x1="297.18" y1="172.72" x2="302.26" y2="172.72" width="0.1524" layer="91"/>
 <wire x1="322.58" y1="139.7" x2="325.12" y2="139.7" width="0.1524" layer="91"/>
 <pinref part="CN6" gate="G$1" pin="D"/>
+<pinref part="CN12" gate="G$1" pin="P16"/>
 </segment>
 </net>
 <net name="N$49" class="0">
@@ -7469,11 +7460,11 @@ http://www.weartronics.com/</description>
 <wire x1="294.64" y1="68.58" x2="294.64" y2="58.42" width="0.1524" layer="91"/>
 <wire x1="294.64" y1="58.42" x2="332.74" y2="58.42" width="0.1524" layer="91"/>
 <wire x1="294.64" y1="152.4" x2="292.1" y2="152.4" width="0.1524" layer="91"/>
-<pinref part="CN12" gate="G$1" pin="14"/>
 <wire x1="294.64" y1="177.8" x2="309.88" y2="177.8" width="0.1524" layer="91"/>
 <wire x1="292.1" y1="177.8" x2="294.64" y2="177.8" width="0.1524" layer="91"/>
 <wire x1="292.1" y1="152.4" x2="292.1" y2="177.8" width="0.1524" layer="91"/>
 <pinref part="CN9" gate="G$1" pin="D"/>
+<pinref part="CN12" gate="G$1" pin="14"/>
 </segment>
 </net>
 <net name="N$8" class="0">
@@ -7687,14 +7678,14 @@ http://www.weartronics.com/</description>
 <pinref part="V99" gate="G$1" pin="RF_MIC"/>
 </segment>
 <segment>
-<pinref part="CN12" gate="G$1" pin="11"/>
 <wire x1="309.88" y1="185.42" x2="274.32" y2="185.42" width="0.1524" layer="91"/>
 <wire x1="274.32" y1="185.42" x2="274.32" y2="182.88" width="0.1524" layer="91"/>
-<pinref part="CN12" gate="G$1" pin="12"/>
 <wire x1="274.32" y1="182.88" x2="274.32" y2="180.34" width="0.1524" layer="91"/>
 <wire x1="309.88" y1="182.88" x2="274.32" y2="182.88" width="0.1524" layer="91"/>
 <junction x="274.32" y="182.88"/>
 <pinref part="V133" gate="G$1" pin="RF_MIC"/>
+<pinref part="CN12" gate="G$1" pin="11"/>
+<pinref part="CN12" gate="G$1" pin="12"/>
 </segment>
 </net>
 <net name="RF_SPKR" class="0">
@@ -7717,14 +7708,14 @@ http://www.weartronics.com/</description>
 <pinref part="CN6" gate="G$1" pin="A"/>
 </segment>
 <segment>
-<pinref part="CN12" gate="G$1" pin="9"/>
 <wire x1="309.88" y1="190.5" x2="266.7" y2="190.5" width="0.1524" layer="91"/>
 <wire x1="266.7" y1="190.5" x2="266.7" y2="187.96" width="0.1524" layer="91"/>
-<pinref part="CN12" gate="G$1" pin="10"/>
 <wire x1="266.7" y1="187.96" x2="266.7" y2="185.42" width="0.1524" layer="91"/>
 <wire x1="309.88" y1="187.96" x2="266.7" y2="187.96" width="0.1524" layer="91"/>
 <junction x="266.7" y="187.96"/>
 <pinref part="V134" gate="G$1" pin="RF_SPKR"/>
+<pinref part="CN12" gate="G$1" pin="9"/>
+<pinref part="CN12" gate="G$1" pin="10"/>
 </segment>
 </net>
 <net name="RF_PTT" class="0">
@@ -7749,10 +7740,10 @@ http://www.weartronics.com/</description>
 <junction x="294.64" y="53.34"/>
 </segment>
 <segment>
-<pinref part="CN12" gate="G$1" pin="13"/>
 <wire x1="309.88" y1="180.34" x2="281.94" y2="180.34" width="0.1524" layer="91"/>
 <wire x1="281.94" y1="180.34" x2="281.94" y2="177.8" width="0.1524" layer="91"/>
 <pinref part="V92" gate="G$1" pin="RF_PTT"/>
+<pinref part="CN12" gate="G$1" pin="13"/>
 </segment>
 </net>
 <net name="N$32" class="0">