Revert "Battery protection circuit"

This reverts commit 69dbc586ce164c6a939ac46ac2dad6727082318c.

2 files changed, 168 insertions, 183 deletions

diff --git a/laser-tag badge/laser-tag.brd b/laser-tag badge/laser-tag.brd
index 6e3fdd4..186bda4 100644
--- a/laser-tag badge/laser-tag.brd
+++ b/laser-tag badge/laser-tag.brd
@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="0.0125" unitdist="inch" unit="inch" style="lines" multiple="1" display="yes" altdistance="0.025" altunitdist="inch" altunit="inch"/>
+<grid distance="0.025" unitdist="inch" unit="inch" style="lines" multiple="1" display="yes" altdistance="0.025" altunitdist="inch" altunit="inch"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
@@ -169,6 +169,7 @@
 <wire x1="5.08" y1="33.02" x2="3.175" y2="34.925" width="0" layer="20" curve="-90"/>
 <wire x1="101.6" y1="20.32" x2="81.915" y2="35.56" width="0" layer="20" curve="-78"/>
 <wire x1="101.6" y1="60.96" x2="81.915" y2="45.72" width="0" layer="20" curve="78"/>
+<text x="69.85" y="31.75" size="0.6096" layer="25" font="vector" rot="R90">USB Power</text>
 <text x="59.055" y="63.5" size="0.8128" layer="25" font="vector" rot="R90">Hold   while powering up
 to enter programming mode</text>
 <wire x1="57.8358" y1="67.3862" x2="57.15" y2="67.3862" width="0.0762" layer="25"/>
@@ -2014,6 +2015,11 @@ Source: http://www3.alps.co.jp/WebObjects/catalog.woa/PDF/E/Switch/Tact/SKHM/SKH
 <smd name="2" x="0.2794" y="0" dx="0.8128" dy="0.4064" layer="1" rot="R90" cream="no"/>
 <wire x1="-0.254" y1="0" x2="0.254" y2="0" width="0.254" layer="1"/>
 </package>
+<package name="JUMPER_SOLDER_1X2_OPEN">
+<description>Solder jumper 6mil clearance</description>
+<smd name="1" x="-0.2794" y="0" dx="0.8128" dy="0.4064" layer="1" rot="R90" cream="no"/>
+<smd name="2" x="0.2794" y="0" dx="0.8128" dy="0.4064" layer="1" rot="R90" cream="no"/>
+</package>
 </packages>
 </library>
 <library name="Displays">
@@ -2458,6 +2464,7 @@ www.irf.com&lt;p&gt;
 </element>
 <element name="J1" library="Jumpers" package="JUMPER_SOLDER_1X2_CLOSED" value="JUMPER_SOLDER_1X2_CLOSED" x="52.07" y="2.54" rot="R90"/>
 <element name="J3" library="Jumpers" package="JUMPER_SOLDER_1X2_CLOSED" value="JUMPER_SOLDER_1X2_CLOSED" x="75.565" y="39.37" rot="R270"/>
+<element name="J2" library="Jumpers" package="JUMPER_SOLDER_1X2_OPEN" value="JUMPER_SOLDER_1X2_OPEN" x="69.215" y="37.465" rot="R180"/>
 <element name="PD1" library="Photonics" package="PDB-C156-FLUSH" value="PDB-C156" x="93.98" y="40.64" smashed="yes" rot="R270">
 <attribute name="NAME" x="92.71" y="36.83" size="1.27" layer="25" font="vector"/>
 </element>
@@ -2559,17 +2566,10 @@ www.irf.com&lt;p&gt;
 <element name="Q1" library="transistor-small-signal" package="SOT23" value="2N7002" x="84.455" y="15.24" smashed="yes" rot="MR90">
 <attribute name="NAME" x="86.36" y="13.335" size="1.27" layer="26" rot="MR90"/>
 </element>
-<element name="Q2" library="transistor-small-signal" package="SOT23" value="BSS123" x="71.12" y="62.23" smashed="yes" rot="MR0">
-<attribute name="NAME" x="73.025" y="64.135" size="1.27" layer="26" rot="MR0"/>
-</element>
-<element name="Q3" library="transistor-small-signal" package="SOT23" value="BSS123" x="75.565" y="62.23" smashed="yes" rot="MR0">
-<attribute name="NAME" x="77.47" y="64.135" size="1.27" layer="26" rot="MR0"/>
-</element>
-<element name="R5" library="rcl" package="R0603" value="10k" x="75.565" y="57.15" rot="MR180"/>
-<element name="R6" library="rcl" package="R0603" value="10k" x="80.01" y="59.055" rot="MR180"/>
 </elements>
 <signals>
 <signal name="GND">
+<contactref element="BAT1" pad="-"/>
 <contactref element="C1" pad="2"/>
 <contactref element="C2" pad="2"/>
 <contactref element="C3" pad="2"/>
@@ -2672,13 +2672,41 @@ www.irf.com&lt;p&gt;
 <via x="64.77" y="42.545" extent="1-16" drill="0.5"/>
 <contactref element="C21" pad="2"/>
 <contactref element="R4" pad="1"/>
+<contactref element="BAT2" pad="-"/>
+<via x="85.725" y="71.755" extent="1-16" drill="0.5"/>
 <contactref element="USB" pad="GND"/>
 <contactref element="USB" pad="MT2"/>
 <contactref element="USB" pad="MT1"/>
 <contactref element="Q1" pad="2"/>
