From: rickb44 <rickb44@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Tue, 21 Oct 2014 19:21:03 +0000 (+0000)
Subject: Update Schemaatic, PCB & BOM to reflect change to 0402 package,
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=6f6fc463312c0c090d5d11a7d891f59ae8dd09e3;p=freetel-svn-tracking.git

Update Schemaatic, PCB & BOM to reflect change to 0402 package,
Change 3.5mm conns to ST-3509 type
RGB

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

diff --git a/smartmic/SM1000-C/BOM-SM1000-C.csv b/smartmic/SM1000-C/BOM-SM1000-C.csv
index 1016fa21..acbdf3f3 100644
--- a/smartmic/SM1000-C/BOM-SM1000-C.csv
+++ b/smartmic/SM1000-C/BOM-SM1000-C.csv
@@ -1,10 +1,10 @@
-"Bill of Materials from SM1000-C.sch, 199 parts, grouped by values, as of 10/20/2014 6:40:54 PM"
+"Bill of Materials from SM1000-C.sch, 199 parts, grouped by values, as of 10/21/2014 3:10:31 PM"
 "Part","Qty","DEFINITION","MANUFACTURER","MFG_NUMBER","DISTRIBUTOR","DIST_NUMBER","GENERIC","ROHS","COST100",
-"C1, C34, C55, C56","4","CAP CER 1000PF 25V 10% X7R 0603","MURATA","GRM188R71E102KA01D","DIGIKEY","490-8626-1-ND","Y","Y","0.013"
+"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"
 "C4, C7, C11, C13, C16, C18, C20, C22, C33, C37, C41, C42, C49, C51, C52, C58, C61, C62, C66","19","CAP CER 0.1UF 16V 10% X5R 0603","YAIYO YUDEN","EMK107BJ104KAHT","DIGIKEY","587-3308-1-ND","Y","Y","0.042"
 "C5, C6, C10, C12, C24, C65","6","CAP CER 1UF 16V 10% X5R 0603","YAEGO","CC0603KRX5R7BB105","DIGIKEY","311-1444-1-ND","Y","Y","0.033"
-"C8, C17, C19, C21, C53","5","CAP CER 10000PF 16V 10% X7R 0603","TDK","CGJ3E2X7R1C103K080AA","DIGIKEY","445-8130-1-ND","Y","Y","0.07"
+"C8, C17, C19, C21, C53","5","CAP CER 10000PF 16V 10% X7R 0402","MURATA","GRM155R71C103KA01D","DIGIKEY","490-1313-1-ND","Y","Y","0.006"
 "C9","1","CAP TANT 4.7UF 16V 10% 1206","AVX","TAJA475K016RNJ","DIGIKEY","478-3868-1-ND","Y","Y","0.260"
 "C14, C15, C35, C50","4","CAP CER 2.2UF 16V 10% X5R 0603","TDK","C1608X5R1C225K080AB","DIGIKEY","445-5157-1-ND","Y","Y","0.0643"
 "C23, C26, C46","3","CAP CER 0.1UF 25V 10% X7R 0603","MURATA","GRM188R71E104KA01D","DIGIKEY","490-1524-1-ND","Y","Y","0.008"
@@ -18,13 +18,12 @@
 "C43, C44, C45","3","CAP CER 100PF 50V 10% NP0 0603","SAMSUNG","CL10C101KB8NNNC","DIGIKEY","1276-2167-1-ND","Y","Y","0.012"
 "C48","1","CAP CER 0.47UF 25V 10% X5R 0603","TDK","C1608X5R1E474K080AC","DIGIKEY","445-5144-1-ND","Y","Y","0.047"
 "C54","1","CAP CER 100PF 16V 10% X7R 0603","AVX","0603YC101KAT2A","DIGIKEY","478-6207-1-ND","Y","Y","0.063"
-"C57","1","CAP CER 3900PF 50V 10% X7R 0603","AVX","06035C392KAT2A","DIGIKEY","478-1222-1-ND","Y","Y","0.0475"
+"C57","1","CAP CER 3900PF 50V 10% X7R 0402","MURATA","GRM155R71H392KA01D","DIGIKEY","490-1307-1-ND","Y","Y","0.011"
 "CN1, CN11","2","CONN HEADER 3POS .100 VERT GOLD","MOLEX","22-10-2031","DIGIKEY","WM2723-ND","N","Y",".495"
 "CN2","1","CONN RECEPT MINIUSB R/A 5POS SMD","MOLEX","0675031020","DIGIKEY","WM5461CT-ND","N","Y","0.856"
 "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, CN7, CN9, CN10","4","CONN AUDIO JACK MONO 3.5MM SMD","CUI","MJ-3523-SMT-TR","DIGIKEY","CP-3523MJTR-ND","N","Y","0.796"
-"CN6, CN8","2","CONN AUDIO JACK 3.5MM STEREO SMD","CUI","SJ-3524-SMT-TR","DIGIKEY","CP-3524SJCT-ND","N","Y","0.811"
+"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"
 "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"
@@ -39,7 +38,7 @@
 "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"," "
-"PCB1","1","PCB - SM1000 REV. C","?","?"," "," ","N","Y","6.50"
+"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"
 "R6, R17","2","RES 1.02K OHM 1/10W 1% 0603 SMD","VISHAY-DALE","CRCW06031K02FKEA","DIGIKEY","541-1.02KHCT-ND","Y","Y","0.025"
@@ -64,7 +63,7 @@
 "R52","1","TRIMMER 1K OHM 0.5W SMD","BOURNS","3361P-1-102GLF","DIGIKEY","3361P-102GLFCT-ND","N","Y","0.969"
 "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"," "," "," "," "," "," "," "," "
+"SPKR1","1"," "," "," "," "," "," "," ","0.0"
 "SW1, SW2, SW4","3","SWITCH TACTILE SPST-NO 0.1A 24V","BOURNS","7914S-1-000E","DIGIKEY","7914S-1-000ECT-ND","N","Y","0.77"
 "SW3","1","SWITCH PUSH DPDT 0.1A 30V","E-SWITCH","PBH2UEENAGX","DIGIKEY","EG2655-ND","N","Y","1.332"
 "SW5","1","Tactile Switches 4mm KEY SWITCH SMD J-Hook","BOURNS","7914J-1-000E","MOUSER","652-7914J-1-000E","N","Y","0.441"
diff --git a/smartmic/SM1000-C/BOM-SM1000-C.pdf b/smartmic/SM1000-C/BOM-SM1000-C.pdf
index 3042c990..121bd838 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 625514de..fb4b010b 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/SM1000-C.brd b/smartmic/SM1000-C/SM1000-C.brd
index 51dbc83c..57238176 100644
--- a/smartmic/SM1000-C/SM1000-C.brd
+++ b/smartmic/SM1000-C/SM1000-C.brd
@@ -23,16 +23,16 @@
 <layer number="13" name="Route13" color="4" fill="5" visible="no" active="no"/>
 <layer number="14" name="Route14" color="1" fill="6" visible="no" active="no"/>
 <layer number="15" name="VDD" color="6" fill="1" visible="no" active="yes"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="yes"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <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="no" active="yes"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="yes" 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="no" active="yes"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" 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"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
@@ -1280,33 +1280,6 @@ Licensed under TAPR Open Hardware License</text>
 </library>
 <library name="_RoweTel">
 <packages>
-<package name="MJ-3523-SMT">
-<smd name="1" x="5.6" y="3.6" dx="2.2" dy="3" layer="1" rot="R180"/>
-<smd name="2" x="-3.8" y="3.6" dx="2.8" dy="3" layer="1"/>
-<smd name="10" x="-7.8" y="-0.75" dx="2.8" dy="3" layer="1" rot="R90"/>
-<wire x1="-8" y1="3" x2="-6" y2="3" width="0.15" layer="21"/>
-<wire x1="-8" y1="1.5" x2="-8" y2="3" width="0.15" layer="21"/>
-<wire x1="-8" y1="-3" x2="8" y2="-3" width="0.15" layer="21"/>
-<wire x1="-8" y1="-3" x2="-8" y2="-2.5" width="0.15" layer="21"/>
-<wire x1="8" y1="-3" x2="8" y2="3" width="0.15" layer="21"/>
-<wire x1="8" y1="3" x2="7.5" y2="3" width="0.15" layer="21"/>
-<wire x1="-1.5" y1="3" x2="3.5" y2="3" width="0.15" layer="21"/>
-<wire x1="8" y1="5" x2="8" y2="-5.5" width="0.15" layer="51"/>
-<text x="10" y="-4.5" size="1" layer="51" ratio="10" rot="R90">BOARD EDGE</text>
-<text x="-2.5" y="7" size="1" layer="25" ratio="10">&gt;NAME</text>
-<wire x1="-5.9" y1="5.7" x2="-1.8" y2="5.7" width="0" layer="39"/>
-<wire x1="-1.8" y1="5.7" x2="-1.8" y2="3" width="0" layer="39"/>
-<wire x1="-1.8" y1="3" x2="3.8" y2="3" width="0" layer="39"/>
-<wire x1="3.8" y1="3" x2="3.8" y2="5.7" width="0" layer="39"/>
-<wire x1="3.8" y1="5.7" x2="7.4" y2="5.7" width="0" layer="39"/>
-<wire x1="7.4" y1="5.7" x2="7.4" y2="-3" width="0" layer="39"/>
-<wire x1="7.4" y1="-3" x2="-9.9" y2="-3" width="0" layer="39"/>
-<wire x1="-9.9" y1="-3" x2="-9.9" y2="1.2" width="0" layer="39"/>
-<wire x1="-9.9" y1="1.2" x2="-5.9" y2="1.2" width="0" layer="39"/>
-<wire x1="-5.9" y1="1.2" x2="-5.9" y2="5.7" width="0" layer="39"/>
-<hole x="-2.5" y="0" drill="1.7"/>
-<hole x="4.5" y="0" drill="1.7"/>
-</package>
 <package name="CAP-CHEMI-HA0">
 <smd name="1" x="0" y="3.65" dx="4.2" dy="3.5" layer="1" rot="R90"/>
 <smd name="2" x="0" y="-3.65" dx="4.2" dy="3.5" layer="1" rot="R90"/>
@@ -1707,43 +1680,41 @@ NS Package M08A</description>
 <wire x1="4" y1="-4" x2="-4" y2="-4" width="0" layer="39"/>
 <wire x1="-4" y1="-4" x2="-4" y2="4" width="0" layer="39"/>
 </package>
-<package name="SJ-3524-SMT">
-<smd name="1" x="4.6" y="3.6" dx="2.2" dy="3" layer="1" rot="R180"/>
-<smd name="2" x="-4.8" y="3.6" dx="2.8" dy="3" layer="1"/>
-<smd name="4" x="-8.8" y="-0.75" dx="2.8" dy="3" layer="1" rot="R90"/>
-<wire x1="-9" y1="3" x2="-7" y2="3" width="0.15" layer="21"/>
-<wire x1="-9" y1="1.5" x2="-9" y2="3" width="0.15" layer="21"/>
-<wire x1="-9" y1="-3" x2="-9" y2="-2.5" width="0.15" layer="21"/>
-<wire x1="7" y1="-3" x2="7" y2="3" width="0.15" layer="21"/>
-<wire x1="7" y1="3" x2="6.5" y2="3" width="0.15" layer="21"/>
-<wire x1="-2.5" y1="3" x2="2.5" y2="3" width="0.15" layer="21"/>
-<wire x1="7" y1="5" x2="7" y2="-5.5" width="0.15" layer="51"/>
-<text x="9" y="-4.5" size="1" layer="51" ratio="10" rot="R90">BOARD EDGE</text>
-<text x="-3.5" y="7" size="1" layer="25" ratio="10">&gt;NAME</text>
-<wire x1="-6.9" y1="5.7" x2="-2.8" y2="5.7" width="0" layer="39"/>
-<wire x1="-2.8" y1="5.7" x2="-2.8" y2="3" width="0" layer="39"/>
-<wire x1="-2.8" y1="3" x2="2.8" y2="3" width="0" layer="39"/>
-<wire x1="2.8" y1="3" x2="2.8" y2="5.7" width="0" layer="39"/>
-<wire x1="2.8" y1="5.7" x2="6.4" y2="5.7" width="0" layer="39"/>
-<wire x1="6.4" y1="5.7" x2="6.4" y2="-2.95" width="0" layer="39"/>
-<wire x1="6.4" y1="-2.95" x2="6.4" y2="-3" width="0" layer="39"/>
-<wire x1="-10.9" y1="-3" x2="-10.9" y2="1.2" width="0" layer="39"/>
-<wire x1="-10.9" y1="1.2" x2="-6.9" y2="1.2" width="0" layer="39"/>
-<wire x1="-6.9" y1="1.2" x2="-6.9" y2="5.7" width="0" layer="39"/>
-<hole x="-3.5" y="0" drill="1.7"/>
-<hole x="3.5" y="0" drill="1.7"/>
-<smd name="3" x="1.6" y="-3.6" dx="2.2" dy="3" layer="1" rot="R180"/>
-<wire x1="-9" y1="-3" x2="0" y2="-3" width="0.15" layer="21"/>
-<wire x1="3" y1="-3" x2="7" y2="-3" width="0.15" layer="21"/>
-<wire x1="-10.9" y1="-3" x2="-0.1" y2="-3" width="0" layer="39"/>
-<wire x1="-0.1" y1="-3" x2="-0.1" y2="-5.7" width="0" layer="39"/>
-<wire x1="-0.1" y1="-5.7" x2="3.3" y2="-5.7" width="0" layer="39"/>
-<wire x1="3.3" y1="-5.7" x2="3.3" y2="-3" width="0" layer="39"/>
-<wire x1="3.3" y1="-3" x2="6.4" y2="-3" width="0" layer="39"/>
-<wire x1="6.4" y1="-3" x2="6.4" y2="-2.95" width="0" layer="39"/>
-</package>
 <package name="NOPACKAGE">
 </package>
