From b6145ca0322566d45369748dd45c790e7f7e5042 Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Tue, 13 Jan 2015 20:30:45 +0100 Subject: [PATCH 01/18] Remove and replace CP by CP2 --- library/device.dcm | 4 ---- library/device.lib | 50 ++++++++++++++-------------------------------- 2 files changed, 15 insertions(+), 39 deletions(-) diff --git a/library/device.dcm b/library/device.dcm index 964994f6..6e93d074 100644 --- a/library/device.dcm +++ b/library/device.dcm @@ -19,10 +19,6 @@ $CMP C D Condensateur non polarise $ENDCMP # -$CMP CAPAPOL -D Condensateur polarise -$ENDCMP -# $CMP CERAMIC_FILTER D Ceramic filter K FILTER diff --git a/library/device.lib b/library/device.lib index 2b57fdc1..a66962d4 100644 --- a/library/device.lib +++ b/library/device.lib @@ -121,8 +121,8 @@ P 2 0 0 0 0 -550 200 -350 N P 2 0 0 6 0 550 200 350 N P 2 0 0 8 250 -100 450 -300 N P 2 0 0 6 350 200 550 0 N -P 2 0 0 0 450 300 250 100 N P 2 0 0 8 450 300 250 100 N +P 2 0 0 0 450 300 250 100 N P 2 0 0 6 550 0 350 -200 N P 5 0 0 0 -450 300 -200 350 -250 100 -450 300 -450 300 F P 5 0 0 0 -250 -100 -200 -350 -450 -300 -250 -100 -250 -100 F @@ -208,21 +208,26 @@ ENDDEF # # CP # -DEF CP C 0 10 N N 1 F N +DEF CP C 0 10 N Y 1 F N F0 "C" 50 100 50 H V L CNN F1 "CP" 50 -100 50 H V L CNN -F2 "" 100 -150 30 H V C CNN -F3 "" 0 0 300 H V C CNN -ALIAS CAPAPOL +F2 "" 38 -150 30 H V C CNN +F3 "" 0 0 60 H V C CNN $FPLIST - CP* SM* + C? + C1-1 $ENDFPLIST DRAW -P 4 0 1 8 -80 50 -80 -50 80 -50 80 50 N -P 4 0 1 0 -50 50 -50 -20 50 -20 50 50 F -X ~ 1 0 200 150 D 40 40 1 1 P -X ~ 2 0 -200 150 U 40 40 1 1 P +S -90 20 -90 40 0 1 0 N +S -90 20 90 20 0 1 0 N +S -70 90 -30 90 0 1 0 N +S -50 70 -50 110 0 1 0 N +S 90 -20 -90 -40 0 1 0 F +S 90 40 -90 40 0 1 0 N +S 90 40 90 20 0 1 0 N +X ~ 1 0 200 160 D 40 40 1 1 P +X ~ 2 0 -200 160 U 40 40 1 1 P ENDDRAW ENDDEF # @@ -246,31 +251,6 @@ X ~ 2 0 -200 180 U 40 40 1 1 P ENDDRAW ENDDEF # -# CP2 -# -DEF CP2 C 0 10 N Y 1 F N -F0 "C" 50 100 50 H V L CNN -F1 "CP2" 50 -100 50 H V L CNN -F2 "" 38 -150 30 H V C CNN -F3 "" 0 0 60 H V C CNN -$FPLIST - SM* - C? - C1-1 -$ENDFPLIST -DRAW -S -90 20 -90 40 0 1 0 N -S -90 20 90 20 0 1 0 N -S -70 90 -30 90 0 1 0 N -S -50 70 -50 110 0 1 0 N -S 90 -20 -90 -40 0 1 0 F -S 90 40 -90 40 0 1 0 N -S 90 40 90 20 0 1 0 N -X ~ 1 0 200 160 D 40 40 1 1 P -X ~ 2 0 -200 160 U 40 40 1 1 P -ENDDRAW -ENDDEF -# # CPsmall # DEF CPsmall C 0 10 N N 1 F N From f7488997fb804232df54a406dc711c890fdd2186 Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Tue, 13 Jan 2015 20:53:56 +0100 Subject: [PATCH 02/18] Add CP_Small and CP1_Small --- library/device.dcm | 12 ++++++++++-- library/device.lib | 39 +++++++++++++++++++++++++++++++-------- 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/library/device.dcm b/library/device.dcm index 6e93d074..219f3085 100644 --- a/library/device.dcm +++ b/library/device.dcm @@ -30,11 +30,19 @@ K SWITCH $ENDCMP # $CMP CP -D Condensateur polarise +D Polarised capacitor $ENDCMP # $CMP CP1 -D Condensateur polarise +D Polarised capacitor +$ENDCMP +# +$CMP CP1_Small +D Polarised capacitor +$ENDCMP +# +$CMP CP_Small +D Polarised capacitor $ENDCMP # $CMP DIODE diff --git a/library/device.lib b/library/device.lib index a66962d4..649127b3 100644 --- a/library/device.lib +++ b/library/device.lib @@ -251,11 +251,11 @@ X ~ 2 0 -200 180 U 40 40 1 1 P ENDDRAW ENDDEF # -# CPsmall +# CP1_Small # -DEF CPsmall C 0 10 N N 1 F N -F0 "C" 25 50 30 H V L CNN -F1 "CPsmall" 25 -75 30 H V L CNN +DEF CP1_Small C 0 10 N N 1 F N +F0 "C" 10 70 50 H V L CNN +F1 "CP1_Small" 10 -80 50 H V L CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN $FPLIST @@ -263,10 +263,33 @@ $FPLIST SM* $ENDFPLIST DRAW -S -40 20 40 -20 0 1 0 F -P 4 0 1 0 60 30 60 -40 -60 -40 -60 30 N -X ~ 1 0 100 80 D 40 40 1 1 P -X ~ 2 0 -100 60 U 40 40 1 1 P +A 0 -140 125 1186 614 0 1 10 N -60 -30 60 -30 +P 2 0 1 10 -60 30 60 30 N +P 2 0 1 0 -50 60 -30 60 N +P 2 0 1 0 -40 50 -40 70 N +X ~ 1 0 100 70 D 40 40 1 1 P +X ~ 2 0 -100 80 U 40 40 1 1 P +ENDDRAW +ENDDEF +# +# CP_Small +# +DEF CP_Small C 0 10 N N 1 F N +F0 "C" 10 70 50 H V L CNN +F1 "CP_Small" 10 -80 50 H V L CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +$FPLIST + CP* + SM* +$ENDFPLIST +DRAW +S -60 -15 60 -30 0 1 0 F +S -60 30 60 15 0 1 0 N +P 2 0 1 0 -50 60 -30 60 N +P 2 0 1 0 -40 50 -40 70 N +X ~ 1 0 100 70 D 40 40 1 1 P +X ~ 2 0 -100 70 U 40 40 1 1 P ENDDRAW ENDDEF # From 859536a799afedba109b4197af1ffbee9cbf19ef Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Tue, 13 Jan 2015 21:27:48 +0100 Subject: [PATCH 03/18] Add C_Small, R_Small, D_Small, L_Small --- library/device.dcm | 24 ++++++++-- library/device.lib | 115 +++++++++++++++++++++++++++++++++------------ 2 files changed, 106 insertions(+), 33 deletions(-) diff --git a/library/device.dcm b/library/device.dcm index 219f3085..cb45957c 100644 --- a/library/device.dcm +++ b/library/device.dcm @@ -16,7 +16,7 @@ K Pont Diode $ENDCMP # $CMP C -D Condensateur non polarise +D Unpolarized capacitor $ENDCMP # $CMP CERAMIC_FILTER @@ -45,8 +45,12 @@ $CMP CP_Small D Polarised capacitor $ENDCMP # -$CMP DIODE -D Diode simple +$CMP C_Small +D Unpolarized capacitor +$ENDCMP +# +$CMP D +D Diode K DEV DIODE $ENDCMP # @@ -94,6 +98,10 @@ D Dual Switch inverseur K switch $ENDCMP # +$CMP D_Small +D Diode +$ENDCMP +# $CMP EMI_FILTER D Filtre EMI K EMI @@ -118,6 +126,10 @@ D Common Cathode RGB LED K RGB LED $ENDCMP # +$CMP L_Small +D Inductor +$ENDCMP +# $CMP MOSFET_N F transistors/mos/*.* $ENDCMP @@ -157,7 +169,7 @@ K R PR Photo Photoresistor $ENDCMP # $CMP R -D Resistance +D Resistor K R DEV $ENDCMP # @@ -176,6 +188,10 @@ D 8 resistors Pack K R DEV $ENDCMP # +$CMP R_Small +D Resistor +$ENDCMP +# $CMP SCHDPAK D Diode schotty - cms K DIODE SCHOTTKY CMS diff --git a/library/device.lib b/library/device.lib index 649127b3..e8864674 100644 --- a/library/device.lib +++ b/library/device.lib @@ -344,23 +344,41 @@ X ~ 2 0 -200 170 U 40 40 1 1 P ENDDRAW ENDDEF # -# Csmall +# C_Small # -DEF Csmall C 0 10 N Y 1 F N -F0 "C" 25 50 30 H V L CNN -F1 "Csmall" 25 -50 30 H V L CNN +DEF C_Small C 0 10 N N 1 F N +F0 "C" 10 70 50 H V L CNN +F1 "C_Small" 10 -80 50 H V L CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN $FPLIST + CP* SM* - C? - C1-1 $ENDFPLIST DRAW -P 2 0 1 0 50 -10 -50 -10 N -P 2 0 1 0 50 10 -50 10 N -X ~ 1 0 100 90 D 40 40 1 1 P -X ~ 2 0 -100 90 U 40 40 1 1 P +P 2 0 1 10 -60 -20 60 -20 N +P 2 0 1 10 -60 20 60 20 N +X ~ 1 0 100 80 D 40 40 1 1 P +X ~ 2 0 -100 80 U 40 40 1 1 P +ENDDRAW +ENDDEF +# +# D +# +DEF D D 0 40 N N 1 F N +F0 "D" 0 100 50 H V C CNN +F1 "D" 0 -100 50 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +$FPLIST + D? + S* +$ENDFPLIST +DRAW +P 2 0 1 6 50 50 50 -50 N +P 3 0 1 0 -50 50 50 0 -50 -50 F +X A 1 -200 0 150 R 40 40 1 1 P +X K 2 200 0 150 L 40 40 1 1 P ENDDRAW ENDDEF # @@ -386,25 +404,6 @@ X ~ 3 150 250 100 D 40 40 1 1 P ENDDRAW ENDDEF # -# DIODE -# -DEF DIODE D 0 40 N N 1 F N -F0 "D" 0 100 50 H V C CNN -F1 "DIODE" 0 -100 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -$FPLIST - D? - S* -$ENDFPLIST -DRAW -P 2 0 1 6 50 50 50 -50 N -P 3 0 1 0 -50 50 50 0 -50 -50 F -X A 1 -200 0 150 R 40 40 1 1 P -X K 2 200 0 150 L 40 40 1 1 P -ENDDRAW -ENDDEF -# # DIODESCH # DEF DIODESCH D 0 40 N N 1 F N @@ -667,6 +666,25 @@ X C 6 500 -100 300 L 60 60 2 1 P ENDDRAW ENDDEF # +# D_Small +# +DEF D_Small D 0 10 N N 1 F N +F0 "D" -50 80 50 H V L CNN +F1 "D_Small" -150 -80 50 H V L CNN +F2 "" 0 0 60 V V C CNN +F3 "" 0 0 60 V V C CNN +$FPLIST + CP* + SM* +$ENDFPLIST +DRAW +P 2 0 1 0 30 -40 30 40 N +P 4 0 1 0 -30 -40 30 0 -30 40 -30 -40 F +X A 1 -100 0 70 R 40 40 1 1 P +X C 2 100 0 70 L 40 40 1 1 P +ENDDRAW +ENDDEF +# # EMI_FILTER # DEF EMI_FILTER FI 0 40 Y N 1 F N @@ -1060,6 +1078,27 @@ X PAD PAD 0 -500 200 U 60 60 1 1 P ENDDRAW ENDDEF # +# L_Small +# +DEF L_Small L 0 10 N N 1 F N +F0 "L" 30 40 50 H V L CNN +F1 "L_Small" 30 -40 50 H V L CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +$FPLIST + CP* + SM* +$ENDFPLIST +DRAW +A 0 -60 20 -899 899 0 1 0 N 0 -80 0 -40 +A 0 -20 20 -899 899 0 1 0 N 0 -40 0 0 +A 0 20 20 -899 899 0 1 0 N 0 0 0 40 +A 0 60 20 -899 899 0 1 0 N 0 40 0 80 +X ~ 1 0 100 20 D 40 40 1 1 P +X ~ 2 0 -100 20 U 40 40 1 1 P +ENDDRAW +ENDDEF +# # MOS_N # DEF MOS_N Q 0 0 N Y 1 F N @@ -1593,6 +1632,24 @@ X R1 16 200 350 100 L 40 40 1 1 P ENDDRAW ENDDEF # +# R_Small +# +DEF R_Small R 0 10 N N 1 F N +F0 "R" 30 40 50 H V L CNN +F1 "R_Small" 30 -40 50 H V L CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +$FPLIST + CP* + SM* +$ENDFPLIST +DRAW +S -20 50 20 -50 0 1 0 N +X ~ 1 0 100 50 D 40 40 1 1 P +X ~ 2 0 -100 50 U 40 40 1 1 P +ENDDRAW +ENDDEF +# # SCHDPAK # DEF SCHDPAK D 0 40 N N 1 F N From 46cc3f92bead53b50ea3268dac0b28cf7b98e0a7 Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Thu, 15 Jan 2015 11:10:51 +0100 Subject: [PATCH 04/18] Added Jumper_NO_Small and Jumper_NC_Small --- library/device.dcm | 10 ++++++++++ library/device.lib | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/library/device.dcm b/library/device.dcm index cb45957c..428166c5 100644 --- a/library/device.dcm +++ b/library/device.dcm @@ -117,6 +117,16 @@ D Filtre EMI K EMI $ENDCMP # +$CMP Jumper_NC_Small +D Jumper normally close +K Jumper, Link +$ENDCMP +# +$CMP Jumper_NO_Small +D Jumper normally open +K Jumper, Link +$ENDCMP +# $CMP LED K LED $ENDCMP diff --git a/library/device.lib b/library/device.lib index e8864674..d0997b43 100644 --- a/library/device.lib +++ b/library/device.lib @@ -121,8 +121,8 @@ P 2 0 0 0 0 -550 200 -350 N P 2 0 0 6 0 550 200 350 N P 2 0 0 8 250 -100 450 -300 N P 2 0 0 6 350 200 550 0 N -P 2 0 0 8 450 300 250 100 N P 2 0 0 0 450 300 250 100 N +P 2 0 0 8 450 300 250 100 N P 2 0 0 6 550 0 350 -200 N P 5 0 0 0 -450 300 -200 350 -250 100 -450 300 -450 300 F P 5 0 0 0 -250 -100 -200 -350 -450 -300 -250 -100 -250 -100 F @@ -946,6 +946,37 @@ X 3 3 250 0 95 L 40 40 0 1 P ENDDRAW ENDDEF # +# Jumper_NC_Small +# +DEF ~Jumper_NC_Small JP 0 30 N N 1 F N +F0 "JP" 0 80 50 H V C CNN +F1 "Jumper_NC_Small" 10 -60 50 H I C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +A 0 -10 57 450 1350 0 1 0 N 40 30 -40 30 +C -40 0 20 0 1 0 N +C 40 0 20 0 1 0 N +X 1 1 -100 0 40 R 60 60 0 1 P +X 2 2 100 0 40 L 60 60 0 1 P +ENDDRAW +ENDDEF +# +# Jumper_NO_Small +# +DEF ~Jumper_NO_Small JP 0 30 N N 1 F N +F0 "JP" 0 80 50 H V C CNN +F1 "Jumper_NO_Small" 10 -60 50 H I C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +C -40 0 20 0 1 0 N +C 40 0 20 0 1 0 N +X 1 1 -100 0 40 R 60 60 0 1 P +X 2 2 100 0 40 L 60 60 0 1 P +ENDDRAW +ENDDEF +# # LED # DEF LED D 0 40 Y N 1 F N From bb4e863cd71398f15c2e820ae8b582361b32c4f5 Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Thu, 15 Jan 2015 12:17:17 +0100 Subject: [PATCH 05/18] Add Crystal_Small in device.lib --- library/device.dcm | 4 ++++ library/device.lib | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/library/device.dcm b/library/device.dcm index 428166c5..ac4b91cf 100644 --- a/library/device.dcm +++ b/library/device.dcm @@ -49,6 +49,10 @@ $CMP C_Small D Unpolarized capacitor $ENDCMP # +$CMP Crystal_Small +K Quartz, Resonator, Ceramic +$ENDCMP +# $CMP D D Diode K DEV DIODE diff --git a/library/device.lib b/library/device.lib index d0997b43..cbcae304 100644 --- a/library/device.lib +++ b/library/device.lib @@ -363,6 +363,22 @@ X ~ 2 0 -100 80 U 40 40 1 1 P ENDDRAW ENDDEF # +# Crystal_Small +# +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 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +S -30 -60 30 60 0 1 0 N +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 +X 2 2 100 0 50 L 40 40 1 1 P +ENDDRAW +ENDDEF +# # D # DEF D D 0 40 N N 1 F N From 6c59cadc744ff084462337a962904c9949aa3f12 Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Thu, 15 Jan 2015 16:59:10 +0100 Subject: [PATCH 06/18] Added F_Small in device.lib --- library/device.dcm | 8 ++++++++ library/device.lib | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/library/device.dcm b/library/device.dcm index ac4b91cf..33b01682 100644 --- a/library/device.dcm +++ b/library/device.dcm @@ -121,6 +121,14 @@ D Filtre EMI K EMI $ENDCMP # +$CMP FP_Small +D Fuse polarised +$ENDCMP +# +$CMP F_Small +D Fuse +$ENDCMP +# $CMP Jumper_NC_Small D Jumper normally close K Jumper, Link diff --git a/library/device.lib b/library/device.lib index cbcae304..43777c90 100644 --- a/library/device.lib +++ b/library/device.lib @@ -121,8 +121,8 @@ P 2 0 0 0 0 -550 200 -350 N P 2 0 0 6 0 550 200 350 N P 2 0 0 8 250 -100 450 -300 N P 2 0 0 6 350 200 550 0 N -P 2 0 0 0 450 300 250 100 N P 2 0 0 8 450 300 250 100 N +P 2 0 0 0 450 300 250 100 N P 2 0 0 6 550 0 350 -200 N P 5 0 0 0 -450 300 -200 350 -250 100 -450 300 -450 300 F P 5 0 0 0 -250 -100 -200 -350 -450 -300 -250 -100 -250 -100 F @@ -802,6 +802,26 @@ X 2 2 350 0 150 L 40 40 1 1 P ENDDRAW ENDDEF # +# FP_Small +# +DEF FP_Small F 0 10 N N 1 F N +F0 "F" -40 60 50 H V L CNN +F1 "FP_Small" -120 -60 50 H V L CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +$FPLIST + CP* + SM* +$ENDFPLIST +DRAW +S -50 20 -30 -20 0 1 0 F +S -50 20 75 -20 0 1 0 N +P 2 0 1 0 -50 0 100 0 N +X ~ 1 -100 0 50 R 40 40 1 1 W +X ~ 2 125 0 50 L 40 40 1 1 w +ENDDRAW +ENDDEF +# # FUSE # DEF FUSE F 0 10 Y Y 1 F N @@ -817,6 +837,25 @@ X ~ 2 250 0 100 L 40 40 1 1 I ENDDRAW ENDDEF # +# F_Small +# +DEF F_Small F 0 10 N N 1 F N +F0 "F" -40 60 50 H V L CNN +F1 "F_Small" -120 -60 50 H V L CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +$FPLIST + CP* + SM* +$ENDFPLIST +DRAW +S -50 20 75 -20 0 1 0 N +P 2 0 1 0 -50 0 100 0 N +X ~ 1 -100 0 50 R 40 40 1 1 P +X ~ 2 125 0 50 L 40 40 1 1 P +ENDDRAW +ENDDEF +# # HCPLXX # DEF HCPLXX U 0 10 Y Y 1 F N From e43d836c8ce2c9a56c3590255b44791e76b5125e Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Thu, 15 Jan 2015 17:01:59 +0100 Subject: [PATCH 07/18] Added D_Schottky_Small in device.lib --- library/device.dcm | 4 ++++ library/device.lib | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/library/device.dcm b/library/device.dcm index 33b01682..bb988294 100644 --- a/library/device.dcm +++ b/library/device.dcm @@ -102,6 +102,10 @@ D Dual Switch inverseur K switch $ENDCMP # +$CMP D_Schottky_Small +D Diode Schottky +$ENDCMP +# $CMP D_Small D Diode $ENDCMP diff --git a/library/device.lib b/library/device.lib index 43777c90..f4ac2286 100644 --- a/library/device.lib +++ b/library/device.lib @@ -682,6 +682,27 @@ X C 6 500 -100 300 L 60 60 2 1 P ENDDRAW ENDDEF # +# D_Schottky_Small +# +DEF D_Schottky_Small D 0 10 N N 1 F N +F0 "D" -50 80 50 H V L CNN +F1 "D_Schottky_Small" -280 -80 50 H V L CNN +F2 "" 0 0 60 V V C CNN +F3 "" 0 0 60 V V C CNN +$FPLIST + CP* + SM* +$ENDFPLIST +DRAW +P 2 0 1 0 30 -40 30 40 N +P 3 0 1 0 30 -40 20 -40 20 -30 N +P 3 0 1 0 30 40 40 40 40 30 N +P 4 0 1 0 -30 -40 30 0 -30 40 -30 -40 F +X A 1 -100 0 70 R 40 40 1 1 P +X C 2 100 0 70 L 40 40 1 1 P +ENDDRAW +ENDDEF +# # D_Small # DEF D_Small D 0 10 N N 1 F N From c61020ebbabe0d89fe06dc770638ca70fdb45925 Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Thu, 15 Jan 2015 17:10:06 +0100 Subject: [PATCH 08/18] Fix size of F_Small to 200mils --- library/device.lib | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/library/device.lib b/library/device.lib index f4ac2286..a2219b97 100644 --- a/library/device.lib +++ b/library/device.lib @@ -836,10 +836,9 @@ $FPLIST $ENDFPLIST DRAW S -50 20 -30 -20 0 1 0 F -S -50 20 75 -20 0 1 0 N -P 2 0 1 0 -50 0 100 0 N +S -50 20 50 -20 0 1 0 N X ~ 1 -100 0 50 R 40 40 1 1 W -X ~ 2 125 0 50 L 40 40 1 1 w +X ~ 2 100 0 50 L 40 40 1 1 w ENDDRAW ENDDEF # @@ -870,10 +869,10 @@ $FPLIST SM* $ENDFPLIST DRAW -S -50 20 75 -20 0 1 0 N -P 2 0 1 0 -50 0 100 0 N +S -50 20 50 -20 0 1 0 N +P 2 0 1 0 -50 0 50 0 N X ~ 1 -100 0 50 R 40 40 1 1 P -X ~ 2 125 0 50 L 40 40 1 1 P +X ~ 2 100 0 50 L 40 40 1 1 P ENDDRAW ENDDEF # From 21d9ad6cfcfe85b713a7c0d745177c2d05a94343 Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Thu, 15 Jan 2015 17:11:19 +0100 Subject: [PATCH 09/18] Fix FP_Small --- library/device.lib | 1 + 1 file changed, 1 insertion(+) diff --git a/library/device.lib b/library/device.lib index a2219b97..96e5531f 100644 --- a/library/device.lib +++ b/library/device.lib @@ -837,6 +837,7 @@ $ENDFPLIST DRAW S -50 20 -30 -20 0 1 0 F S -50 20 50 -20 0 1 0 N +P 2 0 1 0 -50 0 50 0 N X ~ 1 -100 0 50 R 40 40 1 1 W X ~ 2 100 0 50 L 40 40 1 1 w ENDDRAW From 23fec6da6f113b57216bedfde8b0e0495aec3f3c Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Fri, 16 Jan 2015 14:22:59 +0100 Subject: [PATCH 10/18] Added Led_small and Led_RGB_CA --- library/device.dcm | 9 +++++++ library/device.lib | 63 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/library/device.dcm b/library/device.dcm index bb988294..09c226ab 100644 --- a/library/device.dcm +++ b/library/device.dcm @@ -156,6 +156,15 @@ $CMP L_Small D Inductor $ENDCMP # +$CMP Led_RGB_CA +D Common Anode RGB LED +K RGB LED +$ENDCMP +# +$CMP Led_Small +D Led +$ENDCMP +# $CMP MOSFET_N F transistors/mos/*.* $ENDCMP diff --git a/library/device.lib b/library/device.lib index 96e5531f..6aa53d4f 100644 --- a/library/device.lib +++ b/library/device.lib @@ -121,8 +121,8 @@ P 2 0 0 0 0 -550 200 -350 N P 2 0 0 6 0 550 200 350 N P 2 0 0 8 250 -100 450 -300 N P 2 0 0 6 350 200 550 0 N -P 2 0 0 8 450 300 250 100 N P 2 0 0 0 450 300 250 100 N +P 2 0 0 8 450 300 250 100 N P 2 0 0 6 550 0 350 -200 N P 5 0 0 0 -450 300 -200 350 -250 100 -450 300 -450 300 F P 5 0 0 0 -250 -100 -200 -350 -450 -300 -250 -100 -250 -100 F @@ -1206,6 +1206,67 @@ X ~ 2 0 -100 20 U 40 40 1 1 P ENDDRAW ENDDEF # +# Led_RGB_CA +# +DEF Led_RGB_CA D 0 50 Y N 1 F N +F0 "D" -75 350 50 H V C CNN +F1 "Led_RGB_CA" -25 -350 50 H V C CNN +F2 "" 45 -50 50 H V C CNN +F3 "" 45 -50 50 H V C CNN +DRAW +T 0 0 -120 25 0 0 0 B Normal 0 C C +T 0 0 80 25 0 0 0 G Normal 0 C C +T 0 0 280 25 0 0 0 R Normal 0 C C +S -100 300 100 -300 0 1 0 f +S -30 -50 -30 50 0 1 0 N +S -30 50 -30 50 0 1 0 N +S -30 150 -30 250 0 1 0 N +S -30 250 -30 250 0 1 0 N +P 2 0 1 0 -100 0 -30 0 N +P 2 0 1 0 70 -200 100 -200 N +P 2 0 1 0 70 -150 70 -250 N +P 2 0 1 0 70 0 100 0 N +P 2 0 1 0 70 200 100 200 N +P 3 0 1 0 70 50 70 -50 70 -50 N +P 3 0 1 0 70 250 70 150 70 150 N +P 4 0 1 0 -30 200 -70 200 -70 -200 -30 -200 N +P 4 0 1 0 60 80 80 80 60 70 60 70 N +P 4 0 1 0 60 280 80 280 60 270 60 270 N +P 4 0 1 0 73 -116 93 -116 73 -126 73 -126 N +P 5 0 1 0 -30 -150 -30 -250 70 -200 -30 -150 -30 -150 F +P 5 0 1 0 0 -150 50 -140 40 -130 80 -120 80 -120 N +P 6 0 1 0 -30 50 -30 -50 70 0 -30 50 -30 50 -30 50 F +P 6 0 1 0 -30 250 -30 150 70 200 -30 250 -30 250 -30 250 F +P 6 0 1 0 0 50 50 60 40 70 80 80 80 80 80 80 N +P 6 0 1 0 0 250 50 260 40 270 80 280 80 280 80 280 N +X ~ 1 -200 0 100 R 50 50 1 1 P +X R 2 200 200 100 L 50 50 1 1 P +X G 3 200 0 100 L 50 50 1 1 P +X B 4 200 -200 100 L 50 50 1 1 P +ENDDRAW +ENDDEF +# +# Led_Small +# +DEF Led_Small D 0 10 N N 1 F N +F0 "D" -50 100 50 H V L CNN +F1 "Led_Small" -150 -80 50 H V L CNN +F2 "" 0 0 60 V V C CNN +F3 "" 0 0 60 V V C CNN +$FPLIST + CP* + SM* +$ENDFPLIST +DRAW +P 2 0 1 0 30 -40 30 40 N +P 4 0 1 0 -30 -40 30 0 -30 40 -30 -40 F +P 5 0 1 0 -20 50 0 70 -10 70 0 70 0 60 N +P 5 0 1 0 0 30 20 50 10 50 20 50 20 40 N +X A 1 -100 0 70 R 40 40 1 1 P +X C 2 100 0 70 L 40 40 1 1 P +ENDDRAW +ENDDEF +# # MOS_N # DEF MOS_N Q 0 0 N Y 1 F N From e332a6257ef568f8cce5fe7d7462c4bda17457b9 Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Fri, 16 Jan 2015 14:46:53 +0100 Subject: [PATCH 11/18] Added NPN_Small --- library/device.lib | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/library/device.lib b/library/device.lib index 6aa53d4f..f403b76f 100644 --- a/library/device.lib +++ b/library/device.lib @@ -1330,6 +1330,25 @@ X C 3 100 200 100 D 40 40 1 1 P ENDDRAW ENDDEF # +# NPN_Small +# +DEF NPN_Small Q 0 0 N N 1 F N +F0 "Q" 70 60 60 H V C CNN +F1 "NPN_Small" 250 -20 60 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +P 2 0 1 0 -60 -60 -60 60 N +P 2 0 1 0 0 -60 -60 -30 N +P 2 0 1 0 0 -60 -20 -70 N +P 2 0 1 0 0 -60 -10 -40 N +P 2 0 1 0 0 60 -60 30 N +X E 1 0 -100 40 U 50 50 1 1 P +X B 2 -100 0 40 R 50 50 1 1 P +X C 3 0 100 40 D 50 50 1 1 P +ENDDRAW +ENDDEF +# # OPTO_NPN # DEF OPTO_NPN Q 0 0 Y Y 1 F N From 7b1d112f309a968cd3b0d3cd12b31c04803df5c1 Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Sat, 17 Jan 2015 11:33:17 +0100 Subject: [PATCH 12/18] Improved footprint filter for capacitor --- library/device.lib | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/library/device.lib b/library/device.lib index f403b76f..faf494f4 100644 --- a/library/device.lib +++ b/library/device.lib @@ -145,9 +145,11 @@ F1 "C" 50 -100 50 H V L CNN F2 "" 38 -150 30 H V C CNN F3 "" 0 0 60 H V C CNN $FPLIST - SM* C? - C1-1 + C_????_* + C_???? + SMD*_c + Capacitor* $ENDFPLIST DRAW P 2 0 1 20 -80 -30 80 -30 N @@ -214,9 +216,12 @@ F1 "CP" 50 -100 50 H V L CNN F2 "" 38 -150 30 H V C CNN F3 "" 0 0 60 H V C CNN $FPLIST - SM* - C? - C1-1 + CP* + Elko* + TantalC* + C*elec + c_elec* + SMD*_Pol $ENDFPLIST DRAW S -90 20 -90 40 0 1 0 N @@ -239,8 +244,12 @@ F1 "CP1" 50 -100 50 H V L CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN $FPLIST + SMD*_Pol + c_elec* + C*elec + TantalC* + Elko* CP* - SM* $ENDFPLIST DRAW T 0 -50 100 80 0 0 0 + Normal 0 C C @@ -260,7 +269,11 @@ F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN $FPLIST CP* - SM* + Elko* + TantalC* + C*elec + c_elec* + SMD*_Pol $ENDFPLIST DRAW A 0 -140 125 1186 614 0 1 10 N -60 -30 60 -30 @@ -281,7 +294,11 @@ F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN $FPLIST CP* - SM* + Elko* + TantalC* + C*elec + c_elec* + SMD*_Pol $ENDFPLIST DRAW S -60 -15 60 -30 0 1 0 F @@ -352,8 +369,11 @@ F1 "C_Small" 10 -80 50 H V L CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN $FPLIST - CP* - SM* + C? + C_????_* + C_???? + SMD*_c + Capacitor* $ENDFPLIST DRAW P 2 0 1 10 -60 -20 60 -20 N From 64942fb49ec19d1051c331bc20a2c098dc0315a7 Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Sun, 18 Jan 2015 18:46:06 +0100 Subject: [PATCH 13/18] Some rework in device.lib --- library/conn.dcm | 150 --------------- library/conn.lib | 21 +++ library/device.dcm | 43 ++--- library/device.lib | 451 ++++++++++++++++++++++----------------------- 4 files changed, 260 insertions(+), 405 deletions(-) diff --git a/library/conn.dcm b/library/conn.dcm index 8af0a361..1f280857 100644 --- a/library/conn.dcm +++ b/library/conn.dcm @@ -39,161 +39,11 @@ D Symbole general de connexion K CONN $ENDCMP # -$CMP CONN_1 -D 1 pin -K CONN -$ENDCMP -# -$CMP CONN_10 -D Symbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_10X2 -D symbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_11 -D Symbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_12 -D Symbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_12X2 -D ymbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_13 -D Symbole general de connexion -K CONN -$ENDCMP -# -$CMP CONN_14 -D Symbole general de connexion -K CONN -$ENDCMP -# $CMP CONN_15X4 D Connecteur Europe, 60 contacts, rangees A,B,C,D K CONN CONN $ENDCMP # -$CMP CONN_17 -D Symbole general de connexion -K CONN -$ENDCMP -# -$CMP CONN_19 -D Symbole general de connexion -K CONN -$ENDCMP -# -$CMP CONN_2 -D Symbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_20 -D Symbole general de connexion -K CONN -$ENDCMP -# -$CMP CONN_20X4 -D Connecteur Europe, 80 contacts, rangees A,B,C,D -K CONN CONN -$ENDCMP -# -$CMP CONN_25 -D Symbole general de connexion -K CONN -$ENDCMP -# -$CMP CONN_2X2 -D Symbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_3 -D Symbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_30 -D Symbole general de connexion -K CONN -$ENDCMP -# -$CMP CONN_3X2 -D Symbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_4 -D Symbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_4X2 -D Symbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_5 -D Symbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_5X2 -D Symbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_6 -D ymbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_6X2 -D Symbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_7 -D Symbole general pour connexions -K CONN -$ENDCMP -# -$CMP CONN_7X2 -D Symbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_8 -D Symbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_8X2 -D ymbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_9 -D Symbole general de connecteur -K CONN -$ENDCMP -# -$CMP CONN_9X2 -D ymbole general de connecteur -K CONN -$ENDCMP -# $CMP DB15 K CONN $ENDCMP diff --git a/library/conn.lib b/library/conn.lib index 7e0b3002..d15fb977 100644 --- a/library/conn.lib +++ b/library/conn.lib @@ -22,6 +22,26 @@ X ~ 3 300 0 200 L 50 50 1 1 P ENDDRAW ENDDEF # +# BNC +# +DEF BNC P 0 40 Y N 1 F N +F0 "P" 10 120 50 H V C CNN +F1 "BNC" 110 -60 50 V V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +$FPLIST + BNC_* + bnc + bnc-* +$ENDFPLIST +DRAW +C 0 0 20 0 1 8 N +C 0 0 70 0 1 12 N +X In 1 -150 0 130 R 40 40 1 1 P +X Ext 2 0 -200 130 U 40 40 1 1 P +ENDDRAW +ENDDEF +# # BUSAT # DEF BUSAT BUS 0 40 Y Y 1 F N @@ -8787,6 +8807,7 @@ DEF SD_Card CON 0 40 Y Y 1 F N F0 "CON" -650 550 50 H V C CNN F1 "SD_Card" 600 -550 50 H V C CNN F2 "10067847-001" 200 350 50 H V C CNN +F3 "" 0 0 60 H V C CNN $FPLIST SD_Card_Receptacle $ENDFPLIST diff --git a/library/device.dcm b/library/device.dcm index 09c226ab..12198670 100644 --- a/library/device.dcm +++ b/library/device.dcm @@ -1,20 +1,5 @@ EESchema-DOCLIB Version 2.0 # -$CMP 7SEGM -D Afficheur Leds 7 segments -K DEV -$ENDCMP -# -$CMP BI_LED -D LED DOUBLE type Bicolore -K LED -$ENDCMP -# -$CMP BRIDGE -D Pont de Diodes -K Pont Diode -$ENDCMP -# $CMP C D Unpolarized capacitor $ENDCMP @@ -55,12 +40,6 @@ $ENDCMP # $CMP D D Diode -K DEV DIODE -$ENDCMP -# -$CMP DIODESCH -D Diode schottky -K DEV DIODE $ENDCMP # $CMP DISPLAY @@ -102,6 +81,10 @@ D Dual Switch inverseur K switch $ENDCMP # +$CMP D_Schottky +D Diode schottky +$ENDCMP +# $CMP D_Schottky_Small D Diode Schottky $ENDCMP @@ -110,6 +93,11 @@ $CMP D_Small D Diode $ENDCMP # +$CMP Diode_Bridge +D Diode bridge +K Graetz +$ENDCMP +# $CMP EMI_FILTER D Filtre EMI K EMI @@ -133,6 +121,10 @@ $CMP F_Small D Fuse $ENDCMP # +$CMP Jumper +K Jumper, Breaker, Bridge +$ENDCMP +# $CMP Jumper_NC_Small D Jumper normally close K Jumper, Link @@ -165,6 +157,11 @@ $CMP Led_Small D Led $ENDCMP # +$CMP Led_x2 +D LED DOUBLE type Bicolore +K LED +$ENDCMP +# $CMP MOSFET_N F transistors/mos/*.* $ENDCMP @@ -227,6 +224,10 @@ $CMP R_Small D Resistor $ENDCMP # +$CMP R_Small_2 +D Resistor +$ENDCMP +# $CMP SCHDPAK D Diode schotty - cms K DIODE SCHOTTKY CMS diff --git a/library/device.lib b/library/device.lib index faf494f4..ead9f2bb 100644 --- a/library/device.lib +++ b/library/device.lib @@ -1,147 +1,28 @@ EESchema-LIBRARY Version 2.3 #encoding utf-8 # -# 7SEGM +# Battery # -DEF 7SEGM S 0 40 Y Y 1 F N -F0 "S" 0 650 50 H V C CNN -F1 "7SEGM" 0 -650 50 H V C CNN +DEF Battery BT 0 0 Y Y 1 F N +F0 "BT" 0 150 50 H V C CNN +F1 "Battery" 0 -150 50 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW -S -500 600 550 -600 0 1 0 N -P 2 0 1 0 0 0 450 0 N -P 5 0 1 0 -50 -550 50 550 500 550 400 -550 -50 -550 N -X Segm_E 1 -750 -100 250 R 50 50 1 1 P -X Segm_D 2 -750 0 250 R 50 50 1 1 P -X K 3 -750 400 250 R 50 50 1 1 P -X Segm_C 4 -750 100 250 R 50 50 1 1 P -X SegmDP 5 -750 -400 250 R 50 50 1 1 P -X Segm_B 6 -750 200 250 R 50 50 1 1 P -X Segm_A 7 -750 300 250 R 50 50 1 1 P -X K 8 -750 -500 250 R 50 50 1 1 I -X Segm_F 9 -750 -200 250 R 50 50 1 1 P -X Segm_G 10 -750 -300 250 R 50 50 1 1 P -ENDDRAW -ENDDEF -# -# BATTERY -# -DEF BATTERY BT 0 0 Y Y 1 F N -F0 "BT" 0 200 50 H V C CNN -F1 "BATTERY" 0 -190 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -C 0 0 150 0 1 6 N -P 2 0 1 0 -100 0 -150 0 N -P 2 0 1 6 -100 90 -100 -89 N -P 2 0 1 6 -31 50 -31 -50 N -P 2 0 1 6 39 90 39 -89 N -P 2 0 1 0 100 0 150 0 N -P 2 0 1 6 100 50 100 -50 N -X + 1 -300 0 150 R 50 50 1 1 P -X - 2 300 0 150 L 50 50 1 1 P -ENDDRAW -ENDDEF -# -# BI_LED -# -DEF BI_LED D 0 0 Y Y 1 F N -F0 "D" 300 100 50 H V C CNN -F1 "BI_LED" 350 -100 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -C 0 0 180 0 1 0 N -P 2 0 1 0 -150 -100 -100 -100 N -P 2 0 1 0 -150 100 -100 100 N -P 2 0 1 0 0 -50 0 -150 N -P 2 0 1 0 0 150 0 50 N -P 2 0 1 0 180 0 100 0 N -P 3 0 1 0 -100 -50 0 -100 -100 -150 F -P 3 0 1 0 -100 150 0 100 -100 50 F -P 3 0 1 0 15 -140 60 -180 55 -155 N -P 3 0 1 0 15 60 60 20 55 45 N -P 3 0 1 0 30 -125 75 -165 70 -140 N -P 3 0 1 0 30 75 75 35 70 60 N -P 4 0 1 0 0 100 100 100 100 -100 0 -100 N -X A1 1 -300 100 150 R 40 40 1 1 I -X K 2 350 0 170 L 40 40 1 1 I -X A2 3 -300 -100 150 R 40 40 1 1 I -ENDDRAW -ENDDEF -# -# BNC -# -DEF BNC P 0 40 Y N 1 F N -F0 "P" 10 120 50 H V C CNN -F1 "BNC" 110 -60 50 V V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -C 0 0 20 0 1 8 N -C 0 0 70 0 1 12 N -X In 1 -150 0 130 R 40 40 1 1 P -X Ext 2 0 -200 130 U 40 40 1 1 P -ENDDRAW -ENDDEF -# -# BREAKER -# -DEF BREAKER JP 0 10 Y Y 1 F N -F0 "JP" 0 -50 50 H V C CNN -F1 "BREAKER" 0 -150 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -A 4 -2 162 1612 197 0 1 0 N -148 50 157 53 -C -200 0 70 0 1 0 N -C 200 0 70 0 1 0 N -X ~ 1 -500 0 230 R 70 70 1 1 I -X ~ 2 500 0 230 L 70 70 1 1 I -ENDDRAW -ENDDEF -# -# BRIDGE -# -DEF BRIDGE D 0 50 Y Y 1 F N -F0 "D" 0 50 50 H V C CNN -F1 "BRIDGE" 0 -50 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 2 0 0 6 -550 0 -350 -200 N -P 2 0 0 6 -550 0 -350 200 N -P 2 0 0 8 -300 450 -100 250 N -P 2 0 0 8 -100 -250 -300 -450 N -P 2 0 0 0 -100 -250 -300 -450 N -P 2 0 0 6 0 -550 200 -350 N -P 2 0 0 0 0 -550 200 -350 N -P 2 0 0 6 0 550 200 350 N -P 2 0 0 8 250 -100 450 -300 N -P 2 0 0 6 350 200 550 0 N -P 2 0 0 0 450 300 250 100 N -P 2 0 0 8 450 300 250 100 N -P 2 0 0 6 550 0 350 -200 N -P 5 0 0 0 -450 300 -200 350 -250 100 -450 300 -450 300 F -P 5 0 0 0 -250 -100 -200 -350 -450 -300 -250 -100 -250 -100 F -P 5 0 0 0 100 -250 350 -200 300 -450 100 -250 100 -250 F -P 5 0 0 0 300 450 350 200 100 250 300 450 300 450 F -P 2 0 1 6 -200 -350 0 -550 N -P 2 0 1 6 -200 350 0 550 N -X - 1 -850 0 300 R 70 70 1 1 I -X ~ 2 0 -850 300 U 70 70 1 1 I -X + 3 850 0 300 L 70 70 1 1 I -X ~ 4 0 850 300 D 70 70 1 1 I +P 2 0 1 10 -100 90 -100 -89 N +P 2 0 1 14 -31 50 -31 -50 N +P 2 0 1 10 39 90 39 -89 N +P 2 0 1 14 100 50 100 -50 N +X + 1 -200 0 100 R 50 50 1 1 P +X - 2 200 0 100 L 50 50 1 1 P ENDDRAW ENDDEF # # C # DEF C C 0 10 N Y 1 F N -F0 "C" 50 100 50 H V L CNN -F1 "C" 50 -100 50 H V L CNN +F0 "C" 25 100 50 H V L CNN +F1 "C" 25 -100 50 H V L CNN F2 "" 38 -150 30 H V C CNN F3 "" 0 0 60 H V C CNN $FPLIST @@ -152,10 +33,10 @@ $FPLIST Capacitor* $ENDFPLIST DRAW -P 2 0 1 20 -80 -30 80 -30 N -P 2 0 1 20 -80 30 80 30 N -X ~ 1 0 200 170 D 40 40 1 1 P -X ~ 2 0 -200 170 U 40 40 1 1 P +P 2 0 1 20 -80 -40 80 -40 N +P 2 0 1 20 -80 40 80 40 N +X ~ 1 0 150 100 D 40 40 1 1 P +X ~ 2 0 -150 100 U 40 40 1 1 P ENDDRAW ENDDEF # @@ -195,24 +76,11 @@ X D3 5 600 -250 300 L 50 50 1 1 P ENDDRAW ENDDEF # -# CONNECTOR -# -DEF CONNECTOR P 0 40 Y N 1 F N -F0 "P" 350 100 50 H V C CNN -F1 "CONNECTOR" 350 -100 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -S 300 50 350 -50 0 1 0 N -X W 1 0 0 300 R 60 60 1 1 P I -ENDDRAW -ENDDEF -# # CP # DEF CP C 0 10 N Y 1 F N -F0 "C" 50 100 50 H V L CNN -F1 "CP" 50 -100 50 H V L CNN +F0 "C" 25 100 50 H V L CNN +F1 "CP" 25 -100 50 H V L CNN F2 "" 38 -150 30 H V C CNN F3 "" 0 0 60 H V C CNN $FPLIST @@ -231,16 +99,16 @@ S -50 70 -50 110 0 1 0 N S 90 -20 -90 -40 0 1 0 F S 90 40 -90 40 0 1 0 N S 90 40 90 20 0 1 0 N -X ~ 1 0 200 160 D 40 40 1 1 P -X ~ 2 0 -200 160 U 40 40 1 1 P +X ~ 1 0 150 110 D 40 40 1 1 P +X ~ 2 0 -150 110 U 40 40 1 1 P ENDDRAW ENDDEF # # CP1 # DEF CP1 C 0 10 N N 1 F N -F0 "C" 50 100 50 H V L CNN -F1 "CP1" 50 -100 50 H V L CNN +F0 "C" 25 100 50 H V L CNN +F1 "CP1" 25 -100 50 H V L CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN $FPLIST @@ -252,11 +120,12 @@ $FPLIST CP* $ENDFPLIST DRAW -T 0 -50 100 80 0 0 0 + Normal 0 C C -A 0 -200 180 563 1236 0 1 15 N 100 -50 -100 -50 -P 4 0 1 15 -100 50 100 50 50 50 50 50 N -X ~ 1 0 200 150 D 40 40 1 1 P -X ~ 2 0 -200 180 U 40 40 1 1 P +A 0 -150 128 1287 513 0 1 20 N -80 -50 80 -50 +P 2 0 1 20 -80 30 80 30 N +P 2 0 1 0 -70 90 -30 90 N +P 2 0 1 0 -50 70 -50 110 N +X ~ 1 0 150 110 D 40 40 1 1 P +X ~ 2 0 -150 130 U 40 40 1 1 P ENDDRAW ENDDEF # @@ -276,11 +145,11 @@ $FPLIST SMD*_Pol $ENDFPLIST DRAW -A 0 -140 125 1186 614 0 1 10 N -60 -30 60 -30 -P 2 0 1 10 -60 30 60 30 N +A 0 -140 125 1186 614 0 1 12 N -60 -30 60 -30 +P 2 0 1 12 -60 20 60 20 N P 2 0 1 0 -50 60 -30 60 N P 2 0 1 0 -40 50 -40 70 N -X ~ 1 0 100 70 D 40 40 1 1 P +X ~ 1 0 100 80 D 40 40 1 1 P X ~ 2 0 -100 80 U 40 40 1 1 P ENDDRAW ENDDEF @@ -301,28 +170,12 @@ $FPLIST SMD*_Pol $ENDFPLIST DRAW -S -60 -15 60 -30 0 1 0 F -S -60 30 60 15 0 1 0 N +S -60 -12 60 -27 0 1 0 F +S -60 27 60 12 0 1 0 N P 2 0 1 0 -50 60 -30 60 N P 2 0 1 0 -40 50 -40 70 N -X ~ 1 0 100 70 D 40 40 1 1 P -X ~ 2 0 -100 70 U 40 40 1 1 P -ENDDRAW -ENDDEF -# -# CRYSTAL -# -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 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 2 0 1 16 -100 100 -100 -100 N -P 2 0 1 16 100 100 100 -100 N -P 5 0 1 12 -50 50 50 50 50 -50 -50 -50 -50 50 f -X 1 1 -300 0 200 R 40 40 1 1 P -X 2 2 300 0 200 L 40 40 1 1 P +X ~ 1 0 100 73 D 40 40 1 1 P +X ~ 2 0 -100 73 U 40 40 1 1 P ENDDRAW ENDDEF # @@ -346,18 +199,19 @@ ENDDEF # # CTRIM # -DEF CTRIM C 0 10 Y Y 1 F N -F0 "C" 130 -80 50 H V C CNN -F1 "CTRIM" 150 -160 50 H V C CNN +DEF CTRIM C 0 10 N N 1 F N +F0 "C" 60 -80 50 H V C CNN +F1 "CTRIM" 120 -140 50 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW -P 2 0 1 12 -100 -30 100 -30 N -P 2 0 1 12 -100 30 100 30 N -P 2 0 1 12 -90 -90 75 75 N -P 3 0 1 0 50 100 100 100 100 50 F -X ~ 1 0 200 170 D 40 40 1 1 P -X ~ 2 0 -200 170 U 40 40 1 1 P +P 2 0 1 20 -80 -30 80 -30 N +P 2 0 1 20 -80 30 80 30 N +P 2 0 1 12 50 100 -50 -100 N +P 2 0 1 12 50 100 20 90 N +P 2 0 1 12 50 100 60 70 N +X ~ 1 0 150 120 D 40 40 1 1 P +X ~ 2 0 -150 120 U 40 40 1 1 P ENDDRAW ENDDEF # @@ -376,20 +230,42 @@ $FPLIST Capacitor* $ENDFPLIST DRAW -P 2 0 1 10 -60 -20 60 -20 N -P 2 0 1 10 -60 20 60 20 N +P 2 0 1 13 -60 -20 60 -20 N +P 2 0 1 12 -60 20 60 20 N X ~ 1 0 100 80 D 40 40 1 1 P X ~ 2 0 -100 80 U 40 40 1 1 P ENDDRAW ENDDEF # +# Crystal +# +DEF Crystal Y 0 40 N N 1 F N +F0 "Y" 0 150 50 H V C CNN +F1 "Crystal" 0 -150 50 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +$FPLIST + Crystal_* +$ENDFPLIST +DRAW +S -50 100 50 -100 0 1 12 N +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 +X 2 2 150 0 50 L 40 40 1 1 P +ENDDRAW +ENDDEF +# # Crystal_Small # -DEF Crystal_Small X 0 40 N N 1 F N -F0 "X" 0 100 50 H V C CNN +DEF Crystal_Small Y 0 40 N N 1 F N +F0 "Y" 0 100 50 H V C CNN F1 "Crystal_Small" 0 -100 50 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN +$FPLIST + Crystal_ +$ENDFPLIST DRAW S -30 -60 30 60 0 1 0 N P 2 0 1 0 -50 -30 -50 30 N @@ -407,14 +283,17 @@ F1 "D" 0 -100 50 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN $FPLIST - D? - S* + Diode_* + D-Pak_TO252AA + *SingleDiode + *_Diode_* + *SingleDiode* $ENDFPLIST DRAW P 2 0 1 6 50 50 50 -50 N P 3 0 1 0 -50 50 50 0 -50 -50 F -X A 1 -200 0 150 R 40 40 1 1 P -X K 2 200 0 150 L 40 40 1 1 P +X A 1 -150 0 100 R 40 40 1 1 P +X K 2 150 0 100 L 40 40 1 1 P ENDDRAW ENDDEF # @@ -440,25 +319,6 @@ X ~ 3 150 250 100 D 40 40 1 1 P ENDDRAW ENDDEF # -# DIODESCH -# -DEF DIODESCH D 0 40 N N 1 F N -F0 "D" 0 100 50 H V C CNN -F1 "DIODESCH" 0 -100 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -$FPLIST - D? - S* -$ENDFPLIST -DRAW -P 3 0 1 0 -50 50 50 0 -50 -50 F -P 6 0 1 8 75 25 75 50 50 50 50 -50 25 -50 25 -25 N -X A 1 -200 0 150 R 40 40 1 1 P -X K 2 200 0 150 L 40 40 1 1 P -ENDDRAW -ENDDEF -# # DISPLAY # DEF DISPLAY S 0 40 Y Y 1 F N @@ -702,6 +562,28 @@ X C 6 500 -100 300 L 60 60 2 1 P ENDDRAW ENDDEF # +# D_Schottky +# +DEF D_Schottky D 0 40 N N 1 F N +F0 "D" 0 100 50 H V C CNN +F1 "D_Schottky" 0 -100 50 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +$FPLIST + D-Pak_TO252AA + Diode_* + *SingleDiode + *SingleDiode* + *_Diode_* +$ENDFPLIST +DRAW +P 3 0 1 0 -50 50 50 0 -50 -50 F +P 6 0 1 8 75 25 75 50 50 50 50 -50 25 -50 25 -25 N +X A 1 -150 0 100 R 40 40 1 1 P +X K 2 150 0 100 L 40 40 1 1 P +ENDDRAW +ENDDEF +# # D_Schottky_Small # DEF D_Schottky_Small D 0 10 N N 1 F N @@ -710,8 +592,11 @@ F1 "D_Schottky_Small" -280 -80 50 H V L CNN F2 "" 0 0 60 V V C CNN F3 "" 0 0 60 V V C CNN $FPLIST - CP* - SM* + Diode_* + D-Pak_TO252AA + *SingleDiode + *SingleDiode* + *_Diode_* $ENDFPLIST DRAW P 2 0 1 0 30 -40 30 40 N @@ -731,8 +616,11 @@ F1 "D_Small" -150 -80 50 H V L CNN F2 "" 0 0 60 V V C CNN F3 "" 0 0 60 V V C CNN $FPLIST - CP* - SM* + Diode_* + D-Pak_TO252AA + *SingleDiode + *SingleDiode* + *_Diode_* $ENDFPLIST DRAW P 2 0 1 0 30 -40 30 40 N @@ -742,6 +630,40 @@ X C 2 100 0 70 L 40 40 1 1 P ENDDRAW ENDDEF # +# Diode_Bridge +# +DEF Diode_Bridge D 0 50 Y Y 1 F N +F0 "D" 0 50 50 H V C CNN +F1 "Diode_Bridge" 0 -50 50 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +P 2 0 0 6 -550 0 -350 -200 N +P 2 0 0 6 -550 0 -350 200 N +P 2 0 0 8 -300 450 -100 250 N +P 2 0 0 8 -100 -250 -300 -450 N +P 2 0 0 0 -100 -250 -300 -450 N +P 2 0 0 6 0 -550 200 -350 N +P 2 0 0 0 0 -550 200 -350 N +P 2 0 0 6 0 550 200 350 N +P 2 0 0 8 250 -100 450 -300 N +P 2 0 0 6 350 200 550 0 N +P 2 0 0 0 450 300 250 100 N +P 2 0 0 8 450 300 250 100 N +P 2 0 0 6 550 0 350 -200 N +P 5 0 0 0 -450 300 -200 350 -250 100 -450 300 -450 300 F +P 5 0 0 0 -250 -100 -200 -350 -450 -300 -250 -100 -250 -100 F +P 5 0 0 0 100 -250 350 -200 300 -450 100 -250 100 -250 F +P 5 0 0 0 300 450 350 200 100 250 300 450 300 450 F +P 2 0 1 6 -200 -350 0 -550 N +P 2 0 1 6 -200 350 0 550 N +X - 1 -700 0 150 R 50 50 1 1 I +X ~ 2 0 -700 150 U 50 50 1 1 I +X + 3 700 0 150 L 50 50 1 1 I +X ~ 4 0 700 150 D 50 50 1 1 I +ENDDRAW +ENDDEF +# # EMI_FILTER # DEF EMI_FILTER FI 0 40 Y N 1 F N @@ -1042,6 +964,25 @@ X 3 3 250 0 95 L 40 40 0 1 P ENDDRAW ENDDEF # +# Jumper +# +DEF Jumper JP 0 10 N N 1 F N +F0 "JP" 0 -75 50 H V C CNN +F1 "Jumper" 0 -150 50 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +$FPLIST + Pin_Header_*_1x02 +$ENDFPLIST +DRAW +A 0 0 79 184 1616 0 1 10 N 75 25 -75 25 +C -75 0 25 0 1 10 N +C 75 0 25 0 1 10 N +X ~ 1 -150 0 50 R 70 70 1 1 I +X ~ 2 150 0 50 L 70 70 1 1 I +ENDDRAW +ENDDEF +# # Jumper_NC_Small # DEF ~Jumper_NC_Small JP 0 30 N N 1 F N @@ -1287,6 +1228,33 @@ X C 2 100 0 70 L 40 40 1 1 P ENDDRAW ENDDEF # +# Led_x2 +# +DEF Led_x2 D 0 0 Y Y 1 F N +F0 "D" 300 100 50 H V C CNN +F1 "Led_x2" 350 -100 50 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +C 0 0 180 0 1 0 N +P 2 0 1 0 -150 -100 -100 -100 N +P 2 0 1 0 -150 100 -100 100 N +P 2 0 1 0 0 -50 0 -150 N +P 2 0 1 0 0 150 0 50 N +P 2 0 1 0 180 0 100 0 N +P 3 0 1 0 -100 -50 0 -100 -100 -150 F +P 3 0 1 0 -100 150 0 100 -100 50 F +P 3 0 1 0 15 -140 60 -180 55 -155 N +P 3 0 1 0 15 60 60 20 55 45 N +P 3 0 1 0 30 -125 75 -165 70 -140 N +P 3 0 1 0 30 75 75 35 70 60 N +P 4 0 1 0 0 100 100 100 100 -100 0 -100 N +X A1 1 -300 100 150 R 40 40 1 1 I +X K 2 350 0 170 L 40 40 1 1 I +X A2 3 -300 -100 150 R 40 40 1 1 I +ENDDRAW +ENDDEF +# # MOS_N # DEF MOS_N Q 0 0 N Y 1 F N @@ -1629,20 +1597,17 @@ ENDDEF # DEF R R 0 0 N Y 1 F N F0 "R" 80 0 50 V V C CNN -F1 "R" 7 1 50 V V C CNN +F1 "R" 0 0 50 V V C CNN F2 "" -70 0 30 V V C CNN F3 "" 0 0 30 H V C CNN $FPLIST - R? - SM0603 - SM0805 - R?-* - SM1206 + R_* + Resistor_* $ENDFPLIST DRAW -S -40 150 40 -150 0 1 12 N -X ~ 1 0 250 100 D 60 60 1 1 P -X ~ 2 0 -250 100 U 60 60 1 1 P +S -40 -100 40 100 0 1 10 N +X ~ 1 0 150 50 D 60 60 1 1 P +X ~ 2 0 -150 50 U 60 60 1 1 P ENDDRAW ENDDEF # @@ -1847,16 +1812,34 @@ F1 "R_Small" 30 -40 50 H V L CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN $FPLIST - CP* - SM* + Resistor_* + R_* $ENDFPLIST DRAW -S -20 50 20 -50 0 1 0 N +S -20 50 20 -50 0 1 8 N X ~ 1 0 100 50 D 40 40 1 1 P X ~ 2 0 -100 50 U 40 40 1 1 P ENDDRAW ENDDEF # +# R_Small_2 +# +DEF R_Small_2 R 0 10 N N 1 F N +F0 "R" 30 20 50 H V L CNN +F1 "R_Small_2" 30 -40 50 H V L CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +$FPLIST + Resistor_* + R_* +$ENDFPLIST +DRAW +S -30 70 30 -70 0 1 8 N +X ~ 1 0 100 30 D 40 40 1 1 P +X ~ 2 0 -100 30 U 40 40 1 1 P +ENDDRAW +ENDDEF +# # SCHDPAK # DEF SCHDPAK D 0 40 N N 1 F N From 97df88da5f2ef8889241cdd66bf6b2505de97be7 Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Mon, 19 Jan 2015 00:05:12 +0100 Subject: [PATCH 14/18] Rework of device.lib --- library/device.dcm | 100 +++++----- library/device.lib | 479 +++++++++++++++++---------------------------- 2 files changed, 228 insertions(+), 351 deletions(-) diff --git a/library/device.dcm b/library/device.dcm index 12198670..f154f0e6 100644 --- a/library/device.dcm +++ b/library/device.dcm @@ -4,16 +4,6 @@ $CMP C D Unpolarized capacitor $ENDCMP # -$CMP CERAMIC_FILTER -D Ceramic filter -K FILTER -$ENDCMP -# -$CMP CODING_SWITCH -D CODING SWITCH 4 Bits -K SWITCH -$ENDCMP -# $CMP CP D Polarised capacitor $ENDCMP @@ -30,57 +20,39 @@ $CMP CP_Small D Polarised capacitor $ENDCMP # +$CMP CTRIM +D Variable capacitor +K trimmer +$ENDCMP +# $CMP C_Small D Unpolarized capacitor $ENDCMP # +$CMP Coded_Switch +D 4 bits rotary switch +K Rotary, Hex +$ENDCMP +# +$CMP Crystal +D Two pin crystal +K Quartz, Ceramic, Filter, Resonator +$ENDCMP +# $CMP Crystal_Small -K Quartz, Resonator, Ceramic +D Two pin crystal +K Quartz, Resonator, Ceramic, Filter $ENDCMP # $CMP D D Diode $ENDCMP # -$CMP DISPLAY -D Afficheur LCD nLignes -K DEV -$ENDCMP -# -$CMP DISPLAY_3_LIGNE -D DISPLAY EA7123-12C -$ENDCMP -# -$CMP DISPLAY_BL -D Afficheur LCD nLignes -K DEV -$ENDCMP -# -$CMP DOUBLE_SCHOTTKY -D Double diode Shottky (Serie) -K DEV DIODE -$ENDCMP -# -$CMP DOUBLE_SCH_KCOM -D Double diode Shottky Cathodes communes -K DEV DIODE -$ENDCMP -# -$CMP DPST -D Interrupteur double -K switch -$ENDCMP -# $CMP DUAL_POT D Potentionmetre K R $ENDCMP # -$CMP DUAL_SWITCH_INV -D Dual Switch inverseur -K switch -$ENDCMP -# $CMP D_Schottky D Diode schottky $ENDCMP @@ -89,10 +61,24 @@ $CMP D_Schottky_Small D Diode Schottky $ENDCMP # +$CMP D_Schottky_x2_KCom +D Two Schottky diode with common cathode +$ENDCMP +# +$CMP D_Schottky_x2_Serial +D Double diode Shottky (Serie) +K DEV DIODE +$ENDCMP +# $CMP D_Small D Diode $ENDCMP # +$CMP Darl_NPN +D Darlington NPN transistor +K Q +$ENDCMP +# $CMP Diode_Bridge D Diode bridge K Graetz @@ -108,6 +94,11 @@ D Filtre EMI K EMI $ENDCMP # +$CMP FET_N +D Junction Field Effect Transistor, N-channel +K JFET +$ENDCMP +# $CMP FILTER D Filtre EMI K EMI @@ -121,10 +112,6 @@ $CMP F_Small D Fuse $ENDCMP # -$CMP Jumper -K Jumper, Breaker, Bridge -$ENDCMP -# $CMP Jumper_NC_Small D Jumper normally close K Jumper, Link @@ -179,14 +166,20 @@ F transistors/mos/*.* $ENDCMP # $CMP NPN +D Bipolar junction transistor NPN F transistors/bipolar/*.* $ENDCMP # +$CMP NPN_Small +D Bipolar junction transistor NPN +$ENDCMP +# $CMP PHOTORESISTOR D Photo resistor $ENDCMP # $CMP PNP +D Bipolar junction transistor PNP F transistors/bipolar/*.* $ENDCMP # @@ -257,6 +250,15 @@ D Push Button K Switch $ENDCMP # +$CMP Switch_DPST +D Double Pole Single Throw (DPST) Switch +K switch +$ENDCMP +# +$CMP Switch_SPDT_x2 +D Double Single Pole Double Throw (SPDT) switch +$ENDCMP +# $CMP THERMISTOR D Resistance K R DEV diff --git a/library/device.lib b/library/device.lib index ead9f2bb..9eea3dfc 100644 --- a/library/device.lib +++ b/library/device.lib @@ -3,18 +3,20 @@ EESchema-LIBRARY Version 2.3 # # Battery # -DEF Battery BT 0 0 Y Y 1 F N -F0 "BT" 0 150 50 H V C CNN -F1 "Battery" 0 -150 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +DEF Battery BT 0 0 N Y 1 F N +F0 "BT" 100 50 50 H V L CNN +F1 "Battery" 100 -50 50 H V L CNN +F2 "" 0 40 60 V V C CNN +F3 "" 0 40 60 V V C CNN DRAW -P 2 0 1 10 -100 90 -100 -89 N -P 2 0 1 14 -31 50 -31 -50 N -P 2 0 1 10 39 90 39 -89 N -P 2 0 1 14 100 50 100 -50 N -X + 1 -200 0 100 R 50 50 1 1 P -X - 2 200 0 100 L 50 50 1 1 P +S -90 -7 90 -17 0 1 0 F +S -90 50 90 40 0 1 0 F +S -62 -30 58 -50 0 1 0 F +S -62 27 58 7 0 1 0 F +P 2 0 1 10 20 95 60 95 N +P 2 0 1 10 40 115 40 75 N +X ~ 1 0 150 100 D 50 50 1 1 P +X ~ 2 0 -150 100 U 50 50 1 1 P ENDDRAW ENDDEF # @@ -33,46 +35,10 @@ $FPLIST Capacitor* $ENDFPLIST DRAW -P 2 0 1 20 -80 -40 80 -40 N -P 2 0 1 20 -80 40 80 40 N -X ~ 1 0 150 100 D 40 40 1 1 P -X ~ 2 0 -150 100 U 40 40 1 1 P -ENDDRAW -ENDDEF -# -# CERAMIC_FILTER -# -DEF CERAMIC_FILTER F 0 40 Y N 1 F N -F0 "F" 50 150 50 H V C CNN -F1 "CERAMIC_FILTER" 50 -100 50 H V L CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -S -100 100 100 -50 0 1 8 N -P 6 0 1 0 -150 100 -150 -50 -125 -50 -125 100 -150 100 -150 100 F -P 6 0 1 0 150 100 150 -50 125 -50 125 100 150 100 150 100 F -X P1 1 -400 50 250 R 60 60 1 1 P I -X PM 2 0 -200 150 U 20 20 1 1 P I -X P3 3 400 50 250 L 60 60 1 1 P I -ENDDRAW -ENDDEF -# -# CODING_SWITCH -# -DEF CODING_SWITCH SW 0 40 Y Y 1 F N -F0 "SW" 100 350 50 H V C CNN -F1 "CODING_SWITCH" 0 -349 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -C 0 0 150 0 1 0 N -S 300 300 -300 -300 0 1 0 f -P 11 0 1 0 -10 -100 -10 80 -30 60 -50 60 0 110 50 60 30 60 10 80 10 -100 -10 -100 -10 -100 N -X CM 1 600 250 300 L 50 50 1 1 P -X D0 2 600 50 300 L 50 50 1 1 P -X D1 3 600 -50 300 L 50 50 1 1 P -X D2 4 600 -150 300 L 50 50 1 1 P -X D3 5 600 -250 300 L 50 50 1 1 P +P 2 0 1 20 -80 -30 80 -30 N +P 2 0 1 20 -80 30 80 30 N +X ~ 1 0 150 110 D 40 40 1 1 P +X ~ 2 0 -150 110 U 40 40 1 1 P ENDDRAW ENDDEF # @@ -232,11 +198,30 @@ $ENDFPLIST DRAW P 2 0 1 13 -60 -20 60 -20 N P 2 0 1 12 -60 20 60 20 N -X ~ 1 0 100 80 D 40 40 1 1 P +X ~ 1 0 100 75 D 40 40 1 1 P X ~ 2 0 -100 80 U 40 40 1 1 P ENDDRAW ENDDEF # +# Coded_Switch +# +DEF Coded_Switch SW 0 40 Y Y 1 F N +F0 "SW" 100 350 50 H V C CNN +F1 "Coded_Switch" 0 -349 50 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +C 0 0 150 0 1 0 N +S 300 300 -300 -300 0 1 0 f +P 11 0 1 0 -10 -100 -10 80 -30 60 -50 60 0 110 50 60 30 60 10 80 10 -100 -10 -100 -10 -100 N +X CM 1 600 250 300 L 50 50 1 1 P +X D0 2 600 50 300 L 50 50 1 1 P +X D1 3 600 -50 300 L 50 50 1 1 P +X D2 4 600 -150 300 L 50 50 1 1 P +X D3 5 600 -250 300 L 50 50 1 1 P +ENDDRAW +ENDDEF +# # Crystal # DEF Crystal Y 0 40 N N 1 F N @@ -297,216 +282,6 @@ X K 2 150 0 100 L 40 40 1 1 P ENDDRAW ENDDEF # -# DARL_N -# -DEF DARL_N Q 0 10 Y Y 1 F N -F0 "Q" 0 250 50 H V C CNN -F1 "DARL_N" -200 -100 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 2 0 0 0 -150 -50 -150 150 N -P 2 0 0 0 50 50 50 -150 N -P 2 0 1 0 50 -50 150 -150 N -P 3 0 1 0 -150 50 -50 -50 50 -50 N -P 3 0 1 0 -150 50 -50 150 150 150 N -P 3 0 1 0 -50 -50 -65 30 -130 -40 F -P 3 0 1 0 50 -50 150 50 150 150 N -P 3 0 1 0 150 -150 135 -70 70 -135 F -X ~ 1 250 -150 100 L 40 40 1 1 P -X ~ 2 -250 50 100 R 40 40 1 1 I -X ~ 3 150 250 100 D 40 40 1 1 P -ENDDRAW -ENDDEF -# -# DISPLAY -# -DEF DISPLAY S 0 40 Y Y 1 F N -F0 "S" -1050 750 50 H V C CNN -F1 "DISPLAY" 250 -750 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -S -1550 700 1200 -700 0 1 0 N -P 2 0 1 0 -1050 0 -600 0 N -P 2 0 1 0 -500 0 -50 0 N -P 2 0 1 0 50 0 500 0 N -P 2 0 1 0 600 0 1050 0 N -P 5 0 1 0 -1100 -550 -1000 550 -550 550 -650 -550 -1100 -550 N -P 5 0 1 0 -550 -550 -450 550 0 550 -100 -550 -550 -550 N -P 5 0 1 0 0 -550 100 550 550 550 450 -550 0 -550 N -P 5 0 1 0 650 550 550 -550 1000 -550 1100 550 650 550 N -X GND 1 -1800 650 250 R 50 50 1 1 W -X VCC 2 -1800 550 250 R 50 50 1 1 W -X VLCD 3 -1800 450 250 R 50 50 1 1 I -X RS 4 -1800 350 250 R 50 50 1 1 I -X R/W 5 -1800 250 250 R 50 50 1 1 I -X CS 6 -1800 150 250 R 50 50 1 1 I -X D0 7 -1800 50 250 R 50 50 1 1 T -X D1 8 -1800 -50 250 R 50 50 1 1 T -X D2 9 -1800 -150 250 R 50 50 1 1 T -X D3 10 -1800 -250 250 R 50 50 1 1 T -X D4 11 -1800 -350 250 R 50 50 1 1 T -X D5 12 -1800 -450 250 R 50 50 1 1 T -X D6 13 -1800 -550 250 R 50 50 1 1 T -X D7 14 -1800 -650 250 R 50 50 1 1 T -ENDDRAW -ENDDEF -# -# DISPLAY_3_LIGNE -# -DEF DISPLAY_3_LIGNE S 0 40 Y Y 1 F N -F0 "S" -1050 750 50 H V C CNN -F1 "DISPLAY_3_LIGNE" 250 -750 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -T 0 50 450 250 0 0 0 LINE_1 Normal 0 C C -T 0 50 0 250 0 0 0 LINE_2 Normal 0 C C -T 0 50 -450 250 0 0 0 LINE_3 Normal 0 C C -S -1250 650 1150 -650 0 0 0 N -S -1550 700 1200 -700 0 1 0 N -X GND 1 -1800 650 250 R 50 50 1 1 W -X VCC 2 -1800 550 250 R 50 50 1 1 W -X VLCD 3 -1800 450 250 R 50 50 1 1 I -X VO 4 -1800 350 250 R 50 50 1 1 I -X SDA 5 -1800 250 250 R 50 50 1 1 I -X SCL 6 -1800 150 250 R 50 50 1 1 I -ENDDRAW -ENDDEF -# -# DISPLAY_BL -# -DEF DISPLAY_BL S 0 40 Y Y 1 F N -F0 "S" -1050 750 50 H V C CNN -F1 "DISPLAY_BL" 250 -750 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -S -1550 700 1200 -700 0 1 0 N -P 2 0 1 0 -1050 0 -600 0 N -P 2 0 1 0 -500 0 -50 0 N -P 2 0 1 0 50 0 500 0 N -P 2 0 1 0 600 0 1050 0 N -P 3 0 1 0 1080 -100 1130 -150 1180 -100 F -P 3 0 1 0 1130 -160 1130 -300 1200 -300 N -P 3 0 1 0 1130 -100 1130 100 1200 100 N -P 4 0 1 0 1080 -150 1180 -150 1180 -160 1080 -160 F -P 5 0 1 0 -1100 -550 -1000 550 -550 550 -650 -550 -1100 -550 N -P 5 0 1 0 -550 -550 -450 550 0 550 -100 -550 -550 -550 N -P 5 0 1 0 0 -550 100 550 550 550 450 -550 0 -550 N -P 5 0 1 0 650 550 550 -550 1000 -550 1100 550 650 550 N -X GND 1 -1800 650 250 R 50 50 1 1 W -X VCC 2 -1800 550 250 R 50 50 1 1 W -X VLCD 3 -1800 450 250 R 50 50 1 1 I -X RS 4 -1800 350 250 R 50 50 1 1 I -X R/W 5 -1800 250 250 R 50 50 1 1 I -X CS 6 -1800 150 250 R 50 50 1 1 I -X D0 7 -1800 50 250 R 50 50 1 1 T -X D1 8 -1800 -50 250 R 50 50 1 1 T -X D2 9 -1800 -150 250 R 50 50 1 1 T -X ~ A 1500 100 300 L 60 60 1 1 I -X ~ K 1500 -300 300 L 60 60 1 1 I -X D3 10 -1800 -250 250 R 50 50 1 1 T -X D4 11 -1800 -350 250 R 50 50 1 1 T -X D5 12 -1800 -450 250 R 50 50 1 1 T -X D6 13 -1800 -550 250 R 50 50 1 1 T -X D7 14 -1800 -650 250 R 50 50 1 1 T -ENDDRAW -ENDDEF -# -# DOUBLE_LED -# -DEF DOUBLE_LED D 0 40 Y N 1 F N -F0 "D" 100 170 50 H V L CNN -F1 "DOUBLE_LED" 0 -200 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -S -50 50 -50 150 0 1 0 N -S -50 150 -50 150 0 1 0 N -P 2 0 1 0 50 -50 50 -150 N -P 3 0 1 0 50 150 50 50 50 50 N -P 4 0 1 0 40 -20 60 -20 40 -30 40 -30 N -P 4 0 1 0 40 180 60 180 40 170 40 170 N -P 5 0 1 0 -50 -50 -50 -150 50 -100 -50 -50 -50 -50 F -P 5 0 1 0 -20 -50 30 -40 20 -30 60 -20 60 -20 N -P 5 0 1 0 50 100 100 100 100 -100 50 -100 50 -100 N -P 6 0 1 0 -50 150 -50 50 50 100 -50 150 -50 150 -50 150 F -P 6 0 1 0 -20 150 30 160 20 170 60 180 60 180 60 180 N -X K K 200 0 100 L 40 40 1 1 P -X A1 A1 -200 -100 150 R 40 40 1 1 P -X A2 A2 -200 100 150 R 40 40 1 1 P -ENDDRAW -ENDDEF -# -# DOUBLE_SCHOTTKY -# -DEF DOUBLE_SCHOTTKY D 0 30 Y N 1 F N -F0 "D" 100 -100 50 H V C CNN -F1 "DOUBLE_SCHOTTKY" 0 100 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 2 0 1 0 0 0 0 -100 N -P 2 0 1 0 250 0 300 0 N -P 3 0 1 10 -50 -50 -50 50 -50 50 N -P 3 0 1 10 -50 0 50 0 50 0 N -P 3 0 1 10 150 50 150 -50 150 -50 N -P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N -P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N -P 4 0 1 10 150 50 130 50 130 40 130 40 N -P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N -P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N -P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N -X Anode 1 -400 0 250 R 40 40 0 1 P -X AK 2 0 -200 100 U 40 40 0 1 P -X cathode 3 400 0 250 L 40 40 0 1 P -ENDDRAW -ENDDEF -# -# DOUBLE_SCH_KCOM -# -DEF DOUBLE_SCH_KCOM D 0 30 Y N 1 F N -F0 "D" 150 -125 50 H V C CNN -F1 "DOUBLE_SCH_KCOM" 0 150 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 2 0 1 0 0 0 0 -100 N -P 3 0 1 10 -50 0 50 0 50 0 N -P 5 0 1 10 -50 0 -150 50 -150 -50 -50 0 -50 0 N -P 5 0 1 10 60 0 150 -50 150 50 50 0 50 0 N -P 7 0 1 10 25 25 25 50 50 50 50 -50 75 -50 75 -25 75 -25 N -P 8 0 1 10 -25 25 -25 50 -50 50 -50 -50 -75 -50 -75 -25 -75 -25 -75 -25 N -X Anode 1 -400 0 250 R 40 40 0 1 P -X AK 2 0 -200 100 U 40 40 0 1 P -X cathode 3 400 0 250 L 40 40 0 1 P -ENDDRAW -ENDDEF -# -# DPST -# -DEF DPST SW 0 0 N Y 1 F N -F0 "SW" 300 50 50 H V C CNN -F1 "DPST" 300 -50 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -C -150 -200 50 0 0 0 N -C -150 200 50 0 0 0 N -C 150 -200 50 0 0 0 N -C 150 200 50 0 0 0 N -P 2 0 0 0 -100 -200 100 -100 N -P 2 0 0 0 -100 200 100 300 N -P 2 0 0 0 0 250 0 -150 N -X 1 1 -500 -200 300 R 70 70 1 1 I -X 2 2 500 -200 300 L 70 70 1 1 I -X 3 3 -500 200 300 R 70 70 1 1 I -X 4 4 500 200 300 L 70 70 1 1 I -ENDDRAW -ENDDEF -# # DUAL_POT # DEF DUAL_POT RV 0 40 Y N 1 F N @@ -541,27 +316,6 @@ X ~ 6 -150 -300 100 R 40 40 1 1 P ENDDRAW ENDDEF # -# DUAL_SWITCH_INV -# -DEF DUAL_SWITCH_INV SW 0 0 Y Y 2 F N -F0 "SW" -200 150 50 H V C CNN -F1 "DUAL_SWITCH_INV" -250 -150 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -C -150 0 50 0 0 0 N -C 150 -100 50 0 0 0 N -C 150 100 50 0 1 0 N -P 2 0 1 0 -100 0 150 50 N -X A 1 500 100 300 L 60 60 1 1 P -X B 2 -500 0 300 R 60 60 1 1 P -X C 3 500 -100 300 L 60 60 1 1 P -X A 4 500 100 300 L 60 60 2 1 P -X B 5 -500 0 300 R 60 60 2 1 P -X C 6 500 -100 300 L 60 60 2 1 P -ENDDRAW -ENDDEF -# # D_Schottky # DEF D_Schottky D 0 40 N N 1 F N @@ -608,6 +362,51 @@ X C 2 100 0 70 L 40 40 1 1 P ENDDRAW ENDDEF # +# D_Schottky_x2_KCom +# +DEF D_Schottky_x2_KCom D 0 30 Y N 1 F N +F0 "D" 150 -125 50 H V C CNN +F1 "D_Schottky_x2_KCom" 0 150 50 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +P 2 0 1 0 0 0 0 -100 N +P 3 0 1 10 -50 0 50 0 50 0 N +P 5 0 1 10 -50 0 -150 50 -150 -50 -50 0 -50 0 N +P 5 0 1 10 60 0 150 -50 150 50 50 0 50 0 N +P 7 0 1 10 25 25 25 50 50 50 50 -50 75 -50 75 -25 75 -25 N +P 8 0 1 10 -25 25 -25 50 -50 50 -50 -50 -75 -50 -75 -25 -75 -25 -75 -25 N +X Anode 1 -400 0 250 R 40 40 0 1 P +X AK 2 0 -200 100 U 40 40 0 1 P +X cathode 3 400 0 250 L 40 40 0 1 P +ENDDRAW +ENDDEF +# +# D_Schottky_x2_Serial +# +DEF D_Schottky_x2_Serial D 0 30 Y N 1 F N +F0 "D" 100 -100 50 H V C CNN +F1 "D_Schottky_x2_Serial" 0 100 50 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +P 2 0 1 0 0 0 0 -100 N +P 2 0 1 0 250 0 300 0 N +P 3 0 1 10 -50 -50 -50 50 -50 50 N +P 3 0 1 10 -50 0 50 0 50 0 N +P 3 0 1 10 150 50 150 -50 150 -50 N +P 4 0 1 10 -50 -50 -30 -50 -30 -40 -30 -40 N +P 4 0 1 10 150 -50 170 -50 170 -40 170 -40 N +P 4 0 1 10 150 50 130 50 130 40 130 40 N +P 5 0 1 10 -70 40 -70 50 -50 50 -50 50 -50 50 N +P 6 0 1 10 -150 50 -50 0 -150 -50 -150 50 -150 50 -150 50 N +P 6 0 1 10 50 50 150 0 50 -50 50 50 50 50 50 50 N +X Anode 1 -400 0 250 R 40 40 0 1 P +X AK 2 0 -200 100 U 40 40 0 1 P +X cathode 3 400 0 250 L 40 40 0 1 P +ENDDRAW +ENDDEF +# # D_Small # DEF D_Small D 0 10 N N 1 F N @@ -630,6 +429,43 @@ X C 2 100 0 70 L 40 40 1 1 P ENDDRAW ENDDEF # +# Darl_NPN +# +DEF Darl_NPN Q 0 10 Y Y 1 F N +F0 "Q" 0 200 50 H V C CNN +F1 "Darl_NPN" -200 -150 50 H V C CNN +F2 "" 0 -50 60 H V C CNN +F3 "" 0 -50 60 H V C CNN +$FPLIST + OldSowjetaera_Transistor* + Q_* + Transistor_* + SO-8_PowerPAK_Vishay_Single + VLM0806_Housing + VLM0806_Housing* + powermite3 + sc70 + sc70* + sot* + TO-220_Bipolar* + TO-220_Neutral123 + TO-247_Horizontal_Neutral123 +$ENDFPLIST +DRAW +P 2 0 0 0 -150 -100 -150 100 N +P 2 0 0 0 50 0 50 -200 N +P 2 0 1 0 50 -100 150 -200 N +P 3 0 1 0 -150 0 -50 -100 50 -100 N +P 3 0 1 0 -150 0 -50 100 150 100 N +P 3 0 1 0 -50 -100 -65 -20 -130 -90 F +P 3 0 1 0 50 -100 150 0 150 100 N +P 3 0 1 0 150 -200 135 -120 70 -185 F +X ~ 1 150 -300 100 U 40 40 1 1 P +X ~ 2 -250 0 100 R 40 40 1 1 I +X ~ 3 150 200 100 D 40 40 1 1 P +ENDDRAW +ENDDEF +# # Diode_Bridge # DEF Diode_Bridge D 0 50 Y Y 1 F N @@ -715,6 +551,21 @@ F0 "Q" -97 250 50 H V C CNN F1 "FET_N" -147 -247 50 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN +$FPLIST + TO-220_FET-* + TO-220_Neutral* + TO-247_Horizontal_FET* + TO-247_Horizontal_Neutral* + TO-247_Vertical_FET* + TO-247_Vertical_Neutral* + sot* + tsot* + sc70* + powermite3* + VLM0806* + SO-8_PowerPAK* + OldSowjetaera_Transistor_* +$ENDFPLIST DRAW P 2 0 1 6 0 -150 0 150 N P 2 0 1 0 0 -100 150 -100 N @@ -964,25 +815,6 @@ X 3 3 250 0 95 L 40 40 0 1 P ENDDRAW ENDDEF # -# Jumper -# -DEF Jumper JP 0 10 N N 1 F N -F0 "JP" 0 -75 50 H V C CNN -F1 "Jumper" 0 -150 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -$FPLIST - Pin_Header_*_1x02 -$ENDFPLIST -DRAW -A 0 0 79 184 1616 0 1 10 N 75 25 -75 25 -C -75 0 25 0 1 10 N -C 75 0 25 0 1 10 N -X ~ 1 -150 0 50 R 70 70 1 1 I -X ~ 2 150 0 50 L 70 70 1 1 I -ENDDRAW -ENDDEF -# # Jumper_NC_Small # DEF ~Jumper_NC_Small JP 0 30 N N 1 F N @@ -1977,6 +1809,49 @@ X 2 2 100 -100 0 L 60 60 0 1 P ENDDRAW ENDDEF # +# Switch_DPST +# +DEF Switch_DPST SW 0 0 N Y 1 F N +F0 "SW" 300 50 50 H V C CNN +F1 "Switch_DPST" 300 -50 50 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +C -150 -200 50 0 0 0 N +C -150 200 50 0 0 0 N +C 150 -200 50 0 0 0 N +C 150 200 50 0 0 0 N +P 2 0 0 0 -100 -200 100 -100 N +P 2 0 0 0 -100 200 100 300 N +P 2 0 0 0 0 250 0 -150 N +X 1 1 -300 -200 100 R 70 70 1 1 I +X 2 2 300 -200 100 L 70 70 1 1 I +X 3 3 -300 200 100 R 70 70 1 1 I +X 4 4 300 200 100 L 70 70 1 1 I +ENDDRAW +ENDDEF +# +# Switch_SPDT_x2 +# +DEF Switch_SPDT_x2 SW 0 0 Y Y 2 F N +F0 "SW" -200 150 50 H V C CNN +F1 "Switch_SPDT_x2" -250 -150 50 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +C -150 0 50 0 0 0 N +C 150 -100 50 0 0 0 N +C 150 100 50 0 1 0 N +P 2 0 1 0 -100 0 150 50 N +X A 1 300 100 100 L 60 60 1 1 P +X B 2 -300 0 100 R 60 60 1 1 P +X C 3 300 -100 100 L 60 60 1 1 P +X A 4 300 100 100 L 60 60 2 1 P +X B 5 -300 0 100 R 60 60 2 1 P +X C 6 300 -100 100 L 60 60 2 1 P +ENDDRAW +ENDDEF +# # TEMPLATE # DEF TEMPLATE J 0 40 N N 1 F N From affc6869908705cbac708863e3f566d9fa8247d6 Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Thu, 26 Feb 2015 15:38:03 +0100 Subject: [PATCH 15/18] Restore display from device.lib and move to display.lib --- library/display.dcm | 43 ++++++++---------------- library/display.lib | 80 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 29 deletions(-) diff --git a/library/display.dcm b/library/display.dcm index 01cdd730..9f98b3bd 100644 --- a/library/display.dcm +++ b/library/display.dcm @@ -1,5 +1,10 @@ EESchema-DOCLIB Version 2.0 # +$CMP 7SEGM +D Afficheur Leds 7 segments +K DEV +$ENDCMP +# $CMP AG12864E D AG12864E, Graphics Display 128x64px, 1/64 Duty, KS108B Controller, AMPIRE K LCD Graphics 128x64 KS108 Ampire @@ -17,6 +22,15 @@ K 7 SEGMENTS F Display/display-DC04-11GWA.pdf $ENDCMP # +$CMP DISPLAY +D Afficheur LCD nLignes +K DEV +$ENDCMP +# +$CMP DISPLAY_3_LIGNE +D DISPLAY EA7123-12C +$ENDCMP +# $CMP DOT-BAR D BAR GRAPH unit K BAR DOT @@ -29,35 +43,6 @@ K BAR DOT F Display/HDSP-48xx.pdf $ENDCMP # -$CMP ELD-426X -D DUAL 7 Segments ELD-426 series. -K 7 SEGMENTS -$ENDCMP -# -$CMP HDSP-7XXX-A -D Afficheur 7 seg. HDSP-7xxx type A -K 7 Segments -F Display/HDSP-7xxx.pdf -$ENDCMP -# -$CMP HDSP-7XXX-B -D Afficheur 7 seg. HDSP-7xxx type B -K 7 Segments -F Display/HDSP-7xxx.pdf -$ENDCMP -# -$CMP HDSP-7XXX-C -D Afficheur 7 seg. HDSP-7xxx type C -K 7 Segments -F Display/HDSP-7xxx.pdf -$ENDCMP -# -$CMP HDSP-7XXX-D -D Afficheur 7 seg. HDSP-7xxx type D -K 7 Segments -F Display/HDSP-7xxx.pdf -$ENDCMP -# $CMP HY1602E D HY1602E K LCD 16x2 Alphanumeric 16pin Blue/Yellow/Green Backlight diff --git a/library/display.lib b/library/display.lib index 48d33a8a..a6204ff9 100644 --- a/library/display.lib +++ b/library/display.lib @@ -1,6 +1,30 @@ EESchema-LIBRARY Version 2.3 #encoding utf-8 # +# 7SEGM +# +DEF 7SEGM S 0 40 Y Y 1 F N +F0 "S" 0 650 50 H V C CNN +F1 "7SEGM" 0 -650 50 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +S -500 600 550 -600 0 1 0 N +P 2 0 1 0 0 0 450 0 N +P 5 0 1 0 -50 -550 50 550 500 550 400 -550 -50 -550 N +X Segm_E 1 -750 -100 250 R 50 50 1 1 P +X Segm_D 2 -750 0 250 R 50 50 1 1 P +X K 3 -750 400 250 R 50 50 1 1 P +X Segm_C 4 -750 100 250 R 50 50 1 1 P +X SegmDP 5 -750 -400 250 R 50 50 1 1 P +X Segm_B 6 -750 200 250 R 50 50 1 1 P +X Segm_A 7 -750 300 250 R 50 50 1 1 P +X K 8 -750 -500 250 R 50 50 1 1 I +X Segm_F 9 -750 -200 250 R 50 50 1 1 P +X Segm_G 10 -750 -300 250 R 50 50 1 1 P +ENDDRAW +ENDDEF +# # 7SEGMENTS # DEF 7SEGMENTS AFF 0 20 Y Y 1 F N @@ -128,6 +152,62 @@ X g 16 -850 -300 300 R 50 50 1 1 I ENDDRAW ENDDEF # +# DISPLAY +# +DEF DISPLAY S 0 40 Y Y 1 F N +F0 "S" -1050 750 50 H V C CNN +F1 "DISPLAY" 250 -750 50 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +S -1550 700 1200 -700 0 1 0 N +P 2 0 1 0 -1050 0 -600 0 N +P 2 0 1 0 -500 0 -50 0 N +P 2 0 1 0 50 0 500 0 N +P 2 0 1 0 600 0 1050 0 N +P 5 0 1 0 -1100 -550 -1000 550 -550 550 -650 -550 -1100 -550 N +P 5 0 1 0 -550 -550 -450 550 0 550 -100 -550 -550 -550 N +P 5 0 1 0 0 -550 100 550 550 550 450 -550 0 -550 N +P 5 0 1 0 650 550 550 -550 1000 -550 1100 550 650 550 N +X GND 1 -1800 650 250 R 50 50 1 1 W +X VCC 2 -1800 550 250 R 50 50 1 1 W +X VLCD 3 -1800 450 250 R 50 50 1 1 I +X RS 4 -1800 350 250 R 50 50 1 1 I +X R/W 5 -1800 250 250 R 50 50 1 1 I +X CS 6 -1800 150 250 R 50 50 1 1 I +X D0 7 -1800 50 250 R 50 50 1 1 T +X D1 8 -1800 -50 250 R 50 50 1 1 T +X D2 9 -1800 -150 250 R 50 50 1 1 T +X D3 10 -1800 -250 250 R 50 50 1 1 T +X D4 11 -1800 -350 250 R 50 50 1 1 T +X D5 12 -1800 -450 250 R 50 50 1 1 T +X D6 13 -1800 -550 250 R 50 50 1 1 T +X D7 14 -1800 -650 250 R 50 50 1 1 T +ENDDRAW +ENDDEF +# +# DISPLAY_3_LIGNE +# +DEF DISPLAY_3_LIGNE S 0 40 Y Y 1 F N +F0 "S" -1050 750 50 H V C CNN +F1 "DISPLAY_3_LIGNE" 250 -750 50 H V C CNN +F2 "" 0 0 60 H V C CNN +F3 "" 0 0 60 H V C CNN +DRAW +T 0 50 450 250 0 0 0 LINE_1 Normal 0 C C +T 0 50 0 250 0 0 0 LINE_2 Normal 0 C C +T 0 50 -450 250 0 0 0 LINE_3 Normal 0 C C +S -1250 650 1150 -650 0 0 0 N +S -1550 700 1200 -700 0 1 0 N +X GND 1 -1800 650 250 R 50 50 1 1 W +X VCC 2 -1800 550 250 R 50 50 1 1 W +X VLCD 3 -1800 450 250 R 50 50 1 1 I +X VO 4 -1800 350 250 R 50 50 1 1 I +X SDA 5 -1800 250 250 R 50 50 1 1 I +X SCL 6 -1800 150 250 R 50 50 1 1 I +ENDDRAW +ENDDEF +# # DOT-BAR # DEF DOT-BAR BAR 0 40 Y N 10 F N From 448fefe75aa3e32a0485d39a8227de3e02643154 Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Thu, 26 Feb 2015 15:40:40 +0100 Subject: [PATCH 16/18] Remove R_Small and rename R_Small2 to R_Small --- library/device.lib | 84 +++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/library/device.lib b/library/device.lib index 15bed0c3..792670d9 100644 --- a/library/device.lib +++ b/library/device.lib @@ -484,8 +484,8 @@ P 2 0 0 0 0 -550 200 -350 N P 2 0 0 6 0 550 200 350 N P 2 0 0 8 250 -100 450 -300 N P 2 0 0 6 350 200 550 0 N -P 2 0 0 0 450 300 250 100 N P 2 0 0 8 450 300 250 100 N +P 2 0 0 0 450 300 250 100 N P 2 0 0 6 550 0 350 -200 N P 5 0 0 0 -450 300 -200 350 -250 100 -450 300 -450 300 F P 5 0 0 0 -250 -100 -200 -350 -450 -300 -250 -100 -250 -100 F @@ -872,43 +872,6 @@ X K 2 200 0 150 L 40 40 1 1 P ENDDRAW ENDDEF # -# LED_RCBG -# -DEF LED_RCBG D 0 50 Y N 1 F N -F0 "D" -75 350 50 H V C CNN -F1 "LED_RCBG" -25 -350 50 H V C CNN -F2 "" 0 -50 50 H V C CNN -F3 "" 0 -50 50 H V C CNN -DRAW -S -150 300 150 -300 0 1 0 f -S -75 -50 -75 50 0 1 0 N -S -75 50 -75 50 0 1 0 N -S -75 150 -75 250 0 1 0 N -S -75 250 -75 250 0 1 0 N -P 2 0 1 0 -75 -200 -150 -200 N -P 2 0 1 0 -75 0 -150 0 N -P 2 0 1 0 -75 200 -150 200 N -P 2 0 1 0 25 -150 25 -250 N -P 2 0 1 0 25 0 150 0 N -P 3 0 1 0 25 50 25 -50 25 -50 N -P 3 0 1 0 25 250 25 150 25 150 N -P 4 0 1 0 15 80 35 80 15 70 15 70 N -P 4 0 1 0 15 280 35 280 15 270 15 270 N -P 4 0 1 0 25 200 75 200 75 -200 25 -200 N -P 4 0 1 0 28 -116 48 -116 28 -126 28 -126 N -P 5 0 1 0 -75 -150 -75 -250 25 -200 -75 -150 -75 -150 F -P 5 0 1 0 -45 -150 5 -140 -5 -130 35 -120 35 -120 N -P 6 0 1 0 -75 50 -75 -50 25 0 -75 50 -75 50 -75 50 F -P 6 0 1 0 -75 250 -75 150 25 200 -75 250 -75 250 -75 250 F -P 6 0 1 0 -45 50 5 60 -5 70 35 80 35 80 35 80 N -P 6 0 1 0 -45 250 5 260 -5 270 35 280 35 280 35 280 N -X RED_ANODE 1 -300 200 150 R 50 50 1 1 P -X COMMON_CATHODE 2 300 0 150 L 50 50 1 1 P -X BLUE_ANODE 3 -300 -200 150 R 50 50 1 1 P -X GREEN_ANODE 4 -300 0 150 R 50 50 1 1 P -ENDDRAW -ENDDEF -# # LED_RABG # DEF LED_RABG D 0 50 Y N 1 F N @@ -946,6 +909,43 @@ X GREEN_CATHODE 4 300 0 150 L 50 50 1 1 P ENDDRAW ENDDEF # +# LED_RCBG +# +DEF LED_RCBG D 0 50 Y N 1 F N +F0 "D" -75 350 50 H V C CNN +F1 "LED_RCBG" -25 -350 50 H V C CNN +F2 "" 0 -50 50 H V C CNN +F3 "" 0 -50 50 H V C CNN +DRAW +S -150 300 150 -300 0 1 0 f +S -75 -50 -75 50 0 1 0 N +S -75 50 -75 50 0 1 0 N +S -75 150 -75 250 0 1 0 N +S -75 250 -75 250 0 1 0 N +P 2 0 1 0 -75 -200 -150 -200 N +P 2 0 1 0 -75 0 -150 0 N +P 2 0 1 0 -75 200 -150 200 N +P 2 0 1 0 25 -150 25 -250 N +P 2 0 1 0 25 0 150 0 N +P 3 0 1 0 25 50 25 -50 25 -50 N +P 3 0 1 0 25 250 25 150 25 150 N +P 4 0 1 0 15 80 35 80 15 70 15 70 N +P 4 0 1 0 15 280 35 280 15 270 15 270 N +P 4 0 1 0 25 200 75 200 75 -200 25 -200 N +P 4 0 1 0 28 -116 48 -116 28 -126 28 -126 N +P 5 0 1 0 -75 -150 -75 -250 25 -200 -75 -150 -75 -150 F +P 5 0 1 0 -45 -150 5 -140 -5 -130 35 -120 35 -120 N +P 6 0 1 0 -75 50 -75 -50 25 0 -75 50 -75 50 -75 50 F +P 6 0 1 0 -75 250 -75 150 25 200 -75 250 -75 250 -75 250 F +P 6 0 1 0 -45 50 5 60 -5 70 35 80 35 80 35 80 N +P 6 0 1 0 -45 250 5 260 -5 270 35 280 35 280 35 280 N +X RED_ANODE 1 -300 200 150 R 50 50 1 1 P +X COMMON_CATHODE 2 300 0 150 L 50 50 1 1 P +X BLUE_ANODE 3 -300 -200 150 R 50 50 1 1 P +X GREEN_ANODE 4 -300 0 150 R 50 50 1 1 P +ENDDRAW +ENDDEF +# # LED_RGB # DEF LED_RGB D 0 40 Y N 1 F N @@ -1676,7 +1676,7 @@ ENDDEF # R_Small # DEF R_Small R 0 10 N N 1 F N -F0 "R" 30 40 50 H V L CNN +F0 "R" 30 20 50 H V L CNN F1 "R_Small" 30 -40 50 H V L CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN @@ -1685,9 +1685,9 @@ $FPLIST R_* $ENDFPLIST DRAW -S -20 50 20 -50 0 1 8 N -X ~ 1 0 100 50 D 40 40 1 1 P -X ~ 2 0 -100 50 U 40 40 1 1 P +S -30 70 30 -70 0 1 8 N +X ~ 1 0 100 30 D 40 40 1 1 P +X ~ 2 0 -100 30 U 40 40 1 1 P ENDDRAW ENDDEF # From 0f1685b9ba8639088fc8fd5ea5e336752611787e Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Thu, 5 Mar 2015 14:58:21 +0100 Subject: [PATCH 17/18] Remove R_Small2 --- library/device.dcm | 4 ---- library/device.lib | 20 +------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/library/device.dcm b/library/device.dcm index f154f0e6..25d8fa32 100644 --- a/library/device.dcm +++ b/library/device.dcm @@ -217,10 +217,6 @@ $CMP R_Small D Resistor $ENDCMP # -$CMP R_Small_2 -D Resistor -$ENDCMP -# $CMP SCHDPAK D Diode schotty - cms K DIODE SCHOTTKY CMS diff --git a/library/device.lib b/library/device.lib index 792670d9..4e25e618 100644 --- a/library/device.lib +++ b/library/device.lib @@ -484,8 +484,8 @@ P 2 0 0 0 0 -550 200 -350 N P 2 0 0 6 0 550 200 350 N P 2 0 0 8 250 -100 450 -300 N P 2 0 0 6 350 200 550 0 N -P 2 0 0 8 450 300 250 100 N P 2 0 0 0 450 300 250 100 N +P 2 0 0 8 450 300 250 100 N P 2 0 0 6 550 0 350 -200 N P 5 0 0 0 -450 300 -200 350 -250 100 -450 300 -450 300 F P 5 0 0 0 -250 -100 -200 -350 -450 -300 -250 -100 -250 -100 F @@ -1691,24 +1691,6 @@ X ~ 2 0 -100 30 U 40 40 1 1 P ENDDRAW ENDDEF # -# R_Small_2 -# -DEF R_Small_2 R 0 10 N N 1 F N -F0 "R" 30 20 50 H V L CNN -F1 "R_Small_2" 30 -40 50 H V L CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -$FPLIST - Resistor_* - R_* -$ENDFPLIST -DRAW -S -30 70 30 -70 0 1 8 N -X ~ 1 0 100 30 D 40 40 1 1 P -X ~ 2 0 -100 30 U 40 40 1 1 P -ENDDRAW -ENDDEF -# # SCHDPAK # DEF SCHDPAK D 0 40 N N 1 F N From 3ff3ba4ba328270ce8d4662779a56fd153c2fe7c Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Thu, 5 Mar 2015 16:00:15 +0100 Subject: [PATCH 18/18] Remove NPN_Small --- library/device.dcm | 9 --------- library/device.lib | 21 +-------------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/library/device.dcm b/library/device.dcm index 6272b3ff..2c0522af 100644 --- a/library/device.dcm +++ b/library/device.dcm @@ -94,11 +94,6 @@ D Filtre EMI K EMI $ENDCMP # -$CMP FET_N -D Junction Field Effect Transistor, N-channel -K JFET -$ENDCMP -# $CMP FILTER D Filtre EMI K EMI @@ -173,10 +168,6 @@ D Transistor N-IGBT (general) K igbt n-igbt transistor $ENDCMP # -$CMP NPN_Small -D Bipolar junction transistor NPN -$ENDCMP -# $CMP Q_NIGBT_ECG D Transistor N-IGBT (general) K igbt n-igbt transistor diff --git a/library/device.lib b/library/device.lib index 7f6f8abf..df460212 100644 --- a/library/device.lib +++ b/library/device.lib @@ -484,8 +484,8 @@ P 2 0 0 0 0 -550 200 -350 N P 2 0 0 6 0 550 200 350 N P 2 0 0 8 250 -100 450 -300 N P 2 0 0 6 350 200 550 0 N -P 2 0 0 0 450 300 250 100 N P 2 0 0 8 450 300 250 100 N +P 2 0 0 0 450 300 250 100 N P 2 0 0 6 550 0 350 -200 N P 5 0 0 0 -450 300 -200 350 -250 100 -450 300 -450 300 F P 5 0 0 0 -250 -100 -200 -350 -450 -300 -250 -100 -250 -100 F @@ -1071,25 +1071,6 @@ X A2 3 -300 -100 150 R 40 40 1 1 I ENDDRAW ENDDEF # -# NPN_Small -# -DEF NPN_Small Q 0 0 N N 1 F N -F0 "Q" 70 60 60 H V C CNN -F1 "NPN_Small" 250 -20 60 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 2 0 1 0 -60 -60 -60 60 N -P 2 0 1 0 0 -60 -60 -30 N -P 2 0 1 0 0 -60 -20 -70 N -P 2 0 1 0 0 -60 -10 -40 N -P 2 0 1 0 0 60 -60 30 N -X E 1 0 -100 40 U 50 50 1 1 P -X B 2 -100 0 40 R 50 50 1 1 P -X C 3 0 100 40 D 50 50 1 1 P -ENDDRAW -ENDDEF -# # OPTO_NPN # DEF OPTO_NPN Q 0 0 Y Y 1 F N