[Cryptech-Commits] [hardware] branch master updated: More schematic updates after review with Pavel.

git at cryptech.is git at cryptech.is
Thu Feb 4 14:46:23 UTC 2016


This is an automated email from the git hooks/post-receive script.

fredrik at thulin.net pushed a commit to branch master
in repository hardware.

The following commit(s) were added to refs/heads/master by this push:
       new  46fb213   More schematic updates after review with Pavel.
46fb213 is described below

commit 46fb21320eacb3fdcc4dca7d41124be5fe2f07fa
Author: Fredrik Thulin <fredrik at thulin.net>
AuthorDate: Thu Feb 4 15:45:55 2016 +0100

    More schematic updates after review with Pavel.
---
 eagle/alpha/rev02/rev02.brd |  484 +++++++-----------
 eagle/alpha/rev02/rev02.sch | 1195 +++++++++++++++++++++----------------------
 2 files changed, 755 insertions(+), 924 deletions(-)

diff --git a/eagle/alpha/rev02/rev02.brd b/eagle/alpha/rev02/rev02.brd
index 4f3678b..643ca09 100644
--- a/eagle/alpha/rev02/rev02.brd
+++ b/eagle/alpha/rev02/rev02.brd
@@ -2289,109 +2289,6 @@ EAGLE CAD Libraries on element14</a></description>
 </package>
 </packages>
 </library>
-<library name="ON_Semiconductor-MC14551BDG">
-<packages>
-<package name="SOIC127P600X175-16N">
-<smd name="1" x="-2.4638" y="4.445" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="2" x="-2.4638" y="3.175" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="3" x="-2.4638" y="1.905" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="4" x="-2.4638" y="0.635" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="5" x="-2.4638" y="-0.635" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="6" x="-2.4638" y="-1.905" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="7" x="-2.4638" y="-3.175" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="8" x="-2.4638" y="-4.445" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="9" x="2.4638" y="-4.445" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="10" x="2.4638" y="-3.175" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="11" x="2.4638" y="-1.905" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="12" x="2.4638" y="-0.635" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="13" x="2.4638" y="0.635" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="14" x="2.4638" y="1.905" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="15" x="2.4638" y="3.175" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="16" x="2.4638" y="4.445" dx="1.9558" dy="0.5334" layer="1"/>
-<wire x1="-2.0066" y1="4.191" x2="-2.0066" y2="4.699" width="0" layer="51"/>
-<wire x1="-2.0066" y1="4.699" x2="-3.0988" y2="4.699" width="0" layer="51"/>
-<wire x1="-3.0988" y1="4.699" x2="-3.0988" y2="4.191" width="0" layer="51"/>
-<wire x1="-3.0988" y1="4.191" x2="-2.0066" y2="4.191" width="0" layer="51"/>
-<wire x1="-2.0066" y1="2.921" x2="-2.0066" y2="3.429" width="0" layer="51"/>
-<wire x1="-2.0066" y1="3.429" x2="-3.0988" y2="3.429" width="0" layer="51"/>
-<wire x1="-3.0988" y1="3.429" x2="-3.0988" y2="2.921" width="0" layer="51"/>
-<wire x1="-3.0988" y1="2.921" x2="-2.0066" y2="2.921" width="0" layer="51"/>
-<wire x1="-2.0066" y1="1.651" x2="-2.0066" y2="2.159" width="0" layer="51"/>
-<wire x1="-2.0066" y1="2.159" x2="-3.0988" y2="2.159" width="0" layer="51"/>
-<wire x1="-3.0988" y1="2.159" x2="-3.0988" y2="1.651" width="0" layer="51"/>
-<wire x1="-3.0988" y1="1.651" x2="-2.0066" y2="1.651" width="0" layer="51"/>
-<wire x1="-2.0066" y1="0.381" x2="-2.0066" y2="0.889" width="0" layer="51"/>
-<wire x1="-2.0066" y1="0.889" x2="-3.0988" y2="0.889" width="0" layer="51"/>
-<wire x1="-3.0988" y1="0.889" x2="-3.0988" y2="0.381" width="0" layer="51"/>
-<wire x1="-3.0988" y1="0.381" x2="-2.0066" y2="0.381" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-0.889" x2="-2.0066" y2="-0.381" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-0.381" x2="-3.0988" y2="-0.381" width="0" layer="51"/>
-<wire x1="-3.0988" y1="-0.381" x2="-3.0988" y2="-0.889" width="0" layer="51"/>
-<wire x1="-3.0988" y1="-0.889" x2="-2.0066" y2="-0.889" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-2.159" x2="-2.0066" y2="-1.651" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-1.651" x2="-3.0988" y2="-1.651" width="0" layer="51"/>
-<wire x1="-3.0988" y1="-1.651" x2="-3.0988" y2="-2.159" width="0" layer="51"/>
-<wire x1="-3.0988" y1="-2.159" x2="-2.0066" y2="-2.159" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-3.429" x2="-2.0066" y2="-2.921" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-2.921" x2="-3.0988" y2="-2.921" width="0" layer="51"/>
-<wire x1="-3.0988" y1="-2.921" x2="-3.0988" y2="-3.429" width="0" layer="51"/>
-<wire x1="-3.0988" y1="-3.429" x2="-2.0066" y2="-3.429" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-4.699" x2="-2.0066" y2="-4.191" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-4.191" x2="-3.0988" y2="-4.191" width="0" layer="51"/>
-<wire x1="-3.0988" y1="-4.191" x2="-3.0988" y2="-4.699" width="0" layer="51"/>
-<wire x1="-3.0988" y1="-4.699" x2="-2.0066" y2="-4.699" width="0" layer="51"/>
-<wire x1="2.0066" y1="-4.191" x2="2.0066" y2="-4.699" width="0" layer="51"/>
-<wire x1="2.0066" y1="-4.699" x2="3.0988" y2="-4.699" width="0" layer="51"/>
-<wire x1="3.0988" y1="-4.699" x2="3.0988" y2="-4.191" width="0" layer="51"/>
-<wire x1="3.0988" y1="-4.191" x2="2.0066" y2="-4.191" width="0" layer="51"/>
-<wire x1="2.0066" y1="-2.921" x2="2.0066" y2="-3.429" width="0" layer="51"/>
-<wire x1="2.0066" y1="-3.429" x2="3.0988" y2="-3.429" width="0" layer="51"/>
-<wire x1="3.0988" y1="-3.429" x2="3.0988" y2="-2.921" width="0" layer="51"/>
-<wire x1="3.0988" y1="-2.921" x2="2.0066" y2="-2.921" width="0" layer="51"/>
-<wire x1="2.0066" y1="-1.651" x2="2.0066" y2="-2.159" width="0" layer="51"/>
-<wire x1="2.0066" y1="-2.159" x2="3.0988" y2="-2.159" width="0" layer="51"/>
-<wire x1="3.0988" y1="-2.159" x2="3.0988" y2="-1.651" width="0" layer="51"/>
-<wire x1="3.0988" y1="-1.651" x2="2.0066" y2="-1.651" width="0" layer="51"/>
-<wire x1="2.0066" y1="-0.381" x2="2.0066" y2="-0.889" width="0" layer="51"/>
-<wire x1="2.0066" y1="-0.889" x2="3.0988" y2="-0.889" width="0" layer="51"/>
-<wire x1="3.0988" y1="-0.889" x2="3.0988" y2="-0.381" width="0" layer="51"/>
-<wire x1="3.0988" y1="-0.381" x2="2.0066" y2="-0.381" width="0" layer="51"/>
-<wire x1="2.0066" y1="0.889" x2="2.0066" y2="0.381" width="0" layer="51"/>
-<wire x1="2.0066" y1="0.381" x2="3.0988" y2="0.381" width="0" layer="51"/>
-<wire x1="3.0988" y1="0.381" x2="3.0988" y2="0.889" width="0" layer="51"/>
-<wire x1="3.0988" y1="0.889" x2="2.0066" y2="0.889" width="0" layer="51"/>
-<wire x1="2.0066" y1="2.159" x2="2.0066" y2="1.651" width="0" layer="51"/>
-<wire x1="2.0066" y1="1.651" x2="3.0988" y2="1.651" width="0" layer="51"/>
-<wire x1="3.0988" y1="1.651" x2="3.0988" y2="2.159" width="0" layer="51"/>
-<wire x1="3.0988" y1="2.159" x2="2.0066" y2="2.159" width="0" layer="51"/>
-<wire x1="2.0066" y1="3.429" x2="2.0066" y2="2.921" width="0" layer="51"/>
-<wire x1="2.0066" y1="2.921" x2="3.0988" y2="2.921" width="0" layer="51"/>
-<wire x1="3.0988" y1="2.921" x2="3.0988" y2="3.429" width="0" layer="51"/>
-<wire x1="3.0988" y1="3.429" x2="2.0066" y2="3.429" width="0" layer="51"/>
-<wire x1="2.0066" y1="4.699" x2="2.0066" y2="4.191" width="0" layer="51"/>
-<wire x1="2.0066" y1="4.191" x2="3.0988" y2="4.191" width="0" layer="51"/>
-<wire x1="3.0988" y1="4.191" x2="3.0988" y2="4.699" width="0" layer="51"/>
-<wire x1="3.0988" y1="4.699" x2="2.0066" y2="4.699" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-5.0038" x2="2.0066" y2="-5.0038" width="0" layer="51"/>
-<wire x1="2.0066" y1="-5.0038" x2="2.0066" y2="5.0038" width="0" layer="51"/>
-<wire x1="2.0066" y1="5.0038" x2="0.3048" y2="5.0038" width="0" layer="51"/>
-<wire x1="0.3048" y1="5.0038" x2="-0.3048" y2="5.0038" width="0" layer="51"/>
-<wire x1="-0.3048" y1="5.0038" x2="-2.0066" y2="5.0038" width="0" layer="51"/>
-<wire x1="-2.0066" y1="5.0038" x2="-2.0066" y2="-5.0038" width="0" layer="51"/>
-<wire x1="0.3048" y1="5.0038" x2="-0.3048" y2="5.0038" width="0" layer="51" curve="-180"/>
-<text x="-3.302" y="4.8514" size="1.27" layer="51" ratio="6" rot="SR0">*</text>
-<wire x1="3.7846" y1="-3.2004" x2="4.826" y2="-3.2004" width="0.1524" layer="21"/>
-<wire x1="-1.3208" y1="-5.0038" x2="1.3208" y2="-5.0038" width="0.1524" layer="21"/>
-<wire x1="1.3208" y1="5.0038" x2="0.3048" y2="5.0038" width="0.1524" layer="21"/>
-<wire x1="0.3048" y1="5.0038" x2="-0.3048" y2="5.0038" width="0.1524" layer="21"/>
-<wire x1="-0.3048" y1="5.0038" x2="-1.3208" y2="5.0038" width="0.1524" layer="21"/>
-<wire x1="0.3048" y1="5.0038" x2="-0.3048" y2="5.0038" width="0.1524" layer="21" curve="-180"/>
-<text x="-3.302" y="4.8514" size="1.27" layer="21" ratio="6" rot="SR0">*</text>
-<text x="-3.4544" y="6.985" size="2.0828" layer="25" ratio="10" rot="SR0">>NAME</text>
-<text x="-3.4544" y="-8.255" size="2.0828" layer="27" ratio="10" rot="SR0">>VALUE</text>
-</package>
-</packages>
-</library>
 <library name="Microchip-23K640-I_SN">
 <description><b> Developed By element14 </b><p> 
 
@@ -5795,15 +5692,6 @@ Based on the following sources:
 <attribute name="NAME" x="45.847" y="11.2014" size="0.8128" layer="25" rot="R270"/>
 <attribute name="VALUE" x="48.4124" y="9.9822" size="0.4064" layer="27" rot="R270"/>
 </element>
-<element name="U11" library="ON_Semiconductor-MC14551BDG" package="SOIC127P600X175-16N" value="MC14551BDG" x="39.624" y="12.2936" smashed="yes">
-<attribute name="SUPPLIER" value="ON SEMICONDUCTOR" x="39.624" y="12.2936" size="0.4064" layer="27" display="off"/>
-<attribute name="MPN" value="MC14551BDG" x="39.624" y="12.2936" size="0.4064" layer="27" display="off"/>
-<attribute name="PACKAGE" value="SOIC-16" x="39.624" y="12.2936" size="0.4064" layer="27" display="off"/>
-<attribute name="OC_FARNELL" value="9665242" x="39.624" y="12.2936" size="0.4064" layer="27" display="off"/>
-<attribute name="OC_NEWARK" value="71J5501" x="39.624" y="12.2936" size="0.4064" layer="27" display="off"/>
-<attribute name="NAME" x="37.9984" y="17.7546" size="0.8128" layer="25" ratio="10" rot="SR0"/>
-<attribute name="VALUE" x="37.084" y="6.477" size="0.4064" layer="27" ratio="10" rot="SR0"/>
-</element>
 <element name="U12" library="Microchip-23K640-I_SN" package="SOIC127P600X175-8N" value="23K640-I/SN" x="26.5176" y="13.5128" smashed="yes">
 <attribute name="SUPPLIER" value="MICROCHIP" x="26.5176" y="13.5128" size="0.4064" layer="27" display="off"/>
 <attribute name="MPN" value="23K640-I/SN " x="26.5176" y="13.5128" size="0.4064" layer="27" display="off"/>
@@ -5813,18 +5701,14 @@ Based on the following sources:
 <attribute name="NAME" x="24.8412" y="9.8044" size="0.8128" layer="25" ratio="10" rot="SR0"/>
 <attribute name="VALUE" x="24.8412" y="9.1948" size="0.4064" layer="27" ratio="10" rot="SR0"/>
 </element>
-<element name="R33" library="resistor" package="R0402" value="15k" x="32.004" y="14.1224" smashed="yes" rot="R180">
+<element name="R33" library="resistor" package="R0402" value="4.7k" x="32.004" y="14.1224" smashed="yes" rot="R180">
 <attribute name="NAME" x="32.893" y="13.2334" size="0.8128" layer="25" rot="R180"/>
 <attribute name="VALUE" x="33.8074" y="12.8016" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="R34" library="resistor" package="R0402" value="15k" x="24.5364" y="17.78" smashed="yes">
+<element name="R34" library="resistor" package="R0402" value="4.7k" x="24.5364" y="17.78" smashed="yes">
 <attribute name="NAME" x="23.3426" y="18.9738" size="0.8128" layer="25"/>
 <attribute name="VALUE" x="25.781" y="19.1008" size="0.4064" layer="27"/>
 </element>
-<element name="R32" library="resistor" package="R0402" value="15k" x="42.672" y="6.1976" smashed="yes" rot="R180">
-<attribute name="NAME" x="40.8178" y="6.5278" size="0.8128" layer="25" rot="R180"/>
-<attribute name="VALUE" x="42.9514" y="5.1816" size="0.4064" layer="27" rot="R180"/>
-</element>
 <element name="C102" library="resistor" package="C0805" value="10 uF" x="66.9036" y="12.2936" smashed="yes" rot="MR180">
 <attribute name="NAME" x="69.2404" y="12.7254" size="0.8128" layer="26" ratio="18" rot="MR180"/>
 <attribute name="VALUE" x="66.4972" y="13.97" size="0.4064" layer="28" ratio="10" rot="MR180"/>
@@ -6939,6 +6823,23 @@ Based on the following sources:
 </element>
 <element name="JP8" library="jumper" package="JP1" value="" x="-10.16" y="-109.22"/>
 <element name="R4" library="resistor" package="R0402" value="0" x="-11.43" y="-115.57"/>
+<element name="R17" library="resistor" package="R0402" value="4.7k" x="-11.43" y="-120.65">
+<attribute name="TOLERANCE" value="5%" x="-11.43" y="-120.65" size="1.778" layer="27" display="off"/>
+</element>
+<element name="IC4" library="74xx-eu" package="SO20W" value="74AC244DW" x="-5.08" y="-129.54"/>
+<element name="R79" library="resistor" package="R0402" value="4.7k" x="-2.54" y="-144.78">
+<attribute name="TOLERANCE" value="5%" x="-19.05" y="-143.51" size="1.778" layer="27" display="off"/>
+</element>
+<element name="R80" library="resistor" package="R0402" value="4.7k" x="-11.43" y="-149.86">
+<attribute name="TOLERANCE" value="5%" x="-19.05" y="-148.59" size="1.778" layer="27" display="off"/>
+</element>
+<element name="R81" library="resistor" package="R0402" value="4.7k" x="-5.08" y="-149.86">
+<attribute name="TOLERANCE" value="5%" x="-19.05" y="-153.67" size="1.778" layer="27" display="off"/>
+</element>
+<element name="R82" library="resistor" package="R0402" value="15k" x="-11.43" y="-154.94"/>
+<element name="R32" library="resistor" package="R0402" value="0" x="-11.43" y="-160.02">
+<attribute name="TOLERANCE" value="5%" x="-11.43" y="-160.02" size="1.778" layer="27" display="off"/>
+</element>
 </elements>
 <signals>
 <signal name="GND" class="1">
@@ -7141,25 +7042,14 @@ Based on the following sources:
 <contactref element="U10" pad="5"/>
 <contactref element="U10" pad="21"/>
 <contactref element="JP3" pad="6"/>
-<contactref element="U11" pad="8"/>
-<contactref element="U11" pad="7"/>
 <via x="23.7744" y="10.16" extent="1-16" drill="0.6" shape="square"/>
-<via x="35.052" y="9.2456" extent="1-16" drill="0.6" shape="square"/>
-<via x="35.052" y="7.7216" extent="1-16" drill="0.6" shape="square"/>
-<wire x1="37.1602" y1="9.1186" x2="35.179" y2="9.1186" width="0.4064" layer="1"/>
-<wire x1="35.179" y1="9.1186" x2="35.052" y2="9.2456" width="0.4064" layer="1"/>
-<wire x1="37.1602" y1="7.8486" x2="35.179" y2="7.8486" width="0.4064" layer="1"/>
-<wire x1="35.179" y1="7.8486" x2="35.052" y2="7.7216" width="0.4064" layer="1"/>
 <wire x1="96.3812" y1="32.54" x2="96.3812" y2="33.5188" width="0.4064" layer="16"/>
 <wire x1="96.3812" y1="33.5188" x2="96.6216" y2="33.7592" width="0.4064" layer="16"/>
-<contactref element="R32" pad="1"/>
 <contactref element="U12" pad="4"/>
 <via x="66.4464" y="15.6464" extent="1-16" drill="0.6" shape="square"/>
 <via x="67.6656" y="10.4648" extent="1-16" drill="0.6" shape="square"/>
-<via x="44.958" y="5.588" extent="1-16" drill="0.6" shape="square"/>
 <wire x1="88.3516" y1="36.5024" x2="86.5632" y2="36.5024" width="0.4064" layer="16"/>
 <contactref element="C107" pad="2"/>
-<contactref element="C106" pad="2"/>
 <contactref element="C102" pad="2"/>
 <contactref element="C104" pad="2"/>
 <contactref element="C103" pad="2"/>
@@ -7168,8 +7058,6 @@ Based on the following sources:
 <wire x1="29.5252" y1="17.78" x2="27.8892" y2="17.78" width="0.4064" layer="16"/>
 <wire x1="40.5384" y1="17.0824" x2="40.9552" y2="16.8656" width="0.4064" layer="16"/>
 <contactref element="JP6" pad="1"/>
-<wire x1="43.322" y1="6.1976" x2="44.1316" y2="5.588" width="0.4064" layer="1"/>
-<wire x1="44.1316" y1="5.588" x2="44.958" y2="5.588" width="0.4064" layer="1"/>
 <wire x1="23.7998" y1="11.6078" x2="23.7744" y2="11.5824" width="0.3048" layer="1"/>
 <wire x1="23.7744" y1="11.5824" x2="23.7744" y2="10.16" width="0.4064" layer="1"/>
 <wire x1="67.31" y1="8.6614" x2="67.31" y2="10.1092" width="0.4064" layer="1"/>
@@ -7180,7 +7068,6 @@ Based on the following sources:
 <wire x1="67.6656" y1="12.1056" x2="67.8536" y2="12.2936" width="0.4064" layer="16"/>
 <wire x1="66.4972" y1="17.145" x2="66.4972" y2="15.6972" width="0.4064" layer="1"/>
 <wire x1="66.4972" y1="15.6972" x2="66.4464" y2="15.6464" width="0.4064" layer="1"/>
-<wire x1="67.0156" y1="17.1704" x2="66.8156" y2="16.0156" width="0.4064" layer="16"/>
 <wire x1="66.8156" y1="16.0156" x2="66.4464" y2="15.6464" width="0.4064" layer="16"/>
 <contactref element="JP5" pad="10"/>
 <contactref element="S2" pad="G1"/>
@@ -7661,6 +7548,9 @@ Based on the following sources:
 <contactref element="C23" pad="1"/>
 <contactref element="C25" pad="1"/>
 <contactref element="C22" pad="1"/>
+<contactref element="IC4" pad="10"/>
+<contactref element="R81" pad="2"/>
+<contactref element="C106" pad="2"/>
 <wire x1="156.098" y1="99.568" x2="151.75" y2="99.568" width="0" layer="19" extent="1-1"/>
 <wire x1="156.1996" y1="95.1992" x2="156.098" y2="99.568" width="0" layer="19" extent="1-1"/>
 <wire x1="147.5928" y1="93.7144" x2="151.75" y2="99.568" width="0" layer="19" extent="1-1"/>
@@ -7845,19 +7735,17 @@ Based on the following sources:
 <wire x1="155.9941" y1="32.1056" x2="155.9941" y2="26.0096" width="0" layer="19" extent="1-1"/>
 <wire x1="67.8536" y1="12.2936" x2="78.8516" y2="12.2102" width="0" layer="19" extent="1-16"/>
 <wire x1="66.4464" y1="15.6464" x2="67.8536" y2="12.2936" width="0" layer="19" extent="1-16"/>
+<wire x1="67.0156" y1="17.1704" x2="66.4972" y2="17.145" width="0" layer="19" extent="1-16"/>
 <wire x1="56.896" y1="17.018" x2="66.4972" y2="17.145" width="0" layer="19" extent="1-1"/>
 <wire x1="50.3936" y1="8.9916" x2="56.896" y2="17.018" width="0" layer="19" extent="1-1"/>
-<wire x1="44.958" y1="5.588" x2="50.3936" y2="8.9916" width="0" layer="19" extent="1-1"/>
-<wire x1="37.1602" y1="7.8486" x2="43.322" y2="6.1976" width="0" layer="19" extent="1-1"/>
-<wire x1="37.1602" y1="9.1186" x2="37.1602" y2="7.8486" width="0" layer="19" extent="1-1"/>
-<wire x1="28.7176" y1="7.1332" x2="35.052" y2="7.7216" width="0" layer="19" extent="1-1"/>
-<wire x1="26.5176" y1="7.2644" x2="28.6512" y2="7.1996" width="0" layer="19" extent="1-1"/>
-<wire x1="24.384" y1="7.1996" x2="26.5176" y2="7.2644" width="0" layer="19" extent="1-1"/>
-<wire x1="23.7744" y1="10.16" x2="24.384" y2="7.1996" width="0" layer="19" extent="1-1"/>
-<wire x1="26.5176" y1="3.3782" x2="28.6512" y2="5.8928" width="0" layer="19" extent="1-1"/>
-<wire x1="27.8892" y1="17.78" x2="23.7998" y2="11.6078" width="0" layer="19" extent="1-1"/>
-<wire x1="39.0144" y1="17.018" x2="37.1602" y2="9.1186" width="0" layer="19" extent="1-1"/>
 <wire x1="53.736" y1="1.524" x2="50.3936" y2="8.9916" width="0" layer="19" extent="1-1"/>
+<wire x1="40.9552" y1="16.8656" x2="50.3936" y2="8.9916" width="0" layer="19" extent="16-16"/>
+<wire x1="29.5252" y1="17.78" x2="39.0144" y2="17.018" width="0" layer="19" extent="16-16"/>
+<wire x1="23.7998" y1="11.6078" x2="27.8892" y2="17.78" width="0" layer="19" extent="1-1"/>
+<wire x1="24.384" y1="7.1996" x2="23.7744" y2="10.16" width="0" layer="19" extent="1-1"/>
+<wire x1="26.5176" y1="7.2644" x2="24.384" y2="7.1996" width="0" layer="19" extent="1-1"/>
+<wire x1="28.6512" y1="7.1996" x2="26.5176" y2="7.2644" width="0" layer="19" extent="1-1"/>
+<wire x1="26.5176" y1="3.3782" x2="24.384" y2="5.8928" width="0" layer="19" extent="1-1"/>
 <wire x1="13.35" y1="11.44" x2="23.7744" y2="11.5824" width="0" layer="19" extent="1-1"/>
 <wire x1="11.27" y1="10.34" x2="13.35" y2="11.44" width="0" layer="19" extent="1-1"/>
 <wire x1="13.48" y1="14.98" x2="13.35" y2="11.44" width="0" layer="19" extent="1-1"/>