+<package name="ST-3509">
+<smd name="C" x="-4.5" y="3.45" dx="2.5" dy="2" layer="1" rot="R270"/>
+<smd name="A" x="4.75" y="3.45" dx="2.5" dy="2" layer="1" rot="R270"/>
+<smd name="B" x="2.95" y="-3.45" dx="2.5" dy="2" layer="1" rot="R270"/>
+<smd name="D" x="-8.5" y="-0.75" dx="2.5" dy="2" layer="1" rot="R180"/>
+<smd name="F" x="5.65" y="-3.45" dx="2.5" dy="1.5" layer="1" rot="R90"/>
+<wire x1="7.25" y1="3" x2="7.25" y2="-3" width="0.15" layer="21"/>
+<hole x="3.75" y="0" drill="1.8"/>
+<hole x="-3.25" y="0" drill="1.8"/>
+<wire x1="-7.05" y1="3" x2="-7.05" y2="-3" width="0.15" layer="21"/>
+<wire x1="7.25" y1="3" x2="6.25" y2="3" width="0.15" layer="21"/>
+<wire x1="7.25" y1="-3" x2="6.75" y2="-3" width="0.15" layer="21"/>
+<wire x1="1.25" y1="-3" x2="-7.05" y2="-3" width="0.15" layer="21"/>
+<wire x1="-6.25" y1="3" x2="-7.05" y2="3" width="0.15" layer="21"/>
+<wire x1="3.25" y1="3" x2="-2.75" y2="3" width="0.15" layer="21"/>
+<text x="-2.5" y="4" size="1" layer="25" ratio="10">&gt;NAME</text>
+<wire x1="6.5" y1="-5" x2="6.8" y2="-5" width="0" layer="39"/>
+<wire x1="6.8" y1="-5" x2="6.8" y2="-1.8" width="0" layer="39"/>
+<wire x1="6.8" y1="-1.8" x2="6.2" y2="-1.8" width="0" layer="39"/>
+<wire x1="6.2" y1="-1.8" x2="6.2" y2="5" width="0" layer="39"/>
+<wire x1="6.2" y1="5" x2="3.3" y2="5" width="0" layer="39"/>
+<wire x1="3.3" y1="5" x2="3.3" y2="3.5" width="0" layer="39"/>
+<wire x1="3.3" y1="3.5" x2="-3.1" y2="3.5" width="0" layer="39"/>
+<wire x1="-3.1" y1="3.5" x2="-3.1" y2="5" width="0" layer="39"/>
+<wire x1="-3.1" y1="5" x2="-5.9" y2="5" width="0" layer="39"/>
+<wire x1="-5.9" y1="5" x2="-5.9" y2="3.5" width="0" layer="39"/>
+<wire x1="-5.9" y1="3.5" x2="-5.9" y2="0.6" width="0" layer="39"/>
+<wire x1="-5.9" y1="0.6" x2="-10.1" y2="0.6" width="0" layer="39"/>
+<wire x1="-10.1" y1="0.6" x2="-10.1" y2="-2.1" width="0" layer="39"/>
+<wire x1="-10.1" y1="-2.1" x2="1.6" y2="-2.1" width="0" layer="39"/>
+<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>
 </packages>
 </library>
 <library name="_Coherix">
@@ -2637,9 +2608,6 @@ design rules under a new name.</description>
 <element name="U4" library="AA-IC" package="ECOPACK-11" value="EMIF02-USB03F2" x="40.25" y="89" smashed="yes">
 <attribute name="NAME" x="39.5" y="90.5" size="0.8128" layer="25" ratio="10"/>
 </element>
-<element name="CN5" library="_RoweTel" package="MJ-3523-SMT" value="MJ-3523-SMT" x="59.32" y="8" locked="yes" smashed="yes" rot="MR270">
-<attribute name="NAME" x="55.82" y="9" size="1" layer="26" ratio="10" rot="MR270"/>
-</element>
 <element name="C39" library="_RoweTel" package="CAP-CHEMI-HA0" value="220uF,25V" x="48.18" y="47.75" smashed="yes">
 <attribute name="NAME" x="48.43" y="40.5" size="0.8128" layer="25" ratio="10"/>
 </element>
@@ -2867,18 +2835,12 @@ design rules under a new name.</description>
 <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>
-<element name="CN9" library="_RoweTel" package="MJ-3523-SMT" value="MJ-3523-SMT" x="36.625" y="8" locked="yes" smashed="yes" rot="MR270">
-<attribute name="NAME" x="33.125" y="9.5" size="1" layer="26" ratio="10" rot="MR270"/>
-</element>
-<element name="CN7" library="_RoweTel" package="MJ-3523-SMT" value="MJ-3523-SMT" x="25.275" y="8" locked="yes" smashed="yes" rot="MR270">
-<attribute name="NAME" x="21.775" y="9.5" size="1" layer="26" ratio="10" rot="MR270"/>
-</element>
-<element name="CN12" library="SM1000" package="HRS-DF11-16DS" value="DF11-16DS" x="27.49" y="33.87" smashed="yes" rot="R90">
-<attribute name="VALUE" x="28.125" y="27.52" size="1.27" layer="27" ratio="10" rot="R90"/>
-<attribute name="NAME" x="21.443" y="30.956" size="0.8128" layer="25" ratio="10" rot="R180"/>
+<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="73.5" y="32" smashed="yes" rot="R270">
-<attribute name="NAME" x="75.1" y="29.3" size="0.8128" layer="25" ratio="10" rot="R180"/>
+<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>
 <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"/>
@@ -2957,11 +2919,11 @@ 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="45.5" y="33" smashed="yes" rot="R90">
-<attribute name="NAME" x="44.5" y="30" size="0.8128" layer="25" ratio="10"/>
+<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>
-<element name="FB2" library="_RoweTel" package="FE0805" value="FB0805" x="42.5" y="31.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="41.2" y="32.2" size="0.8128" layer="25" ratio="10" rot="R90"/>
+<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"/>
 </element>
 <element name="FB3" library="_RoweTel" package="FE0805" value="FB0805" x="34.5" y="40" smashed="yes" rot="R270">
 <attribute name="NAME" x="31" y="39.5" size="0.8128" layer="25" ratio="10"/>
@@ -2969,8 +2931,8 @@ design rules under a new name.</description>
 <element name="FB4" library="_RoweTel" package="FE0805" value="FB0805" x="40.5" y="45.5" smashed="yes" rot="R90">
 <attribute name="NAME" x="37.25" y="44" size="0.8128" layer="25" ratio="10"/>
 </element>
-<element name="FB6" library="_RoweTel" package="FE0805" value="FB0805" x="39" y="31.5" smashed="yes" rot="R270">
-<attribute name="NAME" x="41" y="29.5" size="0.8128" layer="25" ratio="10" rot="R90"/>
+<element name="FB6" library="_RoweTel" package="FE0805" value="FB0805" x="38" y="21" smashed="yes" rot="R270">
+<attribute name="NAME" x="40" y="19" size="0.8128" layer="25" ratio="10" rot="R90"/>
 </element>
 <element name="C43" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100pF,50V" x="21" y="39.5" smashed="yes" rot="R90">
 <attribute name="NAME" x="21.25" y="37.8325" size="0.8128" layer="25" ratio="10" rot="R180"/>
@@ -2987,11 +2949,11 @@ design rules under a new name.</description>
 <element name="U8" library="_RoweTel" package="SO08" value="LM386M-1" x="49.5" y="84.25" smashed="yes">
 <attribute name="NAME" x="46" y="82.5" size="0.8128" layer="25" rot="R90"/>
 </element>
-<element name="T1" library="_RoweTel" package="SM-LP-5001" value="SM-LP-5001" x="42.25" y="10" smashed="yes" rot="R270">
-<attribute name="NAME" x="46.25" y="18.5" size="0.8128" layer="25" ratio="10"/>
+<element name="T1" library="_RoweTel" package="SM-LP-5001" value="SM-LP-5001" x="53.75" y="12" smashed="yes" rot="R270">
+<attribute name="NAME" x="51.75" y="20.5" size="0.8128" layer="25" ratio="10"/>
 </element>
-<element name="T2" library="_RoweTel" package="SM-LP-5001" value="SM-LP-5001" x="53.75" y="10" smashed="yes" rot="R270">
-<attribute name="NAME" x="48.75" y="18.5" size="0.8128" layer="25" ratio="10"/>
+<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"/>
@@ -3044,9 +3006,6 @@ design rules under a new name.</description>
 <attribute name="NAME" x="62.2325" y="76.025" size="0.8128" layer="25" font="vector" ratio="10" rot="R90"/>
 <attribute name="VALUE" x="65.2875" y="74.775" size="1" layer="27" font="vector" ratio="10" rot="R90"/>
 </element>
-<element name="CN10" library="_RoweTel" package="MJ-3523-SMT" value="MJ-3523-SMT" x="-9.5" y="64" smashed="yes" rot="MR0">
-<attribute name="NAME" x="-9.5" y="68" size="1" layer="26" ratio="10" rot="MR90"/>
-</element>
 <element name="R56" library="AA-ipc-7351-resistor" package="RESC1608X55N" value="2.2K,1%" x="44" y="76" smashed="yes" rot="R90">
 <attribute name="NAME" x="43.5" y="73.1" size="0.8128" layer="25"/>
 </element>
@@ -3187,9 +3146,6 @@ 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="CN8" library="_RoweTel" package="SJ-3524-SMT" value="SJ-3524" x="47.97" y="7" locked="yes" smashed="yes" rot="MR270">
-<attribute name="NAME" x="44.47" y="9.5" size="1" layer="26" ratio="10" rot="MR270"/>
-</element>
 <element name="C60" library="_RoweTel" package="CAP-CHEMI-HA0" value="220uF,25V" x="-10" y="48.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="CAPC1608X92N" value="3.9nF,16V" x="-11.5" y="76.5"/>
@@ -3197,15 +3153,28 @@ design rules under a new name.</description>
 <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="CN6" library="_RoweTel" package="SJ-3524-SMT" value="SJ-3524" x="13.92" y="7" locked="yes" smashed="yes" rot="MR270">
-<attribute name="NAME" x="10.42" y="9.5" size="1" layer="26" ratio="10" rot="MR270"/>
-</element>
 <element name="C63" library="_RoweTel" package="CAP-CHEMI-HA0" value="220uF,25V" x="76.5" y="66"/>
 <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"/>
 <element name="C66" library="AA-ipc-7351-capacitor" package="CAPC1608X92N" value="100nF,16V" x="86.5" y="61"/>
 <element name="SPKR1" library="_RoweTel" package="NOPACKAGE" value="SPKR" x="0.5" y="-0.5" locked="yes"/>
