# HG changeset patch
# User Ethan Zonca <ez@ethanzonca.com>
# Date 2012-11-07 17:58:57
# Node ID e616f0ba31ca437d82a193f0c9b6cdafddfd0908
# Parent  2c32f4d33d696ab58fe6047ed522f83e330d30e6
# Parent  4c19a243fd3c09cef9ad52716b0fb45becffccf0

merge

diff --git a/slave/slave.brd b/slave/slave.brd
--- a/slave/slave.brd
+++ b/slave/slave.brd
@@ -1118,6 +1118,7 @@ Please make sure your boards conform to 
 <via x="46.6344" y="12.8016" extent="1-16" drill="0.381"/>
 <contactref element="C2" pad="2"/>
 <contactref element="C1" pad="2"/>
+<wire x1="39.966" y1="13.6144" x2="37.15" y2="10.752" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VCC">
 <contactref element="IC1" pad="38"/>
@@ -1414,35 +1415,44 @@ Please make sure your boards conform to 
 <signal name="PA4">
 <contactref element="IC1" pad="33"/>
 <contactref element="JP2" pad="7"/>
-<wire x1="31.073" y1="21.907" x2="31.559" y2="21.907" width="0.4064" layer="1"/>
-<wire x1="31.559" y1="21.907" x2="32.004" y2="22.352" width="0.4064" layer="1"/>
-<wire x1="32.004" y1="22.352" x2="32.004" y2="35.306" width="0.4064" layer="1"/>
-<wire x1="32.004" y1="35.306" x2="33.02" y2="36.322" width="0.4064" layer="1"/>
-<wire x1="33.02" y1="36.322" x2="33.02" y2="36.957" width="0.4064" layer="1"/>
+<wire x1="31.073" y1="21.907" x2="31.8638" y2="21.907" width="0.4064" layer="1"/>
+<wire x1="31.8638" y1="21.907" x2="32.2072" y2="22.2504" width="0.4064" layer="1"/>
+<wire x1="32.2072" y1="22.2504" x2="32.2072" y2="34.7472" width="0.4064" layer="1"/>
+<wire x1="33.02" y1="35.56" x2="33.02" y2="36.957" width="0.4064" layer="1"/>
+<wire x1="32.2072" y1="34.7472" x2="33.02" y2="35.56" width="0.4064" layer="1"/>
 </signal>
 <signal name="PA5">
 <contactref element="IC1" pad="32"/>
 <contactref element="JP2" pad="8"/>
-<wire x1="31.073" y1="21.107" x2="32.029" y2="21.107" width="0.4064" layer="1"/>
-<wire x1="32.029" y1="21.107" x2="32.766" y2="21.844" width="0.4064" layer="1"/>
-<wire x1="32.766" y1="21.844" x2="32.766" y2="33.909" width="0.4064" layer="1"/>
-<wire x1="32.766" y1="33.909" x2="35.56" y2="36.703" width="0.4064" layer="1"/>
+<wire x1="31.073" y1="21.107" x2="32.1814" y2="21.107" width="0.4064" layer="1"/>
+<wire x1="32.1814" y1="21.107" x2="33.02" y2="21.9456" width="0.4064" layer="1"/>
+<wire x1="33.02" y1="21.9456" x2="33.02" y2="34.3408" width="0.4064" layer="1"/>
+<wire x1="35.56" y1="35.56" x2="35.56" y2="36.703" width="0.4064" layer="1"/>
+<wire x1="33.02" y1="34.3408" x2="33.9344" y2="35.2552" width="0.4064" layer="1"/>
+<wire x1="33.9344" y1="35.2552" x2="35.2552" y2="35.2552" width="0.4064" layer="1"/>
+<wire x1="35.2552" y1="35.2552" x2="35.56" y2="35.56" width="0.4064" layer="1"/>
 </signal>
 <signal name="PA6">
 <contactref element="IC1" pad="31"/>
 <contactref element="JP2" pad="9"/>
-<wire x1="31.073" y1="20.307" x2="32.245" y2="20.307" width="0.4064" layer="1"/>
-<wire x1="32.245" y1="20.307" x2="33.528" y2="21.59" width="0.4064" layer="1"/>
-<wire x1="33.528" y1="21.59" x2="33.528" y2="32.385" width="0.4064" layer="1"/>
-<wire x1="33.528" y1="32.385" x2="38.1" y2="36.957" width="0.4064" layer="1"/>
+<wire x1="38.1" y1="36.957" x2="38.1" y2="35.56" width="0.4064" layer="1"/>
+<wire x1="31.073" y1="20.307" x2="32.499" y2="20.307" width="0.4064" layer="1"/>
+<wire x1="32.499" y1="20.307" x2="33.8328" y2="21.6408" width="0.4064" layer="1"/>
+<wire x1="33.8328" y1="21.6408" x2="33.8328" y2="33.9344" width="0.4064" layer="1"/>
+<wire x1="33.8328" y1="33.9344" x2="34.4424" y2="34.544" width="0.4064" layer="1"/>
+<wire x1="34.4424" y1="34.544" x2="37.084" y2="34.544" width="0.4064" layer="1"/>
+<wire x1="37.084" y1="34.544" x2="38.1" y2="35.56" width="0.4064" layer="1"/>
 </signal>
 <signal name="PA7">
 <contactref element="IC1" pad="30"/>
 <contactref element="JP2" pad="10"/>
-<wire x1="31.073" y1="19.507" x2="32.461" y2="19.507" width="0.4064" layer="1"/>
-<wire x1="32.461" y1="19.507" x2="34.29" y2="21.336" width="0.4064" layer="1"/>
-<wire x1="34.29" y1="21.336" x2="34.29" y2="30.353" width="0.4064" layer="1"/>
-<wire x1="34.29" y1="30.353" x2="40.64" y2="36.703" width="0.4064" layer="1"/>
+<wire x1="40.64" y1="36.703" x2="40.64" y2="35.56" width="0.4064" layer="1"/>
+<wire x1="31.073" y1="19.507" x2="32.9182" y2="19.507" width="0.4064" layer="1"/>
+<wire x1="32.9182" y1="19.507" x2="34.6456" y2="21.2344" width="0.4064" layer="1"/>
+<wire x1="34.6456" y1="21.2344" x2="34.6456" y2="33.528" width="0.4064" layer="1"/>
+<wire x1="34.6456" y1="33.528" x2="34.9504" y2="33.8328" width="0.4064" layer="1"/>
+<wire x1="34.9504" y1="33.8328" x2="38.9128" y2="33.8328" width="0.4064" layer="1"/>
+<wire x1="38.9128" y1="33.8328" x2="40.64" y2="35.56" width="0.4064" layer="1"/>
 </signal>
 <signal name="SCK">
 <contactref element="IC1" pad="3"/>