# HG changeset patch
# User ethanzonca@CL-SEC241-08.cedarville.edu
# Date 2012-11-08 12:30:23
# Node ID 39d3cba68c8cb691786f01bfb85bbfd864ca0630
# Parent  f6abe1a35d91cbe2ab30ecec4d42724edf36fe17

Work on silk

diff --git a/master/master.brd b/master/master.brd
--- a/master/master.brd
+++ b/master/master.brd
@@ -14,9 +14,9 @@
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="yes"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
 <layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
@@ -44,7 +44,7 @@
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
 <layer number="49" name="Reference" color="7" fill="1" visible="no" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="no"/>
-<layer number="51" name="tDocu" color="7" fill="1" visible="no" active="yes"/>
+<layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="52" name="bDocu" color="7" fill="1" visible="no" active="yes"/>
 <layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
@@ -173,20 +173,60 @@
 <text x="7.3025" y="33.655" size="1.016" layer="21" rot="SR270">GPS</text>
 <text x="48.895" y="9.8425" size="1.016" layer="21" rot="R90">GPS</text>
 <text x="48.895" y="24.4475" size="1.016" layer="21" rot="R90">JTAG</text>
-<text x="27.6225" y="1.27" size="1.016" layer="21" rot="R90">ICSP</text>
+<text x="27.6225" y="1.74625" size="1.016" layer="21" rot="R90">ICSP</text>
 <text x="10.31875" y="0.635" size="1.016" layer="21">err</text>
 <text x="13.81125" y="0.635" size="1.016" layer="21">stat</text>
 <text x="18.415" y="0.635" size="1.016" layer="21">rf</text>
 <text x="21.59" y="0.635" size="1.016" layer="21">pwr</text>
 <text x="20.955" y="49.53" size="1.016" layer="21" rot="R90">batt</text>
 <text x="27.305" y="48.895" size="1.016" layer="21" rot="R90">buzz</text>
-<wire x1="8.89" y1="0" x2="8.89" y2="4.445" width="0.2032" layer="21"/>
-<wire x1="8.89" y1="4.445" x2="9.525" y2="5.08" width="0.2032" layer="21" curve="-90"/>
-<wire x1="9.525" y1="5.08" x2="24.501975" y2="5.08" width="0.2032" layer="21"/>
-<wire x1="24.501975" y1="5.08" x2="25.4" y2="4.181975" width="0.2032" layer="21" curve="-90"/>
-<wire x1="25.4" y1="4.181975" x2="25.4" y2="0" width="0.2032" layer="21"/>
+<wire x1="8.89" y1="0" x2="8.89" y2="4.05255" width="0.2032" layer="21"/>
+<wire x1="8.89" y1="4.05255" x2="9.59995" y2="4.7625" width="0.2032" layer="21" curve="-90"/>
+<wire x1="9.59995" y1="4.7625" x2="24.69005" y2="4.7625" width="0.2032" layer="21"/>
+<wire x1="24.69005" y1="4.7625" x2="25.4" y2="4.05255" width="0.2032" layer="21" curve="-90"/>
+<wire x1="25.4" y1="4.05255" x2="25.4" y2="0" width="0.2032" layer="21"/>
 <text x="39.52875" y="0.635" size="1.016" layer="21">act</text>
 <text x="43.18" y="0.635" size="1.016" layer="21">cyc</text>
