such layout, wow

2 files changed, 39 insertions, 49 deletions

diff --git a/circuit/circuit.brd b/circuit/circuit.brd
index 6c08c28..f3e43ac 100644
--- a/circuit/circuit.brd
+++ b/circuit/circuit.brd
@@ -68,10 +68,10 @@
 <text x="2.54" y="30.48" size="1.016" layer="25">vusb-i2c</text>
 <text x="5.715" y="23.495" size="1.016" layer="25">D-</text>
 <text x="5.715" y="20.955" size="1.016" layer="25">D+</text>
-<text x="38.735" y="26.035" size="1.016" layer="25">SDA</text>
-<text x="38.735" y="18.415" size="1.016" layer="25">SCL</text>
-<text x="38.735" y="23.495" size="1.016" layer="25">5V</text>
-<text x="38.735" y="20.955" size="1.016" layer="25">GND</text>
+<text x="38.735" y="23.495" size="1.016" layer="25">SDA</text>
+<text x="38.735" y="20.955" size="1.016" layer="25">SCL</text>
+<text x="38.735" y="26.035" size="1.016" layer="25">5V</text>
+<text x="38.735" y="18.415" size="1.016" layer="25">GND</text>
 </plain>
 <libraries>
 <library name="atmel">
@@ -608,7 +608,6 @@ design rules under a new name.</description>
 <contactref element="C6" pad="1"/>
 <contactref element="JP1" pad="1"/>
 <contactref element="SV2" pad="6"/>
-<contactref element="JP2" pad="2"/>
 <polygon width="0.4064" layer="1" isolate="0.3048">
 <vertex x="0" y="34.29"/>
 <vertex x="41.91" y="34.29"/>
@@ -621,6 +620,7 @@ design rules under a new name.</description>
 <vertex x="41.91" y="0"/>
 <vertex x="0" y="0"/>
 </polygon>
+<contactref element="JP2" pad="1"/>
 </signal>
 <signal name="N$37">
 <contactref element="C4" pad="2"/>
@@ -695,7 +695,6 @@ design rules under a new name.</description>
 <contactref element="R2" pad="2"/>
 <contactref element="JP1" pad="4"/>
 <contactref element="SV2" pad="2"/>
-<contactref element="JP2" pad="3"/>
 <wire x1="27.94" y1="19.05" x2="27.94" y2="10.16" width="0.4064" layer="16"/>
 <wire x1="27.94" y1="10.16" x2="25.4" y2="7.62" width="0.4064" layer="16"/>
 <wire x1="25.4" y1="7.62" x2="24.13" y2="7.62" width="0.4064" layer="16"/>
@@ -712,35 +711,37 @@ design rules under a new name.</description>
 <wire x1="10.16" y1="5.08" x2="15.24" y2="5.08" width="0.4064" layer="1"/>
 <wire x1="15.24" y1="5.08" x2="16.51" y2="3.81" width="0.4064" layer="1"/>
 <wire x1="16.51" y1="3.81" x2="22.86" y2="3.81" width="0.4064" layer="1"/>
-<wire x1="36.83" y1="24.13" x2="35.56" y2="24.13" width="0.4064" layer="16"/>
-<wire x1="35.56" y1="24.13" x2="33.02" y2="21.59" width="0.4064" layer="16"/>
-<wire x1="33.02" y1="21.59" x2="30.48" y2="21.59" width="0.4064" layer="16"/>
-<wire x1="30.48" y1="21.59" x2="29.21" y2="20.32" width="0.4064" layer="16"/>
-<wire x1="29.21" y1="20.32" x2="29.21" y2="19.05" width="0.4064" layer="16"/>
-<wire x1="29.21" y1="19.05" x2="27.94" y2="19.05" width="0.4064" layer="16"/>
+<contactref element="JP2" pad="4"/>
+<wire x1="27.94" y1="19.37" x2="28.26" y2="19.37" width="0.4064" layer="16"/>
+<wire x1="28.26" y1="19.37" x2="30.48" y2="21.59" width="0.4064" layer="16"/>
+<wire x1="30.48" y1="21.59" x2="33.02" y2="21.59" width="0.4064" layer="16"/>
+<wire x1="33.02" y1="21.59" x2="34.29" y2="22.86" width="0.4064" layer="16"/>
+<wire x1="34.29" y1="22.86" x2="34.29" y2="25.4" width="0.4064" layer="16"/>
+<wire x1="34.29" y1="25.4" x2="35.56" y2="26.67" width="0.4064" layer="16"/>
+<wire x1="35.56" y1="26.67" x2="36.83" y2="26.67" width="0.4064" layer="16"/>
 </signal>
 <signal name="SCL">
 <contactref element="IC1" pad="19"/>
 <contactref element="R1" pad="1"/>
 <contactref element="SV2" pad="3"/>
