Skip to content

Commit c36bfa3

Browse files
author
JoelEB
committed
Fixed 4-way junctions
Fixed 4-way junctions
1 parent 9a0dd20 commit c36bfa3

File tree

4 files changed

+52
-40
lines changed

4 files changed

+52
-40
lines changed

‎hardware/.Weather Shield_V12.brd.lck‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
joel
2+
joelimac.local
3+
24.08.2016 11:14.47

‎hardware/.Weather Shield_V12.sch.lck‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
joel
2+
joelimac.local
3+
24.08.2016 11:14.47

‎hardware/Weather Shield_V12.brd‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
5757
<layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
5858
<layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
59-
<layer number="49" name="Reference" color="7" fill="1" visible="yes" active="yes"/>
59+
<layer number="49" name="Reference" color="7" fill="1" visible="no" active="yes"/>
6060
<layer number="50" name="dxf" color="7" fill="1" visible="no" active="yes"/>
6161
<layer number="51" name="tDocu" color="6" fill="1" visible="yes" active="yes"/>
6262
<layer number="52" name="bDocu" color="7" fill="1" visible="no" active="yes"/>
@@ -90,8 +90,8 @@
9090
<layer number="111" name="LPC17xx" color="7" fill="1" visible="no" active="yes"/>
9191
<layer number="112" name="tSilk" color="7" fill="1" visible="no" active="yes"/>
9292
<layer number="113" name="IDFDebug" color="7" fill="1" visible="no" active="yes"/>
93-
<layer number="114" name="Badge_Outline" color="7" fill="1" visible="yes" active="yes"/>
94-
<layer number="115" name="ReferenceISLANDS" color="7" fill="1" visible="yes" active="yes"/>
93+
<layer number="114" name="Badge_Outline" color="7" fill="1" visible="no" active="yes"/>
94+
<layer number="115" name="ReferenceISLANDS" color="7" fill="1" visible="no" active="yes"/>
9595
<layer number="116" name="Patch_BOT" color="9" fill="4" visible="no" active="yes"/>
9696
<layer number="118" name="Rect_Pads" color="7" fill="1" visible="no" active="yes"/>
9797
<layer number="121" name="_tsilk" color="7" fill="1" visible="no" active="yes"/>
@@ -2541,7 +2541,6 @@ design rules under a new name.</description>
25412541
</signal>
25422542
<signal name="RAIN">
25432543
<contactref element="R11" pad="1"/>
2544-
<contactref element="D6" pad="1"/>
25452544
<contactref element="D5" pad="2"/>
25462545
<contactref element="U1" pad="D2"/>
25472546
<wire x1="14.82" y1="39.37" x2="14.82" y2="40.22" width="0.254" layer="1"/>
@@ -2553,15 +2552,15 @@ design rules under a new name.</description>
25532552
<wire x1="14.82" y1="39.37" x2="14.82" y2="38.95" width="0.254" layer="1"/>
25542553
<wire x1="14.82" y1="38.95" x2="13.97" y2="38.1" width="0.254" layer="1"/>
25552554
<wire x1="13.97" y1="38.1" x2="7.62" y2="38.1" width="0.254" layer="1"/>
2556-
<wire x1="20.44" y1="39.37" x2="18.93" y2="39.37" width="0.254" layer="1"/>
2557-
<wire x1="18.93" y1="39.37" x2="18.93" y2="40.252" width="0.254" layer="1"/>
25582555
<wire x1="18.93" y1="40.252" x2="18.542" y2="40.64" width="0.254" layer="1"/>
25592556
<wire x1="18.542" y1="40.64" x2="15.24" y2="40.64" width="0.254" layer="1"/>
2557+
<contactref element="D6" pad="1"/>
2558+
<wire x1="18.93" y1="39.37" x2="20.44" y2="39.37" width="0" layer="19" extent="1-1"/>
2559+
<wire x1="18.93" y1="40.252" x2="18.93" y2="39.37" width="0" layer="19" extent="1-1"/>
25602560
</signal>
25612561
<signal name="WSPEED">
25622562
<contactref element="R14" pad="1"/>
25632563
<contactref element="D9" pad="2"/>
2564-
<contactref element="D10" pad="1"/>
25652564
<contactref element="U1" pad="D3"/>
25662565
<wire x1="2.54" y1="46.99" x2="3.81" y2="46.99" width="0.254" layer="1"/>
25672566
<wire x1="3.81" y1="46.99" x2="5.08" y2="45.72" width="0.254" layer="1"/>
@@ -2570,27 +2569,28 @@ design rules under a new name.</description>
25702569
<wire x1="7.62" y1="35.56" x2="32.385" y2="35.56" width="0.254" layer="1"/>
25712570
<wire x1="32.9" y1="36.83" x2="32.9" y2="36.075" width="0.254" layer="1"/>
25722571
<wire x1="32.9" y1="36.075" x2="32.385" y2="35.56" width="0.254" layer="1"/>
2573-
<wire x1="34.41" y1="36.83" x2="32.9" y2="36.83" width="0.254" layer="1"/>
2574-
<wire x1="34.41" y1="36.83" x2="34.41" y2="37.585" width="0.254" layer="1"/>
25752572
<wire x1="34.41" y1="37.585" x2="34.925" y2="38.1" width="0.254" layer="1"/>
25762573
<wire x1="35.98" y1="39.37" x2="35.98" y2="38.52" width="0.254" layer="1"/>
25772574
<wire x1="35.98" y1="38.52" x2="35.56" y2="38.1" width="0.254" layer="1"/>
25782575
<wire x1="35.56" y1="38.1" x2="34.925" y2="38.1" width="0.254" layer="1"/>
2576+
<contactref element="D10" pad="1"/>
2577+
<wire x1="34.41" y1="36.83" x2="34.41" y2="37.585" width="0" layer="19" extent="1-1"/>
2578+
<wire x1="32.9" y1="36.83" x2="34.41" y2="36.83" width="0" layer="19" extent="1-1"/>
25792579
</signal>
25802580
<signal name="WDIR">
25812581
<contactref element="R17" pad="2"/>
25822582
<contactref element="R13" pad="1"/>
2583-
<contactref element="D8" pad="1"/>
25842583
<contactref element="D7" pad="2"/>
25852584
<contactref element="U1" pad="A0"/>
2586-
<wire x1="40.52" y1="36.83" x2="42.03" y2="36.83" width="0.254" layer="1"/>
25872585
<wire x1="41.49" y1="39.37" x2="41.49" y2="38.52" width="0.254" layer="1"/>
25882586
<wire x1="41.49" y1="38.52" x2="42.03" y2="37.98" width="0.254" layer="1"/>
2589-
<wire x1="42.03" y1="36.83" x2="42.03" y2="37.98" width="0.254" layer="1"/>
25902587
<wire x1="43.6" y1="39.37" x2="41.49" y2="39.37" width="0.254" layer="1"/>
25912588
<wire x1="43.6" y1="39.37" x2="43.6" y2="41.06" width="0.254" layer="1"/>
25922589
<wire x1="43.6" y1="41.06" x2="44.45" y2="41.91" width="0.254" layer="1"/>
25932590
<wire x1="44.45" y1="41.91" x2="50.8" y2="41.91" width="0.254" layer="1"/>
2591+
<contactref element="D8" pad="1"/>
2592+
<wire x1="42.03" y1="36.83" x2="42.03" y2="37.98" width="0" layer="19" extent="1-1"/>
2593+
<wire x1="40.52" y1="36.83" x2="42.03" y2="36.83" width="0" layer="19" extent="1-1"/>
25942594
</signal>
25952595
<signal name="RAIN2">
25962596
<contactref element="JP9-DNP" pad="2"/>
@@ -2647,18 +2647,18 @@ design rules under a new name.</description>
26472647
</signal>
26482648
<signal name="BATT_LVL">
26492649
<contactref element="R8" pad="2"/>
2650-
<contactref element="R7" pad="1"/>
26512650
<contactref element="U1" pad="A2"/>
26522651
<wire x1="50.8" y1="46.99" x2="52.07" y2="45.72" width="0.254" layer="16"/>
26532652
<wire x1="52.07" y1="45.72" x2="52.07" y2="18.415" width="0.254" layer="16"/>
26542653
<wire x1="48.26" y1="16.51" x2="30.48" y2="16.51" width="0.254" layer="16"/>
26552654
<via x="30.48" y="16.51" extent="1-16" drill="0.508"/>
26562655
<wire x1="30.48" y1="16.51" x2="30.48" y2="18.2" width="0.254" layer="1"/>
2657-
<wire x1="30.48" y1="18.2" x2="31.75" y2="18.2" width="0.254" layer="1"/>
26582656
<wire x1="30.48" y1="18.2" x2="29.21" y2="18.2" width="0.254" layer="1"/>
26592657
<wire x1="52.07" y1="18.415" x2="51.435" y2="17.78" width="0.254" layer="16"/>
26602658
<wire x1="51.435" y1="17.78" x2="49.53" y2="17.78" width="0.254" layer="16"/>
26612659
<wire x1="49.53" y1="17.78" x2="48.26" y2="16.51" width="0.254" layer="16"/>
2660+
<contactref element="R7" pad="1"/>
2661+
<wire x1="30.48" y1="18.2" x2="31.75" y2="18.2" width="0" layer="19" extent="1-1"/>
26622662
</signal>
26632663
<signal name="3V_PWR_CTL">
26642664
<contactref element="R9" pad="2"/>

