# HG changeset patch
# User kripperger@CL-SEC241-09.cedarville.edu
# Date 2012-11-01 14:38:12
# Node ID 7b3565594ba4992d4e4242de0993531a7f09ea82
# Parent  7a3a41521116fb9f8f05378204fb3dcea417b465

Minor Schematic Changes

diff --git a/slave-daughter/slave-daughter-camera.brd b/slave-daughter/slave-daughter-camera.brd
--- a/slave-daughter/slave-daughter-camera.brd
+++ b/slave-daughter/slave-daughter-camera.brd
@@ -120,9 +120,11 @@
 <plain>
 <wire x1="0" y1="34.29" x2="0" y2="5.08" width="0" layer="20"/>
 <wire x1="0" y1="5.08" x2="5.08" y2="0" width="0" layer="20" curve="90"/>
-<wire x1="5.08" y1="0" x2="35.56" y2="0" width="0" layer="20"/>
-<wire x1="35.56" y1="0" x2="35.56" y2="39.37" width="0" layer="20"/>
-<wire x1="35.56" y1="39.37" x2="5.08" y2="39.37" width="0" layer="20"/>
+<wire x1="5.08" y1="0" x2="30.48" y2="0" width="0" layer="20"/>
+<wire x1="30.48" y1="0" x2="35.56" y2="5.08" width="0" layer="20" curve="90"/>
+<wire x1="35.56" y1="5.08" x2="35.56" y2="34.29" width="0" layer="20"/>
+<wire x1="35.56" y1="34.29" x2="30.48" y2="39.37" width="0" layer="20" curve="90"/>
+<wire x1="30.48" y1="39.37" x2="5.08" y2="39.37" width="0" layer="20"/>
 <wire x1="5.08" y1="39.37" x2="0" y2="34.29" width="0" layer="20" curve="90"/>
 <text x="-1.27" y="57.15" size="1.778" layer="21">DO NOT MOVE RINGS, PIN HEADERS, OR PCB DIMMENSIONS. THEY ARE ACCURATELY PLACED</text>
 <text x="44.45" y="53.34" size="1.778" layer="21">Miter edges to radius of .2</text>
@@ -510,18 +512,6 @@ design rules under a new name.</descript
 <signal name="PA7">
 <contactref element="JP2" pad="10"/>
 </signal>
-<signal name="N$1">
-<via x="15.24" y="48.26" extent="1-16" drill="3.2"/>
-</signal>
-<signal name="N$2">
-<via x="29.21" y="48.26" extent="1-16" drill="3.2"/>
-</signal>
-<signal name="N$3">
-<via x="45.72" y="48.26" extent="1-16" drill="3.2"/>
-</signal>
-<signal name="N$4">
-<via x="60.96" y="48.26" extent="1-16" drill="3.2"/>
-</signal>
 </signals>
 </board>
 </drawing>
diff --git a/slave-daughter/slave-daughter-sensors.brd b/slave-daughter/slave-daughter-sensors.brd
--- a/slave-daughter/slave-daughter-sensors.brd
+++ b/slave-daughter/slave-daughter-sensors.brd
@@ -104,9 +104,11 @@
 <plain>
 <wire x1="0" y1="34.29" x2="0" y2="5.08" width="0" layer="20"/>
 <wire x1="0" y1="5.08" x2="5.08" y2="0" width="0" layer="20" curve="90"/>
