Update code, in the process improving the board design.

2021-11-18 15:48:29 -05:00 · 2021-11-18 15:48:29 -05:00 · 1921829c90
commit 1921829c90
parent a9a08a9684
4 changed files with 297 additions and 274 deletions
--- a/flight-panel-2021-11/Flight
+++ b/flight-panel-2021-11/Flight
--- a/flight-panel-2021-11/Flight
+++ b/flight-panel-2021-11/Flight
@ -849,47 +849,47 @@ design rules under a new name.</description>
 <attribute name="DESIGNER" value="annabunches@gmail.com" x="86.36" y="-1.27" size="1.778" layer="27" display="off"/>
 <attribute name="REV" value="1.0.0" x="86.36" y="-1.27" size="1.778" layer="27" display="off"/>
 </element>
-<element name="BUT3" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="31.75" smashed="yes">
+<element name="BTN3" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="31.75" smashed="yes">
 <attribute name="NAME" x="52.07" y="33.147" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="52.07" y="29.718" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="ENC1" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="58.42" y="6.35" smashed="yes" rot="R90">
+<element name="ENC1" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="11.43" smashed="yes">
-<attribute name="NAME" x="57.023" y="5.08" size="0.6096" layer="25" font="vector" ratio="20" rot="R90"/>
+<attribute name="NAME" x="52.07" y="12.827" size="0.6096" layer="25" font="vector" ratio="20"/>
-<attribute name="VALUE" x="60.452" y="5.08" size="0.6096" layer="27" font="vector" ratio="20" rot="R90"/>
+<attribute name="VALUE" x="52.07" y="9.398" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT4" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="35.56" smashed="yes">
+<element name="BTN4" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="35.56" smashed="yes">
 <attribute name="NAME" x="52.07" y="36.957" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="52.07" y="33.528" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT5" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="39.37" smashed="yes">
+<element name="BTN5" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="39.37" smashed="yes">
 <attribute name="NAME" x="52.07" y="40.767" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="52.07" y="37.338" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT6" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="43.18" smashed="yes">
+<element name="BTN6" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="43.18" smashed="yes">
 <attribute name="NAME" x="52.07" y="44.577" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="52.07" y="41.148" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT2" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="27.94" smashed="yes">
+<element name="BTN2" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="27.94" smashed="yes">
 <attribute name="NAME" x="52.07" y="29.337" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="52.07" y="25.908" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT1" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="24.13" smashed="yes">
+<element name="BTN1" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="24.13" smashed="yes">
 <attribute name="NAME" x="52.07" y="25.527" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="52.07" y="22.098" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="ENC2" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="58.42" y="15.24" smashed="yes" rot="R90">
+<element name="ENC2" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="17.78" smashed="yes">
-<attribute name="NAME" x="57.023" y="13.97" size="0.6096" layer="25" font="vector" ratio="20" rot="R90"/>
+<attribute name="NAME" x="52.07" y="19.177" size="0.6096" layer="25" font="vector" ratio="20"/>
-<attribute name="VALUE" x="60.452" y="13.97" size="0.6096" layer="27" font="vector" ratio="20" rot="R90"/>
+<attribute name="VALUE" x="52.07" y="15.748" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT7" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="46.99" smashed="yes">
+<element name="BTN7" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="46.99" smashed="yes">
 <attribute name="NAME" x="52.07" y="48.387" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="52.07" y="44.958" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT8" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="50.8" smashed="yes">
+<element name="BTN8" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="50.8" smashed="yes">
 <attribute name="NAME" x="52.07" y="52.197" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="52.07" y="48.768" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT9" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="54.61" smashed="yes">
+<element name="BTN9" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="53.34" y="54.61" smashed="yes">
 <attribute name="NAME" x="52.07" y="56.007" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="52.07" y="52.578" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
@ -901,55 +901,55 @@ design rules under a new name.</description>
 <attribute name="NAME" x="0" y="44.45" size="1.016" layer="25"/>
 <attribute name="VALUE" x="19.05" y="41.91" size="0.762" layer="27"/>
 </element>
-<element name="BUT10" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="8.89" smashed="yes">
+<element name="BTN10" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="8.89" smashed="yes">
 <attribute name="NAME" x="41.91" y="10.287" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="41.91" y="6.858" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT12" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="16.51" smashed="yes">
+<element name="BTN12" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="16.51" smashed="yes">
 <attribute name="NAME" x="41.91" y="17.907" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="41.91" y="14.478" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT13" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="20.32" smashed="yes">
+<element name="BTN13" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="20.32" smashed="yes">
 <attribute name="NAME" x="41.91" y="21.717" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="41.91" y="18.288" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT14" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="24.13" smashed="yes">
+<element name="BTN14" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="24.13" smashed="yes">
 <attribute name="NAME" x="41.91" y="25.527" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="41.91" y="22.098" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT15" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="27.94" smashed="yes">
+<element name="BTN15" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="27.94" smashed="yes">
 <attribute name="NAME" x="41.91" y="29.337" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="41.91" y="25.908" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT16" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="31.75" smashed="yes">
+<element name="BTN16" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="31.75" smashed="yes">
 <attribute name="NAME" x="41.91" y="33.147" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="41.91" y="29.718" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT17" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="35.56" smashed="yes">
+<element name="BTN17" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="35.56" smashed="yes">
 <attribute name="NAME" x="41.91" y="36.957" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="41.91" y="33.528" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT18" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="39.37" smashed="yes">
+<element name="BTN18" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="39.37" smashed="yes">
 <attribute name="NAME" x="41.91" y="40.767" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="41.91" y="37.338" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT19" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="43.18" smashed="yes">
+<element name="BTN19" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="43.18" smashed="yes">
 <attribute name="NAME" x="41.91" y="44.577" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="41.91" y="41.148" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT20" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="46.99" smashed="yes">
+<element name="BTN20" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="46.99" smashed="yes">
 <attribute name="NAME" x="41.91" y="48.387" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="41.91" y="44.958" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="KBUT1" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="5.08" y="50.8" smashed="yes">
+<element name="KBTN1" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="5.08" y="50.8" smashed="yes">
 <attribute name="NAME" x="3.81" y="52.197" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="3.81" y="48.768" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="KBUT2" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="5.08" y="54.61" smashed="yes">
+<element name="KBTN2" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="5.08" y="54.61" smashed="yes">
 <attribute name="NAME" x="3.81" y="56.007" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="3.81" y="52.578" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="KBUT3" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="5.08" y="58.42" smashed="yes">
+<element name="KBTN3" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="5.08" y="58.42" smashed="yes">
 <attribute name="NAME" x="3.81" y="59.817" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="3.81" y="56.388" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
@ -957,15 +957,15 @@ design rules under a new name.</description>
 <attribute name="NAME" x="3.81" y="48.387" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="3.81" y="44.958" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT21" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="50.8" smashed="yes">
+<element name="BTN21" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="50.8" smashed="yes">
 <attribute name="NAME" x="41.91" y="52.197" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="41.91" y="48.768" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT22" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="54.61" smashed="yes">
+<element name="BTN22" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="54.61" smashed="yes">
 <attribute name="NAME" x="41.91" y="56.007" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="41.91" y="52.578" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
-<element name="BUT11" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="12.7" smashed="yes">
+<element name="BTN11" library="SparkFun-Connectors" package="1X03_LOCK" value="" x="43.18" y="12.7" smashed="yes">
 <attribute name="NAME" x="41.91" y="14.097" size="0.6096" layer="25" font="vector" ratio="20"/>
 <attribute name="VALUE" x="41.91" y="10.668" size="0.6096" layer="27" font="vector" ratio="20"/>
 </element>
@ -974,16 +974,12 @@ design rules under a new name.</description>
 <signal name="GND">
 <wire x1="26.67" y1="3.81" x2="26.67" y2="26.67" width="0.1524" layer="16"/>
 <wire x1="26.67" y1="3.81" x2="27.94" y2="2.54" width="0.1524" layer="16"/>
 <wire x1="52.07" y1="2.54" x2="54.61" y2="5.08" width="0.1524" layer="16"/>
 <wire x1="54.61" y1="5.08" x2="54.61" y2="8.89" width="0.1524" layer="16"/>
 <wire x1="54.61" y1="8.89" x2="57.15" y2="11.43" width="0.1524" layer="16"/>
 <wire x1="27.94" y1="2.54" x2="48.26" y2="2.54" width="0.1524" layer="16"/>
 <wire x1="48.26" y1="2.54" x2="52.07" y2="2.54" width="0.1524" layer="16"/>
 <wire x1="11.43" y1="57.15" x2="11.43" y2="48.26" width="0.1524" layer="16"/>
 <wire x1="10.287" y1="47.117" x2="11.43" y2="48.26" width="0.1524" layer="16"/>
 <wire x1="55.88" y1="59.8578" x2="14.1378" y2="59.8578" width="0.1524" layer="16"/>
 <wire x1="14.1378" y1="59.8578" x2="11.43" y2="57.15" width="0.1524" layer="16"/>
-<contactref element="BUT9" pad="3"/>
+<contactref element="BTN9" pad="3"/>
 <contactref element="ARDUINO" pad="GND@0"/>
 <contactref element="MUX" pad="17"/>
 <wire x1="20.32" y1="27.94" x2="22.86" y2="27.94" width="0.1524" layer="16"/>
@ -994,19 +990,19 @@ design rules under a new name.</description>
 <wire x1="58.42" y1="57.3178" x2="55.88" y2="59.8578" width="0.1524" layer="16"/>
 <wire x1="58.42" y1="54.737" x2="58.42" y2="57.3178" width="0.1524" layer="16"/>
 <contactref element="KEY" pad="3"/>