‎hardware/Weather Shield_V12.sch‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20614,8 +20614,6 @@ Batt Bckup</text>
2061420614
<text x="33.02" y="5.08" size="1.778" layer="97" ratio="12">Digital Pins 4 and 5 are used for
2061520615
software serial with switch is set
2061620616
to "Soft".</text>
20617-
<text x="0" y="213.36" size="3.81" layer="91">Customer/Comment complaints and suggested changes</text>
20618-
<text x="0" y="205.74" size="3.81" layer="91">Rain gauges share same pins as XBee shield</text>
2061920617
<text x="171.704" y="6.858" size="2.54" layer="94">Joel Bartlett</text>
2062020618
<text x="27.94" y="142.24" size="1.778" layer="97">Input Voltage Range: 5-12V</text>
2062120619
</plain>
@@ -20723,14 +20721,14 @@ to "Soft".</text>
2072320721
<attribute name="VALUE" x="196.85" y="80.645" size="1.778" layer="96"/>
2072420722
</instance>
2072520723
<instance part="D9" gate="G$1" x="210.82" y="83.82" rot="R90"/>
20726-
<instance part="D10" gate="G$1" x="210.82" y="63.5" rot="R90"/>
20724+
<instance part="D10" gate="G$1" x="213.36" y="63.5" rot="R90"/>
2072720725
<instance part="D7" gate="G$1" x="205.74" y="83.82" rot="R90"/>
20728-
<instance part="D8" gate="G$1" x="205.74" y="63.5" rot="R90"/>
20726+
<instance part="D8" gate="G$1" x="203.2" y="63.5" rot="R90"/>
2072920727
<instance part="D5" gate="G$1" x="134.62" y="81.28" rot="R90"/>
20730-
<instance part="D6" gate="G$1" x="134.62" y="60.96" rot="R90"/>
20731-
<instance part="GND21" gate="1" x="210.82" y="53.34" rot="MR0"/>
20732-
<instance part="GND29" gate="1" x="205.74" y="53.34"/>
20733-
<instance part="GND31" gate="1" x="134.62" y="50.8" rot="MR0"/>
20728+
<instance part="D6" gate="G$1" x="137.16" y="60.96" rot="R90"/>
20729+
<instance part="GND21" gate="1" x="213.36" y="53.34" rot="MR0"/>
20730+
<instance part="GND29" gate="1" x="203.2" y="53.34"/>
20731+
<instance part="GND31" gate="1" x="137.16" y="50.8" rot="MR0"/>
2073420732
<instance part="R12" gate="G$1" x="119.38" y="60.96" smashed="yes" rot="R270">
2073520733
<attribute name="NAME" x="117.475" y="55.88" size="1.778" layer="95" rot="R90"/>
2073620734
<attribute name="VALUE" x="117.475" y="62.865" size="1.778" layer="96" rot="R90"/>
@@ -20748,9 +20746,9 @@ to "Soft".</text>
2074820746
<instance part="SUPPLY7" gate="G$1" x="220.98" y="93.98"/>
2074920747
<instance part="SUPPLY10" gate="G$1" x="134.62" y="91.44"/>
2075020748
<instance part="LOGO2" gate="G$1" x="187.96" y="35.56"/>
20751-
<instance part="R7" gate="G$1" x="162.56" y="149.86" rot="MR270"/>
20749+
<instance part="R7" gate="G$1" x="165.1" y="149.86" rot="MR270"/>
2075220750
<instance part="R8" gate="G$1" x="162.56" y="167.64" rot="MR270"/>
20753-
<instance part="GND28" gate="1" x="162.56" y="139.7"/>
20751+
<instance part="GND28" gate="1" x="165.1" y="139.7"/>
2075420752
<instance part="LOGO1" gate="G$1" x="134.62" y="10.16"/>
2075520753
<instance part="R9" gate="G$1" x="30.48" y="50.8" rot="MR180"/>
2075620754
<instance part="JP2" gate="G$1" x="15.24" y="40.64" smashed="yes">
@@ -20863,17 +20861,17 @@ to "Soft".</text>
2086320861
<junction x="185.42" y="132.08"/>
2086420862
</segment>
2086520863
<segment>
20866-
<wire x1="210.82" y1="55.88" x2="210.82" y2="60.96" width="0.1524" layer="91"/>
20864+
<wire x1="213.36" y1="55.88" x2="213.36" y2="60.96" width="0.1524" layer="91"/>
2086720865
<pinref part="GND21" gate="1" pin="GND"/>
2086820866
<pinref part="D10" gate="G$1" pin="A"/>
2086920867
</segment>
2087020868
<segment>
20871-
<wire x1="205.74" y1="55.88" x2="205.74" y2="60.96" width="0.1524" layer="91"/>
20869+
<wire x1="203.2" y1="55.88" x2="203.2" y2="60.96" width="0.1524" layer="91"/>
2087220870
<pinref part="GND29" gate="1" pin="GND"/>
2087320871
<pinref part="D8" gate="G$1" pin="A"/>
2087420872
</segment>
2087520873
<segment>
20876-
<wire x1="134.62" y1="53.34" x2="134.62" y2="58.42" width="0.1524" layer="91"/>
20874+
<wire x1="137.16" y1="53.34" x2="137.16" y2="58.42" width="0.1524" layer="91"/>
2087720875
<pinref part="GND31" gate="1" pin="GND"/>
2087820876
<pinref part="D6" gate="G$1" pin="A"/>
2087920877
</segment>
@@ -20893,7 +20891,7 @@ to "Soft".</text>
2089320891
<pinref part="R12" gate="G$1" pin="2"/>
2089420892
</segment>
2089520893
<segment>
20896-
<wire x1="162.56" y1="142.24" x2="162.56" y2="144.78" width="0.1524" layer="91"/>
20894+
<wire x1="165.1" y1="142.24" x2="165.1" y2="144.78" width="0.1524" layer="91"/>
2089720895
<pinref part="R7" gate="G$1" pin="2"/>
2089820896
<pinref part="GND28" gate="1" pin="GND"/>
2089920897
</segment>
@@ -21293,14 +21291,16 @@ to "Soft".</text>
2129321291
<net name="RAIN" class="0">
2129421292
<segment>
2129521293
<wire x1="132.08" y1="73.66" x2="134.62" y2="73.66" width="0.1524" layer="91"/>
21296-
<wire x1="134.62" y1="73.66" x2="139.7" y2="73.66" width="0.1524" layer="91"/>
21297-
<wire x1="134.62" y1="63.5" x2="134.62" y2="73.66" width="0.1524" layer="91"/>
21294+
<wire x1="134.62" y1="73.66" x2="137.16" y2="73.66" width="0.1524" layer="91"/>
21295+
<wire x1="137.16" y1="73.66" x2="139.7" y2="73.66" width="0.1524" layer="91"/>
2129821296
<wire x1="134.62" y1="73.66" x2="134.62" y2="78.74" width="0.1524" layer="91"/>
2129921297
<junction x="134.62" y="73.66"/>
2130021298
<pinref part="R11" gate="G$1" pin="1"/>
21301-
<pinref part="D6" gate="G$1" pin="C"/>
2130221299
<pinref part="D5" gate="G$1" pin="A"/>
2130321300
<label x="139.7" y="73.66" size="1.27" layer="95" xref="yes"/>
21301+
<pinref part="D6" gate="G$1" pin="C"/>
21302+
<wire x1="137.16" y1="63.5" x2="137.16" y2="73.66" width="0.1524" layer="91"/>
21303+
<junction x="137.16" y="73.66"/>
2130421304
</segment>
2130521305
<segment>
2130621306
<pinref part="U1" gate="G$1" pin="D2"/>
@@ -21311,14 +21311,16 @@ to "Soft".</text>
2131121311
<net name="WSPEED" class="0">
2131221312
<segment>
2131321313
<wire x1="200.66" y1="76.2" x2="210.82" y2="76.2" width="0.1524" layer="91"/>
21314-
<wire x1="210.82" y1="76.2" x2="226.06" y2="76.2" width="0.1524" layer="91"/>
21314+
<wire x1="210.82" y1="76.2" x2="213.36" y2="76.2" width="0.1524" layer="91"/>
21315+
<wire x1="213.36" y1="76.2" x2="226.06" y2="76.2" width="0.1524" layer="91"/>
2131521316
<wire x1="210.82" y1="81.28" x2="210.82" y2="76.2" width="0.1524" layer="91"/>
21316-
<wire x1="210.82" y1="76.2" x2="210.82" y2="66.04" width="0.1524" layer="91"/>
2131721317
<junction x="210.82" y="76.2"/>
2131821318
<pinref part="R14" gate="G$1" pin="1"/>
2131921319
<pinref part="D9" gate="G$1" pin="A"/>
21320-
<pinref part="D10" gate="G$1" pin="C"/>
2132121320
<label x="226.06" y="76.2" size="1.27" layer="95" xref="yes"/>
21321+
<pinref part="D10" gate="G$1" pin="C"/>
21322+
<wire x1="213.36" y1="66.04" x2="213.36" y2="76.2" width="0.1524" layer="91"/>
21323+
<junction x="213.36" y="76.2"/>
2132221324
</segment>
2132321325
<segment>
2132421326
<pinref part="U1" gate="G$1" pin="*D3"/>
@@ -21328,19 +21330,21 @@ to "Soft".</text>
2132821330
</net>
2132921331
<net name="WDIR" class="0">
2133021332
<segment>
21331-
<wire x1="200.66" y1="78.74" x2="205.74" y2="78.74" width="0.1524" layer="91"/>
21333+
<wire x1="200.66" y1="78.74" x2="203.2" y2="78.74" width="0.1524" layer="91"/>
21334+
<wire x1="203.2" y1="78.74" x2="205.74" y2="78.74" width="0.1524" layer="91"/>
2133221335
<wire x1="205.74" y1="78.74" x2="220.98" y2="78.74" width="0.1524" layer="91"/>
2133321336
<wire x1="220.98" y1="78.74" x2="226.06" y2="78.74" width="0.1524" layer="91"/>
2133421337
<wire x1="220.98" y1="81.28" x2="220.98" y2="78.74" width="0.1524" layer="91"/>
21335-
<wire x1="205.74" y1="66.04" x2="205.74" y2="78.74" width="0.1524" layer="91"/>
2133621338
<wire x1="205.74" y1="81.28" x2="205.74" y2="78.74" width="0.1524" layer="91"/>
2133721339
<junction x="220.98" y="78.74"/>
2133821340
<junction x="205.74" y="78.74"/>
2133921341
<pinref part="R17" gate="G$1" pin="2"/>
2134021342
<pinref part="R13" gate="G$1" pin="1"/>
21341-
<pinref part="D8" gate="G$1" pin="C"/>
2134221343
<pinref part="D7" gate="G$1" pin="A"/>
2134321344
<label x="226.06" y="78.74" size="1.27" layer="95" xref="yes"/>
21345+
<pinref part="D8" gate="G$1" pin="C"/>
21346+
<wire x1="203.2" y1="66.04" x2="203.2" y2="78.74" width="0.1524" layer="91"/>
21347+
<junction x="203.2" y="78.74"/>
2134421348
</segment>
2134521349
<segment>
2134621350
<pinref part="U1" gate="G$1" pin="A0"/>
@@ -21411,15 +21415,17 @@ to "Soft".</text>
2141121415
<segment>
2141221416
<wire x1="157.48" y1="160.02" x2="162.56" y2="160.02" width="0.1524" layer="91"/>
2141321417
<wire x1="162.56" y1="160.02" x2="162.56" y2="162.56" width="0.1524" layer="91"/>
21414-
<wire x1="162.56" y1="160.02" x2="162.56" y2="154.94" width="0.1524" layer="91"/>
2141521418
<junction x="162.56" y="160.02"/>
2141621419
<pinref part="R8" gate="G$1" pin="2"/>
21417-
<pinref part="R7" gate="G$1" pin="1"/>
2141821420
<label x="157.48" y="160.02" size="1.27" layer="95" rot="R180" xref="yes"/>
2141921421
<pinref part="U1" gate="G$1" pin="A2"/>
2142021422
<wire x1="187.96" y1="165.1" x2="167.64" y2="165.1" width="0.1524" layer="91"/>
2142121423
<wire x1="167.64" y1="165.1" x2="167.64" y2="160.02" width="0.1524" layer="91"/>
21422-
<wire x1="167.64" y1="160.02" x2="162.56" y2="160.02" width="0.1524" layer="91"/>
21424+
<wire x1="167.64" y1="160.02" x2="165.1" y2="160.02" width="0.1524" layer="91"/>
21425+
<pinref part="R7" gate="G$1" pin="1"/>
21426+
<wire x1="165.1" y1="160.02" x2="162.56" y2="160.02" width="0.1524" layer="91"/>
21427+
<wire x1="165.1" y1="154.94" x2="165.1" y2="160.02" width="0.1524" layer="91"/>
21428+
<junction x="165.1" y="160.02"/>
2142321429
</segment>
2142421430
</net>
2142521431
<net name="3V_PWR_CTL" class="0">

0 commit comments

Comments
 (0)