+<wire x1="38.1" y1="0" x2="38.1" y2="4.05255" width="0.2032" layer="21"/>
+<wire x1="38.1" y1="4.05255" x2="38.80995" y2="4.7625" width="0.2032" layer="21" curve="-90"/>
+<wire x1="38.80995" y1="4.7625" x2="46.28005" y2="4.7625" width="0.2032" layer="21"/>
+<wire x1="46.28005" y1="4.7625" x2="46.99" y2="4.05255" width="0.2032" layer="21" curve="-90"/>
+<wire x1="46.99" y1="4.05255" x2="46.99" y2="0" width="0.2032" layer="21"/>
+<wire x1="26.035" y1="26.67" x2="24.765" y2="25.4" width="0.2032" layer="21"/>
+<wire x1="24.765" y1="25.4" x2="26.035" y2="24.13" width="0.2032" layer="21"/>
+<wire x1="26.035" y1="24.13" x2="27.305" y2="25.4" width="0.2032" layer="21"/>
+<wire x1="27.305" y1="25.4" x2="26.035" y2="26.67" width="0.2032" layer="21"/>
+<wire x1="53.34" y1="21.43125" x2="51.59375" y2="21.43125" width="0.2032" layer="21"/>
+<wire x1="51.59375" y1="21.43125" x2="50.95875" y2="20.79625" width="0.2032" layer="21" curve="90"/>
+<wire x1="50.95875" y1="20.79625" x2="50.95875" y2="18.89125" width="0.2032" layer="21"/>
+<wire x1="50.95875" y1="18.89125" x2="51.59375" y2="18.25625" width="0.2032" layer="21" curve="90"/>
+<wire x1="51.59375" y1="18.25625" x2="53.34" y2="18.25625" width="0.2032" layer="21"/>
+<text x="46.99" y="52.705" size="1.016" layer="21" rot="SR180">txen</text>
+<wire x1="43.18" y1="53.34" x2="43.18" y2="48.895" width="0.2032" layer="21"/>
+<wire x1="43.18" y1="48.895" x2="43.815" y2="48.26" width="0.2032" layer="21" curve="90"/>
+<wire x1="43.815" y1="48.26" x2="47.129209375" y2="48.26" width="0.2032" layer="21"/>
+<wire x1="47.129209375" y1="48.26" x2="47.78375" y2="48.914540625" width="0.2032" layer="21" curve="90"/>
+<wire x1="47.78375" y1="48.914540625" x2="47.78375" y2="53.34" width="0.2032" layer="21"/>
+<circle x="31.4325" y="11.1125" radius="0.127" width="0.4064" layer="21"/>
+<circle x="36.35375" y="40.79875" radius="0.127" width="0.4064" layer="21"/>
+<circle x="13.81125" y="11.1125" radius="0.127" width="0.4064" layer="21"/>
+<circle x="48.41875" y="28.8925" radius="0.127" width="0.4064" layer="21"/>
+<circle x="48.41875" y="13.0175" radius="0.127" width="0.4064" layer="21"/>
+<circle x="27.14625" y="0.9525" radius="0.127" width="0.4064" layer="21"/>
+<text x="24.765" y="46.0375" size="1.016" layer="21">+</text>
+<text x="21.74875" y="46.0375" size="1.016" layer="21">-</text>
+<text x="31.115" y="46.0375" size="1.016" layer="21">+</text>
+<text x="28.09875" y="46.0375" size="1.016" layer="21">-</text>
+<circle x="43.815" y="9.36625" radius="0.127" width="0.4064" layer="21"/>
+<wire x1="7.225459375" y1="40.4540125" x2="8.3865125" y2="40.4540125" width="0.127" layer="21" curve="90"/>
+<wire x1="6.776446875" y1="40.005" x2="8.835525" y2="40.005" width="0.127" layer="21" curve="90"/>
+<wire x1="6.327434375" y1="39.555984375" x2="9.2845375" y2="39.555984375" width="0.127" layer="21" curve="90"/>
+<wire x1="7.14375" y1="34.44875" x2="8.41375" y2="34.44875" width="0.127" layer="21"/>
+<wire x1="8.41375" y1="34.44875" x2="9.04875" y2="34.44875" width="0.127" layer="21"/>
+<wire x1="9.04875" y1="34.44875" x2="9.04875" y2="35.08375" width="0.127" layer="21"/>
+<wire x1="9.04875" y1="35.08375" x2="8.41375" y2="34.44875" width="0.127" layer="21"/>
+<wire x1="8.41375" y1="34.44875" x2="9.04875" y2="33.81375" width="0.127" layer="21"/>
+<wire x1="9.04875" y1="33.81375" x2="9.04875" y2="34.44875" width="0.127" layer="21"/>
 </plain>
 <libraries>
 <library name="SparkFun">
