Changeset - a7b1c38f3b53
[Not reviewed]
default
0 1 0
matthewreed - 5 years ago 2020-05-10 22:24:55

Fixed merge issue
1 file changed with 32 insertions and 32 deletions:
0 comments (0 inline, 0 general)
lbr/Protofusion.lbr
Show inline comments
 
@@ -527,13 +527,13 @@
 
<wire x1="-0.635" y1="-3.175" x2="-0.635" y2="4.445" width="0.127" layer="21"/>
 
<polygon width="0.127" layer="21">
 
<vertex x="-0.635" y="1.905"/>
 
<vertex x="0.635" y="1.905"/>
 
<vertex x="0.635" y="4.445"/>
 
<vertex x="-0.635" y="4.445"/>
 
</polygon>
 
</polygon>9655
 
<text x="-1.27" y="5.08" size="1.27" layer="25">&gt;NAME</text>
 
<text x="-1.27" y="-5.08" size="1.27" layer="27">&gt;VALUE</text>
 
<pad name="1" x="0" y="3.81" drill="0.4572"/>
 
<pad name="6" x="0" y="-2.54" drill="0.4572"/>
 
</package>
 
<package name="POGOPROG-CONN-OH-SMALLERVIAS">
 
@@ -980,13 +980,13 @@
 
<text x="-3" y="5" size="1.27" layer="25" ratio="10">&gt;NAME</text>
 
<rectangle x1="-4.185" y1="2.3" x2="-3.815" y2="3.3" layer="51" rot="R270"/>
 
<rectangle x1="-4.185" y1="1.5" x2="-3.815" y2="2.5" layer="51" rot="R270"/>
 
<rectangle x1="-4.185" y1="-3.3" x2="-3.815" y2="-2.3" layer="51" rot="R270"/>
 
<rectangle x1="-4.185" y1="-2.5" x2="-3.815" y2="-1.5" layer="51" rot="R270"/>
 
<rectangle x1="-4.185" y1="-1.7" x2="-3.815" y2="-0.7" layer="51" rot="R270"/>
 
<rectangle x1="-4.185" y1="-0.9" x2="-3.815" y2="0.1" layer="51" rot="R270"/>
 
<rectangle x1="-4.185" y1="-0.9" x2="-3.815" y2="0.1" layer="51" rot="R270"/>9655
 
<rectangle x1="-4.185" y1="-0.1" x2="-3.815" y2="0.9" layer="51" rot="R270"/>
 
<rectangle x1="-4.185" y1="0.7" x2="-3.815" y2="1.7" layer="51" rot="R270"/>
 
<rectangle x1="-2.985" y1="-4.5" x2="-2.615" y2="-3.5" layer="51"/>
 
<rectangle x1="-2.185" y1="-4.5" x2="-1.815" y2="-3.5" layer="51"/>
 
<rectangle x1="2.615" y1="-4.5" x2="2.985" y2="-3.5" layer="51"/>
 
<rectangle x1="1.815" y1="-4.5" x2="2.185" y2="-3.5" layer="51"/>
 
@@ -1453,13 +1453,13 @@
 
<smd name="5" x="0.89" y="-0.75" dx="0.97" dy="0.33" layer="1"/>
 
<wire x1="-0.875" y1="1" x2="0.875" y2="1" width="0.127" layer="21"/>
 
<wire x1="0.875" y1="1" x2="0.875" y2="-1" width="0.127" layer="21"/>
 
<wire x1="0.875" y1="-1" x2="-0.875" y2="-1" width="0.127" layer="21"/>
 
<wire x1="-0.875" y1="-1" x2="-0.875" y2="1" width="0.127" layer="21"/>
 
<text x="-1" y="1.6" size="0.75" layer="25">&gt;Name</text>
 
<text x="-1" y="-2" size="0.75" layer="27">&gt;Value</text>
 
<text x="-1" y="-2" size="0.75" layer="27">&gt;Value</text>9655
 
<rectangle x1="-0.9" y1="0.5" x2="0" y2="1" layer="21"/>
 
<wire x1="-0.875" y1="1" x2="0.875" y2="1" width="0.127" layer="51"/>
 
<wire x1="0.875" y1="1" x2="0.875" y2="-1" width="0.127" layer="51"/>
 
<wire x1="0.875" y1="-1" x2="-0.875" y2="-1" width="0.127" layer="51"/>
 
<wire x1="-0.875" y1="-1" x2="-0.875" y2="1" width="0.127" layer="51"/>
 
<rectangle x1="-0.9" y1="0.5" x2="0" y2="1" layer="51"/>
 
@@ -1906,13 +1906,13 @@ SMB footprint. Diode polarity has been r
 
<wire x1="-3.75" y1="-3.9" x2="5.25" y2="-3.9" width="0.127" layer="22"/>
 