-<contactref element="Q2" pad="2"/>
-<contactref element="Q3" pad="2"/>
-<contactref element="R5" pad="1"/>
+<wire x1="63.44" y1="73.695" x2="85.725" y2="71.755" width="0" layer="19" extent="1-16"/>
+<wire x1="52.07" y1="63.5" x2="61.74" y2="73.695" width="0" layer="19" extent="1-16"/>
+<wire x1="67.31" y1="42.94" x2="65.630621875" y2="46.91558125" width="0" layer="19" extent="1-16"/>
+<wire x1="69.85" y1="41.275" x2="68.34" y2="42.94" width="0" layer="19" extent="1-1"/>
+<wire x1="72.878478125" y1="38.253515625" x2="73.265" y2="38.34" width="0" layer="19" extent="1-16"/>
+<wire x1="64.77" y1="42.545" x2="67.31" y2="42.94" width="0" layer="19" extent="1-1"/>
+<wire x1="67.31" y1="38.735" x2="69.85" y2="41.275" width="0" layer="19" extent="1-1"/>
+<wire x1="68.635828125" y1="34.0108625" x2="67.31" y2="37.705" width="0" layer="19" extent="1-16"/>
+<wire x1="61.03441875" y1="38.96061875" x2="64.135" y2="41.515" width="0" layer="19" extent="1-16"/>
+<wire x1="77.685" y1="41.275" x2="73.66" y2="40.64" width="0" layer="19" extent="1-1"/>
+<wire x1="83.185" y1="42.545" x2="78.74" y2="41.275" width="0" layer="19" extent="1-1"/>
+<wire x1="87.63" y1="42.15" x2="85.18" y2="42.29" width="0" layer="19" extent="1-16"/>
+<wire x1="31.15" y1="31.89" x2="29.845" y2="26.035" width="0" layer="19" extent="16-16"/>
+<wire x1="27.94" y1="33.415" x2="31.15" y2="31.89" width="0" layer="19" extent="16-16"/>
+<wire x1="21.2725" y1="58.6325" x2="29.21" y2="64.135" width="0" layer="19" extent="16-16"/>
+<wire x1="22.225" y1="51.675" x2="21.2725" y2="58.6325" width="0" layer="19" extent="16-16"/>
+<wire x1="24.13" y1="51.675" x2="22.225" y2="51.675" width="0" layer="19" extent="16-16"/>
+<wire x1="26.035" y1="51.675" x2="24.13" y2="51.675" width="0" layer="19" extent="16-16"/>
+<wire x1="27.94" y1="51.675" x2="26.035" y2="51.675" width="0" layer="19" extent="16-16"/>
+<wire x1="20.32" y1="51.675" x2="22.225" y2="51.675" width="0" layer="19" extent="16-16"/>
+<wire x1="31.15" y1="46.89" x2="27.94" y2="51.675" width="0" layer="19" extent="16-16"/>
+<wire x1="64.4525" y1="8.255" x2="52.705" y2="8.89" width="0" layer="19" extent="1-16"/>
+<wire x1="72.35" y1="15.875" x2="64.48" y2="12.455" width="0" layer="19" extent="1-1"/>
+<wire x1="77.18" y1="12.455" x2="72.35" y2="15.875" width="0" layer="19" extent="1-1"/>
+<wire x1="80.645" y1="12.485" x2="77.18" y2="12.455" width="0" layer="19" extent="1-16"/>
+<wire x1="83.355" y1="16.19" x2="80.645" y2="12.485" width="0" layer="19" extent="16-16"/>
+<wire x1="1.397" y1="18.479" x2="11.43" y2="7.62" width="0" layer="19" extent="16-16"/>
+<wire x1="4.047" y1="23.779" x2="1.397" y2="18.479" width="0" layer="19" extent="16-16"/>
+<wire x1="1.397" y1="26.479" x2="4.047" y2="23.779" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="VCC">
 <contactref element="U1" pad="48"/>
@@ -2711,9 +2739,12 @@ www.irf.com&lt;p&gt;
 <wire x1="68.34" y1="35.955" x2="68.58" y2="36.195" width="0.254" layer="1"/>
 <wire x1="67.31" y1="44.69" x2="67.31" y2="45.72" width="0.254" layer="1"/>
 <wire x1="71.12" y1="39.765" x2="70.245" y2="39.765" width="0.254" layer="1"/>
-<wire x1="70.245" y1="39.765" x2="69.5325" y2="39.0525" width="0.254" layer="1"/>
-<wire x1="69.5325" y1="39.0525" x2="68.58" y2="38.1" width="0.254" layer="1"/>
-<wire x1="68.58" y1="38.1" x2="68.58" y2="36.195" width="0.254" layer="1"/>
+<wire x1="70.245" y1="39.765" x2="68.58" y2="38.1" width="0.254" layer="1"/>
+<wire x1="68.58" y1="38.1" x2="68.58" y2="37.465" width="0.254" layer="1"/>
+<contactref element="BAT1" pad="+$1"/>
+<contactref element="BAT1" pad="+$2"/>
+<contactref element="J2" pad="2"/>
+<wire x1="68.58" y1="37.465" x2="68.58" y2="36.195" width="0.254" layer="1"/>
 <contactref element="PD1" pad="C"/>
 <contactref element="PD2" pad="C"/>
 <contactref element="P1" pad="32"/>
@@ -2780,6 +2811,7 @@ www.irf.com&lt;p&gt;
 <wire x1="80.01" y1="9.525" x2="80.01" y2="27.305" width="0.254" layer="1"/>
 <wire x1="80.01" y1="27.305" x2="79.375" y2="27.94" width="0.254" layer="1"/>
 <wire x1="73.025" y1="51.435" x2="67.31" y2="45.72" width="0.254" layer="1"/>