@@ -8122,6 +8010,8 @@ Based on the following sources:
 <wire x1="114.92" y1="98.552" x2="112.5474" y2="100.203" width="0" layer="19" extent="1-1"/>
 <wire x1="-0.62" y1="-87.63" x2="1.666" y2="-69.85" width="0" layer="19" extent="1-1"/>
 <wire x1="-10.78" y1="-104.14" x2="-0.62" y2="-87.63" width="0" layer="19" extent="1-1"/>
+<wire x1="0.635" y1="-134.5692" x2="-10.78" y2="-104.14" width="0" layer="19" extent="1-1"/>
+<wire x1="-4.43" y1="-149.86" x2="0.635" y2="-134.5692" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="AMPLIFIED">
 <contactref element="U3" pad="2"/>
@@ -8221,9 +8111,9 @@ Based on the following sources:
 </signal>
 <signal name="AVR_LED1">
 <contactref element="R31" pad="5"/>
-<contactref element="U10" pad="16"/>
-<wire x1="71.1454" y1="15.6972" x2="73.2828" y2="15.6972" width="0.4064" layer="1"/>
 <wire x1="73.2828" y1="15.6972" x2="73.5296" y2="16.0202" width="0.4064" layer="1"/>
+<contactref element="U10" pad="9"/>
+<wire x1="71.1454" y1="10.1092" x2="73.2828" y2="15.6972" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$5">
 <contactref element="LED9" pad="A"/>
@@ -8234,9 +8124,9 @@ Based on the following sources:
 </signal>
 <signal name="AVR_LED2">
 <contactref element="R31" pad="6"/>
-<contactref element="U10" pad="15"/>
-<wire x1="71.1454" y1="14.9098" x2="73.4716" y2="14.9098" width="0.4064" layer="1"/>
 <wire x1="73.4716" y1="14.9098" x2="73.5296" y2="14.928" width="0.4064" layer="1"/>
+<contactref element="U10" pad="10"/>
+<wire x1="71.1454" y1="10.8966" x2="73.4716" y2="14.9098" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$15">
 <contactref element="LED12" pad="A"/>
@@ -8247,9 +8137,9 @@ Based on the following sources:
 </signal>
 <signal name="AVR_LED3">
 <contactref element="R31" pad="7"/>
-<contactref element="U10" pad="14"/>
-<wire x1="71.1454" y1="14.097" x2="73.4208" y2="14.097" width="0.4064" layer="1"/>
 <wire x1="73.4208" y1="14.097" x2="73.5296" y2="14.0644" width="0.4064" layer="1"/>
+<contactref element="U10" pad="11"/>
+<wire x1="71.1454" y1="11.7094" x2="73.4208" y2="14.097" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$16">
 <contactref element="LED10" pad="A"/>
@@ -8261,9 +8151,9 @@ Based on the following sources:
 </signal>
 <signal name="AVR_LED4">
 <contactref element="R31" pad="8"/>
-<contactref element="U10" pad="13"/>
-<wire x1="71.1454" y1="13.3096" x2="73.116" y2="13.3096" width="0.4064" layer="1"/>
 <wire x1="73.116" y1="13.3096" x2="73.5296" y2="12.9722" width="0.4064" layer="1"/>
+<contactref element="U10" pad="12"/>
+<wire x1="71.1454" y1="12.4968" x2="73.116" y2="13.3096" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$17">
 <contactref element="LED3" pad="A"/>
@@ -9225,25 +9115,27 @@ Based on the following sources:
 </signal>
 <signal name="MKM_SCK">
 <contactref element="U12" pad="6"/>
-<contactref element="U11" pad="13"/>
 <wire x1="29.2354" y1="12.8778" x2="27.4574" y2="12.8778" width="0.4064" layer="1"/>
 <wire x1="27.4574" y1="12.8778" x2="27.432" y2="12.9032" width="0.3048" layer="1"/>
 <via x="27.432" y="12.9032" extent="1-16" drill="0.6" shape="square"/>
 <wire x1="27.432" y1="12.9032" x2="40.2336" y2="12.9032" width="0.4064" layer="16"/>
 <via x="40.2336" y="12.9032" extent="1-16" drill="0.6" shape="square"/>
 <wire x1="40.2336" y1="12.9032" x2="42.0624" y2="12.9032" width="0.4064" layer="1"/>
-<wire x1="42.0624" y1="12.9032" x2="42.0878" y2="12.9286" width="0.3048" layer="1"/>
+<contactref element="IC4" pad="16"/>
+<contactref element="IC4" pad="7"/>
+<wire x1="-5.715" y1="-124.5108" x2="-3.175" y2="-134.5692" width="0" layer="19" extent="1-1"/>
+<wire x1="27.4574" y1="12.8778" x2="-5.715" y2="-124.5108" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MKM_MOSI">
-<contactref element="U11" pad="5"/>
 <contactref element="U12" pad="5"/>
 <wire x1="29.2354" y1="11.6078" x2="37.1094" y2="11.6078" width="0.4064" layer="1"/>
-<wire x1="37.1094" y1="11.6078" x2="37.1602" y2="11.6586" width="0.3048" layer="1"/>
+<contactref element="IC4" pad="5"/>
+<contactref element="IC4" pad="14"/>
+<wire x1="-3.175" y1="-124.5108" x2="-5.715" y2="-134.5692" width="0" layer="19" extent="1-1"/>
+<wire x1="29.2354" y1="11.6078" x2="-3.175" y2="-124.5108" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MKM_CS_N">
 <contactref element="U12" pad="1"/>
-<contactref element="U11" pad="4"/>
-<wire x1="37.1602" y1="12.9286" x2="35.6362" y2="12.9286" width="0.4064" layer="1"/>
 <wire x1="35.6362" y1="12.9286" x2="35.052" y2="13.5128" width="0.4064" layer="1"/>
 <wire x1="35.052" y1="13.5128" x2="35.052" y2="15.3416" width="0.4064" layer="1"/>
 <wire x1="33.8328" y1="16.5608" x2="28.0416" y2="16.5608" width="0.4064" layer="1"/>
@@ -9254,9 +9146,14 @@ Based on the following sources:
 <wire x1="35.052" y1="15.3416" x2="33.8328" y2="16.5608" width="0.4064" layer="1"/>
 <wire x1="23.7998" y1="15.4178" x2="23.7998" y2="17.6666" width="0.4064" layer="1"/>
 <wire x1="23.7998" y1="17.6666" x2="23.8864" y2="17.78" width="0.4064" layer="1"/>
+<contactref element="IC4" pad="9"/>
+<contactref element="IC4" pad="18"/>
+<contactref element="R79" pad="1"/>
+<wire x1="-0.635" y1="-134.5692" x2="-3.19" y2="-144.78" width="0" layer="19" extent="1-1"/>
+<wire x1="-8.255" y1="-124.5108" x2="-0.635" y2="-134.5692" width="0" layer="19" extent="1-1"/>
+<wire x1="23.876" y1="15.3416" x2="-8.255" y2="-124.5108" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MKM_MISO">
-<contactref element="U11" pad="14"/>
 <contactref element="U12" pad="2"/>
 <wire x1="23.7998" y1="14.1478" x2="25.273" y2="14.1478" width="0.4064" layer="1"/>
 <wire x1="25.273" y1="14.1478" x2="25.2984" y2="14.1224" width="0.3048" layer="1"/>
@@ -9264,25 +9161,21 @@ Based on the following sources:
 <wire x1="25.2984" y1="14.1224" x2="40.2336" y2="14.1224" width="0.4064" layer="16"/>
 <via x="40.2336" y="14.1224" extent="1-16" drill="0.6" shape="square"/>
 <wire x1="40.2336" y1="14.1224" x2="42.164" y2="14.1224" width="0.4064" layer="1"/>
-<wire x1="42.164" y1="14.1224" x2="42.0878" y2="14.1986" width="0.3048" layer="1"/>
+<contactref element="IC4" pad="17"/>
+<contactref element="IC4" pad="8"/>
+<wire x1="-6.985" y1="-124.5108" x2="-1.905" y2="-134.5692" width="0" layer="19" extent="1-1"/>
+<wire x1="23.7998" y1="14.1478" x2="-6.985" y2="-124.5108" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="MKM_CONTROL">
-<contactref element="U11" pad="9"/>
-<contactref element="R32" pad="2"/>
-<contactref element="U10" pad="31"/>
-<wire x1="47.244" y1="5.2832" x2="44.6786" y2="7.8486" width="0.4064" layer="1"/>
-<wire x1="42.0878" y1="7.8486" x2="44.6786" y2="7.8486" width="0.4064" layer="1"/>
-<wire x1="42.022" y1="6.1976" x2="41.822" y2="7.5828" width="0.4064" layer="1"/>
-<wire x1="41.822" y1="7.5828" x2="42.0878" y2="7.8486" width="0.4064" layer="1"/>
-<wire x1="62.6618" y1="10.8966" x2="60.1726" y2="10.8966" width="0.4064" layer="1"/>
-<wire x1="60.1726" y1="10.8966" x2="54.5592" y2="5.2832" width="0.4064" layer="1"/>
-<wire x1="54.5592" y1="5.2832" x2="47.244" y2="5.2832" width="0.4064" layer="1"/>
+<signal name="MKM_CONTROL_AVR_ENA">
+<contactref element="U10" pad="15"/>
+<contactref element="IC4" pad="1"/>
+<contactref element="R80" pad="1"/>
+<wire x1="-10.795" y1="-134.5692" x2="-12.08" y2="-149.86" width="0" layer="19" extent="1-1"/>
+<wire x1="71.1454" y1="14.9098" x2="-10.795" y2="-134.5692" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MKM_AVR_SCK">
-<contactref element="U11" pad="12"/>
 <contactref element="U10" pad="30"/>
 <contactref element="JP3" pad="3"/>
-<wire x1="42.0878" y1="11.6586" x2="44.7802" y2="11.6586" width="0.4064" layer="1"/>
 <via x="57.912" y="10.7696" extent="1-16" drill="0.6" shape="square"/>
 <wire x1="57.912" y1="10.7696" x2="57.3024" y2="11.3792" width="0.4064" layer="16"/>
 <wire x1="57.3024" y1="11.3792" x2="57.3024" y2="13.0556" width="0.4064" layer="16"/>
@@ -9297,67 +9190,37 @@ Based on the following sources:
 <wire x1="62.6618" y1="11.7094" x2="59.7662" y2="11.7094" width="0.4064" layer="1"/>
 <wire x1="59.7662" y1="11.7094" x2="58.8264" y2="10.7696" width="0.4064" layer="1"/>
 <wire x1="58.8264" y1="10.7696" x2="57.912" y2="10.7696" width="0.4064" layer="1"/>
+<contactref element="IC4" pad="4"/>
+<wire x1="44.7802" y1="11.6586" x2="-6.985" y2="-134.5692" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MKM_AVR_CS_N">
-<contactref element="U11" pad="3"/>
-<contactref element="U10" pad="32"/>
-<wire x1="37.1602" y1="14.1986" x2="38.481" y2="14.1986" width="0.4064" layer="1"/>
-<wire x1="38.481" y1="14.1986" x2="39.0144" y2="13.6652" width="0.4064" layer="1"/>
-<wire x1="39.0144" y1="13.6652" x2="39.0144" y2="12.2936" width="0.4064" layer="1"/>
-<wire x1="39.0144" y1="12.2936" x2="40.2336" y2="11.0744" width="0.4064" layer="1"/>
-<wire x1="40.2336" y1="11.0744" x2="40.2336" y2="5.2832" width="0.4064" layer="1"/>
-<wire x1="40.2336" y1="5.2832" x2="41.148" y2="4.3688" width="0.4064" layer="1"/>
-<wire x1="41.148" y1="4.3688" x2="54.864" y2="4.3688" width="0.4064" layer="1"/>
-<wire x1="62.6618" y1="10.1092" x2="60.6044" y2="10.1092" width="0.4064" layer="1"/>
-<wire x1="60.6044" y1="10.1092" x2="54.864" y2="4.3688" width="0.4064" layer="1"/>
+<contactref element="IC4" pad="2"/>
+<contactref element="U10" pad="14"/>
+<wire x1="71.1454" y1="14.097" x2="-9.525" y2="-134.5692" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MKM_FPGA_MOSI">
-<contactref element="U11" pad="6"/>
-<via x="39.0144" y="10.4648" extent="1-16" drill="0.6" shape="square"/>
-<wire x1="39.0144" y1="10.4648" x2="37.2364" y2="10.4648" width="0.4064" layer="1"/>
-<wire x1="37.2364" y1="10.4648" x2="37.1602" y2="10.3886" width="0.3048" layer="1"/>
-<wire x1="39.0144" y1="10.4648" x2="40.5384" y2="10.4648" width="0.3048" layer="16"/>
-<wire x1="40.5384" y1="10.4648" x2="50.292" y2="20.2184" width="0.3048" layer="16"/>
 <contactref element="U13" pad="P19"/>
-<wire x1="50.292" y1="20.2184" x2="47.0808" y2="50.2088" width="0" layer="19" extent="1-16"/>
+<contactref element="IC4" pad="15"/>
+<wire x1="47.0808" y1="50.2088" x2="-4.445" y2="-124.5108" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MKM_FPGA_MISO">
-<contactref element="U11" pad="15"/>
-<wire x1="42.0878" y1="15.4686" x2="47.0662" y2="15.4686" width="0.4064" layer="1"/>
-<wire x1="50.5968" y1="19.6088" x2="47.244" y2="16.256" width="0.3048" layer="16"/>
-<wire x1="47.244" y1="16.256" x2="47.244" y2="15.3416" width="0.3048" layer="16"/>
-<via x="47.244" y="15.3416" extent="1-16" drill="0.6" shape="square"/>
-<wire x1="47.0662" y1="15.4686" x2="47.244" y2="15.3416" width="0.4064" layer="1"/>
 <contactref element="U13" pad="R19"/>
-<wire x1="50.5968" y1="19.6088" x2="46.0808" y2="50.2088" width="0" layer="19" extent="1-16"/>
+<contactref element="IC4" pad="3"/>
+<wire x1="46.0808" y1="50.2088" x2="-8.255" y2="-134.5692" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MKM_FPGA_SCK">
-<contactref element="U11" pad="11"/>
-<wire x1="50.9016" y1="18.9992" x2="48.4632" y2="16.5608" width="0.3048" layer="16"/>
-<via x="44.196" y="10.4648" extent="1-16" drill="0.6" shape="square"/>
-<wire x1="42.0878" y1="10.3886" x2="44.1198" y2="10.3886" width="0.4064" layer="1"/>
-<wire x1="44.1198" y1="10.3886" x2="44.196" y2="10.4648" width="0.4064" layer="1"/>
-<wire x1="48.4632" y1="14.732" x2="48.4632" y2="16.5608" width="0.3048" layer="16"/>
-<wire x1="44.5008" y1="10.7696" x2="44.196" y2="10.4648" width="0.3048" layer="16"/>
-<wire x1="48.4632" y1="14.732" x2="44.196" y2="10.4648" width="0.3048" layer="16"/>
 <contactref element="U13" pad="U21"/>
-<wire x1="50.9016" y1="18.9992" x2="44.0808" y2="48.2088" width="0" layer="19" extent="1-16"/>
+<contactref element="IC4" pad="13"/>
+<wire x1="44.0808" y1="48.2088" x2="-1.905" y2="-124.5108" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MKM_FPGA_CS_N">
-<contactref element="U11" pad="2"/>
-<wire x1="49.9872" y1="20.828" x2="44.8056" y2="15.6464" width="0.3048" layer="16"/>
-<wire x1="44.8056" y1="15.6464" x2="39.0144" y2="15.6464" width="0.3048" layer="16"/>
-<via x="39.0144" y="15.6464" extent="1-16" drill="0.6" shape="square"/>
-<wire x1="39.0144" y1="15.6464" x2="38.8366" y2="15.4686" width="0.4064" layer="1"/>
-<wire x1="38.8366" y1="15.4686" x2="37.1602" y2="15.4686" width="0.4064" layer="1"/>
 <contactref element="U13" pad="T21"/>
-<wire x1="49.9872" y1="20.828" x2="45.0808" y2="48.2088" width="0" layer="19" extent="1-16"/>
+<contactref element="IC4" pad="11"/>
+<wire x1="45.0808" y1="48.2088" x2="0.635" y2="-124.5108" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MKM_AVR_MOSI">
-<contactref element="U11" pad="10"/>
 <contactref element="U10" pad="27"/>
 <contactref element="JP3" pad="4"/>
-<wire x1="42.0878" y1="9.1186" x2="44.6278" y2="9.1186" width="0.4064" layer="1"/>
 <wire x1="44.6278" y1="9.1186" x2="46.9392" y2="6.8072" width="0.4064" layer="1"/>
 <wire x1="46.9392" y1="6.8072" x2="52.1208" y2="6.8072" width="0.4064" layer="1"/>
 <wire x1="52.1208" y1="6.8072" x2="52.9336" y2="7.62" width="0.4064" layer="1"/>
@@ -9371,9 +9234,10 @@ Based on the following sources:
 <wire x1="62.6618" y1="14.097" x2="60.3758" y2="14.097" width="0.4064" layer="1"/>
 <wire x1="60.3758" y1="14.097" x2="59.7408" y2="14.732" width="0.4064" layer="1"/>
 <via x="59.7408" y="14.732" extent="1-16" drill="0.6" shape="square"/>
+<contactref element="IC4" pad="6"/>
+<wire x1="46.9392" y1="6.8072" x2="-4.445" y2="-134.5692" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MKM_AVR_MISO">
-<contactref element="U11" pad="1"/>
 <contactref element="JP3" pad="1"/>
 <contactref element="U10" pad="28"/>
 <wire x1="37.6428" y1="17.9324" x2="49.53" y2="17.9324" width="0.4064" layer="1"/>
@@ -9387,70 +9251,69 @@ Based on the following sources:
 <wire x1="54.356" y1="17.018" x2="52.578" y2="17.018" width="0.4064" layer="1"/>
 <wire x1="37.6428" y1="17.9324" x2="37.1856" y2="17.4752" width="0.4064" layer="1"/>
 <wire x1="37.1856" y1="17.4752" x2="37.1856" y2="16.764" width="0.4064" layer="1"/>
-<wire x1="37.1856" y1="16.764" x2="37.1602" y2="16.7386" width="0.4064" layer="1"/>
 <wire x1="52.578" y1="17.018" x2="51.5112" y2="15.9512" width="0.4064" layer="1"/>
+<contactref element="IC4" pad="12"/>
+<wire x1="37.1856" y1="16.764" x2="-0.635" y2="-124.5108" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="AVR_GPIO_1">
+<signal name="AVR_GPIO_0">
 <contactref element="JP5" pad="2"/>
-<contactref element="U10" pad="1"/>
-<wire x1="64.1096" y1="8.6614" x2="64.1096" y2="8.4328" width="0.4064" layer="1"/>
 <wire x1="64.1096" y1="8.4328" x2="62.2808" y2="8.4328" width="0.4064" layer="1"/>
 <wire x1="62.2808" y1="8.4328" x2="59.2328" y2="5.3848" width="0.4064" layer="1"/>
 <wire x1="59.2328" y1="5.3848" x2="59.2328" y2="2.7178" width="0.4064" layer="1"/>
+<contactref element="U10" pad="31"/>
+<wire x1="62.2808" y1="8.4328" x2="62.6618" y2="10.8966" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="AVR_GPIO_2">
+<signal name="AVR_GPIO_1">
 <contactref element="JP5" pad="3"/>
-<contactref element="U10" pad="2"/>
-<wire x1="64.897" y1="8.6614" x2="64.897" y2="7.6962" width="0.4064" layer="1"/>
 <wire x1="64.897" y1="7.6962" x2="61.7728" y2="4.572" width="0.4064" layer="1"/>
 <wire x1="61.7728" y1="4.572" x2="61.7728" y2="2.9718" width="0.4064" layer="1"/>
+<contactref element="U10" pad="32"/>
+<wire x1="64.897" y1="7.6962" x2="62.6618" y2="10.1092" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="AVR_GPIO_3">
+<signal name="AVR_GPIO_2">
 <contactref element="JP5" pad="4"/>
-<contactref element="U10" pad="3"/>
-<wire x1="65.7098" y1="8.6614" x2="65.7098" y2="5.7658" width="0.4064" layer="1"/>
 <wire x1="65.7098" y1="5.7658" x2="64.3128" y2="4.3688" width="0.4064" layer="1"/>
 <wire x1="64.3128" y1="4.3688" x2="64.3128" y2="2.7178" width="0.4064" layer="1"/>
+<contactref element="U10" pad="1"/>
+<wire x1="65.7098" y1="5.7658" x2="64.1096" y2="8.6614" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="AVR_GPIO_4">
+<signal name="AVR_GPIO_3">
 <contactref element="JP5" pad="5"/>
-<contactref element="U10" pad="6"/>
-<wire x1="68.0974" y1="8.6614" x2="68.0974" y2="6.3246" width="0.4064" layer="1"/>
 <wire x1="68.0974" y1="6.3246" x2="66.8528" y2="5.08" width="0.4064" layer="1"/>
 <wire x1="66.8528" y1="2.9718" x2="66.8528" y2="5.08" width="0.4064" layer="1"/>
+<contactref element="U10" pad="2"/>
+<wire x1="68.0974" y1="6.3246" x2="64.897" y2="8.6614" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="AVR_GPIO_5">
+<signal name="AVR_GPIO_4">
 <contactref element="JP5" pad="6"/>
-<contactref element="U10" pad="7"/>
-<wire x1="68.9102" y1="8.6614" x2="68.9102" y2="4.4196" width="0.4064" layer="1"/>
 <wire x1="68.9102" y1="4.4196" x2="69.3928" y2="3.937" width="0.4064" layer="1"/>
 <wire x1="69.3928" y1="3.937" x2="69.3928" y2="2.7178" width="0.4064" layer="1"/>
+<contactref element="U10" pad="3"/>
+<wire x1="65.7098" y1="8.6614" x2="68.9102" y2="4.4196" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="AVR_GPIO_6">
+<signal name="AVR_GPIO_5">
 <contactref element="JP5" pad="7"/>
-<contactref element="U10" pad="8"/>
-<wire x1="69.6976" y1="8.6614" x2="69.6976" y2="5.207" width="0.4064" layer="1"/>
 <wire x1="69.6976" y1="5.207" x2="71.9328" y2="2.9718" width="0.4064" layer="1"/>
+<contactref element="U10" pad="6"/>
+<wire x1="68.0974" y1="8.6614" x2="69.6976" y2="5.207" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="AVR_GPIO_7">
+<signal name="AVR_GPIO_6">
 <contactref element="JP5" pad="8"/>
-<contactref element="U10" pad="9"/>
-<wire x1="71.1454" y1="10.1092" x2="71.1454" y2="6.0452" width="0.4064" layer="1"/>
 <wire x1="71.1454" y1="6.0452" x2="74.4728" y2="2.7178" width="0.4064" layer="1"/>
+<contactref element="U10" pad="7"/>
+<wire x1="68.9102" y1="8.6614" x2="71.1454" y2="6.0452" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="AVR_GPIO_8">
+<signal name="AVR_GPIO_7">
 <contactref element="JP5" pad="9"/>
-<contactref element="U10" pad="10"/>
-<wire x1="71.1454" y1="10.8966" x2="72.4154" y2="10.8966" width="0.4064" layer="1"/>
 <wire x1="72.4154" y1="10.8966" x2="73.152" y2="10.16" width="0.4064" layer="1"/>
 <wire x1="73.152" y1="10.16" x2="73.152" y2="6.8326" width="0.4064" layer="1"/>
 <wire x1="73.152" y1="6.8326" x2="77.0128" y2="2.9718" width="0.4064" layer="1"/>
+<contactref element="U10" pad="8"/>
+<wire x1="69.6976" y1="8.6614" x2="72.4154" y2="10.8966" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="AVR_PANIC">
-<contactref element="U10" pad="11"/>
 <contactref element="S2" pad="A2"/>
 <wire x1="28.7388" y1="3.4544" x2="28.7176" y2="3.4332" width="0.4064" layer="1"/>
-<wire x1="71.1454" y1="11.7094" x2="65.2526" y2="11.7094" width="0.4064" layer="1"/>
 <wire x1="65.2526" y1="11.7094" x2="64.6176" y2="11.0744" width="0.4064" layer="1"/>
 <wire x1="64.6176" y1="11.0744" x2="64.6176" y2="10.4648" width="0.4064" layer="1"/>
 <via x="64.6176" y="10.4648" extent="1-16" drill="0.6" shape="square"/>
@@ -9461,6 +9324,8 @@ Based on the following sources:
 <wire x1="28.7388" y1="3.4544" x2="52.7304" y2="3.4544" width="0.4064" layer="1"/>
 <via x="52.7304" y="3.4544" extent="1-16" drill="0.6" shape="square"/>
 <wire x1="28.7176" y1="3.4332" x2="28.6724" y2="3.4332" width="0.4064" layer="1"/>