-<contactref element="BUT22" pad="3"/>
+<contactref element="BTN22" pad="3"/>
-<contactref element="BUT21" pad="3"/>
+<contactref element="BTN21" pad="3"/>
-<contactref element="BUT20" pad="3"/>
+<contactref element="BTN20" pad="3"/>
-<contactref element="BUT19" pad="3"/>
+<contactref element="BTN19" pad="3"/>
-<contactref element="BUT18" pad="3"/>
+<contactref element="BTN18" pad="3"/>
-<contactref element="BUT17" pad="3"/>
+<contactref element="BTN17" pad="3"/>
-<contactref element="BUT16" pad="3"/>
+<contactref element="BTN16" pad="3"/>
-<contactref element="BUT15" pad="3"/>
+<contactref element="BTN15" pad="3"/>
-<contactref element="BUT14" pad="3"/>
+<contactref element="BTN14" pad="3"/>
-<contactref element="BUT13" pad="3"/>
+<contactref element="BTN13" pad="3"/>
-<contactref element="BUT12" pad="3"/>
+<contactref element="BTN12" pad="3"/>
-<contactref element="BUT11" pad="3"/>
+<contactref element="BTN11" pad="3"/>
-<contactref element="BUT10" pad="3"/>
+<contactref element="BTN10" pad="3"/>
 <wire x1="48.26" y1="2.54" x2="48.26" y2="9.017" width="0.1524" layer="16"/>
 <wire x1="48.26" y1="9.017" x2="48.26" y2="12.827" width="0.1524" layer="16"/>
 <wire x1="48.26" y1="12.827" x2="48.26" y2="16.637" width="0.1524" layer="16"/>
@ -1021,50 +1017,50 @@ design rules under a new name.</description>
 <wire x1="48.26" y1="47.117" x2="48.26" y2="50.927" width="0.1524" layer="16"/>
 <wire x1="48.26" y1="50.927" x2="48.26" y2="54.737" width="0.1524" layer="16"/>
 <wire x1="10.16" y1="47.117" x2="10.287" y2="47.117" width="0.1524" layer="16"/>
-<contactref element="BUT8" pad="3"/>
+<contactref element="BTN8" pad="3"/>
 <contactref element="ENC2" pad="3"/>
 <contactref element="ENC1" pad="3"/>
-<contactref element="BUT1" pad="3"/>
+<contactref element="BTN1" pad="3"/>
-<contactref element="BUT2" pad="3"/>
+<contactref element="BTN2" pad="3"/>
-<contactref element="BUT3" pad="3"/>
+<contactref element="BTN3" pad="3"/>
-<contactref element="BUT4" pad="3"/>
+<contactref element="BTN4" pad="3"/>
-<contactref element="BUT5" pad="3"/>
+<contactref element="BTN5" pad="3"/>
-<contactref element="BUT6" pad="3"/>
+<contactref element="BTN6" pad="3"/>
-<contactref element="BUT7" pad="3"/>
+<contactref element="BTN7" pad="3"/>
 <wire x1="58.42" y1="47.117" x2="58.42" y2="50.927" width="0.1524" layer="16"/>
 <wire x1="58.42" y1="50.927" x2="58.42" y2="54.737" width="0.1524" layer="16"/>
 <wire x1="57.15" y1="11.43" x2="58.293" y2="11.43" width="0.1524" layer="16"/>
 <wire x1="58.293" y1="11.43" x2="60.96" y2="14.097" width="0.1524" layer="16"/>
 <wire x1="60.96" y1="14.097" x2="60.96" y2="17.78" width="0.1524" layer="16"/>
 <wire x1="60.96" y1="17.78" x2="58.42" y2="20.32" width="0.1524" layer="16"/>
 <wire x1="58.42" y1="20.32" x2="58.293" y2="20.32" width="0.1524" layer="16"/>
 <wire x1="58.293" y1="20.32" x2="58.42" y2="20.447" width="0.1524" layer="16"/>
 <wire x1="58.42" y1="20.447" x2="58.42" y2="24.257" width="0.1524" layer="16"/>
 <wire x1="58.42" y1="24.257" x2="58.42" y2="28.067" width="0.1524" layer="16"/>
 <wire x1="58.42" y1="28.067" x2="58.42" y2="31.877" width="0.1524" layer="16"/>
 <wire x1="58.42" y1="31.877" x2="58.42" y2="35.687" width="0.1524" layer="16"/>
 <wire x1="58.42" y1="35.687" x2="58.42" y2="39.497" width="0.1524" layer="16"/>
 <wire x1="58.42" y1="39.497" x2="58.42" y2="43.307" width="0.1524" layer="16"/>
 <wire x1="58.42" y1="43.307" x2="58.42" y2="47.117" width="0.1524" layer="16"/>
 <wire x1="55.88" y1="2.54" x2="58.42" y2="5.08" width="0.1524" layer="16"/>
 <wire x1="58.42" y1="5.08" x2="58.42" y2="11.557" width="0.1524" layer="16"/>
 <wire x1="48.26" y1="2.54" x2="55.88" y2="2.54" width="0.1524" layer="16"/>
 <wire x1="58.42" y1="11.557" x2="58.42" y2="17.907" width="0.1524" layer="16"/>
 <wire x1="58.42" y1="17.907" x2="58.42" y2="24.257" width="0.1524" layer="16"/>
 </signal>
 <signal name="N$11">
 <contactref element="ARDUINO" pad="D4"/>
 <contactref element="ENC2" pad="1"/>
-<wire x1="58.293" y1="15.24" x2="59.563" y2="16.51" width="0.1524" layer="1"/>
+<wire x1="72.39" y1="16.51" x2="71.12" y2="15.24" width="0.1524" layer="1"/>
-<wire x1="59.563" y1="16.51" x2="72.39" y2="16.51" width="0.1524" layer="1"/>
+<wire x1="71.12" y1="15.24" x2="54.61" y2="15.24" width="0.1524" layer="1"/>
 <wire x1="54.61" y1="15.24" x2="53.34" y2="16.51" width="0.1524" layer="1"/>
 <wire x1="53.34" y1="16.51" x2="53.34" y2="17.907" width="0.1524" layer="1"/>
 </signal>
 <signal name="N$13">
 <contactref element="ARDUINO" pad="D6"/>
-<contactref element="BUT1" pad="1"/>
+<contactref element="BTN1" pad="1"/>
-<wire x1="72.39" y1="21.59" x2="59.69" y2="21.59" width="0.1524" layer="1"/>
+<wire x1="68.489284375" y1="22.225" x2="54.102" y2="22.225" width="0.1524" layer="1"/>
 <wire x1="59.69" y1="21.59" x2="59.055" y2="22.225" width="0.1524" layer="1"/>
 <wire x1="59.055" y1="22.225" x2="54.102" y2="22.225" width="0.1524" layer="1"/>
 <wire x1="54.102" y1="22.225" x2="53.34" y2="22.987" width="0.1524" layer="1"/>
 <wire x1="53.34" y1="22.987" x2="53.34" y2="24.257" width="0.1524" layer="1"/>
 <wire x1="69.124284375" y1="21.59" x2="68.489284375" y2="22.225" width="0.1524" layer="1"/>
 <wire x1="72.39" y1="21.59" x2="69.124284375" y2="21.59" width="0.1524" layer="1"/>
 </signal>
 <signal name="N$14">
 <contactref element="ARDUINO" pad="D7"/>
-<contactref element="BUT2" pad="1"/>
+<contactref element="BTN2" pad="1"/>
 <wire x1="72.644" y1="24.13" x2="71.374" y2="25.4" width="0.1524" layer="1"/>
 <wire x1="60.452" y1="25.4" x2="59.817" y2="26.035" width="0.1524" layer="1"/>
 <wire x1="59.817" y1="26.035" x2="54.229" y2="26.035" width="0.1524" layer="1"/>
@ -1074,7 +1070,7 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$15">
 <contactref element="ARDUINO" pad="D8"/>
-<contactref element="BUT3" pad="1"/>
+<contactref element="BTN3" pad="1"/>
 <wire x1="72.39" y1="28.194" x2="71.374" y2="29.21" width="0.1524" layer="1"/>
 <wire x1="60.452" y1="29.21" x2="59.817" y2="29.845" width="0.1524" layer="1"/>
 <wire x1="53.34" y1="30.48" x2="53.34" y2="31.877" width="0.1524" layer="1"/>
@ -1084,15 +1080,16 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$16">
 <contactref element="ARDUINO" pad="D9"/>
-<contactref element="BUT4" pad="1"/>
+<contactref element="BTN4" pad="1"/>
 <wire x1="69.723" y1="33.655" x2="54.61" y2="33.655" width="0.1524" layer="1"/>
 <wire x1="54.61" y1="33.655" x2="53.34" y2="34.925" width="0.1524" layer="1"/>
 <wire x1="53.34" y1="34.925" x2="53.34" y2="35.687" width="0.1524" layer="1"/>
-<wire x1="72.644" y1="30.734" x2="69.723" y2="33.655" width="0.1524" layer="1"/>
+<wire x1="72.644" y1="30.734" x2="64.516" y2="30.734" width="0.1524" layer="1"/>
 <wire x1="64.516" y1="30.734" x2="61.595" y2="33.655" width="0.1524" layer="1"/>
 <wire x1="61.595" y1="33.655" x2="54.61" y2="33.655" width="0.1524" layer="1"/>
 </signal>
 <signal name="N$17">
 <contactref element="ARDUINO" pad="D10"/>
-<contactref element="BUT5" pad="1"/>
+<contactref element="BTN5" pad="1"/>
 <wire x1="60.579" y1="37.465" x2="54.61" y2="37.465" width="0.1524" layer="1"/>
 <wire x1="54.61" y1="37.465" x2="53.34" y2="38.735" width="0.1524" layer="1"/>
 <wire x1="53.34" y1="38.735" x2="53.34" y2="39.497" width="0.1524" layer="1"/>
@ -1101,7 +1098,7 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$18">
 <contactref element="ARDUINO" pad="D11"/>
-<contactref element="BUT6" pad="1"/>
+<contactref element="BTN6" pad="1"/>
 <wire x1="59.563" y1="41.275" x2="54.61" y2="41.275" width="0.1524" layer="1"/>
 <wire x1="54.61" y1="41.275" x2="53.34" y2="42.545" width="0.1524" layer="1"/>
 <wire x1="53.34" y1="42.545" x2="53.34" y2="43.307" width="0.1524" layer="1"/>
@ -1110,7 +1107,7 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$19">
 <contactref element="ARDUINO" pad="D12"/>
-<contactref element="BUT7" pad="1"/>
+<contactref element="BTN7" pad="1"/>
 <wire x1="60.96" y1="41.91" x2="60.96" y2="43.18" width="0.1524" layer="1"/>
 <wire x1="60.96" y1="41.91" x2="64.516" y2="38.354" width="0.1524" layer="1"/>
 <wire x1="64.516" y1="38.354" x2="72.39" y2="38.354" width="0.1524" layer="1"/>
