# HG changeset patch # User ethanzonca@CL-SEC241-08.cedarville.edu # Date 2012-11-01 15:56:55 # Node ID 0d546233ae033105908037cc97449647dc9b2595 # Parent d320264ec8a3b805c50a3a08b246681dd7783314 # Parent 735f1fca6a83c2922e1222fc59b422ae609f2690 Merge diff --git a/master/eagle.epf b/master/eagle.epf --- a/master/eagle.epf +++ b/master/eagle.epf @@ -344,6 +344,46 @@ 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 @@ -352,3 +392,4 @@ 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 @@ -6,7 +6,7 @@ - + @@ -435,9 +435,9 @@ design rules under a new name. - - - + + + @@ -445,9 +445,9 @@ design rules under a new name. - - - + + + @@ -485,17 +485,17 @@ design rules under a new name. - + - + - + 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 @@ -6,7 +6,7 @@ - + @@ -369,7 +369,7 @@ We've spent an enormous amount of time c - + EAGLE Design Rules Die Standard-Design-Rules sind so gewählt, dass sie für @@ -377,33 +377,29 @@ die meisten Anwendungen passen. Sollte i besondere Anforderungen haben, treffen Sie die erforderlichen Einstellungen hier und speichern die Design Rules unter einem neuen Namen ab. -EAGLE Design Rules +Laen's PCB Order Design Rules -The default Design Rules have been set to cover -a wide range of applications. Your particular design -may have different requirements, so please make the -necessary adjustments and save your customized -design rules under a new name. +Please make sure your boards conform to these design rules. - - - - - - - - - - - + + + + + + + + + + + - - + + - - - + + + @@ -412,15 +408,15 @@ design rules under a new name. - + - + - + - + - + @@ -548,15 +544,16 @@ design rules under a new name. - - - - - - - - - + + + + + + + + + + @@ -567,17 +564,44 @@ design rules under a new name. - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -589,14 +613,53 @@ design rules under a new name. + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -604,12 +667,20 @@ design rules under a new name. - + + + + + - + + + + + @@ -627,21 +698,69 @@ design rules under a new name. - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -664,28 +783,26 @@ design rules under a new name. - - - - - - - + + + + - - - - - - + + + + - + + + + 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 @@ -1448,61 +1448,6 @@ i2c - - - - - - - - ->VALUE - - - - - -SUPPLY SYMBOL - - - - - - - - - - - - - - - - - - - - ->VALUE - - - - - -SUPPLY SYMBOL - - - - - - - - - - - - - Reference Package @@ -1607,11 +1552,14 @@ i2c - - - + + + + + + @@ -1626,10 +1574,12 @@ i2c - Temp -Pressure +Pressure + + + @@ -1647,13 +1597,16 @@ i2c - - - - - - - + + + + + + + + + + @@ -1698,9 +1651,22 @@ i2c - - + + + + + + + + + + + + + + + @@ -1741,15 +1707,32 @@ i2c + + + + + - - - + + + - - - + + + + + + + + + + + + + + + @@ -1767,8 +1750,8 @@ i2c - - + + @@ -1779,8 +1762,8 @@ i2c - - + + @@ -1827,6 +1810,11 @@ i2c + + + + + @@ -1844,6 +1832,11 @@ i2c + + + + + @@ -1851,6 +1844,11 @@ i2c + + + + + @@ -1858,6 +1856,13 @@ i2c + + + + + + + @@ -1912,34 +1917,25 @@ i2c - - + + - - - - - - - - - - - + + - - + + - - + + diff --git a/slave/slave.brd b/slave/slave.brd --- a/slave/slave.brd +++ b/slave/slave.brd @@ -1070,22 +1070,21 @@ Please make sure your boards conform to - - + + - - - - - - - - - - - - - + + + + + + + + + + + +