+<contactref element="R82" pad="1"/>
+<wire x1="28.6724" y1="3.4332" x2="-12.08" y2="-154.94" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="3V3_BATT">
 <contactref element="C107" pad="1"/>
@@ -9468,10 +9333,8 @@ Based on the following sources:
 <contactref element="U10" pad="4"/>
 <contactref element="JP3" pad="2"/>
 <contactref element="R30" pad="2"/>
-<contactref element="R34" pad="2"/>
 <contactref element="U12" pad="8"/>
 <contactref element="C103" pad="1"/>
-<contactref element="U11" pad="16"/>
 <contactref element="C102" pad="1"/>
 <contactref element="R33" pad="1"/>
 <contactref element="C104" pad="1"/>
@@ -9485,7 +9348,6 @@ Based on the following sources:
 <vertex x="86.868" y="18.9992"/>
 </polygon>
 <contactref element="JP4" pad="2"/>
-<via x="26.5176" y="17.78" extent="1-16" drill="0.6" shape="square"/>
 <via x="30.7848" y="15.6464" extent="1-16" drill="0.6" shape="square"/>
 <via x="32.9184" y="15.6464" extent="1-16" drill="0.6" shape="square"/>
 <via x="32.6136" y="17.78" extent="1-16" drill="0.6" shape="square"/>
@@ -9493,14 +9355,12 @@ Based on the following sources:
 <via x="47.8536" y="8.0264" extent="1-16" drill="0.6" shape="square"/>
 <via x="66.1416" y="10.4648" extent="1-16" drill="0.6" shape="square"/>
 <via x="68.8848" y="15.6464" extent="1-16" drill="0.6" shape="square"/>
-<wire x1="25.1864" y1="17.78" x2="26.5176" y2="17.78" width="0.4064" layer="1"/>
 <wire x1="29.2354" y1="15.4178" x2="30.5562" y2="15.4178" width="0.4064" layer="1"/>
 <wire x1="30.5562" y1="15.4178" x2="30.7848" y2="15.6464" width="0.4064" layer="1"/>
 <wire x1="32.654" y1="14.1224" x2="32.854" y2="15.582" width="0.4064" layer="1"/>
 <wire x1="32.854" y1="15.582" x2="32.9184" y2="15.6464" width="0.4064" layer="1"/>
 <wire x1="30.8252" y1="17.78" x2="32.6136" y2="17.78" width="0.4064" layer="16"/>
 <wire x1="42.2552" y1="16.8656" x2="43.8912" y2="16.8656" width="0.4064" layer="16"/>
-<wire x1="42.0878" y1="16.7386" x2="43.7134" y2="16.7386" width="0.4064" layer="1"/>
 <wire x1="43.7134" y1="16.7386" x2="43.8912" y2="16.8656" width="0.4064" layer="1"/>
 <wire x1="47.7012" y1="9.6624" x2="47.7012" y2="8.1788" width="0.4064" layer="1"/>
 <wire x1="47.7012" y1="8.1788" x2="47.8536" y2="8.0264" width="0.4064" layer="1"/>
@@ -9519,24 +9379,35 @@ Based on the following sources:
 <wire x1="84.1502" y1="9.525" x2="84.7344" y2="8.9408" width="0.4064" layer="1"/>
 <wire x1="84.7344" y1="8.9408" x2="84.7344" y2="3.7846" width="0.4064" layer="1"/>
 <wire x1="84.7344" y1="3.7846" x2="85.5472" y2="2.9718" width="0.4064" layer="1"/>
-</signal>
-<signal name="AVR_GPIO_11">
-<contactref element="U10" pad="22"/>
-<wire x1="83.3124" y1="29.5652" x2="83.82" y2="29.0576" width="0.3048" layer="1"/>
-<via x="83.82" y="29.0576" extent="1-16" drill="0.6" shape="square"/>
-<wire x1="83.82" y1="29.0576" x2="83.82" y2="26.6192" width="0.3048" layer="16"/>
-<wire x1="83.82" y1="26.6192" x2="78.6384" y2="21.4376" width="0.3048" layer="16"/>
-<via x="67.056" y="21.7424" extent="1-16" drill="0.6" shape="square"/>
-<wire x1="65.7098" y1="17.145" x2="65.7098" y2="20.3962" width="0.4064" layer="1"/>
-<wire x1="78.6384" y1="21.4376" x2="67.3608" y2="21.4376" width="0.3048" layer="16"/>
-<wire x1="67.056" y1="21.4376" x2="67.056" y2="21.7424" width="0.4064" layer="1"/>
-<wire x1="67.3608" y1="21.4376" x2="67.056" y2="21.7424" width="0.3048" layer="16"/>
-<wire x1="65.7098" y1="20.3962" x2="67.056" y2="21.7424" width="0.4064" layer="1"/>
+<contactref element="IC4" pad="20"/>
+<contactref element="R80" pad="2"/>
+<contactref element="R79" pad="2"/>
+<contactref element="R34" pad="2"/>
+<via x="26.5176" y="17.78" extent="1-16" drill="0.6" shape="square"/>
+<wire x1="25.1864" y1="17.78" x2="26.5176" y2="17.78" width="0.4064" layer="1"/>
+<contactref element="R82" pad="2"/>
+<contactref element="R32" pad="1"/>
+<wire x1="-10.78" y1="-154.94" x2="-12.08" y2="-160.02" width="0" layer="19" extent="1-1"/>
+<wire x1="-10.78" y1="-149.86" x2="-10.78" y2="-154.94" width="0" layer="19" extent="1-1"/>
+<wire x1="-1.89" y1="-144.78" x2="-10.78" y2="-149.86" width="0" layer="19" extent="1-1"/>
+<wire x1="-10.795" y1="-124.5108" x2="-1.89" y2="-144.78" width="0" layer="19" extent="1-1"/>
+<wire x1="47.8536" y1="8.0264" x2="-10.795" y2="-124.5108" width="0" layer="19" extent="1-1"/>
+<wire x1="55.4736" y1="8.9916" x2="47.8536" y2="8.0264" width="0" layer="19" extent="1-1"/>
+<wire x1="43.7134" y1="16.7386" x2="47.7012" y2="9.6624" width="0" layer="19" extent="1-1"/>
+<wire x1="32.9184" y1="15.6464" x2="42.2552" y2="16.8656" width="0" layer="19" extent="16-16"/>
+<wire x1="30.7848" y1="15.6464" x2="32.854" y2="15.582" width="0" layer="19" extent="1-1"/>
+<wire x1="30.8252" y1="17.78" x2="30.7848" y2="15.6464" width="0" layer="19" extent="16-16"/>
+<wire x1="26.5176" y1="17.78" x2="29.2354" y2="15.4178" width="0" layer="19" extent="1-1"/>
+<wire x1="65.9536" y1="10.6528" x2="55.4736" y2="8.9916" width="0" layer="19" extent="16-16"/>
+<wire x1="68.8848" y1="15.6464" x2="65.9536" y2="12.2936" width="0" layer="19" extent="1-16"/>
+<wire x1="82.677" y1="9.525" x2="68.9102" y2="15.6718" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="AVR_GPIO_ARM_1">
 <contactref element="U4" pad="9"/>
-<wire x1="83.3124" y1="29.5652" x2="81.3312" y2="31.138" width="0" layer="19" extent="1-1"/>
+<contactref element="U10" pad="19"/>
+<wire x1="68.0974" y1="17.145" x2="81.3312" y2="31.138" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="AVR_GPIO_10">
-<contactref element="U10" pad="20"/>
+<signal name="AVR_GPIO_ARM_0">
 <contactref element="U4" pad="8"/>
 <wire x1="80.8232" y1="31.138" x2="80.8232" y2="29.1088" width="0.3048" layer="1"/>
 <wire x1="80.8232" y1="29.1088" x2="80.772" y2="29.0576" width="0.3048" layer="1"/>
@@ -9544,10 +9415,11 @@ Based on the following sources:
 <wire x1="80.772" y1="29.0576" x2="80.772" y2="24.4856" width="0.3048" layer="16"/>
 <wire x1="80.772" y1="24.4856" x2="78.3336" y2="22.0472" width="0.3048" layer="16"/>
 <via x="69.7992" y="22.352" extent="1-16" drill="0.6" shape="square"/>
-<wire x1="67.31" y1="17.145" x2="67.31" y2="19.8628" width="0.4064" layer="1"/>
 <wire x1="78.3336" y1="22.0472" x2="69.7992" y2="22.0472" width="0.3048" layer="16"/>
 <wire x1="69.7992" y1="22.0472" x2="69.7992" y2="22.352" width="0.3048" layer="16"/>
 <wire x1="67.31" y1="19.8628" x2="69.7992" y2="22.352" width="0.4064" layer="1"/>
+<contactref element="U10" pad="17"/>
+<wire x1="69.6976" y1="17.145" x2="67.31" y2="19.8628" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RTC_X1">
 <contactref element="U7" pad="1"/>
@@ -9556,7 +9428,7 @@ Based on the following sources:
 <wire x1="82.7532" y1="11.9888" x2="82.677" y2="12.065" width="0.4064" layer="1"/>
 <wire x1="82.0556" y1="14.732" x2="81.9912" y2="14.9964" width="0.4064" layer="1"/>
 <contactref element="X1" pad="P$1"/>
-<wire x1="82.0556" y1="14.732" x2="83.89" y2="15.24" width="0" layer="19" extent="1-1"/>
+<wire x1="81.9912" y1="14.9964" x2="83.89" y2="15.24" width="0" layer="19" extent="1-1"/>
 <wire x1="82.677" y1="12.065" x2="82.0556" y2="14.732" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RTC_X2">
@@ -9565,7 +9437,7 @@ Based on the following sources:
 <wire x1="82.7024" y1="10.7696" x2="82.677" y2="10.795" width="0.4064" layer="1"/>
 <wire x1="88.3276" y1="14.732" x2="88.392" y2="14.9964" width="0.4064" layer="1"/>
 <contactref element="X1" pad="P$2"/>
-<wire x1="86.29" y1="15.24" x2="88.3276" y2="14.732" width="0" layer="19" extent="1-1"/>
+<wire x1="86.29" y1="15.24" x2="88.392" y2="14.9964" width="0" layer="19" extent="1-1"/>
 <wire x1="82.677" y1="10.795" x2="86.29" y2="15.24" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="RTC_MFP">
@@ -9852,7 +9724,6 @@ Based on the following sources:
 <contactref element="C36" pad="1"/>
 <contactref element="C45" pad="1"/>
 <contactref element="C29" pad="1"/>
-<contactref element="C21" pad="1"/>
 <wire x1="80.3152" y1="59.2104" x2="79.248" y2="58.1432" width="0.3048" layer="1"/>
 <via x="79.248" y="58.1432" extent="1-16" drill="0.6" shape="square"/>
 <wire x1="79.248" y1="58.1432" x2="79.248" y2="59.679" width="0.4064" layer="16"/>
@@ -9869,7 +9740,6 @@ Based on the following sources:
 <wire x1="106.3752" y1="35.2832" x2="105.0916" y2="35.2832" width="0.4064" layer="16"/>
 <wire x1="105.0916" y1="35.2832" x2="105.156" y2="35.7" width="0.3048" layer="16"/>
 <via x="104.8512" y="29.492" extent="1-16" drill="0.6" shape="square"/>
-<via x="99.441" y="32.8448" extent="1-16" drill="0.6" shape="square"/>
 <via x="89.916" y="33.1496" extent="1-16" drill="0.6" shape="square"/>
 <wire x1="89.916" y1="33.1496" x2="89.6112" y2="33.1496" width="0.3048" layer="16"/>
 <wire x1="89.6516" y1="34.3688" x2="89.8516" y2="33.214" width="0.4064" layer="16"/>
@@ -9920,11 +9790,6 @@ Based on the following sources:
 <wire x1="79.0076" y1="57.9028" x2="79.248" y2="58.1432" width="0.4064" layer="16"/>
 <wire x1="86.2584" y1="58.7528" x2="86.2584" y2="59.778" width="0.4064" layer="16"/>
 <wire x1="86.2584" y1="59.778" x2="86.3704" y2="59.8424" width="0.4064" layer="16"/>
-<wire x1="98.0812" y1="32.54" x2="99.1362" y2="32.54" width="0.4064" layer="16"/>
-<wire x1="99.1362" y1="32.54" x2="99.441" y2="32.8448" width="0.4064" layer="16"/>
-<wire x1="97.8158" y1="32.3854" x2="98.298" y2="32.8676" width="0.3048" layer="1"/>
-<wire x1="98.298" y1="32.8676" x2="99.4182" y2="32.8676" width="0.3048" layer="1"/>
-<wire x1="99.4182" y1="32.8676" x2="99.441" y2="32.8448" width="0.3048" layer="1"/>
 <wire x1="96.3172" y1="29.4924" x2="96.012" y2="29.1872" width="0.3048" layer="1"/>
 <via x="24.384" y="36.3728" extent="1-16" drill="0.6" shape="square"/>
 <via x="31.3944" y="36.3728" extent="1-16" drill="0.6" shape="square"/>
@@ -10085,7 +9950,6 @@ Based on the following sources:
 <contactref element="IC1" pad="8"/>
 <contactref element="IC1" pad="7"/>
 <contactref element="C69" pad="1"/>
-<contactref element="IC1" pad="3"/>
 <contactref element="U4" pad="158"/>
 <contactref element="U4" pad="171"/>
 <contactref element="U4" pad="185"/>
@@ -10104,7 +9968,6 @@ Based on the following sources:
 <contactref element="U4" pad="26"/>
 <contactref element="U4" pad="15"/>
 <contactref element="U4" pad="42"/>
-<contactref element="U4" pad="6"/>
 <contactref element="U4" pad="41"/>
 <contactref element="U4" pad="203"/>
 <contactref element="IC2" pad="20"/>
@@ -10112,9 +9975,16 @@ Based on the following sources:
 <contactref element="R48" pad="2"/>
 <contactref element="R46" pad="2"/>
 <contactref element="R18" pad="1"/>
+<contactref element="R17" pad="1"/>
+<contactref element="C21" pad="1"/>
+<via x="99.441" y="32.8448" extent="1-16" drill="0.6" shape="square"/>
+<wire x1="98.0812" y1="32.54" x2="99.1362" y2="32.54" width="0.4064" layer="16"/>
+<wire x1="99.1362" y1="32.54" x2="99.441" y2="32.8448" width="0.4064" layer="16"/>
+<wire x1="97.8158" y1="32.3854" x2="98.298" y2="32.8676" width="0.3048" layer="1"/>
+<wire x1="98.298" y1="32.8676" x2="99.4182" y2="32.8676" width="0.3048" layer="1"/>
+<wire x1="99.4182" y1="32.8676" x2="99.441" y2="32.8448" width="0.3048" layer="1"/>
 <wire x1="116.22" y1="98.552" x2="116.22" y2="100.076" width="0" layer="19" extent="1-1"/>
-<wire x1="112.5474" y1="98.933" x2="116.22" y2="98.552" width="0" layer="19" extent="1-1"/>
-<wire x1="106.4006" y1="97.663" x2="112.5474" y2="98.933" width="0" layer="19" extent="1-1"/>
+<wire x1="106.4006" y1="97.663" x2="116.22" y2="98.552" width="0" layer="19" extent="1-1"/>
 <wire x1="106.4006" y1="96.393" x2="106.4006" y2="97.663" width="0" layer="19" extent="1-1"/>
 <wire x1="97.678" y1="100.584" x2="106.4006" y2="97.663" width="0" layer="19" extent="1-1"/>
 <wire x1="94.0054" y1="100.457" x2="97.678" y2="100.584" width="0" layer="19" extent="1-1"/>
@@ -10256,7 +10126,6 @@ Based on the following sources:
 <wire x1="85.0392" y1="32.7152" x2="89.6112" y2="33.1496" width="0" layer="19" extent="16-16"/>
 <wire x1="84.3284" y1="31.138" x2="84.7748" y2="31.3436" width="0" layer="19" extent="1-16"/>
 <wire x1="79.898" y1="31.3436" x2="84.3284" y2="31.138" width="0" layer="19" extent="1-16"/>
-<wire x1="79.8072" y1="31.138" x2="79.8576" y2="31.1884" width="0" layer="19" extent="1-1"/>
 <wire x1="77.1144" y1="34.3688" x2="79.8576" y2="32.7152" width="0" layer="19" extent="1-1"/>
 <wire x1="75.4892" y1="34.9734" x2="75.819" y2="34.8084" width="0" layer="19" extent="1-16"/>
 <wire x1="75.4892" y1="35.456" x2="75.4892" y2="34.9734" width="0" layer="19" extent="1-1"/>
@@ -10318,6 +10187,7 @@ Based on the following sources:
 <wire x1="-10.78" y1="-93.98" x2="-1.92" y2="-87.63" width="0" layer="19" extent="1-1"/>
 <wire x1="-10.78" y1="-99.06" x2="-10.78" y2="-93.98" width="0" layer="19" extent="1-1"/>
 <wire x1="86.0298" y1="12.065" x2="84.3284" y2="31.138" width="0" layer="19" extent="1-1"/>
+<wire x1="-12.08" y1="-120.65" x2="-10.78" y2="-99.06" width="0" layer="19" extent="1-1"/>
 <wire x1="158.902" y1="55.626" x2="108.5088" y2="57.9484" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="FMC_CLK">
@@ -10360,16 +10230,6 @@ Based on the following sources:
 <wire x1="91.186" y1="97.282" x2="97.678" y2="98.552" width="0" layer="19" extent="1-1"/>
 <wire x1="87.8586" y1="97.917" x2="91.186" y2="97.282" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="FPGA_GPIO_TAMPER_0">
-<contactref element="U13" pad="F15"/>
-<contactref element="U10" pad="25"/>
-<wire x1="62.6618" y1="15.6972" x2="55.0808" y2="54.2088" width="0" layer="19" extent="1-1"/>
-</signal>
-<signal name="FPGA_GPIO_TAMPER_1">
-<contactref element="U13" pad="F13"/>
-<contactref element="U10" pad="26"/>
-<wire x1="62.6618" y1="14.9098" x2="55.0808" y2="56.2088" width="0" layer="19" extent="1-1"/>
-</signal>
 <signal name="FPGA_IRQ_N_0">
 <contactref element="U13" pad="F14"/>
 <contactref element="U4" pad="122"/>
@@ -10729,7 +10589,7 @@ Based on the following sources:
 <wire x1="153.05" y1="69.85" x2="156.058" y2="69.85" width="0" layer="19" extent="1-1"/>
 <wire x1="153.05" y1="67.818" x2="153.05" y2="69.85" width="0" layer="19" extent="1-1"/>
 <wire x1="151.75" y1="65.786" x2="153.05" y2="67.818" width="0" layer="19" extent="1-1"/>
-<wire x1="156.08" y1="66.802" x2="153.05" y2="67.818" width="0" layer="19" extent="1-1"/>
+<wire x1="156.08" y1="66.802" x2="156.058" y2="69.85" width="0" layer="19" extent="1-1"/>
 <wire x1="145.7104" y1="66.3244" x2="151.75" y2="65.786" width="0" layer="19" extent="1-1"/>
 <wire x1="145.2104" y1="66.3244" x2="145.7104" y2="66.3244" width="0" layer="19" extent="1-1"/>
 <wire x1="144.7104" y1="66.3244" x2="145.2104" y2="66.3244" width="0" layer="19" extent="1-1"/>
@@ -10786,8 +10646,8 @@ Based on the following sources:
 <contactref element="C120" pad="1"/>
 <wire x1="153.05" y1="55.626" x2="156.058" y2="55.626" width="0" layer="19" extent="1-1"/>
 <wire x1="156.08" y1="52.578" x2="156.058" y2="55.626" width="0" layer="19" extent="1-1"/>
-<wire x1="153.05" y1="49.53" x2="156.08" y2="52.578" width="0" layer="19" extent="1-1"/>
-<wire x1="151.75" y1="51.562" x2="153.05" y2="49.53" width="0" layer="19" extent="1-1"/>
+<wire x1="151.75" y1="51.562" x2="153.05" y2="55.626" width="0" layer="19" extent="1-1"/>
+<wire x1="153.05" y1="49.53" x2="151.75" y2="51.562" width="0" layer="19" extent="1-1"/>
 <wire x1="145.304" y1="51.694" x2="151.75" y2="51.562" width="0" layer="19" extent="1-1"/>
 <wire x1="144.804" y1="51.694" x2="145.304" y2="51.694" width="0" layer="19" extent="1-1"/>
 <wire x1="144.304" y1="51.694" x2="144.804" y2="51.694" width="0" layer="19" extent="1-1"/>
@@ -10873,8 +10733,8 @@ Based on the following sources:
 <contactref element="C210" pad="1"/>
 <wire x1="154.8996" y1="95.1992" x2="154.798" y2="97.536" width="0" layer="19" extent="1-1"/>
 <wire x1="151.75" y1="97.536" x2="154.798" y2="97.536" width="0" layer="19" extent="1-1"/>
-<wire x1="147.97" y1="99.568" x2="151.75" y2="97.536" width="0" layer="19" extent="1-1"/>
-<wire x1="147.704" y1="96.52" x2="147.97" y2="99.568" width="0" layer="19" extent="1-1"/>
+<wire x1="147.704" y1="96.52" x2="151.75" y2="97.536" width="0" layer="19" extent="1-1"/>
+<wire x1="147.97" y1="99.568" x2="147.704" y2="96.52" width="0" layer="19" extent="1-1"/>
 <wire x1="142.624" y1="96.52" x2="147.704" y2="96.52" width="0" layer="19" extent="1-1"/>
 <wire x1="139.802" y1="99.568" x2="142.624" y2="96.52" width="0" layer="19" extent="1-1"/>
 <wire x1="140.0928" y1="91.3144" x2="142.624" y2="96.52" width="0" layer="19" extent="1-1"/>
@@ -11361,28 +11221,34 @@ Based on the following sources:
 <contactref element="U4" pad="95"/>
 <wire x1="-10.16" y1="-107.95" x2="104.6484" y2="53.9726" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="SDIO_CK">
-<contactref element="U4" pad="163"/>
+<signal name="N$3">
+<contactref element="Q5" pad="3"/>
+<contactref element="R4" pad="2"/>
+<wire x1="-10.78" y1="-115.57" x2="79.99" y2="99.194" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$23">
+<contactref element="IC1" pad="3"/>
+<contactref element="R17" pad="2"/>
+<wire x1="-10.78" y1="-120.65" x2="112.5474" y2="98.933" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="SDIO_CMD">
-<contactref element="U4" pad="166"/>
+<signal name="MKM_CONTROL_FPGA_DIS">
+<contactref element="IC4" pad="19"/>
+<contactref element="R81" pad="1"/>
+<wire x1="-9.525" y1="-124.5108" x2="-5.73" y2="-149.86" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="SDIO_D3">
-<contactref element="U4" pad="162"/>
+<signal name="AVR_GPIO_ARM_3">
 </signal>
-<signal name="SDIO_D2">
-<contactref element="U4" pad="161"/>
+<signal name="AVR_GPIO_FPGA_2">
+<contactref element="U10" pad="25"/>
 </signal>
-<signal name="SDIO_D0">
-<contactref element="U4" pad="140"/>
+<signal name="AVR_GPIO_FPGA_3">
+<contactref element="U10" pad="26"/>
 </signal>
-<signal name="SDIO_D1">
-<contactref element="U4" pad="141"/>
+<signal name="N$25">
+<contactref element="U4" pad="6"/>
 </signal>
-<signal name="N$3">
-<contactref element="Q5" pad="3"/>
-<contactref element="R4" pad="2"/>
-<wire x1="-10.78" y1="-115.57" x2="79.99" y2="99.194" width="0" layer="19" extent="1-1"/>
+<signal name="N$53">
+<contactref element="R32" pad="2"/>
 </signal>
 </signals>
 <errors>
diff --git a/eagle/alpha/rev02/rev02.sch b/eagle/alpha/rev02/rev02.sch
index 987d85c..c430b75 100644
--- a/eagle/alpha/rev02/rev02.sch
+++ b/eagle/alpha/rev02/rev02.sch
@@ -24608,174 +24608,6 @@ Various fiducial points for machine vision alignment.</description>
 </deviceset>
 </devicesets>
 </library>
