protofusion-hardware Changeset - 7798e8c9d4c1

Changeset - 7798e8c9d4c1

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Ethan Zonca - 11 years ago 2015-03-16 22:39:59
ez@ethanzonca.com

Fix crappy merge

1 file changed with 14 insertions and 5 deletions:

lbr/Protofusion.lbr

0 comments (0 inline, 0 general)

lbr/Protofusion.lbr

➞

Show inline comments

@@ @@ -33781,24 +33781,29 @@ @@
 <wire x1="-3.81" y1="-1.016" x2="-2.54" y2="-1.016" width="0.254" layer="94"/>
 <wire x1="-3.81" y1="1.016" x2="-3.81" y2="3.175" width="0.1524" layer="94"/>
 <wire x1="-3.81" y1="-3.175" x2="-3.81" y2="-1.016" width="0.1524" layer="94"/>
 <wire x1="-5.08" y1="1.016" x2="-2.54" y2="1.016" width="0.254" layer="94"/>
 <wire x1="2.54" y1="-5.08" x2="2.54" y2="-3.302" width="0.1524" layer="94"/>
 <wire x1="7.62" y1="-5.08" x2="2.54" y2="-5.08" width="0.1524" layer="94"/>
 <pin name="GND" x="-12.7" y="-5.08" visible="pad" length="middle" direction="pwr"/>
 <pin name="OUT" x="12.7" y="0" visible="pad" length="middle" direction="out" rot="R180"/>
 <pin name="CNTRL" x="12.7" y="-5.08" visible="pad" length="middle" direction="in" rot="R180"/>
 <pin name="VDD" x="-12.7" y="5.08" visible="pad" length="middle" direction="pwr"/>
 <text x="-7.62" y="8.255" size="1.778" layer="95">&gt;NAME</text>
 <text x="-7.62" y="-10.16" size="1.778" layer="96">&gt;VALUE</text>
 <text x="-6.985" y="4.318" size="1.524" layer="95">VDD</text>
 <text x="-6.985" y="-5.842" size="1.524" layer="95">GND</text>
 <text x="-0.127" y="-0.762" size="1.524" layer="95">OUT</text>
 <text x="0" y="-7.112" size="1.524" layer="95">CNTRL</text>
 </symbol>
 <symbol name="LTC3531">
 <wire x1="-10.16" y1="10.16" x2="10.16" y2="10.16" width="0.254" layer="94"/>
 <wire x1="10.16" y1="10.16" x2="10.16" y2="-10.16" width="0.254" layer="94"/>
 <wire x1="10.16" y1="-10.16" x2="-10.16" y2="-10.16" width="0.254" layer="94"/>
 <wire x1="-10.16" y1="-10.16" x2="-10.16" y2="10.16" width="0.254" layer="94"/>
 <text x="-10.16" y="10.922" size="1.778" layer="95">&gt;NAME</text>
 <text x="-10.414" y="-12.954" size="1.778" layer="96">&gt;VALUE</text>
 <pin name="SW1" x="7.62" y="15.24" length="middle" rot="R270"/>
 <pin name="SW2" x="-7.62" y="15.24" length="middle" rot="R270"/>
 <pin name="GND" x="2.54" y="-15.24" length="middle" rot="R90"/>
 <pin name="VOUT" x="15.24" y="0" length="middle" rot="R180"/>
 <pin name="!SHDN" x="-15.24" y="-2.54" length="middle"/>
@@ @@ -33816,29 +33821,24 @@ @@
 <wire x1="10.16" y1="5.08" x2="10.16" y2="-5.08" width="0.254" layer="94"/>
 <wire x1="10.16" y1="-5.08" x2="-10.16" y2="-5.08" width="0.254" layer="94"/>
 <text x="-7.62" y="7.62" size="1.778" layer="95" rot="MR180">&gt;NAME</text>
 <text x="-7.62" y="-7.62" size="1.778" layer="96">&gt;VALUE</text>
 </symbol>
 <symbol name="ANTENNA">
 <wire x1="-1.27" y1="1.27" x2="0" y2="0" width="0.254" layer="94"/>
 <wire x1="0" y1="0" x2="1.27" y2="1.27" width="0.254" layer="94"/>
 <text x="1.27" y="-3.81" size="1.778" layer="95">&gt;NAME</text>
 <text x="1.27" y="-6.35" size="1.778" layer="96">&gt;VALUE</text>
 <pin name="ANTENNA" x="0" y="-5.08" visible="off" length="middle" direction="in" rot="R90"/>
 </symbol>
 <text x="-6.985" y="4.318" size="1.524" layer="95">VDD</text>
 <text x="-6.985" y="-5.842" size="1.524" layer="95">GND</text>
 <text x="-0.127" y="-0.762" size="1.524" layer="95">OUT</text>
 <text x="0" y="-7.112" size="1.524" layer="95">CNTRL</text>
 </symbol>
 </symbols>
 <devicesets>
 <deviceset name="RJ45">
 <description>&lt;b&gt;RJ45 Jack&lt;/b&gt;
 Simple RJ45, 8-pin connection - connector for common Cat5, Cat5e, and Cat6 Ethernet cables.
 &lt;br&gt;&lt;br&gt;
 MOLEX SMD P/N: 43743-8101</description>
 <gates>
 <gate name="G$1" symbol="RJ45-8" x="0" y="0"/>
 </gates>
 <devices>
 <device name="BIGPKG" package="RJ45-8_SMD-1">
@@ @@ -34499,24 +34499,33 @@ MOLEX SMD P/N: 43743-8101</description> @@
 <deviceset name="VG-4231CE">
 <description>TXVCOscillator</description>
 <gates>
 <gate name="1" symbol="TXVCO" x="0" y="0"/>
 </gates>
 <devices>
 <device name="" package="CRYSTAL-3.2X2.5">
 <connects>
 <connect gate="1" pin="CNTRL" pad="1"/>
 <connect gate="1" pin="GND" pad="2"/>
 <connect gate="1" pin="OUT" pad="3"/>
 <connect gate="1" pin="VDD" pad="4"/>
 </connects>
 <technologies>
 <technology name=""/>
 </technologies>
 </device>
 </devices>
 </deviceset>
 <deviceset name="LTC3531-3.3">
 <gates>
 <gate name="G$1" symbol="LTC3531" x="0" y="0"/>
 </gates>
 <devices>
 <device name="" package="TSOT23-6">
 <connects>
 <connect gate="G$1" pin="!SHDN" pad="4"/>
 <connect gate="G$1" pin="GND" pad="2"/>
 <connect gate="G$1" pin="SW1" pad="6"/>
 <connect gate="G$1" pin="SW2" pad="1"/>
 <connect gate="G$1" pin="VIN" pad="5"/>

0 comments (0 inline, 0 general)