+<element name="CN7" library="_RoweTel" package="ST-3509" value="ST-3509" x="48.2" y="7.5" locked="yes" smashed="yes" rot="MR270">
+<attribute name="NAME" x="44.2" y="10" size="1" layer="26" ratio="10" rot="MR270"/>
+</element>
+<element name="CN6" library="_RoweTel" package="ST-3509" value="ST-3509" x="59.5" y="7.5" locked="yes" smashed="yes" rot="MR270">
+<attribute name="NAME" x="55.5" y="10" size="1" layer="26" ratio="10" rot="MR270"/>
+</element>
+<element name="CN5" library="_RoweTel" package="ST-3509" value="ST-3509" x="14.3" y="7.5" locked="yes" smashed="yes" rot="MR270">
+<attribute name="NAME" x="10.3" y="10" size="1" layer="26" ratio="10" rot="MR270"/>
+</element>
+<element name="CN8" library="_RoweTel" package="ST-3509" value="ST-3509" x="25.6" y="7.5" locked="yes" smashed="yes" rot="MR270">
+<attribute name="NAME" x="21.6" y="10" size="1" layer="26" ratio="10" rot="MR270"/>
+</element>
+<element name="CN9" library="_RoweTel" package="ST-3509" value="ST-3509" x="36.9" y="7.5" locked="yes" smashed="yes" rot="MR270">
+<attribute name="NAME" x="32.9" y="10" size="1" layer="26" ratio="10" rot="MR270"/>
+</element>
+<element name="CN10" library="_RoweTel" package="ST-3509" value="ST-3509" x="-9.5" y="63.5" rot="MR0"/>
 </elements>
 <signals>
 <signal name="N$2">
@@ -3357,7 +3326,6 @@ design rules under a new name.</description>
 <contactref element="C31" pad="2"/>
 <contactref element="C25" pad="2"/>
 <contactref element="CN3" pad="1"/>
-<contactref element="CN5" pad="1"/>
 <contactref element="C34" pad="2"/>
 <contactref element="R50" pad="2"/>
 <contactref element="R46" pad="1"/>
@@ -3403,7 +3371,6 @@ design rules under a new name.</description>
 <contactref element="C22" pad="2"/>
 <contactref element="C35" pad="2"/>
 <contactref element="C50" pad="2"/>
-<contactref element="CN10" pad="1"/>
 <contactref element="C51" pad="2"/>
 <contactref element="C52" pad="2"/>
 <contactref element="C53" pad="2"/>
@@ -3523,7 +3490,6 @@ design rules under a new name.</description>
 <contactref element="C59" pad="2"/>
 <contactref element="C62" pad="2"/>
 <contactref element="C32" pad="2"/>
-<contactref element="CN8" pad="1"/>
 <contactref element="C60" pad="2"/>
 <contactref element="C57" pad="2"/>
 <contactref element="R22" pad="2"/>
@@ -3534,6 +3500,8 @@ design rules under a new name.</description>
 <contactref element="C64" pad="2"/>
 <contactref element="C65" pad="2"/>
 <contactref element="C66" pad="2"/>
+<contactref element="CN8" pad="A"/>
+<contactref element="CN5" pad="A"/>
 <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"/>
@@ -3547,64 +3515,50 @@ design rules under a new name.</description>
 <wire x1="48.865" y1="81.65" x2="51.405" y2="81.65" width="0" layer="19" extent="1-1"/>
 <wire x1="52" y1="76.7" x2="51.405" y2="81.65" width="0" layer="19" extent="1-1"/>
 <wire x1="43.7" y1="82.46" x2="48.865" y2="81.65" width="0" layer="19" extent="1-1"/>
-<wire x1="41.3" y1="79.85" x2="43.7" y2="82.46" width="0" layer="19" extent="1-1"/>
-<wire x1="40.5" y1="85.02" x2="43.7" y2="82.46" width="0" layer="19" extent="1-1"/>
 <wire x1="37.8" y1="85.25" x2="40.5" y2="85.02" width="0" layer="19" extent="1-1"/>
 <wire x1="37.8" y1="83.25" x2="37.8" y2="85.25" width="0" layer="19" extent="1-1"/>
 <wire x1="40.25" y1="88.25" x2="40.5" y2="85.02" width="0" layer="19" extent="1-1"/>
 <wire x1="37.5" y1="90" x2="40.25" y2="88.25" width="0" layer="19" extent="1-1"/>
 <wire x1="34" y1="93.25" x2="31.9" y2="92" width="0" layer="19" extent="1-16"/>
+<wire x1="41.3" y1="79.85" x2="43.7" y2="82.46" width="0" layer="19" extent="1-1"/>
 <wire x1="41.1" y1="93.275" x2="37.5" y2="91.5" width="0" layer="19" extent="1-16"/>
 <wire x1="45" y1="93.25" x2="41.1" y2="93.275" width="0" layer="19" extent="16-16"/>
 <wire x1="45" y1="97.5" x2="45" y2="93.25" width="0" layer="19" extent="16-16"/>
 <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"/>
 <wire x1="36.2" y1="68.25" x2="36" y2="70.25" width="0" layer="19" extent="1-1"/>
 <wire x1="36.2" 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="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.2" 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="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="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="12.75" y1="58.4" x2="12.6" y2="61.7" width="0" layer="19" extent="1-1"/>
-<wire x1="9.5" y1="57.2" x2="12.75" y2="56.95" width="0" layer="19" extent="1-1"/>
-<wire x1="7.7" y1="55.5" x2="7.5" y2="57.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="6.8" y1="66.8" x2="6.75" y2="62.1" width="0" layer="19" extent="1-1"/>
-<wire x1="2.5" y1="58.75" x2="7.5" y2="57.2" 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.2" 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="7.05" y1="49.45" x2="7.7" y2="55.5" width="0" layer="19" extent="1-1"/>
-<wire x1="7.55" y1="47.25" x2="7.05" y2="49.45" width="0" layer="19" extent="1-1"/>
-<wire x1="4.5" y1="48.5" x2="7.05" y2="49.45" width="0" layer="19" extent="1-1"/>
-<wire x1="1.9" y1="49.5" x2="4.5" y2="48.5" width="0" layer="19" extent="1-1"/>
-<wire x1="12.25" y1="41.25" x2="11" y2="47" width="0" layer="19" extent="1-1"/>
-<wire x1="22" y1="46.7" x2="16" y2="47.095" width="0" layer="19" extent="1-1"/>
-<wire x1="24.5" y1="46.7" x2="22" y2="46.7" width="0" layer="19" extent="1-1"/>
-<wire x1="24.5" y1="44.3" x2="24.5" y2="46.7" width="0" layer="19" extent="1-1"/>
-<wire x1="29" y1="41.27" x2="24.5" y2="44.3" width="0" layer="19" extent="1-1"/>
-<wire x1="31.73" y1="46.5" x2="29" y2="41.27" width="0" layer="19" extent="1-1"/>
-<wire x1="14.7" y1="72.5" x2="19.2" y2="68.25" width="0" layer="19" extent="1-1"/>
-<wire x1="12" y1="76.96" x2="14.7" y2="72.5" width="0" layer="19" extent="1-1"/>
-<wire x1="50.75" y1="90.2" x2="45" y2="93.25" width="0" layer="19" extent="1-16"/>
-<wire x1="53.25" y1="91.8" x2="50.75" y2="90.2" width="0" layer="19" extent="1-1"/>
-<wire x1="57.97" y1="95.08" x2="53.25" y2="91.8" width="0" layer="19" extent="1-1"/>
-<wire x1="62.5" y1="94" x2="57.97" y2="95.08" 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="42.5" y1="58.45" x2="33.5" y2="56.7" width="0" layer="19" extent="1-1"/>
 <wire x1="44.5" y1="60.7" x2="42.5" y2="58.45" width="0" layer="19" extent="1-1"/>
 <wire x1="47.5" y1="60.7" x2="44.5" y2="60.7" width="0" layer="19" extent="1-1"/>
@@ -3616,30 +3570,27 @@ design rules under a new name.</description>
 <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.8" 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="3" y1="98" x2="12.75" y2="98.5" 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="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.5" 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="-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="-10.7" y1="76.5" x2="-6.27" y2="84.1" width="0" layer="19" extent="1-1"/>
 <wire x1="-16.2" y1="75.5" x2="-10.7" y2="76.5" width="0" layer="19" extent="1-1"/>
 <wire x1="-21.2" y1="71" x2="-16.2" y2="75.5" width="0" layer="19" extent="1-1"/>
 <wire x1="-21.2" y1="66" x2="-21.2" y2="71" width="0" layer="19" extent="1-1"/>
-<wire x1="-15.1" y1="67.6" x2="-21.2" y2="66" width="0" layer="19" extent="1-16"/>
 <wire x1="-33.5" y1="76" x2="-21.2" 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="3" y1="20.7" x2="12.25" y2="41.25" width="0" layer="19" extent="1-1"/>
-<wire x1="2.31" y1="6.76" x2="3" y2="20.7" width="0" layer="19" extent="1-1"/>
-<wire x1="15.6" y1="6.76" x2="2.31" y2="6.76" width="0" layer="19" extent="1-1"/>
-<wire x1="21.15" y1="6.21" x2="15.6" y2="6.76" width="0" layer="19" extent="1-1"/>
-<wire x1="33.85" y1="6.21" x2="21.15" y2="6.21" width="0" layer="19" extent="1-1"/>
-<wire x1="44.37" y1="2.4" x2="33.85" y2="6.21" width="0" layer="19" extent="1-16"/>
-<wire x1="55.72" y1="2.4" x2="44.37" y2="2.4" width="0" layer="19" extent="16-16"/>
-<wire x1="61.5" y1="4" x2="55.72" y2="2.4" width="0" layer="19" extent="16-16"/>
-<wire x1="39.71" y1="16.25" x2="33.85" y2="6.21" width="0" layer="19" extent="1-1"/>
-<wire x1="51.21" y1="16.25" x2="39.71" y2="16.25" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="NRST">
 <contactref element="U1" pad="14"/>
@@ -3650,7 +3601,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="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"/>
 </signal>
 <signal name="N$1">
 <contactref element="C14" pad="1"/>
@@ -3666,7 +3617,7 @@ design rules under a new name.</description>
 <contactref element="C2" pad="1"/>
 <contactref element="R14" pad="2"/>
 <contactref element="XTAL1" pad="1"/>
-<wire x1="33.5" y1="60.7" x2="33.5" y2="58.3" width="0" layer="19" extent="1-1"/>
+<wire x1="33.5" y1="58.3" x2="33.5" y2="60.7" width="0" layer="19" extent="1-1"/>
 <wire x1="30.7" y1="57.4" x2="33.5" y2="58.3" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="OSC_IN">
@@ -3766,10 +3717,6 @@ design rules under a new name.</description>
 <contactref element="D1" pad="C"/>
 <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="13.7" y1="58.4" x2="14.35" y2="59.65" width="0" layer="19" extent="1-15"/>
-<wire x1="11.8" y1="58.4" x2="10.6" y2="59.65" width="0" layer="19" extent="1-15"/>
-<wire x1="7.5" y1="58.8" x2="9.5" y2="58.8" width="0" layer="19" extent="1-1"/>
-<wire x1="5" y1="58.8" x2="7.5" y2="58.8" width="0" layer="19" extent="1-1"/>
 <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"/>
@@ -3830,7 +3777,7 @@ design rules under a new name.</description>
 <signal name="LED-ERR">
 <contactref element="R16" pad="1"/>
 <contactref element="U1" pad="62"/>
-<wire x1="29" y1="83.25" x2="13.2" y2="96.5" width="0" layer="19" extent="1-1"/>
+<wire x1="13.2" y1="96.5" x2="29" y2="83.25" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$22">
 <contactref element="R28" pad="1"/>
@@ -3931,7 +3878,7 @@ design rules under a new name.</description>
 <signal name="!CPPT!">
 <contactref element="U1" pad="57"/>
 <contactref element="LD2" pad="2"/>
-<wire x1="68.5" y1="30.5" x2="31.5" y2="83.25" width="0" layer="19" extent="1-1"/>
+<wire x1="21.5" y1="28" x2="31.5" y2="83.25" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="!TEST!">
 <contactref element="R4" pad="2"/>
@@ -4079,57 +4026,65 @@ design rules under a new name.</description>
 <signal name="N$51">
 <contactref element="CN12" pad="8"/>
 <contactref element="CN4" pad="8"/>
-<wire x1="31.945" y1="18" x2="34.49" y2="32.87" width="0" layer="19" extent="1-1"/>
+<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"/>
 </signal>
 <signal name="N$52">
 <contactref element="CN12" pad="7"/>
 <contactref element="CN4" pad="7"/>
-<wire x1="30.675" y1="18" x2="32.49" y2="32.87" width="0" layer="19" extent="1-1"/>
+<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"/>
 </signal>
 <signal name="N$53">
 <contactref element="CN12" pad="6"/>
 <contactref element="CN4" pad="6"/>
-<wire x1="29.405" y1="18" x2="30.49" y2="32.87" width="0" layer="19" extent="1-1"/>
+<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"/>
 </signal>
 <signal name="N$54">
 <contactref element="CN12" pad="5"/>
 <contactref element="CN4" pad="5"/>
-<wire x1="28.135" y1="18" x2="28.49" y2="32.87" width="0" layer="19" extent="1-1"/>
+<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"/>
 </signal>
 <signal name="N$55">
 <contactref element="CN12" pad="4"/>
 <contactref element="CN4" pad="4"/>