@ -1121,13 +1118,11 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$20">
 <contactref element="ARDUINO" pad="D13"/>
-<contactref element="BUT8" pad="1"/>
+<contactref element="BTN8" pad="1"/>
 <wire x1="70.866" y1="40.894" x2="72.644" y2="40.894" width="0.1524" layer="1"/>
 <wire x1="70.866" y1="40.894" x2="62.738" y2="49.022" width="0.1524" layer="1"/>
-<wire x1="53.34" y1="50.927" x2="57.15" y2="50.927" width="0.1524" layer="1"/>
+<wire x1="55.245" y1="49.022" x2="53.34" y2="50.927" width="0.1524" layer="1"/>
-<wire x1="57.15" y1="50.927" x2="57.15" y2="49.53" width="0.1524" layer="1"/>
+<wire x1="62.738" y1="49.022" x2="55.245" y2="49.022" width="0.1524" layer="1"/>
 <wire x1="57.658" y1="49.022" x2="57.15" y2="49.53" width="0.1524" layer="1"/>
 <wire x1="62.738" y1="49.022" x2="57.658" y2="49.022" width="0.1524" layer="1"/>
 </signal>
 <signal name="COM">
 <contactref element="ARDUINO" pad="A1"/>
@ -1148,7 +1143,7 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$24">
 <contactref element="MUX" pad="14"/>
-<contactref element="KBUT1" pad="1"/>
+<contactref element="KBTN1" pad="1"/>
 <wire x1="3.175" y1="48.26" x2="3.175" y2="46.355" width="0.1524" layer="1"/>
 <wire x1="3.175" y1="46.355" x2="4.699" y2="44.831" width="0.1524" layer="1"/>
 <wire x1="4.699" y1="44.831" x2="4.699" y2="41.402" width="0.1524" layer="1"/>
@ -1158,7 +1153,7 @@ design rules under a new name.</description>
 <wire x1="3.81" y1="49.657" x2="5.08" y2="50.927" width="0.1524" layer="1"/>
 </signal>
 <signal name="N$25">
-<contactref element="KBUT2" pad="1"/>
+<contactref element="KBTN2" pad="1"/>
 <contactref element="MUX" pad="15"/>
 <wire x1="1.143" y1="40.64" x2="1.27" y2="40.64" width="0.1524" layer="1"/>
 <wire x1="5.08" y1="54.737" x2="4.953" y2="54.61" width="0.1524" layer="1"/>
@ -1170,7 +1165,7 @@ design rules under a new name.</description>
 <wire x1="1.27" y1="53.34" x2="2.54" y2="54.61" width="0.1524" layer="1"/>
 </signal>
 <signal name="N$26">
-<contactref element="KBUT3" pad="1"/>
+<contactref element="KBTN3" pad="1"/>
 <contactref element="MUX" pad="16"/>
 <wire x1="1.397" y1="43.18" x2="0.127" y2="44.45" width="0.1524" layer="1"/>
 <wire x1="0.127" y1="44.45" x2="0" y2="44.45" width="0.1524" layer="1"/>
@ -1180,7 +1175,7 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$22">
 <contactref element="MUX" pad="13"/>
-<contactref element="BUT22" pad="1"/>
+<contactref element="BTN22" pad="1"/>
 <wire x1="12.7" y1="55.88" x2="15.24" y2="58.42" width="0.1524" layer="1"/>
 <wire x1="15.24" y1="58.42" x2="35.56" y2="58.42" width="0.1524" layer="1"/>
 <wire x1="35.56" y1="58.42" x2="36.83" y2="57.15" width="0.1524" layer="1"/>
@ -1192,21 +1187,21 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$23">
 <contactref element="MUX" pad="12"/>
-<contactref element="BUT21" pad="1"/>
+<contactref element="BTN21" pad="1"/>
 <wire x1="38.1" y1="50.927" x2="43.18" y2="50.927" width="0.1524" layer="1"/>
 <wire x1="1.397" y1="33.02" x2="12.7" y2="44.323" width="0.1524" layer="1"/>
 <wire x1="12.7" y1="44.323" x2="12.7" y2="44.45" width="0.1524" layer="1"/>
 <wire x1="12.7" y1="44.45" x2="13.97" y2="45.72" width="0.1524" layer="1"/>
 <wire x1="13.97" y1="45.72" x2="13.97" y2="55.88" width="0.1524" layer="1"/>
 <wire x1="13.97" y1="55.88" x2="15.24" y2="57.15" width="0.1524" layer="1"/>
-<wire x1="15.24" y1="57.15" x2="35.56" y2="57.15" width="0.1524" layer="1"/>
+<wire x1="15.24" y1="57.15" x2="34.29" y2="57.15" width="0.1524" layer="1"/>
 <wire x1="35.56" y1="57.15" x2="35.56" y2="55.88" width="0.1524" layer="1"/>
 <wire x1="35.56" y1="55.88" x2="38.1" y2="53.34" width="0.1524" layer="1"/>
 <wire x1="38.1" y1="53.34" x2="38.1" y2="50.927" width="0.1524" layer="1"/>
 <wire x1="35.56" y1="55.88" x2="34.29" y2="57.15" width="0.1524" layer="1"/>
 </signal>
 <signal name="N$27">
 <contactref element="MUX" pad="11"/>
-<contactref element="BUT20" pad="1"/>
+<contactref element="BTN20" pad="1"/>
 <wire x1="1.143" y1="30.48" x2="15.24" y2="44.577" width="0.1524" layer="1"/>
 <wire x1="15.24" y1="54.61" x2="16.51" y2="55.88" width="0.1524" layer="1"/>
 <wire x1="16.51" y1="55.88" x2="33.02" y2="55.88" width="0.1524" layer="1"/>
@ -1218,7 +1213,7 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$28">
 <contactref element="MUX" pad="10"/>
-<contactref element="BUT19" pad="1"/>
+<contactref element="BTN19" pad="1"/>
 <wire x1="1.397" y1="27.94" x2="16.51" y2="43.053" width="0.1524" layer="1"/>
 <wire x1="16.51" y1="43.053" x2="16.51" y2="53.34" width="0.1524" layer="1"/>
 <wire x1="16.51" y1="53.34" x2="17.78" y2="54.61" width="0.1524" layer="1"/>
@ -1230,7 +1225,7 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$29">
 <contactref element="MUX" pad="9"/>
-<contactref element="BUT18" pad="1"/>
+<contactref element="BTN18" pad="1"/>
 <wire x1="38.1" y1="39.497" x2="43.18" y2="39.497" width="0.1524" layer="1"/>
 <wire x1="1.143" y1="25.4" x2="17.78" y2="42.037" width="0.1524" layer="1"/>
 <wire x1="17.78" y1="42.037" x2="17.78" y2="52.07" width="0.1524" layer="1"/>
@ -1242,7 +1237,7 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$30">
 <contactref element="MUX" pad="8"/>
-<contactref element="BUT17" pad="1"/>
+<contactref element="BTN17" pad="1"/>
 <wire x1="38.1" y1="35.687" x2="43.18" y2="35.687" width="0.1524" layer="1"/>
 <wire x1="1.397" y1="22.86" x2="1.397" y2="22.987" width="0.1524" layer="1"/>
 <wire x1="1.397" y1="22.987" x2="19.05" y2="40.64" width="0.1524" layer="1"/>
@ -1255,7 +1250,7 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$31">
 <contactref element="MUX" pad="7"/>
-<contactref element="BUT16" pad="1"/>
+<contactref element="BTN16" pad="1"/>
 <wire x1="20.32" y1="39.497" x2="20.32" y2="49.53" width="0.1524" layer="1"/>
 <wire x1="20.32" y1="49.53" x2="21.59" y2="50.8" width="0.1524" layer="1"/>
 <wire x1="21.59" y1="50.8" x2="27.94" y2="50.8" width="0.1524" layer="1"/>
@ -1268,7 +1263,7 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$32">
 <contactref element="MUX" pad="6"/>
-<contactref element="BUT15" pad="1"/>
+<contactref element="BTN15" pad="1"/>
 <wire x1="1.397" y1="17.78" x2="3.81" y2="20.193" width="0.1524" layer="16"/>
 <wire x1="3.81" y1="20.193" x2="3.81" y2="36.83" width="0.1524" layer="16"/>
 <wire x1="14.605" y1="47.625" x2="14.605" y2="55.372" width="0.1524" layer="16"/>
@ -1283,7 +1278,7 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$33">
 <contactref element="MUX" pad="5"/>
-<contactref element="BUT14" pad="1"/>
+<contactref element="BTN14" pad="1"/>
 <wire x1="5.08" y1="35.56" x2="5.08" y2="19.05" width="0.1524" layer="16"/>
 <wire x1="15.748" y1="46.228" x2="5.08" y2="35.56" width="0.1524" layer="16"/>
 <wire x1="32.258" y1="55.118" x2="36.195" y2="51.181" width="0.1524" layer="16"/>
@ -1298,7 +1293,7 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$34">
 <contactref element="MUX" pad="4"/>
-<contactref element="BUT13" pad="1"/>
+<contactref element="BTN13" pad="1"/>
 <wire x1="1.397" y1="12.7" x2="6.35" y2="17.653" width="0.1524" layer="16"/>
 <wire x1="6.35" y1="34.417" x2="17.145" y2="45.212" width="0.1524" layer="16"/>
 <wire x1="17.145" y1="45.212" x2="17.145" y2="52.832" width="0.1524" layer="16"/>
@ -1312,7 +1307,7 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$35">
 <contactref element="MUX" pad="3"/>
-<contactref element="BUT12" pad="1"/>
+<contactref element="BTN12" pad="1"/>
 <wire x1="7.62" y1="16.637" x2="7.62" y2="33.02" width="0.1524" layer="16"/>
 <wire x1="7.62" y1="33.02" x2="18.415" y2="43.815" width="0.1524" layer="16"/>
 <wire x1="18.415" y1="43.815" x2="18.415" y2="51.689" width="0.1524" layer="16"/>
@ -1326,7 +1321,7 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$36">
 <contactref element="MUX" pad="1"/>