@@ -4056,9 +4096,9 @@ Please make sure your boards conform to 
 <attribute name="NAME" x="31.75" y="48.26" size="1.27" layer="25"/>
 <attribute name="VALUE" x="31.75" y="41.91" size="1.27" layer="27"/>
 </element>
-<element name="TX" library="adafruit" package="CHIPLED_0603" value="GREEN" x="43.815" y="50.8" smashed="yes">
-<attribute name="NAME" x="43.18" y="49.53" size="1.27" layer="25" rot="R90"/>
-<attribute name="VALUE" x="45.72" y="49.53" size="1.27" layer="27" rot="R90"/>
+<element name="TX" library="adafruit" package="CHIPLED_0603" value="GREEN" x="45.4025" y="50.95875" smashed="yes" rot="R270">
+<attribute name="NAME" x="44.1325" y="51.59375" size="1.27" layer="25"/>
+<attribute name="VALUE" x="44.1325" y="49.05375" size="1.27" layer="27"/>
 </element>
 <element name="STAT" library="adafruit" package="CHIPLED_0603" value="BLUE" x="15.24" y="2.2225" smashed="yes" rot="R90">
 <attribute name="NAME" x="16.51" y="1.5875" size="1.27" layer="25" rot="R180"/>
@@ -4081,9 +4121,9 @@ Please make sure your boards conform to 
 <attribute name="VALUE" x="48.03775" y="20.447" size="0.4064" layer="27" font="vector"/>
 </element>
 <element name="Q5" library="transistor-npn" package="SOT23-BEC" value="NPN" x="30.48" y="44.45"/>
-<element name="R18" library="SparkFun" package="0603-RES" value="10k" x="46.0375" y="50.8" smashed="yes" rot="R270">
-<attribute name="NAME" x="46.7995" y="51.689" size="0.4064" layer="25" font="vector" rot="R270"/>
-<attribute name="VALUE" x="44.8945" y="51.816" size="0.4064" layer="27" font="vector" rot="R270"/>
+<element name="R18" library="SparkFun" package="0603-RES" value="10k" x="45.4025" y="49.53" smashed="yes" rot="R180">
+<attribute name="NAME" x="46.2915" y="48.768" size="0.4064" layer="25" font="vector" rot="R180"/>
+<attribute name="VALUE" x="46.4185" y="50.673" size="0.4064" layer="27" font="vector" rot="R180"/>
 </element>
 <element name="R19" library="SparkFun" package="0603-RES" value="10k" x="15.24" y="3.81" smashed="yes">
 <attribute name="NAME" x="14.351" y="4.572" size="0.4064" layer="25" font="vector"/>
@@ -4289,13 +4329,13 @@ Please make sure your boards conform to 
 <attribute name="NAME" x="39.751" y="4.572" size="0.4064" layer="25" font="vector"/>
 <attribute name="VALUE" x="39.624" y="2.667" size="0.4064" layer="27" font="vector"/>
 </element>
-<element name="AUX7" library="adafruit" package="CHIPLED_0603" value="AQUA" x="52.07" y="20.32" smashed="yes">
-<attribute name="NAME" x="51.435" y="19.05" size="1.27" layer="25" rot="R90"/>
-<attribute name="VALUE" x="53.975" y="19.05" size="1.27" layer="27" rot="R90"/>
+<element name="AUX7" library="adafruit" package="CHIPLED_0603" value="AQUA" x="52.07" y="19.84375" smashed="yes">
+<attribute name="NAME" x="51.435" y="18.57375" size="1.27" layer="25" rot="R90"/>
+<attribute name="VALUE" x="53.975" y="18.57375" size="1.27" layer="27" rot="R90"/>
 </element>