-<wire x1="26.865" y1="18" x2="26.49" y2="32.87" width="0" layer="19" extent="1-1"/>
+<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"/>
 </signal>
 <signal name="N$56">
 <contactref element="CN12" pad="3"/>
 <contactref element="CN4" pad="3"/>
-<wire x1="25.595" y1="18" x2="24.49" y2="32.87" width="0" layer="19" extent="1-1"/>
+<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"/>
 </signal>
 <signal name="N$57">
 <contactref element="CN12" pad="2"/>
 <contactref element="CN4" pad="2"/>
-<wire x1="24.325" y1="18" x2="22.49" y2="32.87" width="0" layer="19" extent="1-1"/>
+<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"/>
 </signal>
 <signal name="N$58">
 <contactref element="CN12" pad="1"/>
 <contactref element="CN4" pad="1"/>
-<wire x1="23.055" y1="18" x2="20.49" y2="32.87" width="0" layer="19" extent="1-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"/>
 </signal>
 <signal name="MIC">
-<contactref element="CN7" pad="10"/>
 <contactref element="CN12" pad="15"/>
-<wire x1="22.49" y1="34.87" x2="26.025" y2="15.8" width="0" layer="19" extent="16-16"/>
+<contactref element="CN7" pad="D"/>
+<wire x1="22.49" y1="23.87" x2="48.95" y2="16" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="SPKR">
 <contactref element="CN12" pad="16"/>
-<contactref element="CN6" pad="4"/>
-<wire x1="20.49" y1="34.87" x2="14.67" y2="15.8" width="0" layer="19" extent="16-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"/>
 </signal>
 <signal name="N$49">
 <contactref element="LD2" pad="1"/>
 <contactref element="R51" pad="1"/>
-<wire x1="49.7" y1="37.5" x2="68.5" y2="33.5" width="0" layer="19" extent="1-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">
@@ -4163,7 +4118,7 @@ design rules under a new name.</description>
 <signal name="N$63">
 <contactref element="T1" pad="1"/>
 <contactref element="R52" pad="3"/>
-<wire x1="44.79" y1="16.25" x2="61.54" y2="63.8" width="0" layer="19" extent="1-1"/>
+<wire x1="56.29" y1="18.25" x2="61.54" y2="63.8" 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"/>
@@ -4179,39 +4134,32 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$60">
 <contactref element="MIC1" pad="1"/>
-<contactref element="CN5" pad="10"/>
-<wire x1="60.07" y1="15.8" x2="34.27" y2="46.5" width="0" layer="19" extent="16-16"/>
+<contactref element="CN5" pad="D"/>
+<wire x1="15.05" y1="16" x2="34.27" y2="46.5" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="N$33">
 <contactref element="FB1" pad="1"/>
 <contactref element="T1" pad="6"/>
-<wire x1="44.79" y1="3.75" x2="45" y2="13.79" width="0" layer="19" extent="1-16"/>
 <contactref element="C44" pad="1"/>
-<wire x1="45" y1="13.79" x2="45.5" y2="32.025" width="0" layer="19" extent="1-1"/>
-<wire x1="23.5" y1="38.7" x2="45.5" y2="32.025" width="0" layer="19" extent="1-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"/>
 </signal>
 <signal name="N$64">
 <contactref element="FB1" pad="2"/>
-<wire x1="45.5" y1="33.975" x2="45.525" y2="34" width="0.2" layer="1"/>
-<contactref element="CN6" pad="2"/>
-<wire x1="10.32" y1="11.8" x2="45.5" y2="33.975" width="0" layer="19" extent="1-16"/>
-</signal>
-<signal name="N$72">
-<contactref element="FB2" pad="2"/>
-<contactref element="CN7" pad="2"/>
-<wire x1="21.675" y1="11.8" x2="42.5" y2="30.525" width="0" layer="19" extent="1-16"/>
+<contactref element="CN6" pad="C"/>
+<wire x1="56.05" y1="12" x2="60.5" y2="21.975" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$73">
 <contactref element="FB6" pad="2"/>
-<contactref element="CN9" pad="2"/>
-<wire x1="33.025" y1="11.8" x2="39" y2="30.525" width="0" layer="19" extent="1-16"/>
+<contactref element="CN9" pad="C"/>
+<wire x1="33.45" y1="12" x2="38" y2="20.025" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$74">
 <contactref element="FB6" pad="1"/>
 <contactref element="LD2" pad="4"/>
 <contactref element="C45" pad="1"/>
-<wire x1="39" y1="32.475" x2="78.5" y2="33.5" width="0" layer="19" extent="1-1"/>
-<wire x1="26" y1="38.7" x2="39" y2="32.475" width="0" layer="19" extent="1-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"/>
 </signal>
 <signal name="N$44">
 <contactref element="FB3" pad="1"/>
@@ -4220,15 +4168,13 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$75">
 <contactref element="FB3" pad="2"/>
-<contactref element="CN8" pad="2"/>
-<contactref element="CN8" pad="3"/>
-<wire x1="44.37" y1="11.8" x2="34.5" y2="39.025" width="0" layer="19" extent="1-16"/>
-<wire x1="51.57" y1="5.4" x2="44.37" y2="11.8" width="0" layer="19" extent="16-16"/>
+<contactref element="CN8" pad="C"/>
+<wire x1="22.15" y1="12" x2="34.5" y2="39.025" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$76">
-<contactref element="CN5" pad="2"/>
 <contactref element="FB4" pad="1"/>
-<wire x1="55.72" y1="11.8" x2="40.5" y2="44.525" width="0" layer="19" extent="1-16"/>
+<contactref element="CN5" pad="C"/>
+<wire x1="10.85" y1="12" x2="40.5" y2="44.525" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$77">
 <contactref element="CN3" pad="2"/>
@@ -4255,7 +4201,7 @@ design rules under a new name.</description>
 <signal name="N$78">
 <contactref element="R48" pad="2"/>
 <contactref element="T2" pad="6"/>
-<wire x1="56.29" y1="3.75" x2="53.7" y2="37.5" width="0" layer="19" extent="1-1"/>
+<wire x1="45.29" y1="5.75" x2="53.7" y2="37.5" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$82">
 <contactref element="R48" pad="1"/>
@@ -4265,20 +4211,19 @@ design rules under a new name.</description>
 <signal name="N$65">
 <contactref element="C38" pad="2"/>
 <contactref element="T2" pad="1"/>
-<wire x1="56.29" y1="16.25" x2="57" y2="26.29" width="0" layer="19" extent="1-16"/>
-<wire x1="57" y1="26.29" x2="62.25" y2="80" width="0" layer="19" extent="1-1"/>
+<wire x1="45.29" y1="18.25" x2="62.25" y2="80" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$79">
 <contactref element="C47" pad="2"/>
 <contactref element="FB2" pad="1"/>
 <contactref element="C43" pad="1"/>
-<wire x1="42.5" y1="32.475" x2="38.7" y2="37" width="0" layer="19" extent="1-1"/>
 <wire x1="21" y1="38.7" x2="38.7" y2="37" width="0" layer="19" extent="1-1"/>
+<wire x1="48.5" y1="21.975" x2="38.7" y2="37" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$62">
 <contactref element="J4" pad="1"/>
-<contactref element="CN8" pad="4"/>
-<wire x1="48.72" y1="15.8" x2="29" y2="38.73" width="0" layer="19" extent="16-16"/>
+<contactref element="CN8" pad="D"/>
+<wire x1="26.35" y1="16" x2="29" y2="38.73" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="N$41">
 <contactref element="R42" pad="1"/>
@@ -4317,9 +4262,9 @@ 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="CN9" pad="10"/>
 <contactref element="CN12" pad="14"/>
-<wire x1="24.49" y1="34.87" x2="37.375" y2="15.8" width="0" layer="19" extent="16-16"/>
+<contactref element="CN9" pad="D"/>
+<wire x1="37.65" y1="16" x2="24.49" y2="23.87" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="N$6">
 <contactref element="R20" pad="2"/>
@@ -4447,13 +4392,13 @@ design rules under a new name.</description>
 <wire x1="-21.2" y1="61" x2="1.34" y2="69.73" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$15">
-<contactref element="CN10" pad="2"/>
 <contactref element="R56" pad="1"/>
 <contactref element="C51" pad="1"/>
 <contactref element="R37" pad="2"/>
+<contactref element="CN10" pad="C"/>
 <wire x1="42" y1="76.8" x2="44" y2="75.2" width="0" layer="19" extent="1-1"/>
-<wire x1="-5.7" y1="67.6" x2="44" y2="75.2" width="0" layer="19" extent="1-16"/>
-<wire x1="-38.2" y1="61" x2="-5.7" y2="67.6" width="0" layer="19" extent="1-16"/>
+<wire x1="-5" y1="66.95" x2="42" y2="76.8" width="0" layer="19" extent="1-16"/>
+<wire x1="-38.2" y1="61" x2="-5" y2="66.95" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="AVDD">
 <contactref element="C22" pad="1"/>
@@ -4514,37 +4459,37 @@ design rules under a new name.</description>
 <wire x1="-40.55" y1="76" x2="-10" y2="52.15" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RF_MIC">
-<contactref element="CN7" pad="1"/>
 <contactref element="T2" pad="4"/>
 <contactref element="R49" pad="1"/>
 <contactref element="C43" pad="2"/>
 <contactref element="CN12" pad="11"/>
 <contactref element="CN12" pad="12"/>
-<wire x1="51.21" y1="3.75" x2="57.7" y2="37.5" width="0" layer="19" extent="1-1"/>
-<wire x1="21.675" y1="2.4" x2="51.21" y2="3.75" width="0" layer="19" extent="1-16"/>
-<wire x1="30.49" y1="34.87" x2="57.7" y2="37.5" width="0" layer="19" extent="1-1"/>
-<wire x1="28.49" y1="34.87" x2="30.49" y2="34.87" width="0" layer="19" extent="1-1"/>
-<wire x1="21" y1="40.3" x2="28.49" y2="34.87" width="0" layer="19" extent="1-1"/>
+<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"/>
 </signal>
 <signal name="RF_SPKR">
 <contactref element="C44" pad="2"/>
 <contactref element="T1" pad="4"/>
 <contactref element="CN12" pad="9"/>
 <contactref element="CN12" pad="10"/>
-<contactref element="CN6" pad="1"/>
-<wire x1="32.49" y1="34.87" x2="34.49" y2="34.87" width="0" layer="19" extent="1-1"/>
-<wire x1="23.5" y1="40.3" x2="32.49" y2="34.87" width="0" layer="19" extent="1-1"/>
-<wire x1="39.71" y1="3.75" x2="34.49" y2="34.87" width="0" layer="19" extent="1-1"/>
-<wire x1="10.32" y1="2.4" x2="39.71" y2="3.75" width="0" layer="19" extent="1-16"/>
+<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"/>
 </signal>
 <signal name="RF_PTT">
 <contactref element="C45" pad="2"/>
-<contactref element="CN9" pad="1"/>
 <contactref element="CN12" pad="13"/>
 <contactref element="LD2" pad="3"/>
-<wire x1="26.49" y1="34.87" x2="78.5" y2="30.5" width="0" layer="19" extent="1-1"/>
-<wire x1="26" y1="40.3" x2="26.49" y2="34.87" width="0" layer="19" extent="1-1"/>
-<wire x1="33.025" y1="2.4" x2="26" y2="40.3" width="0" layer="19" extent="1-16"/>
+<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"/>
 </signal>
 <signal name="N$32">
 <contactref element="U6" pad="3"/>
@@ -4603,6 +4548,11 @@ design rules under a new name.</description>
 <wire x1="-29.05" y1="75" x2="1.9" y2="51.1" 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"/>
 </signal>
+<signal name="N$70">
+<contactref element="FB2" pad="2"/>
+<contactref element="CN7" pad="C"/>
+<wire x1="44.75" y1="12" x2="48.5" y2="20.025" width="0" layer="19" extent="1-16"/>
+</signal>
 </signals>
 <errors>
 <approved hash="18,29,336583616d430529"/>
diff --git a/smartmic/SM1000-C/SM1000-C.sch b/smartmic/SM1000-C/SM1000-C.sch
index d63c95d0..0840e5ee 100644
--- a/smartmic/SM1000-C/SM1000-C.sch
+++ b/smartmic/SM1000-C/SM1000-C.sch
@@ -249,33 +249,6 @@
 </library>
 <library name="_RoweTel">
 <packages>