-<contactref element="JP2" pad="1"/>
 <wire x1="20.32" y1="5.08" x2="20.32" y2="6.35" width="0.4064" layer="1"/>
 <wire x1="20.32" y1="6.35" x2="24.13" y2="10.16" width="0.4064" layer="1"/>
 <wire x1="3.81" y1="8.89" x2="5.08" y2="7.62" width="0.4064" layer="16"/>
 <wire x1="5.08" y1="7.62" x2="21.59" y2="7.62" width="0.4064" layer="16"/>
 <wire x1="21.59" y1="7.62" x2="24.13" y2="10.16" width="0.4064" layer="16"/>
-<wire x1="24.13" y1="10.16" x2="25.4" y2="10.16" width="0.4064" layer="1"/>
-<wire x1="25.4" y1="10.16" x2="29.21" y2="13.97" width="0.4064" layer="1"/>
-<via x="29.21" y="13.97" extent="1-16" drill="0.7" shape="square"/>
-<wire x1="29.21" y1="13.97" x2="29.21" y2="17.78" width="0.4064" layer="16"/>
+<contactref element="JP2" pad="2"/>
+<wire x1="24.13" y1="10.16" x2="29.21" y2="15.24" width="0.4064" layer="1"/>
+<via x="29.21" y="15.24" extent="1-16" drill="0.7" shape="square"/>
+<wire x1="29.21" y1="15.24" x2="29.21" y2="17.78" width="0.4064" layer="16"/>
 <wire x1="29.21" y1="17.78" x2="30.48" y2="19.05" width="0.4064" layer="16"/>
-<wire x1="30.48" y1="19.05" x2="36.83" y2="19.05" width="0.4064" layer="16"/>
+<wire x1="30.48" y1="19.05" x2="33.02" y2="19.05" width="0.4064" layer="16"/>
+<wire x1="33.02" y1="19.05" x2="35.56" y2="21.59" width="0.4064" layer="16"/>
+<wire x1="35.56" y1="21.59" x2="36.83" y2="21.59" width="0.4064" layer="16"/>
 </signal>
 <signal name="SDA">
 <contactref element="IC1" pad="18"/>
 <contactref element="R2" pad="1"/>
 <contactref element="SV2" pad="1"/>
-<contactref element="JP2" pad="4"/>
 <wire x1="20.32" y1="8.89" x2="20.32" y2="10.16" width="0.4064" layer="1"/>
 <wire x1="20.32" y1="10.16" x2="22.86" y2="12.7" width="0.4064" layer="1"/>
 <wire x1="22.86" y1="12.7" x2="24.13" y2="12.7" width="0.4064" layer="1"/>
@@ -748,15 +749,13 @@ design rules under a new name.</description>
 <wire x1="5.08" y1="12.7" x2="7.62" y2="12.7" width="0.4064" layer="1"/>
 <wire x1="7.62" y1="12.7" x2="10.16" y2="10.16" width="0.4064" layer="1"/>
 <wire x1="10.16" y1="10.16" x2="20.32" y2="10.16" width="0.4064" layer="1"/>
