From ed8d98e78d499eed5c3ac1a508e11bd2d2912351 Mon Sep 17 00:00:00 2001
From: Martin Schramm <mschramm@sysmocom.de>
Date: Mon, 26 Apr 2021 19:15:26 +0200
Subject: [PATCH] ngff-cardem: remove SIM switch trio and connect straight to
 pivot

This way the close-pivot OE is the only which needs a pull-down.
Seven FET switches remain for other uses, four of them in a now
usused seperate OE group.
---
 ngff-cardem/eagle/ngff-cardem.brd | 187 +++++++----------
 ngff-cardem/eagle/ngff-cardem.sch | 323 ++++++++++++------------------
 2 files changed, 197 insertions(+), 313 deletions(-)

diff --git a/ngff-cardem/eagle/ngff-cardem.brd b/ngff-cardem/eagle/ngff-cardem.brd
index 2a42b53..a3a4b4a 100644
--- a/ngff-cardem/eagle/ngff-cardem.brd
+++ b/ngff-cardem/eagle/ngff-cardem.brd
@@ -26,13 +26,13 @@
 <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="19" name="Unrouted" color="6" fill="1" visible="no" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="no" 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"/>
@@ -3841,19 +3841,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="NAME" x="39.5925" y="79.6925" size="1" layer="25" font="vector" ratio="16"/>
 <attribute name="VALUE" x="38.5125" y="81.5023" size="0.508" layer="27" font="vector" ratio="10" rot="R180"/>
 </element>
-<element name="R204" library="rc-sysmocom" package="_0603" value="10k" x="8.0325" y="75.565" smashed="yes" rot="R180">
-<attribute name="NAME" x="4.2225" y="76.835" size="1" layer="25" font="vector" ratio="16"/>
-<attribute name="VALUE" x="9.62" y="77.0573" size="0.508" layer="27" font="vector" ratio="10" rot="R180"/>
-<attribute name="DESCRIPTION" value="RES 10K OHM 1%% 1/8W 0603" x="8.0325" y="75.565" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="MANUFACTURER" value="Stackpole Electronics Inc" x="8.0325" y="75.565" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" value="RNCP0603FTD10K0" x="8.0325" y="75.565" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="SOURCE" value="DIGIKEY" x="8.0325" y="75.565" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="SOURCEPARTNUMBER" value="RNCP0603FTD10K0CT-ND" x="8.0325" y="75.565" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="ROHSCERTIFICATE" value="UNKNOWN ROHS CERTIFICATE" x="8.0325" y="75.565" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="POPULATED" value="TRUE" x="8.0325" y="75.565" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="CLASS" value="RESISTOR" x="8.0325" y="75.565" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="LINK" value="https://www.digikey.de/product-detail/de/stackpole-electronics-inc/RNCP0603FTD10K0/RNCP0603FTD10K0CT-ND" x="8.0325" y="75.565" size="1.778" layer="27" rot="R180" display="off"/>
-</element>
 <element name="C202" library="rc-sysmocom" package="_0402" value="100n" x="24.5425" y="63.34125" smashed="yes">
 <attribute name="ROHSCERTIFICATE" value="Bleifrei / RoHS-konform" x="19.78" y="-21.43125" size="1.778" layer="27" display="off"/>
 <attribute name="CLASS" value="CAPACITOR" x="19.78" y="-21.43125" size="1.778" layer="27" display="off"/>
@@ -5286,7 +5273,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <contactref element="U202" pad="4"/>
 <contactref element="U202" pad="3"/>
 <contactref element="C202" pad="1"/>
-<contactref element="R204" pad="2"/>
 <contactref element="TC201" pad="2"/>
 <contactref element="TC201" pad="10"/>
 <contactref element="R209" pad="1"/>
@@ -5362,17 +5348,9 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="26.575" y="76.835" extent="1-16" drill="0.3"/>
 <via x="25.6225" y="77.94625" extent="1-16" drill="0.3"/>
 <via x="23.4" y="80.01" extent="1-16" drill="0.3"/>
-<wire x1="16.335625" y1="94.615" x2="16.335625" y2="94.615" width="0" layer="19" extent="1-16"/>
-<wire x1="11.22" y1="70.66625" x2="11.2425" y2="70.64375" width="0.3048" layer="1"/>
-<via x="10.7" y="70.64375" extent="1-16" drill="0.3"/>
-<wire x1="11.22" y1="70.66625" x2="11.1975" y2="70.64375" width="0.4064" layer="1"/>
-<wire x1="11.1975" y1="70.64375" x2="10.7" y2="70.64375" width="0.4064" layer="1"/>
 <via x="14.1925" y="74.93" extent="1-16" drill="0.3"/>
 <via x="14.1925" y="78.105" extent="1-16" drill="0.3"/>
 <via x="10.065" y="78.89875" extent="1-16" drill="0.3"/>
-<wire x1="24.0345" y1="63.34125" x2="16.288" y2="94.662625" width="0" layer="19" extent="1-16"/>
-<wire x1="16.288" y1="94.662625" x2="16.335625" y2="94.615" width="0" layer="19" extent="1-16"/>
-<wire x1="16.335625" y1="94.615" x2="16.335625" y2="94.403125" width="0" layer="19" extent="1-16"/>
 <wire x1="14.1925" y1="74.93" x2="14.1925" y2="74.48" width="0.254" layer="1"/>
 <wire x1="14.1925" y1="74.48" x2="13.67" y2="73.9575" width="0.254" layer="1"/>
 <contactref element="D101" pad="2"/>
@@ -5386,7 +5364,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="7.9375" y="85.4075" extent="1-16" drill="0.3"/>
 <wire x1="7.9375" y1="84.2825" x2="7.9375" y2="83.058" width="0.3048" layer="1"/>
 <wire x1="7.9375" y1="83.058" x2="7.747" y2="82.8675" width="0.3048" layer="1"/>
-<wire x1="6.6355" y1="76.2" x2="7.2705" y2="75.565" width="0.4064" layer="1"/>
 <contactref element="C306" pad="-"/>
 <wire x1="25.8445" y1="84.20125" x2="25.8445" y2="83.09" width="0.3048" layer="1"/>
 <wire x1="25.8445" y1="84.20125" x2="25.7175" y2="84.32825" width="0.3048" layer="1" curve="-90"/>
@@ -5640,34 +5617,53 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="60.2935" y1="91.84625" x2="60.2935" y2="81.84625" width="0" layer="19" extent="1-1"/>
 <wire x1="36.735" y1="78.105" x2="60.2935" y2="81.84625" width="0" layer="19" extent="1-1"/>
 <wire x1="33.595" y1="78.6325" x2="35.973" y2="78.105" width="0" layer="19" extent="1-1"/>
+<wire x1="30.7025" y1="79.375" x2="32.29" y2="78.4225" width="0" layer="19" extent="1-1"/>
+<wire x1="30.0675" y1="77.47" x2="30.7025" y2="79.375" width="0" layer="19" extent="1-1"/>
+<wire x1="30.0675" y1="75.8825" x2="30.0675" y2="77.47" width="0" layer="19" extent="1-1"/>
+<wire x1="28.48" y1="76.5175" x2="30.0675" y2="75.8825" width="0" layer="19" extent="1-1"/>
+<wire x1="28.48" y1="75.2475" x2="28.48" y2="76.5175" width="0" layer="19" extent="1-1"/>
+<wire x1="27.845" y1="78.105" x2="28.48" y2="76.5175" width="0" layer="19" extent="1-1"/>
+<wire x1="27.5275" y1="79.375" x2="27.845" y2="78.105" width="0" layer="19" extent="1-1"/>
+<wire x1="26.095" y1="80.4825" x2="27.5275" y2="79.375" width="0" layer="19" extent="1-1"/>
 <wire x1="25.8445" y1="83.09" x2="26.095" y2="81.6325" width="0" layer="19" extent="1-1"/>
 <wire x1="25.97875" y1="86.58450625" x2="25.7175" y2="84.93125" width="0" layer="19" extent="1-1"/>
 <wire x1="26.575" y1="76.835" x2="27.845" y2="78.105" width="0" layer="19" extent="1-1"/>