+<wire x1="68.9356" y1="37.465" x2="68.58" y2="37.465" width="0.254" layer="1"/>
 <wire x1="61.387971875" y1="38.607065625" x2="62.78590625" y2="40.005" width="0.254" layer="16"/>
 <wire x1="62.78590625" y1="40.005" x2="62.865" y2="40.005" width="0.254" layer="16"/>
 <via x="62.865" y="40.005" extent="1-16" drill="0.5"/>
@@ -2788,37 +2820,17 @@ www.irf.com&lt;p&gt;
 <wire x1="64.135" y1="39.765" x2="64.135" y2="38.1" width="0.254" layer="1"/>
 <wire x1="64.135" y1="38.1" x2="66.04" y2="36.195" width="0.254" layer="1"/>
 <wire x1="64.135" y1="39.765" x2="65.165" y2="39.765" width="0.254" layer="1"/>
+<wire x1="73.025" y1="51.435" x2="73.025" y2="71.755" width="0.254" layer="1"/>
+<via x="73.025" y="71.755" extent="1-16" drill="0.5"/>
 <contactref element="C21" pad="1"/>
 <via x="88.645" y="38.99" extent="1-16" drill="0.5"/>
 <wire x1="88.645" y1="38.99" x2="90.08" y2="38.99" width="0.254" layer="1"/>
 <wire x1="88.645" y1="38.99" x2="87.63" y2="40.005" width="0.254" layer="16"/>
 <wire x1="87.63" y1="40.005" x2="87.63" y2="40.4" width="0.254" layer="16"/>
-<contactref element="BAT1" pad="+$1"/>
-<contactref element="BAT1" pad="+$2"/>
 <contactref element="BAT2" pad="+$2"/>
 <contactref element="BAT2" pad="+$1"/>
-<contactref element="R6" pad="2"/>
-<via x="73.025" y="71.755" extent="1-16" drill="0.5"/>
 <via x="98.425" y="71.755" extent="1-16" drill="0.5"/>
-<contactref element="C5" pad="1"/>
-<contactref element="U1" pad="7"/>
-<contactref element="BREAKOUT1" pad="7"/>
-<wire x1="41.91" y1="6.35" x2="41.91" y2="10.795" width="0.254" layer="16"/>
-<wire x1="41.91" y1="10.795" x2="52.705" y2="10.795" width="0.254" layer="16"/>
-<wire x1="52.705" y1="10.795" x2="74.93" y2="33.02" width="0.254" layer="16"/>
-<wire x1="74.93" y1="34.080678125" x2="74.93" y2="33.02" width="0.254" layer="16"/>
-<wire x1="71.817821875" y1="37.19285625" x2="74.93" y2="34.080678125" width="0.254" layer="16"/>
-<wire x1="71.995" y1="36.59" x2="72.39" y2="36.59" width="0.254" layer="1"/>
-<wire x1="73.025" y1="51.435" x2="73.025" y2="71.755" width="0.254" layer="1"/>
-<wire x1="80.86" y1="59.055" x2="89.535" y2="59.055" width="0.254" layer="16"/>
-<wire x1="89.535" y1="59.055" x2="98.425" y2="67.945" width="0.254" layer="16"/>
-<wire x1="98.425" y1="67.945" x2="98.425" y2="71.755" width="0.254" layer="16"/>
-<wire x1="71.817821875" y1="37.19285625" x2="69.958178125" y2="39.0525" width="0.254" layer="16"/>
-<wire x1="69.958178125" y1="39.0525" x2="69.5325" y2="39.0525" width="0.254" layer="16"/>
-<via x="69.5325" y="39.0525" extent="1-16" drill="0.5"/>
-<wire x1="69.5325" y1="39.0525" x2="69.9275" y2="39.0525" width="0.254" layer="1"/>
-<wire x1="69.9275" y1="39.0525" x2="72.39" y2="36.59" width="0.254" layer="1"/>
-<wire x1="73.025" y1="51.435" x2="80.86" y2="59.055" width="0" layer="19" extent="1-16"/>
+<wire x1="73.025" y1="71.755" x2="98.425" y2="71.755" width="0" layer="19" extent="16-16"/>
 <wire x1="69.703478125" y1="35.071521875" x2="69.696484375" y2="35.071521875" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="PTA3">
@@ -2947,20 +2959,6 @@ www.irf.com&lt;p&gt;
 <contactref element="USB" pad="VBUS"/>
 <wire x1="4.125" y1="21.179" x2="9.936" y2="21.179" width="0.254" layer="16"/>
 <wire x1="9.936" y1="21.179" x2="10.795" y2="20.32" width="0.254" layer="16"/>
-<contactref element="R5" pad="2"/>
-<contactref element="Q3" pad="1"/>
-<wire x1="76.515" y1="61.13" x2="76.515" y2="57.25" width="0.254" layer="16"/>
-<wire x1="76.515" y1="57.25" x2="76.415" y2="57.15" width="0.254" layer="16"/>
-<wire x1="71.46425" y1="36.8392875" x2="70.5210375" y2="37.7825" width="0.254" layer="16"/>
-<wire x1="70.5210375" y1="37.7825" x2="69.5325" y2="37.7825" width="0.254" layer="16"/>
-<via x="69.5325" y="37.7825" extent="1-16" drill="0.5"/>
-<wire x1="69.5325" y1="37.7825" x2="72.0725" y2="35.2425" width="0.254" layer="1"/>
-<wire x1="72.0725" y1="35.2425" x2="74.295" y2="35.2425" width="0.254" layer="1"/>
-<wire x1="74.295" y1="35.2425" x2="74.6125" y2="35.56" width="0.254" layer="1"/>
-<wire x1="74.6125" y1="35.56" x2="74.6125" y2="55.245" width="0.254" layer="1"/>
-<via x="74.6125" y="55.245" extent="1-16" drill="0.5"/>
-<wire x1="74.6125" y1="55.245" x2="76.415" y2="57.0475" width="0.254" layer="16"/>
-<wire x1="76.415" y1="57.0475" x2="76.415" y2="57.15" width="0.254" layer="16"/>
 </signal>
 <signal name="PTE20">
 <contactref element="U1" pad="9"/>
