From fd0f5fb8172ded4c8eb7c9354e45e4a4bca73d53 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Fri, 7 Oct 2016 07:22:14 +0200 Subject: [PATCH] modifier R_PHOTO, added alternative symbol --- library/device.dcm | 39 +++++---- library/device.lib | 203 +++++++++++++++++++++++++-------------------- 2 files changed, 137 insertions(+), 105 deletions(-) diff --git a/library/device.dcm b/library/device.dcm index efd980e5..9a1054e8 100644 --- a/library/device.dcm +++ b/library/device.dcm @@ -240,21 +240,6 @@ D Jumper, normally open K jumper link bridge $ENDCMP # -$CMP Lamp -D lamp -K lamp -$ENDCMP -# -$CMP Lamp_ALT -D lamp, alternative symbol -K lamp -$ENDCMP -# -$CMP Lamp_Neon -D neon lamp -K neon lamp -$ENDCMP -# $CMP LED D LED generic K led diode @@ -295,6 +280,21 @@ D LED, small symbol K led diode light-emitting-diode $ENDCMP # +$CMP Lamp +D lamp +K lamp +$ENDCMP +# +$CMP Lamp_ALT +D lamp, alternative symbol +K lamp +$ENDCMP +# +$CMP Lamp_Neon +D neon lamp +K neon lamp +$ENDCMP +# $CMP Microphone D Microphone K Microphone @@ -643,8 +643,13 @@ K r $ENDCMP # $CMP R_PHOTO -D Photoresistor, light sensitive resistor -K resistor variable light opto +D Photoresistor, light sensitive resistor, LDR +K resistor variable light opto LDR +$ENDCMP +# +$CMP R_PHOTO_ALT +D Photoresistor, light sensitive resistor, LDR, alternative symbol +K resistor variable light opto LDR $ENDCMP # $CMP R_Small diff --git a/library/device.lib b/library/device.lib index b349d7b6..54eead5e 100644 --- a/library/device.lib +++ b/library/device.lib @@ -1018,59 +1018,6 @@ C 40 0 20 0 1 0 N X 1 1 -100 0 40 R 50 50 0 1 P X 2 2 100 0 40 L 50 50 0 1 P ENDDRAW -ENDDEF -# -# Lamp -# -DEF Lamp L 0 1 N N 1 F N -F0 "L" 25 150 50 H V L CNN -F1 "Lamp" 25 -150 50 H V L CNN -F2 "" 0 100 50 V V C CNN -F3 "" 0 100 50 V V C CNN -DRAW -C 0 0 100 0 1 0 N -P 2 0 1 0 -70 70 70 -70 N -P 2 0 1 0 70 70 -70 -70 N -X - 1 0 -200 100 U 50 50 1 1 P -X + 2 0 200 100 D 50 50 1 1 P -ENDDRAW -ENDDEF -# -# Lamp_ALT -# -DEF Lamp_ALT L 0 1 N N 1 F N -F0 "L" 25 150 50 H V L CNN -F1 "Lamp_ALT" 25 -150 50 H V L CNN -F2 "" 0 100 50 V V C CNN -F3 "" 0 100 50 V V C CNN -DRAW -A 45 -27 44 376 -1762 0 1 0 N 80 0 0 -30 -A 46 32 46 -1775 -433 0 1 0 N 0 30 80 0 -C 0 0 100 0 1 0 N -P 2 0 1 0 0 -30 0 -100 N -P 2 0 1 0 0 30 0 100 N -X - 1 0 -200 100 U 50 50 1 1 P -X + 2 0 200 100 D 50 50 1 1 P -ENDDRAW -ENDDEF -# -# Lamp_Neon -# -DEF Lamp_Neon L 0 1 Y N 1 F N -F0 "L" 25 150 50 H V L CNN -F1 "Lamp_Neon" 25 -150 50 H V L CNN -F2 "" 0 100 50 V V C CNN -F3 "" 0 100 50 V V C CNN -DRAW -C 0 0 100 0 1 0 N -C 40 -50 10 0 1 0 F -S -60 -20 60 -30 0 1 0 F -S -60 30 60 20 0 1 0 F -P 2 0 1 0 0 -100 0 -30 N -P 2 0 1 0 0 30 0 100 N -X ~ 1 0 -200 100 U 50 50 1 1 P -X ~ 2 0 200 100 D 50 50 1 1 P -ENDDRAW ENDDEF # # LED @@ -1343,6 +1290,59 @@ X A 2 100 0 70 L 50 50 1 1 P ENDDRAW ENDDEF # +# Lamp +# +DEF Lamp L 0 1 N N 1 F N +F0 "L" 25 150 50 H V L CNN +F1 "Lamp" 25 -150 50 H V L CNN +F2 "" 0 100 50 V V C CNN +F3 "" 0 100 50 V V C CNN +DRAW +C 0 0 100 0 1 0 N +P 2 0 1 0 -70 70 70 -70 N +P 2 0 1 0 70 70 -70 -70 N +X - 1 0 -200 100 U 50 50 1 1 P +X + 2 0 200 100 D 50 50 1 1 P +ENDDRAW +ENDDEF +# +# Lamp_ALT +# +DEF Lamp_ALT L 0 1 N N 1 F N +F0 "L" 25 150 50 H V L CNN +F1 "Lamp_ALT" 25 -150 50 H V L CNN +F2 "" 0 100 50 V V C CNN +F3 "" 0 100 50 V V C CNN +DRAW +A 45 -27 44 376 -1762 0 1 0 N 80 0 0 -30 +A 46 32 46 -1775 -433 0 1 0 N 0 30 80 0 +C 0 0 100 0 1 0 N +P 2 0 1 0 0 -30 0 -100 N +P 2 0 1 0 0 30 0 100 N +X - 1 0 -200 100 U 50 50 1 1 P +X + 2 0 200 100 D 50 50 1 1 P +ENDDRAW +ENDDEF +# +# Lamp_Neon +# +DEF Lamp_Neon L 0 1 Y N 1 F N +F0 "L" 25 150 50 H V L CNN +F1 "Lamp_Neon" 25 -150 50 H V L CNN +F2 "" 0 100 50 V V C CNN +F3 "" 0 100 50 V V C CNN +DRAW +C 0 0 100 0 1 0 N +C 40 -50 10 0 1 0 F +S -60 -20 60 -30 0 1 0 F +S -60 30 60 20 0 1 0 F +P 2 0 1 0 0 -100 0 -30 N +P 2 0 1 0 0 30 0 100 N +X ~ 1 0 -200 100 U 50 50 1 1 P +X ~ 2 0 200 100 D 50 50 1 1 P +ENDDRAW +ENDDEF +# # Microphone # DEF Microphone MIC 0 1 Y N 1 F N @@ -2920,46 +2920,73 @@ ENDDEF # R_PHOTO # DEF R_PHOTO R 0 0 N Y 1 F N -F0 "R" 150 200 50 H V C CNN -F1 "R_PHOTO" 250 -200 50 H V C TNN -F2 "" -70 0 50 V V C CNN -F3 "" 0 0 50 H V C CNN +F0 "R" -100 125 50 H V R CNN +F1 "R_PHOTO" -100 50 50 H V R TNN +F2 "" 50 -250 50 V V L CNN +F3 "" 0 -50 50 H V C CNN $FPLIST R? R?-* + LDR* $ENDFPLIST DRAW -C 0 0 180 0 1 0 N -S -40 150 40 -150 0 1 12 N -P 2 0 1 0 -180 90 -280 190 N -P 2 0 1 0 -180 90 -210 90 N -P 2 0 1 0 -180 90 -180 120 N -P 2 0 1 0 -140 140 -240 240 N -P 2 0 1 0 -140 140 -240 240 N -P 2 0 1 0 -140 140 -240 240 N -P 2 0 1 0 -140 140 -240 240 N -P 2 0 1 0 -140 140 -240 240 N -P 2 0 1 0 -140 140 -240 240 N -P 2 0 1 0 -140 140 -240 240 N -P 2 0 1 0 -140 140 -240 240 N -P 2 0 1 0 -140 140 -170 140 N -P 2 0 1 0 -140 140 -170 140 N -P 2 0 1 0 -140 140 -170 140 N -P 2 0 1 0 -140 140 -170 140 N -P 2 0 1 0 -140 140 -170 140 N -P 2 0 1 0 -140 140 -170 140 N -P 2 0 1 0 -140 140 -170 140 N -P 2 0 1 0 -140 140 -170 140 N -P 2 0 1 0 -140 140 -140 170 N -P 2 0 1 0 -140 140 -140 170 N -P 2 0 1 0 -140 140 -140 170 N -P 2 0 1 0 -140 140 -140 170 N -P 2 0 1 0 -140 140 -140 170 N -P 2 0 1 0 -140 140 -140 170 N -P 2 0 1 0 -140 140 -140 170 N -P 2 0 1 0 -140 140 -140 170 N -X ~ 1 0 250 100 D 50 50 1 1 P -X ~ 2 0 -250 100 U 50 50 1 1 P +S -40 100 40 -200 0 1 10 N +P 2 0 1 0 -105 -185 -205 -85 N +P 2 0 1 0 -105 -185 -135 -185 N +P 2 0 1 0 -105 -185 -105 -155 N +P 2 0 1 0 -65 -135 -165 -35 N +P 2 0 1 0 -65 -135 -165 -35 N +P 2 0 1 0 -65 -135 -165 -35 N +P 2 0 1 0 -65 -135 -165 -35 N +P 2 0 1 0 -65 -135 -165 -35 N +P 2 0 1 0 -65 -135 -165 -35 N +P 2 0 1 0 -65 -135 -165 -35 N +P 2 0 1 0 -65 -135 -165 -35 N +P 2 0 1 0 -65 -135 -95 -135 N +P 2 0 1 0 -65 -135 -95 -135 N +P 2 0 1 0 -65 -135 -95 -135 N +P 2 0 1 0 -65 -135 -95 -135 N +P 2 0 1 0 -65 -135 -95 -135 N +P 2 0 1 0 -65 -135 -95 -135 N +P 2 0 1 0 -65 -135 -95 -135 N +P 2 0 1 0 -65 -135 -95 -135 N +P 2 0 1 0 -65 -135 -65 -105 N +P 2 0 1 0 -65 -135 -65 -105 N +P 2 0 1 0 -65 -135 -65 -105 N +P 2 0 1 0 -65 -135 -65 -105 N +P 2 0 1 0 -65 -135 -65 -105 N +P 2 0 1 0 -65 -135 -65 -105 N +P 2 0 1 0 -65 -135 -65 -105 N +P 2 0 1 0 -65 -135 -65 -105 N +X ~ 1 0 200 100 D 50 50 1 1 P +X ~ 2 0 -300 100 U 50 50 1 1 P +ENDDRAW +ENDDEF +# +# R_PHOTO_ALT +# +DEF R_PHOTO_ALT R 0 0 N Y 1 F N +F0 "R" -75 150 50 H V R BNN +F1 "R_PHOTO_ALT" -75 50 50 H V R BNN +F2 "" 50 -250 50 V V L CNN +F3 "" 0 -50 50 H V C CNN +$FPLIST + R? + R?-* + LDR* +$ENDFPLIST +DRAW +S -40 100 40 -200 0 1 10 N +P 2 0 1 0 -60 -180 -125 -115 N +P 2 0 1 0 -60 -180 -90 -180 N +P 2 0 1 0 -60 -180 -60 -150 N +P 2 0 1 0 -60 -100 -125 -35 N +P 2 0 1 0 -60 -100 -90 -100 N +P 2 0 1 0 -60 -100 -60 -70 N +P 4 0 1 0 -40 -200 0 -130 40 -200 -40 -200 F +P 4 0 1 0 -40 100 0 30 40 100 -40 100 F +X ~ 1 0 200 100 D 50 50 1 1 P +X ~ 2 0 -300 100 U 50 50 1 1 P ENDDRAW ENDDEF #