-<wire x1="24.13" y1="12.7" x2="25.4" y2="12.7" width="0.4064" layer="1"/>
-<wire x1="25.4" y1="12.7" x2="29.21" y2="16.51" width="0.4064" layer="1"/>
-<wire x1="29.21" y1="16.51" x2="29.21" y2="17.78" width="0.4064" layer="1"/>
-<wire x1="29.21" y1="17.78" x2="30.48" y2="19.05" width="0.4064" layer="1"/>
+<contactref element="JP2" pad="3"/>
+<wire x1="24.13" y1="12.7" x2="30.48" y2="19.05" width="0.4064" layer="1"/>
 <wire x1="30.48" y1="19.05" x2="33.02" y2="19.05" width="0.4064" layer="1"/>
 <wire x1="33.02" y1="19.05" x2="34.29" y2="20.32" width="0.4064" layer="1"/>
-<wire x1="34.29" y1="20.32" x2="34.29" y2="25.4" width="0.4064" layer="1"/>
-<wire x1="34.29" y1="25.4" x2="35.56" y2="26.67" width="0.4064" layer="1"/>
-<wire x1="35.56" y1="26.67" x2="36.83" y2="26.67" width="0.4064" layer="1"/>
+<wire x1="34.29" y1="20.32" x2="34.29" y2="22.86" width="0.4064" layer="1"/>
+<wire x1="34.29" y1="22.86" x2="35.56" y2="24.13" width="0.4064" layer="1"/>
+<wire x1="35.56" y1="24.13" x2="36.83" y2="24.13" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$4">
 <contactref element="SV2" pad="4"/>
diff --git a/circuit/circuit.sch b/circuit/circuit.sch
index 082716d..66e024d 100644
--- a/circuit/circuit.sch
+++ b/circuit/circuit.sch
@@ -7116,15 +7116,13 @@ Low profile connectors, straight&lt;p&gt;
 </segment>
 <segment>
 <pinref part="GND1" gate="1" pin="GND"/>
-<wire x1="99.06" y1="139.7" x2="91.44" y2="139.7" width="0.1524" layer="91"/>
-<wire x1="91.44" y1="139.7" x2="91.44" y2="121.92" width="0.1524" layer="91"/>
+<wire x1="91.44" y1="165.1" x2="91.44" y2="139.7" width="0.1524" layer="91"/>
 <pinref part="SV2" gate="1" pin="6"/>
-<wire x1="63.5" y1="165.1" x2="99.06" y2="165.1" width="0.1524" layer="91"/>
-<wire x1="99.06" y1="165.1" x2="99.06" y2="139.7" width="0.1524" layer="91"/>
-<pinref part="JP2" gate="A" pin="2"/>
-<wire x1="116.84" y1="137.16" x2="99.06" y2="137.16" width="0.1524" layer="91"/>
-<wire x1="99.06" y1="137.16" x2="99.06" y2="139.7" width="0.1524" layer="91"/>
-<junction x="99.06" y="139.7"/>
+<wire x1="91.44" y1="139.7" x2="91.44" y2="121.92" width="0.1524" layer="91"/>
+<wire x1="63.5" y1="165.1" x2="91.44" y2="165.1" width="0.1524" layer="91"/>
+<pinref part="JP2" gate="A" pin="1"/>
+<wire x1="116.84" y1="139.7" x2="91.44" y2="139.7" width="0.1524" layer="91"/>
+<junction x="91.44" y="139.7"/>
 </segment>
 </net>
 <net name="N$37" class="0">
@@ -7230,9 +7228,7 @@ Low profile connectors, straight&lt;p&gt;
 <pinref part="R15" gate="G$1" pin="2"/>
 <wire x1="38.1" y1="88.9" x2="38.1" y2="119.38" width="0.1524" layer="91"/>
 <junction x="38.1" y="119.38"/>