-<library name="ON_Semiconductor-MC14551BDG">
-<packages>
-<package name="SOIC127P600X175-16N">
-<smd name="1" x="-2.4638" y="4.445" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="2" x="-2.4638" y="3.175" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="3" x="-2.4638" y="1.905" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="4" x="-2.4638" y="0.635" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="5" x="-2.4638" y="-0.635" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="6" x="-2.4638" y="-1.905" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="7" x="-2.4638" y="-3.175" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="8" x="-2.4638" y="-4.445" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="9" x="2.4638" y="-4.445" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="10" x="2.4638" y="-3.175" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="11" x="2.4638" y="-1.905" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="12" x="2.4638" y="-0.635" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="13" x="2.4638" y="0.635" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="14" x="2.4638" y="1.905" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="15" x="2.4638" y="3.175" dx="1.9558" dy="0.5334" layer="1"/>
-<smd name="16" x="2.4638" y="4.445" dx="1.9558" dy="0.5334" layer="1"/>
-<wire x1="-2.0066" y1="4.191" x2="-2.0066" y2="4.699" width="0" layer="51"/>
-<wire x1="-2.0066" y1="4.699" x2="-3.0988" y2="4.699" width="0" layer="51"/>
-<wire x1="-3.0988" y1="4.699" x2="-3.0988" y2="4.191" width="0" layer="51"/>
-<wire x1="-3.0988" y1="4.191" x2="-2.0066" y2="4.191" width="0" layer="51"/>
-<wire x1="-2.0066" y1="2.921" x2="-2.0066" y2="3.429" width="0" layer="51"/>
-<wire x1="-2.0066" y1="3.429" x2="-3.0988" y2="3.429" width="0" layer="51"/>
-<wire x1="-3.0988" y1="3.429" x2="-3.0988" y2="2.921" width="0" layer="51"/>
-<wire x1="-3.0988" y1="2.921" x2="-2.0066" y2="2.921" width="0" layer="51"/>
-<wire x1="-2.0066" y1="1.651" x2="-2.0066" y2="2.159" width="0" layer="51"/>
-<wire x1="-2.0066" y1="2.159" x2="-3.0988" y2="2.159" width="0" layer="51"/>
-<wire x1="-3.0988" y1="2.159" x2="-3.0988" y2="1.651" width="0" layer="51"/>
-<wire x1="-3.0988" y1="1.651" x2="-2.0066" y2="1.651" width="0" layer="51"/>
-<wire x1="-2.0066" y1="0.381" x2="-2.0066" y2="0.889" width="0" layer="51"/>
-<wire x1="-2.0066" y1="0.889" x2="-3.0988" y2="0.889" width="0" layer="51"/>
-<wire x1="-3.0988" y1="0.889" x2="-3.0988" y2="0.381" width="0" layer="51"/>
-<wire x1="-3.0988" y1="0.381" x2="-2.0066" y2="0.381" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-0.889" x2="-2.0066" y2="-0.381" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-0.381" x2="-3.0988" y2="-0.381" width="0" layer="51"/>
-<wire x1="-3.0988" y1="-0.381" x2="-3.0988" y2="-0.889" width="0" layer="51"/>
-<wire x1="-3.0988" y1="-0.889" x2="-2.0066" y2="-0.889" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-2.159" x2="-2.0066" y2="-1.651" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-1.651" x2="-3.0988" y2="-1.651" width="0" layer="51"/>
-<wire x1="-3.0988" y1="-1.651" x2="-3.0988" y2="-2.159" width="0" layer="51"/>
-<wire x1="-3.0988" y1="-2.159" x2="-2.0066" y2="-2.159" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-3.429" x2="-2.0066" y2="-2.921" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-2.921" x2="-3.0988" y2="-2.921" width="0" layer="51"/>
-<wire x1="-3.0988" y1="-2.921" x2="-3.0988" y2="-3.429" width="0" layer="51"/>
-<wire x1="-3.0988" y1="-3.429" x2="-2.0066" y2="-3.429" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-4.699" x2="-2.0066" y2="-4.191" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-4.191" x2="-3.0988" y2="-4.191" width="0" layer="51"/>
-<wire x1="-3.0988" y1="-4.191" x2="-3.0988" y2="-4.699" width="0" layer="51"/>
-<wire x1="-3.0988" y1="-4.699" x2="-2.0066" y2="-4.699" width="0" layer="51"/>
-<wire x1="2.0066" y1="-4.191" x2="2.0066" y2="-4.699" width="0" layer="51"/>
-<wire x1="2.0066" y1="-4.699" x2="3.0988" y2="-4.699" width="0" layer="51"/>
-<wire x1="3.0988" y1="-4.699" x2="3.0988" y2="-4.191" width="0" layer="51"/>
-<wire x1="3.0988" y1="-4.191" x2="2.0066" y2="-4.191" width="0" layer="51"/>
-<wire x1="2.0066" y1="-2.921" x2="2.0066" y2="-3.429" width="0" layer="51"/>
-<wire x1="2.0066" y1="-3.429" x2="3.0988" y2="-3.429" width="0" layer="51"/>
-<wire x1="3.0988" y1="-3.429" x2="3.0988" y2="-2.921" width="0" layer="51"/>
-<wire x1="3.0988" y1="-2.921" x2="2.0066" y2="-2.921" width="0" layer="51"/>
-<wire x1="2.0066" y1="-1.651" x2="2.0066" y2="-2.159" width="0" layer="51"/>
-<wire x1="2.0066" y1="-2.159" x2="3.0988" y2="-2.159" width="0" layer="51"/>
-<wire x1="3.0988" y1="-2.159" x2="3.0988" y2="-1.651" width="0" layer="51"/>
-<wire x1="3.0988" y1="-1.651" x2="2.0066" y2="-1.651" width="0" layer="51"/>
-<wire x1="2.0066" y1="-0.381" x2="2.0066" y2="-0.889" width="0" layer="51"/>
-<wire x1="2.0066" y1="-0.889" x2="3.0988" y2="-0.889" width="0" layer="51"/>
-<wire x1="3.0988" y1="-0.889" x2="3.0988" y2="-0.381" width="0" layer="51"/>
-<wire x1="3.0988" y1="-0.381" x2="2.0066" y2="-0.381" width="0" layer="51"/>
-<wire x1="2.0066" y1="0.889" x2="2.0066" y2="0.381" width="0" layer="51"/>
-<wire x1="2.0066" y1="0.381" x2="3.0988" y2="0.381" width="0" layer="51"/>
-<wire x1="3.0988" y1="0.381" x2="3.0988" y2="0.889" width="0" layer="51"/>
-<wire x1="3.0988" y1="0.889" x2="2.0066" y2="0.889" width="0" layer="51"/>
-<wire x1="2.0066" y1="2.159" x2="2.0066" y2="1.651" width="0" layer="51"/>
-<wire x1="2.0066" y1="1.651" x2="3.0988" y2="1.651" width="0" layer="51"/>
-<wire x1="3.0988" y1="1.651" x2="3.0988" y2="2.159" width="0" layer="51"/>
-<wire x1="3.0988" y1="2.159" x2="2.0066" y2="2.159" width="0" layer="51"/>
-<wire x1="2.0066" y1="3.429" x2="2.0066" y2="2.921" width="0" layer="51"/>
-<wire x1="2.0066" y1="2.921" x2="3.0988" y2="2.921" width="0" layer="51"/>
-<wire x1="3.0988" y1="2.921" x2="3.0988" y2="3.429" width="0" layer="51"/>
-<wire x1="3.0988" y1="3.429" x2="2.0066" y2="3.429" width="0" layer="51"/>
-<wire x1="2.0066" y1="4.699" x2="2.0066" y2="4.191" width="0" layer="51"/>
-<wire x1="2.0066" y1="4.191" x2="3.0988" y2="4.191" width="0" layer="51"/>
-<wire x1="3.0988" y1="4.191" x2="3.0988" y2="4.699" width="0" layer="51"/>
-<wire x1="3.0988" y1="4.699" x2="2.0066" y2="4.699" width="0" layer="51"/>
-<wire x1="-2.0066" y1="-5.0038" x2="2.0066" y2="-5.0038" width="0" layer="51"/>
-<wire x1="2.0066" y1="-5.0038" x2="2.0066" y2="5.0038" width="0" layer="51"/>
-<wire x1="2.0066" y1="5.0038" x2="0.3048" y2="5.0038" width="0" layer="51"/>
-<wire x1="0.3048" y1="5.0038" x2="-0.3048" y2="5.0038" width="0" layer="51"/>
-<wire x1="-0.3048" y1="5.0038" x2="-2.0066" y2="5.0038" width="0" layer="51"/>
-<wire x1="-2.0066" y1="5.0038" x2="-2.0066" y2="-5.0038" width="0" layer="51"/>
-<wire x1="0.3048" y1="5.0038" x2="-0.3048" y2="5.0038" width="0" layer="51" curve="-180"/>
-<text x="-3.302" y="4.8514" size="1.27" layer="51" ratio="6" rot="SR0">*</text>
-<wire x1="3.7846" y1="-3.2004" x2="4.826" y2="-3.2004" width="0.1524" layer="21"/>
-<wire x1="-1.3208" y1="-5.0038" x2="1.3208" y2="-5.0038" width="0.1524" layer="21"/>
-<wire x1="1.3208" y1="5.0038" x2="0.3048" y2="5.0038" width="0.1524" layer="21"/>
-<wire x1="0.3048" y1="5.0038" x2="-0.3048" y2="5.0038" width="0.1524" layer="21"/>
-<wire x1="-0.3048" y1="5.0038" x2="-1.3208" y2="5.0038" width="0.1524" layer="21"/>
-<wire x1="0.3048" y1="5.0038" x2="-0.3048" y2="5.0038" width="0.1524" layer="21" curve="-180"/>
-<text x="-3.302" y="4.8514" size="1.27" layer="21" ratio="6" rot="SR0">*</text>
-<text x="-3.4544" y="6.985" size="2.0828" layer="25" ratio="10" rot="SR0">>NAME</text>
-<text x="-3.4544" y="-8.255" size="2.0828" layer="27" ratio="10" rot="SR0">>VALUE</text>
-</package>
-</packages>
-<symbols>
-<symbol name="MC14551BDG">
-<pin name="VDD" x="-17.78" y="17.78" length="middle" direction="pwr"/>
-<pin name="X0" x="-17.78" y="12.7" length="middle"/>
-<pin name="X1" x="-17.78" y="10.16" length="middle"/>
-<pin name="Y0" x="-17.78" y="5.08" length="middle"/>
-<pin name="Y1" x="-17.78" y="2.54" length="middle"/>
-<pin name="W0" x="-17.78" y="-2.54" length="middle"/>
-<pin name="W1" x="-17.78" y="-5.08" length="middle"/>
-<pin name="Z0" x="-17.78" y="-10.16" length="middle"/>
-<pin name="Z1" x="-17.78" y="-12.7" length="middle"/>
-<pin name="CONTROL" x="-17.78" y="-17.78" length="middle" direction="in"/>
-<pin name="VEE" x="-17.78" y="-22.86" length="middle" direction="pwr"/>
-<pin name="VSS" x="-17.78" y="-25.4" length="middle" direction="pwr"/>
-<pin name="W" x="17.78" y="17.78" length="middle" rot="R180"/>
-<pin name="X" x="17.78" y="15.24" length="middle" rot="R180"/>
-<pin name="Y" x="17.78" y="12.7" length="middle" rot="R180"/>
-<pin name="Z" x="17.78" y="10.16" length="middle" rot="R180"/>
-<wire x1="-12.7" y1="22.86" x2="-12.7" y2="-30.48" width="0.4064" layer="94"/>
-<wire x1="-12.7" y1="-30.48" x2="12.7" y2="-30.48" width="0.4064" layer="94"/>
-<wire x1="12.7" y1="-30.48" x2="12.7" y2="22.86" width="0.4064" layer="94"/>
-<wire x1="12.7" y1="22.86" x2="-12.7" y2="22.86" width="0.4064" layer="94"/>
-<text x="-5.3594" y="26.8986" size="2.0828" layer="95" ratio="10" rot="SR0">>NAME</text>
-<text x="-3.5814" y="-35.8648" size="2.0828" layer="96" ratio="10" rot="SR0">>VALUE</text>
-</symbol>
-</symbols>
-<devicesets>
-<deviceset name="MC14551BDG" prefix="U">
-<description>Quad 2-Channel Analog Multiplexer/Demultiplexer</description>
-<gates>
-<gate name="A" symbol="MC14551BDG" x="0" y="0"/>
-</gates>
-<devices>
-<device name="" package="SOIC127P600X175-16N">
-<connects>
-<connect gate="A" pin="CONTROL" pad="9"/>
-<connect gate="A" pin="VDD" pad="16"/>
-<connect gate="A" pin="VEE" pad="7"/>
-<connect gate="A" pin="VSS" pad="8"/>
-<connect gate="A" pin="W" pad="14"/>
-<connect gate="A" pin="W0" pad="15"/>
-<connect gate="A" pin="W1" pad="1"/>
-<connect gate="A" pin="X" pad="4"/>
-<connect gate="A" pin="X0" pad="2"/>
-<connect gate="A" pin="X1" pad="3"/>
-<connect gate="A" pin="Y" pad="5"/>
-<connect gate="A" pin="Y0" pad="6"/>
-<connect gate="A" pin="Y1" pad="10"/>
-<connect gate="A" pin="Z" pad="13"/>
-<connect gate="A" pin="Z0" pad="11"/>
-<connect gate="A" pin="Z1" pad="12"/>
-</connects>
-<technologies>
-<technology name="">
-<attribute name="MPN" value="MC14551BDG" constant="no"/>
-<attribute name="OC_FARNELL" value="9665242" constant="no"/>
-<attribute name="OC_NEWARK" value="71J5501" constant="no"/>
-<attribute name="PACKAGE" value="SOIC-16" constant="no"/>
-<attribute name="SUPPLIER" value="ON SEMICONDUCTOR" constant="no"/>
-</technology>
-</technologies>
-</device>
-</devices>
-</deviceset>
-</devicesets>
-</library>
 <library name="Microchip-23K640-I_SN">
 <description><b> Developed By element14 </b><p> 
 
@@ -35550,15 +35382,12 @@ Based on the following sources:
 <part name="R30" library="resistor" deviceset="R-EU_" device="R0402" value="15k"/>
 <part name="P+45" library="SUPPLY1" deviceset="VCC" device=""/>
 <part name="SUPPLY74" library="supply2" deviceset="GND" device=""/>
-<part name="U11" library="ON_Semiconductor-MC14551BDG" deviceset="MC14551BDG" device=""/>
 <part name="U12" library="Microchip-23K640-I_SN" deviceset="23K640-I/SN" device=""/>
 <part name="SUPPLY83" library="supply2" deviceset="GND" device=""/>
 <part name="P+52" library="SUPPLY1" deviceset="VCC" device=""/>
-<part name="R33" library="resistor" deviceset="R-EU_" device="R0402" value="15k"/>
+<part name="R33" library="resistor" deviceset="R-EU_" device="R0402" value="4.7k"/>
 <part name="P+50" library="SUPPLY1" deviceset="VCC" device=""/>
-<part name="SUPPLY82" library="supply2" deviceset="GND" device=""/>
-<part name="R34" library="resistor" deviceset="R-EU_" device="R0402" value="15k"/>
-<part name="R32" library="resistor" deviceset="R-EU_" device="R0402" value="15k"/>
+<part name="R34" library="resistor" deviceset="R-EU_" device="R0402" value="4.7k"/>
 <part name="P+51" library="SUPPLY1" deviceset="VCC" device=""/>
 <part name="C102" library="resistor" deviceset="C-EU" device="C0805" value="10 uF">
 <attribute name="DIELECTRIC" value="X7R"/>
@@ -35581,7 +35410,6 @@ Based on the following sources:
 <attribute name="RATED_VOLTAGE" value="10V"/>
 </part>
 <part name="SUPPLY84" library="supply2" deviceset="GND" device=""/>
-<part name="SUPPLY81" library="supply2" deviceset="GND" device=""/>
 <part name="SUPPLY72" library="supply2" deviceset="GND" device=""/>
 <part name="JP6" library="jumper" deviceset="JP1Q" device=""/>
 <part name="SUPPLY80" library="supply2" deviceset="GND" device=""/>
@@ -36851,6 +36679,30 @@ Based on the following sources:
 <part name="SUPPLY7" library="supply2" deviceset="GND" device=""/>
 <part name="SUPPLY43" library="supply2" deviceset="GND" device=""/>
 <part name="R4" library="resistor" deviceset="R-EU_" device="R0402" value="0"/>
+<part name="R17" library="resistor" deviceset="R-EU_" device="R0402" value="4.7k">
+<attribute name="TOLERANCE" value="5%"/>
+</part>
+<part name="IC4" library="74xx-eu" deviceset="74*244" device="DW" technology="AC"/>
+<part name="R79" library="resistor" deviceset="R-EU_" device="R0402" value="4.7k">
+<attribute name="TOLERANCE" value="5%"/>
+</part>
+<part name="SUPPLY44" library="supply2" deviceset="GND" device=""/>
+<part name="R80" library="resistor" deviceset="R-EU_" device="R0402" value="4.7k">
+<attribute name="TOLERANCE" value="5%"/>
+</part>
+<part name="R81" library="resistor" deviceset="R-EU_" device="R0402" value="4.7k">
+<attribute name="TOLERANCE" value="5%"/>
+</part>
+<part name="SUPPLY222" library="supply2" deviceset="GND" device=""/>
+<part name="P+5" library="SUPPLY1" deviceset="VCC" device=""/>
+<part name="P+13" library="SUPPLY1" deviceset="VCC" device=""/>
+<part name="P+85" library="SUPPLY1" deviceset="VCC" device=""/>
+<part name="R82" library="resistor" deviceset="R-EU_" device="R0402" value="15k"/>
+<part name="P+86" library="SUPPLY1" deviceset="VCC" device=""/>
+<part name="R32" library="resistor" deviceset="R-EU_" device="R0402" value="0">
+<attribute name="TOLERANCE" value="5%"/>
+</part>
+<part name="P+87" library="SUPPLY1" deviceset="VCC" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -36902,6 +36754,7 @@ be allowed to turn off the entropy source
 *) SYNC is not used</text>
 <text x="-83.82" y="78.74" size="3.81" layer="91">Entropy source power</text>
 <text x="-172.72" y="20.32" size="1.778" layer="91">XXX verify symbol</text>
+<text x="144.78" y="-121.92" size="2.54" layer="94">Input power</text>
 </plain>
 <instances>
 <instance part="FRAME2" gate="G$1" x="-198.12" y="-142.24"/>
@@ -37362,6 +37215,7 @@ The suggestion is to add a fast optocoupler to really isolate AGND from GND.
 
 As this appears to require a bigger digitizer, we are reluctant to add that
 for the Alpha.</text>
+<text x="121.92" y="-91.44" size="2.54" layer="94">Noise source</text>
 </plain>
 <instances>
 <instance part="C16" gate="G$1" x="53.34" y="22.86" smashed="yes" rot="R180">
@@ -37616,6 +37470,7 @@ recommended.</text>
 internal power regulator</text>
 <text x="81.28" y="193.04" size="1.778" layer="91">CL 10pF</text>
 <text x="45.72" y="251.46" size="3.81" layer="91">Basic configuration, STM32</text>
+<text x="347.98" y="63.5" size="2.54" layer="94">ARM configuration</text>
 </plain>
 <instances>
 <instance part="U4" gate="CFG" x="198.12" y="185.42"/>
@@ -37917,7 +37772,7 @@ internal power regulator</text>
 <plain>
 <text x="114.3" y="20.32" size="1.778" layer="91">ST AN8844 §2.2
 One bypass capacitor for every VDD.
-Use 0.1 uF X7R (X5R?) 10V.</text>
+Use 0.1 uF X7R 10V.</text>
 <text x="34.29" y="19.05" size="1.778" layer="91">ST AN8844 §2.2
 One 10uF bypass cap for the package.
 (two used for extra comfort)</text>
@@ -37926,6 +37781,7 @@ One 10uF bypass cap for the package.
 < 1 ohm
 (ST AN4488 §2.2)</text>
 <text x="-154.94" y="88.9" size="3.81" layer="91">Power and bypass capacitors, STM32</text>
+<text x="149.86" y="-109.22" size="2.54" layer="94">ARM power</text>
 </plain>
 <instances>
 <instance part="FRAME5" gate="G$1" x="-193.04" y="-129.54"/>
@@ -38009,13 +37865,13 @@ One 10uF bypass cap for the package.
 <instance part="C34" gate="G$1" x="121.92" y="-5.08" smashed="yes">
 <attribute name="NAME" x="119.38" y="-12.7" size="1.27" layer="95" font="vector"/>
 </instance>
-<instance part="C21" gate="G$1" x="-152.4" y="27.94" smashed="yes">
-<attribute name="NAME" x="-160.02" y="30.48" size="1.27" layer="95" font="vector"/>
-<attribute name="VALUE" x="-160.02" y="27.94" size="1.27" layer="96" font="vector"/>
-<attribute name="DIELECTRIC" x="-152.4" y="27.94" size="1.6764" layer="96" display="off"/>
-<attribute name="RATED_VOLTAGE" x="-152.4" y="27.94" size="1.6764" layer="96" display="off"/>
+<instance part="C21" gate="G$1" x="-142.24" y="-33.02" smashed="yes">
+<attribute name="NAME" x="-149.86" y="-30.48" size="1.27" layer="95" font="vector"/>
+<attribute name="VALUE" x="-149.86" y="-33.02" size="1.27" layer="96" font="vector"/>
+<attribute name="DIELECTRIC" x="-142.24" y="-33.02" size="1.6764" layer="96" display="off"/>
+<attribute name="RATED_VOLTAGE" x="-142.24" y="-33.02" size="1.6764" layer="96" display="off"/>
 </instance>
-<instance part="SUPPLY35" gate="GND" x="-152.4" y="17.78"/>
+<instance part="SUPPLY35" gate="GND" x="-142.24" y="-43.18"/>
 <instance part="C24" gate="G$1" x="-43.18" y="-5.08" smashed="yes" rot="R180">
 <attribute name="DIELECTRIC" x="-43.18" y="-5.08" size="1.778" layer="96" rot="R180" display="off"/>
 <attribute name="RATED_VOLTAGE" x="-43.18" y="-5.08" size="1.778" layer="96" rot="R180" display="off"/>
@@ -38041,10 +37897,16 @@ One 10uF bypass cap for the package.
 <attribute name="VALUE" x="-52.324" y="-5.461" size="1.778" layer="96" rot="R180"/>
 </instance>
 <instance part="U4" gate="PWR" x="-116.84" y="2.54"/>
-<instance part="P+12" gate="VCC" x="-142.24" y="52.07" smashed="yes"/>
-<instance part="SUPPLY36" gate="GND" x="-91.44" y="-38.1"/>
+<instance part="P+12" gate="VCC" x="-142.24" y="36.83" smashed="yes"/>
+<instance part="SUPPLY36" gate="GND" x="-91.44" y="-43.18"/>
 <instance part="SUPPLY7" gate="GND" x="-10.16" y="-17.78"/>
 <instance part="SUPPLY43" gate="GND" x="-43.18" y="-17.78"/>
+<instance part="R32" gate="G$1" x="-137.16" y="45.72" smashed="yes" rot="R270">
+<attribute name="TOLERANCE" x="-137.16" y="45.72" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="NAME" x="-144.78" y="48.26" size="1.778" layer="95"/>
+<attribute name="VALUE" x="-144.78" y="45.72" size="1.778" layer="96"/>
+</instance>
+<instance part="P+87" gate="VCC" x="-137.16" y="55.88" smashed="yes"/>
 </instances>
 <busses>
 </busses>
@@ -38124,7 +37986,7 @@ One 10uF bypass cap for the package.
 <segment>
 <pinref part="SUPPLY35" gate="GND" pin="GND"/>
 <pinref part="C21" gate="G$1" pin="2"/>
-<wire x1="-152.4" y1="22.86" x2="-152.4" y2="20.32" width="0.1524" layer="91"/>
+<wire x1="-142.24" y1="-38.1" x2="-142.24" y2="-40.64" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="SUPPLY36" gate="GND" pin="GND"/>
@@ -38145,7 +38007,7 @@ One 10uF bypass cap for the package.
 <wire x1="-91.44" y1="-12.7" x2="-91.44" y2="-17.78" width="0.1524" layer="91"/>
 <wire x1="-91.44" y1="-17.78" x2="-91.44" y2="-20.32" width="0.1524" layer="91"/>
 <wire x1="-91.44" y1="-20.32" x2="-91.44" y2="-22.86" width="0.1524" layer="91"/>
-<wire x1="-91.44" y1="-22.86" x2="-91.44" y2="-35.56" width="0.1524" layer="91"/>
+<wire x1="-91.44" y1="-22.86" x2="-91.44" y2="-40.64" width="0.1524" layer="91"/>
 <wire x1="-96.52" y1="20.32" x2="-91.44" y2="20.32" width="0.1524" layer="91"/>
 <junction x="-91.44" y="20.32"/>
 <pinref part="U4" gate="PWR" pin="VSS at 25"/>
@@ -38286,10 +38148,9 @@ One 10uF bypass cap for the package.
 </segment>
 <segment>
 <pinref part="P+12" gate="VCC" pin="VCC"/>
-<label x="-160.02" y="48.26" size="1.778" layer="95"/>
-<wire x1="-142.24" y1="49.53" x2="-142.24" y2="33.02" width="0.1524" layer="91"/>
+<label x="-160.02" y="33.02" size="1.778" layer="95"/>
+<wire x1="-142.24" y1="34.29" x2="-142.24" y2="27.94" width="0.1524" layer="91"/>
 <pinref part="U4" gate="PWR" pin="VDD at 158"/>