-<contactref element="BUT10" pad="1"/>
+<contactref element="BTN10" pad="1"/>
 <wire x1="10.16" y1="14.097" x2="10.16" y2="30.48" width="0.1524" layer="16"/>
 <wire x1="10.16" y1="30.48" x2="21.209" y2="41.529" width="0.1524" layer="16"/>
 <wire x1="21.209" y1="49.276" x2="22.098" y2="50.165" width="0.1524" layer="16"/>
@ -1341,8 +1336,11 @@ design rules under a new name.</description>
 <signal name="N$37">
 <contactref element="ARDUINO" pad="D5"/>
 <contactref element="ENC2" pad="2"/>
-<wire x1="71.374" y1="17.78" x2="72.644" y2="19.05" width="0.1524" layer="1"/>
+<wire x1="72.644" y1="19.05" x2="72.39" y2="19.05" width="0.1524" layer="1"/>
-<wire x1="58.547" y1="17.78" x2="71.374" y2="17.78" width="0.1524" layer="1"/>
+<wire x1="72.39" y1="19.05" x2="71.12" y2="20.32" width="0.1524" layer="1"/>
 <wire x1="71.12" y1="20.32" x2="57.15" y2="20.32" width="0.1524" layer="1"/>
 <wire x1="57.15" y1="20.32" x2="55.88" y2="19.05" width="0.1524" layer="1"/>
 <wire x1="55.88" y1="19.05" x2="55.88" y2="17.653" width="0.1524" layer="1"/>
 </signal>
 <signal name="S0">
 <contactref element="ARDUINO" pad="A5"/>
@ -1369,7 +1367,7 @@ design rules under a new name.</description>
 </signal>
 <signal name="N$8">
 <contactref element="MUX" pad="2"/>
-<contactref element="BUT11" pad="1"/>
+<contactref element="BTN11" pad="1"/>
 <wire x1="1.397" y1="7.62" x2="8.89" y2="15.113" width="0.1524" layer="16"/>
 <wire x1="8.89" y1="15.113" x2="8.89" y2="31.75" width="0.1524" layer="16"/>
 <wire x1="8.89" y1="31.75" x2="19.812" y2="42.672" width="0.1524" layer="16"/>
@ -1392,9 +1390,9 @@ design rules under a new name.</description>
 <signal name="N$4">
 <contactref element="KEY" pad="1"/>
 <wire x1="5.08" y1="47.117" x2="6.2484" y2="48.2854" width="0.1524" layer="1"/>
-<contactref element="KBUT3" pad="3"/>
+<contactref element="KBTN3" pad="3"/>
-<contactref element="KBUT1" pad="3"/>
+<contactref element="KBTN1" pad="3"/>
-<contactref element="KBUT2" pad="3"/>
+<contactref element="KBTN2" pad="3"/>
 <wire x1="10.16" y1="49.53" x2="10.16" y2="50.927" width="0.1524" layer="1"/>
 <wire x1="10.16" y1="50.927" x2="10.16" y2="54.737" width="0.1524" layer="1"/>
 <wire x1="10.16" y1="54.737" x2="10.16" y2="58.547" width="0.1524" layer="1"/>
@ -1403,7 +1401,7 @@ design rules under a new name.</description>
 </signal>
 <signal name="A0">
 <contactref element="ARDUINO" pad="A0"/>
-<contactref element="BUT9" pad="1"/>
+<contactref element="BTN9" pad="1"/>
 <wire x1="23.876" y1="19.05" x2="27.94" y2="19.05" width="0.1524" layer="1"/>
 <wire x1="27.94" y1="19.05" x2="29.21" y2="17.78" width="0.1524" layer="1"/>
 <wire x1="29.21" y1="17.78" x2="29.21" y2="5.08" width="0.1524" layer="1"/>
@ -1417,14 +1415,17 @@ design rules under a new name.</description>
 <signal name="N$1">
 <contactref element="ENC1" pad="1"/>
 <contactref element="ARDUINO" pad="D2"/>
-<wire x1="58.293" y1="6.35" x2="63.373" y2="11.43" width="0.1524" layer="1"/>
+<wire x1="63.5" y1="11.43" x2="72.39" y2="11.43" width="0.1524" layer="1"/>
-<wire x1="63.373" y1="11.43" x2="72.39" y2="11.43" width="0.1524" layer="1"/>
+<wire x1="63.5" y1="11.43" x2="60.96" y2="8.89" width="0.1524" layer="1"/>
 <wire x1="60.96" y1="8.89" x2="54.61" y2="8.89" width="0.1524" layer="1"/>
 <wire x1="54.61" y1="8.89" x2="53.34" y2="10.16" width="0.1524" layer="1"/>
 <wire x1="53.34" y1="10.16" x2="53.34" y2="11.557" width="0.1524" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="ENC1" pad="2"/>
 <contactref element="ARDUINO" pad="D3"/>
-<wire x1="72.644" y1="13.97" x2="63.627" y2="13.97" width="0.1524" layer="1"/>
+<wire x1="58.547" y1="13.97" x2="55.88" y2="11.303" width="0.1524" layer="1"/>
-<wire x1="63.627" y1="13.97" x2="58.547" y2="8.89" width="0.1524" layer="1"/>
+<wire x1="72.644" y1="13.97" x2="58.547" y2="13.97" width="0.1524" layer="1"/>
 </signal>
 </signals>
 <mfgpreviewcolors>
--- a/flight-panel-2021-11/Flight
+++ b/flight-panel-2021-11/Flight
@ -2316,36 +2316,36 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <attribute name="DESIGNER" value="annabunches@gmail.com"/>
 <attribute name="REV" value="1.0.0"/>
 </part>
-<part name="BUT3" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN3" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT4" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN4" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT5" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN5" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT6" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN6" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT2" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN2" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT1" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN1" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
 <part name="ENC2" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
 <part name="ENC1" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT7" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN7" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT8" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN8" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT9" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN9" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
 <part name="ARDUINO" library="SparkFun-Boards" deviceset="ARDUINO_UNO_R3_SHIELD" device="UNO_R3_SHIELD_LOCK"/>
 <part name="MUX" library="CD74HC4067-breakout" deviceset="CD74HC4067-BREAKOUT" device=""/>
-<part name="BUT10" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN10" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT12" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN12" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT13" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN13" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT14" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN14" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT15" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN15" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT16" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN16" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT17" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN17" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT18" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN18" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT19" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN19" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT20" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN20" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="KBUT1" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="KBTN1" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="KBUT2" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="KBTN2" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="KBUT3" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="KBTN3" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
 <part name="KEY" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT21" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN21" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT22" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN22" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
-<part name="BUT11" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
+<part name="BTN11" library="SparkFun-Connectors" deviceset="CONN_03" device="LOCK"/>
 </parts>
 <sheets>
 <sheet>
@ -2360,27 +2360,27 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <attribute name="DESIGNER" x="170.434" y="11.176" size="2.7432" layer="94" font="vector"/>
 <attribute name="REV" x="236.22" y="6.604" size="2.7432" layer="94" font="vector"/>
 </instance>
-<instance part="BUT3" gate="J$1" x="218.44" y="134.62" smashed="yes" rot="R180">
+<instance part="BTN3" gate="J$1" x="218.44" y="134.62" smashed="yes" rot="R180">
 <attribute name="VALUE" x="220.98" y="141.986" size="1.778" layer="96" font="vector" rot="R180"/>
 <attribute name="NAME" x="220.98" y="129.032" size="1.778" layer="95" font="vector" rot="R180"/>
 </instance>
-<instance part="BUT4" gate="J$1" x="218.44" y="119.38" smashed="yes" rot="R180">
+<instance part="BTN4" gate="J$1" x="218.44" y="119.38" smashed="yes" rot="R180">
 <attribute name="VALUE" x="220.98" y="126.746" size="1.778" layer="96" font="vector" rot="R180"/>
 <attribute name="NAME" x="220.98" y="113.792" size="1.778" layer="95" font="vector" rot="R180"/>
 </instance>
-<instance part="BUT5" gate="J$1" x="218.44" y="104.14" smashed="yes" rot="R180">
+<instance part="BTN5" gate="J$1" x="218.44" y="104.14" smashed="yes" rot="R180">
 <attribute name="VALUE" x="220.98" y="111.506" size="1.778" layer="96" font="vector" rot="R180"/>
 <attribute name="NAME" x="220.98" y="98.552" size="1.778" layer="95" font="vector" rot="R180"/>
 </instance>
-<instance part="BUT6" gate="J$1" x="218.44" y="88.9" smashed="yes" rot="R180">
+<instance part="BTN6" gate="J$1" x="218.44" y="88.9" smashed="yes" rot="R180">
 <attribute name="VALUE" x="220.98" y="96.266" size="1.778" layer="96" font="vector" rot="R180"/>
 <attribute name="NAME" x="220.98" y="83.312" size="1.778" layer="95" font="vector" rot="R180"/>
 </instance>
-<instance part="BUT2" gate="J$1" x="218.44" y="149.86" smashed="yes" rot="R180">
+<instance part="BTN2" gate="J$1" x="218.44" y="149.86" smashed="yes" rot="R180">
 <attribute name="VALUE" x="220.98" y="157.226" size="1.778" layer="96" font="vector" rot="R180"/>
 <attribute name="NAME" x="220.98" y="144.272" size="1.778" layer="95" font="vector" rot="R180"/>
 </instance>
-<instance part="BUT1" gate="J$1" x="218.44" y="165.1" smashed="yes" rot="R180">
+<instance part="BTN1" gate="J$1" x="218.44" y="165.1" smashed="yes" rot="R180">
 <attribute name="VALUE" x="220.98" y="172.466" size="1.778" layer="96" font="vector" rot="R180"/>
 <attribute name="NAME" x="220.98" y="159.512" size="1.778" layer="95" font="vector" rot="R180"/>
 </instance>
@ -2392,15 +2392,15 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <attribute name="VALUE" x="170.18" y="142.494" size="1.778" layer="96" font="vector"/>
 <attribute name="NAME" x="170.18" y="155.448" size="1.778" layer="95" font="vector"/>
 </instance>