-<wire x1="20.225" y1="72.39" x2="19.2725" y2="72.39" width="0" layer="19" extent="1-1"/>
+<wire x1="25.6225" y1="77.94625" x2="26.575" y2="76.835" width="0" layer="19" extent="1-1"/>
+<wire x1="26.41625" y1="75.2475" x2="26.575" y2="76.835" width="0" layer="19" extent="1-1"/>
+<wire x1="25.94" y1="73.025" x2="26.41625" y2="75.2475" width="0" layer="19" extent="1-1"/>
 <wire x1="24.67" y1="71.755" x2="25.94" y2="73.025" width="0" layer="19" extent="1-1"/>
 <wire x1="24.095" y1="70.1325" x2="24.67" y2="71.755" width="0" layer="19" extent="1-1"/>
+<wire x1="21.495" y1="70.8025" x2="23.2095" y2="69.4055" width="0" layer="19" extent="1-1"/>
+<wire x1="20.225" y1="72.39" x2="21.495" y2="70.8025" width="0" layer="19" extent="1-1"/>
+<wire x1="19.2725" y1="72.39" x2="20.225" y2="72.39" width="0" layer="19" extent="1-1"/>
+<wire x1="17.685" y1="72.39" x2="19.2725" y2="72.39" width="0" layer="19" extent="1-1"/>
+<wire x1="18.955" y1="74.295" x2="19.2725" y2="72.39" width="0" layer="19" extent="1-1"/>
+<wire x1="19.1455" y1="75.8825" x2="18.955" y2="74.295" width="0" layer="19" extent="1-1"/>
+<wire x1="19.1455" y1="77.1525" x2="18.47875" y2="76.5175" width="0" layer="19" extent="1-1"/>
+<wire x1="20.86" y1="79.1845" x2="19.11375" y2="78.105" width="0" layer="19" extent="1-1"/>
+<wire x1="23.4" y1="80.01" x2="23.325" y2="79.1325" width="0" layer="19" extent="1-1"/>
+<wire x1="21.495" y1="81.28" x2="21.2295" y2="79.1325" width="0" layer="19" extent="1-1"/>
 <wire x1="31.095" y1="81.6325" x2="30.7025" y2="79.375" width="0" layer="19" extent="1-1"/>
 <wire x1="29.27375" y1="84.48675" x2="31.095" y2="82.8475" width="0" layer="19" extent="1-1"/>
+<wire x1="29.75" y1="73.025" x2="28.48" y2="75.2475" width="0" layer="19" extent="1-1"/>
 <wire x1="23.12125" y1="84.356528125" x2="25.7175" y2="84.32825" width="0" layer="19" extent="1-1"/>
-<wire x1="11.22" y1="70.66625" x2="13.67" y2="73.9575" width="0" layer="19" extent="1-1"/>
-<wire x1="7.1005" y1="68.455" x2="10.7" y2="70.64375" width="0" layer="19" extent="1-1"/>
-<wire x1="2.97375" y1="66.04" x2="7.13175" y2="67.05" width="0" layer="19" extent="1-1"/>
-<wire x1="4.18" y1="62.0195" x2="2.97375" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="7.2705" y1="75.565" x2="10.065" y2="78.89875" width="0" layer="19" extent="1-1"/>
+<wire x1="14.1925" y1="74.48" x2="17.685" y2="72.39" width="0" layer="19" extent="1-1"/>
+<wire x1="14.1925" y1="78.105" x2="14.1925" y2="74.93" width="0" layer="19" extent="1-1"/>
+<wire x1="10.065" y1="78.89875" x2="14.1925" y2="78.105" width="0" layer="19" extent="1-1"/>
 <wire x1="27.845" y1="67.7545" x2="24.095" y2="70.1325" width="0" layer="19" extent="1-1"/>
 <wire x1="7.747" y1="82.8675" x2="10.065" y2="78.89875" width="0" layer="19" extent="1-1"/>
 <wire x1="3.6195" y1="81.5975" x2="7.747" y2="82.8675" width="0" layer="19" extent="1-1"/>
 <wire x1="16.51" y1="82.3595" x2="14.1925" y2="78.105" width="0" layer="19" extent="1-1"/>
+<wire x1="32.385" y1="64.643" x2="27.845" y2="67.15125" width="0" layer="19" extent="1-1"/>
+<wire x1="24.0345" y1="63.34125" x2="23.2095" y2="68.58" width="0" layer="19" extent="1-1"/>
 <wire x1="35.2425" y1="89.44" x2="31.75" y2="83.5025" width="0" layer="19" extent="1-1"/>
 <wire x1="35.56" y1="94.52" x2="34.76625" y2="89.7575" width="0" layer="19" extent="1-1"/>
-<wire x1="4.1275" y1="54.19875" x2="4.18" y2="62.0195" width="0" layer="19" extent="1-1"/>
-<wire x1="5" y1="95" x2="7.9375" y2="85.4075" width="0" layer="19" extent="1-1"/>
-<wire x1="39.5605" y1="63.5" x2="36.735" y2="78.105" width="0" layer="19" extent="1-1"/>
-<wire x1="32.385" y1="64.643" x2="39.5605" y2="63.5" width="0" layer="19" extent="1-1"/>
-<wire x1="16.335625" y1="94.403125" x2="16.1925" y2="83.82" width="0" layer="19" extent="1-1"/>
-<wire x1="-7.77875" y1="69.408" x2="2.97375" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-14.89075" y1="65.15125" x2="-7.77875" y2="69.408" width="0" layer="19" extent="1-1"/>
+<wire x1="39.5605" y1="63.5" x2="32.385" y2="64.643" width="0" layer="19" extent="1-1"/>
 <wire x1="32.6422" y1="56.4475" x2="32.385" y2="64.643" width="0" layer="19" extent="1-1"/>
+<wire x1="7.1005" y1="68.455" x2="13.67" y2="73.9575" width="0" layer="19" extent="1-1"/>
+<wire x1="2.97375" y1="66.04" x2="7.13175" y2="67.05" width="0" layer="19" extent="1-1"/>
+<wire x1="4.18" y1="62.0195" x2="2.97375" y2="66.04" width="0" layer="19" extent="1-1"/>
+<wire x1="4.1275" y1="54.19875" x2="4.18" y2="62.0195" width="0" layer="19" extent="1-1"/>
 <wire x1="30.0355" y1="48.1965" x2="32.6422" y2="56.4475" width="0" layer="19" extent="1-1"/>
 <wire x1="29.74975" y1="44.4525" x2="30.0355" y2="48.1965" width="0" layer="19" extent="1-1"/>
 <wire x1="32.0675" y1="43.075" x2="29.74975" y2="44.4525" width="0" layer="19" extent="1-1"/>
@@ -5712,7 +5708,10 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="63.8175" y1="24.135" x2="63.8175" y2="20.6425" width="0" layer="19" extent="1-1"/>
 <wire x1="59.6875" y1="26.0375" x2="63.5" y2="24.3255" width="0" layer="19" extent="1-1"/>
 <wire x1="54.2925" y1="24.5795" x2="58.5675" y2="26.0375" width="0" layer="19" extent="1-1"/>
-<wire x1="18.0372" y1="56.4475" x2="24.63" y2="48.52" width="0" layer="19" extent="1-1"/>
+<wire x1="18.0372" y1="56.4475" x2="24.0345" y2="63.34125" width="0" layer="19" extent="1-1"/>
+<wire x1="5" y1="95" x2="7.9375" y2="85.4075" width="0" layer="19" extent="1-1"/>
+<wire x1="-7.77875" y1="69.408" x2="2.97375" y2="66.04" width="0" layer="19" extent="1-1"/>
+<wire x1="-14.89075" y1="65.15125" x2="-7.77875" y2="69.408" width="0" layer="19" extent="1-1"/>
 <wire x1="30.6655" y1="4.7625" x2="41.91" y2="3.97375" width="0" layer="19" extent="1-1"/>
 <wire x1="14.4145" y1="28.54375" x2="22.06625" y2="18.42" width="0" layer="19" extent="1-1"/>
 <wire x1="4.1275" y1="33.56125" x2="14.4145" y2="28.54375" width="0" layer="19" extent="1-1"/>
@@ -6072,10 +6071,12 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <contactref element="D101" pad="6"/>
 <contactref element="C102" pad="1"/>
 <contactref element="SIM101" pad="C2"/>