-<wire x1="5.08" y1="0" x2="100" y2="0" width="0" layer="20"/>
-<wire x1="100" y1="0" x2="100" y2="39.37" width="0" layer="20"/>
-<wire x1="100" y1="39.37" x2="5.08" y2="39.37" width="0" layer="20"/>
+<wire x1="5.08" y1="0" x2="30.48" y2="0" width="0" layer="20"/>
+<wire x1="30.48" y1="0" x2="35.56" y2="5.08" width="0" layer="20" curve="90"/>
+<wire x1="35.56" y1="5.08" x2="35.56" y2="34.29" width="0" layer="20"/>
+<wire x1="35.56" y1="34.29" x2="30.48" y2="39.37" width="0" layer="20" curve="90"/>
+<wire x1="30.48" y1="39.37" x2="5.08" y2="39.37" width="0" layer="20"/>
 <wire x1="5.08" y1="39.37" x2="0" y2="34.29" width="0" layer="20" curve="90"/>
 <text x="-13.97" y="43.18" size="1.778" layer="21">DO NOT MOVE RINGS, PIN HEADERS, OR PCB DIMMENSIONS. THEY ARE ACCURATELY PLACED</text>
 </plain>
@@ -219,6 +221,29 @@ We've spent an enormous amount of time c
 <rectangle x1="0.3302" y1="-0.4699" x2="0.8303" y2="0.4801" layer="51"/>
 <rectangle x1="-0.1999" y1="-0.3" x2="0.1999" y2="0.3" layer="35"/>
 </package>
+<package name="BMP085">
+<wire x1="2.5" y1="2.5" x2="2.5" y2="-2.5" width="0.127" layer="51"/>
+<wire x1="2.5" y1="-2.5" x2="-2.5" y2="-2.5" width="0.127" layer="51"/>
+<wire x1="-2.5" y1="2.5" x2="-2.5" y2="-2.5" width="0.127" layer="51"/>
+<wire x1="2.5" y1="2.5" x2="-2.5" y2="2.5" width="0.127" layer="51"/>
+<wire x1="-2.5" y1="2.5" x2="-2.5" y2="1.9" width="0.2032" layer="21"/>
+<wire x1="-2.5" y1="2.5" x2="-1.9" y2="2.5" width="0.2032" layer="21"/>
+<wire x1="2.5" y1="2.5" x2="1.9" y2="2.5" width="0.2032" layer="21"/>
+<wire x1="2.5" y1="2.5" x2="2.5" y2="1.9" width="0.2032" layer="21"/>
+<wire x1="-2.5" y1="-2.5" x2="-2.5" y2="-1.9" width="0.2032" layer="21"/>
+<wire x1="-2.5" y1="-2.5" x2="-1.8" y2="-2.5" width="0.2032" layer="21"/>
+<wire x1="2.5" y1="-2.5" x2="1.8" y2="-2.5" width="0.2032" layer="21"/>
+<wire x1="2.5" y1="-2.5" x2="2.5" y2="-1.9" width="0.2032" layer="21"/>
+<circle x="-2.1" y="2.1" radius="0.2" width="0.127" layer="21"/>
+<smd name="8" x="0" y="1.65" dx="2.5" dy="0.8" layer="1" rot="R90"/>
+<smd name="4" x="0" y="-2.065" dx="1.67" dy="0.8" layer="1" rot="R90"/>
+<smd name="7" x="2.065" y="1.27" dx="0.8" dy="1.67" layer="1" rot="R270"/>
+<smd name="6" x="2.065" y="0" dx="0.8" dy="1.67" layer="1" rot="R270"/>
+<smd name="5" x="2.065" y="-1.27" dx="0.8" dy="1.67" layer="1" rot="R270"/>
+<smd name="3" x="-2.065" y="-1.27" dx="0.8" dy="1.67" layer="1" rot="R270"/>
+<smd name="2" x="-2.065" y="0" dx="0.8" dy="1.67" layer="1" rot="R270"/>
+<smd name="1" x="-2.065" y="1.27" dx="0.8" dy="1.67" layer="1" rot="R270"/>
+</package>
 </packages>
 </library>
 <library name="SeniorDesign">
@@ -459,6 +484,7 @@ design rules under a new name.</descript
 <element name="C1" library="SparkFun" package="0603-CAP" value="0.1uF" x="-17.78" y="35.56"/>
 <element name="C2" library="SparkFun" package="0603-CAP" value="0.22uF" x="-21.59" y="35.56"/>
 <element name="C3" library="SparkFun" package="0603-CAP" value="1uF" x="-25.4" y="35.56"/>
+<element name="U$3" library="SparkFun" package="BMP085" value="BMP085" x="-22.86" y="-5.08"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -469,12 +495,14 @@ design rules under a new name.</descript
 <contactref element="U$2" pad="3"/>
 <contactref element="C3" pad="2"/>
 <contactref element="JP1" pad="1"/>
-<wire x1="-15.11" y1="35.29" x2="-16.93" y2="35.56" width="0" layer="19" extent="1-1"/>
+<contactref element="U$3" pad="1"/>
+<wire x1="-15.11" y1="35.29" x2="5.08" y2="36.957" width="0" layer="19" extent="1-1"/>
 <wire x1="-15.11" y1="34.63" x2="-15.11" y2="35.29" width="0" layer="19" extent="1-1"/>
+<wire x1="-16.93" y1="35.56" x2="-15.11" y2="35.29" width="0" layer="19" extent="1-1"/>
 <wire x1="-20.74" y1="35.56" x2="-16.93" y2="35.56" width="0" layer="19" extent="1-1"/>
 <wire x1="-24.55" y1="35.56" x2="-20.74" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="5.08" y1="36.957" x2="-24.55" y2="35.56" width="0" layer="19" extent="1-1"/>
-<wire x1="-18.415" y1="1.21" x2="5.08" y2="36.957" width="0" layer="19" extent="1-1"/>
+<wire x1="-18.415" y1="1.21" x2="-15.11" y2="34.63" width="0" layer="19" extent="1-1"/>
+<wire x1="-24.925" y1="-3.81" x2="-18.415" y2="1.21" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VBAT">
 <contactref element="JP1" pad="2"/>
@@ -554,17 +582,11 @@ design rules under a new name.</descript
 <contactref element="C1" pad="1"/>
 <wire x1="-18.63" y1="35.56" x2="-19.685" y2="1.21" width="0" layer="19" extent="1-1"/>
 </signal>
-<signal name="N$2">
-<via x="19.05" y="48.26" extent="1-16" drill="3.2"/>
-</signal>
-<signal name="N$3">
-<via x="38.1" y="49.53" extent="1-16" drill="3.2"/>
+<signal name="VDDD">
+<contactref element="U$3" pad="4"/>
 </signal>
-<signal name="N$4">
-<via x="63.5" y="48.26" extent="1-16" drill="3.2"/>
-</signal>
-<signal name="N$5">
-<via x="78.74" y="48.26" extent="1-16" drill="3.2"/>
+<signal name="VDDA">
+<contactref element="U$3" pad="3"/>
 </signal>
 </signals>
 </board>
diff --git a/slave-daughter/slave-daughter-sensors.sch b/slave-daughter/slave-daughter-sensors.sch
--- a/slave-daughter/slave-daughter-sensors.sch
+++ b/slave-daughter/slave-daughter-sensors.sch
@@ -572,6 +572,29 @@ Commonly used for small ceramic capacito
 <vertex x="1.8364" y="-0.0051" curve="-90.012967"/>
 </polygon>
 </package>
