# HG changeset patch
# User mkroening@CL-SEC241-07.cedarville.edu
# Date 2012-11-01 19:27:51
# Node ID c0143f6b81dbf04cff7b713c8e588863a5991420
# Parent  0d546233ae033105908037cc97449647dc9b2595

Finished draft routing sensor and camera

diff --git a/master/eagle.epf b/master/eagle.epf
--- a/master/eagle.epf
+++ b/master/eagle.epf
@@ -344,46 +344,6 @@ UsedLibrary="C:/Temp/SparkFun.lbr"
 UsedLibrary="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/lbr/SeniorDesign.lbr"
 
 [Win_1]
-Type="Schematic Editor"
-Loc="332 293 931 692"
-State=0
-Number=2
-File="C:/Users/mkroening/Documents/eagle/seniordesign-hardware/slave-daughter/slave-daughter-sensors.sch"
-View="-5.50062 -4.23062 254.116 189.346"
-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="580 320 1179 719"
 State=2
@@ -392,4 +352,3 @@ Number=0
 [Desktop]
 Screen="1280 1024"
 Window="Win_1"
-Window="Win_2"
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
@@ -435,9 +435,9 @@ design rules under a new name.</descript
 <elements>
 <element name="JP1" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="5.08" y="2.54" locked="yes"/>
 <element name="JP2" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="5.08" y="36.83" locked="yes"/>
-<element name="J1" library="SLAT-CON-JST-ZH" package="ZH-H-2-1" value="ZH-H-2-1" x="25.7302" y="15.875" rot="R270"/>
-<element name="J2" library="SLAT-CON-JST-ZH" package="ZH-H-2-1" value="ZH-H-2-1" x="24.511" y="21.59" rot="R270"/>
-<element name="J3" library="SLAT-CON-JST-ZH" package="ZH-H-2-1" value="ZH-H-2-1" x="25.654" y="29.21" rot="R270"/>
+<element name="J1" library="SLAT-CON-JST-ZH" package="ZH-H-2-1" value="ZH-H-2-1" x="30.8102" y="11.938" rot="R270"/>
+<element name="J2" library="SLAT-CON-JST-ZH" package="ZH-H-2-1" value="ZH-H-2-1" x="30.861" y="20.447" rot="R270"/>
+<element name="J3" library="SLAT-CON-JST-ZH" package="ZH-H-2-1" value="ZH-H-2-1" x="30.861" y="28.829" rot="R270"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -445,9 +445,26 @@ design rules under a new name.</descript
 <contactref element="J1" pad="2"/>
 <contactref element="J2" pad="2"/>
 <contactref element="J3" pad="2"/>
-<wire x1="24.491" y1="21.59" x2="25.634" y2="29.21" width="0" layer="19" extent="1-1"/>
-<wire x1="25.7102" y1="15.875" x2="24.491" y2="21.59" width="0" layer="19" extent="1-1"/>
-<wire x1="5.08" y1="2.667" x2="25.7102" y2="15.875" width="0" layer="19" extent="1-1"/>
+<wire x1="5.08" y1="2.667" x2="5.207" y2="2.667" width="0.4064" layer="1"/>
+<wire x1="5.207" y1="2.667" x2="14.605" y2="12.065" width="0.4064" layer="1"/>
+<wire x1="14.605" y1="12.065" x2="21.844" y2="12.065" width="0.4064" layer="1"/>
+<via x="21.844" y="12.065" extent="1-16" drill="0.254"/>
+<wire x1="21.844" y1="12.065" x2="26.289" y2="12.065" width="0.4064" layer="16"/>
+<via x="26.289" y="12.065" extent="1-16" drill="0.254"/>
+<wire x1="26.289" y1="12.065" x2="30.6632" y2="12.065" width="0.4064" layer="1"/>
+<wire x1="30.6632" y1="12.065" x2="30.7902" y2="11.938" width="0.4064" layer="1"/>
+<wire x1="30.7902" y1="11.938" x2="30.7902" y2="14.2948" width="0.4064" layer="1"/>
+<wire x1="30.7902" y1="14.2948" x2="27.813" y2="17.272" width="0.4064" layer="1"/>
+<via x="27.813" y="17.272" extent="1-16" drill="0.254"/>
+<wire x1="27.813" y1="17.272" x2="27.813" y2="20.447" width="0.4064" layer="16"/>
+<via x="27.813" y="20.447" extent="1-16" drill="0.254"/>
+<wire x1="27.813" y1="20.447" x2="30.841" y2="20.447" width="0.4064" layer="1"/>
+<wire x1="30.841" y1="20.447" x2="30.841" y2="22.499" width="0.4064" layer="1"/>
+<wire x1="30.841" y1="22.499" x2="27.686" y2="25.654" width="0.4064" layer="1"/>
+<via x="27.686" y="25.654" extent="1-16" drill="0.254"/>
+<wire x1="27.686" y1="25.654" x2="27.686" y2="28.829" width="0.4064" layer="16"/>
+<via x="27.686" y="28.829" extent="1-16" drill="0.254"/>
+<wire x1="27.686" y1="28.829" x2="30.841" y2="28.829" width="0.4064" layer="1"/>
 </signal>
 <signal name="VBAT">
 <contactref element="JP1" pad="2"/>
