Skip to content

Commit

Permalink
Implementing wiring changes; should have already uploaded?
Browse files Browse the repository at this point in the history
  • Loading branch information
@awickert
awickert committed May 2, 2017
1 parent 3871eeb commit 6bd7bdb
Showing 1 changed file with 1 addition and 164 deletions.
165 changes: 1 addition & 164 deletions ALogShield.brd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,18 +202,8 @@ University of Minnesota</text>
<text x="1.27" y="25.781" size="1.27" layer="21">A3</text>
<text x="12.831" y="15.24" size="1.016" layer="21" rot="R90">GND</text>
<text x="49.276" y="54.864" size="1.778" layer="21">+</text>
<<<<<<< HEAD
<text x="7.6835" y="11.811" size="0.8128" layer="21" rot="R90">ALog-Shield v2.1.0a
21 March 2017
Andy Wickert and
Chad Sandell
Northern Widget LLC and
University of Minnesota</text>
<text x="42.183" y="8.636" size="0.8128" layer="21" rot="R90">(3V3 SOOOOOOOOOON NEED TO FIX!!!)</text>
=======
<text x="23.6855" y="35.433" size="0.8128" layer="21" rot="R90">ALog-Shield v2.1.0a</text>
<text x="2.794" y="22.733" size="1.27" layer="21">Reference Resistors</text>
>>>>>>> 6d33003b7ebe7ae5411e8a9a0469f4d4a00e5e6c
</plain>
<libraries>
<library name="SparkFun">
Expand Down Expand Up @@ -1297,7 +1287,7 @@ design rules under a new name.</description>
<pass name="Default">
<param name="RoutingGrid" value="6.25mil"/>
<param name="AutoGrid" value="1"/>
<param name="Efforts" value="1"/>
<param name="Efforts" value="2"/>
<param name="TopRouterVariant" value="1"/>
<param name="tpViaShape" value="round"/>
<param name="PrefDir.1" value="*"/>
Expand Down Expand Up @@ -1484,73 +1474,21 @@ design rules under a new name.</description>
<via x="18.034" y="55.118" extent="1-16" drill="0.3048" shape="octagon"/>
<via x="33.02" y="46.482" extent="1-16" drill="0.3048" shape="octagon"/>
<wire x1="23.368" y1="52.2224" x2="23.456" y2="51.943" width="0.2032" layer="1"/>
<<<<<<< HEAD
<via x="23.368" y="29.972" extent="1-16" drill="0.3048" shape="octagon"/>
<via x="14.986" y="57.404" extent="1-16" drill="0.3048" shape="octagon"/>
<via x="20.828" y="45.72" extent="1-16" drill="0.3048" shape="octagon"/>
=======
>>>>>>> 6d33003b7ebe7ae5411e8a9a0469f4d4a00e5e6c
<contactref element="C15" pad="D2"/>
<contactref element="C15" pad="C2"/>
<contactref element="C15" pad="B2"/>
<contactref element="C15" pad="A2"/>
<via x="10.414" y="26.416" extent="1-16" drill="0.3048" shape="octagon"/>
<via x="16.764" y="53.086" extent="1-16" drill="0.3048" shape="octagon"/>
<contactref element="CLOCK_BATT" pad="GND"/>
<<<<<<< HEAD
=======
<via x="25.4" y="54.61" extent="1-16" drill="0.3048" shape="octagon"/>
>>>>>>> 6d33003b7ebe7ae5411e8a9a0469f4d4a00e5e6c
</signal>
<signal name="VCC">
<contactref element="U$9" pad="5V"/>
<contactref element="U$9" pad="VIN"/>
<contactref element="J1" pad="1"/>
<contactref element="U1" pad="2"/>
<contactref element="H4" pad="5"/>
<<<<<<< HEAD
<wire x1="32.9184" y1="10.9728" x2="32.9184" y2="3.8608" width="0.2032" layer="16"/>
<wire x1="30.2768" y1="13.6144" x2="31.4706" y2="12.4206" width="0.2032" layer="16"/>
<wire x1="31.4706" y1="12.4206" x2="32.9184" y2="10.9728" width="0.2032" layer="16"/>
<wire x1="32.9184" y1="3.8608" x2="33.08" y2="3.81" width="0.2032" layer="16"/>
<wire x1="30.2768" y1="13.6144" x2="30.1625" y2="13.716" width="0.2032" layer="16"/>
<contactref element="I2C_PU_" pad="6"/>
<contactref element="I2C_PU_" pad="5"/>
<wire x1="16.256" y1="55.0672" x2="15.8496" y2="55.0672" width="0.2032" layer="1"/>
<wire x1="22.5552" y1="61.3664" x2="20.5232" y2="59.3344" width="0.2032" layer="1"/>
<wire x1="20.5232" y1="59.3344" x2="16.256" y2="55.0672" width="0.2032" layer="1"/>
<wire x1="22.5552" y1="64.008" x2="22.5552" y2="61.3664" width="0.2032" layer="1"/>
<wire x1="19.1008" y1="67.4624" x2="22.5552" y2="64.008" width="0.2032" layer="1"/>
<wire x1="19.1008" y1="74.5744" x2="19.1008" y2="67.4624" width="0.2032" layer="1"/>
<wire x1="15.8496" y1="55.0672" x2="15.678" y2="54.981" width="0.2032" layer="1"/>
<wire x1="19.1008" y1="74.5744" x2="19.08" y2="74.676" width="0.2032" layer="1"/>
<wire x1="16.256" y1="47.1424" x2="16.256" y2="46.5328" width="0.2032" layer="1"/>
<wire x1="20.1168" y1="51.0032" x2="16.256" y2="47.1424" width="0.2032" layer="1"/>
<wire x1="24.1808" y1="51.0032" x2="20.1168" y2="51.0032" width="0.2032" layer="1"/>
<wire x1="24.384" y1="51.2064" x2="24.1808" y2="51.0032" width="0.2032" layer="1"/>
<wire x1="24.384" y1="55.4736" x2="24.384" y2="51.2064" width="0.2032" layer="1"/>
<wire x1="20.5232" y1="59.3344" x2="24.384" y2="55.4736" width="0.2032" layer="1"/>
<wire x1="16.256" y1="46.5328" x2="16.129" y2="46.4312" width="0.2032" layer="1"/>
<wire x1="15.6464" y1="55.0672" x2="15.0368" y2="55.0672" width="0.2032" layer="1"/>
<wire x1="15.0368" y1="55.0672" x2="14.878" y2="54.981" width="0.2032" layer="1"/>
<wire x1="15.6464" y1="55.0672" x2="15.678" y2="54.981" width="0.2032" layer="1"/>
<wire x1="23.33625" y1="13.6525" x2="22.5425" y2="13.6525" width="0.2032" layer="16"/>
<wire x1="24.60625" y1="12.3825" x2="23.33625" y2="13.6525" width="0.2032" layer="16"/>
<wire x1="31.4325" y1="12.3825" x2="24.60625" y2="12.3825" width="0.2032" layer="16"/>
<wire x1="22.5425" y1="13.6525" x2="22.5425" y2="13.716" width="0.2032" layer="16"/>
<wire x1="31.4325" y1="12.3825" x2="31.4706" y2="12.4206" width="0.2032" layer="16"/>
<wire x1="22.5425" y1="39.52875" x2="22.5425" y2="13.716" width="0.2032" layer="1"/>
<wire x1="16.1925" y1="45.87875" x2="22.5425" y2="39.52875" width="0.2032" layer="1"/>
<wire x1="16.1925" y1="46.355" x2="16.1925" y2="45.87875" width="0.2032" layer="1"/>
<wire x1="16.1925" y1="46.355" x2="16.129" y2="46.4312" width="0.2032" layer="1"/>
<contactref element="U$9" pad="IOREF"/>
<wire x1="15.71625" y1="13.81125" x2="14.9225" y2="13.81125" width="0.2032" layer="16"/>
<wire x1="16.98625" y1="15.08125" x2="15.71625" y2="13.81125" width="0.2032" layer="16"/>
<wire x1="21.2725" y1="15.08125" x2="16.98625" y2="15.08125" width="0.2032" layer="16"/>
<wire x1="22.5425" y1="13.81125" x2="21.2725" y2="15.08125" width="0.2032" layer="16"/>
<wire x1="14.9225" y1="13.81125" x2="14.9225" y2="13.716" width="0.2032" layer="16"/>
<wire x1="22.5425" y1="13.81125" x2="22.5425" y2="13.716" width="0.2032" layer="16"/>
=======
<contactref element="I2C_PU_" pad="6"/>
<contactref element="I2C_PU_" pad="5"/>
<contactref element="U$9" pad="IOREF"/>
Expand Down Expand Up @@ -1584,7 +1522,6 @@ design rules under a new name.</description>
<wire x1="23.7744" y1="12.3952" x2="30.1625" y2="12.3952" width="0.2032" layer="16"/>
<wire x1="22.5552" y1="13.6144" x2="23.7744" y2="12.3952" width="0.2032" layer="16"/>
<wire x1="22.5552" y1="13.6144" x2="22.5425" y2="13.716" width="0.2032" layer="16"/>
>>>>>>> 6d33003b7ebe7ae5411e8a9a0469f4d4a00e5e6c
</signal>
<signal name="DI">
<contactref element="U$9" pad="D11"/>
Expand Down Expand Up @@ -1746,55 +1683,6 @@ design rules under a new name.</description>
<wire x1="19.5072" y1="6.2992" x2="17.0688" y2="3.8608" width="0.2032" layer="16"/>
<wire x1="20.1168" y1="6.2992" x2="19.5072" y2="6.2992" width="0.2032" layer="16"/>
<wire x1="15.6464" y1="3.8608" x2="15.58" y2="3.81" width="0.2032" layer="16"/>
<<<<<<< HEAD
<<<<<<< HEAD
=======
<contactref element="3V1" pad="1"/>
<contactref element="3V1" pad="7"/>
<wire x1="19.1008" y1="38.608" x2="19.012" y2="38.704" width="0.2032" layer="1"/>
<wire x1="19.1008" y1="38.608" x2="19.112" y2="38.604" width="0.2032" layer="1"/>
<wire x1="17.4752" y1="38.8112" x2="18.8976" y2="38.8112" width="0.2032" layer="1"/>
<wire x1="18.8976" y1="38.8112" x2="19.012" y2="38.704" width="0.2032" layer="1"/>
<wire x1="17.4752" y1="37.592" x2="17.4752" y2="38.8112" width="0.2032" layer="1"/>
<wire x1="14.4272" y1="34.544" x2="17.4752" y2="37.592" width="0.2032" layer="16"/>
<wire x1="14.4272" y1="19.304" x2="14.4272" y2="34.544" width="0.2032" layer="16"/>
<wire x1="19.9136" y1="13.8176" x2="14.4272" y2="19.304" width="0.2032" layer="16"/>
<wire x1="19.9136" y1="13.8176" x2="20.0025" y2="13.716" width="0.2032" layer="16"/>
<via x="17.4752" y="37.592" extent="1-16" drill="0.3048"/>
>>>>>>> 2d37069eaa50c6076bce9fd65f2af4943ffda3ff
<wire x1="28.0416" y1="74.5744" x2="29.464" y2="74.5744" width="0.2032" layer="16"/>
<wire x1="16.8656" y1="63.3984" x2="28.0416" y2="74.5744" width="0.2032" layer="16"/>
<wire x1="10.16" y1="63.3984" x2="16.8656" y2="63.3984" width="0.2032" layer="16"/>
<wire x1="8.7376" y1="61.976" x2="10.16" y2="63.3984" width="0.2032" layer="16"/>
<wire x1="29.464" y1="74.5744" x2="29.58" y2="74.676" width="0.2032" layer="16"/>
<wire x1="8.7376" y1="61.976" x2="8.5725" y2="61.976" width="0.2032" layer="16"/>
<<<<<<< HEAD
<wire x1="20.0025" y1="31.115" x2="20.0025" y2="13.716" width="0.2032" layer="1"/>
<wire x1="14.605" y1="36.5125" x2="20.0025" y2="31.115" width="0.2032" layer="1"/>
<wire x1="3.33375" y1="36.5125" x2="14.605" y2="36.5125" width="0.2032" layer="1"/>
<wire x1="0.635" y1="39.21125" x2="3.33375" y2="36.5125" width="0.2032" layer="1"/>
<wire x1="0.635" y1="60.96" x2="0.635" y2="39.21125" width="0.2032" layer="1"/>
<wire x1="3.4925" y1="63.8175" x2="0.635" y2="60.96" width="0.2032" layer="1"/>
<wire x1="6.82625" y1="63.8175" x2="3.4925" y2="63.8175" width="0.2032" layer="1"/>
<wire x1="8.5725" y1="62.07125" x2="6.82625" y2="63.8175" width="0.2032" layer="1"/>
<wire x1="8.5725" y1="62.07125" x2="8.5725" y2="61.976" width="0.2032" layer="1"/>
=======
<wire x1="16.8656" y1="40.0304" x2="16.8656" y2="42.672" width="0.2032" layer="1"/>
<wire x1="16.8656" y1="38.2016" x2="16.8656" y2="40.0304" width="0.2032" layer="16"/>
<wire x1="17.4752" y1="37.592" x2="16.8656" y2="38.2016" width="0.2032" layer="16"/>
<wire x1="16.8656" y1="42.672" x2="16.852" y2="42.672" width="0.2032" layer="1"/>
<wire x1="12.3952" y1="40.0304" x2="16.8656" y2="40.0304" width="0.2032" layer="1"/>
<wire x1="8.7376" y1="36.3728" x2="12.3952" y2="40.0304" width="0.2032" layer="1"/>
<wire x1="3.4544" y1="36.3728" x2="8.7376" y2="36.3728" width="0.2032" layer="1"/>
<wire x1="0.6096" y1="39.2176" x2="3.4544" y2="36.3728" width="0.2032" layer="1"/>
<wire x1="0.6096" y1="60.96" x2="0.6096" y2="39.2176" width="0.2032" layer="1"/>
<wire x1="3.4544" y1="63.8048" x2="0.6096" y2="60.96" width="0.2032" layer="1"/>
<wire x1="6.7056" y1="63.8048" x2="3.4544" y2="63.8048" width="0.2032" layer="1"/>
<wire x1="8.5344" y1="61.976" x2="6.7056" y2="63.8048" width="0.2032" layer="1"/>
<wire x1="8.5344" y1="61.976" x2="8.5725" y2="61.976" width="0.2032" layer="1"/>
<via x="16.8656" y="40.0304" extent="1-16" drill="0.3048"/>
>>>>>>> 2d37069eaa50c6076bce9fd65f2af4943ffda3ff
=======
<wire x1="9.3472" y1="61.976" x2="8.5725" y2="61.976" width="0.2032" layer="16"/>
<wire x1="10.7696" y1="63.3984" x2="9.3472" y2="61.976" width="0.2032" layer="16"/>
<wire x1="21.7424" y1="63.3984" x2="10.7696" y2="63.3984" width="0.2032" layer="16"/>
Expand All @@ -1815,7 +1703,6 @@ design rules under a new name.</description>
<wire x1="8.5344" y1="61.976" x2="6.7056" y2="63.8048" width="0.2032" layer="16"/>
<wire x1="19.9136" y1="13.8176" x2="20.0025" y2="13.716" width="0.2032" layer="16"/>
<wire x1="8.5344" y1="61.976" x2="8.5725" y2="61.976" width="0.2032" layer="16"/>
>>>>>>> 6d33003b7ebe7ae5411e8a9a0469f4d4a00e5e6c
</signal>
<signal name="SCL">
<contactref element="U$9" pad="A5"/>
Expand Down Expand Up @@ -2022,18 +1909,6 @@ design rules under a new name.</description>
<signal name="VDD">
<contactref element="LSHIFT1" pad="1"/>
<contactref element="SD1" pad="4"/>
<<<<<<< HEAD
<wire x1="38.735" y1="56.35625" x2="38.735" y2="55.7784" width="0.2032" layer="1"/>
<wire x1="37.94125" y1="57.15" x2="38.735" y2="56.35625" width="0.2032" layer="1"/>
<wire x1="36.98875" y1="57.15" x2="37.94125" y2="57.15" width="0.2032" layer="1"/>
<wire x1="36.83" y1="56.99125" x2="36.98875" y2="57.15" width="0.2032" layer="1"/>
<wire x1="36.83" y1="52.22875" x2="36.83" y2="56.99125" width="0.2032" layer="1"/>
<wire x1="38.1" y1="50.95875" x2="36.83" y2="52.22875" width="0.2032" layer="1"/>
<wire x1="38.1" y1="43.97375" x2="38.1" y2="50.95875" width="0.2032" layer="1"/>
<wire x1="27.78125" y1="33.655" x2="38.1" y2="43.97375" width="0.2032" layer="1"/>
<wire x1="27.14625" y1="33.655" x2="27.78125" y2="33.655" width="0.2032" layer="1"/>
<wire x1="27.14625" y1="33.655" x2="27.04" y2="33.563" width="0.2032" layer="1"/>
=======
<wire x1="38.8112" y1="52.0192" x2="38.8112" y2="55.6768" width="0.2032" layer="1"/>
<wire x1="39.8272" y1="51.0032" x2="38.8112" y2="52.0192" width="0.2032" layer="1"/>
<wire x1="39.8272" y1="40.64" x2="39.8272" y2="51.0032" width="0.2032" layer="1"/>
Expand All @@ -2045,7 +1920,6 @@ design rules under a new name.</description>
<wire x1="27.0256" y1="33.528" x2="26.416" y2="33.528" width="0.2032" layer="1"/>
<wire x1="38.8112" y1="55.6768" x2="38.735" y2="55.7784" width="0.2032" layer="1"/>
<wire x1="27.0256" y1="33.528" x2="27.04" y2="33.563" width="0.2032" layer="1"/>
>>>>>>> 6d33003b7ebe7ae5411e8a9a0469f4d4a00e5e6c
</signal>
<signal name="D9-LED">
<contactref element="U$9" pad="D9"/>
Expand Down Expand Up @@ -2121,46 +1995,9 @@ design rules under a new name.</description>
</signal>
<signal name="D4-SENSE_LDO_SWITCH">
<contactref element="U$9" pad="D4"/>
<<<<<<< HEAD
<<<<<<< HEAD
</signal>
<signal name="D6-CLOCK_SD_SWITCH">
<contactref element="U$9" pad="D6"/>
=======
<contactref element="3V1" pad="10"/>
<contactref element="3V1" pad="4"/>
<wire x1="20.6375" y1="38.1" x2="20.512" y2="38.104" width="0.2032" layer="1"/>
<wire x1="21.43125" y1="38.1" x2="20.6375" y2="38.1" width="0.2032" layer="1"/>
<wire x1="23.1775" y1="39.84625" x2="21.43125" y2="38.1" width="0.2032" layer="1"/>
<wire x1="23.1775" y1="42.545" x2="23.1775" y2="39.84625" width="0.2032" layer="1"/>
<wire x1="24.60625" y1="43.97375" x2="23.1775" y2="42.545" width="0.2032" layer="1"/>
<wire x1="24.60625" y1="47.46625" x2="24.60625" y2="43.97375" width="0.2032" layer="1"/>
<wire x1="25.0825" y1="47.9425" x2="24.60625" y2="47.46625" width="0.2032" layer="1"/>
<wire x1="25.0825" y1="49.2125" x2="25.0825" y2="47.9425" width="0.2032" layer="16"/>
<wire x1="37.7825" y1="61.9125" x2="25.0825" y2="49.2125" width="0.2032" layer="16"/>
<wire x1="20.6375" y1="38.1" x2="20.612" y2="38.004" width="0.2032" layer="1"/>
<wire x1="37.7825" y1="61.9125" x2="37.7825" y2="61.976" width="0.2032" layer="16"/>
<via x="25.0825" y="47.9425" extent="1-16" drill="0.3048"/>
</signal>
<signal name="D6-CLOCK_SD_SWITCH">
<contactref element="U$9" pad="D6"/>
<contactref element="3V1" pad="9"/>
<contactref element="3V1" pad="3"/>
<wire x1="19.84375" y1="37.62375" x2="19.812" y2="37.554" width="0.2032" layer="1"/>
<wire x1="19.84375" y1="37.62375" x2="19.812" y2="37.704" width="0.2032" layer="1"/>
<wire x1="21.43125" y1="37.465" x2="19.84375" y2="37.465" width="0.2032" layer="1"/>
<wire x1="24.13" y1="40.16375" x2="21.43125" y2="37.465" width="0.2032" layer="1"/>
<wire x1="24.13" y1="53.34" x2="24.13" y2="40.16375" width="0.2032" layer="16"/>
<wire x1="32.7025" y1="61.9125" x2="24.13" y2="53.34" width="0.2032" layer="16"/>
<wire x1="19.84375" y1="37.465" x2="19.812" y2="37.554" width="0.2032" layer="1"/>
<wire x1="32.7025" y1="61.9125" x2="32.7025" y2="61.976" width="0.2032" layer="16"/>
<via x="24.13" y="40.16375" extent="1-16" drill="0.3048"/>
>>>>>>> 2d37069eaa50c6076bce9fd65f2af4943ffda3ff
=======
</signal>
<signal name="D6-CLOCK_SD_SWITCH">
<contactref element="U$9" pad="D6"/>
>>>>>>> 6d33003b7ebe7ae5411e8a9a0469f4d4a00e5e6c
</signal>
<signal name="D8-EXT">
<contactref element="U$9" pad="D8"/>
Expand Down

0 comments on commit 6bd7bdb

Please sign in to comment.