+<package name="BMP085">
+<wire x1="2.5" y1="2.5" x2="2.5" y2="-2.5" width="0.127" layer="51"/>
+<wire x1="2.5" y1="-2.5" x2="-2.5" y2="-2.5" width="0.127" layer="51"/>
+<wire x1="-2.5" y1="2.5" x2="-2.5" y2="-2.5" width="0.127" layer="51"/>
+<wire x1="2.5" y1="2.5" x2="-2.5" y2="2.5" width="0.127" layer="51"/>
+<wire x1="-2.5" y1="2.5" x2="-2.5" y2="1.9" width="0.2032" layer="21"/>
+<wire x1="-2.5" y1="2.5" x2="-1.9" y2="2.5" width="0.2032" layer="21"/>
+<wire x1="2.5" y1="2.5" x2="1.9" y2="2.5" width="0.2032" layer="21"/>
+<wire x1="2.5" y1="2.5" x2="2.5" y2="1.9" width="0.2032" layer="21"/>
+<wire x1="-2.5" y1="-2.5" x2="-2.5" y2="-1.9" width="0.2032" layer="21"/>
+<wire x1="-2.5" y1="-2.5" x2="-1.8" y2="-2.5" width="0.2032" layer="21"/>
+<wire x1="2.5" y1="-2.5" x2="1.8" y2="-2.5" width="0.2032" layer="21"/>
+<wire x1="2.5" y1="-2.5" x2="2.5" y2="-1.9" width="0.2032" layer="21"/>
+<circle x="-2.1" y="2.1" radius="0.2" width="0.127" layer="21"/>
+<smd name="8" x="0" y="1.65" dx="2.5" dy="0.8" layer="1" rot="R90"/>
+<smd name="4" x="0" y="-2.065" dx="1.67" dy="0.8" layer="1" rot="R90"/>
+<smd name="7" x="2.065" y="1.27" dx="0.8" dy="1.67" layer="1" rot="R270"/>
+<smd name="6" x="2.065" y="0" dx="0.8" dy="1.67" layer="1" rot="R270"/>
+<smd name="5" x="2.065" y="-1.27" dx="0.8" dy="1.67" layer="1" rot="R270"/>
+<smd name="3" x="-2.065" y="-1.27" dx="0.8" dy="1.67" layer="1" rot="R270"/>
+<smd name="2" x="-2.065" y="0" dx="0.8" dy="1.67" layer="1" rot="R270"/>
+<smd name="1" x="-2.065" y="1.27" dx="0.8" dy="1.67" layer="1" rot="R270"/>
+</package>
 </packages>
 <symbols>
 <symbol name="LETTER_L">
@@ -658,6 +681,22 @@ Commonly used for small ceramic capacito
 <text x="-1.016" y="3.556" size="1.778" layer="96">&gt;VALUE</text>
 <pin name="VCC" x="0" y="0" visible="off" length="short" direction="sup" rot="R90"/>
 </symbol>
+<symbol name="BMP085">
+<wire x1="-7.62" y1="-7.62" x2="-7.62" y2="5.08" width="0.254" layer="94"/>
+<wire x1="-7.62" y1="5.08" x2="10.16" y2="5.08" width="0.254" layer="94"/>
+<wire x1="10.16" y1="5.08" x2="10.16" y2="-7.62" width="0.254" layer="94"/>
+<wire x1="10.16" y1="-7.62" x2="-7.62" y2="-7.62" width="0.254" layer="94"/>
+<text x="-7.62" y="5.588" size="1.778" layer="95">&gt;Name</text>
+<text x="-7.62" y="-10.16" size="1.778" layer="95">&gt;Value</text>
+<pin name="XCLR" x="12.7" y="-5.08" length="short" direction="in" rot="R180"/>
+<pin name="SDA" x="12.7" y="2.54" length="short" rot="R180"/>
+<pin name="SCL" x="12.7" y="0" length="short" direction="in" rot="R180"/>
+<pin name="NC" x="-10.16" y="-2.54" length="short"/>
+<pin name="VDDD" x="-10.16" y="0" length="short" direction="pwr"/>
+<pin name="VDDA" x="-10.16" y="2.54" length="short" direction="pwr"/>
+<pin name="EOC" x="12.7" y="-2.54" length="short" direction="out" rot="R180"/>
+<pin name="GND" x="-10.16" y="-5.08" length="short" direction="pwr"/>
+</symbol>
 </symbols>
 <devicesets>
 <deviceset name="FRAME-LETTER" prefix="FRAME">
@@ -921,6 +960,29 @@ Standard 0603 ceramic capacitor, and 0.1
 </device>
 </devices>
 </deviceset>
