tztz/KicadLib
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix merge error.

Browse source
This commit is contained in:
Henrik Brix Andersen 2014-12-25 20:02:23 +01:00
parent f92588353f
commit 1f48fc7513
1 changed files with 0 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

29
library/silabs.lib
View file

@ -4,20 +4,14 @@ EESchema-LIBRARY Version 2.3
# Si4362 # Si4362
# #
DEF Si4362 U 0 40 Y Y 1 F N DEF Si4362 U 0 40 Y Y 1 F N
<<<<<<< HEAD
F0 "U" -400 700 50 H V C CNN F0 "U" -400 700 50 H V C CNN
F1 "Si4362" -300 -700 50 H V C CNN F1 "Si4362" -300 -700 50 H V C CNN
=======
F0 "U" -450 650 50 H V C CNN
F1 "Si4362" -350 -650 50 H V C CNN
>>>>>>> 50d38bcdfb3e966122bb9e2f9a50c025f47fd3f5
F2 "" 50 -1000 60 H V C CNN F2 "" 50 -1000 60 H V C CNN
F3 "" 50 -1000 60 H V C CNN F3 "" 50 -1000 60 H V C CNN
$FPLIST $FPLIST
QFN-20-1EP_4x4mm_Pitch0.5mm QFN-20-1EP_4x4mm_Pitch0.5mm
$ENDFPLIST $ENDFPLIST
DRAW DRAW
<<<<<<< HEAD
S -450 650 450 -650 0 1 0 f S -450 650 450 -650 0 1 0 f
X SDN 1 -600 500 150 R 50 50 1 1 I X SDN 1 -600 500 150 R 50 50 1 1 I
X RXp 2 -600 400 150 R 50 50 1 1 I X RXp 2 -600 400 150 R 50 50 1 1 I
@ -36,29 +30,6 @@ X XOUT 16 -600 -200 150 R 50 50 1 1 I
X XIN 17 -600 -100 150 R 50 50 1 1 I X XIN 17 -600 -100 150 R 50 50 1 1 I
X GND 18 0 -800 150 U 50 50 1 1 W X GND 18 0 -800 150 U 50 50 1 1 W
X GPIO2 19 600 300 150 L 50 50 1 1 B X GPIO2 19 600 300 150 L 50 50 1 1 B
=======
S -500 600 500 -600 0 1 0 f
X SDN 1 -700 500 200 R 60 60 1 1 I
X RXp 2 -700 400 200 R 60 60 1 1 I
X RXn 3 -700 300 200 R 60 60 1 1 I
X NC 4 -700 -300 200 R 60 60 1 1 N N
X NC 5 -700 -400 200 R 60 60 1 1 N N
X VDD 6 -100 800 200 D 60 60 1 1 W
X NC 7 -700 -500 200 R 60 60 1 1 N N
X VDD 8 0 800 200 D 60 60 1 1 W
X GPIO0 9 700 500 200 L 60 60 1 1 B
X GPIO1 10 700 400 200 L 60 60 1 1 B
X GPIO3 20 700 200 200 L 60 60 1 1 B
X ~IRQ 11 700 -500 200 L 60 60 1 1 I
X SCLK 12 700 -400 200 L 60 60 1 1 I C
X SDO 13 700 -300 200 L 60 60 1 1 I
X SDI 14 700 -200 200 L 60 60 1 1 I
X ~SEL 15 700 -100 200 L 60 60 1 1 I
X XOUT 16 -700 -200 200 R 60 60 1 1 I
X XIN 17 -700 -100 200 R 60 60 1 1 I
X GND 18 0 -800 200 U 60 60 1 1 W
X GPIO2 19 700 300 200 L 60 60 1 1 B
>>>>>>> 50d38bcdfb3e966122bb9e2f9a50c025f47fd3f5
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #