# HG changeset patch
# User kripperger
# Date 2012-10-25 21:12:35
# Node ID 53e56aaff9e429d95d2048c44615031f1e1b68a9
# Parent  1a11c7dc4c226f59faf982398c97f6121fe95d99
# Parent  0ae50c6a8125aa185e297b74b131263e3d7ec88f

Merge

diff --git a/slave/slave.brd b/slave/slave.brd
--- a/slave/slave.brd
+++ b/slave/slave.brd
@@ -944,7 +944,7 @@ design rules under a new name.</descript
 <element name="C11" library="SparkFun" package="0603-CAP" value="220nF" x="-39.37" y="60.96"/>
 <element name="C12" library="SparkFun" package="0805" value="100uF" x="-27.94" y="60.96"/>
 <element name="ROTARY_DIP" library="SeniorDesign" package="CD08RM0SB" value="CD08RM0SB" x="5.08" y="26.67"/>
-<element name="TEMP" library="SeniorDesign" package="SOT23-5" value="MCP9800" x="27.94" y="24.13"/>
+<element name="TEMP" library="SeniorDesign" package="SOT23-5" value="MCP9800" x="57.15" y="33.02"/>
 <element name="JP2" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="24.13" y="36.83"/>
 <element name="JP1" library="SparkFun" package="1X10_LOCK" value="M10LOCK" x="24.13" y="2.54"/>
 <element name="R3" library="SparkFun" package="0603-RES" value="4.7k" x="-57.15" y="-22.86"/>
@@ -952,23 +952,23 @@ design rules under a new name.</descript
 <element name="R5" library="SparkFun" package="0603-RES" value="4.7k" x="-57.15" y="-27.94"/>
 <element name="C13" library="SparkFun" package="0603-CAP" value="18pf" x="-57.15" y="-36.83"/>
 <element name="C14" library="SparkFun" package="0603-CAP" value="18pf" x="-53.34" y="-36.83"/>
-<element name="Y2" library="SparkFun" package="CRYSTAL-SMD-5X3" value="11.0592MHz" x="-55.88" y="-31.75"/>
+<element name="Y2" library="SparkFun" package="CRYSTAL-SMD-5X3" value="11.0592MHz" x="27.94" y="17.78"/>
 <element name="C15" library="SparkFun" package="0603-CAP" value=".1uF" x="-57.15" y="-40.64"/>
 <element name="L2" library="SparkFun" package="0603" value="10uH" x="-53.34" y="-40.64"/>
 <element name="C16" library="SparkFun" package="0603-CAP" value=".1uF" x="-57.15" y="-44.45"/>
 <element name="C17" library="SparkFun" package="0603-CAP" value=".1uF" x="-57.15" y="-48.26"/>
 <element name="C18" library="SparkFun" package="0603-CAP" value="10uF" x="-57.15" y="-52.07"/>
-<element name="ICSP" library="SparkFun" package="2X3-NS" value="AVR_SPI_PRG_6NS" x="-54.61" y="-59.69"/>
+<element name="ICSP" library="SparkFun" package="2X3-NS" value="AVR_SPI_PRG_6NS" x="55.88" y="10.16"/>
 <element name="R6" library="SparkFun" package="0603-RES" value="4.7k" x="-57.15" y="-66.04"/>
 <element name="R7" library="SparkFun" package="0603-RES" value="4.7k" x="-57.15" y="-69.85"/>
-<element name="LED1" library="adafruit" package="CHIPLED_0603" value="AMBER" x="-63.5" y="-68.58"/>
+<element name="LED1" library="adafruit" package="CHIPLED_0603" value="AMBER" x="58.42" y="16.51"/>
 <element name="R8" library="SparkFun" package="0603-RES" value="10K" x="-63.5" y="-73.66"/>
 <element name="R9" library="SparkFun" package="0603-RES" value="10K" x="-63.5" y="-77.47"/>
 <element name="R10" library="SparkFun" package="0603-RES" value="1M" x="-63.5" y="-80.01"/>
-<element name="R11" library="SparkFun" package="R2512" value="" x="-60.96" y="-85.09"/>
+<element name="R11" library="SparkFun" package="R2512" value="" x="21.59" y="17.78" rot="R90"/>
 <element name="C19" library="SparkFun" package="0603-CAP" value=".1uF" x="-63.5" y="-88.9"/>
-<element name="Q1" library="SparkFun" package="SOT23-3" value="MOSFET-PCHANNELSMD" x="-68.58" y="-88.9"/>
-<element name="Q2" library="transistor-npn" package="SOT23-BEC" value="BC849SMD" x="-67.31" y="-95.25"/>
+<element name="Q1" library="SparkFun" package="SOT23-3" value="MOSFET-PCHANNELSMD" x="21.59" y="25.4" rot="R180"/>
+<element name="Q2" library="transistor-npn" package="SOT23-BEC" value="BC849SMD" x="26.67" y="25.4"/>
 <element name="R12" library="SparkFun" package="0603-RES" value="10K" x="-68.58" y="-100.33"/>
 <element name="R13" library="SparkFun" package="0603-RES" value="10K" x="-68.58" y="-104.14"/>
 <element name="R14" library="SparkFun" package="0603-RES" value="10K" x="-68.58" y="-107.95"/>
@@ -1024,12 +1024,12 @@ design rules under a new name.</descript
 <wire x1="-83.82" y1="-109.74" x2="-88.9" y2="-109.74" width="0" layer="19" extent="1-1"/>
 <wire x1="-78.74" y1="-109.74" x2="-83.82" y2="-109.74" width="0" layer="19" extent="1-1"/>
 <wire x1="-73.66" y1="-109.74" x2="-78.74" y2="-109.74" width="0" layer="19" extent="1-1"/>
-<wire x1="-66.36" y1="-96.35" x2="-73.66" y2="-109.74" width="0" layer="19" extent="1-1"/>
-<wire x1="-62.65" y1="-88.9" x2="-66.36" y2="-96.35" width="0" layer="19" extent="1-1"/>
-<wire x1="-63.76" y1="-85.09" x2="-62.65" y2="-88.9" width="0" layer="19" extent="1-1"/>
-<wire x1="-63.5" y1="-67.83" x2="-63.76" y2="-85.09" width="0" layer="19" extent="1-1"/>
-<wire x1="-52.07" y1="-58.42" x2="-63.5" y2="-67.83" width="0" layer="19" extent="1-1"/>
-<wire x1="-56.3" y1="-52.07" x2="-52.07" y2="-58.42" width="0" layer="19" extent="1-1"/>
+<wire x1="27.62" y1="24.3" x2="-73.66" y2="-109.74" width="0" layer="19" extent="1-1"/>
+<wire x1="-62.65" y1="-88.9" x2="27.62" y2="24.3" width="0" layer="19" extent="1-1"/>
+<wire x1="21.59" y1="14.98" x2="-62.65" y2="-88.9" width="0" layer="19" extent="1-1"/>
+<wire x1="58.42" y1="17.26" x2="21.59" y2="14.98" width="0" layer="19" extent="1-1"/>
+<wire x1="58.42" y1="11.43" x2="58.42" y2="17.26" width="0" layer="19" extent="1-1"/>
+<wire x1="-56.3" y1="-52.07" x2="58.42" y2="11.43" width="0" layer="19" extent="1-1"/>
 <wire x1="-56.3" y1="-48.26" x2="-56.3" y2="-52.07" width="0" layer="19" extent="1-1"/>
 <wire x1="-56.3" y1="-44.45" x2="-56.3" y2="-48.26" width="0" layer="19" extent="1-1"/>
 <wire x1="-58" y1="-40.64" x2="-56.3" y2="-44.45" width="0" layer="19" extent="1-1"/>
@@ -1043,8 +1043,8 @@ design rules under a new name.</descript
 <wire x1="4.445" y1="30.6705" x2="5.02" y2="22.225" width="0" layer="19" extent="1-1"/>
 <wire x1="15.24" y1="15.63" x2="7.62" y2="20.32" width="0" layer="19" extent="1-1"/>
 <wire x1="13.716" y1="30.6705" x2="4.445" y2="30.6705" width="0" layer="19" extent="1-1"/>
-<wire x1="27.94" y1="22.84" x2="15.24" y2="15.63" width="0" layer="19" extent="1-1"/>
-<wire x1="35.475" y1="19.685" x2="27.94" y2="22.84" width="0" layer="19" extent="1-1"/>
+<wire x1="57.15" y1="31.73" x2="15.24" y2="15.63" width="0" layer="19" extent="1-1"/>
+<wire x1="35.475" y1="19.685" x2="57.15" y2="31.73" width="0" layer="19" extent="1-1"/>
 <wire x1="41.275" y1="25.485" x2="35.475" y2="19.685" width="0" layer="19" extent="1-1"/>
 <wire x1="47.53" y1="29.185" x2="41.275" y2="25.485" width="0" layer="19" extent="1-16"/>
 <wire x1="47.075" y1="19.685" x2="41.275" y2="25.485" width="0" layer="19" extent="1-1"/>
@@ -1081,19 +1081,19 @@ design rules under a new name.</descript
 <contactref element="C19" pad="1"/>
 <wire x1="-56.3" y1="-69.85" x2="-64.35" y2="-88.9" width="0" layer="19" extent="1-1"/>
 <wire x1="-56.3" y1="-66.04" x2="-56.3" y2="-69.85" width="0" layer="19" extent="1-1"/>
-<wire x1="-57.15" y1="-58.42" x2="-56.3" y2="-66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="-58" y1="-52.07" x2="-57.15" y2="-58.42" width="0" layer="19" extent="1-1"/>
+<wire x1="53.34" y1="11.43" x2="-56.3" y2="-66.04" width="0" layer="19" extent="1-1"/>
+<wire x1="-58" y1="-52.07" x2="53.34" y2="11.43" width="0" layer="19" extent="1-1"/>
 <wire x1="-58" y1="-48.26" x2="-58" y2="-52.07" width="0" layer="19" extent="1-1"/>
 <wire x1="-58" y1="-44.45" x2="-58" y2="-48.26" width="0" layer="19" extent="1-1"/>
 <wire x1="-52.49" y1="-40.64" x2="-58" y2="-44.45" width="0" layer="19" extent="1-1"/>
 <wire x1="5.02" y1="18.415" x2="-52.49" y2="-40.64" width="0" layer="19" extent="1-1"/>
 <wire x1="21.01" y1="7.62" x2="5.02" y2="18.415" width="0" layer="19" extent="1-1"/>
 <wire x1="29.21" y1="2.667" x2="21.01" y2="7.62" width="0" layer="19" extent="1-1"/>
-<wire x1="26.99" y1="22.84" x2="21.01" y2="7.62" width="0" layer="19" extent="1-1"/>
-<wire x1="35.475" y1="20.485" x2="26.99" y2="22.84" width="0" layer="19" extent="1-1"/>
+<wire x1="56.2" y1="31.73" x2="21.01" y2="7.62" width="0" layer="19" extent="1-1"/>
+<wire x1="35.475" y1="20.485" x2="56.2" y2="31.73" width="0" layer="19" extent="1-1"/>
 <wire x1="42.075" y1="25.485" x2="35.475" y2="20.485" width="0" layer="19" extent="1-1"/>
 <wire x1="41.275" y1="13.885" x2="35.475" y2="20.485" width="0" layer="19" extent="1-1"/>
-<wire x1="29.53" y1="32.185" x2="26.99" y2="22.84" width="0" layer="19" extent="1-16"/>
+<wire x1="29.53" y1="32.185" x2="56.2" y2="31.73" width="0" layer="19" extent="1-16"/>
 <wire x1="-16.09" y1="63.5" x2="5.02" y2="18.415" width="0" layer="19" extent="1-1"/>
 <wire x1="-19.9" y1="63.5" x2="-16.09" y2="63.5" width="0" layer="19" extent="1-1"/>
 <wire x1="-28.84" y1="60.96" x2="-19.9" y2="63.5" width="0" layer="19" extent="1-1"/>
@@ -1104,7 +1104,7 @@ design rules under a new name.</descript
 <contactref element="R1" pad="2"/>
 <contactref element="IC1" pad="4"/>
 <contactref element="ICSP" pad="5"/>
-<wire x1="35.475" y1="21.285" x2="-52.07" y2="-60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="35.475" y1="21.285" x2="58.42" y2="8.89" width="0" layer="19" extent="1-1"/>
 <wire x1="-42.33" y1="60.96" x2="35.475" y2="21.285" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$2">
@@ -1120,7 +1120,7 @@ design rules under a new name.</descript
 <contactref element="JP1" pad="2"/>
 <contactref element="R10" pad="2"/>
 <contactref element="Q1" pad="2"/>
-<wire x1="-62.65" y1="-80.01" x2="-67.63" y2="-89.9" width="0" layer="19" extent="1-1"/>
+<wire x1="-62.65" y1="-80.01" x2="20.64" y2="26.4" width="0" layer="19" extent="1-1"/>
 <wire x1="6.03" y1="11.6" x2="-62.65" y2="-80.01" width="0" layer="19" extent="1-1"/>
 <wire x1="10.22" y1="20.955" x2="6.03" y2="11.6" width="0" layer="19" extent="1-1"/>
 <wire x1="10.22" y1="22.225" x2="10.22" y2="20.955" width="0" layer="19" extent="1-1"/>
@@ -1157,8 +1157,8 @@ design rules under a new name.</descript
 <contactref element="R7" pad="1"/>
 <contactref element="JP2" pad="2"/>
 <wire x1="26.67" y1="36.703" x2="-58" y2="-69.85" width="0" layer="19" extent="1-1"/>
-<wire x1="26.99" y1="25.43" x2="26.67" y2="36.703" width="0" layer="19" extent="1-1"/>
-<wire x1="43.675" y1="13.885" x2="26.99" y2="25.43" width="0" layer="19" extent="1-1"/>
+<wire x1="56.2" y1="34.32" x2="26.67" y2="36.703" width="0" layer="19" extent="1-1"/>
+<wire x1="43.675" y1="13.885" x2="56.2" y2="34.32" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="SCL">
 <contactref element="IC1" pad="19"/>
@@ -1166,8 +1166,8 @@ design rules under a new name.</descript
 <contactref element="R6" pad="1"/>
 <contactref element="JP2" pad="1"/>
 <wire x1="24.13" y1="36.957" x2="-58" y2="-66.04" width="0" layer="19" extent="1-1"/>
-<wire x1="28.89" y1="25.43" x2="24.13" y2="36.957" width="0" layer="19" extent="1-1"/>
-<wire x1="42.875" y1="13.885" x2="28.89" y2="25.43" width="0" layer="19" extent="1-1"/>
+<wire x1="58.1" y1="34.32" x2="24.13" y2="36.957" width="0" layer="19" extent="1-1"/>
+<wire x1="42.875" y1="13.885" x2="58.1" y2="34.32" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PA0">
 <contactref element="IC1" pad="37"/>
@@ -1213,36 +1213,36 @@ design rules under a new name.</descript
 <contactref element="IC1" pad="3"/>
 <contactref element="ICSP" pad="3"/>
 <contactref element="JP1" pad="6"/>
-<wire x1="36.83" y1="2.413" x2="-54.61" y2="-60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="36.83" y1="2.413" x2="55.88" y2="8.89" width="0" layer="19" extent="1-1"/>
 <wire x1="35.475" y1="22.085" x2="36.83" y2="2.413" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MISO">
 <contactref element="IC1" pad="2"/>
 <contactref element="ICSP" pad="1"/>
 <contactref element="JP1" pad="5"/>