-<instance part="BUT7" gate="J$1" x="218.44" y="71.12" smashed="yes" rot="R180">
+<instance part="BTN7" gate="J$1" x="218.44" y="71.12" smashed="yes" rot="R180">
 <attribute name="VALUE" x="220.98" y="78.486" size="1.778" layer="96" font="vector" rot="R180"/>
 <attribute name="NAME" x="220.98" y="65.532" size="1.778" layer="95" font="vector" rot="R180"/>
 </instance>
-<instance part="BUT8" gate="J$1" x="218.44" y="55.88" smashed="yes" rot="R180">
+<instance part="BTN8" gate="J$1" x="218.44" y="55.88" smashed="yes" rot="R180">
 <attribute name="VALUE" x="220.98" y="63.246" size="1.778" layer="96" font="vector" rot="R180"/>
 <attribute name="NAME" x="220.98" y="50.292" size="1.778" layer="95" font="vector" rot="R180"/>
 </instance>
-<instance part="BUT9" gate="J$1" x="238.76" y="165.1" smashed="yes" rot="R180">
+<instance part="BTN9" gate="J$1" x="238.76" y="165.1" smashed="yes" rot="R180">
 <attribute name="VALUE" x="241.3" y="172.466" size="1.778" layer="96" font="vector" rot="R180"/>
 <attribute name="NAME" x="241.3" y="159.512" size="1.778" layer="95" font="vector" rot="R180"/>
 </instance>
@ -2411,55 +2411,55 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <attribute name="NAME" x="96.52" y="152.4" size="1.27" layer="95"/>
 <attribute name="VALUE" x="96.52" y="104.14" size="1.27" layer="96"/>
 </instance>
-<instance part="BUT10" gate="J$1" x="45.72" y="175.26" smashed="yes">
+<instance part="BTN10" gate="J$1" x="45.72" y="175.26" smashed="yes">
 <attribute name="VALUE" x="43.18" y="167.894" size="1.778" layer="96" font="vector"/>
 <attribute name="NAME" x="43.18" y="180.848" size="1.778" layer="95" font="vector"/>
 </instance>
-<instance part="BUT12" gate="J$1" x="45.72" y="149.86" smashed="yes">
+<instance part="BTN12" gate="J$1" x="45.72" y="149.86" smashed="yes">
 <attribute name="VALUE" x="43.18" y="142.494" size="1.778" layer="96" font="vector"/>
 <attribute name="NAME" x="43.18" y="155.448" size="1.778" layer="95" font="vector"/>
 </instance>
-<instance part="BUT13" gate="J$1" x="45.72" y="137.16" smashed="yes">
+<instance part="BTN13" gate="J$1" x="45.72" y="137.16" smashed="yes">
 <attribute name="VALUE" x="43.18" y="129.794" size="1.778" layer="96" font="vector"/>
 <attribute name="NAME" x="43.18" y="142.748" size="1.778" layer="95" font="vector"/>
 </instance>
-<instance part="BUT14" gate="J$1" x="45.72" y="124.46" smashed="yes">
+<instance part="BTN14" gate="J$1" x="45.72" y="124.46" smashed="yes">
 <attribute name="VALUE" x="43.18" y="117.094" size="1.778" layer="96" font="vector"/>
 <attribute name="NAME" x="43.18" y="130.048" size="1.778" layer="95" font="vector"/>
 </instance>
-<instance part="BUT15" gate="J$1" x="45.72" y="111.76" smashed="yes">
+<instance part="BTN15" gate="J$1" x="45.72" y="111.76" smashed="yes">
 <attribute name="VALUE" x="43.18" y="104.394" size="1.778" layer="96" font="vector"/>
 <attribute name="NAME" x="43.18" y="117.348" size="1.778" layer="95" font="vector"/>
 </instance>
-<instance part="BUT16" gate="J$1" x="45.72" y="99.06" smashed="yes">
+<instance part="BTN16" gate="J$1" x="45.72" y="99.06" smashed="yes">
 <attribute name="VALUE" x="43.18" y="91.694" size="1.778" layer="96" font="vector"/>
 <attribute name="NAME" x="43.18" y="104.648" size="1.778" layer="95" font="vector"/>
 </instance>
-<instance part="BUT17" gate="J$1" x="45.72" y="86.36" smashed="yes">
+<instance part="BTN17" gate="J$1" x="45.72" y="86.36" smashed="yes">
 <attribute name="VALUE" x="43.18" y="78.994" size="1.778" layer="96" font="vector"/>
 <attribute name="NAME" x="43.18" y="91.948" size="1.778" layer="95" font="vector"/>
 </instance>
-<instance part="BUT18" gate="J$1" x="45.72" y="73.66" smashed="yes">
+<instance part="BTN18" gate="J$1" x="45.72" y="71.12" smashed="yes">
-<attribute name="VALUE" x="43.18" y="66.294" size="1.778" layer="96" font="vector"/>
+<attribute name="VALUE" x="43.18" y="63.754" size="1.778" layer="96" font="vector"/>
-<attribute name="NAME" x="43.18" y="79.248" size="1.778" layer="95" font="vector"/>
+<attribute name="NAME" x="43.18" y="76.708" size="1.778" layer="95" font="vector"/>
 </instance>
-<instance part="BUT19" gate="J$1" x="45.72" y="60.96" smashed="yes">
+<instance part="BTN19" gate="J$1" x="45.72" y="55.88" smashed="yes">
-<attribute name="VALUE" x="43.18" y="53.594" size="1.778" layer="96" font="vector"/>
+<attribute name="VALUE" x="43.18" y="48.514" size="1.778" layer="96" font="vector"/>
-<attribute name="NAME" x="43.18" y="66.548" size="1.778" layer="95" font="vector"/>
+<attribute name="NAME" x="43.18" y="61.468" size="1.778" layer="95" font="vector"/>
 </instance>
-<instance part="BUT20" gate="J$1" x="45.72" y="45.72" smashed="yes">
+<instance part="BTN20" gate="J$1" x="45.72" y="40.64" smashed="yes">
-<attribute name="VALUE" x="43.18" y="38.354" size="1.778" layer="96" font="vector"/>
+<attribute name="VALUE" x="43.18" y="33.274" size="1.778" layer="96" font="vector"/>
-<attribute name="NAME" x="43.18" y="51.308" size="1.778" layer="95" font="vector"/>
+<attribute name="NAME" x="43.18" y="46.228" size="1.778" layer="95" font="vector"/>
 </instance>
-<instance part="KBUT1" gate="J$1" x="101.6" y="68.58" smashed="yes" rot="R180">
+<instance part="KBTN1" gate="J$1" x="101.6" y="68.58" smashed="yes" rot="R180">
 <attribute name="VALUE" x="104.14" y="75.946" size="1.778" layer="96" font="vector" rot="R180"/>
 <attribute name="NAME" x="104.14" y="62.992" size="1.778" layer="95" font="vector" rot="R180"/>
 </instance>
-<instance part="KBUT2" gate="J$1" x="101.6" y="83.82" smashed="yes" rot="R180">
+<instance part="KBTN2" gate="J$1" x="101.6" y="83.82" smashed="yes" rot="R180">
 <attribute name="VALUE" x="104.14" y="91.186" size="1.778" layer="96" font="vector" rot="R180"/>
 <attribute name="NAME" x="104.14" y="78.232" size="1.778" layer="95" font="vector" rot="R180"/>
 </instance>
-<instance part="KBUT3" gate="J$1" x="101.6" y="99.06" smashed="yes" rot="R180">
+<instance part="KBTN3" gate="J$1" x="101.6" y="99.06" smashed="yes" rot="R180">
 <attribute name="VALUE" x="104.14" y="106.426" size="1.778" layer="96" font="vector" rot="R180"/>
 <attribute name="NAME" x="104.14" y="93.472" size="1.778" layer="95" font="vector" rot="R180"/>
 </instance>
@ -2467,15 +2467,15 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <attribute name="VALUE" x="104.14" y="60.706" size="1.778" layer="96" font="vector" rot="R180"/>
 <attribute name="NAME" x="104.14" y="47.752" size="1.778" layer="95" font="vector" rot="R180"/>
 </instance>
-<instance part="BUT21" gate="J$1" x="45.72" y="33.02" smashed="yes">
+<instance part="BTN21" gate="J$1" x="45.72" y="25.4" smashed="yes">
-<attribute name="VALUE" x="43.18" y="25.654" size="1.778" layer="96" font="vector"/>
+<attribute name="VALUE" x="43.18" y="18.034" size="1.778" layer="96" font="vector"/>
-<attribute name="NAME" x="43.18" y="38.608" size="1.778" layer="95" font="vector"/>
+<attribute name="NAME" x="43.18" y="30.988" size="1.778" layer="95" font="vector"/>
 </instance>
-<instance part="BUT22" gate="J$1" x="45.72" y="20.32" smashed="yes">
+<instance part="BTN22" gate="J$1" x="45.72" y="10.16" smashed="yes">
-<attribute name="VALUE" x="43.18" y="12.954" size="1.778" layer="96" font="vector"/>
+<attribute name="VALUE" x="43.18" y="2.794" size="1.778" layer="96" font="vector"/>
-<attribute name="NAME" x="43.18" y="25.908" size="1.778" layer="95" font="vector"/>
+<attribute name="NAME" x="43.18" y="15.748" size="1.778" layer="95" font="vector"/>
 </instance>
-<instance part="BUT11" gate="J$1" x="45.72" y="162.56" smashed="yes">
+<instance part="BTN11" gate="J$1" x="45.72" y="162.56" smashed="yes">
 <attribute name="VALUE" x="43.18" y="155.194" size="1.778" layer="96" font="vector"/>
 <attribute name="NAME" x="43.18" y="168.148" size="1.778" layer="95" font="vector"/>
 </instance>
@ -2485,7 +2485,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <nets>
 <net name="GND" class="0">
 <segment>
-<pinref part="BUT9" gate="J$1" pin="3"/>
+<pinref part="BTN9" gate="J$1" pin="3"/>
 <wire x1="231.14" y1="162.56" x2="226.06" y2="162.56" width="0.1524" layer="91"/>
 <label x="226.06" y="162.56" size="1.778" layer="95"/>
 </segment>
