WIP: click-generator: Replace U3 (so far SAMD11) with SAMD21

Closes: OS#3856

1 files changed, 88 insertions, 152 deletions

diff --git a/clock-generator/clock-generator.brd b/clock-generator/clock-generator.brd
index 455cd36..494878d 100644
--- a/clock-generator/clock-generator.brd
+++ b/clock-generator/clock-generator.brd
@@ -760,70 +760,54 @@ Copyright: Würth Elektronik</description>
 USE AT YOUR OWN RISK!&lt;p&gt;
 &lt;author&gt;Copyright (C) 2008-2009, Bob Starr&lt;br&gt; http://www.bobstarr.net&lt;br&gt;&lt;/author&gt;</description>
 <packages>
-<package name="QFN24_4X4">
-<smd name="1" x="-1.975" y="1.2446" dx="0.25" dy="0.7" layer="1" rot="R270"/>
-<smd name="2" x="-1.975" y="0.762" dx="0.25" dy="0.7" layer="1" rot="R270"/>
-<smd name="3" x="-1.975" y="0.254" dx="0.25" dy="0.7" layer="1" rot="R270"/>
-<smd name="4" x="-1.975" y="-0.254" dx="0.25" dy="0.7" layer="1" rot="R270"/>
-<smd name="5" x="-1.975" y="-0.762" dx="0.25" dy="0.7" layer="1" rot="R270"/>
-<smd name="6" x="-1.975" y="-1.2446" dx="0.25" dy="0.7" layer="1" rot="R270"/>
-<smd name="7" x="-1.2446" y="-1.975" dx="0.25" dy="0.7" layer="1" rot="R180"/>
-<smd name="8" x="-0.762" y="-1.975" dx="0.25" dy="0.7" layer="1" rot="R180"/>
-<smd name="9" x="-0.254" y="-1.975" dx="0.25" dy="0.7" layer="1" rot="R180"/>
-<smd name="10" x="0.254" y="-1.975" dx="0.25" dy="0.7" layer="1" rot="R180"/>
-<smd name="11" x="0.762" y="-1.975" dx="0.25" dy="0.7" layer="1" rot="R180"/>
-<smd name="12" x="1.2446" y="-1.975" dx="0.25" dy="0.7" layer="1" rot="R180"/>
-<smd name="13" x="1.975" y="-1.2446" dx="0.25" dy="0.7" layer="1" rot="R270"/>
-<smd name="14" x="1.975" y="-0.762" dx="0.25" dy="0.7" layer="1" rot="R270"/>
-<smd name="15" x="1.975" y="-0.254" dx="0.25" dy="0.7" layer="1" rot="R270"/>
-<smd name="16" x="1.975" y="0.254" dx="0.25" dy="0.7" layer="1" rot="R270"/>
-<smd name="17" x="1.975" y="0.762" dx="0.25" dy="0.7" layer="1" rot="R270"/>
-<smd name="18" x="1.975" y="1.2446" dx="0.25" dy="0.7" layer="1" rot="R270"/>
-<smd name="19" x="1.2446" y="1.975" dx="0.25" dy="0.7" layer="1" rot="R180"/>
-<smd name="20" x="0.762" y="1.975" dx="0.25" dy="0.7" layer="1" rot="R180"/>
-<smd name="21" x="0.254" y="1.975" dx="0.25" dy="0.7" layer="1" rot="R180"/>
-<smd name="22" x="-0.254" y="1.975" dx="0.25" dy="0.7" layer="1" rot="R180"/>
-<smd name="23" x="-0.762" y="1.975" dx="0.25" dy="0.7" layer="1" rot="R180"/>
-<smd name="24" x="-1.2446" y="1.975" dx="0.25" dy="0.7" layer="1" rot="R180"/>
-<smd name="25" x="0" y="0" dx="2.75" dy="2.75" layer="1"/>
-<wire x1="1.9812" y1="1.7272" x2="1.9812" y2="1.9812" width="0.1524" layer="51"/>
-<wire x1="1.7272" y1="-1.9812" x2="1.9812" y2="-1.9812" width="0.1524" layer="51"/>
-<wire x1="-1.9812" y1="-1.7272" x2="-1.9812" y2="-1.9812" width="0.1524" layer="51"/>
-<wire x1="-1.7272" y1="1.9812" x2="-1.9812" y2="1.9812" width="0.1524" layer="51"/>
-<wire x1="-1.9812" y1="-1.9812" x2="-1.7272" y2="-1.9812" width="0.1524" layer="51"/>
-<wire x1="1.9812" y1="-1.9812" x2="1.9812" y2="-1.7272" width="0.1524" layer="51"/>
-<wire x1="1.9812" y1="1.9812" x2="1.7272" y2="1.9812" width="0.1524" layer="51"/>
-<wire x1="-1.9812" y1="1.9812" x2="-1.9812" y2="1.7272" width="0.1524" layer="51"/>
-<wire x1="-1.9812" y1="0.7112" x2="-0.7112" y2="1.9812" width="0.1524" layer="25"/>
-<wire x1="1.397" y1="1.9812" x2="1.0922" y2="1.9812" width="0.1524" layer="25"/>
-<wire x1="0.4064" y1="1.9812" x2="0.1016" y2="1.9812" width="0.1524" layer="25"/>
-<wire x1="-0.1016" y1="1.9812" x2="-0.4064" y2="1.9812" width="0.1524" layer="25"/>
-<wire x1="-0.6096" y1="1.9812" x2="-0.9144" y2="1.9812" width="0.1524" layer="25"/>
-<wire x1="-1.0922" y1="1.9812" x2="-1.397" y2="1.9812" width="0.1524" layer="25"/>
-<wire x1="-1.9812" y1="1.397" x2="-1.9812" y2="1.0922" width="0.1524" layer="25"/>
-<wire x1="-1.9812" y1="0.9144" x2="-1.9812" y2="0.6096" width="0.1524" layer="25"/>
-<wire x1="-1.9812" y1="0.4064" x2="-1.9812" y2="0.1016" width="0.1524" layer="25"/>
-<wire x1="-1.9812" y1="-0.1016" x2="-1.9812" y2="-0.4064" width="0.1524" layer="25"/>
-<wire x1="-1.9812" y1="-0.6096" x2="-1.9812" y2="-0.9144" width="0.1524" layer="25"/>
-<wire x1="-1.9812" y1="-1.0922" x2="-1.9812" y2="-1.397" width="0.1524" layer="25"/>
-<wire x1="-1.397" y1="-1.9812" x2="-1.0922" y2="-1.9812" width="0.1524" layer="25"/>
-<wire x1="-0.9144" y1="-1.9812" x2="-0.6096" y2="-1.9812" width="0.1524" layer="25"/>
-<wire x1="-0.4064" y1="-1.9812" x2="-0.1016" y2="-1.9812" width="0.1524" layer="25"/>
-<wire x1="0.6096" y1="-1.9812" x2="0.9144" y2="-1.9812" width="0.1524" layer="25"/>
-<wire x1="1.0922" y1="-1.9812" x2="1.397" y2="-1.9812" width="0.1524" layer="25"/>
-<wire x1="1.9812" y1="-1.397" x2="1.9812" y2="-1.0922" width="0.1524" layer="25"/>
-<wire x1="1.9812" y1="-0.9144" x2="1.9812" y2="-0.6096" width="0.1524" layer="25"/>
-<wire x1="1.9812" y1="-0.4064" x2="1.9812" y2="-0.1016" width="0.1524" layer="25"/>
-<wire x1="1.9812" y1="0.1016" x2="1.9812" y2="0.4064" width="0.1524" layer="25"/>
-<wire x1="1.9812" y1="0.6096" x2="1.9812" y2="0.9144" width="0.1524" layer="25"/>
-<wire x1="1.9812" y1="1.0922" x2="1.9812" y2="1.397" width="0.1524" layer="25"/>
-<wire x1="-1.9812" y1="-1.9812" x2="1.9812" y2="-1.9812" width="0.1524" layer="25"/>
-<wire x1="1.9812" y1="-1.9812" x2="1.9812" y2="1.9812" width="0.1524" layer="25"/>
-<wire x1="1.9812" y1="1.9812" x2="-1.9812" y2="1.9812" width="0.1524" layer="25"/>
-<wire x1="-1.9812" y1="1.9812" x2="-1.9812" y2="-1.9812" width="0.1524" layer="25"/>
-<text x="-2.8702" y="3.175" size="1.27" layer="25" ratio="6" rot="SR0">&gt;NAME</text>
-<text x="4.445" y="-2.1844" size="1.27" layer="27" ratio="6" rot="SR90">&gt;VALUE</text>
-<circle x="-2" y="2" radius="0.1" width="0.127" layer="21"/>
+<package name="QFN32_5X5">
+<wire x1="-2.5" y1="2.1" x2="-2.5" y2="2.5" width="0.127" layer="21"/>
+<wire x1="-2.5" y1="2.5" x2="-2.1" y2="2.5" width="0.127" layer="21"/>
+<wire x1="2.1" y1="2.5" x2="2.5" y2="2.5" width="0.127" layer="21"/>
+<wire x1="2.5" y1="2.5" x2="2.5" y2="2.1" width="0.127" layer="21"/>
+<wire x1="2.5" y1="-2.1" x2="2.5" y2="-2.5" width="0.127" layer="21"/>
+<wire x1="2.5" y1="-2.5" x2="2.1" y2="-2.5" width="0.127" layer="21"/>
+<wire x1="-2.5" y1="-2.1" x2="-2.1" y2="-2.5" width="0.127" layer="21"/>
+<circle x="-2.55" y="-2.55" radius="0.1" width="0.127" layer="21"/>
+<smd name="1" x="-1.75" y="-2.5" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R90"/>
+<smd name="2" x="-1.25" y="-2.5" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R90"/>
+<smd name="3" x="-0.75" y="-2.5" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R90"/>
+<smd name="4" x="-0.25" y="-2.5" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R90"/>
+<smd name="5" x="0.25" y="-2.5" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R90"/>
+<smd name="6" x="0.75" y="-2.5" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R90"/>
+<smd name="7" x="1.25" y="-2.5" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R90"/>
+<smd name="8" x="1.75" y="-2.5" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R90"/>
+<smd name="9" x="2.5" y="-1.75" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R180"/>
+<smd name="10" x="2.5" y="-1.25" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R180"/>
+<smd name="11" x="2.5" y="-0.75" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R180"/>
+<smd name="12" x="2.5" y="-0.25" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R180"/>
+<smd name="13" x="2.5" y="0.25" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R180"/>
+<smd name="14" x="2.5" y="0.75" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R180"/>
+<smd name="15" x="2.5" y="1.25" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R180"/>
+<smd name="16" x="2.5" y="1.75" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R180"/>
+<smd name="17" x="1.75" y="2.5" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R270"/>
+<smd name="18" x="1.25" y="2.5" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R270"/>
+<smd name="19" x="0.75" y="2.5" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R270"/>
+<smd name="20" x="0.25" y="2.5" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R270"/>
+<smd name="21" x="-0.25" y="2.5" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R270"/>
+<smd name="22" x="-0.75" y="2.5" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R270"/>
+<smd name="23" x="-1.25" y="2.5" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R270"/>
+<smd name="24" x="-1.75" y="2.5" dx="0.8" dy="0.28" layer="1" roundness="100" rot="R270"/>
+<smd name="25" x="-2.5" y="1.75" dx="0.8" dy="0.28" layer="1" roundness="100"/>
+<smd name="26" x="-2.5" y="1.25" dx="0.8" dy="0.28" layer="1" roundness="100"/>
+<smd name="27" x="-2.5" y="0.75" dx="0.8" dy="0.28" layer="1" roundness="100"/>
+<smd name="28" x="-2.5" y="0.25" dx="0.8" dy="0.28" layer="1" roundness="100"/>
+<smd name="29" x="-2.5" y="-0.25" dx="0.8" dy="0.28" layer="1" roundness="100"/>
+<smd name="30" x="-2.5" y="-0.75" dx="0.8" dy="0.28" layer="1" roundness="100"/>
+<smd name="31" x="-2.5" y="-1.25" dx="0.8" dy="0.28" layer="1" roundness="100"/>
+<smd name="32" x="-2.5" y="-1.75" dx="0.8" dy="0.28" layer="1" roundness="100"/>
+<smd name="EXP" x="0" y="0" dx="3.6" dy="3.6" layer="1" roundness="15" thermals="no" cream="no"/>
+<text x="-1.27" y="3.174" size="0.4318" layer="25">&gt;NAME</text>
+<text x="-1.27" y="-3.555" size="0.4318" layer="27">&gt;VALUE</text>
+<rectangle x1="0.15" y1="0.15" x2="1.35" y2="1.35" layer="31"/>
+<rectangle x1="-1.35" y1="0.15" x2="-0.15" y2="1.35" layer="31"/>
+<rectangle x1="-1.35" y1="-1.35" x2="-0.15" y2="-0.15" layer="31"/>
+<rectangle x1="0.15" y1="-1.35" x2="1.35" y2="-0.15" layer="31"/>
 </package>
 </packages>
 </library>