-<contactref element="IC201" pad="6"/>
-<wire x1="6.11575" y1="67.05" x2="18.0372" y2="59.0475" width="0" layer="19" extent="1-1"/>
+<contactref element="IC201" pad="15"/>
+<contactref element="IC202" pad="6"/>
+<wire x1="23.8728" y1="59.0475" x2="32.6422" y2="59.0475" width="0" layer="19" extent="1-1"/>
+<wire x1="24.63" y1="43.44" x2="23.8728" y2="59.0475" width="0" layer="19" extent="1-1"/>
+<wire x1="6.11575" y1="67.05" x2="23.8728" y2="59.0475" width="0" layer="19" extent="1-1"/>
 <wire x1="4.72375" y1="66.578" x2="6.11575" y2="67.05" width="0" layer="19" extent="1-1"/>
-<wire x1="24.63" y1="43.44" x2="18.0372" y2="59.0475" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="USIM_CLK">
 <contactref element="D101" pad="4"/>
@@ -6083,23 +6084,27 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <contactref element="R110" pad="2"/>
 <contactref element="C107" pad="1"/>
 <contactref element="SIM101" pad="C3"/>
-<contactref element="IC201" pad="4"/>
-<wire x1="4.72375" y1="65.502" x2="18.0372" y2="60.3475" width="0" layer="19" extent="1-1"/>
-<wire x1="6.0845" y1="68.455" x2="4.72375" y2="65.502" width="0" layer="19" extent="1-1"/>
-<wire x1="24.63" y1="45.98" x2="18.0372" y2="60.3475" width="0" layer="19" extent="1-1"/>
+<contactref element="IC201" pad="13"/>
+<contactref element="IC202" pad="4"/>
+<wire x1="23.8728" y1="57.7475" x2="32.6422" y2="60.3475" width="0" layer="19" extent="1-1"/>
+<wire x1="24.63" y1="45.98" x2="23.8728" y2="57.7475" width="0" layer="19" extent="1-1"/>
 <wire x1="28.73375" y1="42.8635" x2="24.63" y2="45.98" width="0" layer="19" extent="1-1"/>
 <wire x1="28.73375" y1="41.6585" x2="28.73375" y2="42.8635" width="0" layer="19" extent="1-1"/>
+<wire x1="6.0845" y1="68.455" x2="23.8728" y2="57.7475" width="0" layer="19" extent="1-1"/>
+<wire x1="4.72375" y1="65.502" x2="6.0845" y2="68.455" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="USIM_IO">
 <contactref element="D101" pad="5"/>
 <contactref element="R101" pad="1"/>
 <contactref element="C103" pad="1"/>
 <contactref element="SIM101" pad="C7"/>
-<contactref element="IC201" pad="2"/>
-<wire x1="4.18" y1="63.0355" x2="18.0372" y2="61.6475" width="0" layer="19" extent="1-1"/>
+<contactref element="IC201" pad="11"/>
+<contactref element="IC202" pad="2"/>
+<wire x1="23.8728" y1="56.4475" x2="32.6422" y2="61.6475" width="0" layer="19" extent="1-1"/>
+<wire x1="24.63" y1="47.25" x2="23.8728" y2="56.4475" width="0" layer="19" extent="1-1"/>
+<wire x1="4.18" y1="63.0355" x2="23.8728" y2="56.4475" width="0" layer="19" extent="1-1"/>
 <wire x1="4.77375" y1="66.04" x2="4.18" y2="63.0355" width="0" layer="19" extent="1-1"/>
 <wire x1="3.9255" y1="71.81" x2="4.77375" y2="66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="24.63" y1="47.25" x2="18.0372" y2="61.6475" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="ST12_LED_R">
 <contactref element="R201" pad="1"/>
@@ -6130,17 +6135,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <signal name="!ST_UART1_RST">
 <contactref element="U202" pad="23"/>
 <wire x1="27.095" y1="70.1325" x2="27.095" y2="65.925" width="0.3048" layer="1"/>
-<wire x1="27.095" y1="65.925" x2="26.575" y2="65.405" width="0.3048" layer="1"/>
-<wire x1="26.575" y1="65.405" x2="22.4475" y2="65.405" width="0.3048" layer="1"/>
-<wire x1="22.4475" y1="65.405" x2="19.9075" y2="67.945" width="0.3048" layer="1"/>
-<wire x1="19.9075" y1="67.945" x2="18.0025" y2="67.945" width="0.3048" layer="1"/>
-<wire x1="18.0025" y1="67.945" x2="17.3675" y2="68.58" width="0.3048" layer="1"/>
-<wire x1="9.6325" y1="71.9575" x2="8.16" y2="70.485" width="0.3048" layer="1"/>
-<wire x1="8.16" y1="70.485" x2="8.16" y2="69.5325" width="0.3048" layer="1"/>
-<wire x1="8.16" y1="69.5325" x2="9.1125" y2="68.58" width="0.3048" layer="1"/>
-<wire x1="9.1125" y1="68.58" x2="17.3675" y2="68.58" width="0.3048" layer="1"/>
-<contactref element="IC201" pad="7"/>
-<wire x1="18.0372" y1="58.3975" x2="22.4475" y2="65.405" width="0" layer="19" extent="1-1"/>
+<contactref element="IC201" pad="5"/>
+<wire x1="18.0372" y1="59.6975" x2="27.095" y2="65.925" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="ST_UART1_CLK">
 <contactref element="U202" pad="15"/>
@@ -6158,11 +6154,11 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="23.325" y1="72.6325" x2="22.095" y2="72.6325" width="0.3048" layer="1"/>
 <wire x1="22.095" y1="72.6325" x2="21.42" y2="72.6325" width="0.3048" layer="1"/>
 <wire x1="21.42" y1="72.6325" x2="20.225" y2="71.4375" width="0.3048" layer="1"/>
-<wire x1="13.69" y1="71.4375" x2="14.325" y2="70.8025" width="0.3048" layer="1"/>
-<wire x1="14.325" y1="70.8025" x2="19.59" y2="70.8025" width="0.3048" layer="1"/>
+<wire x1="13.69" y1="71.4375" x2="14.325" y2="70.8025" width="0" layer="19" extent="1-16"/>
+<wire x1="14.325" y1="70.8025" x2="19.59" y2="70.8025" width="0" layer="19" extent="1-16"/>
 <wire x1="19.59" y1="70.8025" x2="20.225" y2="71.4375" width="0.254" layer="1"/>
-<contactref element="IC201" pad="5"/>
-<wire x1="18.0372" y1="59.6975" x2="19.59" y2="70.8025" width="0" layer="19" extent="1-1"/>
+<contactref element="IC201" pad="7"/>
+<wire x1="18.0372" y1="58.3975" x2="19.59" y2="70.8025" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="ST_UART1_IO">
 <contactref element="U202" pad="11"/>
@@ -6181,25 +6177,16 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="32.29" y="74.6125" extent="1-16" drill="0.3"/>
 <wire x1="32.29" y1="74.6125" x2="32.77" y2="74.1325" width="0.3048" layer="1"/>
 <wire x1="32.77" y1="74.1325" x2="33.595" y2="74.1325" width="0.3048" layer="1"/>
-<wire x1="15.99" y1="73.1325" x2="15.815" y2="72.9575" width="0.3048" layer="1"/>
+<wire x1="15.99" y1="73.1325" x2="15.815" y2="72.9575" width="0" layer="19" extent="1-16"/>
 <contactref element="IC201" pad="9"/>
 <wire x1="18.0372" y1="57.0975" x2="15.815" y2="72.9575" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="!CONNECT_ST_USIM">
-<wire x1="11.22" y1="74.79875" x2="11.22" y2="75.3625" width="0.3048" layer="1"/>
-<wire x1="11.22" y1="75.3625" x2="11.0175" y2="75.565" width="0.3048" layer="1"/>
-<via x="11.0175" y="75.565" extent="1-16" drill="0.3"/>
-<wire x1="11.0175" y1="75.565" x2="11.0175" y2="71.4375" width="0.3048" layer="16"/>
-<wire x1="11.0175" y1="71.4375" x2="11.335" y2="71.12" width="0.3048" layer="16"/>
-<wire x1="11.335" y1="71.12" x2="11.335" y2="70.1675" width="0.3048" layer="16"/>
-<wire x1="11.335" y1="70.1675" x2="10.7" y2="69.5325" width="0.3048" layer="16"/>
-<via x="10.7" y="69.5325" extent="1-16" drill="0.3"/>
+<signal name="!CONNECT_UART1">
 <contactref element="U202" pad="16"/>
 <wire x1="22.095" y1="72.1325" x2="21.65" y2="72.1325" width="0.3048" layer="1"/>
 <wire x1="21.65" y1="72.1325" x2="18.7325" y2="69.215" width="0.3048" layer="1"/>
