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

Merge branch 'crystal-fix'

Browse source 
Conflicts:
	library/device.lib
This commit is contained in:
Oliver Walters 2016-05-20 13:39:52 +10:00
parent 405a0aa1b2 a655607264
commit 56a663afe3
2 changed files with 70 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
library/device.dcm
View file

@ -41,7 +41,19 @@ $ENDCMP
#
$CMP Crystal
D Two pin crystal
K Quartz, Ceramic, Filter, Resonator
K Quartz Ceramic Filter Resonator
$ENDCMP
#
$CMP Crystal_3Pin
D Crystal with ground pin
K crystal resonator oscillator
F ~
$ENDCMP
#
$CMP Crystal_4Pin
D Crystal with two ground pins
K crystal resonator oscillator
F ~
$ENDCMP
#
$CMP Crystal_Small

95
library/device.lib
View file

@ -149,24 +149,6 @@ X ~ 2 0 -100 73 U 40 40 1 1 P
ENDDRAW
ENDDEF
#
# CRYSTAL_SMD
#
DEF CRYSTAL_SMD X 0 40 Y N 1 F N
F0 "X" 0 90 50 H V C CNN
F1 "CRYSTAL_SMD" 0 200 50 H V C CNN
F2 "" 0 0 50 H V C CNN
F3 "" 0 0 50 H V C CNN
DRAW
P 2 0 1 0 -70 -70 70 -70 N
P 2 0 1 16 -70 50 -70 -50 N
P 2 0 1 16 70 50 70 -50 N
P 5 0 1 12 -40 40 40 40 40 -40 -40 -40 -40 40 f
X 1 1 -200 0 130 R 25 20 1 1 P
X 2 2 200 0 130 L 25 20 1 1 P
X case 3 0 -100 30 U 25 20 1 1 P
ENDDRAW
ENDDEF
#
# CTRIM
#
DEF CTRIM C 0 10 N N 1 F N
@ -228,8 +210,8 @@ ENDDEF
#
# Crystal
#
DEF Crystal Y 0 40 N N 1 F N
F0 "Y" 0 150 50 H V C CNN
DEF Crystal X 0 40 N N 1 F N
F0 "X" 0 150 50 H V C CNN
F1 "Crystal" 0 -150 50 H V C CNN
F2 "" 0 0 50 H V C CNN
F3 "" 0 0 50 H V C CNN
@ -237,7 +219,7 @@ $FPLIST
Crystal_*
$ENDFPLIST
DRAW
S -50 100 50 -100 0 1 12 N
S -50 100 50 -100 0 1 10 f
P 2 0 1 12 -100 -50 -100 50 N
P 2 0 1 12 100 -50 100 50 N
X 1 1 -150 0 50 R 40 40 1 1 P
@ -245,10 +227,47 @@ X 2 2 150 0 50 L 40 40 1 1 P
ENDDRAW
ENDDEF
#
# Crystal_3Pin
#
DEF Crystal_3Pin X 0 40 N N 1 F N
F0 "X" 0 90 50 H V C CNN
F1 "Crystal_3Pin" 0 -150 50 H V C CNN
F2 "" 0 0 50 H V C CNN
F3 "" 0 0 50 H V C CNN
DRAW
P 2 0 1 0 -70 -70 70 -70 N
P 2 0 1 16 -70 50 -70 -50 N
P 2 0 1 16 70 50 70 -50 N
P 5 0 1 12 -40 40 40 40 40 -40 -40 -40 -40 40 f
X OSC1 1 -175 0 100 R 50 50 1 1 P
X OSC2 2 200 0 130 L 50 50 1 1 P
X GND 3 0 -100 30 U 30 30 1 1 W
ENDDRAW
ENDDEF
#
# Crystal_4Pin
#
DEF Crystal_4Pin X 0 40 N N 1 F N
F0 "X" 0 90 50 H V C CNN
F1 "Crystal_4Pin" 0 -150 50 H V C CNN
F2 "" 0 0 50 H V C CNN
F3 "" 0 0 50 H V C CNN
DRAW
P 2 0 1 0 -70 -70 70 -70 N
P 2 0 1 16 -70 50 -70 -50 N
P 2 0 1 16 70 50 70 -50 N
P 5 0 1 12 -40 40 40 40 40 -40 -40 -40 -40 40 f
X OSC1 1 -175 0 100 R 50 50 1 1 P
X OSC2 2 200 0 130 L 50 50 1 1 P
X GND 3 -50 -100 30 U 30 30 1 1 W
X GND 4 50 -100 30 U 50 50 1 1 W
ENDDRAW
ENDDEF
#
# Crystal_Small
#
DEF Crystal_Small Y 0 40 N N 1 F N
F0 "Y" 0 100 50 H V C CNN
DEF Crystal_Small X 0 40 N N 1 F N
F0 "X" 0 100 50 H V C CNN
F1 "Crystal_Small" 0 -100 50 H V C CNN
F2 "" 0 0 50 H V C CNN
F3 "" 0 0 50 H V C CNN
@ -256,7 +275,7 @@ $FPLIST
Crystal_
$ENDFPLIST
DRAW
S -30 -60 30 60 0 1 0 N
S -30 -60 30 60 0 1 10 f
P 2 0 1 0 -50 -30 -50 30 N
P 2 0 1 0 50 -30 50 30 N
X 1 1 -100 0 50 R 40 40 1 1 P
@ -294,16 +313,16 @@ F1 "DUAL_POT" 290 -300 50 H V C CNN
F2 "" 0 0 50 H V C CNN
F3 "" 0 0 50 H V C CNN
DRAW
T 0 -70 -100 30 0 0 0 H Normal 0 C C
T 0 -70 300 30 0 0 0 H Normal 0 C C
T 0 -70 -300 30 0 0 0 L Normal 0 C C
T 0 -70 100 30 0 0 0 L Normal 0 C C
S -100 -50 50 -350 0 1 10 f
T 0 -20 -100 30 0 0 0 H Normal 0 C C
T 0 -20 300 30 0 0 0 H Normal 0 C C
T 0 -20 -300 30 0 0 0 L Normal 0 C C
T 0 -20 100 30 0 0 0 L Normal 0 C C
S -100 250 -100 250 0 1 0 N
S -100 250 -100 250 0 1 0 N
S -100 250 -100 250 0 1 0 N
S -100 250 -100 250 0 1 0 N
S -100 350 50 50 0 1 10 f
S -50 -50 50 -350 0 1 0 N
S -50 350 50 50 0 1 0 N
P 4 0 1 0 200 200 80 200 80 200 80 200 N
P 5 0 1 0 80 -220 80 -180 50 -200 80 -220 80 -220 N
P 5 0 1 0 150 -200 100 -180 130 -150 150 -200 150 -200 N
@ -311,12 +330,12 @@ P 5 0 1 0 200 -200 80 -200 80 -200 80 -200 80 -200 N
P 6 0 1 0 80 180 80 220 50 200 80 180 80 180 80 180 N
P 6 0 1 0 110 160 100 150 100 -150 110 -160 110 -160 110 -160 N
P 6 0 1 0 150 200 100 180 130 150 150 200 150 200 150 200 N
X 1 1 -200 300 100 R 50 50 1 1 P
X 2 2 300 200 100 L 50 50 1 1 P
X 3 3 -200 100 100 R 50 50 1 1 P
X ~ 4 -200 -100 100 R 50 50 1 1 P
X ~ 5 300 -200 100 L 50 50 1 1 P
X ~ 6 -200 -300 100 R 50 50 1 1 P
X 1 1 -150 300 100 R 40 40 1 1 P
X 2 2 300 200 100 L 40 40 1 1 P
X 3 3 -150 100 100 R 40 40 1 1 P
X ~ 4 -150 -100 100 R 40 40 1 1 P
X ~ 5 300 -200 100 L 40 40 1 1 P
X ~ 6 -150 -300 100 R 40 40 1 1 P
ENDDRAW
ENDDEF
#
@ -3118,12 +3137,12 @@ F1 "SW_PUSH_SMALL" 0 -79 50 H V C CNN
F2 "" 0 0 50 H V C CNN
F3 "" 0 0 50 H V C CNN
DRAW
C -60 60 10 0 1 0 N
C 60 -60 10 0 1 0 N
P 3 0 1 0 -100 100 -60 60 -60 60 N
P 4 0 1 0 60 -60 100 -100 100 -100 100 -100 N
P 6 0 1 0 -10 60 10 70 70 10 60 -10 60 -10 60 -10 N
P 7 0 1 0 -50 80 80 -50 90 -40 -40 90 -50 80 -50 80 -50 80 N
C -60 60 10 0 1 0 N
C 60 -60 10 0 1 0 N
X 1 1 -100 100 0 R 50 50 0 1 P
X 2 2 100 -100 0 L 50 50 0 1 P
ENDDRAW