@@ -2173,19 +2157,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="CLASS" value="IC" x="32.3895" y="95.504" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="LINK" value="https://www.digikey.de/product-detail/de/analog-devices-inc/ADP151AUJZ-3.0-R7/ADP151AUJZ-3.0-R7CT-ND/2334207" x="32.3895" y="95.504" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="U3" library="atmel-arm" package="QFN24_4X4" value="ATSAMD11-QFN24" x="21.59" y="78.232" smashed="yes" rot="R90">
-<attribute name="NAME" x="21.7678" y="80.899" size="1.016" layer="25" font="vector" ratio="14" rot="SR0"/>
-<attribute name="VALUE" x="23.7744" y="82.677" size="1.27" layer="27" ratio="6" rot="SR180"/>
-<attribute name="DESCRIPTION" value="IC MCU 32BIT 16KB FLASH 24QFN" x="21.59" y="78.232" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="MANUFACTURER" value="Microchip Technology" x="21.59" y="78.232" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="MANUFACTURERPARTNUMBER" value="ATSAMD11D14A-MUT" x="21.59" y="78.232" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="SOURCE" value="DIGIKEY" x="21.59" y="78.232" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="SOURCEPARTNUMBER" value="ATSAMD11D14A-MUTCT-ND" x="21.59" y="78.232" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="ROHSCERTIFICATE" value="Bleifrei / RoHS-konform" x="21.59" y="78.232" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="POPULATED" value="TRUE" x="21.59" y="78.232" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="CLASS" value="IC" x="21.59" y="78.232" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="LINK" value="https://www.digikey.de/product-detail/de/microchip-technology/ATSAMD11D14A-MUT/ATSAMD11D14A-MUTCT-ND/5226480" x="21.59" y="78.232" size="1.778" layer="27" rot="R90" display="off"/>
-</element>
 <element name="U4" library="jackens" package="QFN-20" value="SI5351C" x="23.114" y="23.114" smashed="yes" rot="R270">
 <attribute name="NAME" x="20.32" y="25.4" size="1.016" layer="21" font="vector" ratio="14"/>
 <attribute name="DESCRIPTION" value="IC CLK GENERATOR 200MHZ 20QFN" x="23.114" y="23.114" size="1.778" layer="27" rot="R270" display="off"/>
@@ -2838,6 +2809,7 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <attribute name="ROHSCERTIFICATE" value="Bleifrei / RoHS-konform" x="17.018" y="88.392" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
 <element name="U$1" library="oshw" package="OSHW_8MM" value="" x="24.0975" y="9.18"/>
+<element name="U3" library="atmel-arm" package="QFN32_5X5" value="ATSAMD21E" x="22.8225" y="75.0975"/>
 </elements>
 <signals>
 <signal name="GND" class="2">
@@ -2867,8 +2839,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <contactref element="D7" pad="1"/>
 <contactref element="D8" pad="1"/>
 <contactref element="D9" pad="1"/>
-<contactref element="U3" pad="23"/>
-<contactref element="U3" pad="25"/>
 <contactref element="C3" pad="1"/>
 <contactref element="C15" pad="1"/>
 <contactref element="X2" pad="1"/>
@@ -2944,11 +2914,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="23.876" y="23.876" extent="1-16" drill="0.3"/>
 <via x="23.876" y="22.352" extent="1-16" drill="0.3"/>
 <via x="22.352" y="22.352" extent="1-16" drill="0.3"/>
-<wire x1="19.615" y1="77.47" x2="19.05" y2="77.47" width="0.254" layer="1"/>
-<wire x1="19.05" y1="77.47" x2="18.796" y2="77.216" width="0.254" layer="1"/>
-<wire x1="18.796" y1="77.216" x2="18.542" y2="76.962" width="0.3048" layer="1"/>
-<wire x1="19.615" y1="77.47" x2="20.828" y2="77.47" width="0.254" layer="1"/>
-<wire x1="20.828" y1="77.47" x2="21.59" y2="78.232" width="0.254" layer="1"/>
 <wire x1="23.622" y1="18.034" x2="23.876" y2="17.272" width="0.4064" layer="1"/>
 <contactref element="IC1" pad="7"/>
 <via x="46.228" y="95.504" extent="1-16" drill="2.6" diameter="5"/>
@@ -3006,13 +2971,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="27.94" y="27.432" extent="1-16" drill="0.3"/>
 <via x="28.3225" y="26.162" extent="1-16" drill="0.3"/>
 <wire x1="23.114" y1="23.114" x2="22.352" y2="22.352" width="0.254" layer="1"/>
-<via x="20.828" y="78.994" extent="1-16" drill="0.3"/>
-<via x="22.352" y="78.994" extent="1-16" drill="0.3"/>
-<via x="22.352" y="77.47" extent="1-16" drill="0.3"/>
-<via x="20.828" y="77.47" extent="1-16" drill="0.3"/>
-<wire x1="20.828" y1="78.994" x2="21.59" y2="78.232" width="0.1524" layer="1"/>
-<wire x1="21.59" y1="78.232" x2="22.352" y2="77.47" width="0.1524" layer="1"/>
-<wire x1="21.59" y1="78.232" x2="22.352" y2="78.994" width="0.1524" layer="1"/>
 <contactref element="CLK0U" pad="GND@2"/>
 <contactref element="CLK0U" pad="GND@1"/>
 <contactref element="CLK1U" pad="GND@2"/>
@@ -3033,21 +2991,15 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="26.2885" y1="90.8045" x2="26.2885" y2="89.0265" width="0.254" layer="1"/>
 <contactref element="R17" pad="1"/>
 <via x="4.826" y="75.184" extent="1-16" drill="0.3"/>
-<wire x1="22.352" y1="77.47" x2="22.352" y2="78.994" width="1.016" layer="16"/>
-<wire x1="22.352" y1="78.994" x2="24.13" y2="78.994" width="1.016" layer="16"/>
-<wire x1="24.13" y1="78.994" x2="24.892" y2="79.756" width="1.016" layer="16"/>
-<wire x1="24.892" y1="79.756" x2="24.892" y2="80.772" width="1.016" layer="16"/>
-<wire x1="24.892" y1="80.772" x2="22.606" y2="83.058" width="1.016" layer="16"/>
-<wire x1="22.606" y1="83.058" x2="15.748" y2="83.058" width="1.016" layer="16"/>
-<wire x1="24.13" y1="78.994" x2="25.654" y2="77.47" width="1.016" layer="16"/>
-<via x="25.654" y="77.47" extent="1-16" drill="0.6"/>
-<wire x1="25.654" y1="77.47" x2="25.908" y2="77.216" width="1.016" layer="1"/>
 <polygon width="0.254" layer="16">
 <vertex x="20.32" y="79.502"/>
 <vertex x="22.86" y="79.502"/>
 <vertex x="22.86" y="76.962"/>
 <vertex x="20.32" y="76.962"/>
 </polygon>
+<contactref element="U3" pad="10"/>
+<contactref element="U3" pad="28"/>
+<contactref element="U3" pad="EXP"/>
 </signal>
 <signal name="VDD" class="2">
 <contactref element="C2" pad="1"/>
@@ -3194,12 +3146,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <signal name="I2C_SDA">
 <contactref element="U4" pad="5"/>
 <contactref element="R2" pad="2"/>
-<contactref element="U3" pad="15"/>
 <contactref element="IC1" pad="5"/>
 <contactref element="X4" pad="6"/>
-<wire x1="21.844" y1="80.207" x2="21.844" y2="80.8995" width="0.254" layer="1"/>
-<wire x1="21.844" y1="80.8995" x2="22.4785" y2="81.534" width="0.254" layer="1"/>
-<wire x1="22.4785" y1="81.534" x2="28.702" y2="81.534" width="0.254" layer="1"/>
 <wire x1="28.702" y1="81.534" x2="36.83" y2="73.406" width="0.254" layer="1"/>
 <wire x1="36.83" y1="73.406" x2="40.386" y2="69.85" width="0.254" layer="1"/>
 <wire x1="45.72" y1="71.882" x2="44.45" y2="70.612" width="0.254" layer="16"/>
@@ -3234,16 +3182,14 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="32.004" y1="71.12" x2="33.02" y2="72.136" width="0.254" layer="16"/>
 <via x="33.02" y="72.136" extent="1-16" drill="0.3"/>
 <wire x1="33.02" y1="72.136" x2="32.004" y2="72.136" width="0.254" layer="1"/>
+<contactref element="U3" pad="11"/>
+<wire x1="32.004" y1="73.406" x2="25.3225" y2="74.3475" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="I2C_SCL">
 <contactref element="U4" pad="4"/>
 <contactref element="R3" pad="2"/>
-<contactref element="U3" pad="16"/>
 <contactref element="IC1" pad="6"/>
 <contactref element="X4" pad="5"/>
-<wire x1="21.336" y1="80.207" x2="21.336" y2="81.026" width="0.254" layer="1"/>
-<wire x1="21.336" y1="81.026" x2="22.352" y2="82.042" width="0.254" layer="1"/>
-<wire x1="22.352" y1="82.042" x2="28.956" y2="82.042" width="0.254" layer="1"/>
 <wire x1="28.956" y1="82.042" x2="36.83" y2="74.168" width="0.254" layer="1"/>
 <wire x1="36.83" y1="74.168" x2="39.116" y2="71.882" width="0.254" layer="1"/>
 <wire x1="39.116" y1="71.882" x2="43.18" y2="71.882" width="0.254" layer="1"/>
@@ -3276,6 +3222,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="31.496" y1="54.61" x2="31.496" y2="72.136" width="0.254" layer="16"/>
 <via x="30.48" y="73.406" extent="1-16" drill="0.3"/>
 <wire x1="31.496" y1="72.136" x2="30.48" y2="73.406" width="0.254" layer="16"/>
+<contactref element="U3" pad="12"/>
+<wire x1="30.48" y1="73.772" x2="25.3225" y2="74.8475" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="XA">
 <contactref element="U4" pad="1"/>
@@ -3418,8 +3366,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="24.13" y1="29.464" x2="27.94" y2="29.464" width="0.254" layer="1"/>
 <wire x1="27.94" y1="29.464" x2="28.194" y2="29.718" width="0.254" layer="1"/>
 <wire x1="28.194" y1="29.718" x2="28.194" y2="42.164" width="0.254" layer="1"/>
-<contactref element="U3" pad="2"/>
-<wire x1="20.828" y1="76.257" x2="20.828" y2="73.406" width="0.254" layer="1"/>
 <wire x1="20.828" y1="73.406" x2="30.226" y2="64.008" width="0.254" layer="1"/>
 <wire x1="23.134" y1="24.994" x2="23.134" y2="25.634" width="0.254" layer="1"/>
 <wire x1="23.876" y1="26.376" x2="23.134" y2="25.634" width="0.254" layer="1"/>
@@ -3433,6 +3379,8 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="30.988" y1="54.864" x2="30.988" y2="62.484" width="0.254" layer="16"/>
 <wire x1="30.988" y1="62.484" x2="30.48" y2="62.992" width="0.254" layer="16"/>
 <wire x1="30.226" y1="64.008" x2="30.48" y2="64.008" width="0.254" layer="1"/>
+<contactref element="U3" pad="4"/>
+<wire x1="20.828" y1="73.406" x2="22.5725" y2="72.5975" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="CLKIN_AC" class="1">
 <contactref element="C6" pad="2"/>
@@ -3494,23 +3442,22 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="24.638" y1="64.008" x2="24.638" y2="66.294" width="0.6096" layer="1"/>
 </signal>
 <signal name="USB_D_N" class="3">
-<contactref element="U3" pad="21"/>
 <contactref element="L1" pad="4"/>
 <wire x1="16.09" y1="78.632" x2="16.49" y2="78.6336" width="0.6" layer="1"/>
 <wire x1="16.49" y1="78.6336" x2="18.288" y2="78.6336" width="0.6" layer="1"/>
 <wire x1="18.288" y1="78.6336" x2="18.6896" y2="78.486" width="0.3" layer="1"/>
-<wire x1="18.6896" y1="78.486" x2="19.615" y2="78.486" width="0.3" layer="1"/>
+<contactref element="U3" pad="23"/>
+<wire x1="18.6896" y1="78.486" x2="21.5725" y2="77.5975" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="USB_D_P" class="3">
-<contactref element="U3" pad="22"/>
 <contactref element="L1" pad="1"/>
 <wire x1="16.09" y1="77.832" x2="16.49" y2="77.8304" width="0.6" layer="1"/>
 <wire x1="16.49" y1="77.8304" x2="18.288" y2="77.8304" width="0.6" layer="1"/>
 <wire x1="18.288" y1="77.8304" x2="18.6896" y2="77.978" width="0.3" layer="1"/>
-<wire x1="18.6896" y1="77.978" x2="19.615" y2="77.978" width="0.3" layer="1"/>
+<contactref element="U3" pad="24"/>
+<wire x1="18.6896" y1="77.978" x2="21.0725" y2="77.5975" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VBUS_DET">
-<contactref element="U3" pad="17"/>
 <contactref element="R16" pad="1"/>
 <contactref element="R17" pad="2"/>
 <wire x1="16.256" y1="89.916" x2="16.256" y2="88.392" width="0.3048" layer="1"/>
@@ -3525,34 +3472,29 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="20.32" y1="81.788" x2="21.082" y2="81.788" width="0.3048" layer="16"/>
 <via x="21.082" y="81.788" extent="1-16" drill="0.3"/>
 <wire x1="21.082" y1="81.788" x2="20.828" y2="81.534" width="0.254" layer="1"/>
-<wire x1="20.828" y1="81.534" x2="20.828" y2="80.207" width="0.254" layer="1"/>
+<contactref element="U3" pad="25"/>
+<wire x1="18.034" y1="79.502" x2="20.3225" y2="76.8475" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="SWCLK">
-<contactref element="U3" pad="19"/>
 <contactref element="TC1" pad="6"/>
-<wire x1="19.615" y1="79.4766" x2="19.615" y2="84.017" width="0.254" layer="1"/>
 <wire x1="24.13" y1="86.741" x2="24.13" y2="86.4875" width="0.254" layer="1"/>
 <wire x1="24.13" y1="86.4875" x2="23.114" y2="85.344" width="0.254" layer="1"/>
 <wire x1="23.114" y1="85.344" x2="20.942" y2="85.344" width="0.254" layer="1"/>
-<wire x1="20.942" y1="85.344" x2="19.615" y2="84.017" width="0.254" layer="1"/>
+<contactref element="U3" pad="31"/>
+<wire x1="20.3225" y1="73.8475" x2="20.942" y2="85.344" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SWDIO">
-<contactref element="U3" pad="20"/>
 <contactref element="TC1" pad="5"/>
-<wire x1="19.615" y1="78.994" x2="19.05" y2="78.994" width="0.254" layer="1"/>
-<wire x1="19.05" y1="78.994" x2="18.796" y2="79.248" width="0.254" layer="1"/>
-<wire x1="18.796" y1="79.248" x2="18.796" y2="84.836" width="0.254" layer="1"/>
 <wire x1="24.13" y1="88.011" x2="24.003" y2="88.011" width="0.254" layer="1"/>
 <wire x1="24.003" y1="88.011" x2="23.368" y2="87.376" width="0.254" layer="1"/>
 <wire x1="23.368" y1="87.376" x2="21.336" y2="87.376" width="0.254" layer="1"/>
 <wire x1="21.336" y1="87.376" x2="18.796" y2="84.836" width="0.254" layer="1"/>
+<contactref element="U3" pad="32"/>
+<wire x1="20.3225" y1="73.3475" x2="18.796" y2="84.836" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="UART_TX">
-<contactref element="U3" pad="9"/>
 <contactref element="U6" pad="3"/>
 <contactref element="TC1" pad="1"/>
-<wire x1="23.565" y1="77.978" x2="24.892" y2="77.978" width="0.254" layer="1"/>
-<wire x1="24.892" y1="77.978" x2="26.416" y2="79.502" width="0.254" layer="1"/>
 <wire x1="26.416" y1="79.502" x2="26.924" y2="79.502" width="0.254" layer="1"/>
 <wire x1="26.67" y1="88.011" x2="27.051" y2="88.2645" width="0.254" layer="1" curve="-90"/>
 <wire x1="27.051" y1="88.2645" x2="29.464" y2="88.2645" width="0.254" layer="1"/>
@@ -3572,14 +3514,13 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <via x="31.496" y="86.106" extent="1-16" drill="0.3"/>
 <wire x1="31.496" y1="86.106" x2="31.115" y2="85.725" width="0.3048" layer="1"/>
 <wire x1="31.115" y1="85.725" x2="31.115" y2="85.471" width="0.3048" layer="1"/>
+<contactref element="U3" pad="21"/>
+<wire x1="22.5725" y1="77.5975" x2="26.416" y2="79.502" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="UART_RX">
-<contactref element="U3" pad="10"/>
 <contactref element="U6" pad="4"/>
 <contactref element="R1" pad="1"/>
 <contactref element="TC1" pad="2"/>
-<wire x1="23.565" y1="78.486" x2="24.638" y2="78.486" width="0.254" layer="1"/>
-<wire x1="24.638" y1="78.486" x2="26.416" y2="80.264" width="0.254" layer="1"/>
 <wire x1="26.67" y1="86.741" x2="27.051" y2="86.4875" width="0.254" layer="1" curve="90"/>
 <wire x1="27.051" y1="86.4875" x2="29.3365" y2="86.4875" width="0.254" layer="1"/>
 <wire x1="29.3365" y1="86.4875" x2="31.242" y2="84.582" width="0.3048" layer="1"/>
@@ -3595,18 +3536,17 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="29.464" y1="82.804" x2="31.242" y2="84.582" width="0.3048" layer="1"/>
 <wire x1="31.859" y1="82.695" x2="32.004" y2="82.55" width="0.3048" layer="1"/>
 <wire x1="32.004" y1="82.55" x2="32.004" y2="81.28" width="0.3048" layer="1"/>
+<contactref element="U3" pad="22"/>
+<wire x1="22.0725" y1="77.5975" x2="26.416" y2="80.264" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="!RESET">
-<contactref element="U3" pad="18"/>
 <contactref element="TC1" pad="4"/>
-<wire x1="20.3454" y1="80.207" x2="20.32" y2="80.2324" width="0.254" layer="1"/>
-<wire x1="20.32" y1="80.2324" x2="20.32" y2="82.042" width="0.254" layer="1"/>
-<wire x1="20.32" y1="82.042" x2="20.828" y2="82.55" width="0.254" layer="1"/>
 <wire x1="25.4" y1="86.741" x2="25.4" y2="86.614" width="0.254" layer="1"/>
 <wire x1="25.4" y1="86.614" x2="26.2885" y2="85.7255" width="0.254" layer="1"/>
 <wire x1="26.2885" y1="85.7255" x2="26.2885" y2="83.1845" width="0.254" layer="1"/>
 <wire x1="26.2885" y1="83.1845" x2="25.654" y2="82.55" width="0.254" layer="1"/>
-<wire x1="25.654" y1="82.55" x2="20.828" y2="82.55" width="0.254" layer="1"/>
+<contactref element="U3" pad="26"/>
+<wire x1="20.3225" y1="76.3475" x2="25.654" y2="82.55" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="USB0_D_P" class="3">
 <contactref element="X1" pad="3"/>
@@ -3711,7 +3651,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 </signal>
 <signal name="!OEB" class="2">
 <contactref element="U4" pad="7"/>
-<contactref element="U3" pad="14"/>
 <wire x1="21.214" y1="23.614" x2="20.836" y2="23.614" width="0.254" layer="1"/>
 <wire x1="20.836" y1="23.614" x2="20.574" y2="23.876" width="0.254" layer="1"/>
 <wire x1="20.574" y1="23.876" x2="20.574" y2="25.146" width="0.254" layer="1"/>
@@ -3721,8 +3660,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="19.05" y1="41.91" x2="23.114" y2="41.91" width="0.254" layer="16"/>
 <wire x1="23.114" y1="41.91" x2="26.67" y2="45.466" width="0.254" layer="16"/>
 <wire x1="26.67" y1="45.466" x2="26.67" y2="51.308" width="0.254" layer="16"/>
-<wire x1="22.352" y1="80.207" x2="22.352" y2="80.772" width="0.254" layer="1"/>
-<wire x1="22.352" y1="80.772" x2="22.606" y2="81.026" width="0.254" layer="1"/>
 <wire x1="26.67" y1="51.308" x2="30.48" y2="55.118" width="0.254" layer="16"/>
 <wire x1="30.48" y1="55.118" x2="30.48" y2="61.976" width="0.254" layer="16"/>
 <wire x1="30.48" y1="61.976" x2="29.718" y2="62.738" width="0.254" layer="16"/>
@@ -3731,12 +3668,13 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="30.988" y1="64.77" x2="30.988" y2="71.882" width="0.254" layer="16"/>
 <wire x1="30.988" y1="71.882" x2="29.718" y2="73.152" width="0.254" layer="16"/>
 <wire x1="29.718" y1="73.152" x2="29.718" y2="74.168" width="0.254" layer="16"/>
-<wire x1="22.606" y1="81.026" x2="28.448" y2="81.026" width="0.254" layer="1"/>
 <wire x1="28.448" y1="81.026" x2="33.782" y2="75.692" width="0.254" layer="1"/>
 <wire x1="33.782" y1="75.692" x2="33.782" y2="74.93" width="0.254" layer="1"/>
 <via x="33.782" y="74.93" extent="1-16" drill="0.3"/>
 <wire x1="33.782" y1="74.93" x2="33.02" y2="74.168" width="0.254" layer="16"/>
 <wire x1="33.02" y1="74.168" x2="29.718" y2="74.168" width="0.254" layer="16"/>
+<contactref element="U3" pad="18"/>
+<wire x1="28.448" y1="81.026" x2="24.0725" y2="77.5975" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$1">
 <contactref element="R12" pad="2"/>
@@ -3806,7 +3744,6 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 </signal>
 <signal name="!LED_YELLOW">
 <contactref element="LED2" pad="K"/>
-<contactref element="U3" pad="13"/>
 <wire x1="11.176" y1="68.834" x2="11.176" y2="69.85" width="0.3048" layer="1"/>
 <wire x1="11.176" y1="69.85" x2="12.192" y2="70.866" width="0.3048" layer="1"/>
 <via x="12.192" y="70.866" extent="1-16" drill="0.3"/>
@@ -3816,50 +3753,47 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="20.574" y1="80.264" x2="23.622" y2="80.264" width="0.3048" layer="16"/>
 <via x="23.622" y="80.264" extent="1-16" drill="0.3"/>
 <wire x1="23.622" y1="80.264" x2="23.565" y2="80.207" width="0.3048" layer="1"/>