@ -2505,72 +2505,72 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <label x="88.9" y="50.8" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="BUT22" gate="J$1" pin="3"/>
+<pinref part="BTN22" gate="J$1" pin="3"/>
-<label x="53.34" y="22.86" size="1.778" layer="95"/>
+<label x="53.34" y="12.7" size="1.778" layer="95"/>
-<wire x1="53.34" y1="22.86" x2="58.42" y2="22.86" width="0.1524" layer="91"/>
+<wire x1="53.34" y1="12.7" x2="58.42" y2="12.7" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="BUT21" gate="J$1" pin="3"/>
+<pinref part="BTN21" gate="J$1" pin="3"/>
-<label x="53.34" y="35.56" size="1.778" layer="95"/>
+<label x="53.34" y="27.94" size="1.778" layer="95"/>
-<wire x1="53.34" y1="35.56" x2="58.42" y2="35.56" width="0.1524" layer="91"/>
+<wire x1="53.34" y1="27.94" x2="58.42" y2="27.94" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="BUT20" gate="J$1" pin="3"/>
+<pinref part="BTN20" gate="J$1" pin="3"/>
-<label x="53.34" y="48.26" size="1.778" layer="95"/>
+<label x="53.34" y="43.18" size="1.778" layer="95"/>
-<wire x1="53.34" y1="48.26" x2="58.42" y2="48.26" width="0.1524" layer="91"/>
+<wire x1="53.34" y1="43.18" x2="58.42" y2="43.18" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="BUT19" gate="J$1" pin="3"/>
+<pinref part="BTN19" gate="J$1" pin="3"/>
-<label x="53.34" y="63.5" size="1.778" layer="95"/>
+<label x="53.34" y="58.42" size="1.778" layer="95"/>
-<wire x1="53.34" y1="63.5" x2="58.42" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="53.34" y1="58.42" x2="58.42" y2="58.42" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="BUT18" gate="J$1" pin="3"/>
+<pinref part="BTN18" gate="J$1" pin="3"/>
-<label x="53.34" y="76.2" size="1.778" layer="95"/>
+<label x="53.34" y="73.66" size="1.778" layer="95"/>
-<wire x1="53.34" y1="76.2" x2="58.42" y2="76.2" width="0.1524" layer="91"/>
+<wire x1="53.34" y1="73.66" x2="58.42" y2="73.66" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="BUT17" gate="J$1" pin="3"/>
+<pinref part="BTN17" gate="J$1" pin="3"/>
 <label x="53.34" y="88.9" size="1.778" layer="95"/>
 <wire x1="53.34" y1="88.9" x2="58.42" y2="88.9" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="BUT16" gate="J$1" pin="3"/>
+<pinref part="BTN16" gate="J$1" pin="3"/>
 <label x="53.34" y="101.6" size="1.778" layer="95"/>
 <wire x1="53.34" y1="101.6" x2="58.42" y2="101.6" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="BUT15" gate="J$1" pin="3"/>
+<pinref part="BTN15" gate="J$1" pin="3"/>
 <label x="53.34" y="114.3" size="1.778" layer="95"/>
 <wire x1="53.34" y1="114.3" x2="58.42" y2="114.3" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="BUT14" gate="J$1" pin="3"/>
+<pinref part="BTN14" gate="J$1" pin="3"/>
 <label x="53.34" y="127" size="1.778" layer="95"/>
 <wire x1="53.34" y1="127" x2="58.42" y2="127" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="BUT13" gate="J$1" pin="3"/>
+<pinref part="BTN13" gate="J$1" pin="3"/>
 <label x="53.34" y="139.7" size="1.778" layer="95"/>
 <wire x1="53.34" y1="139.7" x2="58.42" y2="139.7" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="BUT12" gate="J$1" pin="3"/>
+<pinref part="BTN12" gate="J$1" pin="3"/>
 <label x="53.34" y="152.4" size="1.778" layer="95"/>
 <wire x1="53.34" y1="152.4" x2="58.42" y2="152.4" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="BUT11" gate="J$1" pin="3"/>
+<pinref part="BTN11" gate="J$1" pin="3"/>
 <label x="53.34" y="165.1" size="1.778" layer="95"/>
 <wire x1="53.34" y1="165.1" x2="58.42" y2="165.1" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="BUT10" gate="J$1" pin="3"/>
+<pinref part="BTN10" gate="J$1" pin="3"/>
 <label x="53.34" y="177.8" size="1.778" layer="95"/>
 <wire x1="53.34" y1="177.8" x2="58.42" y2="177.8" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="BUT8" gate="J$1" pin="3"/>
+<pinref part="BTN8" gate="J$1" pin="3"/>
 <wire x1="205.74" y1="53.34" x2="210.82" y2="53.34" width="0.1524" layer="91"/>
 <label x="205.74" y="53.34" size="1.778" layer="95"/>
 </segment>
@ -2586,36 +2586,36 @@ Holes are offset 0.005" to hold pins in place while soldering.
 </segment>
 <segment>
 <wire x1="205.74" y1="162.56" x2="210.82" y2="162.56" width="0.1524" layer="91"/>
-<pinref part="BUT1" gate="J$1" pin="3"/>
+<pinref part="BTN1" gate="J$1" pin="3"/>
 <label x="205.74" y="162.56" size="1.778" layer="95"/>
 </segment>
 <segment>
 <wire x1="205.74" y1="147.32" x2="210.82" y2="147.32" width="0.1524" layer="91"/>
 <label x="205.74" y="147.32" size="1.778" layer="95"/>
-<pinref part="BUT2" gate="J$1" pin="3"/>
+<pinref part="BTN2" gate="J$1" pin="3"/>
 </segment>
 <segment>
 <wire x1="205.74" y1="132.08" x2="210.82" y2="132.08" width="0.1524" layer="91"/>
 <label x="205.74" y="132.08" size="1.778" layer="95"/>
-<pinref part="BUT3" gate="J$1" pin="3"/>
+<pinref part="BTN3" gate="J$1" pin="3"/>
 </segment>
 <segment>
 <wire x1="205.74" y1="116.84" x2="210.82" y2="116.84" width="0.1524" layer="91"/>
 <label x="205.74" y="116.84" size="1.778" layer="95"/>
-<pinref part="BUT4" gate="J$1" pin="3"/>
+<pinref part="BTN4" gate="J$1" pin="3"/>
 </segment>
 <segment>
 <wire x1="205.74" y1="101.6" x2="210.82" y2="101.6" width="0.1524" layer="91"/>
 <label x="205.74" y="101.6" size="1.778" layer="95"/>
-<pinref part="BUT5" gate="J$1" pin="3"/>
+<pinref part="BTN5" gate="J$1" pin="3"/>
 </segment>
 <segment>
 <wire x1="205.74" y1="86.36" x2="210.82" y2="86.36" width="0.1524" layer="91"/>
 <label x="205.74" y="86.36" size="1.778" layer="95"/>
-<pinref part="BUT6" gate="J$1" pin="3"/>
+<pinref part="BTN6" gate="J$1" pin="3"/>
 </segment>
 <segment>
-<pinref part="BUT7" gate="J$1" pin="3"/>
+<pinref part="BTN7" gate="J$1" pin="3"/>
 <wire x1="205.74" y1="68.58" x2="210.82" y2="68.58" width="0.1524" layer="91"/>
 <label x="205.74" y="68.58" size="1.778" layer="95"/>
 </segment>
@ -2634,7 +2634,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <wire x1="180.34" y1="119.38" x2="193.04" y2="119.38" width="0.1524" layer="91"/>
 <wire x1="193.04" y1="119.38" x2="193.04" y2="167.64" width="0.1524" layer="91"/>
 <pinref part="ARDUINO" gate="G$1" pin="*D6"/>
-<pinref part="BUT1" gate="J$1" pin="1"/>
+<pinref part="BTN1" gate="J$1" pin="1"/>
 <wire x1="193.04" y1="167.64" x2="210.82" y2="167.64" width="0.1524" layer="91"/>
 </segment>
 </net>
@ -2643,7 +2643,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <wire x1="180.34" y1="116.84" x2="195.58" y2="116.84" width="0.1524" layer="91"/>
 <wire x1="195.58" y1="116.84" x2="195.58" y2="152.4" width="0.1524" layer="91"/>
 <pinref part="ARDUINO" gate="G$1" pin="D7"/>
-<pinref part="BUT2" gate="J$1" pin="1"/>
+<pinref part="BTN2" gate="J$1" pin="1"/>
 <wire x1="195.58" y1="152.4" x2="210.82" y2="152.4" width="0.1524" layer="91"/>
 </segment>
 </net>
@ -2652,7 +2652,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <wire x1="180.34" y1="114.3" x2="198.12" y2="114.3" width="0.1524" layer="91"/>
 <wire x1="198.12" y1="114.3" x2="198.12" y2="137.16" width="0.1524" layer="91"/>
 <pinref part="ARDUINO" gate="G$1" pin="D8"/>
-<pinref part="BUT3" gate="J$1" pin="1"/>
+<pinref part="BTN3" gate="J$1" pin="1"/>
 <wire x1="198.12" y1="137.16" x2="210.82" y2="137.16" width="0.1524" layer="91"/>
 </segment>
 </net>
@ -2661,7 +2661,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <wire x1="180.34" y1="111.76" x2="200.66" y2="111.76" width="0.1524" layer="91"/>
 <pinref part="ARDUINO" gate="G$1" pin="*D9"/>
 <wire x1="200.66" y1="111.76" x2="200.66" y2="121.92" width="0.1524" layer="91"/>
-<pinref part="BUT4" gate="J$1" pin="1"/>
+<pinref part="BTN4" gate="J$1" pin="1"/>
 <wire x1="200.66" y1="121.92" x2="210.82" y2="121.92" width="0.1524" layer="91"/>
 </segment>
 </net>
@ -2670,7 +2670,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <wire x1="180.34" y1="109.22" x2="195.58" y2="109.22" width="0.1524" layer="91"/>
 <pinref part="ARDUINO" gate="G$1" pin="*D10"/>
 <wire x1="195.58" y1="109.22" x2="195.58" y2="106.68" width="0.1524" layer="91"/>
-<pinref part="BUT5" gate="J$1" pin="1"/>
+<pinref part="BTN5" gate="J$1" pin="1"/>
 <wire x1="195.58" y1="106.68" x2="210.82" y2="106.68" width="0.1524" layer="91"/>
 </segment>
 </net>