@@ -485,17 +502,29 @@ design rules under a new name.</descript
 <signal name="PA0">
 <contactref element="JP2" pad="3"/>
 <contactref element="J1" pad="1"/>
-<wire x1="10.16" y1="36.957" x2="25.7102" y2="14.375" width="0" layer="19" extent="1-1"/>
+<wire x1="10.16" y1="36.957" x2="10.16" y2="36.83" width="0.4064" layer="1"/>
+<wire x1="10.16" y1="36.83" x2="23.368" y2="23.622" width="0.4064" layer="1"/>
+<wire x1="23.368" y1="23.622" x2="23.368" y2="13.208" width="0.4064" layer="1"/>
+<wire x1="23.368" y1="13.208" x2="26.162" y2="10.414" width="0.4064" layer="1"/>
+<wire x1="26.162" y1="10.414" x2="30.7662" y2="10.414" width="0.4064" layer="1"/>
+<wire x1="30.7662" y1="10.414" x2="30.7902" y2="10.438" width="0.4064" layer="1"/>
 </signal>
 <signal name="PA1">
 <contactref element="JP2" pad="4"/>
 <contactref element="J2" pad="1"/>
-<wire x1="12.7" y1="36.703" x2="24.491" y2="20.09" width="0" layer="19" extent="1-1"/>
+<wire x1="12.7" y1="36.703" x2="24.638" y2="24.765" width="0.4064" layer="1"/>
+<wire x1="24.638" y1="24.765" x2="24.638" y2="19.685" width="0.4064" layer="1"/>
+<wire x1="24.638" y1="19.685" x2="25.4" y2="18.923" width="0.4064" layer="1"/>
+<wire x1="25.4" y1="18.923" x2="30.817" y2="18.923" width="0.4064" layer="1"/>
+<wire x1="30.817" y1="18.923" x2="30.841" y2="18.947" width="0.4064" layer="1"/>
 </signal>
 <signal name="PA2">
 <contactref element="JP2" pad="5"/>
 <contactref element="J3" pad="1"/>
-<wire x1="15.24" y1="36.957" x2="25.634" y2="27.71" width="0" layer="19" extent="1-1"/>
+<wire x1="15.24" y1="36.957" x2="15.24" y2="36.83" width="0.4064" layer="1"/>
+<wire x1="15.24" y1="36.83" x2="24.765" y2="27.305" width="0.4064" layer="1"/>
+<wire x1="24.765" y1="27.305" x2="30.817" y2="27.305" width="0.4064" layer="1"/>
+<wire x1="30.817" y1="27.305" x2="30.841" y2="27.329" width="0.4064" layer="1"/>
 </signal>
 <signal name="PA3">
 <contactref element="JP2" pad="6"/>
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
@@ -588,9 +588,6 @@ Please make sure your boards conform to 
 <wire x1="16.637" y1="25.527" x2="15.875" y2="24.765" width="0.4064" layer="1"/>
 <wire x1="15.875" y1="24.765" x2="15.875" y2="22.8" width="0.4064" layer="1"/>
 <wire x1="15.875" y1="22.8" x2="15.875" y2="21.971" width="0.4064" layer="1"/>
-<wire x1="15.875" y1="21.971" x2="14.986" y2="21.082" width="0.4064" layer="1"/>
-<wire x1="14.986" y1="21.082" x2="14.224" y2="21.082" width="0.4064" layer="1"/>
-<wire x1="14.224" y1="21.082" x2="13.589" y2="21.717" width="0.4064" layer="1"/>
 <wire x1="13.589" y1="21.717" x2="12.319" y2="22.987" width="0.4064" layer="1"/>
 <wire x1="10.58" y1="24.13" x2="10.58" y2="23.964" width="0.4064" layer="1"/>
 <wire x1="10.58" y1="23.964" x2="11.557" y2="22.987" width="0.4064" layer="1"/>
@@ -602,6 +599,9 @@ Please make sure your boards conform to 
 <via x="13.208" y="20.955" extent="1-16" drill="0.254"/>
 <wire x1="13.208" y1="20.955" x2="13.208" y2="21.336" width="0.4064" layer="1"/>
 <wire x1="13.208" y1="21.336" x2="13.589" y2="21.717" width="0.4064" layer="1"/>
+<wire x1="15.875" y1="21.971" x2="15.113" y2="21.209" width="0.4064" layer="1"/>
+<wire x1="15.113" y1="21.209" x2="14.097" y2="21.209" width="0.4064" layer="1"/>
+<wire x1="14.097" y1="21.209" x2="13.589" y2="21.717" width="0.4064" layer="1"/>
 </signal>
 <signal name="VBAT">
 <contactref element="JP1" pad="2"/>