-<wire x1="10.7" y1="69.5325" x2="10.795" y2="69.5325" width="0.3048" layer="1"/>
-<wire x1="10.795" y1="69.5325" x2="11.1125" y2="69.215" width="0.3048" layer="1"/>
-<wire x1="11.1125" y1="69.215" x2="18.7325" y2="69.215" width="0.3048" layer="1"/>
+<contactref element="IC201" pad="19"/>
+<wire x1="23.8728" y1="61.6475" x2="18.7325" y2="69.215" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VERSION_DETECT">
 <contactref element="R213" pad="2"/>
@@ -6237,8 +6224,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 </signal>
 <signal name="VAUX" class="3">
 <contactref element="C202" pad="2"/>
-<wire x1="14.9425" y1="95.39675" x2="25.0505" y2="63.34125" width="0" layer="19" extent="1-16"/>
-<wire x1="12.72" y1="74.74875" x2="12.72" y2="75.553" width="0.3048" layer="1"/>
 <contactref element="C120" pad="2"/>
 <contactref element="C206" pad="2"/>
 <contactref element="U202" pad="7"/>
@@ -6306,13 +6291,12 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="23.87625" y1="76.5175" x2="27.095" y2="81.6325" width="0" layer="19" extent="1-1"/>
 <wire x1="19.3675" y1="82.6135" x2="20.6695" y2="77.1525" width="0" layer="19" extent="1-1"/>
 <wire x1="24.595" y1="70.1325" x2="23.87625" y2="76.5175" width="0" layer="19" extent="1-1"/>
-<wire x1="23.8728" y1="62.2975" x2="24.19375" y2="67.945" width="0" layer="19" extent="1-1"/>
+<wire x1="25.0505" y1="63.34125" x2="24.19375" y2="67.945" width="0" layer="19" extent="1-1"/>
+<wire x1="23.8728" y1="62.2975" x2="25.0505" y2="63.34125" width="0" layer="19" extent="1-1"/>
 <wire x1="33.595" y1="78.1325" x2="27.095" y2="81.6325" width="0" layer="19" extent="1-1"/>
-<wire x1="12.72" y1="75.553" x2="20.6695" y2="77.1525" width="0" layer="19" extent="1-1"/>
 <wire x1="9.0805" y1="88.5825" x2="17.78" y2="82.3595" width="0" layer="19" extent="1-1"/>
-<wire x1="14.9425" y1="95.39675" x2="9.0805" y2="88.5825" width="0" layer="19" extent="1-1"/>
-<wire x1="38.5445" y1="63.5" x2="35.0205" y2="78.0415" width="0" layer="19" extent="1-1"/>
-<wire x1="38.4778" y1="62.2975" x2="38.5445" y2="63.5" width="0" layer="19" extent="1-1"/>
+<wire x1="38.4778" y1="62.2975" x2="25.0505" y2="63.34125" width="0" layer="19" extent="1-1"/>
+<wire x1="38.5445" y1="63.5" x2="38.4778" y2="62.2975" width="0" layer="19" extent="1-1"/>
 <wire x1="15.4305" y1="28.54375" x2="23.8728" y2="62.2975" width="0" layer="19" extent="1-1"/>
 <wire x1="18.06575" y1="26.7375" x2="15.4305" y2="28.54375" width="0" layer="19" extent="1-1"/>
 <wire x1="4.318" y1="27.055" x2="15.4305" y2="28.54375" width="0" layer="19" extent="1-1"/>
@@ -7114,48 +7098,21 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <signal name="FREE_(MDM2_USIM_VDD)">
 <contactref element="U202" pad="5"/>
 </signal>
-<signal name="N$42">
-<contactref element="IC201" pad="19"/>
-</signal>
-<signal name="N$43">
-<contactref element="IC202" pad="19"/>
-</signal>
 <signal name="N$44">
 <contactref element="IC202" pad="1"/>
 <contactref element="R205" pad="1"/>
 <wire x1="32.59" y1="62.2975" x2="32.385" y2="66.167" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="N$1">
-<contactref element="IC201" pad="18"/>
-<contactref element="IC201" pad="11"/>
-<contactref element="IC202" pad="2"/>
-<wire x1="23.8728" y1="60.9975" x2="32.6422" y2="61.6475" width="0" layer="19" extent="1-1"/>
-<wire x1="23.8728" y1="56.4475" x2="23.8728" y2="60.9975" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$2">
-<contactref element="IC201" pad="16"/>
-<contactref element="IC201" pad="15"/>
-<contactref element="IC202" pad="4"/>
-<wire x1="23.8728" y1="59.6975" x2="32.6422" y2="60.3475" width="0" layer="19" extent="1-1"/>
-<wire x1="23.8728" y1="59.0475" x2="23.8728" y2="59.6975" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="N$3">
-<contactref element="IC201" pad="14"/>
-<contactref element="IC201" pad="13"/>
-<contactref element="IC202" pad="6"/>
-<wire x1="23.8728" y1="58.3975" x2="32.6422" y2="59.0475" width="0" layer="19" extent="1-1"/>
-<wire x1="23.8728" y1="57.7475" x2="23.8728" y2="58.3975" width="0" layer="19" extent="1-1"/>
-</signal>
 <signal name="FREE_(FOR_12/34_ID)" class="3">
 <contactref element="U202" pad="21"/>
 <via x="25.305" y="72.39" extent="1-16" drill="0.3"/>
 <wire x1="26.095" y1="70.1325" x2="26.095" y2="72.39" width="0.3048" layer="1"/>
 <wire x1="26.095" y1="72.39" x2="25.305" y2="72.39" width="0.3048" layer="1"/>
 </signal>
-<signal name="N$8">
-<contactref element="IC201" pad="1"/>
-<contactref element="R204" pad="1"/>
-<wire x1="17.985" y1="62.2975" x2="8.7945" y2="75.565" width="0" layer="19" extent="1-1"/>
+<signal name="!CONNECT_UART2">
+<contactref element="U202" pad="38"/>
+<contactref element="IC202" pad="19"/>
+<wire x1="38.4778" y1="61.6475" x2="33.595" y2="74.6325" width="0" layer="19" extent="1-1"/>
 </signal>
 </signals>
 <errors>
diff --git a/ngff-cardem/eagle/ngff-cardem.sch b/ngff-cardem/eagle/ngff-cardem.sch
index b613854..27fca7b 100644
--- a/ngff-cardem/eagle/ngff-cardem.sch
+++ b/ngff-cardem/eagle/ngff-cardem.sch
@@ -19253,18 +19253,6 @@ octal FET bus switch</description>
 <attribute name="SOURCEPARTNUMBER" value="311-1.50KHRCT-ND"/>
 </part>
 <part name="GND606" library="supply1" deviceset="GND" device=""/>
-<part name="R204" library="rc-sysmocom" deviceset="RESISTOR" device="_0603" value="10k">
-<attribute name="CLASS" value="RESISTOR"/>
-<attribute name="DESCRIPTION" value="RES 10K OHM 1%% 1/8W 0603"/>
-<attribute name="LINK" value="https://www.digikey.de/product-detail/de/stackpole-electronics-inc/RNCP0603FTD10K0/RNCP0603FTD10K0CT-ND"/>
-<attribute name="MANUFACTURER" value="Stackpole Electronics Inc"/>
-<attribute name="MANUFACTURERPARTNUMBER" value="RNCP0603FTD10K0"/>
-<attribute name="POPULATED" value="TRUE"/>
-<attribute name="ROHSCERTIFICATE" value="UNKNOWN ROHS CERTIFICATE"/>
-<attribute name="SOURCE" value="DIGIKEY"/>
-<attribute name="SOURCEPARTNUMBER" value="RNCP0603FTD10K0CT-ND"/>
-</part>
-<part name="GND603" library="supply1" deviceset="GND" device=""/>
 <part name="C202" library="rc-sysmocom" deviceset="CAP_CERAMIC" device="_0402" value="100n">
 <attribute name="CLASS" value="CAPACITOR"/>
 <attribute name="DESCRIPTION" value="CAP CER 0.1UF 16V 10% X7R 0402"/>
@@ -22550,10 +22538,11 @@ detection</text>
 <wire x1="127" y1="88.9" x2="127" y2="5.08" width="0.1524" layer="97" style="longdash"/>
 <wire x1="127" y1="88.9" x2="271.78" y2="88.9" width="0.1524" layer="97" style="longdash"/>
 <text x="175.26" y="81.28" size="3.81" layer="97" ratio="10">switch bank</text>
-<text x="85.344" y="83.82" size="1.27" layer="97" rot="R180">USIM-to-bus</text>
 <text x="85.344" y="78.74" size="1.27" layer="97" rot="R180">UART1-to-bus</text>
 <text x="85.344" y="33.02" size="1.27" layer="97" rot="R180">UART2-to-bus</text>
 <text x="85.344" y="38.1" size="1.27" layer="97" rot="R180">close pivot</text>
+<wire x1="134.62" y1="50.8" x2="276.86" y2="50.8" width="0.1016" layer="97" style="dashdot"/>
+<wire x1="134.62" y1="38.1" x2="276.86" y2="38.1" width="0.1016" layer="97" style="dashdot"/>
 </plain>
 <instances>
 <instance part="U202" gate="G$1" x="223.52" y="165.1">
@@ -22755,20 +22744,6 @@ detection</text>
 <attribute name="LINK" x="182.88" y="223.52" size="1.27" layer="96" display="off"/>
 </instance>
 <instance part="GND606" gate="1" x="101.6" y="60.96"/>
-<instance part="R204" gate="G$1" x="68.58" y="73.66" smashed="yes" rot="R270">
-<attribute name="NAME" x="65.278" y="75.184" size="1.27" layer="95" font="vector" rot="R270"/>
-<attribute name="VALUE" x="70.485" y="78.74" size="1.27" layer="96" font="vector" rot="R270"/>
-<attribute name="DESCRIPTION" x="68.58" y="73.66" size="1.778" layer="96" display="off"/>
-<attribute name="MANUFACTURER" x="68.58" y="73.66" size="1.778" layer="96" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="68.58" y="73.66" size="1.778" layer="96" display="off"/>
-<attribute name="SOURCE" x="68.58" y="73.66" size="1.778" layer="96" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="68.58" y="73.66" size="1.778" layer="96" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="68.58" y="73.66" size="1.778" layer="96" display="off"/>
-<attribute name="POPULATED" x="68.58" y="73.66" size="1.778" layer="96" display="off"/>
-<attribute name="CLASS" x="68.58" y="73.66" size="1.778" layer="96" display="off"/>
-<attribute name="LINK" x="68.58" y="73.66" size="1.778" layer="96" display="off"/>
-</instance>
-<instance part="GND603" gate="1" x="68.58" y="63.5"/>
 <instance part="C202" gate="G$1" x="109.22" y="76.2" smashed="yes" rot="R90">
 <attribute name="NAME" x="107.188" y="79.756" size="1.27" layer="95" font="vector" rot="R90"/>
 <attribute name="VALUE" x="107.188" y="71.882" size="1.27" layer="96" font="vector" rot="R90"/>
@@ -22836,18 +22811,18 @@ detection</text>
 </instance>
 <instance part="GND607" gate="1" x="167.64" y="182.88"/>
 <instance part="FRAME601" gate="G$1" x="0" y="0"/>
-<instance part="R206" gate="G$1" x="132.08" y="45.72" smashed="yes" rot="R270">
-<attribute name="NAME" x="133.858" y="47.244" size="1.27" layer="95" font="vector" rot="R270"/>
-<attribute name="VALUE" x="128.905" y="45.72" size="1.27" layer="96" font="vector" rot="R270"/>
-<attribute name="DESCRIPTION" x="132.08" y="45.72" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="MANUFACTURER" x="132.08" y="45.72" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="132.08" y="45.72" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="SOURCE" x="132.08" y="45.72" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="132.08" y="45.72" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="132.08" y="45.72" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="POPULATED" x="132.08" y="45.72" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="CLASS" x="132.08" y="45.72" size="1.778" layer="96" rot="R90" display="off"/>
-<attribute name="LINK" x="132.08" y="45.72" size="1.778" layer="96" rot="R90" display="off"/>
+<instance part="R206" gate="G$1" x="218.44" y="10.16" smashed="yes">
+<attribute name="NAME" x="216.916" y="11.938" size="1.27" layer="95" font="vector"/>
+<attribute name="VALUE" x="218.44" y="6.985" size="1.27" layer="96" font="vector"/>
+<attribute name="DESCRIPTION" x="218.44" y="10.16" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="MANUFACTURER" x="218.44" y="10.16" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="218.44" y="10.16" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="SOURCE" x="218.44" y="10.16" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="218.44" y="10.16" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="218.44" y="10.16" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="POPULATED" x="218.44" y="10.16" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="CLASS" x="218.44" y="10.16" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="LINK" x="218.44" y="10.16" size="1.778" layer="96" rot="R180" display="off"/>
 </instance>
 <instance part="GND616" gate="1" x="256.54" y="121.92" rot="R90"/>
 <instance part="L202" gate="G$1" x="185.42" y="170.18" smashed="yes" rot="R90">
@@ -23127,62 +23102,46 @@ detection</text>
 </instance>
 <instance part="GND7" gate="1" x="175.26" y="210.82" rot="R270"/>
 <instance part="GND8" gate="1" x="175.26" y="205.74" rot="R270"/>
-<instance part="IC201" gate="-1OE_1" x="170.18" y="73.66" smashed="yes" rot="MR270">
-<attribute name="DESCRIPTION" x="170.18" y="73.66" size="1.27" layer="96" rot="MR270" display="off"/>
-<attribute name="MANUFACTURER" x="170.18" y="73.66" size="1.27" layer="96" rot="MR270" display="off"/>
-<attribute name="SOURCE" x="170.18" y="73.66" size="1.27" layer="96" rot="MR270" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="170.18" y="73.66" size="1.27" layer="96" rot="MR270" display="off"/>
-<attribute name="POPULATED" x="170.18" y="73.66" size="1.27" layer="96" rot="MR270" display="off"/>
-<attribute name="CLASS" x="170.18" y="73.66" size="1.27" layer="96" rot="MR270" display="off"/>
-<attribute name="LINK" x="170.18" y="73.66" size="1.27" layer="96" rot="MR270" display="off"/>
-<attribute name="NAME" x="165.1" y="74.295" size="1.778" layer="95" rot="MR0"/>
-</instance>
 <instance part="IC201" gate="-CTL/PWR" x="96.52" y="78.74"/>
-<instance part="IC201" gate="-1OE_2" x="185.42" y="58.42" smashed="yes" rot="MR270">
-<attribute name="NAME" x="189.992" y="54.483" size="1.778" layer="95" rot="MR180"/>
+<instance part="IC201" gate="-1OE_4" x="309.88" y="60.96"/>
+<instance part="IC201" gate="-2OE_1" x="160.02" y="55.88" smashed="yes" rot="MR180">
+<attribute name="NAME" x="160.02" y="61.595" size="1.778" layer="95" rot="MR0"/>
 </instance>
-<instance part="IC201" gate="-1OE_3" x="200.66" y="43.18" smashed="yes" rot="MR270">
-<attribute name="NAME" x="204.978" y="40.259" size="1.778" layer="95" rot="MR180"/>
+<instance part="IC201" gate="-2OE_3" x="241.3" y="55.88" smashed="yes" rot="MR180">
+<attribute name="NAME" x="241.808" y="63.119" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="IC201" gate="-1OE_4" x="287.02" y="50.8"/>
-<instance part="IC201" gate="-2OE_1" x="170.18" y="55.88" smashed="yes" rot="MR90">
-<attribute name="NAME" x="165.1" y="59.055" size="1.778" layer="95" rot="MR0"/>
+<instance part="IC201" gate="-2OE_2" x="198.12" y="55.88" smashed="yes" rot="MR180">
+<attribute name="NAME" x="200.66" y="61.595" size="1.778" layer="95" rot="MR0"/>
 </instance>