-<package name="MJ-3523-SMT">
-<smd name="1" x="5.6" y="3.6" dx="2.2" dy="3" layer="1" rot="R180"/>
-<smd name="2" x="-3.8" y="3.6" dx="2.8" dy="3" layer="1"/>
-<smd name="10" x="-7.8" y="-0.75" dx="2.8" dy="3" layer="1" rot="R90"/>
-<wire x1="-8" y1="3" x2="-6" y2="3" width="0.15" layer="21"/>
-<wire x1="-8" y1="1.5" x2="-8" y2="3" width="0.15" layer="21"/>
-<wire x1="-8" y1="-3" x2="8" y2="-3" width="0.15" layer="21"/>
-<wire x1="-8" y1="-3" x2="-8" y2="-2.5" width="0.15" layer="21"/>
-<wire x1="8" y1="-3" x2="8" y2="3" width="0.15" layer="21"/>
-<wire x1="8" y1="3" x2="7.5" y2="3" width="0.15" layer="21"/>
-<wire x1="-1.5" y1="3" x2="3.5" y2="3" width="0.15" layer="21"/>
-<wire x1="8" y1="5" x2="8" y2="-5.5" width="0.15" layer="51"/>
-<text x="10" y="-4.5" size="1" layer="51" ratio="10" rot="R90">BOARD EDGE</text>
-<text x="-2.5" y="7" size="1" layer="25" ratio="10">&gt;NAME</text>
-<wire x1="-5.9" y1="5.7" x2="-1.8" y2="5.7" width="0" layer="39"/>
-<wire x1="-1.8" y1="5.7" x2="-1.8" y2="3" width="0" layer="39"/>
-<wire x1="-1.8" y1="3" x2="3.8" y2="3" width="0" layer="39"/>
-<wire x1="3.8" y1="3" x2="3.8" y2="5.7" width="0" layer="39"/>
-<wire x1="3.8" y1="5.7" x2="7.4" y2="5.7" width="0" layer="39"/>
-<wire x1="7.4" y1="5.7" x2="7.4" y2="-3" width="0" layer="39"/>
-<wire x1="7.4" y1="-3" x2="-9.9" y2="-3" width="0" layer="39"/>
-<wire x1="-9.9" y1="-3" x2="-9.9" y2="1.2" width="0" layer="39"/>
-<wire x1="-9.9" y1="1.2" x2="-5.9" y2="1.2" width="0" layer="39"/>
-<wire x1="-5.9" y1="1.2" x2="-5.9" y2="5.7" width="0" layer="39"/>
-<hole x="-2.5" y="0" drill="1.7"/>
-<hole x="4.5" y="0" drill="1.7"/>
-</package>
 <package name="CAP-CHEMI-HA0">
 <smd name="1" x="0" y="3.65" dx="4.2" dy="3.5" layer="1" rot="R90"/>
 <smd name="2" x="0" y="-3.65" dx="4.2" dy="3.5" layer="1" rot="R90"/>
@@ -735,69 +708,43 @@ Source: http://cache.national.com/ds/LM/LM386.pdf</description>
 <wire x1="4" y1="-4" x2="-4" y2="-4" width="0" layer="39"/>
 <wire x1="-4" y1="-4" x2="-4" y2="4" width="0" layer="39"/>
 </package>
-<package name="SJ-3524-SMT">
-<smd name="1" x="4.6" y="3.6" dx="2.2" dy="3" layer="1" rot="R180"/>
-<smd name="2" x="-4.8" y="3.6" dx="2.8" dy="3" layer="1"/>
-<smd name="4" x="-8.8" y="-0.75" dx="2.8" dy="3" layer="1" rot="R90"/>
-<wire x1="-9" y1="3" x2="-7" y2="3" width="0.15" layer="21"/>
-<wire x1="-9" y1="1.5" x2="-9" y2="3" width="0.15" layer="21"/>
-<wire x1="-9" y1="-3" x2="-9" y2="-2.5" width="0.15" layer="21"/>
-<wire x1="7" y1="-3" x2="7" y2="3" width="0.15" layer="21"/>
-<wire x1="7" y1="3" x2="6.5" y2="3" width="0.15" layer="21"/>
-<wire x1="-2.5" y1="3" x2="2.5" y2="3" width="0.15" layer="21"/>
-<wire x1="7" y1="5" x2="7" y2="-5.5" width="0.15" layer="51"/>
-<text x="9" y="-4.5" size="1" layer="51" ratio="10" rot="R90">BOARD EDGE</text>
-<text x="-3.5" y="7" size="1" layer="25" ratio="10">&gt;NAME</text>
-<wire x1="-6.9" y1="5.7" x2="-2.8" y2="5.7" width="0" layer="39"/>
-<wire x1="-2.8" y1="5.7" x2="-2.8" y2="3" width="0" layer="39"/>
-<wire x1="-2.8" y1="3" x2="2.8" y2="3" width="0" layer="39"/>
-<wire x1="2.8" y1="3" x2="2.8" y2="5.7" width="0" layer="39"/>
-<wire x1="2.8" y1="5.7" x2="6.4" y2="5.7" width="0" layer="39"/>
-<wire x1="6.4" y1="5.7" x2="6.4" y2="-2.95" width="0" layer="39"/>
-<wire x1="6.4" y1="-2.95" x2="6.4" y2="-3" width="0" layer="39"/>
-<wire x1="-10.9" y1="-3" x2="-10.9" y2="1.2" width="0" layer="39"/>
-<wire x1="-10.9" y1="1.2" x2="-6.9" y2="1.2" width="0" layer="39"/>
-<wire x1="-6.9" y1="1.2" x2="-6.9" y2="5.7" width="0" layer="39"/>
-<hole x="-3.5" y="0" drill="1.7"/>
-<hole x="3.5" y="0" drill="1.7"/>
-<smd name="3" x="1.6" y="-3.6" dx="2.2" dy="3" layer="1" rot="R180"/>
-<wire x1="-9" y1="-3" x2="0" y2="-3" width="0.15" layer="21"/>
-<wire x1="3" y1="-3" x2="7" y2="-3" width="0.15" layer="21"/>
-<wire x1="-10.9" y1="-3" x2="-0.1" y2="-3" width="0" layer="39"/>
-<wire x1="-0.1" y1="-3" x2="-0.1" y2="-5.7" width="0" layer="39"/>
-<wire x1="-0.1" y1="-5.7" x2="3.3" y2="-5.7" width="0" layer="39"/>
-<wire x1="3.3" y1="-5.7" x2="3.3" y2="-3" width="0" layer="39"/>
-<wire x1="3.3" y1="-3" x2="6.4" y2="-3" width="0" layer="39"/>
-<wire x1="6.4" y1="-3" x2="6.4" y2="-2.95" width="0" layer="39"/>
-</package>
 <package name="NOPACKAGE">
 </package>
+<package name="ST-3509">
+<smd name="C" x="-4.5" y="3.45" dx="2.5" dy="2" layer="1" rot="R270"/>
+<smd name="A" x="4.75" y="3.45" dx="2.5" dy="2" layer="1" rot="R270"/>
+<smd name="B" x="2.95" y="-3.45" dx="2.5" dy="2" layer="1" rot="R270"/>
+<smd name="D" x="-8.5" y="-0.75" dx="2.5" dy="2" layer="1" rot="R180"/>
+<smd name="F" x="5.65" y="-3.45" dx="2.5" dy="1.5" layer="1" rot="R90"/>
+<wire x1="7.25" y1="3" x2="7.25" y2="-3" width="0.15" layer="21"/>
+<hole x="3.75" y="0" drill="1.8"/>
+<hole x="-3.25" y="0" drill="1.8"/>
+<wire x1="-7.05" y1="3" x2="-7.05" y2="-3" width="0.15" layer="21"/>
+<wire x1="7.25" y1="3" x2="6.25" y2="3" width="0.15" layer="21"/>
+<wire x1="7.25" y1="-3" x2="6.75" y2="-3" width="0.15" layer="21"/>
+<wire x1="1.25" y1="-3" x2="-7.05" y2="-3" width="0.15" layer="21"/>
+<wire x1="-6.25" y1="3" x2="-7.05" y2="3" width="0.15" layer="21"/>
+<wire x1="3.25" y1="3" x2="-2.75" y2="3" width="0.15" layer="21"/>
+<text x="-2.5" y="4" size="1" layer="25" ratio="10">&gt;NAME</text>
+<wire x1="6.5" y1="-5" x2="6.8" y2="-5" width="0" layer="39"/>
+<wire x1="6.8" y1="-5" x2="6.8" y2="-1.8" width="0" layer="39"/>
+<wire x1="6.8" y1="-1.8" x2="6.2" y2="-1.8" width="0" layer="39"/>
+<wire x1="6.2" y1="-1.8" x2="6.2" y2="5" width="0" layer="39"/>
+<wire x1="6.2" y1="5" x2="3.3" y2="5" width="0" layer="39"/>
+<wire x1="3.3" y1="5" x2="3.3" y2="3.5" width="0" layer="39"/>
+<wire x1="3.3" y1="3.5" x2="-3.1" y2="3.5" width="0" layer="39"/>
+<wire x1="-3.1" y1="3.5" x2="-3.1" y2="5" width="0" layer="39"/>
+<wire x1="-3.1" y1="5" x2="-5.9" y2="5" width="0" layer="39"/>
+<wire x1="-5.9" y1="5" x2="-5.9" y2="3.5" width="0" layer="39"/>
+<wire x1="-5.9" y1="3.5" x2="-5.9" y2="0.6" width="0" layer="39"/>
+<wire x1="-5.9" y1="0.6" x2="-10.1" y2="0.6" width="0" layer="39"/>
+<wire x1="-10.1" y1="0.6" x2="-10.1" y2="-2.1" width="0" layer="39"/>
+<wire x1="-10.1" y1="-2.1" x2="1.6" y2="-2.1" width="0" layer="39"/>
+<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>
 </packages>
 <symbols>
-<symbol name="MJ-3523-SMT">
-<pin name="1" x="7.62" y="7.62" visible="pad" length="middle" rot="R180"/>
-<pin name="10" x="7.62" y="2.54" visible="pad" length="middle" rot="R180"/>
-<pin name="2" x="7.62" y="-2.54" visible="pad" length="middle" rot="R180"/>
-<wire x1="2.54" y1="2.54" x2="-7.62" y2="2.54" width="0.1524" layer="94"/>
-<wire x1="-7.62" y1="2.54" x2="-7.62" y2="-2.032" width="0.1524" layer="94"/>
-<polygon width="0.1524" layer="94">
-<vertex x="-7.62" y="-2.54"/>
-<vertex x="-8.128" y="-0.254"/>
-<vertex x="-7.112" y="-0.254"/>
-</polygon>
-<wire x1="2.54" y1="-2.54" x2="-10.16" y2="-2.54" width="0.1524" layer="94"/>
-<wire x1="-10.16" y1="-2.54" x2="-12.7" y2="0" width="0.1524" layer="94"/>
-<wire x1="-12.7" y1="0" x2="-15.24" y2="-2.54" width="0.1524" layer="94"/>
-<wire x1="2.54" y1="7.62" x2="-17.78" y2="7.62" width="0.1524" layer="94"/>
-<wire x1="-17.78" y1="7.62" x2="-17.78" y2="2.54" width="0.1524" layer="94"/>
-<wire x1="-17.78" y1="2.54" x2="-19.05" y2="2.54" width="0.1524" layer="94"/>
-<wire x1="-19.05" y1="2.54" x2="-19.05" y2="-3.302" width="0.1524" layer="94"/>
-<wire x1="-19.05" y1="-3.302" x2="-16.51" y2="-3.302" width="0.1524" layer="94"/>
-<wire x1="-16.51" y1="-3.302" x2="-16.51" y2="2.54" width="0.1524" layer="94"/>
-<wire x1="-16.51" y1="2.54" x2="-17.78" y2="2.54" width="0.1524" layer="94"/>
-<text x="-15.24" y="10.16" size="1.778" layer="95" ratio="10">&gt;NAME </text>
-<text x="-15.24" y="-7.62" size="1.778" layer="95" ratio="10">&gt;VALUE</text>
-</symbol>
 <symbol name="CAP-POL">
 <wire x1="0" y1="-1.016" x2="0" y2="-2.54" width="0.1524" layer="94"/>
 <wire x1="0" y1="-1" x2="2.4892" y2="-1.8542" width="0.254" layer="94" curve="-37.878202" cap="flat"/>
@@ -1237,58 +1184,49 @@ Source: http://cache.national.com/ds/LM/LM386.pdf</description>
 <pin name="-" x="-5.08" y="0" visible="off" length="short" direction="pas"/>
 <pin name="+" x="5.08" y="0" visible="off" length="short" direction="pas" rot="R180"/>
 </symbol>