-<wire x1="23.565" y1="80.207" x2="22.8346" y2="80.207" width="0.3048" layer="1"/>
+<contactref element="U3" pad="17"/>
+<wire x1="23.565" y1="80.207" x2="24.5725" y2="77.5975" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$13" class="2">
-<contactref element="U3" pad="24"/>
 <contactref element="C15" pad="2"/>
 <contactref element="C3" pad="2"/>
 <contactref element="L2" pad="1"/>
 <wire x1="18.542" y1="72.39" x2="18.542" y2="74.422" width="0.6096" layer="1"/>
 <wire x1="18.542" y1="74.422" x2="18.542" y2="75.946" width="0.6096" layer="1"/>
-<wire x1="19.615" y1="76.9874" x2="19.558" y2="76.9304" width="0.254" layer="1"/>
 <wire x1="19.558" y1="76.9304" x2="19.558" y2="76.708" width="0.254" layer="1"/>
 <wire x1="19.558" y1="76.708" x2="18.796" y2="75.946" width="0.6096" layer="1"/>
 <wire x1="18.796" y1="75.946" x2="18.542" y2="75.946" width="0.6096" layer="1"/>
 </signal>
 <signal name="!SPI_SS">
-<contactref element="U3" pad="3"/>
 <contactref element="X4" pad="10"/>
-<wire x1="21.336" y1="76.257" x2="21.336" y2="73.66" width="0.254" layer="1"/>
 <wire x1="21.336" y1="73.66" x2="29.972" y2="65.024" width="0.254" layer="1"/>
 <wire x1="29.972" y1="65.024" x2="43.942" y2="65.024" width="0.254" layer="1"/>
 <wire x1="43.942" y1="65.024" x2="45.72" y2="66.802" width="0.254" layer="1"/>
+<contactref element="U3" pad="6"/>
+<wire x1="21.336" y1="73.66" x2="23.5725" y2="72.5975" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SPI_MISO">
-<contactref element="U3" pad="4"/>
 <contactref element="X4" pad="7"/>
-<wire x1="21.844" y1="76.257" x2="21.844" y2="73.914" width="0.254" layer="1"/>
 <wire x1="21.844" y1="73.914" x2="30.226" y2="65.532" width="0.254" layer="1"/>
 <wire x1="30.226" y1="65.532" x2="39.37" y2="65.532" width="0.254" layer="1"/>
 <wire x1="39.37" y1="65.532" x2="40.64" y2="66.802" width="0.254" layer="1"/>
 <via x="40.64" y="66.802" extent="1-16" drill="0.3"/>
 <wire x1="40.64" y1="66.802" x2="43.18" y2="69.342" width="0.254" layer="16"/>
+<contactref element="U3" pad="5"/>
+<wire x1="21.844" y1="73.914" x2="23.0725" y2="72.5975" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SPI_MOSI">
-<contactref element="U3" pad="5"/>
 <contactref element="X4" pad="8"/>
-<wire x1="22.352" y1="76.257" x2="22.352" y2="74.168" width="0.254" layer="1"/>
 <wire x1="22.352" y1="74.168" x2="28.448" y2="68.072" width="0.254" layer="1"/>
 <wire x1="28.448" y1="68.072" x2="44.45" y2="68.072" width="0.254" layer="1"/>
 <wire x1="44.45" y1="68.072" x2="45.72" y2="69.342" width="0.254" layer="1"/>
+<contactref element="U3" pad="7"/>
+<wire x1="24.0725" y1="72.5975" x2="22.352" y2="74.168" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SPI_SCK">
-<contactref element="U3" pad="6"/>
 <contactref element="X4" pad="9"/>
-<wire x1="22.8346" y1="76.257" x2="22.8346" y2="74.4474" width="0.254" layer="1"/>
 <wire x1="22.8346" y1="74.4474" x2="28.702" y2="68.58" width="0.254" layer="1"/>
 <wire x1="28.702" y1="68.58" x2="40.64" y2="68.58" width="0.254" layer="1"/>
 <wire x1="40.64" y1="68.58" x2="42.672" y2="70.612" width="0.254" layer="1"/>
@@ -3870,15 +3804,17 @@ for the minimum (VIA) drill of 0.3mm as 0.36mm.</description>
 <wire x1="46.228" y1="68.072" x2="45.212" y2="68.072" width="0.254" layer="1"/>
 <wire x1="45.212" y1="68.072" x2="43.942" y2="66.802" width="0.254" layer="1"/>
 <wire x1="43.942" y1="66.802" x2="43.18" y2="66.802" width="0.254" layer="1"/>
+<contactref element="U3" pad="8"/>
+<wire x1="24.5725" y1="72.5975" x2="22.8346" y2="74.4474" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VCXO_CV">
-<contactref element="U3" pad="1"/>
 <contactref element="R15" pad="1"/>
-<wire x1="20.3454" y1="76.257" x2="20.3454" y2="73.1266" width="0.254" layer="1"/>
 <wire x1="20.3454" y1="73.1266" x2="26.67" y2="66.802" width="0.254" layer="1"/>
 <wire x1="23.622" y1="54.61" x2="23.622" y2="55.118" width="0.254" layer="1"/>
 <wire x1="23.622" y1="55.118" x2="26.67" y2="58.166" width="0.254" layer="1"/>
 <wire x1="26.67" y1="58.166" x2="26.67" y2="66.802" width="0.254" layer="1"/>
+<contactref element="U3" pad="3"/>
+<wire x1="20.3454" y1="73.1266" x2="22.0725" y2="72.5975" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$6">
 <contactref element="D11" pad="C"/>