@@ -3564,6 +3562,25 @@ www.irf.com&lt;p&gt;
 <wire x1="11.43" y1="73.025" x2="11.43" y2="74.93" width="0.254" layer="16"/>
 <wire x1="52.07" y1="54.61" x2="29.845" y2="54.61" width="0.254" layer="16"/>
 </signal>
+<signal name="VOUT33">
+<via x="70.485" y="38.1" extent="1-16" drill="0.5"/>
+<contactref element="C5" pad="1"/>
+<contactref element="BREAKOUT1" pad="7"/>
+<contactref element="J2" pad="1"/>
+<wire x1="70.910675" y1="38.1" x2="70.485" y2="38.1" width="0.254" layer="16"/>
+<wire x1="41.91" y1="6.35" x2="41.91" y2="10.795" width="0.254" layer="16"/>
+<wire x1="41.91" y1="10.795" x2="52.705" y2="10.795" width="0.254" layer="16"/>
+<wire x1="52.705" y1="10.795" x2="74.93" y2="33.02" width="0.254" layer="16"/>
+<wire x1="74.93" y1="34.080678125" x2="74.93" y2="33.02" width="0.254" layer="16"/>
+<contactref element="U1" pad="7"/>
+<wire x1="71.817821875" y1="37.19285625" x2="74.93" y2="34.080678125" width="0.254" layer="16"/>
+<wire x1="71.817821875" y1="37.19285625" x2="70.910678125" y2="38.1" width="0.254" layer="16"/>
+<wire x1="70.910678125" y1="38.1" x2="70.485" y2="38.1" width="0.254" layer="16"/>
+<wire x1="72.39" y1="36.59" x2="71.995" y2="36.59" width="0.254" layer="1"/>
+<wire x1="71.995" y1="36.59" x2="70.485" y2="38.1" width="0.254" layer="1"/>
+<wire x1="69.4944" y1="37.465" x2="69.85" y2="37.465" width="0.254" layer="1"/>
+<wire x1="69.85" y1="37.465" x2="70.485" y2="38.1" width="0.254" layer="1"/>
+</signal>
 <signal name="N$2">
 <contactref element="P1" pad="40"/>
 <contactref element="P1" pad="39"/>
@@ -3813,36 +3830,12 @@ www.irf.com&lt;p&gt;
 <wire x1="75.985" y1="42.965" x2="76.835" y2="43.815" width="0.254" layer="1"/>
 <wire x1="76.835" y1="43.815" x2="90.805" y2="43.815" width="0.254" layer="1"/>
 </signal>
-<signal name="N$31">
-<contactref element="BAT1" pad="-"/>
-<contactref element="BAT2" pad="-"/>
-<contactref element="Q2" pad="3"/>
-<via x="85.725" y="71.755" extent="1-16" drill="0.5"/>
-<wire x1="71.12" y1="63.33" x2="71.12" y2="67.31" width="0.254" layer="16"/>
-<wire x1="71.12" y1="67.31" x2="71.755" y2="67.945" width="0.254" layer="16"/>
-<wire x1="71.755" y1="67.945" x2="81.915" y2="67.945" width="0.254" layer="16"/>
-<wire x1="81.915" y1="67.945" x2="85.725" y2="71.755" width="0.254" layer="16"/>
-</signal>
-<signal name="N$32">
-<contactref element="Q2" pad="1"/>
-<contactref element="Q3" pad="3"/>
-<contactref element="R6" pad="1"/>
-<wire x1="72.07" y1="61.13" x2="72.56" y2="61.13" width="0.254" layer="16"/>
-<wire x1="72.56" y1="61.13" x2="73.025" y2="61.595" width="0.254" layer="16"/>
-<wire x1="73.025" y1="61.595" x2="73.025" y2="62.865" width="0.254" layer="16"/>
-<wire x1="75.565" y1="63.33" x2="73.49" y2="63.33" width="0.254" layer="16"/>
-<wire x1="73.49" y1="63.33" x2="73.025" y2="62.865" width="0.254" layer="16"/>
-<wire x1="72.175" y1="61.025" x2="72.07" y2="61.13" width="0.254" layer="16"/>
-<wire x1="79.16" y1="59.055" x2="79.16" y2="61.175" width="0.254" layer="16"/>
-<wire x1="75.565" y1="63.33" x2="77.005" y2="63.33" width="0.254" layer="16"/>
-<wire x1="77.005" y1="63.33" x2="79.16" y2="61.175" width="0.254" layer="16"/>
-</signal>
 </signals>
 <errors>
-<approved hash="19,1,09184da6418375c1"/>
 <approved hash="19,1,4009389685838de0"/>
-<approved hash="19,1,b13f81038015b029"/>
+<approved hash="19,1,09184da6418375c1"/>
 <approved hash="19,1,b277824b837db341"/>
+<approved hash="19,1,b13f81038015b029"/>
 <approved hash="19,1,201b79316db2e4e5"/>
 <approved hash="19,1,85d1e09ae729521f"/>
 <approved hash="19,1,c33ac306c200c23c"/>