@ -2679,7 +2679,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <wire x1="180.34" y1="106.68" x2="190.5" y2="106.68" width="0.1524" layer="91"/>
 <wire x1="190.5" y1="106.68" x2="190.5" y2="91.44" width="0.1524" layer="91"/>
 <pinref part="ARDUINO" gate="G$1" pin="*D11"/>
-<pinref part="BUT6" gate="J$1" pin="1"/>
+<pinref part="BTN6" gate="J$1" pin="1"/>
 <wire x1="190.5" y1="91.44" x2="210.82" y2="91.44" width="0.1524" layer="91"/>
 </segment>
 </net>
@ -2687,7 +2687,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <segment>
 <wire x1="180.34" y1="104.14" x2="187.96" y2="104.14" width="0.1524" layer="91"/>
 <pinref part="ARDUINO" gate="G$1" pin="D12"/>
-<pinref part="BUT7" gate="J$1" pin="1"/>
+<pinref part="BTN7" gate="J$1" pin="1"/>
 <wire x1="187.96" y1="104.14" x2="187.96" y2="73.66" width="0.1524" layer="91"/>
 <wire x1="187.96" y1="73.66" x2="210.82" y2="73.66" width="0.1524" layer="91"/>
 </segment>
@ -2697,7 +2697,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <wire x1="180.34" y1="101.6" x2="185.42" y2="101.6" width="0.1524" layer="91"/>
 <pinref part="ARDUINO" gate="G$1" pin="D13"/>
 <wire x1="185.42" y1="101.6" x2="185.42" y2="58.42" width="0.1524" layer="91"/>
-<pinref part="BUT8" gate="J$1" pin="1"/>
+<pinref part="BTN8" gate="J$1" pin="1"/>
 <wire x1="185.42" y1="58.42" x2="210.82" y2="58.42" width="0.1524" layer="91"/>
 </segment>
 </net>
@ -2728,7 +2728,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <net name="N$24" class="0">
 <segment>
 <pinref part="MUX" gate="G$1" pin="CHAN13"/>
-<pinref part="KBUT1" gate="J$1" pin="1"/>
+<pinref part="KBTN1" gate="J$1" pin="1"/>
 <wire x1="86.36" y1="114.3" x2="91.44" y2="114.3" width="0.1524" layer="91"/>
 <wire x1="86.36" y1="114.3" x2="86.36" y2="71.12" width="0.1524" layer="91"/>
 <wire x1="86.36" y1="71.12" x2="93.98" y2="71.12" width="0.1524" layer="91"/>
@ -2736,7 +2736,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 </net>
 <net name="N$25" class="0">
 <segment>
-<pinref part="KBUT2" gate="J$1" pin="1"/>
+<pinref part="KBTN2" gate="J$1" pin="1"/>
 <pinref part="MUX" gate="G$1" pin="CHAN14"/>
 <wire x1="88.9" y1="111.76" x2="91.44" y2="111.76" width="0.1524" layer="91"/>
 <wire x1="88.9" y1="111.76" x2="88.9" y2="86.36" width="0.1524" layer="91"/>
@ -2745,7 +2745,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 </net>
 <net name="N$26" class="0">
 <segment>
-<pinref part="KBUT3" gate="J$1" pin="1"/>
+<pinref part="KBTN3" gate="J$1" pin="1"/>
 <wire x1="93.98" y1="101.6" x2="91.44" y2="101.6" width="0.1524" layer="91"/>
 <wire x1="91.44" y1="101.6" x2="91.44" y2="109.22" width="0.1524" layer="91"/>
 <pinref part="MUX" gate="G$1" pin="CHAN15"/>
@ -2755,52 +2755,52 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <segment>
 <pinref part="MUX" gate="G$1" pin="CHAN12"/>
 <wire x1="91.44" y1="116.84" x2="83.82" y2="116.84" width="0.1524" layer="91"/>
-<wire x1="83.82" y1="116.84" x2="83.82" y2="17.78" width="0.1524" layer="91"/>
+<wire x1="83.82" y1="116.84" x2="83.82" y2="7.62" width="0.1524" layer="91"/>
-<pinref part="BUT22" gate="J$1" pin="1"/>
+<pinref part="BTN22" gate="J$1" pin="1"/>
-<wire x1="83.82" y1="17.78" x2="53.34" y2="17.78" width="0.1524" layer="91"/>
+<wire x1="83.82" y1="7.62" x2="53.34" y2="7.62" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$23" class="0">
 <segment>
 <pinref part="MUX" gate="G$1" pin="CHAN11"/>
 <wire x1="91.44" y1="119.38" x2="81.28" y2="119.38" width="0.1524" layer="91"/>
-<wire x1="81.28" y1="119.38" x2="81.28" y2="30.48" width="0.1524" layer="91"/>
+<wire x1="81.28" y1="119.38" x2="81.28" y2="22.86" width="0.1524" layer="91"/>
-<pinref part="BUT21" gate="J$1" pin="1"/>
+<pinref part="BTN21" gate="J$1" pin="1"/>
-<wire x1="81.28" y1="30.48" x2="53.34" y2="30.48" width="0.1524" layer="91"/>
+<wire x1="81.28" y1="22.86" x2="53.34" y2="22.86" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$27" class="0">
 <segment>
 <pinref part="MUX" gate="G$1" pin="CHAN10"/>
 <wire x1="91.44" y1="121.92" x2="78.74" y2="121.92" width="0.1524" layer="91"/>
-<wire x1="78.74" y1="121.92" x2="78.74" y2="43.18" width="0.1524" layer="91"/>
+<wire x1="78.74" y1="121.92" x2="78.74" y2="38.1" width="0.1524" layer="91"/>
-<pinref part="BUT20" gate="J$1" pin="1"/>
+<pinref part="BTN20" gate="J$1" pin="1"/>
-<wire x1="78.74" y1="43.18" x2="53.34" y2="43.18" width="0.1524" layer="91"/>
+<wire x1="78.74" y1="38.1" x2="53.34" y2="38.1" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$28" class="0">
 <segment>
 <pinref part="MUX" gate="G$1" pin="CHAN9"/>
 <wire x1="91.44" y1="124.46" x2="76.2" y2="124.46" width="0.1524" layer="91"/>
-<wire x1="76.2" y1="124.46" x2="76.2" y2="58.42" width="0.1524" layer="91"/>
+<wire x1="76.2" y1="124.46" x2="76.2" y2="53.34" width="0.1524" layer="91"/>
-<pinref part="BUT19" gate="J$1" pin="1"/>
+<pinref part="BTN19" gate="J$1" pin="1"/>
-<wire x1="76.2" y1="58.42" x2="53.34" y2="58.42" width="0.1524" layer="91"/>
+<wire x1="76.2" y1="53.34" x2="53.34" y2="53.34" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$29" class="0">
 <segment>
 <pinref part="MUX" gate="G$1" pin="CHAN8"/>
 <wire x1="91.44" y1="127" x2="73.66" y2="127" width="0.1524" layer="91"/>
-<pinref part="BUT18" gate="J$1" pin="1"/>
+<pinref part="BTN18" gate="J$1" pin="1"/>
-<wire x1="73.66" y1="127" x2="73.66" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="73.66" y1="127" x2="73.66" y2="68.58" width="0.1524" layer="91"/>
-<wire x1="73.66" y1="71.12" x2="53.34" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="73.66" y1="68.58" x2="53.34" y2="68.58" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$30" class="0">
 <segment>
 <pinref part="MUX" gate="G$1" pin="CHAN7"/>
 <wire x1="91.44" y1="129.54" x2="71.12" y2="129.54" width="0.1524" layer="91"/>
-<pinref part="BUT17" gate="J$1" pin="1"/>
+<pinref part="BTN17" gate="J$1" pin="1"/>
 <wire x1="71.12" y1="129.54" x2="71.12" y2="83.82" width="0.1524" layer="91"/>
 <wire x1="71.12" y1="83.82" x2="53.34" y2="83.82" width="0.1524" layer="91"/>
 </segment>
@ -2810,7 +2810,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <pinref part="MUX" gate="G$1" pin="CHAN6"/>
 <wire x1="91.44" y1="132.08" x2="68.58" y2="132.08" width="0.1524" layer="91"/>
 <wire x1="68.58" y1="132.08" x2="68.58" y2="96.52" width="0.1524" layer="91"/>
-<pinref part="BUT16" gate="J$1" pin="1"/>
+<pinref part="BTN16" gate="J$1" pin="1"/>
 <wire x1="53.34" y1="96.52" x2="68.58" y2="96.52" width="0.1524" layer="91"/>
 </segment>
 </net>
@ -2819,7 +2819,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <pinref part="MUX" gate="G$1" pin="CHAN5"/>
 <wire x1="91.44" y1="134.62" x2="66.04" y2="134.62" width="0.1524" layer="91"/>
 <wire x1="66.04" y1="134.62" x2="66.04" y2="109.22" width="0.1524" layer="91"/>
-<pinref part="BUT15" gate="J$1" pin="1"/>
+<pinref part="BTN15" gate="J$1" pin="1"/>
 <wire x1="66.04" y1="109.22" x2="53.34" y2="109.22" width="0.1524" layer="91"/>
 </segment>
 </net>
@ -2827,7 +2827,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <segment>
 <pinref part="MUX" gate="G$1" pin="CHAN4"/>
 <wire x1="91.44" y1="137.16" x2="63.5" y2="137.16" width="0.1524" layer="91"/>
-<pinref part="BUT14" gate="J$1" pin="1"/>
+<pinref part="BTN14" gate="J$1" pin="1"/>
 <wire x1="63.5" y1="137.16" x2="63.5" y2="121.92" width="0.1524" layer="91"/>
 <wire x1="63.5" y1="121.92" x2="53.34" y2="121.92" width="0.1524" layer="91"/>
 </segment>
@ -2837,7 +2837,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <pinref part="MUX" gate="G$1" pin="CHAN3"/>
 <wire x1="91.44" y1="139.7" x2="60.96" y2="139.7" width="0.1524" layer="91"/>
 <wire x1="60.96" y1="139.7" x2="60.96" y2="134.62" width="0.1524" layer="91"/>