<wire x1="0.75" y1="3.5" x2="-3.25" y2="3" width="0.127" layer="22"/>
 
<wire x1="-3.25" y1="3" x2="-3.25" y2="2" width="0.127" layer="22"/>
 
<wire x1="-3.25" y1="2" x2="0.75" y2="1.5" width="0.127" layer="22"/>
 
<wire x1="1.25" y1="-3.5" x2="-3.25" y2="-3" width="0.127" layer="22"/>
 
<wire x1="-3.25" y1="-3" x2="-3.25" y2="-2" width="0.127" layer="22"/>
 
<wire x1="-3.25" y1="-2" x2="1.25" y2="-1.5" width="0.127" layer="22"/>
 
<wire x1="-3.25" y1="-2" x2="1.25" y2="-1.5" width="0.127" layer="22"/>9655
 
<wire x1="-3.25" y1="1.25" x2="1.75" y2="0.75" width="0.127" layer="22"/>
 
<wire x1="1.75" y1="0.75" x2="1.75" y2="-0.75" width="0.127" layer="22"/>
 
<wire x1="1.75" y1="-0.75" x2="-3.25" y2="-1.25" width="0.127" layer="22"/>
 
<pad name="VBUS" x="5.1" y="1.6" drill="0.8"/>
 
<pad name="D+" x="5.1" y="0" drill="0.8"/>
 
<pad name="GND" x="5.1" y="-1.6" drill="0.8"/>
 
@@ -3601,36 +3601,12 @@ 0603, surface mount.
 
<smd name="3" x="-2.4864" y="0.5" dx="0.9773" dy="0.2925" layer="1" roundness="100" thermals="no"/>
 
<smd name="4" x="-2.4864" y="0" dx="0.9773" dy="0.2925" layer="1" roundness="100" thermals="no"/>
 
<smd name="5" x="-2.4864" y="-0.5" dx="0.9773" dy="0.2925" layer="1" roundness="100" thermals="no"/>
 
<smd name="6" x="-2.4864" y="-1" dx="0.9773" dy="0.2925" layer="1" roundness="100" thermals="no"/>
 
<smd name="7" x="-2.4864" y="-1.5" dx="0.9773" dy="0.2925" layer="1" roundness="100" thermals="no"/>
 
<smd name="8" x="-1.5" y="-2.4864" dx="0.9773" dy="0.2925" layer="1" roundness="100" rot="R90" thermals="no"/>
 
<package name="CL-SB-22A-11T">
 
<wire x1="-4.25" y1="1.75" x2="-4.25" y2="-1.75" width="0.2032" layer="21"/>
 
<wire x1="-4.25" y1="-1.75" x2="4.25" y2="-1.75" width="0.2032" layer="21"/>
 
<wire x1="4.25" y1="-1.75" x2="4.25" y2="1.75" width="0.2032" layer="21"/>
 
<wire x1="4.25" y1="1.75" x2="-4.25" y2="1.75" width="0.2032" layer="21"/>
 
<smd name="3" x="2.5" y="1.4" dx="1.2" dy="1.6" layer="1"/>
 
<smd name="2" x="0" y="1.4" dx="1.2" dy="1.6" layer="1"/>
 
<smd name="1" x="-2.5" y="1.4" dx="1.2" dy="1.6" layer="1"/>
 
<smd name="6" x="2.5" y="-1.4" dx="1.2" dy="1.6" layer="1"/>
 
<smd name="5" x="0" y="-1.4" dx="1.2" dy="1.6" layer="1"/>
 
<smd name="4" x="-2.5" y="-1.4" dx="1.2" dy="1.6" layer="1"/>
 
<text x="-4.81" y="0" size="0.6096" layer="25" font="vector" ratio="20" rot="R90" align="bottom-center">&gt;Name</text>
 
<text x="4.81" y="0" size="0.6096" layer="27" font="vector" ratio="20" rot="R90" align="top-center">&gt;Value</text>
 
<wire x1="0" y1="1.8" x2="0" y2="3.8" width="0.127" layer="21"/>
 
<wire x1="0" y1="3.8" x2="1.548" y2="3.8" width="0.127" layer="21"/>
 
<wire x1="1.548" y1="3.8" x2="1.548" y2="1.8" width="0.127" layer="21"/>
 
<wire x1="-0.562" y1="3.8" x2="-0.362" y2="3.8" width="0.127" layer="21"/>
 
<wire x1="-1.005" y1="3.8" x2="-0.805" y2="3.8" width="0.127" layer="21"/>
 
<wire x1="-1.521" y1="3.8" x2="-1.321" y2="3.8" width="0.127" layer="21"/>
 
<wire x1="-1.548" y1="3.3" x2="-1.548" y2="3.5" width="0.127" layer="21"/>
 
<wire x1="-1.548" y1="2.8" x2="-1.548" y2="3" width="0.127" layer="21"/>
 