-<wire x1="34.29" y1="2.667" x2="-57.15" y2="-60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="34.29" y1="2.667" x2="53.34" y2="8.89" width="0" layer="19" extent="1-1"/>
 <wire x1="35.475" y1="22.885" x2="34.29" y2="2.667" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="MOSI">
 <contactref element="IC1" pad="1"/>
 <contactref element="ICSP" pad="4"/>
 <contactref element="JP1" pad="4"/>
-<wire x1="31.75" y1="2.413" x2="-54.61" y2="-58.42" width="0" layer="19" extent="1-1"/>
+<wire x1="31.75" y1="2.413" x2="55.88" y2="11.43" width="0" layer="19" extent="1-1"/>
 <wire x1="35.475" y1="23.685" x2="31.75" y2="2.413" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$10">
 <contactref element="Y2" pad="3"/>
 <contactref element="C14" pad="2"/>
 <contactref element="IC1" pad="7"/>
-<wire x1="-54.03" y1="-30.6" x2="-52.49" y2="-36.83" width="0" layer="19" extent="1-1"/>
-<wire x1="35.475" y1="18.885" x2="-54.03" y2="-30.6" width="0" layer="19" extent="1-1"/>
+<wire x1="29.79" y1="18.93" x2="-52.49" y2="-36.83" width="0" layer="19" extent="1-1"/>
+<wire x1="35.475" y1="18.885" x2="29.79" y2="18.93" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$11">
 <contactref element="Y2" pad="1"/>
 <contactref element="C13" pad="2"/>
 <contactref element="IC1" pad="8"/>
-<wire x1="-57.73" y1="-32.9" x2="-56.3" y2="-36.83" width="0" layer="19" extent="1-1"/>
-<wire x1="35.475" y1="18.085" x2="-57.73" y2="-32.9" width="0" layer="19" extent="1-1"/>
+<wire x1="26.09" y1="16.63" x2="-56.3" y2="-36.83" width="0" layer="19" extent="1-1"/>
+<wire x1="35.475" y1="18.085" x2="26.09" y2="16.63" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$12">
 <contactref element="C15" pad="2"/>
@@ -1338,24 +1338,24 @@ design rules under a new name.</descript
 <signal name="N$7">
 <contactref element="R8" pad="1"/>
 <contactref element="LED1" pad="A"/>
-<wire x1="-63.5" y1="-69.33" x2="-64.35" y2="-73.66" width="0" layer="19" extent="1-1"/>
+<wire x1="58.42" y1="15.76" x2="-64.35" y2="-73.66" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$8">
 <contactref element="Q2" pad="B"/>
 <contactref element="R9" pad="2"/>
-<wire x1="-62.65" y1="-77.47" x2="-68.26" y2="-96.35" width="0" layer="19" extent="1-1"/>
+<wire x1="-62.65" y1="-77.47" x2="25.72" y2="24.3" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$9">
 <contactref element="Q1" pad="3"/>
 <contactref element="R11" pad="2"/>
-<wire x1="-58.16" y1="-85.09" x2="-68.58" y2="-87.8" width="0" layer="19" extent="1-1"/>
+<wire x1="21.59" y1="20.58" x2="21.59" y2="24.3" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$14">
 <contactref element="Q2" pad="C"/>
 <contactref element="R10" pad="1"/>
 <contactref element="Q1" pad="1"/>
-<wire x1="-69.53" y1="-89.9" x2="-67.31" y2="-94.15" width="0" layer="19" extent="1-1"/>
-<wire x1="-64.35" y1="-80.01" x2="-69.53" y2="-89.9" width="0" layer="19" extent="1-1"/>
+<wire x1="22.54" y1="26.4" x2="26.67" y2="26.5" width="0" layer="19" extent="1-1"/>
+<wire x1="-64.35" y1="-80.01" x2="22.54" y2="26.4" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="HEAT">
 <contactref element="R9" pad="1"/>