-<pinref part="BUT13" gate="J$1" pin="1"/>
+<pinref part="BTN13" gate="J$1" pin="1"/>
 <wire x1="60.96" y1="134.62" x2="53.34" y2="134.62" width="0.1524" layer="91"/>
 </segment>
 </net>
@ -2846,7 +2846,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <pinref part="MUX" gate="G$1" pin="CHAN2"/>
 <wire x1="91.44" y1="142.24" x2="60.96" y2="142.24" width="0.1524" layer="91"/>
 <wire x1="60.96" y1="142.24" x2="60.96" y2="147.32" width="0.1524" layer="91"/>
-<pinref part="BUT12" gate="J$1" pin="1"/>
+<pinref part="BTN12" gate="J$1" pin="1"/>
 <wire x1="60.96" y1="147.32" x2="53.34" y2="147.32" width="0.1524" layer="91"/>
 </segment>
 </net>
@ -2854,7 +2854,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <segment>
 <pinref part="MUX" gate="G$1" pin="CHAN0"/>
 <wire x1="91.44" y1="147.32" x2="91.44" y2="172.72" width="0.1524" layer="91"/>
-<pinref part="BUT10" gate="J$1" pin="1"/>
+<pinref part="BTN10" gate="J$1" pin="1"/>
 <wire x1="91.44" y1="172.72" x2="53.34" y2="172.72" width="0.1524" layer="91"/>
 </segment>
 </net>
@ -2908,7 +2908,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <pinref part="MUX" gate="G$1" pin="CHAN1"/>
 <wire x1="91.44" y1="144.78" x2="88.9" y2="144.78" width="0.1524" layer="91"/>
 <wire x1="88.9" y1="144.78" x2="88.9" y2="160.02" width="0.1524" layer="91"/>
-<pinref part="BUT11" gate="J$1" pin="1"/>
+<pinref part="BTN11" gate="J$1" pin="1"/>
 <wire x1="88.9" y1="160.02" x2="53.34" y2="160.02" width="0.1524" layer="91"/>
 </segment>
 </net>
@ -2928,20 +2928,20 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <segment>
 <pinref part="KEY" gate="J$1" pin="1"/>
 <wire x1="91.44" y1="55.88" x2="93.98" y2="55.88" width="0.1524" layer="91"/>
-<pinref part="KBUT3" gate="J$1" pin="3"/>
+<pinref part="KBTN3" gate="J$1" pin="3"/>
 <wire x1="91.44" y1="60.96" x2="106.68" y2="60.96" width="0.1524" layer="91"/>
 <wire x1="106.68" y1="60.96" x2="106.68" y2="76.2" width="0.1524" layer="91"/>
 <wire x1="106.68" y1="76.2" x2="106.68" y2="91.44" width="0.1524" layer="91"/>
 <wire x1="106.68" y1="91.44" x2="91.44" y2="91.44" width="0.1524" layer="91"/>
 <wire x1="91.44" y1="55.88" x2="91.44" y2="60.96" width="0.1524" layer="91"/>
-<pinref part="KBUT1" gate="J$1" pin="3"/>
+<pinref part="KBTN1" gate="J$1" pin="3"/>
 <wire x1="93.98" y1="66.04" x2="91.44" y2="66.04" width="0.1524" layer="91"/>
 <wire x1="91.44" y1="60.96" x2="91.44" y2="66.04" width="0.1524" layer="91"/>
 <junction x="91.44" y="60.96"/>
 <wire x1="106.68" y1="76.2" x2="91.44" y2="76.2" width="0.1524" layer="91"/>
 <junction x="106.68" y="76.2"/>
 <wire x1="91.44" y1="76.2" x2="91.44" y2="81.28" width="0.1524" layer="91"/>
-<pinref part="KBUT2" gate="J$1" pin="3"/>
+<pinref part="KBTN2" gate="J$1" pin="3"/>
 <wire x1="91.44" y1="81.28" x2="93.98" y2="81.28" width="0.1524" layer="91"/>
 <wire x1="93.98" y1="96.52" x2="91.44" y2="96.52" width="0.1524" layer="91"/>
 <wire x1="91.44" y1="96.52" x2="91.44" y2="91.44" width="0.1524" layer="91"/>
@ -2954,7 +2954,7 @@ Holes are offset 0.005" to hold pins in place while soldering.
 <label x="149.86" y="137.16" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="BUT9" gate="J$1" pin="1"/>
+<pinref part="BTN9" gate="J$1" pin="1"/>
 <wire x1="231.14" y1="167.64" x2="226.06" y2="167.64" width="0.1524" layer="91"/>
 <label x="226.06" y="167.64" size="1.778" layer="95"/>
 </segment>
--- a/flight-panel-2021-11/flight-panel.ino
+++ b/flight-panel-2021-11/flight-panel.ino
@ -1,53 +1,75 @@
 #include <Joystick.h>
 #include <Mux.h>
 Joystick joystick(false);
 // These defines match the board schematic
 #define ENC1   2, 3
 #define ENC2   4, 5
 #define BTN1   6
 #define BTN2   7
 #define BTN3   8
 #define BTN4   9
 #define BTN5   10
 #define BTN6   11
 #define BTN7   12
 #define BTN8   13
 #define BTN9   A0
 // Buttons 10 and higher are all on A1 (the MUX signal pin), these are multiplexer channel IDs
 #define BTN10  0
 #define BTN11  1
 #define BTN12  2
 #define BTN13  3
 #define BTN14  4
 #define BTN15  5
 #define BTN16  6
 #define BTN17  7
 #define BTN18  8
 #define BTN19  9
 #define BTN20  10
 #define BTN21  11
 #define BTN22  12
 #define KBTN1   13
 #define KBTN2   14
 #define KBTN3   15
 void setup() {
-  // for (uint8_t i = 0; i < 14; i++) {
+  // Encoders
-  //   joystick.AddButton(i, BUTTON_PASSTHRU);
+  joystick.AddEncoder(ENC1, ENCODER_PULSED_SPLIT);
-  // }
+  joystick.AddEncoder(ENC2, ENCODER_PULSED_SPLIT);  
  // joystick.AddButton(A0, BUTTON_PASSTHRU);
  // joystick.AddButton(A1, BUTTON_PASSTHRU);
  // joystick.AddButton(A2, BUTTON_PASSTHRU);
  // joystick.AddButton(A3, BUTTON_PASSTHRU);
  // joystick.AddButton(A4, BUTTON_PASSTHRU);
  // joystick.AddButton(A5, BUTTON_PASSTHRU);
  // // Power switches
-  joystick.AddButton(2, BUTTON_PULSED_DOUBLE_ACTION_SPLIT);
+  joystick.AddButton(BTN1, BUTTON_PULSED_DOUBLE_ACTION_SPLIT);
-  joystick.AddButton(3, BUTTON_PULSED_DOUBLE_ACTION_SPLIT);
+  joystick.AddButton(BTN2, BUTTON_PULSED_DOUBLE_ACTION_SPLIT);
-  joystick.AddButton(4, BUTTON_PULSED_DOUBLE_ACTION_SPLIT);
+  joystick.AddButton(BTN3, BUTTON_PULSED_DOUBLE_ACTION_SPLIT);
-  joystick.AddButton(5, BUTTON_PULSED_DOUBLE_ACTION_SPLIT);
+  joystick.AddButton(BTN4, BUTTON_PULSED_DOUBLE_ACTION_SPLIT);
  // // HUD modes
-  joystick.AddButton(8, BUTTON_PASSTHRU);
+  joystick.AddButton(BTN5, BUTTON_PASSTHRU);
-  joystick.AddButton(7, BUTTON_PASSTHRU);
+  joystick.AddButton(BTN6, BUTTON_PASSTHRU);
-  joystick.AddButton(6, BUTTON_PASSTHRU);
+  joystick.AddButton(BTN7, BUTTON_PASSTHRU);
  // // Encoders
  // // FIXME: these seem to be wired wrong.
  // // joystick.AddEncoder(10, 11, ENCODER_PULSED_SPLIT);
  // // joystick.AddEncoder(12, 13, ENCODER_PULSED_SPLIT);
  // // Mining Modules
-  joystick.AddButton(9, BUTTON_PASSTHRU);
+  joystick.AddButton(BTN8, BUTTON_PASSTHRU);
-  joystick.AddButton(10, BUTTON_PASSTHRU);
+  joystick.AddButton(BTN9, BUTTON_PASSTHRU);
-  joystick.AddButton(11, BUTTON_PASSTHRU);
+  joystick.AddButton(BTN10, BUTTON_PASSTHRU, true, mux);
  // // Flight Modes
-  joystick.AddButton(A1, BUTTON_PASSTHRU);
+  joystick.AddButton(BTN11, BUTTON_PASSTHRU, true, mux);
-  joystick.AddButton(A2, BUTTON_PASSTHRU);
+  joystick.AddButton(BTN12, BUTTON_PASSTHRU, true, mux);
-  joystick.AddButton(A3, BUTTON_PASSTHRU);
+  joystick.AddButton(BTN13, BUTTON_PASSTHRU, true, mux);
-  joystick.AddButton(A4, BUTTON_PASSTHRU);
+  joystick.AddButton(BTN14, BUTTON_PASSTHRU, true, mux);
  // // Doors & Lights
-  // // TODO: Need multiplexer setup
+  joystick.AddButton(BTN15, BUTTON_PULSED_DOUBLE_ACTION, true, mux);
-  joystick.AddButton(12, BUTTON_PULSED_DOUBLE_ACTION);
+  joystick.AddButton(BTN16, BUTTON_PULSED_DOUBLE_ACTION_SPLIT, true, mux);
-  joystick.AddButton(A0, BUTTON_PULSED_DOUBLE_ACTION);
+  joystick.AddButton(BTN17, BUTTON_PULSED_DOUBLE_ACTION_SPLIT, true, mux);
  // // Emergency Panel
-  // // TODO: Need multiplexer setup
+  joystick.AddButton(KBTN1, BUTTON_PASSTHRU);
-  joystick.AddButton(A5, BUTTON_PASSTHRU);
+  joystick.AddButton(KBTN2, BUTTON_PASSTHRU);
  joystick.AddButton(KBTN3, BUTTON_PASSTHRU);
  joystick.Init();
 }