<wire x1="-1.548" y1="2.3" x2="-1.548" y2="2.5" width="0.127" layer="21"/>
 
<wire x1="-1.548" y1="1.8" x2="-1.548" y2="2" width="0.127" layer="21"/>
 
</package>
 
<smd name="9" x="-1" y="-2.4864" dx="0.9773" dy="0.2925" layer="1" roundness="100" rot="R90" thermals="no"/>
 
<smd name="10" x="-0.5" y="-2.4864" dx="0.9773" dy="0.2925" layer="1" roundness="100" rot="R90" thermals="no"/>
 
<smd name="11" x="0" y="-2.4864" dx="0.9773" dy="0.2925" layer="1" roundness="100" rot="R90" thermals="no"/>
 
<smd name="12" x="0.5" y="-2.4864" dx="0.9773" dy="0.2925" layer="1" roundness="100" rot="R90" thermals="no"/>
 
<smd name="13" x="1" y="-2.4864" dx="0.9773" dy="0.2925" layer="1" roundness="100" rot="R90" thermals="no"/>
 
<smd name="14" x="1.5" y="-2.4864" dx="0.9773" dy="0.2925" layer="1" roundness="100" rot="R90" thermals="no"/>
 
@@ -3653,12 +3629,36 @@ 0603, surface mount.
 
<text x="4.1" y="-1.01" size="0.8128" layer="27">&gt;VALUE</text>
 
<rectangle x1="-1.2" y1="-1.2" x2="-0.2" y2="-0.2" layer="31"/>
 
<rectangle x1="0.2" y1="-1.2" x2="1.2" y2="-0.2" layer="31"/>
 
<rectangle x1="-1.2" y1="0.2" x2="-0.2" y2="1.2" layer="31"/>
 
<rectangle x1="0.2" y1="0.2" x2="1.2" y2="1.2" layer="31"/>
 
</package>
 
<package name="CL-SB-22A-11T">
 
<wire x1="-4.25" y1="1.75" x2="-4.25" y2="-1.75" width="0.2032" layer="21"/>
 
<wire x1="-4.25" y1="-1.75" x2="4.25" y2="-1.75" width="0.2032" layer="21"/>
 
<wire x1="4.25" y1="-1.75" x2="4.25" y2="1.75" width="0.2032" layer="21"/>
 
<wire x1="4.25" y1="1.75" x2="-4.25" y2="1.75" width="0.2032" layer="21"/>
 
<smd name="3" x="2.5" y="1.4" dx="1.2" dy="1.6" layer="1"/>
 
<smd name="2" x="0" y="1.4" dx="1.2" dy="1.6" layer="1"/>
 
<smd name="1" x="-2.5" y="1.4" dx="1.2" dy="1.6" layer="1"/>
 
<smd name="6" x="2.5" y="-1.4" dx="1.2" dy="1.6" layer="1"/>
 
<smd name="5" x="0" y="-1.4" dx="1.2" dy="1.6" layer="1"/>
 
<smd name="4" x="-2.5" y="-1.4" dx="1.2" dy="1.6" layer="1"/>
 
<text x="-4.81" y="0" size="0.6096" layer="25" font="vector" ratio="20" rot="R90" align="bottom-center">&gt;Name</text>
 
<text x="4.81" y="0" size="0.6096" layer="27" font="vector" ratio="20" rot="R90" align="top-center">&gt;Value</text>
 
<wire x1="0" y1="1.8" x2="0" y2="3.8" width="0.127" layer="21"/>
 
<wire x1="0" y1="3.8" x2="1.548" y2="3.8" width="0.127" layer="21"/>
 
<wire x1="1.548" y1="3.8" x2="1.548" y2="1.8" width="0.127" layer="21"/>
 
<wire x1="-0.562" y1="3.8" x2="-0.362" y2="3.8" width="0.127" layer="21"/>
 
<wire x1="-1.005" y1="3.8" x2="-0.805" y2="3.8" width="0.127" layer="21"/>
 
<wire x1="-1.521" y1="3.8" x2="-1.321" y2="3.8" width="0.127" layer="21"/>
 
<wire x1="-1.548" y1="3.3" x2="-1.548" y2="3.5" width="0.127" layer="21"/>
 
<wire x1="-1.548" y1="2.8" x2="-1.548" y2="3" width="0.127" layer="21"/>
 
<wire x1="-1.548" y1="2.3" x2="-1.548" y2="2.5" width="0.127" layer="21"/>
 
<wire x1="-1.548" y1="1.8" x2="-1.548" y2="2" width="0.127" layer="21"/>
 
</package>
 
<package name="UBLOX_MAX-8">
 
<description>uBlox MAX-8</description>
 
<circle x="2.65" y="-3.9" radius="0.4031125" width="0.127" layer="21"/>
 