diff --git a/laser-tag badge/laser-tag.sch b/laser-tag badge/laser-tag.sch
index 154b619..09a1321 100644
--- a/laser-tag badge/laser-tag.sch
+++ b/laser-tag badge/laser-tag.sch
@@ -7404,6 +7404,11 @@ Source: http://www3.alps.co.jp/WebObjects/catalog.woa/PDF/E/Switch/Tact/SKHM/SKH
 <smd name="2" x="0.2794" y="0" dx="0.8128" dy="0.4064" layer="1" rot="R90" cream="no"/>
 <wire x1="-0.254" y1="0" x2="0.254" y2="0" width="0.254" layer="1"/>
 </package>
+<package name="JUMPER_SOLDER_1X2_OPEN">
+<description>Solder jumper 6mil clearance</description>
+<smd name="1" x="-0.2794" y="0" dx="0.8128" dy="0.4064" layer="1" rot="R90" cream="no"/>
+<smd name="2" x="0.2794" y="0" dx="0.8128" dy="0.4064" layer="1" rot="R90" cream="no"/>
+</package>
 </packages>
 <symbols>
 <symbol name="JUMP_SOLDER_1X2_CLOSED">
@@ -7424,6 +7429,23 @@ Source: http://www3.alps.co.jp/WebObjects/catalog.woa/PDF/E/Switch/Tact/SKHM/SKH
 </polygon>
 <wire x1="-0.762" y1="0" x2="0.762" y2="0" width="0.254" layer="94"/>
 </symbol>
+<symbol name="JUMP_SOLDER_1X2_OPEN">
+<wire x1="-2.54" y1="0" x2="-1.524" y2="0" width="0.1524" layer="94"/>
+<wire x1="2.54" y1="0" x2="1.524" y2="0" width="0.1524" layer="94"/>
+<text x="-4.318" y="2.54" size="1.778" layer="95">&gt;NAME</text>
+<pin name="1" x="-5.08" y="0" visible="off" length="short" direction="pas"/>
+<pin name="2" x="5.08" y="0" visible="off" length="short" direction="pas" rot="R180"/>
+<polygon width="0.254" layer="94">
+<vertex x="-0.635" y="0.9137"/>
+<vertex x="-0.635" y="-0.9137" curve="-90"/>
+<vertex x="-1.5875" y="0" curve="-90"/>
+</polygon>
+<polygon width="0.254" layer="94">
+<vertex x="0.635" y="-0.9137"/>
+<vertex x="0.635" y="0.9137" curve="-90"/>
+<vertex x="1.5875" y="0" curve="-90"/>
+</polygon>
+</symbol>
 </symbols>
 <devicesets>
 <deviceset name="JUMPER_SOLDER_1X2_CLOSED" prefix="J">
@@ -7442,6 +7464,22 @@ Source: http://www3.alps.co.jp/WebObjects/catalog.woa/PDF/E/Switch/Tact/SKHM/SKH
 </device>
 </devices>
 </deviceset>
+<deviceset name="JUMPER_SOLDER_1X2_OPEN" prefix="J">
+<gates>
+<gate name="J" symbol="JUMP_SOLDER_1X2_OPEN" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="JUMPER_SOLDER_1X2_OPEN">
+<connects>
+<connect gate="J" pin="1" pad="1"/>
+<connect gate="J" pin="2" pad="2"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
 </devicesets>
 </library>
 <library name="Displays">
@@ -8617,6 +8655,7 @@ www.irf.com&lt;p&gt;
 <part name="GND8" library="supply1" deviceset="GND" device=""/>
 <part name="J1" library="Jumpers" deviceset="JUMPER_SOLDER_1X2_CLOSED" device=""/>
 <part name="J3" library="Jumpers" deviceset="JUMPER_SOLDER_1X2_CLOSED" device=""/>
+<part name="J2" library="Jumpers" deviceset="JUMPER_SOLDER_1X2_OPEN" device=""/>
 <part name="PD1" library="Photonics" deviceset="PDB-C156" device=""/>
 <part name="PD2" library="Photonics" deviceset="PDB-C156" device=""/>
 <part name="P1" library="Displays" deviceset="E1260CS021" device=""/>
@@ -8656,12 +8695,6 @@ www.irf.com&lt;p&gt;
 <part name="U$3" library="adafruit" deviceset="FIDUCIAL" device=""/>
 <part name="U$4" library="adafruit" deviceset="FIDUCIAL" device=""/>
 <part name="Q1" library="transistor-small-signal" deviceset="BSS123" device="" value="2N7002"/>
-<part name="GND4" library="supply1" deviceset="GND" device=""/>
-<part name="Q2" library="transistor-small-signal" deviceset="BSS123" device=""/>
-<part name="Q3" library="transistor-small-signal" deviceset="BSS123" device=""/>
-<part name="R5" library="rcl" deviceset="R-EU_" device="R0603" value="10k"/>
-<part name="R6" library="rcl" deviceset="R-EU_" device="R0603" value="10k"/>
-<part name="P+4" library="supply1" deviceset="VCC" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -8676,9 +8709,9 @@ support interrupts</text>
 </plain>
 <instances>
 <instance part="U1" gate="A" x="10.16" y="99.06"/>
-<instance part="BAT1" gate="G$1" x="-76.2" y="-17.78" rot="R90"/>
+<instance part="BAT1" gate="G$1" x="-114.3" y="88.9" rot="R90"/>
 <instance part="P+3" gate="VCC" x="-101.6" y="104.14"/>
-<instance part="GND3" gate="1" x="-86.36" y="-53.34"/>
+<instance part="GND3" gate="1" x="-114.3" y="76.2"/>
 <instance part="C1" gate="G$1" x="-101.6" y="91.44"/>
 <instance part="C2" gate="G$1" x="-91.44" y="91.44"/>
 <instance part="C3" gate="G$1" x="-81.28" y="91.44"/>