@@ -658,8 +658,9 @@ Please make sure your boards conform to 
 <wire x1="13.97" y1="15.24" x2="13.462" y2="14.732" width="0.4064" layer="1"/>
 <wire x1="13.462" y1="14.732" x2="13.462" y2="13.589" width="0.4064" layer="1"/>
 <via x="13.462" y="13.589" extent="1-16" drill="0.254"/>
-<wire x1="13.462" y1="13.589" x2="12.319" y2="13.589" width="0.4064" layer="16"/>
-<wire x1="12.319" y1="13.589" x2="12.319" y2="21.463" width="0.4064" layer="16"/>
+<wire x1="13.462" y1="13.589" x2="12.827" y2="13.589" width="0.4064" layer="16"/>
+<wire x1="12.827" y1="13.589" x2="12.319" y2="14.097" width="0.4064" layer="16"/>
+<wire x1="12.319" y1="14.097" x2="12.319" y2="21.463" width="0.4064" layer="16"/>
 </signal>
 <signal name="MOSI">
 <contactref element="JP1" pad="4"/>
@@ -714,15 +715,15 @@ Please make sure your boards conform to 
 <wire x1="9.525" y1="18.923" x2="9.525" y2="16.637" width="0.4064" layer="1"/>
 <wire x1="9.525" y1="16.637" x2="9.525" y2="7.112" width="0.4064" layer="1"/>
 <wire x1="9.525" y1="7.112" x2="5.08" y2="2.667" width="0.4064" layer="1"/>
-<wire x1="17.145" y1="21.971" x2="14.859" y2="19.685" width="0.4064" layer="1"/>
-<wire x1="14.859" y1="19.685" x2="12.573" y2="19.685" width="0.4064" layer="1"/>
-<wire x1="12.573" y1="19.685" x2="11.303" y2="18.415" width="0.4064" layer="1"/>
 <via x="11.303" y="18.415" extent="1-16" drill="0.254"/>
 <wire x1="11.303" y1="18.415" x2="8.128" y2="18.415" width="0.4064" layer="16"/>
 <via x="8.128" y="18.415" extent="1-16" drill="0.254"/>
 <wire x1="8.128" y1="18.415" x2="8.128" y2="17.145" width="0.4064" layer="1"/>
 <wire x1="8.128" y1="17.145" x2="8.636" y2="16.637" width="0.4064" layer="1"/>
 <wire x1="8.636" y1="16.637" x2="9.525" y2="16.637" width="0.4064" layer="1"/>
+<wire x1="17.145" y1="21.971" x2="14.732" y2="19.558" width="0.4064" layer="1"/>
+<wire x1="14.732" y1="19.558" x2="12.446" y2="19.558" width="0.4064" layer="1"/>
+<wire x1="12.446" y1="19.558" x2="11.303" y2="18.415" width="0.4064" layer="1"/>
 </signal>
 <signal name="SDA">
 <contactref element="JP2" pad="2"/>
@@ -731,9 +732,20 @@ Please make sure your boards conform to 
 <contactref element="U$3" pad="7"/>
 <wire x1="18.415" y1="22.8" x2="18.415" y2="17.94" width="0.4064" layer="1"/>
 <wire x1="18.415" y1="17.94" x2="18.575" y2="17.78" width="0.4064" layer="1"/>
-<wire x1="10.55" y1="19.7" x2="18.415" y2="17.94" width="0" layer="19" extent="1-1"/>
 <wire x1="10.55" y1="19.7" x2="10.55" y2="5.343" width="0.4064" layer="1"/>
 <wire x1="10.55" y1="5.343" x2="7.62" y2="2.413" width="0.4064" layer="1"/>
+<wire x1="10.55" y1="19.7" x2="10.683" y2="19.7" width="0.4064" layer="1"/>
+<wire x1="10.683" y1="19.7" x2="11.176" y2="20.193" width="0.4064" layer="1"/>
+<wire x1="11.176" y1="20.193" x2="14.224" y2="20.193" width="0.4064" layer="1"/>
+<wire x1="14.224" y1="20.193" x2="14.478" y2="20.447" width="0.4064" layer="1"/>
+<via x="14.478" y="20.447" extent="1-16" drill="0.254"/>
+<wire x1="14.478" y1="20.447" x2="17.018" y2="20.447" width="0.4064" layer="16"/>
+<via x="17.018" y="20.447" extent="1-16" drill="0.254"/>
+<wire x1="17.018" y1="20.447" x2="17.399" y2="20.066" width="0.4064" layer="1"/>
+<wire x1="17.399" y1="20.066" x2="17.399" y2="18.542" width="0.4064" layer="1"/>
+<wire x1="17.399" y1="18.542" x2="17.907" y2="18.034" width="0.4064" layer="1"/>
+<wire x1="17.907" y1="18.034" x2="18.321" y2="18.034" width="0.4064" layer="1"/>
+<wire x1="18.321" y1="18.034" x2="18.575" y2="17.78" width="0.4064" layer="1"/>
 </signal>
 <signal name="PA0">
 <contactref element="JP2" pad="3"/>