<wire x1="-4.85" y1="-4.85" x2="-4.85" y2="-5.1" width="0.1" layer="21"/>
 
<wire x1="-4.85" y1="-5.1" x2="4.85" y2="-5.1" width="0.1" layer="21"/>
 
<wire x1="4.85" y1="-4.85" x2="4.85" y2="-5.1" width="0.1" layer="21"/>
 
@@ -4651,13 +4651,13 @@ short conditions is included.</descripti
 
<wire x1="12.7" y1="-15.24" x2="-12.7" y2="-15.24" width="0.254" layer="94"/>
 
<wire x1="-12.7" y1="-15.24" x2="-12.7" y2="12.7" width="0.254" layer="94"/>
 
<pin name="SDI" x="-17.78" y="2.54" length="middle" direction="in"/>
 
<pin name="SCLK" x="-17.78" y="0" length="middle" direction="in"/>
 
<pin name="!CS" x="-17.78" y="-2.54" length="middle" direction="in"/>
 
<pin name="SDO" x="-17.78" y="-5.08" length="middle" direction="out"/>
 
<pin name="GND1" x="-17.78" y="-10.16" length="middle" direction="pwr"/>
 
<pin name="GND1" x="-17.78" y="-10.16" length="middle" direction="pwr"/>9655
 
<pin name="GND2" x="-17.78" y="-12.7" length="middle" direction="pwr"/>
 
<pin name="DGND" x="-17.78" y="-7.62" length="middle" direction="pwr"/>
 
<pin name="DVDD" x="-17.78" y="7.62" length="middle" direction="pwr"/>
 
<pin name="VDD" x="-17.78" y="10.16" length="middle" direction="pwr"/>
 
<pin name="BIAS" x="17.78" y="10.16" length="middle" direction="in" rot="R180"/>
 
<pin name="REFIN+" x="17.78" y="7.62" length="middle" direction="in" rot="R180"/>
 
@@ -6112,13 +6112,13 @@ http://www.st.com/content/ccc/resource/t
 
<pin name="PA7" x="30.48" y="7.62" length="middle" rot="R180"/>
 
<pin name="PB0" x="30.48" y="-12.7" length="middle" rot="R180"/>
 
<pin name="PB1" x="30.48" y="-15.24" length="middle" rot="R180"/>
 
<pin name="VSS" x="-30.48" y="-17.78" length="middle"/>
 
<pin name="PA8" x="30.48" y="5.08" length="middle" rot="R180"/>
 
<pin name="PA9" x="30.48" y="2.54" length="middle" rot="R180"/>
 
<pin name="PA10" x="30.48" y="0" length="middle" rot="R180"/>
 
<pin name="PA10" x="30.48" y="0" length="middle" rot="R180"/>9655
 
<pin name="PA13" x="30.48" y="-2.54" length="middle" rot="R180"/>
 
<pin name="PA14" x="30.48" y="-5.08" length="middle" rot="R180"/>
 
<pin name="PA15" x="30.48" y="-7.62" length="middle" rot="R180"/>
 
<pin name="PB3" x="30.48" y="-17.78" length="middle" rot="R180"/>
 
<pin name="PB6" x="30.48" y="-20.32" length="middle" rot="R180"/>
 
<pin name="PB7" x="30.48" y="-22.86" length="middle" rot="R180"/>
 
@@ -6463,13 +6463,13 @@ MOLEX SMD P/N: 43743-8101</description>
 
</connects>
 
<technologies>
 
<technology name="">
 
<attribute name="DIGIKEY_PART_NUMBER" value="" constant="no"/>
 
<attribute name="MANUFACTURER" value="" constant="no"/>
 
<attribute name="PART_NUMBER" value="" constant="no"/>
 
</technology>
 
</technology>9655
 
</technologies>
 
</device>
 
</devices>
 
</deviceset>
 
<deviceset name="LED-RGB-10W-MODULAR">
 
<description>High power RGB LED</description>
 
@@ -7852,13 +7852,13 @@ Source: http://www.nxp.com/documents/dat
 
<description>Clock generator 8 output with VCO</description>
 
<gates>
 
<gate name="G$1" symbol="SI5351B" x="7.62" y="5.08"/>
 
</gates>
 
<devices>
 
<device name="" package="QFN20-4X4">
 
<connects>
 
<connects>9655
 
<connect gate="G$1" pin="CLK0" pad="P$13"/>
 
<connect gate="G$1" pin="CLK1" pad="P$12"/>
 
<connect gate="G$1" pin="CLK2" pad="P$9"/>
 
<connect gate="G$1" pin="CLK3" pad="P$8"/>
 
<connect gate="G$1" pin="CLK4" pad="P$19"/>
 
<connect gate="G$1" pin="CLK5" pad="P$17"/>
0 comments (0 inline, 0 general)