@@ -8692,14 +8725,15 @@ support interrupts</text>
 <instance part="R1" gate="G$1" x="-38.1" y="78.74" rot="R90"/>
 <instance part="GND2" gate="1" x="-38.1" y="68.58"/>
 <instance part="R2" gate="G$1" x="-17.78" y="86.36" rot="R90"/>
-<instance part="C5" gate="G$1" x="-2.54" y="81.28"/>
-<instance part="GND5" gate="1" x="-2.54" y="71.12"/>
-<instance part="P+5" gate="VCC" x="-2.54" y="91.44"/>
+<instance part="C5" gate="G$1" x="-58.42" y="81.28"/>
+<instance part="GND5" gate="1" x="-58.42" y="71.12"/>
+<instance part="P+5" gate="VCC" x="-58.42" y="106.68"/>
 <instance part="S1" gate="G$1" x="147.32" y="27.94"/>
 <instance part="S2" gate="G$1" x="147.32" y="43.18"/>
 <instance part="GND8" gate="1" x="157.48" y="17.78"/>
 <instance part="J1" gate="J" x="2.54" y="96.52"/>
 <instance part="J3" gate="J" x="2.54" y="58.42"/>
+<instance part="J2" gate="J" x="-58.42" y="93.98" rot="R90"/>
 <instance part="PD1" gate="G$1" x="-38.1" y="93.98" rot="R180"/>
 <instance part="PD2" gate="G$1" x="-33.02" y="93.98" rot="R180"/>
 <instance part="P1" gate="G$1" x="30.48" y="-53.34"/>
@@ -8732,26 +8766,26 @@ support interrupts</text>
 <instance part="GND9" gate="1" x="-45.72" y="-2.54"/>
 <instance part="C21" gate="G$1" x="-20.32" y="43.18"/>
 <instance part="R4" gate="G$1" x="-10.16" y="66.04" rot="R90"/>
-<instance part="BAT2" gate="G$1" x="-86.36" y="-17.78" rot="R90"/>
+<instance part="BAT2" gate="G$1" x="-124.46" y="88.9" rot="R90"/>
 <instance part="USB" gate="G$1" x="-104.14" y="10.16" rot="R180"/>
 <instance part="U$1" gate="G$1" x="127" y="-2.54"/>
 <instance part="U$2" gate="G$1" x="134.62" y="-2.54"/>
 <instance part="U$3" gate="G$1" x="127" y="-10.16"/>
 <instance part="U$4" gate="G$1" x="134.62" y="-10.16"/>
 <instance part="Q1" gate="G$1" x="-17.78" y="73.66" rot="MR0"/>
-<instance part="GND4" gate="1" x="-101.6" y="76.2"/>
-<instance part="Q2" gate="G$1" x="-86.36" y="-30.48"/>
-<instance part="Q3" gate="G$1" x="-99.06" y="-40.64"/>
-<instance part="R5" gate="G$1" x="-106.68" y="-50.8" rot="R90"/>
-<instance part="R6" gate="G$1" x="-99.06" y="-17.78" rot="R90"/>
-<instance part="P+4" gate="VCC" x="-73.66" y="-5.08"/>
 </instances>
 <busses>
 </busses>
 <nets>
 <net name="GND" class="0">
 <segment>
+<pinref part="BAT1" gate="G$1" pin="-"/>
+<pinref part="GND3" gate="1" pin="GND"/>
+<wire x1="-114.3" y1="83.82" x2="-114.3" y2="81.28" width="0.1524" layer="91"/>
 <pinref part="C1" gate="G$1" pin="2"/>
+<wire x1="-114.3" y1="81.28" x2="-114.3" y2="78.74" width="0.1524" layer="91"/>
+<wire x1="-114.3" y1="81.28" x2="-101.6" y2="81.28" width="0.1524" layer="91"/>
+<junction x="-114.3" y="81.28"/>
 <pinref part="C2" gate="G$1" pin="2"/>
 <wire x1="-101.6" y1="81.28" x2="-101.6" y2="86.36" width="0.1524" layer="91"/>
 <wire x1="-101.6" y1="81.28" x2="-91.44" y2="81.28" width="0.1524" layer="91"/>
@@ -8765,8 +8799,9 @@ support interrupts</text>
 <wire x1="-81.28" y1="81.28" x2="-71.12" y2="81.28" width="0.1524" layer="91"/>
 <wire x1="-71.12" y1="81.28" x2="-71.12" y2="86.36" width="0.1524" layer="91"/>
 <junction x="-81.28" y="81.28"/>
-<pinref part="GND4" gate="1" pin="GND"/>
-<wire x1="-101.6" y1="81.28" x2="-101.6" y2="78.74" width="0.1524" layer="91"/>
+<pinref part="BAT2" gate="G$1" pin="-"/>
+<wire x1="-114.3" y1="81.28" x2="-124.46" y2="81.28" width="0.1524" layer="91"/>
+<wire x1="-124.46" y1="81.28" x2="-124.46" y2="83.82" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U1" gate="A" pin="VSSA"/>
@@ -8820,7 +8855,7 @@ support interrupts</text>
 <segment>
 <pinref part="C5" gate="G$1" pin="2"/>
 <pinref part="GND5" gate="1" pin="GND"/>
-<wire x1="-2.54" y1="76.2" x2="-2.54" y2="73.66" width="0.1524" layer="91"/>
+<wire x1="-58.42" y1="76.2" x2="-58.42" y2="73.66" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="S1" gate="G$1" pin="2.2"/>
@@ -8910,21 +8945,6 @@ support interrupts</text>
 <pinref part="SP1" gate="S1" pin="+"/>
 <wire x1="-45.72" y1="0" x2="-45.72" y2="2.54" width="0.1524" layer="91"/>
 </segment>
