Tweak AGC, wire laser to switch1

2 files changed, 54 insertions, 43 deletions

diff --git a/laser-tag badge/laser-tag.brd b/laser-tag badge/laser-tag.brd
index ed0141a..1e90d19 100644
--- a/laser-tag badge/laser-tag.brd
+++ b/laser-tag badge/laser-tag.brd
@@ -3200,16 +3200,14 @@ design rules under a new name.</description>
 <wire x1="27.94" y1="33.02" x2="26.67" y2="34.29" width="0.254" layer="16"/>
 </signal>
 <signal name="PTB3">
-<contactref element="U1" pad="38"/>
 <contactref element="BREAKOUT2" pad="6"/>
-<wire x1="37.5464125" y1="40.858628125" x2="31.115" y2="34.42721875" width="0.254" layer="16"/>
 <wire x1="31.115" y1="34.42721875" x2="31.115" y2="33.02" width="0.254" layer="16"/>
 <wire x1="31.115" y1="33.02" x2="29.845" y2="31.75" width="0.254" layer="16"/>
 <wire x1="29.845" y1="31.75" x2="29.21" y2="31.75" width="0.254" layer="16"/>
 <contactref element="S4" pad="2"/>
 <contactref element="S4" pad="1"/>
 <wire x1="63.11" y1="50.51" x2="71.51" y2="50.51" width="0" layer="19" extent="1-1"/>
-<wire x1="37.5464125" y1="40.858628125" x2="63.11" y2="50.51" width="0" layer="19" extent="1-16"/>
+<wire x1="31.115" y1="34.42721875" x2="63.11" y2="50.51" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="PTB2">
 <contactref element="U1" pad="37"/>
@@ -3221,10 +3219,6 @@ design rules under a new name.</description>
 <wire x1="30.48" y1="31.115" x2="29.845" y2="30.48" width="0.254" layer="16"/>
 <wire x1="29.845" y1="30.48" x2="27.94" y2="30.48" width="0.254" layer="16"/>
 <wire x1="27.94" y1="30.48" x2="26.67" y2="31.75" width="0.254" layer="16"/>
-<contactref element="S3" pad="2"/>
-<contactref element="S3" pad="1"/>
-<wire x1="63.11" y1="61.94" x2="71.51" y2="61.94" width="0" layer="19" extent="1-1"/>
-<wire x1="37.899965625" y1="40.505075" x2="63.11" y2="61.94" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="PTB1">
 <contactref element="U1" pad="36"/>
@@ -3235,10 +3229,6 @@ design rules under a new name.</description>
 <wire x1="31.115" y1="31.75" x2="31.115" y2="30.48" width="0.254" layer="16"/>
 <wire x1="31.115" y1="30.48" x2="29.845" y2="29.21" width="0.254" layer="16"/>
 <wire x1="29.845" y1="29.21" x2="29.21" y2="29.21" width="0.254" layer="16"/>
-<contactref element="S2" pad="2"/>
-<contactref element="S2" pad="1"/>
-<wire x1="9.77" y1="50.51" x2="18.17" y2="50.51" width="0" layer="19" extent="1-1"/>
-<wire x1="32.385" y1="34.28300625" x2="18.17" y2="50.51" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="PTB0">
 <contactref element="U1" pad="35"/>
@@ -3253,10 +3243,6 @@ design rules under a new name.</description>
 <wire x1="29.845" y1="27.94" x2="28.575" y2="27.94" width="0.254" layer="16"/>
 <wire x1="28.575" y1="27.94" x2="27.305" y2="29.21" width="0.254" layer="16"/>
 <wire x1="27.305" y1="29.21" x2="26.67" y2="29.21" width="0.254" layer="16"/>
-<contactref element="S1" pad="2"/>
-<contactref element="S1" pad="1"/>
-<wire x1="9.77" y1="61.94" x2="18.17" y2="61.94" width="0" layer="19" extent="1-1"/>
-<wire x1="38.60706875" y1="39.79796875" x2="18.17" y2="61.94" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="PTA19">
 <contactref element="U1" pad="33"/>