-<element name="R9" library="SparkFun" package="0603-RES" value="10k" x="52.07" y="17.145" smashed="yes" rot="R90">
-<attribute name="NAME" x="51.308" y="16.256" size="0.4064" layer="25" font="vector" rot="R90"/>
-<attribute name="VALUE" x="53.213" y="16.129" size="0.4064" layer="27" font="vector" rot="R90"/>
+<element name="R9" library="SparkFun" package="0603-RES" value="10k" x="52.07" y="16.51" smashed="yes" rot="R90">
+<attribute name="NAME" x="51.308" y="15.621" size="0.4064" layer="25" font="vector" rot="R90"/>
+<attribute name="VALUE" x="53.213" y="15.494" size="0.4064" layer="27" font="vector" rot="R90"/>
 </element>
 <element name="U$4" library="SeniorDesign" package="BALLOON" value="BOARDLOGOBALLOON" x="59.69" y="22.225" rot="MR0"/>
 </elements>
@@ -4789,8 +4829,9 @@ Please make sure your boards conform to 
 <wire x1="46.6725" y1="52.07" x2="47.3075" y2="51.435" width="0.4064" layer="16"/>
 <wire x1="34.29" y1="42.545" x2="34.29" y2="41.275" width="0.4064" layer="16"/>
 <wire x1="34.29" y1="41.275" x2="32.7025" y2="39.6875" width="0.4064" layer="16"/>
-<wire x1="46.0375" y1="51.65" x2="46.2525" y2="51.435" width="0.4064" layer="1"/>
-<wire x1="46.2525" y1="51.435" x2="47.3075" y2="51.435" width="0.4064" layer="1"/>
+<wire x1="46.2525" y1="49.53" x2="46.99" y2="49.53" width="0.254" layer="1"/>
+<wire x1="46.99" y1="49.53" x2="47.3075" y2="49.8475" width="0.254" layer="1"/>
+<wire x1="47.3075" y1="49.8475" x2="47.3075" y2="51.435" width="0.254" layer="1"/>
 </signal>
 <signal name="3.3V">
 <contactref element="C8" pad="1"/>
@@ -5111,8 +5152,8 @@ Please make sure your boards conform to 
 <signal name="N$24">
 <contactref element="R18" pad="2"/>
 <contactref element="TX" pad="A"/>
-<wire x1="43.815" y1="50.05" x2="45.9375" y2="50.05" width="0.4064" layer="1"/>
-<wire x1="45.9375" y1="50.05" x2="46.0375" y2="49.95" width="0.4064" layer="1"/>
+<wire x1="44.6525" y1="50.95875" x2="44.5525" y2="50.85875" width="0.254" layer="1"/>
+<wire x1="44.5525" y1="50.85875" x2="44.5525" y2="49.53" width="0.254" layer="1"/>
 </signal>
 <signal name="N$26">
 <contactref element="R19" pad="2"/>
@@ -5506,7 +5547,7 @@ Please make sure your boards conform to 
 <signal name="N$16">
 <contactref element="R9" pad="2"/>
 <contactref element="AUX7" pad="A"/>
-<wire x1="52.07" y1="19.57" x2="52.07" y2="17.995" width="0.4064" layer="1"/>
+<wire x1="52.07" y1="19.09375" x2="52.07" y2="17.36" width="0.4064" layer="1"/>
 </signal>
 <signal name="EREG0">
 <contactref element="R7" pad="1"/>
@@ -5547,7 +5588,7 @@ Please make sure your boards conform to 
 <wire x1="43.97375" y1="14.9225" x2="47.3075" y2="14.9225" width="0.4064" layer="16"/>
 <wire x1="47.3075" y1="14.9225" x2="47.78375" y2="14.44625" width="0.4064" layer="16"/>
 <wire x1="47.78375" y1="14.44625" x2="52.07" y2="14.44625" width="0.4064" layer="16"/>
-<wire x1="52.07" y1="14.44625" x2="52.07" y2="16.295" width="0.4064" layer="1"/>
+<wire x1="52.07" y1="14.44625" x2="52.07" y2="15.66" width="0.4064" layer="1"/>
 </signal>
 </signals>
 </board>