-<instance part="IC201" gate="-2OE_2" x="200.66" y="25.4" smashed="yes" rot="MR90">
-<attribute name="NAME" x="205.232" y="23.241" size="1.778" layer="95"/>
-</instance>
-<instance part="IC201" gate="-2OE_3" x="185.42" y="40.64" smashed="yes" rot="MR90">
-<attribute name="NAME" x="180.34" y="43.815" size="1.778" layer="95" rot="MR0"/>
-</instance>
-<instance part="IC201" gate="-2OE_4" x="287.02" y="35.56"/>
-<instance part="IC202" gate="-1OE_1" x="208.28" y="55.88" smashed="yes" rot="R90">
-<attribute name="DESCRIPTION" x="208.28" y="55.88" size="1.27" layer="96" rot="R90" display="off"/>
-<attribute name="MANUFACTURER" x="208.28" y="55.88" size="1.27" layer="96" rot="R90" display="off"/>
-<attribute name="SOURCE" x="208.28" y="55.88" size="1.27" layer="96" rot="R90" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="208.28" y="55.88" size="1.27" layer="96" rot="R90" display="off"/>
-<attribute name="POPULATED" x="208.28" y="55.88" size="1.27" layer="96" rot="R90" display="off"/>
-<attribute name="CLASS" x="208.28" y="55.88" size="1.27" layer="96" rot="R90" display="off"/>
-<attribute name="LINK" x="208.28" y="55.88" size="1.27" layer="96" rot="R90" display="off"/>
-<attribute name="NAME" x="203.962" y="61.087" size="1.778" layer="95" rot="R180"/>
+<instance part="IC201" gate="-2OE_4" x="292.1" y="45.72"/>
+<instance part="IC202" gate="-1OE_1" x="160.02" y="43.18" smashed="yes">
+<attribute name="DESCRIPTION" x="160.02" y="43.18" size="1.27" layer="96" display="off"/>
+<attribute name="MANUFACTURER" x="160.02" y="43.18" size="1.27" layer="96" display="off"/>
+<attribute name="SOURCE" x="160.02" y="43.18" size="1.27" layer="96" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="160.02" y="43.18" size="1.27" layer="96" display="off"/>
+<attribute name="POPULATED" x="160.02" y="43.18" size="1.27" layer="96" display="off"/>
+<attribute name="CLASS" x="160.02" y="43.18" size="1.27" layer="96" display="off"/>
+<attribute name="LINK" x="160.02" y="43.18" size="1.27" layer="96" display="off"/>
+<attribute name="NAME" x="158.242" y="48.387" size="1.778" layer="95" rot="R180"/>
 </instance>
 <instance part="IC202" gate="-CTL/PWR" x="96.52" y="33.02"/>
-<instance part="IC202" gate="-1OE_2" x="226.06" y="40.64" smashed="yes" rot="R90">
-<attribute name="NAME" x="221.742" y="45.339" size="1.778" layer="95" rot="R180"/>
+<instance part="IC202" gate="-1OE_2" x="198.12" y="43.18" smashed="yes">
+<attribute name="NAME" x="198.882" y="49.657" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="IC202" gate="-1OE_3" x="241.3" y="25.4" smashed="yes" rot="R90">
-<attribute name="NAME" x="246.38" y="23.495" size="1.778" layer="95"/>
+<instance part="IC202" gate="-1OE_3" x="241.3" y="43.18" smashed="yes">
+<attribute name="NAME" x="241.3" y="50.165" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="IC202" gate="-1OE_4" x="302.26" y="50.8"/>
-<instance part="IC202" gate="-2OE_1" x="208.28" y="73.66" smashed="yes" rot="R270">
-<attribute name="NAME" x="213.36" y="69.215" size="1.778" layer="95"/>
+<instance part="IC202" gate="-1OE_4" x="292.1" y="30.48"/>
+<instance part="IC202" gate="-2OE_1" x="160.02" y="30.48" smashed="yes">
+<attribute name="NAME" x="157.48" y="37.465" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="IC202" gate="-2OE_2" x="226.06" y="58.42" smashed="yes" rot="R270">
-<attribute name="NAME" x="231.14" y="53.975" size="1.778" layer="95"/>
+<instance part="IC202" gate="-2OE_2" x="198.12" y="30.48" smashed="yes">
+<attribute name="NAME" x="200.66" y="37.465" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="IC202" gate="-2OE_3" x="241.3" y="43.18" smashed="yes" rot="R270">
-<attribute name="NAME" x="246.126" y="38.989" size="1.778" layer="95"/>
+<instance part="IC202" gate="-2OE_3" x="241.3" y="30.48" smashed="yes">
+<attribute name="NAME" x="241.554" y="37.211" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="IC202" gate="-2OE_4" x="302.26" y="35.56"/>
+<instance part="IC202" gate="-2OE_4" x="309.88" y="30.48"/>
 <instance part="C203" gate="G$1" x="109.22" y="30.48" smashed="yes" rot="R90">
 <attribute name="NAME" x="107.188" y="34.036" size="1.27" layer="95" font="vector" rot="R90"/>
 <attribute name="VALUE" x="107.188" y="26.162" size="1.27" layer="96" font="vector" rot="R90"/>
@@ -23197,20 +23156,23 @@ detection</text>
 <attribute name="LINK" x="109.22" y="30.48" size="1.778" layer="96" rot="R180" display="off"/>
 </instance>
 <instance part="GND4" gate="1" x="101.6" y="15.24"/>
-<instance part="R205" gate="G$1" x="68.58" y="27.94" smashed="yes" rot="R270">
-<attribute name="NAME" x="65.278" y="29.464" size="1.27" layer="95" font="vector" rot="R270"/>
-<attribute name="VALUE" x="70.485" y="33.02" size="1.27" layer="96" font="vector" rot="R270"/>
-<attribute name="DESCRIPTION" x="68.58" y="27.94" size="1.778" layer="96" display="off"/>
-<attribute name="MANUFACTURER" x="68.58" y="27.94" size="1.778" layer="96" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" x="68.58" y="27.94" size="1.778" layer="96" display="off"/>
-<attribute name="SOURCE" x="68.58" y="27.94" size="1.778" layer="96" display="off"/>
-<attribute name="SOURCEPARTNUMBER" x="68.58" y="27.94" size="1.778" layer="96" display="off"/>
-<attribute name="ROHSCERTIFICATE" x="68.58" y="27.94" size="1.778" layer="96" display="off"/>
-<attribute name="POPULATED" x="68.58" y="27.94" size="1.778" layer="96" display="off"/>
-<attribute name="CLASS" x="68.58" y="27.94" size="1.778" layer="96" display="off"/>
-<attribute name="LINK" x="68.58" y="27.94" size="1.778" layer="96" display="off"/>
+<instance part="R205" gate="G$1" x="71.12" y="22.86" smashed="yes" rot="R270">
+<attribute name="NAME" x="67.818" y="24.384" size="1.27" layer="95" font="vector" rot="R270"/>
+<attribute name="VALUE" x="73.025" y="27.94" size="1.27" layer="96" font="vector" rot="R270"/>
+<attribute name="DESCRIPTION" x="71.12" y="22.86" size="1.778" layer="96" display="off"/>
+<attribute name="MANUFACTURER" x="71.12" y="22.86" size="1.778" layer="96" display="off"/>
+<attribute name="MANUFACTURERPARTNUMBER" x="71.12" y="22.86" size="1.778" layer="96" display="off"/>
+<attribute name="SOURCE" x="71.12" y="22.86" size="1.778" layer="96" display="off"/>
+<attribute name="SOURCEPARTNUMBER" x="71.12" y="22.86" size="1.778" layer="96" display="off"/>
+<attribute name="ROHSCERTIFICATE" x="71.12" y="22.86" size="1.778" layer="96" display="off"/>
+<attribute name="POPULATED" x="71.12" y="22.86" size="1.778" layer="96" display="off"/>
+<attribute name="CLASS" x="71.12" y="22.86" size="1.778" layer="96" display="off"/>
+<attribute name="LINK" x="71.12" y="22.86" size="1.778" layer="96" display="off"/>
 </instance>
-<instance part="GND5" gate="1" x="68.58" y="17.78"/>
+<instance part="GND5" gate="1" x="71.12" y="15.24"/>
+<instance part="IC201" gate="-1OE_1" x="292.1" y="73.66"/>
+<instance part="IC201" gate="-1OE_2" x="309.88" y="73.66"/>
+<instance part="IC201" gate="-1OE_3" x="292.1" y="60.96"/>
 </instances>
 <busses>
 </busses>
