diff --git a/library/device.dcm b/library/device.dcm index 2be3338f..dda2aaa7 100644 --- a/library/device.dcm +++ b/library/device.dcm @@ -796,6 +796,16 @@ D Push button switch, normally open, two pins K switch normally-open pushbutton push-button $ENDCMP # +$CMP SW_Push_LED +D Push button switch, normally open, two pins +K switch normally-open pushbutton push-button +$ENDCMP +# +$CMP SW_Push_LED_Small +D Push button switch with LED, generic, small symbol, two pins +K switch normally-open pushbutton push-button LED +$ENDCMP +# $CMP SW_Push_Open D Button, Push-To-Open K Switch Push Button diff --git a/library/device.lib b/library/device.lib index 5ef22e7c..e9aac116 100644 --- a/library/device.lib +++ b/library/device.lib @@ -4094,12 +4094,12 @@ F1 "SW_DPST" 0 -350 50 H V C CNN F2 "" 0 0 50 H V C CNN F3 "" 0 0 50 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 -175 100 -100 N -P 2 0 0 0 -100 225 100 300 N +C -175 -200 25 0 0 0 N +C -175 200 25 0 0 0 N +C 175 -200 25 0 0 0 N +C 175 200 25 0 0 0 N +P 2 0 0 0 -150 -190 175 -75 N +P 2 0 0 0 -150 210 175 350 N P 2 0 1 0 0 -100 0 -120 N P 2 0 1 0 0 -60 0 -80 N P 2 0 1 0 0 -20 0 -40 N @@ -4150,10 +4150,68 @@ F1 "SW_Push" 0 -80 50 H V C CNN F2 "" 0 0 50 H V C CNN F3 "" 0 0 50 H V C CNN DRAW -S -170 50 170 60 0 1 0 N -P 4 0 1 0 -40 60 -30 90 30 90 40 60 N -X 1 1 -300 0 200 R 50 50 0 1 P I -X 2 2 300 0 200 L 50 50 0 1 P I +C -125 0 25 0 0 0 N +C 125 0 25 0 0 0 N +P 2 0 0 0 -150 0 -200 0 N +P 2 0 0 0 150 0 200 0 N +P 2 0 1 0 -150 50 150 50 N +P 2 0 1 0 0 50 0 150 N +X 1 1 -300 0 100 R 50 50 0 1 P +X 2 2 300 0 100 L 50 50 0 1 P +ENDDRAW +ENDDEF +# +# SW_Push_LED +# +DEF SW_Push_LED SW 0 40 Y N 1 F N +F0 "SW" 150 110 50 H V C CNN +F1 "SW_Push_LED" 0 -350 50 H V C CNN +F2 "" 0 0 50 H V C CNN +F3 "" 0 0 50 H V C CNN +DRAW +C -125 0 25 0 0 0 N +C 125 0 25 0 0 0 N +P 2 0 0 0 -200 -200 200 -200 N +P 2 0 0 0 -150 0 -200 0 N +P 2 0 0 0 -125 -250 -175 -300 N +P 2 0 0 0 -75 -250 -125 -300 N +P 2 0 0 0 -50 -125 -50 -275 N +P 2 0 0 0 150 0 200 0 N +P 3 0 0 0 -175 -275 -175 -300 -150 -300 N +P 3 0 0 0 -125 -275 -125 -300 -100 -300 N +P 4 0 0 0 -50 -200 50 -275 50 -125 -50 -200 F +P 2 0 1 0 -150 50 150 50 N +P 2 0 1 0 0 50 0 150 N +X 1 1 -300 0 100 R 50 50 0 1 P +X 2 2 300 0 100 L 50 50 0 1 P +X C 3 -300 -200 100 R 50 50 0 1 P +X A 4 300 -200 100 L 50 50 0 1 P +ENDDRAW +ENDDEF +# +# SW_Push_LED_Small +# +DEF SW_Push_LED_Small SW 0 40 Y N 1 F N +F0 "SW" 25 225 50 H V L CNN +F1 "SW_Push_LED_Small" 0 -125 50 H V C CNN +F2 "" 0 300 50 H V C CNN +F3 "" 0 300 50 H V C CNN +DRAW +P 2 0 0 0 -150 -75 -100 -25 N +P 2 0 0 0 -100 -75 -50 -25 N +P 2 0 0 0 -100 0 100 0 N +P 2 0 0 0 -25 50 -25 -50 N +P 3 0 0 0 -150 -50 -150 -75 -125 -75 N +P 3 0 0 0 -100 -50 -100 -75 -75 -75 N +P 4 0 0 0 -25 0 50 50 50 -50 -25 0 F +C -80 100 20 0 1 0 N +C 80 100 20 0 1 0 N +P 2 0 1 0 0 150 0 220 N +P 2 0 1 0 100 150 -100 150 N +X 1 1 -150 100 50 R 50 50 0 1 P +X 2 2 150 100 50 L 50 50 0 1 P +X K 3 -150 0 50 R 50 50 0 1 P +X A 4 150 0 50 L 50 50 0 1 P ENDDRAW ENDDEF # @@ -4165,8 +4223,8 @@ F1 "SW_Push_Open" 0 -100 50 H V C CNN F2 "" 0 0 50 H V C CNN F3 "" 0 0 50 H V C CNN DRAW -S -180 -40 160 -30 0 1 0 N -P 4 0 1 0 -50 -30 -40 0 20 0 30 -30 N +P 2 0 1 0 0 -30 0 75 N +P 2 0 1 0 150 -30 -150 -30 N X 1 1 -300 0 200 R 50 50 0 1 P I X 2 2 300 0 200 L 50 50 0 1 P I ENDDRAW @@ -4175,16 +4233,15 @@ ENDDEF # SW_Push_Open_Small # DEF SW_Push_Open_Small SW 0 40 N N 1 F N -F0 "SW" 0 75 50 H V C CNN +F0 "SW" 0 100 50 H V C CNN F1 "SW_Push_Open_Small" 0 -75 50 H V C CNN F2 "" 0 200 50 H V C CNN F3 "" 0 200 50 H V C CNN DRAW -C -90 0 10 0 1 0 N -C 90 0 10 0 1 0 N -P 2 0 1 0 -115 -25 105 -25 N -P 4 0 1 0 -115 -25 -115 -15 105 -15 105 -25 N -P 4 0 1 0 -55 -15 -45 5 35 5 45 -15 N +C -80 0 20 0 1 0 N +C 80 0 20 0 1 0 N +P 2 0 1 0 -100 -25 100 -25 N +P 2 0 1 0 0 -25 0 50 N X 1 1 -150 0 50 R 50 50 0 1 P X 2 2 150 0 50 L 50 50 0 1 P ENDDRAW @@ -4193,16 +4250,15 @@ ENDDEF # SW_Push_Small # DEF SW_Push_Small SW 0 40 N N 1 F N -F0 "SW" 0 100 50 H V C CNN -F1 "SW_Push_Small" 0 -50 50 H V C CNN +F0 "SW" 50 100 50 H V L CNN +F1 "SW_Push_Small" 0 -60 50 H V C CNN F2 "" 0 200 50 H V C CNN F3 "" 0 200 50 H V C CNN DRAW -C -90 0 10 0 1 0 N -C 90 0 10 0 1 0 N -P 2 0 1 0 -110 30 110 30 N -P 4 0 1 0 -110 30 -110 40 110 40 110 30 N -P 4 0 1 0 -50 40 -40 60 40 60 50 40 N +C -80 0 20 0 1 0 N +C 80 0 20 0 1 0 N +P 2 0 1 0 0 50 0 120 N +P 2 0 1 0 100 50 -100 50 N X 1 1 -150 0 50 R 50 50 0 1 P X 2 2 150 0 50 L 50 50 0 1 P ENDDRAW @@ -4211,17 +4267,17 @@ ENDDEF # SW_Push_Small_45deg # DEF SW_Push_Small_45deg SW 0 40 N N 1 F N -F0 "SW" 150 110 50 H V C CNN +F0 "SW" 120 40 50 H V L CNN F1 "SW_Push_Small_45deg" 0 -150 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 +C -46 46 20 0 1 0 N +C 45 -47 20 0 1 0 N +P 2 0 1 0 -20 100 100 -20 N +P 2 0 1 0 40 40 80 80 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 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 @@ -4230,19 +4286,19 @@ ENDDEF # SW_Reed # DEF SW_Reed SW 0 0 N N 1 F N -F0 "SW" 0 125 50 H V C CNN -F1 "SW_Reed" 0 -125 50 H V C CNN +F0 "SW" 0 100 50 H V C CNN +F1 "SW_Reed" 0 -100 50 H V C CNN F2 "" 0 0 50 H V C CNN F3 "" 0 0 50 H V C CNN DRAW -A -150 0 75 901 -901 0 0 0 N -150 75 -150 -75 -A 150 0 75 -899 899 0 0 0 N 150 -75 150 75 -P 2 0 0 0 -150 -75 150 -75 N -P 2 0 0 0 -100 0 50 50 N -P 2 0 0 0 100 0 -50 -50 N -P 2 0 0 0 150 75 -150 75 N -X 1 1 -400 0 300 R 50 50 1 1 I -X 2 2 400 0 300 L 50 50 1 1 I +A -85 0 55 901 -901 0 0 10 N -85 55 -85 -55 +A 85 0 55 -899 899 0 0 10 N 85 -55 85 55 +P 2 0 0 0 -100 0 50 30 N +P 2 0 0 10 -85 -55 90 -55 N +P 2 0 0 10 85 55 -85 55 N +P 2 0 0 0 100 0 -50 -30 N +X 1 1 -200 0 100 R 50 50 1 1 I +X 2 2 200 0 100 L 50 50 1 1 I ENDDRAW ENDDEF # @@ -4282,11 +4338,11 @@ $FPLIST SP3T* $ENDFPLIST DRAW -C -85 0 15 0 1 0 N -C 85 -100 15 0 1 0 N -C 85 0 15 0 1 0 N -C 85 100 15 0 1 0 N -P 2 0 1 0 -70 10 60 90 N +C -75 0 25 0 1 0 N +C 75 -100 25 0 1 0 N +C 75 0 25 0 1 0 N +C 75 100 25 0 1 0 N +P 2 0 1 0 -55 15 55 85 N X 1 1 200 100 100 L 50 50 1 1 P X 2 2 200 0 100 L 50 50 1 1 P X 3 3 -200 0 100 R 50 50 1 1 P @@ -4297,15 +4353,15 @@ ENDDEF # SW_SPDT # DEF SW_SPDT SW 0 0 N Y 1 F N -F0 "SW" -200 150 50 H V C CNN -F1 "SW_SPDT" 0 -210 50 H V C CNN +F0 "SW" 0 150 50 H V C CNN +F1 "SW_SPDT" 0 -175 50 H V C CNN F2 "" 0 0 50 H V C CNN F3 "" 0 0 50 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 15 105 80 N +C -175 0 25 0 0 0 N +C 175 -100 25 0 0 0 N +C 175 100 25 0 1 0 N +P 2 0 1 0 -150 10 150 95 N X 1 1 500 100 300 L 50 50 1 1 P X 2 2 -500 0 300 R 50 50 1 1 P X 3 3 500 -100 300 L 50 50 1 1 P @@ -4378,9 +4434,9 @@ F1 "SW_SPST" 0 -150 50 H V C CNN F2 "" 0 0 50 H V C CNN F3 "" 0 0 50 H V C CNN DRAW -C -150 0 50 0 0 0 N -C 150 0 50 0 0 0 N -P 2 0 0 0 -105 20 125 115 N +C -175 0 25 0 0 0 N +C 175 0 25 0 0 0 N +P 2 0 0 0 -150 10 150 125 N X 1 1 -500 0 300 R 50 50 1 1 I X 2 2 500 0 300 L 50 50 1 1 I ENDDRAW @@ -4389,7 +4445,7 @@ ENDDEF # SW_SPST_Small # DEF SW_SPST_Small SW 0 0 N Y 1 F N -F0 "SW" 0 150 50 H V C CNN +F0 "SW" 0 125 50 H V C CNN F1 "SW_SPST_Small" 0 -100 50 H V C CNN F2 "" 0 0 50 H V C CNN F3 "" 0 0 50 H V C CNN