-<wire x1="-142.24" y1="33.02" x2="-142.24" y2="27.94" width="0.1524" layer="91"/>
 <wire x1="-142.24" y1="27.94" x2="-142.24" y2="22.86" width="0.1524" layer="91"/>
 <wire x1="-142.24" y1="22.86" x2="-142.24" y2="20.32" width="0.1524" layer="91"/>
 <wire x1="-142.24" y1="20.32" x2="-142.24" y2="17.78" width="0.1524" layer="91"/>
@@ -38359,12 +38220,9 @@ One 10uF bypass cap for the package.
 <pinref part="U4" gate="PWR" pin="VDDA at 42"/>
 <wire x1="-137.16" y1="27.94" x2="-142.24" y2="27.94" width="0.1524" layer="91"/>
 <junction x="-142.24" y="27.94"/>
-<pinref part="U4" gate="PWR" pin="VBAT at 6"/>
-<wire x1="-137.16" y1="33.02" x2="-142.24" y2="33.02" width="0.1524" layer="91"/>
-<junction x="-142.24" y="33.02"/>
-<wire x1="-152.4" y1="33.02" x2="-152.4" y2="30.48" width="0.1524" layer="91"/>
 <pinref part="C21" gate="G$1" pin="1"/>
-<wire x1="-142.24" y1="33.02" x2="-152.4" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="-142.24" y1="-25.4" x2="-142.24" y2="-30.48" width="0.1524" layer="91"/>
+<junction x="-142.24" y="-25.4"/>
 </segment>
 </net>
 <net name="VCAP2" class="0">
@@ -38405,6 +38263,26 @@ One 10uF bypass cap for the package.
 <wire x1="-119.38" y1="48.26" x2="-124.46" y2="48.26" width="0.1524" layer="91"/>
 </segment>
 </net>
+<net name="N$25" class="0">
+<segment>
+<pinref part="U4" gate="PWR" pin="VBAT at 6"/>
+<wire x1="-137.16" y1="33.02" x2="-137.16" y2="35.56" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$53" class="0">
+<segment>
+<pinref part="R32" gate="G$1" pin="2"/>
+<wire x1="-137.16" y1="40.64" x2="-137.16" y2="35.56" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="3V3_BATT" class="0">
+<segment>
+<pinref part="R32" gate="G$1" pin="1"/>
+<wire x1="-137.16" y1="50.8" x2="-137.16" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="P+87" gate="VCC" pin="VCC"/>
+<label x="-149.86" y="58.42" size="1.778" layer="95"/>
+</segment>
+</net>
 </nets>
 </sheet>
 <sheet>
@@ -38413,6 +38291,7 @@ One 10uF bypass cap for the package.
 <text x="-121.92" y="-95.25" size="1.778" layer="91">All of these input/outputs can be swapped
 with equivalent functionality pins.</text>
 <text x="-167.64" y="104.14" size="3.81" layer="91">Input/output, STM32</text>
+<text x="149.86" y="-109.22" size="2.54" layer="94">ARM I/O</text>
 </plain>
 <instances>
 <instance part="FRAME6" gate="G$1" x="-193.04" y="-129.54"/>
@@ -38950,14 +38829,14 @@ with equivalent functionality pins.</text>
 <pinref part="U4" gate="IO" pin="PJ3"/>
 </segment>
 </net>
-<net name="AVR_GPIO_11" class="0">
+<net name="AVR_GPIO_ARM_1" class="0">
 <segment>
 <wire x1="-132.08" y1="-68.58" x2="-124.46" y2="-68.58" width="0.1524" layer="91"/>
 <label x="-132.08" y="-68.58" size="1.27" layer="95" rot="R180" xref="yes"/>
 <pinref part="U4" gate="IO" pin="PC14"/>
 </segment>
 </net>
-<net name="AVR_GPIO_10" class="0">
+<net name="AVR_GPIO_ARM_0" class="0">
 <segment>
 <wire x1="-124.46" y1="-66.04" x2="-132.08" y2="-66.04" width="0.1524" layer="91"/>
 <label x="-132.08" y="-66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
@@ -39076,48 +38955,6 @@ with equivalent functionality pins.</text>
 <pinref part="U4" gate="IO" pin="SPI1_MOSI/PA7"/>
 </segment>
 </net>
-<net name="SDIO_CK" class="0">
-<segment>
-<wire x1="-124.46" y1="5.08" x2="-132.08" y2="5.08" width="0.1524" layer="91"/>
-<label x="-132.08" y="5.08" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U4" gate="IO" pin="SDIO_CK/PC12"/>
-</segment>
-</net>
-<net name="SDIO_CMD" class="0">
-<segment>
-<wire x1="-124.46" y1="7.62" x2="-132.08" y2="7.62" width="0.1524" layer="91"/>
-<label x="-132.08" y="7.62" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U4" gate="IO" pin="SDIO_CMD/PD2"/>
-</segment>
-</net>
-<net name="SDIO_D3" class="0">
-<segment>
-<wire x1="-124.46" y1="-5.08" x2="-132.08" y2="-5.08" width="0.1524" layer="91"/>
-<label x="-132.08" y="-5.08" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U4" gate="IO" pin="SDIO_D3/PC11"/>
-</segment>
-</net>
-<net name="SDIO_D2" class="0">
-<segment>
-<wire x1="-124.46" y1="-2.54" x2="-132.08" y2="-2.54" width="0.1524" layer="91"/>
-<label x="-132.08" y="-2.54" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U4" gate="IO" pin="SDIO_D2/PC10"/>
-</segment>
-</net>
-<net name="SDIO_D0" class="0">
-<segment>
-<wire x1="-124.46" y1="2.54" x2="-132.08" y2="2.54" width="0.1524" layer="91"/>
-<label x="-132.08" y="2.54" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U4" gate="IO" pin="SDIO_D0/PC8"/>
-</segment>
-</net>
-<net name="SDIO_D1" class="0">
-<segment>
-<wire x1="-124.46" y1="0" x2="-132.08" y2="0" width="0.1524" layer="91"/>
-<label x="-132.08" y="0" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U4" gate="IO" pin="SDIO_D1/PC9"/>
-</segment>
-</net>
 <net name="FT_RTS" class="0">
 <segment>
 <wire x1="-124.46" y1="63.5" x2="-132.08" y2="63.5" width="0.1524" layer="91"/>
@@ -39202,12 +39039,25 @@ with equivalent functionality pins.</text>
 <label x="-132.08" y="22.86" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
+<net name="AVR_GPIO_ARM_2" class="0">
+<segment>
+<wire x1="-132.08" y1="-71.12" x2="-124.46" y2="-71.12" width="0.1524" layer="91"/>
+<label x="-132.08" y="-71.12" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+</net>
+<net name="AVR_GPIO_ARM_3" class="0">
+<segment>
+<wire x1="-45.72" y1="22.86" x2="-38.1" y2="22.86" width="0.1524" layer="91"/>
+<label x="-38.1" y="22.86" size="1.27" layer="95" xref="yes"/>
+</segment>
+</net>
 </nets>
 </sheet>
 <sheet>
 <description>SDRAM</description>
 <plain>
 <text x="-63.5" y="109.22" size="3.81" layer="91">2x512 Mbit SDRAM memory for the ARM</text>
+<text x="149.86" y="-109.22" size="2.54" layer="94">SDRAM</text>
 </plain>
 <instances>
 <instance part="FRAME7" gate="G$1" x="-193.04" y="-129.54"/>
@@ -40282,6 +40132,7 @@ with equivalent functionality pins.</text>
 <text x="-40.64" y="45.72" size="2.54" layer="91">This memory holds cryptographic keys
 wrapped with the master key.</text>
 <text x="-40.64" y="60.96" size="3.81" layer="91">Keystore memory, 128 Mbit</text>
+<text x="149.86" y="-109.22" size="2.54" layer="94">Keystore memory</text>
 </plain>
 <instances>
 <instance part="FRAME8" gate="G$1" x="-193.04" y="-129.54"/>
@@ -40299,6 +40150,11 @@ wrapped with the master key.</text>
 <attribute name="TOLERANCE" x="43.18" y="-10.16" size="1.778" layer="96" display="off"/>
 </instance>
 <instance part="P+22" gate="VCC" x="-45.72" y="33.02" smashed="yes"/>
+<instance part="R17" gate="G$1" x="-45.72" y="12.7" smashed="yes" rot="R270">
+<attribute name="TOLERANCE" x="-45.72" y="12.7" size="1.778" layer="96" rot="R270" display="off"/>
+<attribute name="NAME" x="-52.07" y="14.1986" size="1.778" layer="95"/>
+<attribute name="VALUE" x="-52.07" y="11.938" size="1.778" layer="96"/>
+</instance>
 </instances>
 <busses>
 </busses>
@@ -40329,18 +40185,17 @@ wrapped with the master key.</text>
 <wire x1="11.43" y1="0" x2="17.78" y2="0" width="0.1524" layer="91"/>
 <wire x1="17.78" y1="0" x2="17.78" y2="2.54" width="0.1524" layer="91"/>
 <junction x="17.78" y="2.54"/>
-<junction x="-45.72" y="22.86"/>
 <wire x1="43.18" y1="0" x2="43.18" y2="-7.62" width="0.1524" layer="91"/>
 <wire x1="17.78" y1="0" x2="43.18" y2="0" width="0.1524" layer="91"/>
 <junction x="17.78" y="0"/>
 <pinref part="C69" gate="G$1" pin="1"/>
 <pinref part="P+22" gate="VCC" pin="VCC"/>
-<pinref part="IC1" gate="A" pin="!W!/VPP/DQ2"/>
-<wire x1="-25.4" y1="-2.54" x2="-45.72" y2="-2.54" width="0.1524" layer="91"/>
-<wire x1="-45.72" y1="-2.54" x2="-45.72" y2="22.86" width="0.1524" layer="91"/>
 <pinref part="R18" gate="G$1" pin="1"/>
 <wire x1="-38.1" y1="17.78" x2="-38.1" y2="22.86" width="0.1524" layer="91"/>
 <junction x="-38.1" y="22.86"/>
+<pinref part="R17" gate="G$1" pin="1"/>
+<wire x1="-45.72" y1="22.86" x2="-45.72" y2="17.78" width="0.1524" layer="91"/>
+<junction x="-45.72" y="22.86"/>
 </segment>
 </net>
 <net name="KSM_PROM_CS_N" class="0">
@@ -40375,66 +40230,64 @@ wrapped with the master key.</text>
 <label x="-53.34" y="0" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
+<net name="N$23" class="0">
+<segment>
+<pinref part="IC1" gate="A" pin="!W!/VPP/DQ2"/>
+<wire x1="-25.4" y1="-2.54" x2="-45.72" y2="-2.54" width="0.1524" layer="91"/>
+<pinref part="R17" gate="G$1" pin="2"/>
+<wire x1="-45.72" y1="7.62" x2="-45.72" y2="-2.54" width="0.1524" layer="91"/>
+</segment>
+</net>
 </nets>
 </sheet>
 <sheet>
-<description>RTC / Micro SD</description>
+<description>Real Time Clock</description>
 <plain>
-<text x="-147.32" y="5.08" size="1.778" layer="91">CL 12.5 pF</text>
-<text x="-81.28" y="-10.16" size="1.778" layer="91">MFP is Multi Function Pin.
+<text x="-45.72" y="0" size="1.778" layer="91">CL 12.5 pF</text>
+<text x="20.32" y="-15.24" size="1.778" layer="91">MFP is Multi Function Pin.
 GPIO output from RTC.</text>
-<text x="-91.44" y="30.48" size="1.778" layer="91">i2c pull-ups, typically 10K for 100kHz</text>
-<text x="-147.32" y="60.96" size="2.54" layer="91">Real Time Clock</text>
-<text x="30.48" y="58.42" size="2.54" layer="91">Micro SD card goes here</text>
-<text x="30.48" y="22.86" size="1.778" layer="91">Questions:
-
-1) Which connector to use?
-Haven't found a good one with Eagle symbol. Some different kinds available.
-
-2) Novena seems to have card reset capability (power control from MCU).
-Do we want the same?
-
-3) Novena has two SD slots, and list power at 200mA.
-Do we need a separate power regulator for the SD card, or can we use VCCO_3V3?</text>
-<text x="-147.32" y="53.34" size="1.778" layer="91">Should we keep this separate chip or rather connect
+<text x="10.16" y="25.4" size="1.778" layer="91">i2c pull-ups, typically 10K for 100kHz</text>
+<text x="-45.72" y="55.88" size="2.54" layer="91">Real Time Clock</text>
+<text x="-45.72" y="48.26" size="1.778" layer="91">Should we keep this separate chip or rather connect
 VBAT to the STM32 and use the internal RTC?</text>
+<text x="149.86" y="-109.22" size="2.54" layer="94">Real Time Clock</text>
 </plain>
 <instances>
-<instance part="U7" gate="A" x="-101.6" y="5.08"/>
-<instance part="SUPPLY49" gate="GND" x="-121.92" y="-17.78"/>
-<instance part="P+23" gate="VCC" x="-121.92" y="27.94" smashed="yes"/>
-<instance part="P+24" gate="VCC" x="-116.84" y="27.94" smashed="yes"/>
-<instance part="C71" gate="G$1" x="-134.62" y="-10.16" smashed="yes" rot="R180">
-<attribute name="NAME" x="-139.7" y="-12.7" size="1.778" layer="95" rot="R180"/>
-<attribute name="VALUE" x="-139.7" y="-15.24" size="1.778" layer="96" rot="R180"/>
-<attribute name="DIELECTRIC" x="-139.7" y="-17.78" size="1.778" layer="96" rot="R180"/>
-<attribute name="RATED_VOLTAGE" x="-134.62" y="-10.16" size="1.778" layer="96" rot="R180" display="off"/>
-</instance>
-<instance part="C70" gate="G$1" x="-149.86" y="-10.16" smashed="yes" rot="R180">
-<attribute name="NAME" x="-139.7" y="-10.16" size="1.778" layer="95" rot="R180"/>
-<attribute name="DIELECTRIC" x="-149.86" y="-10.16" size="1.778" layer="96" rot="R180" display="off"/>
-<attribute name="RATED_VOLTAGE" x="-149.86" y="-10.16" size="1.778" layer="96" rot="R180" display="off"/>
-</instance>
-<instance part="SUPPLY47" gate="GND" x="-149.86" y="-17.78"/>
-<instance part="SUPPLY48" gate="GND" x="-134.62" y="-17.78"/>
+<instance part="U7" gate="A" x="0" y="0"/>
+<instance part="SUPPLY49" gate="GND" x="-20.32" y="-22.86"/>
+<instance part="P+23" gate="VCC" x="-20.32" y="22.86" smashed="yes"/>
+<instance part="P+24" gate="VCC" x="-15.24" y="22.86" smashed="yes"/>
+<instance part="C71" gate="G$1" x="-33.02" y="-15.24" smashed="yes" rot="R180">
+<attribute name="NAME" x="-38.1" y="-17.78" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="-38.1" y="-20.32" size="1.778" layer="96" rot="R180"/>
+<attribute name="DIELECTRIC" x="-38.1" y="-22.86" size="1.778" layer="96" rot="R180"/>
+<attribute name="RATED_VOLTAGE" x="-33.02" y="-15.24" size="1.778" layer="96" rot="R180" display="off"/>
+</instance>
+<instance part="C70" gate="G$1" x="-48.26" y="-15.24" smashed="yes" rot="R180">
+<attribute name="NAME" x="-38.1" y="-15.24" size="1.778" layer="95" rot="R180"/>
+<attribute name="DIELECTRIC" x="-48.26" y="-15.24" size="1.778" layer="96" rot="R180" display="off"/>
+<attribute name="RATED_VOLTAGE" x="-48.26" y="-15.24" size="1.778" layer="96" rot="R180" display="off"/>
+</instance>
+<instance part="SUPPLY47" gate="GND" x="-48.26" y="-22.86"/>
+<instance part="SUPPLY48" gate="GND" x="-33.02" y="-22.86"/>
 <instance part="FRAME9" gate="G$1" x="-193.04" y="-129.54"/>
-<instance part="X1" gate="G$1" x="-142.24" y="-5.08">
-<attribute name="MPN" x="-142.24" y="-5.08" size="1.778" layer="96" display="off"/>
-<attribute name="OC_FARNELL" x="-142.24" y="-5.08" size="1.778" layer="96" display="off"/>
+<instance part="X1" gate="G$1" x="-40.64" y="-10.16">
+<attribute name="MPN" x="-40.64" y="-10.16" size="1.778" layer="96" display="off"/>
+<attribute name="OC_FARNELL" x="-40.64" y="-10.16" size="1.778" layer="96" display="off"/>
 </instance>
-<instance part="P+25" gate="VCC" x="-73.66" y="27.94" smashed="yes"/>
-<instance part="R21" gate="G$1" x="-68.58" y="15.24" smashed="yes" rot="R270">
-<attribute name="NAME" x="-60.96" y="15.24" size="1.778" layer="95"/>
-<attribute name="VALUE" x="-60.96" y="12.7" size="1.778" layer="96"/>
-<attribute name="TOLERANCE" x="-68.58" y="15.24" size="1.778" layer="96" rot="R270" display="off"/>
+<instance part="P+25" gate="VCC" x="27.94" y="22.86" smashed="yes"/>
+<instance part="R21" gate="G$1" x="33.02" y="10.16" smashed="yes" rot="R270">
+<attribute name="NAME" x="40.64" y="10.16" size="1.778" layer="95"/>
+<attribute name="VALUE" x="40.64" y="7.62" size="1.778" layer="96"/>
+<attribute name="TOLERANCE" x="33.02" y="10.16" size="1.778" layer="96" rot="R270" display="off"/>
 </instance>
-<instance part="R20" gate="G$1" x="-73.66" y="15.24" smashed="yes" rot="R270">
-<attribute name="NAME" x="-60.96" y="17.78" size="1.778" layer="95"/>
-<attribute name="TOLERANCE" x="-73.66" y="15.24" size="1.778" layer="96" rot="R270" display="off"/>
+<instance part="R20" gate="G$1" x="27.94" y="10.16" smashed="yes" rot="R270">
+<attribute name="NAME" x="40.64" y="12.7" size="1.778" layer="95"/>
+<attribute name="TOLERANCE" x="27.94" y="10.16" size="1.778" layer="96" rot="R270" display="off"/>
 </instance>
-<instance part="R19" gate="G$1" x="-78.74" y="15.24" smashed="yes" rot="R270">
-<attribute name="NAME" x="-60.96" y="20.32" size="1.778" layer="95"/>
-<attribute name="TOLERANCE" x="-78.74" y="15.24" size="1.778" layer="96" rot="R270" display="off"/>
+<instance part="R19" gate="G$1" x="22.86" y="10.16" smashed="yes" rot="R270">
+<attribute name="NAME" x="40.64" y="15.24" size="1.778" layer="95"/>
+<attribute name="TOLERANCE" x="22.86" y="10.16" size="1.778" layer="96" rot="R270" display="off"/>
 </instance>
 </instances>
 <busses>
@@ -40442,47 +40295,47 @@ VBAT to the STM32 and use the internal RTC?</text>
 <nets>
 <net name="3V3_BATT" class="0">
 <segment>
-<wire x1="-121.92" y1="7.62" x2="-121.92" y2="25.4" width="0.1524" layer="91"/>
+<wire x1="-20.32" y1="2.54" x2="-20.32" y2="20.32" width="0.1524" layer="91"/>
 <pinref part="P+23" gate="VCC" pin="VCC"/>
-<label x="-134.62" y="25.4" size="1.27" layer="95"/>
+<label x="-33.02" y="20.32" size="1.27" layer="95"/>
 <pinref part="U7" gate="A" pin="VBAT"/>
-<wire x1="-116.84" y1="7.62" x2="-121.92" y2="7.62" width="0.1524" layer="91"/>
+<wire x1="-15.24" y1="2.54" x2="-20.32" y2="2.54" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="GND" class="1">
 <segment>
 <pinref part="U7" gate="A" pin="VSS"/>
 <pinref part="SUPPLY49" gate="GND" pin="GND"/>
-<wire x1="-116.84" y1="-5.08" x2="-121.92" y2="-5.08" width="0.1524" layer="91"/>
-<wire x1="-121.92" y1="-5.08" x2="-121.92" y2="-15.24" width="0.1524" layer="91"/>
+<wire x1="-15.24" y1="-10.16" x2="-20.32" y2="-10.16" width="0.1524" layer="91"/>
+<wire x1="-20.32" y1="-10.16" x2="-20.32" y2="-20.32" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C71" gate="G$1" pin="1"/>
 <pinref part="SUPPLY48" gate="GND" pin="GND"/>
-<wire x1="-134.62" y1="-12.7" x2="-134.62" y2="-15.24" width="0.1524" layer="91"/>
+<wire x1="-33.02" y1="-17.78" x2="-33.02" y2="-20.32" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C70" gate="G$1" pin="1"/>
 <pinref part="SUPPLY47" gate="GND" pin="GND"/>
-<wire x1="-149.86" y1="-12.7" x2="-149.86" y2="-15.24" width="0.1524" layer="91"/>
+<wire x1="-48.26" y1="-17.78" x2="-48.26" y2="-20.32" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="VCCO_3V3" class="0">
 <segment>
 <pinref part="U7" gate="A" pin="VCC"/>
-<wire x1="-116.84" y1="10.16" x2="-116.84" y2="25.4" width="0.1524" layer="91"/>
+<wire x1="-15.24" y1="5.08" x2="-15.24" y2="20.32" width="0.1524" layer="91"/>
 <pinref part="P+24" gate="VCC" pin="VCC"/>
-<label x="-111.76" y="25.4" size="1.27" layer="95"/>
+<label x="-10.16" y="20.32" size="1.27" layer="95"/>
 </segment>
 </net>
 <net name="RTC_X1" class="0">
 <segment>
 <pinref part="U7" gate="A" pin="X1"/>
 <pinref part="C70" gate="G$1" pin="2"/>
-<wire x1="-149.86" y1="-5.08" x2="-147.32" y2="-5.08" width="0.1524" layer="91"/>
-<wire x1="-116.84" y1="2.54" x2="-149.86" y2="2.54" width="0.1524" layer="91"/>
-<wire x1="-149.86" y1="2.54" x2="-149.86" y2="-5.08" width="0.1524" layer="91"/>
-<junction x="-149.86" y="-5.08"/>
+<wire x1="-48.26" y1="-10.16" x2="-45.72" y2="-10.16" width="0.1524" layer="91"/>
+<wire x1="-15.24" y1="-2.54" x2="-48.26" y2="-2.54" width="0.1524" layer="91"/>
+<wire x1="-48.26" y1="-2.54" x2="-48.26" y2="-10.16" width="0.1524" layer="91"/>
+<junction x="-48.26" y="-10.16"/>
 <pinref part="X1" gate="G$1" pin="P$1"/>
 </segment>
 </net>
@@ -40490,95 +40343,59 @@ VBAT to the STM32 and use the internal RTC?</text>
 <segment>
 <pinref part="U7" gate="A" pin="X2"/>
 <pinref part="C71" gate="G$1" pin="2"/>
-<wire x1="-137.16" y1="-5.08" x2="-134.62" y2="-5.08" width="0.1524" layer="91"/>
-<wire x1="-116.84" y1="0" x2="-134.62" y2="0" width="0.1524" layer="91"/>
-<wire x1="-134.62" y1="0" x2="-134.62" y2="-5.08" width="0.1524" layer="91"/>
-<junction x="-134.62" y="-5.08"/>
+<wire x1="-35.56" y1="-10.16" x2="-33.02" y2="-10.16" width="0.1524" layer="91"/>
+<wire x1="-15.24" y1="-5.08" x2="-33.02" y2="-5.08" width="0.1524" layer="91"/>
+<wire x1="-33.02" y1="-5.08" x2="-33.02" y2="-10.16" width="0.1524" layer="91"/>
+<junction x="-33.02" y="-10.16"/>
 <pinref part="X1" gate="G$1" pin="P$2"/>
 </segment>
 </net>
 <net name="RTC_MFP" class="0">
 <segment>
 <pinref part="U7" gate="A" pin="MFP"/>
-<wire x1="-86.36" y1="7.62" x2="-68.58" y2="7.62" width="0.1524" layer="91"/>
-<label x="-63.5" y="7.62" size="1.27" layer="95" xref="yes"/>
+<wire x1="15.24" y1="2.54" x2="33.02" y2="2.54" width="0.1524" layer="91"/>
+<label x="38.1" y="2.54" size="1.27" layer="95" xref="yes"/>
 <pinref part="R21" gate="G$1" pin="2"/>
-<wire x1="-68.58" y1="7.62" x2="-63.5" y2="7.62" width="0.1524" layer="91"/>
-<wire x1="-68.58" y1="10.16" x2="-68.58" y2="7.62" width="0.1524" layer="91"/>
-<junction x="-68.58" y="7.62"/>
+<wire x1="33.02" y1="2.54" x2="38.1" y2="2.54" width="0.1524" layer="91"/>
+<wire x1="33.02" y1="5.08" x2="33.02" y2="2.54" width="0.1524" layer="91"/>
+<junction x="33.02" y="2.54"/>
 </segment>
 </net>
 <net name="RTC_SCL" class="0">
 <segment>
 <pinref part="U7" gate="A" pin="SCL"/>