-<wire x1="116.84" y1="134.62" x2="96.52" y2="134.62" width="0.1524" layer="91"/>
-<wire x1="96.52" y1="134.62" x2="96.52" y2="157.48" width="0.1524" layer="91"/>
-<wire x1="96.52" y1="157.48" x2="86.36" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="104.14" y1="157.48" x2="86.36" y2="157.48" width="0.1524" layer="91"/>
 <junction x="35.56" y="157.48"/>
 <pinref part="R1" gate="G$1" pin="2"/>
 <wire x1="86.36" y1="157.48" x2="78.74" y2="157.48" width="0.1524" layer="91"/>
@@ -7245,7 +7241,9 @@ Low profile connectors, straight&lt;p&gt;
 <pinref part="SV2" gate="1" pin="2"/>
 <wire x1="63.5" y1="170.18" x2="78.74" y2="170.18" width="0.1524" layer="91"/>
 <wire x1="78.74" y1="170.18" x2="78.74" y2="157.48" width="0.1524" layer="91"/>
-<pinref part="JP2" gate="A" pin="3"/>
+<pinref part="JP2" gate="A" pin="4"/>
+<wire x1="116.84" y1="132.08" x2="104.14" y2="132.08" width="0.1524" layer="91"/>
+<wire x1="104.14" y1="132.08" x2="104.14" y2="157.48" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="SCL" class="0">
@@ -7261,20 +7259,15 @@ Low profile connectors, straight&lt;p&gt;
 <wire x1="45.72" y1="167.64" x2="45.72" y2="142.24" width="0.1524" layer="91"/>
 <wire x1="45.72" y1="142.24" x2="78.74" y2="142.24" width="0.1524" layer="91"/>
 <junction x="78.74" y="142.24"/>
-<pinref part="JP2" gate="A" pin="1"/>
-<wire x1="116.84" y1="139.7" x2="101.6" y2="139.7" width="0.1524" layer="91"/>
-<wire x1="101.6" y1="139.7" x2="101.6" y2="132.08" width="0.1524" layer="91"/>
-<wire x1="101.6" y1="132.08" x2="93.98" y2="132.08" width="0.1524" layer="91"/>
-<wire x1="93.98" y1="132.08" x2="93.98" y2="137.16" width="0.1524" layer="91"/>
-<wire x1="93.98" y1="137.16" x2="78.74" y2="137.16" width="0.1524" layer="91"/>
 <junction x="78.74" y="137.16"/>
+<pinref part="JP2" gate="A" pin="2"/>
+<wire x1="116.84" y1="137.16" x2="78.74" y2="137.16" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="SDA" class="0">
 <segment>
 <pinref part="IC1" gate="G$1" pin="(MISO)PB6"/>
 <wire x1="76.2" y1="134.62" x2="86.36" y2="134.62" width="0.1524" layer="91"/>
-<wire x1="86.36" y1="134.62" x2="86.36" y2="129.54" width="0.1524" layer="91"/>
 <pinref part="R2" gate="G$1" pin="1"/>
 <wire x1="86.36" y1="134.62" x2="86.36" y2="144.78" width="0.1524" layer="91"/>
 <junction x="86.36" y="134.62"/>
@@ -7284,10 +7277,8 @@ Low profile connectors, straight&lt;p&gt;
 <wire x1="43.18" y1="170.18" x2="43.18" y2="144.78" width="0.1524" layer="91"/>
 <wire x1="43.18" y1="144.78" x2="86.36" y2="144.78" width="0.1524" layer="91"/>
 <junction x="86.36" y="144.78"/>
-<wire x1="86.36" y1="129.54" x2="111.76" y2="129.54" width="0.1524" layer="91"/>
-<wire x1="111.76" y1="129.54" x2="111.76" y2="132.08" width="0.1524" layer="91"/>
-<pinref part="JP2" gate="A" pin="4"/>
-<wire x1="111.76" y1="132.08" x2="116.84" y2="132.08" width="0.1524" layer="91"/>
+<pinref part="JP2" gate="A" pin="3"/>
+<wire x1="116.84" y1="134.62" x2="86.36" y2="134.62" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$4" class="0">