@@ -3406,6 +3392,22 @@ design rules under a new name.</description>
 <contactref element="J10" pad="2"/>
 <wire x1="46.355" y1="67.5894" x2="46.64" y2="69.73" width="0" layer="19" extent="1-1"/>
 </signal>
+<signal name="N$2">
+<contactref element="U1" pad="38"/>
+</signal>
+<signal name="N$4">
+<contactref element="S3" pad="2"/>
+<contactref element="S3" pad="1"/>
+<wire x1="63.11" y1="61.94" x2="71.51" y2="61.94" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$12">
+<contactref element="S2" pad="2"/>
+<contactref element="S2" pad="1"/>
+<wire x1="9.77" y1="50.51" x2="18.17" y2="50.51" width="0" layer="19" extent="1-1"/>
+</signal>
+<signal name="N$20">
+<contactref element="S1" pad="1"/>
+</signal>
 </signals>
 </board>
 </drawing>
diff --git a/laser-tag badge/laser-tag.sch b/laser-tag badge/laser-tag.sch
index 7189384..54b6652 100644
--- a/laser-tag badge/laser-tag.sch
+++ b/laser-tag badge/laser-tag.sch
@@ -10695,12 +10695,9 @@ support interrupts</text>
 </net>
 <net name="PTB3" class="0">
 <segment>
-<pinref part="U1" gate="A" pin="PTB3"/>
 <pinref part="S4" gate="G$1" pin="1.2"/>
 <wire x1="142.24" y1="71.12" x2="139.7" y2="71.12" width="0.1524" layer="91"/>
 <wire x1="139.7" y1="71.12" x2="132.08" y2="71.12" width="0.1524" layer="91"/>
-<wire x1="132.08" y1="71.12" x2="132.08" y2="33.02" width="0.1524" layer="91"/>
-<wire x1="132.08" y1="33.02" x2="116.84" y2="33.02" width="0.1524" layer="91"/>
 <pinref part="S4" gate="G$1" pin="1.1"/>
 <wire x1="142.24" y1="73.66" x2="139.7" y2="73.66" width="0.1524" layer="91"/>
 <wire x1="139.7" y1="73.66" x2="139.7" y2="71.12" width="0.1524" layer="91"/>
@@ -10715,15 +10712,7 @@ support interrupts</text>
 <net name="PTB2" class="0">
 <segment>
 <pinref part="U1" gate="A" pin="PTB2"/>
-<pinref part="S3" gate="G$1" pin="1.2"/>
-<wire x1="142.24" y1="55.88" x2="139.7" y2="55.88" width="0.1524" layer="91"/>
-<wire x1="139.7" y1="55.88" x2="134.62" y2="55.88" width="0.1524" layer="91"/>
-<wire x1="134.62" y1="55.88" x2="134.62" y2="30.48" width="0.1524" layer="91"/>
-<wire x1="134.62" y1="30.48" x2="116.84" y2="30.48" width="0.1524" layer="91"/>
-<pinref part="S3" gate="G$1" pin="1.1"/>
-<wire x1="142.24" y1="58.42" x2="139.7" y2="58.42" width="0.1524" layer="91"/>
-<wire x1="139.7" y1="58.42" x2="139.7" y2="55.88" width="0.1524" layer="91"/>
-<junction x="139.7" y="55.88"/>
+<wire x1="119.38" y1="30.48" x2="116.84" y2="30.48" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="BREAKOUT2" gate="A" pin="5"/>
@@ -10734,15 +10723,7 @@ support interrupts</text>
 <net name="PTB1" class="0">
 <segment>
 <pinref part="U1" gate="A" pin="PTB1"/>