-<wire x1="-86.36" y1="5.08" x2="-73.66" y2="5.08" width="0.1524" layer="91"/>
-<label x="-63.5" y="5.08" size="1.27" layer="95" xref="yes"/>
+<wire x1="15.24" y1="0" x2="27.94" y2="0" width="0.1524" layer="91"/>
+<label x="38.1" y="0" size="1.27" layer="95" xref="yes"/>
 <pinref part="R20" gate="G$1" pin="2"/>
-<wire x1="-73.66" y1="5.08" x2="-63.5" y2="5.08" width="0.1524" layer="91"/>
-<wire x1="-73.66" y1="10.16" x2="-73.66" y2="5.08" width="0.1524" layer="91"/>
-<junction x="-73.66" y="5.08"/>
+<wire x1="27.94" y1="0" x2="38.1" y2="0" width="0.1524" layer="91"/>
+<wire x1="27.94" y1="5.08" x2="27.94" y2="0" width="0.1524" layer="91"/>
+<junction x="27.94" y="0"/>
 </segment>
 </net>
 <net name="RTC_SDA" class="0">
 <segment>
 <pinref part="U7" gate="A" pin="SDA"/>
-<wire x1="-86.36" y1="2.54" x2="-78.74" y2="2.54" width="0.1524" layer="91"/>
-<label x="-63.5" y="2.54" size="1.27" layer="95" xref="yes"/>
+<wire x1="15.24" y1="-2.54" x2="22.86" y2="-2.54" width="0.1524" layer="91"/>
+<label x="38.1" y="-2.54" size="1.27" layer="95" xref="yes"/>
 <pinref part="R19" gate="G$1" pin="2"/>
-<wire x1="-78.74" y1="2.54" x2="-63.5" y2="2.54" width="0.1524" layer="91"/>
-<wire x1="-78.74" y1="10.16" x2="-78.74" y2="2.54" width="0.1524" layer="91"/>
-<junction x="-78.74" y="2.54"/>
+<wire x1="22.86" y1="-2.54" x2="38.1" y2="-2.54" width="0.1524" layer="91"/>
+<wire x1="22.86" y1="5.08" x2="22.86" y2="-2.54" width="0.1524" layer="91"/>
+<junction x="22.86" y="-2.54"/>
 </segment>
 </net>
 <net name="VCC" class="0">
 <segment>
 <pinref part="P+25" gate="VCC" pin="VCC"/>
 <pinref part="R20" gate="G$1" pin="1"/>
-<wire x1="-73.66" y1="25.4" x2="-73.66" y2="22.86" width="0.1524" layer="91"/>
+<wire x1="27.94" y1="20.32" x2="27.94" y2="17.78" width="0.1524" layer="91"/>
 <pinref part="R19" gate="G$1" pin="1"/>
-<wire x1="-73.66" y1="22.86" x2="-73.66" y2="20.32" width="0.1524" layer="91"/>
-<wire x1="-78.74" y1="20.32" x2="-78.74" y2="22.86" width="0.1524" layer="91"/>
+<wire x1="27.94" y1="17.78" x2="27.94" y2="15.24" width="0.1524" layer="91"/>
+<wire x1="22.86" y1="15.24" x2="22.86" y2="17.78" width="0.1524" layer="91"/>
 <pinref part="R21" gate="G$1" pin="1"/>
-<wire x1="-78.74" y1="22.86" x2="-73.66" y2="22.86" width="0.1524" layer="91"/>
-<wire x1="-73.66" y1="22.86" x2="-68.58" y2="22.86" width="0.1524" layer="91"/>
-<wire x1="-68.58" y1="22.86" x2="-68.58" y2="20.32" width="0.1524" layer="91"/>
-<junction x="-73.66" y="22.86"/>
-</segment>
-</net>
-<net name="SDIO_CK" class="0">
-<segment>
-<wire x1="48.26" y1="-5.08" x2="40.64" y2="-5.08" width="0.1524" layer="91"/>
-<label x="40.64" y="-5.08" size="1.27" layer="95" rot="R180" xref="yes"/>
-</segment>
-</net>
-<net name="SDIO_CMD" class="0">
-<segment>
-<wire x1="48.26" y1="-10.16" x2="40.64" y2="-10.16" width="0.1524" layer="91"/>
-<label x="40.64" y="-10.16" size="1.27" layer="95" rot="R180" xref="yes"/>
-</segment>
-</net>
-<net name="SDIO_D3" class="0">
-<segment>
-<wire x1="48.26" y1="0" x2="40.64" y2="0" width="0.1524" layer="91"/>
-<label x="40.64" y="0" size="1.27" layer="95" rot="R180" xref="yes"/>
-</segment>
-</net>
-<net name="SDIO_D2" class="0">
-<segment>
-<wire x1="48.26" y1="2.54" x2="40.64" y2="2.54" width="0.1524" layer="91"/>
-<label x="40.64" y="2.54" size="1.27" layer="95" rot="R180" xref="yes"/>
-</segment>
-</net>
-<net name="SDIO_D0" class="0">
-<segment>
-<wire x1="48.26" y1="7.62" x2="40.64" y2="7.62" width="0.1524" layer="91"/>
-<label x="40.64" y="7.62" size="1.27" layer="95" rot="R180" xref="yes"/>
-</segment>
-</net>
-<net name="SDIO_D1" class="0">
-<segment>
-<wire x1="48.26" y1="5.08" x2="40.64" y2="5.08" width="0.1524" layer="91"/>
-<label x="40.64" y="5.08" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="22.86" y1="17.78" x2="27.94" y2="17.78" width="0.1524" layer="91"/>
+<wire x1="27.94" y1="17.78" x2="33.02" y2="17.78" width="0.1524" layer="91"/>
+<wire x1="33.02" y1="17.78" x2="33.02" y2="15.24" width="0.1524" layer="91"/>
+<junction x="27.94" y="17.78"/>
 </segment>
 </net>
 </nets>
@@ -40595,6 +40412,7 @@ copy of reference circuit</text>
 
 Plan for now is to not populate it on the Alpha though.</text>
 <text x="-45.72" y="93.98" size="3.81" layer="91">Application access USB UART</text>
+<text x="147.32" y="-111.76" size="2.54" layer="94">USB-UART interface</text>
 </plain>
 <instances>
 <instance part="U8" gate="G$1" x="10.16" y="20.32"/>
@@ -41150,7 +40968,7 @@ Plan for now is to not populate it on the Alpha though.</text>
 </nets>
 </sheet>
 <sheet>
-<description>MGMT USB-UART interface</description>
+<description>MGMT USB-UART</description>
 <plain>
 <text x="-73.66" y="68.58" size="1.778" layer="91">DS_FT232H.pdf
 6.1 USB Bus Powered Configuration
@@ -41161,6 +40979,7 @@ copy of reference circuit</text>
 <text x="-160.02" y="10.16" size="1.9304" layer="91">XXX Add EEPROM for USB settings.
 
 Plan for now is to not populate it on the Alpha though.</text>
+<text x="149.86" y="-109.22" size="2.54" layer="94">MGMT USB-UART</text>
 </plain>
 <instances>
 <instance part="U9" gate="G$1" x="12.7" y="22.86"/>
@@ -41716,17 +41535,17 @@ Plan for now is to not populate it on the Alpha though.</text>
 </nets>
 </sheet>
 <sheet>
-<description>Tamper circuit
-Master Key Memory</description>
+<description>AVR Tamper circuit</description>
 <plain>
 <text x="-81.28" y="63.5" size="3.81" layer="91">AVR Tiny Tamper Detect MCU</text>
-<text x="121.92" y="38.1" size="2.54" layer="91">Panic button</text>
+<text x="121.92" y="43.18" size="2.54" layer="91">Panic button</text>
 <text x="137.16" y="-12.7" size="2.54" layer="91">Expansion GPIO</text>
 <text x="121.92" y="93.98" size="1.778" layer="91">Connector for external 3V3 battery.
 
 Place a jumper between pins 1-2
 to "emulate" having a battery present.</text>
-<text x="-93.98" y="-35.56" size="1.778" layer="91">AVR_GPIO* AVR_LED*, AVR_PANIC and FPGA_GPIO_TAMPER* can be swapped.</text>
+<text x="-93.98" y="-35.56" size="1.778" layer="91">AVR_GPIO* AVR_LED* and AVR_PANIC can be swapped.</text>
+<text x="152.4" y="-109.22" size="2.54" layer="94">AVR Tamper circuit</text>
 </plain>
 <instances>
 <instance part="U10" gate="A" x="-43.18" y="12.7"/>
@@ -41741,25 +41560,25 @@ to "emulate" having a battery present.</text>
 <instance part="R30" gate="G$1" x="45.72" y="25.4" rot="R90"/>
 <instance part="P+45" gate="VCC" x="45.72" y="40.64" smashed="yes"/>
 <instance part="SUPPLY74" gate="GND" x="78.74" y="-30.48"/>
-<instance part="C102" gate="G$1" x="-144.78" y="30.48" smashed="yes">
-<attribute name="NAME" x="-152.4" y="30.48" size="1.27" layer="95"/>
-<attribute name="VALUE" x="-152.4" y="27.94" size="1.27" layer="96"/>
-<attribute name="DIELECTRIC" x="-144.78" y="30.48" size="1.778" layer="96" display="off"/>
-<attribute name="RATED_VOLTAGE" x="-144.78" y="30.48" size="1.778" layer="96" display="off"/>
-</instance>
-<instance part="C104" gate="G$1" x="-129.54" y="30.48" smashed="yes">
-<attribute name="NAME" x="-127" y="30.48" size="1.27" layer="95" font="vector"/>
-<attribute name="VALUE" x="-127" y="27.94" size="1.27" layer="96" font="vector"/>
-<attribute name="DIELECTRIC" x="-129.54" y="30.48" size="1.778" layer="96" display="off"/>
-<attribute name="RATED_VOLTAGE" x="-129.54" y="30.48" size="1.778" layer="96" display="off"/>
-</instance>
-<instance part="C103" gate="G$1" x="-137.16" y="30.48" smashed="yes">
-<attribute name="DIELECTRIC" x="-137.16" y="30.48" size="1.778" layer="96" display="off"/>
-<attribute name="RATED_VOLTAGE" x="-137.16" y="30.48" size="1.778" layer="96" display="off"/>
-<attribute name="NAME" x="-137.16" y="33.02" size="1.27" layer="95"/>
-<attribute name="VALUE" x="-137.16" y="30.48" size="1.27" layer="96"/>
-</instance>
-<instance part="SUPPLY72" gate="GND" x="-137.16" y="17.78"/>
+<instance part="C102" gate="G$1" x="-149.86" y="30.48" smashed="yes">
+<attribute name="NAME" x="-157.48" y="30.48" size="1.27" layer="95"/>
+<attribute name="VALUE" x="-157.48" y="27.94" size="1.27" layer="96"/>
+<attribute name="DIELECTRIC" x="-149.86" y="30.48" size="1.778" layer="96" display="off"/>
+<attribute name="RATED_VOLTAGE" x="-149.86" y="30.48" size="1.778" layer="96" display="off"/>
+</instance>
+<instance part="C104" gate="G$1" x="-134.62" y="30.48" smashed="yes">
+<attribute name="NAME" x="-132.08" y="30.48" size="1.27" layer="95" font="vector"/>
+<attribute name="VALUE" x="-132.08" y="27.94" size="1.27" layer="96" font="vector"/>
+<attribute name="DIELECTRIC" x="-134.62" y="30.48" size="1.778" layer="96" display="off"/>
+<attribute name="RATED_VOLTAGE" x="-134.62" y="30.48" size="1.778" layer="96" display="off"/>
+</instance>
+<instance part="C103" gate="G$1" x="-142.24" y="30.48" smashed="yes">
+<attribute name="DIELECTRIC" x="-142.24" y="30.48" size="1.778" layer="96" display="off"/>
+<attribute name="RATED_VOLTAGE" x="-142.24" y="30.48" size="1.778" layer="96" display="off"/>
+<attribute name="NAME" x="-142.24" y="33.02" size="1.27" layer="95"/>
+<attribute name="VALUE" x="-142.24" y="30.48" size="1.27" layer="96"/>
+</instance>
+<instance part="SUPPLY72" gate="GND" x="-142.24" y="17.78"/>
 <instance part="LED11" gate="G$1" x="157.48" y="-78.74" smashed="yes" rot="R90">
 <attribute name="NAME" x="177.292" y="-77.724" size="1.778" layer="95" rot="R180"/>
 <attribute name="VALUE" x="189.992" y="-78.105" size="1.778" layer="96" rot="R180"/>
@@ -41794,6 +41613,11 @@ to "emulate" having a battery present.</text>
 <attribute name="RATED_VOLTAGE" x="127" y="-33.02" size="1.778" layer="96" display="off"/>
 </instance>
 <instance part="SUPPLY75" gate="GND" x="127" y="-50.8"/>
+<instance part="R82" gate="G$1" x="127" y="22.86" smashed="yes" rot="R90">
+<attribute name="NAME" x="123.19" y="23.9014" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="123.19" y="21.082" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="P+86" gate="VCC" x="127" y="33.02" smashed="yes"/>
 </instances>
 <busses>
 </busses>
@@ -41817,16 +41641,16 @@ to "emulate" having a battery present.</text>
 </segment>
 <segment>
 <pinref part="C102" gate="G$1" pin="2"/>
-<wire x1="-144.78" y1="25.4" x2="-144.78" y2="22.86" width="0.1524" layer="91"/>
+<wire x1="-149.86" y1="25.4" x2="-149.86" y2="22.86" width="0.1524" layer="91"/>
 <pinref part="SUPPLY72" gate="GND" pin="GND"/>
-<wire x1="-144.78" y1="22.86" x2="-137.16" y2="22.86" width="0.1524" layer="91"/>
-<wire x1="-137.16" y1="22.86" x2="-137.16" y2="20.32" width="0.1524" layer="91"/>
+<wire x1="-149.86" y1="22.86" x2="-142.24" y2="22.86" width="0.1524" layer="91"/>
+<wire x1="-142.24" y1="22.86" x2="-142.24" y2="20.32" width="0.1524" layer="91"/>
 <pinref part="C104" gate="G$1" pin="2"/>
-<wire x1="-129.54" y1="25.4" x2="-129.54" y2="22.86" width="0.1524" layer="91"/>
-<wire x1="-129.54" y1="22.86" x2="-137.16" y2="22.86" width="0.1524" layer="91"/>
-<junction x="-137.16" y="22.86"/>
+<wire x1="-134.62" y1="25.4" x2="-134.62" y2="22.86" width="0.1524" layer="91"/>
+<wire x1="-134.62" y1="22.86" x2="-142.24" y2="22.86" width="0.1524" layer="91"/>
+<junction x="-142.24" y="22.86"/>
 <pinref part="C103" gate="G$1" pin="2"/>
-<wire x1="-137.16" y1="25.4" x2="-137.16" y2="22.86" width="0.1524" layer="91"/>
+<wire x1="-142.24" y1="25.4" x2="-142.24" y2="22.86" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="LED11" gate="G$1" pin="C"/>
@@ -41918,16 +41742,16 @@ to "emulate" having a battery present.</text>
 <junction x="-109.22" y="38.1"/>
 <pinref part="P+44" gate="VCC" pin="VCC"/>
 <pinref part="C102" gate="G$1" pin="1"/>
-<wire x1="-109.22" y1="38.1" x2="-129.54" y2="38.1" width="0.1524" layer="91"/>
-<wire x1="-129.54" y1="38.1" x2="-137.16" y2="38.1" width="0.1524" layer="91"/>
-<wire x1="-137.16" y1="38.1" x2="-144.78" y2="38.1" width="0.1524" layer="91"/>
-<wire x1="-144.78" y1="38.1" x2="-144.78" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="-109.22" y1="38.1" x2="-134.62" y2="38.1" width="0.1524" layer="91"/>
+<wire x1="-134.62" y1="38.1" x2="-142.24" y2="38.1" width="0.1524" layer="91"/>
+<wire x1="-142.24" y1="38.1" x2="-149.86" y2="38.1" width="0.1524" layer="91"/>
+<wire x1="-149.86" y1="38.1" x2="-149.86" y2="33.02" width="0.1524" layer="91"/>
 <pinref part="C103" gate="G$1" pin="1"/>
-<wire x1="-137.16" y1="38.1" x2="-137.16" y2="33.02" width="0.1524" layer="91"/>
-<junction x="-137.16" y="38.1"/>
+<wire x1="-142.24" y1="38.1" x2="-142.24" y2="33.02" width="0.1524" layer="91"/>
+<junction x="-142.24" y="38.1"/>
 <pinref part="C104" gate="G$1" pin="1"/>
-<wire x1="-129.54" y1="38.1" x2="-129.54" y2="33.02" width="0.1524" layer="91"/>
-<junction x="-129.54" y="38.1"/>
+<wire x1="-134.62" y1="38.1" x2="-134.62" y2="33.02" width="0.1524" layer="91"/>
+<junction x="-134.62" y="38.1"/>
 <label x="-106.68" y="53.34" size="1.27" layer="95"/>
 </segment>
 <segment>
@@ -41937,12 +41761,18 @@ to "emulate" having a battery present.</text>
 <wire x1="142.24" y1="78.74" x2="142.24" y2="86.36" width="0.1524" layer="91"/>
 <label x="139.7" y="88.9" size="1.27" layer="95" rot="R180"/>
 </segment>
+<segment>
+<pinref part="R82" gate="G$1" pin="2"/>
+<pinref part="P+86" gate="VCC" pin="VCC"/>
+<wire x1="127" y1="27.94" x2="127" y2="30.48" width="0.1524" layer="91"/>
+<label x="116.84" y="33.02" size="1.27" layer="95"/>
+</segment>
 </net>
-<net name="MKM_CONTROL" class="0">
+<net name="MKM_CONTROL_AVR_ENA" class="0">
 <segment>
-<wire x1="17.78" y1="38.1" x2="12.7" y2="38.1" width="0.1524" layer="91"/>
-<label x="17.78" y="38.1" size="1.27" layer="95" xref="yes"/>
-<pinref part="U10" gate="A" pin="PC0_(PCINT16/ADC16/TOCC0/SS/XCK)"/>
+<wire x1="-104.14" y1="15.24" x2="-99.06" y2="15.24" width="0.1524" layer="91"/>
+<label x="-104.14" y="15.24" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U10" gate="A" pin="(PCINT6/ADC6)_PA6"/>
 </segment>
 </net>
 <net name="MKM_AVR_SCK" class="0">
@@ -41960,9 +41790,9 @@ to "emulate" having a battery present.</text>
 </net>
 <net name="MKM_AVR_CS_N" class="0">
 <segment>
-<pinref part="U10" gate="A" pin="PC1_(PCINT17/ADC17/TOCC1/INT0/CLKO)"/>
-<wire x1="12.7" y1="35.56" x2="17.78" y2="35.56" width="0.1524" layer="91"/>
-<label x="17.78" y="35.56" size="1.27" layer="95" xref="yes"/>
+<wire x1="-99.06" y1="17.78" x2="-104.14" y2="17.78" width="0.1524" layer="91"/>
+<label x="-104.14" y="17.78" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U10" gate="A" pin="(PC!INT5/ADC5)_PA5"/>
 </segment>
 </net>
 <net name="MKM_AVR_MOSI" class="0">
@@ -42005,9 +41835,9 @@ to "emulate" having a battery present.</text>
 <pinref part="R31" gate="A" pin="5"/>
 </segment>
 <segment>
-<pinref part="U10" gate="A" pin="(PCINT7/ADC7)_PA7"/>
-<wire x1="-99.06" y1="12.7" x2="-101.6" y2="12.7" width="0.1524" layer="91"/>
-<label x="-101.6" y="12.7" size="1.27" layer="95" rot="R180"/>
+<wire x1="-99.06" y1="30.48" x2="-101.6" y2="30.48" width="0.1524" layer="91"/>
+<label x="-111.76" y="30.48" size="1.27" layer="95"/>
+<pinref part="U10" gate="A" pin="(PCINT0/ADC0)_PA0"/>
 </segment>
 </net>
 <net name="N$5" class="0">
@@ -42024,9 +41854,9 @@ to "emulate" having a battery present.</text>
 <pinref part="R31" gate="A" pin="6"/>
 </segment>
 <segment>
-<pinref part="U10" gate="A" pin="(PCINT6/ADC6)_PA6"/>
-<wire x1="-99.06" y1="15.24" x2="-101.6" y2="15.24" width="0.1524" layer="91"/>
-<label x="-101.6" y="15.24" size="1.27" layer="95" rot="R180"/>
+<wire x1="-99.06" y1="27.94" x2="-101.6" y2="27.94" width="0.1524" layer="91"/>
+<label x="-111.76" y="27.94" size="1.27" layer="95"/>
+<pinref part="U10" gate="A" pin="(PCINT1/ADC1/AIN0)_PA1"/>
 </segment>
 </net>
 <net name="N$15" class="0">
@@ -42043,9 +41873,9 @@ to "emulate" having a battery present.</text>
 <pinref part="R31" gate="A" pin="7"/>
 </segment>
 <segment>
-<pinref part="U10" gate="A" pin="(PC!INT5/ADC5)_PA5"/>
-<wire x1="-99.06" y1="17.78" x2="-101.6" y2="17.78" width="0.1524" layer="91"/>
-<label x="-101.6" y="17.78" size="1.27" layer="95" rot="R180"/>
+<wire x1="-99.06" y1="25.4" x2="-101.6" y2="25.4" width="0.1524" layer="91"/>
+<label x="-111.76" y="25.4" size="1.27" layer="95"/>
+<pinref part="U10" gate="A" pin="(PCINT2/ADC2/AIN1)_PA2"/>
 </segment>
 </net>
 <net name="N$16" class="0">
@@ -42062,118 +41892,120 @@ to "emulate" having a battery present.</text>
 <pinref part="R31" gate="A" pin="8"/>
 </segment>
 <segment>
-<pinref part="U10" gate="A" pin="(PCINT4/ADC4)_PA4"/>
-<wire x1="-99.06" y1="20.32" x2="-101.6" y2="20.32" width="0.1524" layer="91"/>
-<label x="-101.6" y="20.32" size="1.27" layer="95" rot="R180"/>
+<wire x1="-99.06" y1="22.86" x2="-101.6" y2="22.86" width="0.1524" layer="91"/>
+<label x="-111.76" y="22.86" size="1.27" layer="95"/>
+<pinref part="U10" gate="A" pin="(PCINT3/ADC3)_PA3"/>
 </segment>
 </net>
-<net name="AVR_GPIO_1" class="0">
+<net name="AVR_GPIO_0" class="0">
 <segment>
 <pinref part="JP5" gate="G$1" pin="2"/>
 <wire x1="154.94" y1="-25.4" x2="149.86" y2="-25.4" width="0.1524" layer="91"/>
 <label x="149.86" y="-25.4" size="1.27" layer="95" rot="R180"/>
 </segment>
 <segment>
-<pinref part="U10" gate="A" pin="(PCINT18/ADC18/TOCC2/RXD/INT1)_PC2"/>
-<wire x1="12.7" y1="33.02" x2="17.78" y2="33.02" width="0.1524" layer="91"/>
-<label x="17.78" y="33.02" size="1.27" layer="95"/>
+<wire x1="12.7" y1="38.1" x2="17.78" y2="38.1" width="0.1524" layer="91"/>
+<label x="17.78" y="38.1" size="1.27" layer="95"/>
+<pinref part="U10" gate="A" pin="PC0_(PCINT16/ADC16/TOCC0/SS/XCK)"/>
 </segment>
 </net>
-<net name="AVR_GPIO_2" class="0">
+<net name="AVR_GPIO_1" class="0">
 <segment>
 <pinref part="JP5" gate="G$1" pin="3"/>
 <wire x1="154.94" y1="-27.94" x2="149.86" y2="-27.94" width="0.1524" layer="91"/>
 <label x="149.86" y="-27.94" size="1.27" layer="95" rot="R180"/>
 </segment>
 <segment>
-<pinref part="U10" gate="A" pin="(PCINT19/ADC19/TOCC3/TXD)_PC3"/>
-<wire x1="12.7" y1="30.48" x2="17.78" y2="30.48" width="0.1524" layer="91"/>
-<label x="17.78" y="30.48" size="1.27" layer="95"/>
+<wire x1="12.7" y1="35.56" x2="17.78" y2="35.56" width="0.1524" layer="91"/>
+<label x="17.78" y="35.56" size="1.27" layer="95"/>
+<pinref part="U10" gate="A" pin="PC1_(PCINT17/ADC17/TOCC1/INT0/CLKO)"/>
 </segment>
 </net>
-<net name="AVR_GPIO_3" class="0">
+<net name="AVR_GPIO_2" class="0">
 <segment>
 <pinref part="JP5" gate="G$1" pin="4"/>
 <wire x1="154.94" y1="-30.48" x2="149.86" y2="-30.48" width="0.1524" layer="91"/>
 <label x="149.86" y="-30.48" size="1.27" layer="95" rot="R180"/>
 </segment>
 <segment>