@@ -23306,11 +23268,6 @@ detection</text>
 <pinref part="IC201" gate="-CTL/PWR" pin="GND"/>
 </segment>
 <segment>
-<pinref part="R204" gate="G$1" pin="2"/>
-<pinref part="GND603" gate="1" pin="GND"/>
-<wire x1="68.58" y1="68.58" x2="68.58" y2="66.04" width="0.1524" layer="91"/>
-</segment>
-<segment>
 <pinref part="TC201" gate="A" pin="2"/>
 <wire x1="347.98" y1="121.92" x2="350.52" y2="121.92" width="0.1524" layer="91"/>
 <label x="350.52" y="121.92" size="1.27" layer="95" xref="yes"/>
@@ -23389,7 +23346,6 @@ detection</text>
 <segment>
 <pinref part="R205" gate="G$1" pin="2"/>
 <pinref part="GND5" gate="1" pin="GND"/>
-<wire x1="68.58" y1="20.32" x2="68.58" y2="22.86" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="VDD_1V8_SIMTRACE12" class="3">
@@ -23618,53 +23574,62 @@ detection</text>
 </net>
 <net name="!USIM_RST" class="0">
 <segment>
-<wire x1="198.12" y1="35.56" x2="193.04" y2="35.56" width="0.1524" layer="91"/>
-<label x="193.04" y="35.56" size="1.27" layer="95" rot="MR0" xref="yes"/>
-<pinref part="IC201" gate="-1OE_3" pin="A"/>
+<label x="251.46" y="53.34" size="1.27" layer="95" rot="MR180" xref="yes"/>
+<pinref part="IC201" gate="-2OE_3" pin="A"/>
+<wire x1="251.46" y1="53.34" x2="248.92" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="IC202" gate="-1OE_3" pin="A"/>
+<wire x1="248.92" y1="45.72" x2="248.92" y2="53.34" width="0.1524" layer="91"/>
+<junction x="248.92" y="53.34"/>
 </segment>
 </net>
 <net name="USIM_CLK" class="0">
 <segment>
-<wire x1="182.88" y1="50.8" x2="177.8" y2="50.8" width="0.1524" layer="91"/>
-<label x="177.8" y="50.8" size="1.27" layer="95" rot="MR0" xref="yes"/>
-<pinref part="IC201" gate="-1OE_2" pin="A"/>
+<label x="208.28" y="53.34" size="1.27" layer="95" rot="MR180" xref="yes"/>
+<pinref part="IC201" gate="-2OE_2" pin="A"/>
+<wire x1="208.28" y1="53.34" x2="205.74" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="IC202" gate="-1OE_2" pin="A"/>
+<wire x1="205.74" y1="45.72" x2="205.74" y2="53.34" width="0.1524" layer="91"/>
+<junction x="205.74" y="53.34"/>
 </segment>
 </net>
 <net name="!MDM_USIM_RST" class="0">
 <segment>
-<label x="246.38" y="35.56" size="1.27" layer="95" xref="yes"/>
+<label x="251.46" y="33.02" size="1.27" layer="95" xref="yes"/>
 <pinref part="IC202" gate="-2OE_3" pin="A"/>
-<wire x1="243.84" y1="35.56" x2="246.38" y2="35.56" width="0.1524" layer="91"/>
+<wire x1="248.92" y1="33.02" x2="251.46" y2="33.02" width="0.1524" layer="91"/>
 <pinref part="IC202" gate="-1OE_3" pin="B"/>
-<wire x1="243.84" y1="33.02" x2="243.84" y2="35.56" width="0.1524" layer="91"/>
-<junction x="243.84" y="35.56"/>
+<wire x1="248.92" y1="40.64" x2="248.92" y2="33.02" width="0.1524" layer="91"/>
+<junction x="248.92" y="33.02"/>
 </segment>
 </net>
 <net name="MDM_USIM_CLK" class="0">
 <segment>
-<wire x1="228.6" y1="48.26" x2="228.6" y2="50.8" width="0.1524" layer="91"/>
-<label x="231.14" y="50.8" size="1.27" layer="95" xref="yes"/>
+<wire x1="205.74" y1="40.64" x2="205.74" y2="33.02" width="0.1524" layer="91"/>
+<label x="208.28" y="33.02" size="1.27" layer="95" xref="yes"/>
 <pinref part="IC202" gate="-2OE_2" pin="A"/>
-<wire x1="228.6" y1="50.8" x2="231.14" y2="50.8" width="0.1524" layer="91"/>
-<junction x="228.6" y="50.8"/>
+<wire x1="205.74" y1="33.02" x2="208.28" y2="33.02" width="0.1524" layer="91"/>
+<junction x="205.74" y="33.02"/>
 <pinref part="IC202" gate="-1OE_2" pin="B"/>
 </segment>
 </net>
 <net name="MDM_USIM_IO" class="0">
 <segment>
-<label x="213.36" y="66.04" size="1.27" layer="95" xref="yes"/>
-<wire x1="210.82" y1="66.04" x2="213.36" y2="66.04" width="0.1524" layer="91"/>
+<label x="170.18" y="33.02" size="1.27" layer="95" xref="yes"/>
+<wire x1="167.64" y1="33.02" x2="170.18" y2="33.02" width="0.1524" layer="91"/>
 <pinref part="IC202" gate="-2OE_1" pin="A"/>
 <pinref part="IC202" gate="-1OE_1" pin="B"/>
-<wire x1="210.82" y1="63.5" x2="210.82" y2="66.04" width="0.1524" layer="91"/>
-<junction x="210.82" y="66.04"/>
+<wire x1="167.64" y1="40.64" x2="167.64" y2="33.02" width="0.1524" layer="91"/>
+<junction x="167.64" y="33.02"/>
 </segment>
 </net>
 <net name="USIM_IO" class="0">
 <segment>
-<wire x1="167.64" y1="66.04" x2="162.56" y2="66.04" width="0.1524" layer="91"/>
-<label x="162.56" y="66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="IC201" gate="-1OE_1" pin="A"/>
+<label x="170.18" y="53.34" size="1.27" layer="95" xref="yes"/>
+<pinref part="IC201" gate="-2OE_1" pin="A"/>
+<wire x1="170.18" y1="53.34" x2="167.64" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="IC202" gate="-1OE_1" pin="A"/>
+<wire x1="167.64" y1="45.72" x2="167.64" y2="53.34" width="0.1524" layer="91"/>
+<junction x="167.64" y="53.34"/>
 </segment>
 </net>
 <net name="ST12_LED_R" class="0">
@@ -23700,21 +23665,21 @@ detection</text>
 <label x="261.62" y="127" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<wire x1="132.08" y1="38.1" x2="132.08" y2="35.56" width="0.1524" layer="91"/>
-<label x="132.08" y="35.56" size="1.27" layer="95" font="vector" rot="R270" xref="yes"/>
+<wire x1="226.06" y1="10.16" x2="228.6" y2="10.16" width="0.1524" layer="91"/>
+<label x="228.6" y="10.16" size="1.27" layer="95" font="vector" xref="yes"/>
 </segment>
 </net>
 <net name="USIM_VDD" class="3">
 <segment>
-<wire x1="132.08" y1="55.88" x2="132.08" y2="58.42" width="0.1524" layer="91"/>
-<label x="132.08" y="58.42" size="1.27" layer="95" font="vector" rot="R90" xref="yes"/>
+<wire x1="208.28" y1="10.16" x2="205.74" y2="10.16" width="0.1524" layer="91"/>
+<label x="205.74" y="10.16" size="1.27" layer="95" font="vector" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="!ST_UART1_RST" class="0">
 <segment>
-<wire x1="198.12" y1="33.02" x2="193.04" y2="33.02" width="0.1524" layer="91"/>
-<label x="193.04" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="IC201" gate="-2OE_2" pin="B"/>
+<wire x1="248.92" y1="58.42" x2="251.46" y2="58.42" width="0.1524" layer="91"/>
+<label x="251.46" y="58.42" size="1.27" layer="95" xref="yes"/>
+<pinref part="IC201" gate="-2OE_3" pin="B"/>
 </segment>
 <segment>
 <pinref part="U202" gate="G$1" pin="A20/PWMH1/RTS1/PA24"/>
@@ -23724,9 +23689,9 @@ detection</text>
 </net>
 <net name="ST_UART1_CLK" class="0">
 <segment>