-<symbol name="SJ-3524-SMT">
-<pin name="1" x="5.08" y="10.16" visible="pad" length="middle" rot="R180"/>
-<pin name="3" x="5.08" y="5.08" visible="pad" length="middle" rot="R180"/>
-<pin name="2" x="5.08" y="-5.08" visible="pad" length="middle" rot="R180"/>
-<wire x1="0" y1="-5.08" x2="-10.16" y2="-5.08" width="0.1524" layer="94"/>
-<wire x1="-10.16" y1="-5.08" x2="-12.7" y2="-2.54" width="0.1524" layer="94"/>
-<wire x1="-12.7" y1="-2.54" x2="-15.24" y2="-5.08" width="0.1524" layer="94"/>
-<wire x1="0" y1="10.16" x2="-20.32" y2="10.16" width="0.1524" layer="94"/>
-<wire x1="-20.32" y1="10.16" x2="-20.32" y2="3.81" width="0.1524" layer="94"/>
-<wire x1="-20.32" y1="3.81" x2="-21.59" y2="3.81" width="0.1524" layer="94"/>
-<wire x1="-21.59" y1="3.81" x2="-21.59" y2="-3.81" width="0.1524" layer="94"/>
-<wire x1="-21.59" y1="-3.81" x2="-19.05" y2="-3.81" width="0.1524" layer="94"/>
-<wire x1="-19.05" y1="-3.81" x2="-19.05" y2="3.81" width="0.1524" layer="94"/>
-<wire x1="-19.05" y1="3.81" x2="-20.32" y2="3.81" width="0.1524" layer="94"/>
-<text x="-17.78" y="12.7" size="1.778" layer="95" ratio="10">&gt;NAME </text>
-<text x="-17.78" y="-10.16" size="1.778" layer="95" ratio="10">&gt;VALUE</text>
-<wire x1="-12.7" y1="5.08" x2="-10.16" y2="2.54" width="0.1524" layer="94"/>
-<wire x1="-10.16" y1="2.54" x2="-7.62" y2="5.08" width="0.1524" layer="94"/>
-<wire x1="-7.62" y1="5.08" x2="0" y2="5.08" width="0.1524" layer="94"/>
-<wire x1="0" y1="0" x2="-5.08" y2="0" width="0.1524" layer="94"/>
-<wire x1="-5.08" y1="0" x2="-5.08" y2="-2.54" width="0.1524" layer="94"/>
-<polygon width="0.1524" layer="94">
-<vertex x="-4.318" y="-2.54"/>
-<vertex x="-5.842" y="-2.54"/>
-<vertex x="-5.08" y="-5.08"/>
-</polygon>
-<pin name="4" x="5.08" y="0" visible="pad" length="middle" rot="R180"/>
-</symbol>
 <symbol name="SPKR,SM1000">
 <text x="0" y="5.08" size="1.4224" layer="95" ratio="10">&gt;NAME</text>
 <text x="0" y="2.54" size="1.4224" layer="95" ratio="10">&gt;VALUE</text>
 <text x="0" y="0" size="1.4224" layer="94" ratio="10">SPEAKER, SM1000</text>
 </symbol>
+<symbol name="ST-3509">
+<wire x1="-21.59" y1="-5.08" x2="-24.13" y2="-5.08" width="0.1524" layer="94"/>
+<wire x1="-24.13" y1="-5.08" x2="-24.13" y2="2.54" width="0.1524" layer="94"/>
+<wire x1="-24.13" y1="2.54" x2="-22.86" y2="2.54" width="0.1524" layer="94"/>
+<wire x1="-22.86" y1="2.54" x2="-21.59" y2="2.54" width="0.1524" layer="94"/>
+<wire x1="-21.59" y1="2.54" x2="-21.59" y2="-5.08" width="0.1524" layer="94"/>
+<wire x1="-16.51" y1="-7.62" x2="-15.24" y2="-5.08" width="0.1524" layer="94"/>
+<wire x1="-15.24" y1="-5.08" x2="-13.97" y2="-7.62" width="0.1524" layer="94"/>
+<wire x1="-19.05" y1="5.08" x2="-17.78" y2="2.54" width="0.1524" layer="94"/>
+<wire x1="-17.78" y1="2.54" x2="-16.51" y2="5.08" width="0.1524" layer="94"/>
+<wire x1="-13.97" y1="-7.62" x2="0" y2="-7.62" width="0.1524" layer="94"/>
+<wire x1="-16.51" y1="5.08" x2="0" y2="5.08" width="0.1524" layer="94"/>
+<polygon width="0.1524" layer="94">
+<vertex x="-10.16" y="5.08"/>
+<vertex x="-11.43" y="2.54"/>
+<vertex x="-8.89" y="2.54"/>
+</polygon>
+<polygon width="0.1524" layer="94">
+<vertex x="-11.43" y="-5.08"/>
+<vertex x="-8.89" y="-5.08"/>
+<vertex x="-10.16" y="-7.62"/>
+</polygon>
+<wire x1="-10.16" y1="2.54" x2="-10.16" y2="0" width="0.1524" layer="94"/>
+<wire x1="-10.16" y1="0" x2="0" y2="0" width="0.1524" layer="94"/>
+<wire x1="-10.16" y1="-5.08" x2="-10.16" y2="-2.54" width="0.1524" layer="94"/>
+<wire x1="-10.16" y1="-2.54" x2="0" y2="-2.54" width="0.1524" layer="94"/>
+<wire x1="-22.86" y1="2.54" x2="-22.86" y2="7.62" width="0.1524" layer="94"/>
+<wire x1="-22.86" y1="7.62" x2="0" y2="7.62" width="0.1524" layer="94"/>
+<pin name="C" x="5.08" y="-7.62" visible="pad" length="middle" rot="R180"/>
+<pin name="D" x="5.08" y="-2.54" visible="pad" length="middle" rot="R180"/>
+<pin name="E" x="5.08" y="0" visible="pad" length="middle" rot="R180"/>
+<pin name="B" x="5.08" y="5.08" visible="pad" length="middle" rot="R180"/>
+<pin name="A" x="5.08" y="7.62" visible="pad" length="middle" rot="R180"/>
+<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>
 </symbols>
 <devicesets>
-<deviceset name="MJ-3523-SMT" prefix="CN">
-<gates>
-<gate name="G$1" symbol="MJ-3523-SMT" x="5.08" y="-2.54"/>
-</gates>
-<devices>
-<device name="" package="MJ-3523-SMT">
-<connects>
-<connect gate="G$1" pin="1" pad="1"/>
-<connect gate="G$1" pin="10" pad="10"/>
-<connect gate="G$1" pin="2" pad="2"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
 <deviceset name="CAP-CHEMI-MVE-HA0" prefix="C">
 <gates>
 <gate name="G$1" symbol="CAP-POL" x="0" y="0"/>
@@ -1692,30 +1630,31 @@ Source: http://cache.national.com/ds/LM/LM386.pdf</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="SJ-3524" prefix="CN">
+<deviceset name="SPKR" prefix="SPKR">
 <gates>
-<gate name="G$1" symbol="SJ-3524-SMT" x="2.54" y="-2.54"/>
+<gate name="G$1" symbol="SPKR,SM1000" x="0" y="0"/>
 </gates>
 <devices>
-<device name="" package="SJ-3524-SMT">
-<connects>
-<connect gate="G$1" pin="1" pad="1"/>
-<connect gate="G$1" pin="2" pad="2"/>
-<connect gate="G$1" pin="3" pad="3"/>
-<connect gate="G$1" pin="4" pad="4"/>
-</connects>
+<device name="" package="NOPACKAGE">
 <technologies>
 <technology name=""/>
 </technologies>
 </device>
 </devices>
 </deviceset>
-<deviceset name="SPKR" prefix="SPKR">
+<deviceset name="ST-3509" prefix="CN">
 <gates>
-<gate name="G$1" symbol="SPKR,SM1000" x="0" y="0"/>
+<gate name="G$1" symbol="ST-3509" x="0" y="0"/>
 </gates>
 <devices>
-<device name="" package="NOPACKAGE">
+<device name="" package="ST-3509">
+<connects>
+<connect gate="G$1" pin="A" pad="A"/>
+<connect gate="G$1" pin="B" pad="B"/>
+<connect gate="G$1" pin="C" pad="C"/>
+<connect gate="G$1" pin="D" pad="D"/>
+<connect gate="G$1" pin="E" pad="F"/>
+</connects>
 <technologies>
 <technology name=""/>
 </technologies>
@@ -3999,7 +3938,6 @@ http://www.weartronics.com/</description>
 </classes>
 <parts>
 <part name="U4" library="AA-IC" deviceset="EMIF02-USB03F2" device=""/>
-<part name="CN5" library="_RoweTel" deviceset="MJ-3523-SMT" device=""/>
 <part name="C39" library="_RoweTel" deviceset="CAP-CHEMI-MVE-HA0" device="" value="220uF,25V"/>
 <part name="C24" library="AA-ipc-7351-capacitor" deviceset="CAPACITOR_" device="0603" value="1uF,16V"/>
 <part name="V3" library="A-SUPPLY2" deviceset="GND" device=""/>
@@ -4117,8 +4055,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="CN9" library="_RoweTel" deviceset="MJ-3523-SMT" device=""/>
-<part name="CN7" library="_RoweTel" deviceset="MJ-3523-SMT" 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%"/>
@@ -4196,7 +4132,6 @@ http://www.weartronics.com/</description>
 <part name="V60" library="A-SUPPLY2" deviceset="GND" device=""/>
 <part name="C50" library="AA-ipc-7351-capacitor" deviceset="CAPACITOR_" device="0603" value="2.2uF,16V"/>
 <part name="V107" library="A-SUPPLY2" deviceset="GND" device=""/>
-<part name="CN10" library="_RoweTel" deviceset="MJ-3523-SMT" device=""/>
 <part name="R56" library="AA-ipc-7351-resistor" deviceset="RESISTOR_" device="0603" value="2.2K,1%"/>
 <part name="V108" library="A-SUPPLY2" deviceset="VDD" device=""/>
 <part name="V109" library="A-SUPPLY2" deviceset="GND" device=""/>
@@ -4299,7 +4234,6 @@ http://www.weartronics.com/</description>
 <part name="V129" library="A-SUPPLY2" deviceset="GND" device=""/>
 <part name="R32" library="AA-ipc-7351-resistor" deviceset="RESISTOR_" device="0603" value="100,1%"/>
 <part name="C32" library="_RoweTel" deviceset="NICHICON-WX-6.3" device="" value="100uF,6.3V,EL"/>
-<part name="CN8" library="_RoweTel" deviceset="SJ-3524" device=""/>
 <part name="C60" library="_RoweTel" deviceset="CAP-CHEMI-MVE-HA0" device="" value="220uF,25V"/>
 <part name="V130" library="A-SUPPLY2" deviceset="GND" device=""/>
 <part name="R39" library="AA-ipc-7351-resistor" deviceset="RESISTOR_" device="1206" value="4.7,0.5W,1206"/>
@@ -4330,7 +4264,6 @@ http://www.weartronics.com/</description>
 <part name="C61" library="AA-ipc-7351-capacitor" deviceset="CAPACITOR_" device="0603" value="100nF,16V"/>
 <part name="V135" library="A-SUPPLY2" deviceset="GND" device=""/>
 <part name="R9" library="AA-ipc-7351-resistor" deviceset="RESISTOR_" device="0603" value="1.5K,1%"/>
-<part name="CN6" library="_RoweTel" deviceset="SJ-3524" device=""/>
 <part name="C63" library="_RoweTel" deviceset="CAP-CHEMI-MVE-HA0" device="" value="220uF,25V"/>
 <part name="V73" library="A-SUPPLY2" deviceset="GND" device=""/>
 <part name="FB8" library="_RoweTel" deviceset="FB0805" device=""/>
@@ -4343,6 +4276,12 @@ http://www.weartronics.com/</description>
 <part name="V139" library="A-SUPPLY2" deviceset="VDD" device=""/>
 <part name="V140" library="A-SUPPLY2" deviceset="AVDD" device=""/>
 <part name="SPKR1" library="_RoweTel" deviceset="SPKR" device=""/>
+<part name="CN7" library="_RoweTel" deviceset="ST-3509" device=""/>
+<part name="CN6" library="_RoweTel" deviceset="ST-3509" device=""/>
+<part name="CN5" library="_RoweTel" deviceset="ST-3509" device=""/>
+<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=""/>
 </parts>
 <sheets>
 <sheet>
@@ -6009,14 +5948,14 @@ http://www.weartronics.com/</description>
 <sheet>
 <plain>
 <text x="330.2" y="152.4" size="1.778" layer="94" ratio="10">SPKR</text>