-<segment>
-<pinref part="Q2" gate="G$1" pin="S"/>
-<pinref part="GND3" gate="1" pin="GND"/>
-<wire x1="-86.36" y1="-35.56" x2="-86.36" y2="-48.26" width="0.1524" layer="91"/>
-<pinref part="Q3" gate="G$1" pin="S"/>
-<wire x1="-86.36" y1="-48.26" x2="-86.36" y2="-50.8" width="0.1524" layer="91"/>
-<wire x1="-99.06" y1="-45.72" x2="-99.06" y2="-48.26" width="0.1524" layer="91"/>
-<wire x1="-99.06" y1="-48.26" x2="-86.36" y2="-48.26" width="0.1524" layer="91"/>
-<junction x="-86.36" y="-48.26"/>
-<pinref part="R5" gate="G$1" pin="1"/>
-<wire x1="-106.68" y1="-55.88" x2="-106.68" y2="-58.42" width="0.1524" layer="91"/>
-<wire x1="-106.68" y1="-58.42" x2="-99.06" y2="-58.42" width="0.1524" layer="91"/>
-<wire x1="-99.06" y1="-58.42" x2="-99.06" y2="-48.26" width="0.1524" layer="91"/>
-<junction x="-99.06" y="-48.26"/>
-</segment>
 </net>
 <net name="VCC" class="0">
 <segment>
@@ -8995,7 +9015,27 @@ support interrupts</text>
 <wire x1="-101.6" y1="101.6" x2="-101.6" y2="96.52" width="0.1524" layer="91"/>
 <junction x="-101.6" y="96.52"/>
 <pinref part="P+3" gate="VCC" pin="VCC"/>
+<pinref part="BAT1" gate="G$1" pin="+"/>
+<pinref part="BAT1" gate="G$1" pin="+1"/>
+<wire x1="-111.76" y1="93.98" x2="-111.76" y2="96.52" width="0.1524" layer="91"/>
+<wire x1="-111.76" y1="96.52" x2="-116.84" y2="96.52" width="0.1524" layer="91"/>
+<wire x1="-116.84" y1="96.52" x2="-116.84" y2="93.98" width="0.1524" layer="91"/>
+<wire x1="-111.76" y1="96.52" x2="-101.6" y2="96.52" width="0.1524" layer="91"/>
+<junction x="-111.76" y="96.52"/>
 <junction x="-101.6" y="96.52"/>
+<pinref part="BAT2" gate="G$1" pin="+1"/>
+<wire x1="-121.92" y1="93.98" x2="-121.92" y2="96.52" width="0.1524" layer="91"/>
+<wire x1="-121.92" y1="96.52" x2="-116.84" y2="96.52" width="0.1524" layer="91"/>
+<junction x="-116.84" y="96.52"/>
+<pinref part="BAT2" gate="G$1" pin="+"/>
+<wire x1="-127" y1="93.98" x2="-127" y2="96.52" width="0.1524" layer="91"/>
+<wire x1="-127" y1="96.52" x2="-121.92" y2="96.52" width="0.1524" layer="91"/>
+<junction x="-121.92" y="96.52"/>
+</segment>
+<segment>
+<pinref part="P+5" gate="VCC" pin="VCC"/>
+<wire x1="-58.42" y1="104.14" x2="-58.42" y2="99.06" width="0.1524" layer="91"/>
+<pinref part="J2" gate="J" pin="2"/>
 </segment>
 <segment>
 <pinref part="P1" gate="G$1" pin="VDD"/>
@@ -9016,44 +9056,6 @@ support interrupts</text>
 <wire x1="-20.32" y1="45.72" x2="-30.48" y2="45.72" width="0.1524" layer="91"/>
 <junction x="-30.48" y="45.72"/>
 </segment>
-<segment>
-<pinref part="BAT1" gate="G$1" pin="+"/>
-<wire x1="-78.74" y1="-10.16" x2="-78.74" y2="-12.7" width="0.1524" layer="91"/>
-<pinref part="BAT2" gate="G$1" pin="+1"/>
-<wire x1="-83.82" y1="-12.7" x2="-83.82" y2="-10.16" width="0.1524" layer="91"/>
-<pinref part="BAT2" gate="G$1" pin="+"/>
-<wire x1="-88.9" y1="-12.7" x2="-88.9" y2="-10.16" width="0.1524" layer="91"/>
-<wire x1="-88.9" y1="-10.16" x2="-83.82" y2="-10.16" width="0.1524" layer="91"/>
-<junction x="-83.82" y="-10.16"/>
-<wire x1="-83.82" y1="-10.16" x2="-78.74" y2="-10.16" width="0.1524" layer="91"/>
-<junction x="-78.74" y="-10.16"/>
-<pinref part="BAT1" gate="G$1" pin="+1"/>
-<wire x1="-73.66" y1="-12.7" x2="-73.66" y2="-10.16" width="0.1524" layer="91"/>
-<wire x1="-73.66" y1="-10.16" x2="-78.74" y2="-10.16" width="0.1524" layer="91"/>
-<pinref part="R6" gate="G$1" pin="2"/>
-<wire x1="-99.06" y1="-12.7" x2="-99.06" y2="-10.16" width="0.1524" layer="91"/>
-<wire x1="-99.06" y1="-10.16" x2="-88.9" y2="-10.16" width="0.1524" layer="91"/>
-<junction x="-88.9" y="-10.16"/>
-<pinref part="P+4" gate="VCC" pin="VCC"/>
-<wire x1="-73.66" y1="-7.62" x2="-73.66" y2="-10.16" width="0.1524" layer="91"/>
-<junction x="-73.66" y="-10.16"/>
-</segment>
-<segment>
-<pinref part="C5" gate="G$1" pin="1"/>
-<wire x1="-2.54" y1="83.82" x2="-2.54" y2="86.36" width="0.1524" layer="91"/>
-<pinref part="P+5" gate="VCC" pin="VCC"/>
-<pinref part="U1" gate="A" pin="VOUT33"/>
-<wire x1="-2.54" y1="86.36" x2="-2.54" y2="88.9" width="0.1524" layer="91"/>
-<wire x1="10.16" y1="83.82" x2="2.54" y2="83.82" width="0.1524" layer="91"/>
-<wire x1="2.54" y1="83.82" x2="2.54" y2="86.36" width="0.1524" layer="91"/>
-<wire x1="2.54" y1="86.36" x2="-2.54" y2="86.36" width="0.1524" layer="91"/>
-<junction x="-2.54" y="86.36"/>
-</segment>
-<segment>
-<pinref part="BREAKOUT1" gate="A" pin="7"/>
-<wire x1="-111.76" y1="53.34" x2="-116.84" y2="53.34" width="0.1524" layer="91"/>
-<label x="-116.84" y="53.34" size="1.778" layer="95" rot="R180"/>
-</segment>
 </net>
 <net name="PTA3" class="0">
 <segment>