+<deviceset name="BMP085">
+<description>&lt;b&gt;BMP085 Pressure Sensor&lt;/b&gt; Great little MEMS pressure sensor. SKU: COM-09603</description>
+<gates>
+<gate name="G$1" symbol="BMP085" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="BMP085">
+<connects>
+<connect gate="G$1" pin="EOC" pad="2"/>
+<connect gate="G$1" pin="GND" pad="1"/>
+<connect gate="G$1" pin="NC" pad="5"/>
+<connect gate="G$1" pin="SCL" pad="6"/>
+<connect gate="G$1" pin="SDA" pad="7"/>
+<connect gate="G$1" pin="VDDA" pad="3"/>
+<connect gate="G$1" pin="VDDD" pad="4"/>
+<connect gate="G$1" pin="XCLR" pad="8"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
 </devicesets>
 </library>
 <library name="SeniorDesign">
@@ -1070,6 +1132,7 @@ i2c</description>
 <part name="P+4" library="SparkFun" deviceset="VCC" device=""/>
 <part name="P+5" library="SparkFun" deviceset="VCC" device=""/>
 <part name="P+6" library="SparkFun" deviceset="VCC" device=""/>
+<part name="U$3" library="SparkFun" deviceset="BMP085" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -1087,6 +1150,7 @@ i2c</description>
 <wire x1="132.08" y1="185.42" x2="132.08" y2="119.38" width="0.4064" layer="94"/>
 <wire x1="187.96" y1="185.42" x2="187.96" y2="119.38" width="0.4064" layer="94"/>
 <text x="208.28" y="175.26" size="6.4516" layer="94">Temp</text>
+<text x="73.66" y="109.22" size="6.4516" layer="94">Pressure</text>
 </plain>
 <instances>
 <instance part="FRAME1" gate="G$1" x="0" y="0"/>
@@ -1104,6 +1168,7 @@ i2c</description>
 <instance part="P+4" gate="1" x="38.1" y="149.86"/>
 <instance part="P+5" gate="1" x="83.82" y="162.56"/>
 <instance part="P+6" gate="1" x="144.78" y="162.56"/>
+<instance part="U$3" gate="G$1" x="91.44" y="96.52"/>
 </instances>
 <busses>
 </busses>
diff --git a/slave/eagle.epf b/slave/eagle.epf
--- a/slave/eagle.epf
+++ b/slave/eagle.epf
@@ -16,46 +16,6 @@ UsedLibrary="C:/Users/kripperger/Documen
 UsedLibrary="C:/Users/kripperger/Documents/eagle/seniordesign-hardware/lbr/SparkFun.lbr"
 
 [Win_1]
-Type="Schematic Editor"
-Loc="332 293 931 692"
-State=0
-Number=2
-File="slave.sch"
-View="-5.53265 -4.31698 255.749 189.348"
-WireWidths=" 0 0.3048 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0.4064 0.1524"
-PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-PadDrills=" 0.5 0.6 0.7 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.8"
-ViaDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-ViaDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
-HoleDrills=" 0.5 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 2 2.2 2.8 3.2 0.6"
-TextSizes=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778"
-PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27"
-PolygonIsolates=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0"
-MiterRadiuss=" 0.254 0.3175 0.635 1.27 2.54 1 2 2.5 5 7.5 10 0"
-SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635"
-WireBend=0
-WireBendSet=31
-WireCap=1
-MiterStyle=0
-PadShape=0
-ViaShape=0
-PolygonPour=0
-PolygonRank=0
-PolygonThermals=1
-PolygonOrphans=0
-TextRatio=8
-PinDirection=3
-PinFunction=0
-PinLength=2
-PinVisible=3
-SwapLevel=0
-ArcDirection=0
-AddLevel=2
-PadsSameType=0
-Layer=91
-Sheet=1
-
-[Win_2]
 Type="Control Panel"
 Loc="466 200 1065 599"
 State=2
@@ -64,4 +24,3 @@ Number=0
 [Desktop]
 Screen="2560 1024"
 Window="Win_1"
-Window="Win_2"