-<text x="330.2" y="106.68" size="1.778" layer="94" ratio="10">MIC</text>
+<text x="330.2" y="111.76" size="1.778" layer="94" ratio="10">MIC</text>
 <wire x1="342.9" y1="106.68" x2="353.06" y2="106.68" width="0.1524" layer="94"/>
 <wire x1="353.06" y1="106.68" x2="350.52" y2="107.442" width="0.1524" layer="94"/>
 <wire x1="353.06" y1="106.68" x2="350.52" y2="105.918" width="0.1524" layer="94"/>
 <wire x1="342.9" y1="152.4" x2="353.06" y2="152.4" width="0.1524" layer="94"/>
 <wire x1="342.9" y1="152.4" x2="345.44" y2="153.162" width="0.1524" layer="94"/>
 <wire x1="342.9" y1="152.4" x2="345.44" y2="151.638" width="0.1524" layer="94"/>
-<text x="355.6" y="106.68" size="1.778" layer="94" ratio="10">RIG</text>
+<text x="355.6" y="111.76" size="1.778" layer="94" ratio="10">RIG</text>
 <text x="355.6" y="152.4" size="1.778" layer="94" ratio="10">RIG</text>
 <text x="116.84" y="63.5" size="1.778" layer="94" ratio="10">SPEAKER OUT</text>
 <text x="335.28" y="71.12" size="1.778" layer="94" ratio="10">PTT</text>
@@ -6025,7 +5964,7 @@ http://www.weartronics.com/</description>
 <wire x1="353.06" y1="71.12" x2="350.52" y2="71.882" width="0.1524" layer="94"/>
 <wire x1="353.06" y1="71.12" x2="350.52" y2="70.358" width="0.1524" layer="94"/>
 <text x="355.6" y="71.12" size="1.778" layer="94" ratio="10">RIG</text>
-<text x="15.24" y="111.76" size="1.778" layer="94" ratio="10">EXT MIC INPUT</text>
+<text x="12.7" y="104.14" size="1.778" layer="94" ratio="10">EXT MIC INPUT</text>
 <text x="22.86" y="231.14" size="2.54" layer="94" ratio="10">EXTERNAL POWER</text>
 <text x="210.82" y="269.24" size="2.54" layer="94" ratio="10">12 - 15VDC -&gt; 5.0VDC</text>
 <wire x1="269.24" y1="200.66" x2="177.8" y2="200.66" width="0.1524" layer="94" style="longdash"/>
@@ -6074,10 +6013,6 @@ http://www.weartronics.com/</description>
 <text x="210.82" y="238.76" size="1.4224" layer="94" ratio="10" rot="R180">DNL</text>
 </plain>
 <instances>
-<instance part="CN5" gate="G$1" x="30.48" y="129.54" smashed="yes" rot="MR180">
-<attribute name="NAME" x="15.24" y="119.38" size="1.778" layer="95" ratio="10" rot="MR180"/>
-<attribute name="VALUE" x="15.24" y="137.16" size="1.778" layer="95" ratio="10" rot="MR180"/>
-</instance>
 <instance part="C39" gate="G$1" x="91.44" y="55.88" smashed="yes" rot="R90">
 <attribute name="NAME" x="88.9" y="60.96" size="1.4224" layer="95" ratio="10"/>
 <attribute name="VALUE" x="93.98" y="60.96" size="1.4224" layer="96" ratio="10"/>
@@ -6149,8 +6084,8 @@ http://www.weartronics.com/</description>
 <instance part="V55" gate="GND" x="58.42" y="160.02" smashed="yes">
 <attribute name="VALUE" x="55.88" y="156.718" size="1.4224" layer="96" ratio="9"/>
 </instance>
-<instance part="V56" gate="GND" x="45.72" y="116.84" smashed="yes">
-<attribute name="VALUE" x="43.18" y="113.538" size="1.4224" layer="96" ratio="9"/>
+<instance part="V56" gate="GND" x="45.72" y="111.76" smashed="yes">
+<attribute name="VALUE" x="43.18" y="108.458" size="1.4224" layer="96" ratio="9"/>
 </instance>
 <instance part="C34" gate="G$1" x="76.2" y="124.46" smashed="yes" rot="R270">
 <attribute name="NAME" x="78.74" y="119.38" size="1.4224" layer="95" ratio="9"/>
@@ -6222,14 +6157,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="CN9" gate="G$1" x="330.2" y="60.96" smashed="yes" rot="R180">
-<attribute name="NAME" x="345.44" y="50.8" size="1.778" layer="95" ratio="10" rot="R180"/>
-<attribute name="VALUE" x="345.44" y="68.58" size="1.778" layer="95" ratio="10" rot="R180"/>
-</instance>
-<instance part="CN7" gate="G$1" x="330.2" y="96.52" smashed="yes" rot="R180">
-<attribute name="NAME" x="327.66" y="101.6" size="1.778" layer="95" ratio="10"/>
-<attribute name="VALUE" x="335.28" y="101.6" size="1.778" layer="95" ratio="10"/>
-</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"/>
@@ -6305,8 +6232,8 @@ http://www.weartronics.com/</description>
 <attribute name="VALUE" x="279.4" y="78.74" size="1.4224" layer="96" ratio="9"/>
 </instance>
 <instance part="C36" gate="G$1" x="251.46" y="142.24" smashed="yes" rot="R90">
-<attribute name="NAME" x="248.92" y="149.86" size="1.4224" layer="95" ratio="10"/>
-<attribute name="VALUE" x="248.92" y="147.32" size="1.4224" layer="96" ratio="10"/>
+<attribute name="NAME" x="243.84" y="149.86" size="1.4224" layer="95" ratio="10"/>
+<attribute name="VALUE" x="243.84" y="147.32" size="1.4224" layer="96" ratio="10"/>
 </instance>
 <instance part="B-FRAME3" gate="G$1" x="-2.54" y="0" smashed="yes"/>
 <instance part="B-FRAME3" gate="G$2" x="327.66" y="0" smashed="yes">
@@ -6478,10 +6405,6 @@ http://www.weartronics.com/</description>
 <instance part="V107" gate="GND" x="205.74" y="162.56" smashed="yes">
 <attribute name="VALUE" x="203.2" y="159.258" size="1.4224" layer="96" ratio="9"/>
 </instance>
-<instance part="CN10" gate="G$1" x="304.8" y="233.68" smashed="yes" rot="MR180">
-<attribute name="NAME" x="289.56" y="223.52" size="1.4224" layer="95" ratio="10" rot="MR180"/>
-<attribute name="VALUE" x="289.56" y="241.3" size="1.4224" layer="95" ratio="10" rot="MR180"/>
-</instance>
 <instance part="R56" gate="G$1" x="327.66" y="236.22" smashed="yes">
 <attribute name="NAME" x="325.12" y="241.3" size="1.4224" layer="95" ratio="9"/>
 <attribute name="VALUE" x="322.58" y="238.76" size="1.4224" layer="96" ratio="9"/>
@@ -6489,8 +6412,8 @@ http://www.weartronics.com/</description>
 <instance part="V108" gate="G$1" x="320.04" y="254" smashed="yes">
 <attribute name="VALUE" x="317.5" y="257.048" size="1.4224" layer="95" ratio="9"/>
 </instance>
-<instance part="V109" gate="GND" x="314.96" y="220.98" smashed="yes">
-<attribute name="VALUE" x="312.42" y="217.678" size="1.4224" layer="96" ratio="9"/>
+<instance part="V109" gate="GND" x="314.96" y="215.9" smashed="yes">
+<attribute name="VALUE" x="312.42" y="212.598" size="1.4224" layer="96" ratio="9"/>
 </instance>
 <instance part="C51" gate="G$1" x="320.04" y="228.6" smashed="yes" rot="R270">
 <attribute name="NAME" x="322.58" y="223.52" size="1.4224" layer="95" ratio="9"/>
@@ -6584,7 +6507,6 @@ http://www.weartronics.com/</description>
 <attribute name="NAME" x="86.36" y="144.78" size="1.4224" layer="95"/>
 <attribute name="VALUE" x="81.28" y="142.24" size="1.4224" layer="96"/>
 </instance>
-<instance part="CN8" gate="G$1" x="137.16" y="50.8" rot="R180"/>
 <instance part="C60" gate="G$1" x="78.74" y="76.2" smashed="yes" rot="R90">
 <attribute name="NAME" x="76.2" y="81.28" size="1.4224" layer="95" ratio="10"/>
 <attribute name="VALUE" x="81.28" y="81.28" size="1.4224" layer="96" ratio="10"/>
@@ -6656,8 +6578,8 @@ http://www.weartronics.com/</description>
 <attribute name="VALUE" x="223.52" y="160.02" size="1.4224" layer="96" ratio="9"/>
 </instance>
 <instance part="C61" gate="G$1" x="248.92" y="129.54" smashed="yes" rot="R270">
-<attribute name="NAME" x="251.46" y="127" size="1.4224" layer="95" ratio="9"/>
-<attribute name="VALUE" x="251.46" y="124.46" size="1.4224" layer="96" ratio="9"/>
+<attribute name="NAME" x="251.46" y="134.62" size="1.4224" layer="95" ratio="9" rot="R270"/>
+<attribute name="VALUE" x="251.46" y="129.54" size="1.4224" layer="96" ratio="9" rot="R270"/>
 </instance>
 <instance part="V135" gate="GND" x="248.92" y="119.38" smashed="yes">
 <attribute name="VALUE" x="246.38" y="116.078" size="1.4224" layer="96" ratio="9"/>
@@ -6666,7 +6588,6 @@ http://www.weartronics.com/</description>
 <attribute name="NAME" x="200.66" y="142.24" size="1.4224" layer="95" ratio="9"/>
 <attribute name="VALUE" x="205.74" y="142.24" size="1.4224" layer="96" ratio="9"/>
 </instance>
-<instance part="CN6" gate="G$1" x="330.2" y="139.7" rot="R180"/>
 <instance part="C63" gate="G$1" x="93.98" y="254" smashed="yes">
 <attribute name="NAME" x="99.06" y="251.46" size="1.4224" layer="95" ratio="10"/>
 <attribute name="VALUE" x="96.52" y="248.92" size="1.4224" layer="96" ratio="10"/>
@@ -6692,6 +6613,15 @@ http://www.weartronics.com/</description>
 <instance part="V138" gate="GND" x="233.68" y="7.62"/>
 <instance part="V139" gate="G$1" x="187.96" y="25.4" rot="R90"/>
 <instance part="V140" gate="G$1" x="243.84" y="25.4" rot="R270"/>
+<instance part="CN7" gate="G$1" x="337.82" y="91.44" rot="R180"/>
+<instance part="CN6" gate="G$1" x="330.2" y="137.16" rot="R180"/>
+<instance part="CN5" gate="G$1" x="33.02" y="124.46" rot="MR180"/>
+<instance part="CN8" gate="G$1" x="137.16" y="48.26" rot="R180"/>
+<instance part="CN9" gate="G$1" x="337.82" y="55.88" smashed="yes" rot="R180">
+<attribute name="NAME" x="350.52" y="66.04" size="1.4224" layer="95" ratio="10"/>
+<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"/>
 </instances>
 <busses>
 </busses>
@@ -6781,10 +6711,10 @@ http://www.weartronics.com/</description>
 <pinref part="MIC1" gate="G$1" pin="2"/>
 </segment>
 <segment>
-<pinref part="CN5" gate="G$1" pin="1"/>
 <pinref part="V56" gate="GND" pin="GND"/>
-<wire x1="38.1" y1="121.92" x2="45.72" y2="121.92" width="0.1524" layer="91"/>
-<wire x1="45.72" y1="121.92" x2="45.72" y2="119.38" width="0.1524" layer="91"/>
+<wire x1="38.1" y1="116.84" x2="45.72" y2="116.84" width="0.1524" layer="91"/>
+<wire x1="45.72" y1="116.84" x2="45.72" y2="114.3" width="0.1524" layer="91"/>
+<pinref part="CN5" gate="G$1" pin="A"/>
 </segment>
 <segment>
 <pinref part="V61" gate="GND" pin="GND"/>
@@ -6805,8 +6735,8 @@ http://www.weartronics.com/</description>
 <wire x1="129.54" y1="40.64" x2="124.46" y2="40.64" width="0.1524" layer="91"/>
 <wire x1="124.46" y1="40.64" x2="124.46" y2="38.1" width="0.1524" layer="91"/>
 <pinref part="V66" gate="GND" pin="GND"/>
-<pinref part="CN8" gate="G$1" pin="1"/>
 <wire x1="132.08" y1="40.64" x2="129.54" y2="40.64" width="0.1524" layer="91"/>