@@ -9167,15 +9169,6 @@ support interrupts</text>
 <label x="-96.52" y="7.62" size="1.778" layer="95"/>
 <pinref part="USB" gate="G$1" pin="VBUS"/>
 </segment>
-<segment>
-<pinref part="R5" gate="G$1" pin="2"/>
-<pinref part="Q3" gate="G$1" pin="G"/>
-<wire x1="-106.68" y1="-45.72" x2="-106.68" y2="-43.18" width="0.1524" layer="91"/>
-<wire x1="-106.68" y1="-43.18" x2="-104.14" y2="-43.18" width="0.1524" layer="91"/>
-<wire x1="-106.68" y1="-43.18" x2="-106.68" y2="-38.1" width="0.1524" layer="91"/>
-<junction x="-106.68" y="-43.18"/>
-<label x="-106.68" y="-38.1" size="1.778" layer="95" rot="R180"/>
-</segment>
 </net>
 <net name="PTE20" class="0">
 <segment>
@@ -9775,6 +9768,27 @@ support interrupts</text>
 <label x="-76.2" y="60.96" size="1.778" layer="95" rot="R180"/>
 </segment>
 </net>
+<net name="VOUT33" class="0">
+<segment>
+<pinref part="C5" gate="G$1" pin="1"/>
+<wire x1="-58.42" y1="83.82" x2="-58.42" y2="86.36" width="0.1524" layer="91"/>
+<pinref part="J2" gate="J" pin="1"/>
+<wire x1="-58.42" y1="86.36" x2="-58.42" y2="88.9" width="0.1524" layer="91"/>
+<wire x1="-58.42" y1="86.36" x2="-55.88" y2="86.36" width="0.1524" layer="91"/>
+<junction x="-58.42" y="86.36"/>
+<label x="-55.88" y="86.36" size="1.778" layer="95"/>
+</segment>
+<segment>
+<pinref part="BREAKOUT1" gate="A" pin="7"/>
+<wire x1="-111.76" y1="53.34" x2="-116.84" y2="53.34" width="0.1524" layer="91"/>
+<label x="-116.84" y="53.34" size="1.778" layer="95" rot="R180"/>
+</segment>
+<segment>
+<pinref part="U1" gate="A" pin="VOUT33"/>
+<wire x1="10.16" y1="83.82" x2="7.62" y2="83.82" width="0.1524" layer="91"/>
+<junction x="7.62" y="83.82"/>
+</segment>
+</net>
 <net name="N$2" class="0">
 <segment>
 <pinref part="P1" gate="G$1" pin="VCOM_PANEL"/>
@@ -10047,28 +10061,6 @@ support interrupts</text>
 <pinref part="PD2" gate="G$1" pin="A"/>
 </segment>
 </net>
-<net name="N$31" class="0">
-<segment>
-<pinref part="BAT2" gate="G$1" pin="-"/>
-<wire x1="-86.36" y1="-25.4" x2="-86.36" y2="-22.86" width="0.1524" layer="91"/>
-<wire x1="-76.2" y1="-25.4" x2="-86.36" y2="-25.4" width="0.1524" layer="91"/>
-<pinref part="BAT1" gate="G$1" pin="-"/>
-<wire x1="-76.2" y1="-22.86" x2="-76.2" y2="-25.4" width="0.1524" layer="91"/>
-<pinref part="Q2" gate="G$1" pin="D"/>
-<junction x="-86.36" y="-25.4"/>
-</segment>
-</net>
-<net name="N$32" class="0">
-<segment>
-<pinref part="Q2" gate="G$1" pin="G"/>
-<wire x1="-91.44" y1="-33.02" x2="-99.06" y2="-33.02" width="0.1524" layer="91"/>
-<pinref part="Q3" gate="G$1" pin="D"/>
-<wire x1="-99.06" y1="-33.02" x2="-99.06" y2="-35.56" width="0.1524" layer="91"/>
-<pinref part="R6" gate="G$1" pin="1"/>
-<wire x1="-99.06" y1="-22.86" x2="-99.06" y2="-33.02" width="0.1524" layer="91"/>
-<junction x="-99.06" y="-33.02"/>
-</segment>
-</net>
 </nets>
 </sheet>
 </sheets>