-<wire x1="182.88" y1="48.26" x2="177.8" y2="48.26" width="0.1524" layer="91"/>
-<label x="177.8" y="48.26" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="IC201" gate="-2OE_3" pin="B"/>
+<wire x1="205.74" y1="58.42" x2="208.28" y2="58.42" width="0.1524" layer="91"/>
+<label x="208.28" y="58.42" size="1.27" layer="95" xref="yes"/>
+<pinref part="IC201" gate="-2OE_2" pin="B"/>
 </segment>
 <segment>
 <pinref part="U202" gate="G$1" pin="A19/PWMH0/SCK1/PA23"/>
@@ -23741,8 +23706,8 @@ detection</text>
 </net>
 <net name="ST_UART1_IO" class="0">
 <segment>
-<wire x1="167.64" y1="63.5" x2="162.56" y2="63.5" width="0.1524" layer="91"/>
-<label x="162.56" y="63.5" size="1.27" layer="95" rot="MR0" xref="yes"/>
+<wire x1="167.64" y1="58.42" x2="170.18" y2="58.42" width="0.1524" layer="91"/>
+<label x="170.18" y="58.42" size="1.27" layer="95" rot="MR180" xref="yes"/>
 <pinref part="IC201" gate="-2OE_1" pin="B"/>
 </segment>
 <segment>
@@ -23759,10 +23724,11 @@ detection</text>
 <wire x1="259.08" y1="149.86" x2="254" y2="149.86" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="!CONNECT_ST_USIM" class="0">
+<net name="!CONNECT_UART1" class="0">
 <segment>
-<wire x1="66.04" y1="88.9" x2="63.5" y2="88.9" width="0.1524" layer="91"/>
-<label x="63.5" y="88.9" size="1.27" layer="95" rot="R180" xref="yes"/>
+<label x="71.12" y="76.2" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="IC201" gate="-CTL/PWR" pin="!2OE"/>
+<wire x1="86.36" y1="76.2" x2="71.12" y2="76.2" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U202" gate="G$1" pin="A16/AD3/PWML1/RF/PA20"/>
@@ -24057,8 +24023,8 @@ detection</text>
 </segment>
 <segment>
 <pinref part="IC202" gate="-2OE_1" pin="B"/>
-<wire x1="205.74" y1="66.04" x2="203.2" y2="66.04" width="0.1524" layer="91"/>
-<label x="203.2" y="66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="167.64" y1="27.94" x2="170.18" y2="27.94" width="0.1524" layer="91"/>
+<label x="170.18" y="27.94" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="ST_UART2_CLK" class="0">
@@ -24074,8 +24040,8 @@ detection</text>
 </segment>
 <segment>
 <pinref part="IC202" gate="-2OE_2" pin="B"/>
-<wire x1="223.52" y1="50.8" x2="220.98" y2="50.8" width="0.1524" layer="91"/>
-<label x="220.98" y="50.8" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="205.74" y1="27.94" x2="208.28" y2="27.94" width="0.1524" layer="91"/>
+<label x="208.28" y="27.94" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="FREE_(ST34_RESET)" class="0">
@@ -24100,8 +24066,8 @@ detection</text>
 </segment>
 <segment>
 <pinref part="IC202" gate="-2OE_3" pin="B"/>
-<wire x1="238.76" y1="35.56" x2="236.22" y2="35.56" width="0.1524" layer="91"/>
-<label x="236.22" y="35.56" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="248.92" y1="27.94" x2="251.46" y2="27.94" width="0.1524" layer="91"/>
+<label x="251.46" y="27.94" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="FREE_(_PERST2)" class="0">
@@ -24125,56 +24091,15 @@ detection</text>
 <label x="271.78" y="129.54" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
-<net name="N$42" class="0">
-<segment>
-<pinref part="IC201" gate="-CTL/PWR" pin="!2OE"/>
-<wire x1="86.36" y1="76.2" x2="83.82" y2="76.2" width="0.1524" layer="91"/>
-</segment>
-</net>
-<net name="N$43" class="0">
-<segment>
-<pinref part="IC202" gate="-CTL/PWR" pin="!2OE"/>
-<wire x1="86.36" y1="30.48" x2="83.82" y2="30.48" width="0.1524" layer="91"/>
-</segment>
-</net>
 <net name="N$44" class="0">
 <segment>
 <pinref part="IC202" gate="-CTL/PWR" pin="!1OE"/>
-<wire x1="86.36" y1="35.56" x2="68.58" y2="35.56" width="0.1524" layer="91"/>
+<wire x1="86.36" y1="35.56" x2="71.12" y2="35.56" width="0.1524" layer="91"/>
 <pinref part="R205" gate="G$1" pin="1"/>
-<wire x1="68.58" y1="35.56" x2="66.04" y2="35.56" width="0.1524" layer="91"/>
-<wire x1="68.58" y1="33.02" x2="68.58" y2="35.56" width="0.1524" layer="91"/>
-<junction x="68.58" y="35.56"/>
-</segment>
-</net>
-<net name="N$1" class="0">
-<segment>
-<pinref part="IC201" gate="-1OE_1" pin="B"/>
-<pinref part="IC201" gate="-2OE_1" pin="A"/>
-<wire x1="172.72" y1="66.04" x2="172.72" y2="63.5" width="0.1524" layer="91"/>
-<pinref part="IC202" gate="-1OE_1" pin="A"/>
-<wire x1="205.74" y1="63.5" x2="172.72" y2="63.5" width="0.1524" layer="91"/>
-<junction x="172.72" y="63.5"/>
-</segment>
-</net>
-<net name="N$2" class="0">
-<segment>
-<pinref part="IC201" gate="-1OE_2" pin="B"/>
-<pinref part="IC201" gate="-2OE_3" pin="A"/>
-<wire x1="187.96" y1="50.8" x2="187.96" y2="48.26" width="0.1524" layer="91"/>
-<pinref part="IC202" gate="-1OE_2" pin="A"/>
-<wire x1="223.52" y1="48.26" x2="187.96" y2="48.26" width="0.1524" layer="91"/>
-<junction x="187.96" y="48.26"/>
-</segment>
-</net>
-<net name="N$3" class="0">
-<segment>
-<pinref part="IC201" gate="-1OE_3" pin="B"/>
-<pinref part="IC201" gate="-2OE_2" pin="A"/>
-<wire x1="203.2" y1="35.56" x2="203.2" y2="33.02" width="0.1524" layer="91"/>
-<pinref part="IC202" gate="-1OE_3" pin="A"/>
-<wire x1="238.76" y1="33.02" x2="203.2" y2="33.02" width="0.1524" layer="91"/>
-<junction x="203.2" y="33.02"/>
+<wire x1="71.12" y1="35.56" x2="68.58" y2="35.56" width="0.1524" layer="91"/>
+<wire x1="71.12" y1="27.94" x2="71.12" y2="35.56" width="0.1524" layer="91"/>
+<junction x="71.12" y="35.56"/>
+<label x="68.58" y="35.56" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="FREE_(FOR_12/34_ID)" class="3">
@@ -24184,14 +24109,16 @@ detection</text>
 <label x="271.78" y="182.88" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
-<net name="N$8" class="0">
+<net name="!CONNECT_UART2" class="0">
 <segment>
-<pinref part="IC201" gate="-CTL/PWR" pin="!1OE"/>
-<pinref part="R204" gate="G$1" pin="1"/>
-<wire x1="68.58" y1="81.28" x2="68.58" y2="78.74" width="0.1524" layer="91"/>
-<wire x1="86.36" y1="81.28" x2="68.58" y2="81.28" width="0.1524" layer="91"/>
-<wire x1="68.58" y1="81.28" x2="66.04" y2="81.28" width="0.1524" layer="91"/>
-<junction x="68.58" y="81.28"/>
+<pinref part="U202" gate="G$1" pin="TCLK1/DSR1/PA28"/>
+<wire x1="254" y1="147.32" x2="261.62" y2="147.32" width="0.1524" layer="91"/>
+<label x="261.62" y="147.32" size="1.27" layer="95" xref="yes"/>
+</segment>
+<segment>
+<pinref part="IC202" gate="-CTL/PWR" pin="!2OE"/>
+<wire x1="86.36" y1="30.48" x2="68.58" y2="30.48" width="0.1524" layer="91"/>
+<label x="68.58" y="30.48" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 </nets>