-<pinref part="U10" gate="A" pin="(PCINT20/ADC20/TOCC4)_PC4"/>
-<wire x1="12.7" y1="27.94" x2="17.78" y2="27.94" width="0.1524" layer="91"/>
-<label x="17.78" y="27.94" size="1.27" layer="95"/>
+<wire x1="12.7" y1="33.02" x2="17.78" y2="33.02" width="0.1524" layer="91"/>
+<label x="17.78" y="33.02" size="1.27" layer="95"/>
+<pinref part="U10" gate="A" pin="(PCINT18/ADC18/TOCC2/RXD/INT1)_PC2"/>
 </segment>
 </net>
-<net name="AVR_GPIO_4" class="0">
+<net name="AVR_GPIO_3" class="0">
 <segment>
 <pinref part="JP5" gate="G$1" pin="5"/>
 <wire x1="154.94" y1="-33.02" x2="149.86" y2="-33.02" width="0.1524" layer="91"/>
 <label x="149.86" y="-33.02" size="1.27" layer="95" rot="R180"/>
 </segment>
 <segment>
-<pinref part="U10" gate="A" pin="(PCINT21/ADC21/TOCC5/ICP1/T0)_PC5"/>
-<wire x1="12.7" y1="25.4" x2="17.78" y2="25.4" width="0.1524" layer="91"/>
-<label x="17.78" y="25.4" size="1.27" layer="95"/>
+<wire x1="12.7" y1="30.48" x2="17.78" y2="30.48" width="0.1524" layer="91"/>
+<label x="17.78" y="30.48" size="1.27" layer="95"/>
+<pinref part="U10" gate="A" pin="(PCINT19/ADC19/TOCC3/TXD)_PC3"/>
 </segment>
 </net>
-<net name="AVR_GPIO_5" class="0">
+<net name="AVR_GPIO_4" class="0">
 <segment>
 <pinref part="JP5" gate="G$1" pin="6"/>
 <wire x1="154.94" y1="-35.56" x2="149.86" y2="-35.56" width="0.1524" layer="91"/>
 <label x="149.86" y="-35.56" size="1.27" layer="95" rot="R180"/>
 </segment>
 <segment>
-<pinref part="U10" gate="A" pin="(PCINT22/ADC22/CLKI/TOCC6)_PC6"/>
-<wire x1="12.7" y1="22.86" x2="17.78" y2="22.86" width="0.1524" layer="91"/>
-<label x="17.78" y="22.86" size="1.27" layer="95"/>
+<wire x1="12.7" y1="27.94" x2="17.78" y2="27.94" width="0.1524" layer="91"/>
+<label x="17.78" y="27.94" size="1.27" layer="95"/>
+<pinref part="U10" gate="A" pin="(PCINT20/ADC20/TOCC4)_PC4"/>
 </segment>
 </net>
-<net name="AVR_GPIO_6" class="0">
+<net name="AVR_GPIO_5" class="0">
 <segment>
 <pinref part="JP5" gate="G$1" pin="7"/>
 <wire x1="154.94" y1="-38.1" x2="149.86" y2="-38.1" width="0.1524" layer="91"/>
 <label x="149.86" y="-38.1" size="1.27" layer="95" rot="R180"/>
 </segment>
 <segment>
-<pinref part="U10" gate="A" pin="(PCINT23/ADC23/TOCC7/T1)_PC7"/>
-<wire x1="12.7" y1="20.32" x2="17.78" y2="20.32" width="0.1524" layer="91"/>
-<label x="17.78" y="20.32" size="1.27" layer="95"/>
+<wire x1="12.7" y1="25.4" x2="17.78" y2="25.4" width="0.1524" layer="91"/>
+<label x="17.78" y="25.4" size="1.27" layer="95"/>
+<pinref part="U10" gate="A" pin="(PCINT21/ADC21/TOCC5/ICP1/T0)_PC5"/>
 </segment>
 </net>
-<net name="AVR_GPIO_7" class="0">
+<net name="AVR_GPIO_6" class="0">
 <segment>
 <pinref part="JP5" gate="G$1" pin="8"/>
 <wire x1="154.94" y1="-40.64" x2="149.86" y2="-40.64" width="0.1524" layer="91"/>
 <label x="149.86" y="-40.64" size="1.27" layer="95" rot="R180"/>
 </segment>
 <segment>
-<pinref part="U10" gate="A" pin="(PCINT0/ADC0)_PA0"/>
-<wire x1="-99.06" y1="30.48" x2="-101.6" y2="30.48" width="0.1524" layer="91"/>
-<label x="-101.6" y="30.48" size="1.27" layer="95" rot="R180"/>
+<wire x1="12.7" y1="22.86" x2="17.78" y2="22.86" width="0.1524" layer="91"/>
+<label x="17.78" y="22.86" size="1.27" layer="95"/>
+<pinref part="U10" gate="A" pin="(PCINT22/ADC22/CLKI/TOCC6)_PC6"/>
 </segment>
 </net>
-<net name="AVR_GPIO_8" class="0">
+<net name="AVR_GPIO_7" class="0">
 <segment>
 <pinref part="JP5" gate="G$1" pin="9"/>
 <wire x1="154.94" y1="-43.18" x2="149.86" y2="-43.18" width="0.1524" layer="91"/>
 <label x="149.86" y="-43.18" size="1.27" layer="95" rot="R180"/>
 </segment>
 <segment>
-<pinref part="U10" gate="A" pin="(PCINT1/ADC1/AIN0)_PA1"/>
-<wire x1="-99.06" y1="27.94" x2="-101.6" y2="27.94" width="0.1524" layer="91"/>
-<label x="-101.6" y="27.94" size="1.27" layer="95" rot="R180"/>
+<wire x1="12.7" y1="20.32" x2="17.78" y2="20.32" width="0.1524" layer="91"/>
+<label x="17.78" y="20.32" size="1.27" layer="95"/>
+<pinref part="U10" gate="A" pin="(PCINT23/ADC23/TOCC7/T1)_PC7"/>
 </segment>
 </net>
 <net name="AVR_PANIC" class="0">
 <segment>
-<pinref part="U10" gate="A" pin="(PCINT2/ADC2/AIN1)_PA2"/>
-<wire x1="-99.06" y1="25.4" x2="-101.6" y2="25.4" width="0.1524" layer="91"/>
-<label x="-101.6" y="25.4" size="1.27" layer="95" rot="R180"/>
-<label x="-101.6" y="25.4" size="1.27" layer="95" rot="R180"/>
+<wire x1="137.16" y1="12.7" x2="127" y2="12.7" width="0.1524" layer="91"/>
+<label x="116.84" y="12.7" size="1.27" layer="95" rot="R180"/>
+<pinref part="S2" gate="A" pin="A2"/>
+<pinref part="R82" gate="G$1" pin="1"/>
+<wire x1="127" y1="12.7" x2="119.38" y2="12.7" width="0.1524" layer="91"/>
+<wire x1="127" y1="17.78" x2="127" y2="12.7" width="0.1524" layer="91"/>
+<junction x="127" y="12.7"/>
 </segment>
 <segment>
-<wire x1="137.16" y1="12.7" x2="132.08" y2="12.7" width="0.1524" layer="91"/>
-<label x="132.08" y="12.7" size="1.27" layer="95" rot="R180"/>
-<pinref part="S2" gate="A" pin="A2"/>
+<wire x1="-99.06" y1="20.32" x2="-101.6" y2="20.32" width="0.1524" layer="91"/>
+<label x="-111.76" y="20.32" size="1.27" layer="95"/>
 </segment>
 </net>
 <net name="VCCO_3V3" class="0">
@@ -42185,32 +42017,30 @@ to "emulate" having a battery present.</text>
 <label x="162.56" y="88.9" size="1.27" layer="95" rot="R180"/>
 </segment>
 </net>
-<net name="AVR_GPIO_10" class="0">
+<net name="AVR_GPIO_ARM_0" class="0">
 <segment>
-<pinref part="U10" gate="A" pin="PB2_(PCINT10/ADC10)"/>
-<wire x1="-99.06" y1="2.54" x2="-101.6" y2="2.54" width="0.1524" layer="91"/>
-<label x="-101.6" y="2.54" size="1.27" layer="95" rot="R180"/>
+<wire x1="-99.06" y1="7.62" x2="-101.6" y2="7.62" width="0.1524" layer="91"/>
+<label x="-101.6" y="7.62" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U10" gate="A" pin="PB0_(PCINT8/ADC8)"/>
 </segment>
 </net>
-<net name="AVR_GPIO_11" class="0">
+<net name="AVR_GPIO_ARM_1" class="0">
 <segment>
-<pinref part="U10" gate="A" pin="PB3_(PCINT11/ADC11)"/>
-<wire x1="-99.06" y1="0" x2="-101.6" y2="0" width="0.1524" layer="91"/>
-<label x="-101.6" y="0" size="1.27" layer="95" rot="R180"/>
+<wire x1="-99.06" y1="5.08" x2="-101.6" y2="5.08" width="0.1524" layer="91"/>
+<label x="-101.6" y="5.08" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U10" gate="A" pin="PB1_(PCINT9/ADC9)"/>
 </segment>
 </net>
-<net name="FPGA_GPIO_TAMPER_0" class="0">
+<net name="AVR_GPIO_FPGA_0" class="0">
 <segment>
-<wire x1="-99.06" y1="-7.62" x2="-101.6" y2="-7.62" width="0.1524" layer="91"/>
-<label x="-101.6" y="-7.62" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U10" gate="A" pin="PB6_(PCINT14/ADC14)"/>
+<wire x1="-99.06" y1="-2.54" x2="-101.6" y2="-2.54" width="0.1524" layer="91"/>
+<label x="-101.6" y="-2.54" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
-<net name="FPGA_GPIO_TAMPER_1" class="0">
+<net name="AVR_GPIO_FPGA_1" class="0">
 <segment>
-<wire x1="-99.06" y1="-10.16" x2="-101.6" y2="-10.16" width="0.1524" layer="91"/>
-<label x="-101.6" y="-10.16" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U10" gate="A" pin="PB7_(PCINT15/ADC15)"/>
+<wire x1="-99.06" y1="-5.08" x2="-101.6" y2="-5.08" width="0.1524" layer="91"/>
+<label x="-101.6" y="-5.08" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="VCC" class="0">
@@ -42225,52 +42055,107 @@ to "emulate" having a battery present.</text>
 <junction x="127" y="-22.86"/>
 </segment>
 </net>
+<net name="MKM_CONTROL_FPGA_DIS" class="0">
+<segment>
+<wire x1="-104.14" y1="12.7" x2="-99.06" y2="12.7" width="0.1524" layer="91"/>
+<label x="-104.14" y="12.7" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+</net>
+<net name="AVR_GPIO_ARM_2" class="0">
+<segment>
+<wire x1="-99.06" y1="2.54" x2="-101.6" y2="2.54" width="0.1524" layer="91"/>
+<label x="-101.6" y="2.54" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+</net>
+<net name="AVR_GPIO_ARM_3" class="0">
+<segment>
+<wire x1="-99.06" y1="0" x2="-101.6" y2="0" width="0.1524" layer="91"/>
+<label x="-101.6" y="0" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+</net>
+<net name="AVR_GPIO_FPGA_2" class="0">
+<segment>
+<wire x1="-99.06" y1="-7.62" x2="-101.6" y2="-7.62" width="0.1524" layer="91"/>
+<label x="-101.6" y="-7.62" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U10" gate="A" pin="PB6_(PCINT14/ADC14)"/>
+</segment>
+</net>
+<net name="AVR_GPIO_FPGA_3" class="0">
+<segment>
+<wire x1="-99.06" y1="-10.16" x2="-101.6" y2="-10.16" width="0.1524" layer="91"/>
+<label x="-101.6" y="-10.16" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U10" gate="A" pin="PB7_(PCINT15/ADC15)"/>
+</segment>
+</net>
 </nets>
 </sheet>
 <sheet>
 <description>Master Key Memory</description>
 <plain>
-<text x="162.56" y="60.96" size="1.27" layer="91">CS pull-up to disable MKM by
+<text x="205.74" y="55.88" size="1.27" layer="91">CS pull-up to disable MKM by
 default (allows programming
 of AVR)</text>
-<text x="17.78" y="27.94" size="1.27" layer="91">Pull-down CONTROL to
-enable 0 (AVR) by default</text>
-<text x="129.54" y="106.68" size="2.54" layer="91">Master Key Memory</text>
-<text x="-10.16" y="109.22" size="2.54" layer="91">Analog switch controlling access to the MKM.
+<text x="172.72" y="101.6" size="2.54" layer="91">Master Key Memory</text>
+<text x="-30.48" y="129.54" size="2.54" layer="91">SPI mux controlling access to the MKM.
 
-XXX suggest changing this chip to an 74AC244,
-like the one used for the FPGA config memory.</text>
-<text x="2.54" y="35.56" size="1.27" layer="91" rot="R180">Make AVR unable to read the
+Normally, the FPGA has R/W access to the MKM but on a
+tamper event the tamper detect MCU (AVR) will grab access
+to the MKM and erase the contents.</text>
+<text x="81.28" y="43.18" size="1.27" layer="91">Make AVR unable to read the
 MKM by installing this jumper</text>
+<text x="-17.78" y="48.26" size="1.27" layer="91">AVR access default
+disabled through pull-up</text>
+<text x="-20.32" y="20.32" size="1.27" layer="91">FPGA access default
+enabled through pull-down</text>
+<text x="236.22" y="-50.8" size="2.54" layer="94">Master Key Memory</text>
 </plain>
 <instances>
-<instance part="U11" gate="A" x="78.74" y="50.8"/>
-<instance part="U12" gate="A" x="147.32" y="60.96"/>
-<instance part="SUPPLY83" gate="GND" x="127" y="35.56"/>
-<instance part="P+52" gate="VCC" x="127" y="99.06" smashed="yes"/>
-<instance part="R33" gate="G$1" x="119.38" y="50.8" rot="R90"/>
-<instance part="P+50" gate="VCC" x="55.88" y="99.06" smashed="yes"/>
-<instance part="SUPPLY82" gate="GND" x="55.88" y="12.7"/>
-<instance part="R34" gate="G$1" x="121.92" y="73.66" rot="R90"/>
-<instance part="R32" gate="G$1" x="48.26" y="25.4" rot="R90"/>
-<instance part="P+51" gate="VCC" x="111.76" y="58.42" smashed="yes"/>
-<instance part="C106" gate="G$1" x="50.8" y="86.36" smashed="yes">
-<attribute name="NAME" x="40.64" y="83.82" size="1.27" layer="95" font="vector"/>
-<attribute name="VALUE" x="40.64" y="86.36" size="1.27" layer="96" font="vector"/>
-<attribute name="DIELECTRIC" x="50.8" y="86.36" size="1.778" layer="96" display="off"/>
-<attribute name="RATED_VOLTAGE" x="50.8" y="86.36" size="1.778" layer="96" display="off"/>
-</instance>
-<instance part="C107" gate="G$1" x="132.08" y="91.44" smashed="yes">
-<attribute name="NAME" x="134.62" y="93.98" size="1.27" layer="95" font="vector"/>
-<attribute name="VALUE" x="134.62" y="91.44" size="1.27" layer="96" font="vector"/>
-<attribute name="DIELECTRIC" x="132.08" y="91.44" size="1.778" layer="96" display="off"/>
-<attribute name="RATED_VOLTAGE" x="132.08" y="91.44" size="1.778" layer="96" display="off"/>
-</instance>
-<instance part="SUPPLY84" gate="GND" x="132.08" y="81.28"/>
-<instance part="SUPPLY81" gate="GND" x="50.8" y="76.2"/>
-<instance part="JP6" gate="A" x="10.16" y="35.56"/>
-<instance part="SUPPLY80" gate="GND" x="10.16" y="22.86"/>
+<instance part="U12" gate="A" x="190.5" y="55.88"/>
+<instance part="SUPPLY83" gate="GND" x="170.18" y="30.48"/>
+<instance part="P+52" gate="VCC" x="170.18" y="93.98" smashed="yes"/>
+<instance part="R33" gate="G$1" x="160.02" y="76.2" smashed="yes" rot="R270">
+<attribute name="NAME" x="153.67" y="77.6986" size="1.778" layer="95"/>
+<attribute name="VALUE" x="158.75" y="76.962" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="P+50" gate="VCC" x="-33.02" y="96.52" smashed="yes"/>
+<instance part="R34" gate="G$1" x="149.86" y="76.2" smashed="yes" rot="R90">
+<attribute name="NAME" x="146.05" y="79.7814" size="1.778" layer="95" rot="R180"/>
+<attribute name="VALUE" x="146.05" y="76.962" size="1.778" layer="96" rot="R180"/>
+</instance>
+<instance part="P+51" gate="VCC" x="160.02" y="93.98" smashed="yes"/>
+<instance part="C106" gate="G$1" x="-43.18" y="78.74" smashed="yes">
+<attribute name="NAME" x="-53.34" y="76.2" size="1.27" layer="95" font="vector"/>
+<attribute name="VALUE" x="-53.34" y="78.74" size="1.27" layer="96" font="vector"/>
+<attribute name="DIELECTRIC" x="-43.18" y="78.74" size="1.778" layer="96" display="off"/>
+<attribute name="RATED_VOLTAGE" x="-43.18" y="78.74" size="1.778" layer="96" display="off"/>
+</instance>
+<instance part="C107" gate="G$1" x="175.26" y="86.36" smashed="yes">
+<attribute name="NAME" x="177.8" y="88.9" size="1.27" layer="95" font="vector"/>
+<attribute name="VALUE" x="177.8" y="86.36" size="1.27" layer="96" font="vector"/>
+<attribute name="DIELECTRIC" x="175.26" y="86.36" size="1.778" layer="96" display="off"/>
+<attribute name="RATED_VOLTAGE" x="175.26" y="86.36" size="1.778" layer="96" display="off"/>
+</instance>
+<instance part="SUPPLY84" gate="GND" x="175.26" y="76.2"/>
+<instance part="JP6" gate="A" x="76.2" y="45.72"/>
+<instance part="SUPPLY80" gate="GND" x="76.2" y="33.02"/>
 <instance part="FRAME13" gate="G$1" x="-106.68" y="-71.12"/>
+<instance part="IC4" gate="A" x="30.48" y="60.96"/>
+<instance part="IC4" gate="B" x="30.48" y="33.02"/>
+<instance part="IC4" gate="P" x="-33.02" y="78.74"/>
+<instance part="R79" gate="G$1" x="45.72" y="76.2" rot="R90">
+<attribute name="TOLERANCE" x="45.72" y="76.2" size="1.778" layer="96" rot="R90" display="off"/>
+</instance>
+<instance part="SUPPLY44" gate="GND" x="-33.02" y="63.5"/>
+<instance part="R80" gate="G$1" x="10.16" y="76.2" rot="R90">
+<attribute name="TOLERANCE" x="10.16" y="76.2" size="1.778" layer="96" rot="R90" display="off"/>
+</instance>
+<instance part="R81" gate="G$1" x="10.16" y="15.24" rot="R270">
+<attribute name="TOLERANCE" x="10.16" y="15.24" size="1.778" layer="96" rot="R270" display="off"/>
+</instance>
+<instance part="SUPPLY222" gate="GND" x="10.16" y="5.08"/>
+<instance part="P+5" gate="VCC" x="10.16" y="96.52" smashed="yes"/>
+<instance part="P+13" gate="VCC" x="45.72" y="96.52" smashed="yes"/>
+<instance part="P+85" gate="VCC" x="149.86" y="93.98" smashed="yes"/>
 </instances>
 <busses>
 </busses>
@@ -42278,190 +42163,247 @@ MKM by installing this jumper</text>
 <net name="GND" class="1">
 <segment>
 <pinref part="SUPPLY83" gate="GND" pin="GND"/>
-<wire x1="127" y1="48.26" x2="127" y2="38.1" width="0.1524" layer="91"/>
+<wire x1="170.18" y1="43.18" x2="170.18" y2="33.02" width="0.1524" layer="91"/>
 <pinref part="U12" gate="A" pin="VSS"/>
-<wire x1="127" y1="48.26" x2="129.54" y2="48.26" width="0.1524" layer="91"/>
-</segment>
-<segment>
-<pinref part="U11" gate="A" pin="VSS"/>
-<pinref part="SUPPLY82" gate="GND" pin="GND"/>
-<wire x1="60.96" y1="25.4" x2="55.88" y2="25.4" width="0.1524" layer="91"/>
-<wire x1="55.88" y1="25.4" x2="55.88" y2="17.78" width="0.1524" layer="91"/>
-<pinref part="U11" gate="A" pin="VEE"/>
-<wire x1="55.88" y1="17.78" x2="55.88" y2="15.24" width="0.1524" layer="91"/>
-<wire x1="60.96" y1="27.94" x2="55.88" y2="27.94" width="0.1524" layer="91"/>
-<wire x1="55.88" y1="27.94" x2="55.88" y2="25.4" width="0.1524" layer="91"/>
-<junction x="55.88" y="25.4"/>
-<pinref part="R32" gate="G$1" pin="1"/>
-<wire x1="48.26" y1="20.32" x2="48.26" y2="17.78" width="0.1524" layer="91"/>
-<wire x1="48.26" y1="17.78" x2="55.88" y2="17.78" width="0.1524" layer="91"/>
-<junction x="55.88" y="17.78"/>
+<wire x1="170.18" y1="43.18" x2="172.72" y2="43.18" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C107" gate="G$1" pin="2"/>
 <pinref part="SUPPLY84" gate="GND" pin="GND"/>
-<wire x1="132.08" y1="86.36" x2="132.08" y2="83.82" width="0.1524" layer="91"/>
+<wire x1="175.26" y1="81.28" x2="175.26" y2="78.74" width="0.1524" layer="91"/>
+</segment>
+<segment>
+<pinref part="JP6" gate="A" pin="1"/>
+<pinref part="SUPPLY80" gate="GND" pin="GND"/>
+<wire x1="76.2" y1="38.1" x2="76.2" y2="35.56" width="0.1524" layer="91"/>
 </segment>
 <segment>
+<pinref part="IC4" gate="P" pin="GND"/>
+<wire x1="-33.02" y1="66.04" x2="-33.02" y2="68.58" width="0.1524" layer="91"/>
+<wire x1="-33.02" y1="68.58" x2="-33.02" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="-43.18" y1="73.66" x2="-43.18" y2="68.58" width="0.1524" layer="91"/>
+<wire x1="-43.18" y1="68.58" x2="-33.02" y2="68.58" width="0.1524" layer="91"/>
+<junction x="-33.02" y="68.58"/>
+<pinref part="SUPPLY44" gate="GND" pin="GND"/>
 <pinref part="C106" gate="G$1" pin="2"/>
-<pinref part="SUPPLY81" gate="GND" pin="GND"/>
-<wire x1="50.8" y1="81.28" x2="50.8" y2="78.74" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="JP6" gate="A" pin="1"/>
-<pinref part="SUPPLY80" gate="GND" pin="GND"/>
-<wire x1="10.16" y1="27.94" x2="10.16" y2="25.4" width="0.1524" layer="91"/>
+<pinref part="R81" gate="G$1" pin="2"/>
+<wire x1="10.16" y1="10.16" x2="10.16" y2="7.62" width="0.1524" layer="91"/>
+<pinref part="SUPPLY222" gate="GND" pin="GND"/>
 </segment>
 </net>
 <net name="N$31" class="0">
 <segment>
 <pinref part="U12" gate="A" pin="!HOLD"/>
 <pinref part="R33" gate="G$1" pin="2"/>
-<wire x1="129.54" y1="58.42" x2="119.38" y2="58.42" width="0.1524" layer="91"/>
-<wire x1="119.38" y1="58.42" x2="119.38" y2="55.88" width="0.1524" layer="91"/>
+<wire x1="172.72" y1="53.34" x2="160.02" y2="53.34" width="0.1524" layer="91"/>
+<wire x1="160.02" y1="53.34" x2="160.02" y2="71.12" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="MKM_SCK" class="0">
 <segment>
 <pinref part="U12" gate="A" pin="SCK"/>
-<pinref part="U11" gate="A" pin="Z"/>
-<wire x1="129.54" y1="60.96" x2="96.52" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="172.72" y1="55.88" x2="139.7" y2="55.88" width="0.1524" layer="91"/>
+<label x="139.7" y="55.88" size="1.27" layer="95" rot="R180"/>
+</segment>
+<segment>
+<pinref part="IC4" gate="A" pin="Y2"/>
+<wire x1="43.18" y1="63.5" x2="48.26" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="48.26" y1="63.5" x2="48.26" y2="35.56" width="0.1524" layer="91"/>
+<pinref part="IC4" gate="B" pin="Y2"/>
+<wire x1="48.26" y1="35.56" x2="43.18" y2="35.56" width="0.1524" layer="91"/>
+<wire x1="48.26" y1="63.5" x2="60.96" y2="63.5" width="0.1524" layer="91"/>
+<junction x="48.26" y="63.5"/>
+<label x="60.96" y="63.5" size="1.27" layer="95"/>
 </segment>
 </net>
 <net name="MKM_MOSI" class="0">
 <segment>
-<pinref part="U11" gate="A" pin="Y"/>
 <pinref part="U12" gate="A" pin="SI"/>
-<wire x1="96.52" y1="63.5" x2="129.54" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="58.42" x2="172.72" y2="58.42" width="0.1524" layer="91"/>
+<label x="139.7" y="58.42" size="1.27" layer="95" rot="R180"/>
+</segment>
+<segment>
+<pinref part="IC4" gate="B" pin="Y3"/>
+<wire x1="43.18" y1="33.02" x2="50.8" y2="33.02" width="0.1524" layer="91"/>
+<wire x1="50.8" y1="33.02" x2="50.8" y2="60.96" width="0.1524" layer="91"/>
+<pinref part="IC4" gate="A" pin="Y3"/>
+<wire x1="43.18" y1="60.96" x2="50.8" y2="60.96" width="0.1524" layer="91"/>
+<junction x="50.8" y="60.96"/>
+<wire x1="50.8" y1="60.96" x2="60.96" y2="60.96" width="0.1524" layer="91"/>
+<label x="60.96" y="60.96" size="1.27" layer="95"/>
 </segment>
 </net>
 <net name="MKM_CS_N" class="0">
 <segment>
 <pinref part="U12" gate="A" pin="!CS"/>
-<pinref part="U11" gate="A" pin="X"/>
-<wire x1="129.54" y1="66.04" x2="121.92" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="172.72" y1="60.96" x2="149.86" y2="60.96" width="0.1524" layer="91"/>
 <pinref part="R34" gate="G$1" pin="1"/>
-<wire x1="121.92" y1="66.04" x2="96.52" y2="66.04" width="0.1524" layer="91"/>
-<wire x1="121.92" y1="68.58" x2="121.92" y2="66.04" width="0.1524" layer="91"/>
-<junction x="121.92" y="66.04"/>
+<wire x1="149.86" y1="60.96" x2="139.7" y2="60.96" width="0.1524" layer="91"/>
+<wire x1="149.86" y1="71.12" x2="149.86" y2="60.96" width="0.1524" layer="91"/>
+<junction x="149.86" y="60.96"/>
+<label x="139.7" y="60.96" size="1.27" layer="95" rot="R180"/>
+</segment>
+<segment>
+<pinref part="IC4" gate="B" pin="Y1"/>
+<wire x1="43.18" y1="38.1" x2="45.72" y2="38.1" width="0.1524" layer="91"/>
+<wire x1="45.72" y1="38.1" x2="45.72" y2="66.04" width="0.1524" layer="91"/>
+<pinref part="IC4" gate="A" pin="Y1"/>
+<wire x1="45.72" y1="66.04" x2="43.18" y2="66.04" width="0.1524" layer="91"/>
+<junction x="45.72" y="66.04"/>
+<label x="60.96" y="66.04" size="1.27" layer="95"/>
+<pinref part="R79" gate="G$1" pin="1"/>
+<wire x1="45.72" y1="66.04" x2="60.96" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="45.72" y1="71.12" x2="45.72" y2="66.04" width="0.1524" layer="91"/>
+<junction x="45.72" y="66.04"/>
 </segment>
 </net>
 <net name="MKM_MISO" class="0">
 <segment>
-<pinref part="U11" gate="A" pin="W"/>
-<wire x1="96.52" y1="68.58" x2="99.06" y2="68.58" width="0.1524" layer="91"/>
-<wire x1="99.06" y1="68.58" x2="99.06" y2="101.6" width="0.1524" layer="91"/>
-<wire x1="99.06" y1="101.6" x2="167.64" y2="101.6" width="0.1524" layer="91"/>
-<wire x1="167.64" y1="101.6" x2="167.64" y2="71.12" width="0.1524" layer="91"/>
 <pinref part="U12" gate="A" pin="SO"/>
-<wire x1="167.64" y1="71.12" x2="165.1" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="210.82" y1="66.04" x2="208.28" y2="66.04" width="0.1524" layer="91"/>
+<label x="213.36" y="68.58" size="1.778" layer="95"/>
+</segment>
+<segment>
+<pinref part="IC4" gate="B" pin="A4"/>
+<wire x1="17.78" y1="30.48" x2="15.24" y2="30.48" width="0.1524" layer="91"/>
+<wire x1="15.24" y1="30.48" x2="15.24" y2="58.42" width="0.1524" layer="91"/>
+<pinref part="IC4" gate="A" pin="A4"/>
+<wire x1="17.78" y1="58.42" x2="15.24" y2="58.42" width="0.1524" layer="91"/>
+<wire x1="15.24" y1="58.42" x2="5.08" y2="58.42" width="0.1524" layer="91"/>
+<junction x="15.24" y="58.42"/>
+<label x="2.54" y="58.42" size="1.27" layer="95" rot="R180"/>
 </segment>
 </net>
 <net name="3V3_BATT" class="0">
 <segment>
 <pinref part="U12" gate="A" pin="VCC"/>
 <pinref part="P+52" gate="VCC" pin="VCC"/>
-<wire x1="129.54" y1="71.12" x2="127" y2="71.12" width="0.1524" layer="91"/>
-<wire x1="127" y1="71.12" x2="127" y2="83.82" width="0.1524" layer="91"/>
-<pinref part="R34" gate="G$1" pin="2"/>
-<wire x1="127" y1="83.82" x2="127" y2="93.98" width="0.1524" layer="91"/>
-<wire x1="127" y1="93.98" x2="127" y2="96.52" width="0.1524" layer="91"/>
-<wire x1="121.92" y1="78.74" x2="121.92" y2="83.82" width="0.1524" layer="91"/>
-<wire x1="121.92" y1="83.82" x2="127" y2="83.82" width="0.1524" layer="91"/>
-<junction x="127" y="83.82"/>
+<wire x1="172.72" y1="66.04" x2="170.18" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="170.18" y1="66.04" x2="170.18" y2="88.9" width="0.1524" layer="91"/>
+<wire x1="170.18" y1="88.9" x2="170.18" y2="91.44" width="0.1524" layer="91"/>
 <pinref part="C107" gate="G$1" pin="1"/>
-<wire x1="132.08" y1="93.98" x2="127" y2="93.98" width="0.1524" layer="91"/>
-<junction x="127" y="93.98"/>
-<label x="129.54" y="99.06" size="1.27" layer="95"/>
+<wire x1="175.26" y1="88.9" x2="170.18" y2="88.9" width="0.1524" layer="91"/>
+<junction x="170.18" y="88.9"/>
+<label x="167.64" y="96.52" size="1.27" layer="95"/>
 </segment>
 <segment>
-<pinref part="U11" gate="A" pin="VDD"/>
 <pinref part="P+50" gate="VCC" pin="VCC"/>
-<wire x1="60.96" y1="68.58" x2="55.88" y2="68.58" width="0.1524" layer="91"/>
-<wire x1="55.88" y1="68.58" x2="55.88" y2="88.9" width="0.1524" layer="91"/>
-<wire x1="55.88" y1="88.9" x2="55.88" y2="96.52" width="0.1524" layer="91"/>
-<wire x1="55.88" y1="88.9" x2="50.8" y2="88.9" width="0.1524" layer="91"/>
-<junction x="55.88" y="88.9"/>
+<wire x1="-33.02" y1="88.9" x2="-33.02" y2="93.98" width="0.1524" layer="91"/>
+<wire x1="-33.02" y1="88.9" x2="-43.18" y2="88.9" width="0.1524" layer="91"/>
+<wire x1="-43.18" y1="88.9" x2="-43.18" y2="81.28" width="0.1524" layer="91"/>
 <pinref part="C106" gate="G$1" pin="1"/>
-<label x="58.42" y="99.06" size="1.27" layer="95"/>
+<label x="-35.56" y="99.06" size="1.27" layer="95"/>
+<pinref part="IC4" gate="P" pin="VCC"/>
+<wire x1="-33.02" y1="88.9" x2="-33.02" y2="86.36" width="0.1524" layer="91"/>
+<junction x="-33.02" y="88.9"/>
 </segment>
 <segment>
 <pinref part="R33" gate="G$1" pin="1"/>
 <pinref part="P+51" gate="VCC" pin="VCC"/>
-<wire x1="119.38" y1="45.72" x2="111.76" y2="45.72" width="0.1524" layer="91"/>
-<wire x1="111.76" y1="45.72" x2="111.76" y2="55.88" width="0.1524" layer="91"/>
-<label x="109.22" y="48.26" size="1.27" layer="95" rot="R90"/>
+<wire x1="160.02" y1="81.28" x2="160.02" y2="91.44" width="0.1524" layer="91"/>
+<label x="154.94" y="96.52" size="1.27" layer="95"/>
+</segment>
+<segment>
+<pinref part="R80" gate="G$1" pin="2"/>
+<pinref part="P+5" gate="VCC" pin="VCC"/>
+<wire x1="10.16" y1="81.28" x2="10.16" y2="93.98" width="0.1524" layer="91"/>
+<label x="5.08" y="99.06" size="1.27" layer="95"/>
+</segment>
+<segment>
+<pinref part="R79" gate="G$1" pin="2"/>
+<pinref part="P+13" gate="VCC" pin="VCC"/>
+<wire x1="45.72" y1="81.28" x2="45.72" y2="93.98" width="0.1524" layer="91"/>
+<label x="43.18" y="99.06" size="1.27" layer="95"/>
+</segment>
+<segment>
+<pinref part="R34" gate="G$1" pin="2"/>
+<wire x1="149.86" y1="81.28" x2="149.86" y2="91.44" width="0.1524" layer="91"/>
+<pinref part="P+85" gate="VCC" pin="VCC"/>
+<label x="142.24" y="96.52" size="1.27" layer="95"/>
 </segment>
 </net>
-<net name="MKM_CONTROL" class="0">
+<net name="MKM_CONTROL_AVR_ENA" class="0">
 <segment>
-<pinref part="U11" gate="A" pin="CONTROL"/>
-<pinref part="R32" gate="G$1" pin="2"/>
-<wire x1="60.96" y1="33.02" x2="48.26" y2="33.02" width="0.1524" layer="91"/>
-<wire x1="48.26" y1="33.02" x2="48.26" y2="30.48" width="0.1524" layer="91"/>
-<wire x1="48.26" y1="33.02" x2="43.18" y2="33.02" width="0.1524" layer="91"/>
-<junction x="48.26" y="33.02"/>
-<label x="43.18" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="10.16" y1="53.34" x2="5.08" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="IC4" gate="A" pin="G"/>
+<wire x1="17.78" y1="53.34" x2="10.16" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="R80" gate="G$1" pin="1"/>
+<wire x1="10.16" y1="71.12" x2="10.16" y2="53.34" width="0.1524" layer="91"/>
+<junction x="10.16" y="53.34"/>
+<label x="5.08" y="53.34" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="MKM_AVR_SCK" class="0">
 <segment>
-<pinref part="U11" gate="A" pin="Z1"/>
-<wire x1="60.96" y1="38.1" x2="55.88" y2="38.1" width="0.1524" layer="91"/>
-<label x="55.88" y="38.1" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="IC4" gate="A" pin="A2"/>
+<wire x1="17.78" y1="63.5" x2="5.08" y2="63.5" width="0.1524" layer="91"/>
+<label x="5.08" y="63.5" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="MKM_FPGA_CS_N" class="0">
 <segment>
-<wire x1="60.96" y1="63.5" x2="55.88" y2="63.5" width="0.1524" layer="91"/>
-<label x="55.88" y="63.5" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U11" gate="A" pin="X0"/>
+<pinref part="IC4" gate="B" pin="A1"/>
+<wire x1="17.78" y1="38.1" x2="5.08" y2="38.1" width="0.1524" layer="91"/>
+<label x="5.08" y="38.1" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="MKM_AVR_CS_N" class="0">
 <segment>
-<wire x1="60.96" y1="60.96" x2="55.88" y2="60.96" width="0.1524" layer="91"/>
-<label x="55.88" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U11" gate="A" pin="X1"/>
+<pinref part="IC4" gate="A" pin="A1"/>
+<wire x1="17.78" y1="66.04" x2="5.08" y2="66.04" width="0.1524" layer="91"/>
+<label x="5.08" y="66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="MKM_FPGA_MOSI" class="0">
 <segment>
-<wire x1="60.96" y1="55.88" x2="55.88" y2="55.88" width="0.1524" layer="91"/>
-<label x="55.88" y="55.88" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U11" gate="A" pin="Y0"/>
+<pinref part="IC4" gate="B" pin="A3"/>
+<wire x1="17.78" y1="33.02" x2="5.08" y2="33.02" width="0.1524" layer="91"/>
+<label x="5.08" y="33.02" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="MKM_AVR_MOSI" class="0">
 <segment>
-<wire x1="60.96" y1="53.34" x2="55.88" y2="53.34" width="0.1524" layer="91"/>
-<label x="55.88" y="53.34" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U11" gate="A" pin="Y1"/>
+<pinref part="IC4" gate="A" pin="A3"/>
+<wire x1="17.78" y1="60.96" x2="5.08" y2="60.96" width="0.1524" layer="91"/>
+<label x="5.08" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="MKM_FPGA_MISO" class="0">
 <segment>
-<wire x1="60.96" y1="48.26" x2="55.88" y2="48.26" width="0.1524" layer="91"/>
-<label x="55.88" y="48.26" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U11" gate="A" pin="W0"/>
+<wire x1="43.18" y1="30.48" x2="48.26" y2="30.48" width="0.1524" layer="91"/>
+<label x="48.26" y="30.48" size="1.27" layer="95" xref="yes"/>
+<pinref part="IC4" gate="B" pin="Y4"/>
 </segment>
 </net>
 <net name="MKM_AVR_MISO" class="0">
 <segment>
-<wire x1="60.96" y1="45.72" x2="10.16" y2="45.72" width="0.1524" layer="91"/>
-<label x="5.08" y="45.72" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U11" gate="A" pin="W1"/>
+<wire x1="43.18" y1="58.42" x2="76.2" y2="58.42" width="0.1524" layer="91"/>
+<label x="81.28" y="58.42" size="1.27" layer="95" xref="yes"/>
 <pinref part="JP6" gate="A" pin="2"/>
-<wire x1="10.16" y1="45.72" x2="5.08" y2="45.72" width="0.1524" layer="91"/>
-<wire x1="10.16" y1="43.18" x2="10.16" y2="45.72" width="0.1524" layer="91"/>
-<junction x="10.16" y="45.72"/>
+<wire x1="76.2" y1="58.42" x2="81.28" y2="58.42" width="0.1524" layer="91"/>
+<wire x1="76.2" y1="53.34" x2="76.2" y2="58.42" width="0.1524" layer="91"/>
+<junction x="76.2" y="58.42"/>
+<pinref part="IC4" gate="A" pin="Y4"/>
 </segment>
 </net>
 <net name="MKM_FPGA_SCK" class="0">
 <segment>
-<wire x1="60.96" y1="40.64" x2="55.88" y2="40.64" width="0.1524" layer="91"/>
-<label x="55.88" y="40.64" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U11" gate="A" pin="Z0"/>
+<pinref part="IC4" gate="B" pin="A2"/>
+<wire x1="17.78" y1="35.56" x2="5.08" y2="35.56" width="0.1524" layer="91"/>
+<label x="5.08" y="35.56" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+</net>
+<net name="MKM_CONTROL_FPGA_DIS" class="0">
+<segment>
+<pinref part="IC4" gate="B" pin="G"/>
+<wire x1="17.78" y1="25.4" x2="10.16" y2="25.4" width="0.1524" layer="91"/>
+<pinref part="R81" gate="G$1" pin="1"/>
+<wire x1="10.16" y1="25.4" x2="10.16" y2="20.32" width="0.1524" layer="91"/>
+<wire x1="10.16" y1="25.4" x2="5.08" y2="25.4" width="0.1524" layer="91"/>
+<junction x="10.16" y="25.4"/>
+<label x="5.08" y="25.4" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 </nets>
@@ -42479,6 +42421,7 @@ MKM by installing this jumper</text>
 
 *) INIT_B is bi-directional open-drain, must be driven with MOSFET to ground</text>
 <text x="-63.5" y="20.32" size="1.778" layer="91">*) "Not DONE" LED, should be of red color</text>
+<text x="66.04" y="17.78" size="1.6764" layer="94">FPGA configuration interface</text>
 </plain>
 <instances>
 <instance part="U13" gate="B0" x="-111.76" y="132.08"/>
@@ -42855,6 +42798,7 @@ MKM by installing this jumper</text>
 <text x="22.86" y="78.74" size="1.778" layer="91">*) Temperature Sensor [NOT USED]</text>
 <text x="-35.56" y="78.74" size="1.778" layer="91">*) XADC [NOT USED]</text>
 <text x="-139.7" y="81.28" size="1.778" layer="91">*) Transceivers [NOT USED]</text>
+<text x="55.88" y="-60.96" size="2.54" layer="94">FPGA unused</text>
 </plain>
 <instances>
 <instance part="U13" gate="B216" x="-119.38" y="-12.7"/>
@@ -42941,6 +42885,7 @@ disabled through pull-up</text>
 enabled through pull-down</text>
 <text x="-111.76" y="-15.24" size="1.27" layer="91">Install this jumper to allow
 ARM to configure the FPGA</text>
+<text x="81.28" y="-68.58" size="1.778" layer="94">FPGA supporting components</text>
 </plain>
 <instances>
 <instance part="IC3" gate="A" x="71.12" y="16.51"/>
@@ -43320,6 +43265,7 @@ ARM to configure the FPGA</text>
 still must be powered</text>
 <text x="-7.62" y="68.58" size="1.778" layer="91">*) Completely unused banks
 still must be powered</text>
+<text x="68.58" y="-60.96" size="2.54" layer="94">FPGA unused banks</text>
 </plain>
 <instances>
 <instance part="U13" gate="B15" x="-109.22" y="5.08"/>
@@ -43403,6 +43349,7 @@ MRCC differential pairs)</text>
 <text x="-53.34" y="45.72" size="1.778" layer="91"><-- FMC_D[...] signals can be swapped</text>
 <text x="-58.42" y="-43.18" size="1.778" layer="91"><-- FMC_* control signals
       can be swapped</text>
+<text x="91.44" y="-73.66" size="2.54" layer="94">FPGA FMC interface</text>
 </plain>
 <instances>
 <instance part="U13" gate="B13" x="34.29" y="2.54"/>
@@ -43947,6 +43894,7 @@ MRCC differential pairs)</text>
 <text x="33.02" y="-33.02" size="1.778" layer="91">This is the 3V3 rail that powers
 both the FPGA and the ARM as well
 as various other components.</text>
+<text x="86.36" y="-68.58" size="1.9304" layer="94">FPGA voltage regulators</text>
 </plain>
 <instances>
 <instance part="FRAME19" gate="G$1" x="-129.54" y="-88.9"/>
@@ -44355,6 +44303,7 @@ MRCC pins.</text>
 <text x="-53.34" y="10.16" size="1.778" layer="91">NOTE: GPIO pins should be
 length matched to support
 I/O at XXX MHz (pavel)</text>
+<text x="86.36" y="-71.12" size="2.54" layer="94">FPGA GPIO</text>
 </plain>
 <instances>
 <instance part="U13" gate="B16" x="-93.98" y="-2.54"/>
@@ -44551,18 +44500,16 @@ I/O at XXX MHz (pavel)</text>
 <pinref part="P+73" gate="VCC" pin="VCC"/>
 </segment>
 </net>
-<net name="FPGA_GPIO_TAMPER_0" class="0">
+<net name="AVR_GPIO_FPGA_0" class="0">
 <segment>
-<pinref part="U13" gate="B16" pin="IO_0_16"/>
-<wire x1="-88.9" y1="50.8" x2="-58.42" y2="50.8" width="0.1524" layer="91"/>
-<label x="-58.42" y="50.8" size="1.27" layer="95" xref="yes"/>
+<wire x1="-88.9" y1="-27.94" x2="-58.42" y2="-27.94" width="0.1524" layer="91"/>
+<label x="-58.42" y="-27.94" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
-<net name="FPGA_GPIO_TAMPER_1" class="0">
+<net name="AVR_GPIO_FPGA_1" class="0">
 <segment>
-<pinref part="U13" gate="B16" pin="IO_L1P_T0_16"/>
-<wire x1="-88.9" y1="48.26" x2="-58.42" y2="48.26" width="0.1524" layer="91"/>
-<label x="-58.42" y="48.26" size="1.27" layer="95" xref="yes"/>
+<wire x1="-88.9" y1="-30.48" x2="-58.42" y2="-30.48" width="0.1524" layer="91"/>
+<label x="-58.42" y="-30.48" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="FPGA_IRQ_N_0" class="0">
@@ -44855,6 +44802,18 @@ I/O at XXX MHz (pavel)</text>
 <label x="-58.42" y="-5.08" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
+<net name="AVR_GPIO_FPGA_2" class="0">
+<segment>
+<wire x1="-88.9" y1="-33.02" x2="-58.42" y2="-33.02" width="0.1524" layer="91"/>
+<label x="-58.42" y="-33.02" size="1.27" layer="95" xref="yes"/>
+</segment>
+</net>
+<net name="AVR_GPIO_FPGA_3" class="0">
+<segment>
+<wire x1="-88.9" y1="-35.56" x2="-58.42" y2="-35.56" width="0.1524" layer="91"/>
+<label x="-58.42" y="-35.56" size="1.27" layer="95" xref="yes"/>
+</segment>
+</net>
 </nets>
 </sheet>
 <sheet>
@@ -44869,6 +44828,7 @@ MRCC differential pairs)</text>
 with each other and/or moved to different pins within their bank.</text>
 <text x="-15.24" y="17.78" size="1.778" layer="91"><-- FPGA_GPIO_* and FPGA_IRQ_N_* signals can be swapped</text>
 <text x="-58.42" y="60.96" size="1.778" layer="91"><-- Disable pull-ups on all pins during configuration</text>
+<text x="86.36" y="-68.58" size="2.54" layer="94">FPGA MKM interface</text>
 </plain>
 <instances>
 <instance part="U13" gate="B14" x="-81.28" y="0"/>
@@ -45014,6 +44974,7 @@ with each other and/or moved to different pins within their bank.</text>
 <text x="63.5" y="66.04" size="1.778" layer="91">*) Power - AUX</text>
 <text x="-15.24" y="66.04" size="1.778" layer="91">*) Power - CORE & BRAM</text>
 <text x="-91.44" y="68.58" size="1.778" layer="91">*) Ground Pins</text>
+<text x="83.82" y="-68.58" size="1.9304" layer="94">FPGA power and ground</text>
 </plain>
 <instances>
 <instance part="U13" gate="BGNDA" x="-101.6" y="-2.54"/>
@@ -45500,6 +45461,7 @@ with each other and/or moved to different pins within their bank.</text>
 
 <-- Try to place smaller caps next to FPGA balls</text>
 <text x="-50.8" y="-7.62" size="1.778" layer="91">*) Decoupling capacitors for VCCAUX</text>
+<text x="88.9" y="-68.58" size="1.4224" layer="94">FPGA CORE and AUX capacitors</text>
 </plain>
 <instances>
 <instance part="C123" gate="G$1" x="-88.9" y="63.5">
@@ -46169,6 +46131,7 @@ with each other and/or moved to different pins within their bank.</text>
 <-- Place one of four 47 uF caps on every side of the BGA package
 <-- Distribute six sets of caps among six FPGA I/O banks</text>
 <text x="-55.88" y="73.66" size="1.778" layer="91">*) Decoupling capacitors for VCCO</text>
+<text x="86.36" y="-71.12" size="1.6764" layer="94">FPGA VCCO bypass capacitors</text>
 </plain>
 <instances>
 <instance part="SUPPLY169" gate="GND" x="-93.98" y="50.8"/>
@@ -46813,6 +46776,7 @@ with each other and/or moved to different pins within their bank.</text>
 
 *) Minimal load current is 0A, but we still place
 load of 100 Ohms just in case (gives 10 mA)</text>
+<text x="83.82" y="-71.12" size="1.6764" layer="94">FPGA CORE voltage regulators</text>
 </plain>
 <instances>
 <instance part="FRAME25" gate="G$1" x="-132.08" y="-91.44"/>
@@ -47060,6 +47024,7 @@ should be tweaked after experiments
 <text x="-116.84" y="-43.18" size="1.778" layer="91">---></text>
 <text x="-2.54" y="-43.18" size="1.778" layer="91">---></text>
 <text x="33.02" y="-60.96" size="1.778" layer="91">*) "Power OK" LED, should be of green color</text>
+<text x="91.44" y="-71.12" size="1.9304" layer="94">FPGA power sequencing</text>
 </plain>
 <instances>
 <instance part="FRAME26" gate="G$1" x="-124.46" y="-91.44"/>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Commits mailing list