+<pinref part="CN8" gate="G$1" pin="A"/>
 </segment>
 <segment>
 <pinref part="V64" gate="GND" pin="GND"/>
@@ -6902,9 +6832,8 @@ http://www.weartronics.com/</description>
 <wire x1="205.74" y1="165.1" x2="205.74" y2="167.64" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="CN10" gate="G$1" pin="1"/>
-<wire x1="312.42" y1="226.06" x2="314.96" y2="226.06" width="0.1524" layer="91"/>
-<wire x1="314.96" y1="226.06" x2="314.96" y2="223.52" width="0.1524" layer="91"/>
+<wire x1="312.42" y1="220.98" x2="314.96" y2="220.98" width="0.1524" layer="91"/>
+<wire x1="314.96" y1="220.98" x2="314.96" y2="218.44" width="0.1524" layer="91"/>
 <pinref part="V109" gate="GND" pin="GND"/>
 </segment>
 <segment>
@@ -7231,14 +7160,15 @@ http://www.weartronics.com/</description>
 </net>
 <net name="MIC" class="0">
 <segment>
-<pinref part="CN7" gate="G$1" pin="10"/>
-<wire x1="322.58" y1="93.98" x2="297.18" y2="93.98" width="0.1524" layer="91"/>
 <wire x1="297.18" y1="154.94" x2="297.18" y2="93.98" width="0.1524" layer="91"/>
 <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"/>
 </segment>
 </net>
 <net name="SPKR" class="0">
@@ -7250,8 +7180,8 @@ http://www.weartronics.com/</description>
 <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"/>
-<pinref part="CN6" gate="G$1" pin="4"/>
 <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"/>
 </segment>
 </net>
 <net name="N$49" class="0">
@@ -7340,10 +7270,10 @@ http://www.weartronics.com/</description>
 <wire x1="63.5" y1="182.88" x2="63.5" y2="149.86" width="0.1524" layer="91"/>
 <pinref part="MIC1" gate="G$1" pin="1"/>
 <wire x1="63.5" y1="147.32" x2="63.5" y2="149.86" width="0.1524" layer="91"/>
-<pinref part="CN5" gate="G$1" pin="10"/>
 <wire x1="38.1" y1="127" x2="40.64" y2="127" width="0.1524" layer="91"/>
 <wire x1="40.64" y1="127" x2="40.64" y2="147.32" width="0.1524" layer="91"/>
 <wire x1="40.64" y1="147.32" x2="63.5" y2="147.32" width="0.1524" layer="91"/>
+<pinref part="CN5" gate="G$1" pin="D"/>
 </segment>
 </net>
 <net name="N$33" class="0">
@@ -7362,22 +7292,15 @@ http://www.weartronics.com/</description>
 <segment>
 <pinref part="FB1" gate="G$1" pin="2"/>
 <wire x1="320.04" y1="144.78" x2="322.58" y2="144.78" width="0.1524" layer="91"/>
-<pinref part="CN6" gate="G$1" pin="2"/>
 <wire x1="322.58" y1="144.78" x2="325.12" y2="144.78" width="0.1524" layer="91"/>
-</segment>
-</net>
-<net name="N$72" class="0">
-<segment>
-<pinref part="FB2" gate="G$1" pin="2"/>
-<pinref part="CN7" gate="G$1" pin="2"/>
-<wire x1="320.04" y1="99.06" x2="322.58" y2="99.06" width="0.1524" layer="91"/>
+<pinref part="CN6" gate="G$1" pin="C"/>
 </segment>
 </net>
 <net name="N$73" class="0">
 <segment>
 <pinref part="FB6" gate="G$1" pin="2"/>
-<pinref part="CN9" gate="G$1" pin="2"/>
-<wire x1="320.04" y1="63.5" x2="322.58" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="320.04" y1="63.5" x2="332.74" y2="63.5" width="0.1524" layer="91"/>
+<pinref part="CN9" gate="G$1" pin="C"/>
 </segment>
 </net>
 <net name="N$74" class="0">
@@ -7404,20 +7327,19 @@ http://www.weartronics.com/</description>
 <segment>
 <pinref part="FB3" gate="G$1" pin="2"/>
 <wire x1="114.3" y1="55.88" x2="127" y2="55.88" width="0.1524" layer="91"/>
-<pinref part="CN8" gate="G$1" pin="2"/>
 <wire x1="127" y1="55.88" x2="129.54" y2="55.88" width="0.1524" layer="91"/>
-<pinref part="CN8" gate="G$1" pin="3"/>
 <wire x1="129.54" y1="55.88" x2="132.08" y2="55.88" width="0.1524" layer="91"/>
-<wire x1="132.08" y1="45.72" x2="129.54" y2="45.72" width="0.1524" layer="91"/>
-<wire x1="129.54" y1="45.72" x2="129.54" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="132.08" y1="43.18" x2="129.54" y2="43.18" width="0.1524" layer="91"/>
+<wire x1="129.54" y1="43.18" x2="129.54" y2="55.88" width="0.1524" layer="91"/>
 <junction x="129.54" y="55.88"/>
+<pinref part="CN8" gate="G$1" pin="C"/>
 </segment>
 </net>
 <net name="N$76" class="0">
 <segment>
-<pinref part="CN5" gate="G$1" pin="2"/>
 <pinref part="FB4" gate="G$1" pin="1"/>
 <wire x1="38.1" y1="132.08" x2="43.18" y2="132.08" width="0.1524" layer="91"/>
+<pinref part="CN5" gate="G$1" pin="C"/>
 </segment>
 </net>
 <net name="N$77" class="0">
@@ -7490,8 +7412,8 @@ http://www.weartronics.com/</description>
 <pinref part="J4" gate="G$1" pin="1"/>
 <wire x1="127" y1="50.8" x2="114.3" y2="50.8" width="0.1524" layer="91"/>
 <wire x1="114.3" y1="50.8" x2="114.3" y2="48.26" width="0.1524" layer="91"/>
-<pinref part="CN8" gate="G$1" pin="4"/>
 <wire x1="132.08" y1="50.8" x2="127" y2="50.8" width="0.1524" layer="91"/>
+<pinref part="CN8" gate="G$1" pin="D"/>
 </segment>
 </net>
 <net name="N$41" class="0">
@@ -7545,13 +7467,13 @@ http://www.weartronics.com/</description>
 <segment>
 <wire x1="294.64" y1="152.4" x2="294.64" y2="68.58" width="0.1524" layer="91"/>
 <wire x1="294.64" y1="68.58" x2="294.64" y2="58.42" width="0.1524" layer="91"/>
-<pinref part="CN9" gate="G$1" pin="10"/>
-<wire x1="294.64" y1="58.42" x2="322.58" 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"/>
 </segment>
 </net>
 <net name="N$8" class="0">
@@ -7581,7 +7503,6 @@ http://www.weartronics.com/</description>
 </net>
 <net name="N$15" class="0">
 <segment>
-<pinref part="CN10" gate="G$1" pin="2"/>
 <pinref part="R56" gate="G$1" pin="1"/>
 <wire x1="312.42" y1="236.22" x2="320.04" y2="236.22" width="0.1524" layer="91"/>
 <pinref part="C51" gate="G$1" pin="1"/>
@@ -7590,6 +7511,7 @@ http://www.weartronics.com/</description>
 <wire x1="320.04" y1="233.68" x2="320.04" y2="236.22" width="0.1524" layer="91"/>
 <junction x="320.04" y="236.22"/>
 <wire x1="320.04" y1="236.22" x2="320.04" y2="241.3" width="0.1524" layer="91"/>
+<pinref part="CN10" gate="G$1" pin="C"/>
 </segment>
 </net>
 <net name="!EXT-PTT!" class="0">
@@ -7740,8 +7662,6 @@ http://www.weartronics.com/</description>
 </net>
 <net name="RF_MIC" class="0">
 <segment>
-<pinref part="CN7" gate="G$1" pin="1"/>
-<wire x1="320.04" y1="88.9" x2="322.58" y2="88.9" width="0.1524" layer="91"/>
 <wire x1="320.04" y1="86.36" x2="320.04" y2="88.9" width="0.1524" layer="91"/>
 <pinref part="T2" gate="G$1" pin="4"/>
 <wire x1="259.08" y1="88.9" x2="261.62" y2="88.9" width="0.1524" layer="91"/>
@@ -7753,8 +7673,12 @@ http://www.weartronics.com/</description>
 <wire x1="276.86" y1="78.74" x2="276.86" y2="76.2" width="0.1524" layer="91"/>
 <junction x="276.86" y="76.2"/>
 <wire x1="289.56" y1="88.9" x2="320.04" y2="88.9" width="0.1524" layer="91"/>
-<junction x="320.04" y="88.9"/>
 <pinref part="V72" gate="G$1" pin="RF_MIC"/>
+<wire x1="327.66" y1="88.9" x2="320.04" y2="88.9" width="0.1524" layer="91"/>
+<junction x="320.04" y="88.9"/>
+<pinref part="CN7" gate="G$1" pin="A"/>
+<wire x1="332.74" y1="83.82" x2="327.66" y2="83.82" width="0.1524" layer="91"/>
+<wire x1="327.66" y1="83.82" x2="327.66" y2="88.9" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C43" gate="G$1" pin="2"/>
@@ -7788,9 +7712,9 @@ http://www.weartronics.com/</description>
 <wire x1="309.88" y1="132.08" x2="309.88" y2="134.62" width="0.1524" layer="91"/>
 <wire x1="309.88" y1="134.62" x2="317.5" y2="134.62" width="0.1524" layer="91"/>
 <wire x1="317.5" y1="134.62" x2="317.5" y2="129.54" width="0.1524" layer="91"/>
-<pinref part="CN6" gate="G$1" pin="1"/>
 <wire x1="317.5" y1="129.54" x2="325.12" y2="129.54" width="0.1524" layer="91"/>
 <junction x="309.88" y="134.62"/>
+<pinref part="CN6" gate="G$1" pin="A"/>
 </segment>
 <segment>
 <pinref part="CN12" gate="G$1" pin="9"/>
@@ -7812,14 +7736,16 @@ http://www.weartronics.com/</description>
 </segment>
 <segment>
 <wire x1="294.64" y1="50.8" x2="294.64" y2="53.34" width="0.1524" layer="91"/>
-<pinref part="CN9" gate="G$1" pin="1"/>
-<wire x1="294.64" y1="53.34" x2="322.58" y2="53.34" width="0.1524" layer="91"/>
 <pinref part="V97" gate="G$1" pin="RF_PTT"/>
 <pinref part="LD2" gate="G$1" pin="EMIT"/>
 <wire x1="287.02" y1="58.42" x2="289.56" y2="58.42" width="0.1524" layer="91"/>
 <wire x1="289.56" y1="58.42" x2="289.56" y2="55.88" width="0.1524" layer="91"/>
 <wire x1="289.56" y1="55.88" x2="289.56" y2="53.34" width="0.1524" layer="91" style="longdash"/>
 <wire x1="289.56" y1="53.34" x2="294.64" y2="53.34" width="0.1524" layer="91" style="longdash"/>
+<wire x1="294.64" y1="53.34" x2="302.26" y2="53.34" width="0.1524" layer="91"/>
+<wire x1="302.26" y1="53.34" x2="302.26" y2="48.26" width="0.1524" layer="91"/>
+<pinref part="CN9" gate="G$1" pin="A"/>
+<wire x1="302.26" y1="48.26" x2="332.74" y2="48.26" width="0.1524" layer="91"/>
 <junction x="294.64" y="53.34"/>
 </segment>
 <segment>
@@ -7921,6 +7847,14 @@ http://www.weartronics.com/</description>
 <junction x="134.62" y="259.08"/>
 </segment>
 </net>
+<net name="N$70" class="0">
+<segment>
+<pinref part="FB2" gate="G$1" pin="2"/>
+<wire x1="322.58" y1="99.06" x2="320.04" y2="99.06" width="0.1524" layer="91"/>
+<pinref part="CN7" gate="G$1" pin="C"/>
+<wire x1="322.58" y1="99.06" x2="332.74" y2="99.06" width="0.1524" layer="91"/>
+</segment>
+</net>
 </nets>
 </sheet>
 </sheets>
diff --git a/smartmic/SM1000-C/eagle.epf b/smartmic/SM1000-C/eagle.epf
index 1f5b7378..0183ca85 100644
--- a/smartmic/SM1000-C/eagle.epf
+++ b/smartmic/SM1000-C/eagle.epf
@@ -394,7 +394,7 @@ UsedLibrary="C:/Users/rbarnich/My Projects/PIC32MZ/PIC32MZ.lbr"
 
 [Win_1]
 Type="Control Panel"
-Loc="505 147 1104 778"
+Loc="563 33 1527 664"
 State=2
 Number=0