-<pinref part="S2" gate="G$1" pin="1.2"/>
-<wire x1="142.24" y1="40.64" x2="139.7" y2="40.64" width="0.1524" layer="91"/>
-<wire x1="139.7" y1="40.64" x2="137.16" y2="40.64" width="0.1524" layer="91"/>
-<wire x1="137.16" y1="40.64" x2="137.16" y2="27.94" width="0.1524" layer="91"/>
-<wire x1="137.16" y1="27.94" x2="116.84" y2="27.94" width="0.1524" layer="91"/>
-<pinref part="S2" gate="G$1" pin="1.1"/>
-<wire x1="142.24" y1="43.18" x2="139.7" y2="43.18" width="0.1524" layer="91"/>
-<wire x1="139.7" y1="43.18" x2="139.7" y2="40.64" width="0.1524" layer="91"/>
-<junction x="139.7" y="40.64"/>
+<wire x1="119.38" y1="27.94" x2="116.84" y2="27.94" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="BREAKOUT2" gate="A" pin="4"/>
@@ -10753,13 +10734,7 @@ support interrupts</text>
 <net name="PTB0" class="0">
 <segment>
 <pinref part="U1" gate="A" pin="PTB0/LLWU_P5"/>
-<pinref part="S1" gate="G$1" pin="1.2"/>
-<wire x1="142.24" y1="25.4" x2="139.7" y2="25.4" width="0.1524" layer="91"/>
-<pinref part="S1" gate="G$1" pin="1.1"/>
-<wire x1="139.7" y1="25.4" x2="116.84" y2="25.4" width="0.1524" layer="91"/>
-<wire x1="142.24" y1="27.94" x2="139.7" y2="27.94" width="0.1524" layer="91"/>
-<wire x1="139.7" y1="27.94" x2="139.7" y2="25.4" width="0.1524" layer="91"/>
-<junction x="139.7" y="25.4"/>
+<wire x1="119.38" y1="25.4" x2="116.84" y2="25.4" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="BREAKOUT2" gate="A" pin="3"/>
@@ -10948,6 +10923,40 @@ support interrupts</text>
 <pinref part="J10" gate="J" pin="2"/>
 </segment>
 </net>
+<net name="N$2" class="0">
+<segment>
+<pinref part="U1" gate="A" pin="PTB3"/>
+<wire x1="119.38" y1="33.02" x2="116.84" y2="33.02" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$4" class="0">
+<segment>
+<pinref part="S3" gate="G$1" pin="1.2"/>
+<wire x1="142.24" y1="55.88" x2="139.7" y2="55.88" width="0.1524" layer="91"/>
+<pinref part="S3" gate="G$1" pin="1.1"/>
+<wire x1="142.24" y1="58.42" x2="139.7" y2="58.42" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="58.42" x2="139.7" y2="55.88" width="0.1524" layer="91"/>
+<junction x="139.7" y="55.88"/>
+<wire x1="139.7" y1="55.88" x2="134.62" y2="55.88" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$12" class="0">
+<segment>
+<pinref part="S2" gate="G$1" pin="1.2"/>
+<wire x1="142.24" y1="40.64" x2="139.7" y2="40.64" width="0.1524" layer="91"/>
+<pinref part="S2" gate="G$1" pin="1.1"/>
+<wire x1="142.24" y1="43.18" x2="139.7" y2="43.18" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="43.18" x2="139.7" y2="40.64" width="0.1524" layer="91"/>
+<junction x="139.7" y="40.64"/>
+<wire x1="139.7" y1="40.64" x2="137.16" y2="40.64" width="0.1524" layer="91"/>
+</segment>
+</net>
+<net name="N$20" class="0">
+<segment>
+<pinref part="S1" gate="G$1" pin="1.1"/>
+<wire x1="142.24" y1="27.94" x2="139.7" y2="27.94" width="0.1524" layer="91"/>
+</segment>
+</net>
 </nets>
 </sheet>
 </sheets>