From e185969815dbe931249579904bad536f420f78b6 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Sun, 4 Jun 2017 22:25:30 +0200 Subject: [PATCH] moved symbols to conn.lib + removed country-specific symbols --- library/conn.dcm | 18 +++ library/conn.lib | 108 +++++++++++++++++- library/power_connectors.dcm | 51 --------- library/power_connectors.lib | 208 ----------------------------------- 4 files changed, 120 insertions(+), 265 deletions(-) delete mode 100644 library/power_connectors.dcm delete mode 100644 library/power_connectors.lib diff --git a/library/conn.dcm b/library/conn.dcm index 0da36c98..bd6f4e35 100644 --- a/library/conn.dcm +++ b/library/conn.dcm @@ -545,6 +545,24 @@ D double coaxial connector (BNC, SMA, SMB, SMC, Cinch/RCA, ...) K BNC SMA SMB SMC coaxial connector CINCH RCA $ENDCMP # +$CMP Conn_WallPlug +D 3-pin general wall plug, no Earth wire (110VAC, 220VAC) +K wall plug 110VAC 220VAC +F ~ +$ENDCMP +# +$CMP Conn_WallPlug_Earth +D 3-pin general wall plug, with Earth wire (110VAC, 220VAC) +K wall plug 110VAC 220VAC +F ~ +$ENDCMP +# +$CMP Conn_WallSocket +D 3-pin german wall socket, no Earth wire (110VAC, 220VAC) +K wall socket 110VAC 220VAC +F ~ +$ENDCMP +# $CMP DB15_FEMALE D 15-pin female D-SUB connector (low-density/2 columns) K female D-SUB connector diff --git a/library/conn.lib b/library/conn.lib index d05b43ba..b5bce96d 100644 --- a/library/conn.lib +++ b/library/conn.lib @@ -7340,6 +7340,102 @@ X EXT 3 0 -300 100 U 50 50 1 1 P ENDDRAW ENDDEF # +# Conn_WallPlug +# +DEF Conn_WallPlug K 0 0 Y Y 1 F N +F0 "K" -50 175 50 H V C BNN +F1 "Conn_WallPlug" -225 0 50 V V C BNN +F2 "" 400 0 50 H I C CNN +F3 "" 400 0 50 H I C CNN +DRAW +A -125 0 150 -899 899 0 1 10 f -125 -150 -125 150 +P 2 0 1 20 -175 -100 -25 -100 N +P 2 0 1 20 -175 100 -25 100 N +P 2 0 1 10 -125 -150 -125 150 N +P 2 0 1 0 -25 -100 100 -100 N +P 2 0 1 0 -25 100 100 100 N +X AC_P 1 200 100 200 L 50 50 1 1 w +X AC_N 2 200 -100 200 L 50 50 1 1 w +ENDDRAW +ENDDEF +# +# Conn_WallPlug_Earth +# +DEF Conn_WallPlug_Earth K 0 0 Y Y 1 F N +F0 "K" 0 150 50 H V C BNN +F1 "Conn_WallPlug_Earth" -200 0 50 V V C BNN +F2 "" 400 0 50 H I C CNN +F3 "" 400 0 50 H I C CNN +DRAW +A -125 0 150 -899 899 0 1 10 f -125 -150 -125 150 +C 100 -300 14 0 1 0 F +P 2 0 1 20 -175 -100 -25 -100 N +P 2 0 1 20 -175 0 20 0 N +P 2 0 1 20 -175 100 -25 100 N +P 2 0 1 10 -125 -150 -125 150 N +P 2 0 1 0 -25 -100 100 -100 N +P 2 0 1 0 -25 100 100 100 N +P 2 0 1 8 60 -370 140 -370 N +P 2 0 1 8 70 -390 130 -390 N +P 2 0 1 8 80 -410 120 -410 N +P 2 0 1 8 90 -430 110 -430 N +P 2 0 1 8 100 -300 100 -350 N +P 2 0 1 8 150 -350 50 -350 N +P 4 0 1 0 100 -300 75 -300 75 0 -175 0 N +X AC_P 1 300 100 200 L 50 50 1 1 w +X AC_N 2 300 -100 200 L 50 50 1 1 w +X EARTH 3 300 -300 200 L 50 50 1 1 P +ENDDRAW +ENDDEF +# +# Conn_WallSocket +# +DEF Conn_WallSocket K 0 0 Y Y 1 F N +F0 "K" 50 175 50 H V C BNN +F1 "Conn_WallSocket" 200 0 50 V V C BNN +F2 "" -400 0 50 H I C CNN +F3 "" -400 0 50 H I C CNN +DRAW +A 125 0 150 901 -901 0 1 10 f 125 150 125 -150 +S 125 -110 60 -90 0 1 0 N +S 125 90 60 110 0 1 0 N +P 2 0 1 0 60 -100 -100 -100 N +P 2 0 1 0 60 100 -100 100 N +P 2 0 1 10 125 -150 125 150 N +X AC_P 1 -200 100 200 R 50 50 1 1 W +X AC_N 2 -200 -100 200 R 50 50 1 1 W +ENDDRAW +ENDDEF +# +# Conn_WallSocket_Earth +# +DEF Conn_WallSocket_Earth K 0 0 Y Y 1 F N +F0 "K" 150 275 50 H V C BNN +F1 "Conn_WallSocket_Earth" 300 100 50 V V C BNN +F2 "" -300 100 50 H I C CNN +F3 "" -300 100 50 H I C CNN +DRAW +A 225 100 150 901 -901 0 1 10 f 225 250 225 -50 +C 0 -200 14 0 1 0 F +S 225 -10 160 10 0 1 0 N +S 225 90 160 110 0 1 0 N +S 225 190 160 210 0 1 0 N +P 2 0 1 8 -50 -250 50 -250 N +P 2 0 1 8 0 -200 0 -250 N +P 2 0 1 8 10 -330 -10 -330 N +P 2 0 1 8 20 -310 -20 -310 N +P 2 0 1 8 30 -290 -30 -290 N +P 2 0 1 8 40 -270 -40 -270 N +P 2 0 1 0 160 0 0 0 N +P 2 0 1 0 160 200 0 200 N +P 2 0 1 10 225 -50 225 250 N +P 4 0 1 0 0 -200 25 -200 25 100 160 100 N +X AC_P 1 -200 200 200 R 50 50 1 1 W +X AC_N 2 -200 0 200 R 50 50 1 1 W +X EARTH 3 -200 -200 200 R 50 50 1 1 P +ENDDRAW +ENDDEF +# # DB15_FEMALE # DEF DB15_FEMALE J 0 40 Y N 1 F N @@ -12263,11 +12359,11 @@ S 400 1010 360 990 0 0 0 N S 400 1110 360 1090 0 0 0 N S 400 1210 360 1190 0 0 0 N S 400 1310 360 1290 0 0 0 N -A -275 -150 25 -1799 -1 0 1 10 F -300 -150 -250 -150 -A -275 -150 75 -1799 -1 0 1 20 N -350 -150 -200 -150 A -275 -150 25 -1799 -1 0 1 10 N -300 -150 -250 -150 -A -275 150 25 1 1799 0 1 10 F -250 150 -300 150 +A -275 -150 75 -1799 -1 0 1 20 N -350 -150 -200 -150 +A -275 -150 25 -1799 -1 0 1 10 F -300 -150 -250 -150 A -275 150 25 1 1799 0 1 10 N -250 150 -300 150 +A -275 150 25 1 1799 0 1 10 F -250 150 -300 150 A -275 150 75 1 1799 0 1 20 N -200 150 -350 150 C -130 175 25 0 1 10 F S -400 1400 400 -1400 0 1 10 f @@ -12342,11 +12438,11 @@ S 400 1110 360 1090 0 0 0 N S 400 1210 360 1190 0 0 0 N S 400 1310 360 1290 0 0 0 N A -275 -150 25 -1799 -1 0 1 10 F -300 -150 -250 -150 -A -275 -150 75 -1799 -1 0 1 20 N -350 -150 -200 -150 A -275 -150 25 -1799 -1 0 1 10 N -300 -150 -250 -150 -A -275 150 25 1 1799 0 1 10 F -250 150 -300 150 -A -275 150 25 1 1799 0 1 10 N -250 150 -300 150 +A -275 -150 75 -1799 -1 0 1 20 N -350 -150 -200 -150 A -275 150 75 1 1799 0 1 20 N -200 150 -350 150 +A -275 150 25 1 1799 0 1 10 N -250 150 -300 150 +A -275 150 25 1 1799 0 1 10 F -250 150 -300 150 C -130 175 25 0 1 10 F S -400 1400 400 -1400 0 1 10 f S -300 -150 -250 150 0 1 10 F diff --git a/library/power_connectors.dcm b/library/power_connectors.dcm deleted file mode 100644 index 1118a321..00000000 --- a/library/power_connectors.dcm +++ /dev/null @@ -1,51 +0,0 @@ -EESchema-DOCLIB Version 2.0 -# -$CMP Conn_WallPlug -D 3-pin general wall plug, no Earth wire (110VAC, 220VAC) -K wall plug 110VAC 220VAC -F ~ -$ENDCMP -# -$CMP Conn_WallPlug_ALT -D 3-pin wall plug, alternate symbol, no earth wire (110VAC, 220VAC) -K wall plug 110VAC 220VAC -F ~ -$ENDCMP -# -$CMP Conn_WallPlug_ALT_Earth -D 3-pin wall plug, alternate symbol (110VAC, 220VAC) -K wall plug 110VAC 220VAC -F ~ -$ENDCMP -# -$CMP Conn_WallPlug_Earth -D 3-pin general wall plug, with Earth wire (110VAC, 220VAC) -K wall plug 110VAC 220VAC -F ~ -$ENDCMP -# -$CMP Conn_WallSocket -D 3-pin general wall socket, no Earth wire (110VAC, 220VAC) -K wall socket 110VAC 220VAC -F ~ -$ENDCMP -# -$CMP Conn_WallSocket_DE -D 3-pin german wall socket, no Earth wire (110VAC, 220VAC) -K wall socket 110VAC 220VAC -F ~ -$ENDCMP -# -$CMP Conn_WallSocket_DE_Earth -D 3-pin german wall socket, with Earth wire (110VAC, 220VAC) -K wall socket 110VAC 220VAC -F ~ -$ENDCMP -# -$CMP Conn_WallSocket_Earth -D 3-pin general wall socket, with Earth wire (110VAC, 220VAC) -K wall socket 110VAC 220VAC -F ~ -$ENDCMP -# -#End Doc Library diff --git a/library/power_connectors.lib b/library/power_connectors.lib deleted file mode 100644 index 1e699c7c..00000000 --- a/library/power_connectors.lib +++ /dev/null @@ -1,208 +0,0 @@ -EESchema-LIBRARY Version 2.3 -#encoding utf-8 -# -# Conn_WallPlug -# -DEF Conn_WallPlug K 0 0 Y Y 1 F N -F0 "K" -50 175 50 H V C BNN -F1 "Conn_WallPlug" -225 0 50 V V C BNN -F2 "" 400 0 50 H I C CNN -F3 "" 400 0 50 H I C CNN -DRAW -A -125 0 150 -899 899 0 1 10 f -125 -150 -125 150 -P 2 0 1 20 -175 -100 -25 -100 N -P 2 0 1 20 -175 100 -25 100 N -P 2 0 1 10 -125 -150 -125 150 N -P 2 0 1 0 -25 -100 100 -100 N -P 2 0 1 0 -25 100 100 100 N -X AC_P 1 200 100 200 L 50 50 1 1 w -X AC_N 2 200 -100 200 L 50 50 1 1 w -ENDDRAW -ENDDEF -# -# Conn_WallPlug_ALT -# -DEF Conn_WallPlug_ALT K 0 0 Y Y 1 F N -F0 "K" -275 405 50 H V L CNN -F1 "Conn_WallPlug_ALT" -275 330 50 H V L CNN -F2 "" -215 75 50 H I C CNN -F3 "" 200 0 50 H I C CNN -DRAW -A -283 96 129 909 84 0 1 60 N -285 225 -155 115 -A -175 -725 729 590 841 0 1 10 N 200 -100 -100 0 -A -175 725 729 -841 -590 0 1 10 N -100 0 200 100 -A -27 129 129 -891 -1716 0 1 60 N -25 0 -155 110 -S -510 375 -310 75 0 1 10 f -S -285 250 -310 200 0 1 10 F -P 2 0 1 59 -660 125 -535 125 N -P 2 0 1 59 -535 325 -660 325 N -P 2 0 1 59 -510 50 -510 400 N -P 2 0 1 39 -510 225 -610 225 N -X AC_P 1 400 100 200 L 50 50 1 1 w -X AC_N 2 400 -100 200 L 50 50 1 1 w -ENDDRAW -ENDDEF -# -# Conn_WallPlug_ALT_Earth -# -DEF Conn_WallPlug_ALT_Earth K 0 0 Y Y 1 F N -F0 "K" -175 405 50 H V L CNN -F1 "Conn_WallPlug_ALT_Earth" -175 330 50 H V L CNN -F2 "" -115 75 50 H I C CNN -F3 "" 300 100 50 H I C CNN -DRAW -A -183 96 129 909 84 0 1 60 N -185 225 -55 115 -A -14 -344 344 877 246 0 1 10 N 0 0 300 -200 -A -4 329 329 -893 -230 0 1 10 N 0 0 300 200 -A 73 129 129 -891 -1716 0 1 60 N 75 0 -55 110 -C 300 -200 14 0 1 10 F -S -410 375 -210 75 0 1 10 f -S -185 250 -210 200 0 1 10 F -P 2 0 1 59 -560 125 -435 125 N -P 2 0 1 59 -435 325 -560 325 N -P 2 0 1 59 -410 50 -410 400 N -P 2 0 1 39 -410 225 -510 225 N -P 2 0 1 10 30 0 300 0 N -P 2 0 1 8 260 -270 340 -270 N -P 2 0 1 8 270 -290 330 -290 N -P 2 0 1 8 280 -310 320 -310 N -P 2 0 1 8 290 -330 310 -330 N -P 2 0 1 8 300 -200 300 -250 N -P 2 0 1 8 350 -250 250 -250 N -X AC_P 1 500 200 200 L 50 50 1 1 w -X AC_N 2 500 0 200 L 50 50 1 1 w -X EARTH 3 500 -200 200 L 50 50 1 1 P -ENDDRAW -ENDDEF -# -# Conn_WallPlug_Earth -# -DEF Conn_WallPlug_Earth K 0 0 Y Y 1 F N -F0 "K" 0 150 50 H V C BNN -F1 "Conn_WallPlug_Earth" -200 0 50 V V C BNN -F2 "" 400 0 50 H I C CNN -F3 "" 400 0 50 H I C CNN -DRAW -A -125 0 150 -899 899 0 1 10 f -125 -150 -125 150 -C 100 -300 14 0 1 0 F -P 2 0 1 20 -175 -100 -25 -100 N -P 2 0 1 20 -175 0 20 0 N -P 2 0 1 20 -175 100 -25 100 N -P 2 0 1 10 -125 -150 -125 150 N -P 2 0 1 0 -25 -100 100 -100 N -P 2 0 1 0 -25 100 100 100 N -P 2 0 1 8 60 -370 140 -370 N -P 2 0 1 8 70 -390 130 -390 N -P 2 0 1 8 80 -410 120 -410 N -P 2 0 1 8 90 -430 110 -430 N -P 2 0 1 8 100 -300 100 -350 N -P 2 0 1 8 150 -350 50 -350 N -P 4 0 1 0 100 -300 75 -300 75 0 -175 0 N -X AC_P 1 300 100 200 L 50 50 1 1 w -X AC_N 2 300 -100 200 L 50 50 1 1 w -X EARTH 3 300 -300 200 L 50 50 1 1 P -ENDDRAW -ENDDEF -# -# Conn_WallSocket -# -DEF Conn_WallSocket K 0 0 Y Y 1 F N -F0 "K" 50 175 50 H V C BNN -F1 "Conn_WallSocket" 200 0 50 V V C BNN -F2 "" -400 0 50 H I C CNN -F3 "" -400 0 50 H I C CNN -DRAW -A 125 0 150 901 -901 0 1 10 f 125 150 125 -150 -S 125 -110 60 -90 0 1 0 N -S 125 90 60 110 0 1 0 N -P 2 0 1 0 60 -100 -100 -100 N -P 2 0 1 0 60 100 -100 100 N -P 2 0 1 10 125 -150 125 150 N -X AC_P 1 -200 100 200 R 50 50 1 1 W -X AC_N 2 -200 -100 200 R 50 50 1 1 W -ENDDRAW -ENDDEF -# -# Conn_WallSocket_DE -# -DEF Conn_WallSocket_DE K 0 0 Y Y 1 F N -F0 "K" -75 225 50 H V L BNN -F1 "Conn_WallSocket_DE" -300 -350 50 H V L BNN -F2 "" -400 0 50 H I C CNN -F3 "" -400 0 50 H I C CNN -DRAW -A 225 0 230 1675 125 0 1 0 N 0 50 450 50 -A 225 0 230 -125 -1675 0 1 0 N 450 -50 0 -50 -C 225 -100 50 0 1 8 F -C 225 0 266 0 1 0 N -C 225 100 50 0 1 8 F -P 2 0 1 0 -275 -100 225 -100 N -P 2 0 1 0 225 100 -275 100 N -P 4 0 1 0 0 -50 25 -50 25 50 0 50 N -P 4 0 1 0 450 50 425 50 425 -50 450 -50 N -X AC_P 1 -300 100 200 R 50 50 1 1 W -X AC_N 2 -300 -100 200 R 50 50 1 1 W -ENDDRAW -ENDDEF -# -# Conn_WallSocket_DE_Earth -# -DEF Conn_WallSocket_DE_Earth K 0 0 Y Y 1 F N -F0 "K" -75 200 50 H V L BNN -F1 "Conn_WallSocket_DE_Earth" -25 -350 50 H V L BNN -F2 "" -400 0 50 H I C CNN -F3 "" -400 0 50 H I C CNN -DRAW -A 225 0 230 1675 125 0 1 0 N 0 50 450 50 -A 225 0 230 -125 -1675 0 1 0 N 450 -50 0 -50 -C -100 -300 14 0 1 0 F -C 225 -100 50 0 1 8 F -C 225 0 266 0 1 0 N -C 225 100 50 0 1 8 F -P 2 0 1 0 -275 -100 225 -100 N -P 2 0 1 8 -150 -350 -50 -350 N -P 2 0 1 8 -100 -300 -100 -350 N -P 2 0 1 8 -90 -430 -110 -430 N -P 2 0 1 8 -80 -410 -120 -410 N -P 2 0 1 8 -70 -390 -130 -390 N -P 2 0 1 8 -60 -370 -140 -370 N -P 2 0 1 0 225 100 -275 100 N -P 4 0 1 0 -200 -300 -50 -300 -50 -230 230 -230 N -P 4 0 1 0 0 -50 25 -50 25 50 0 50 N -P 4 0 1 0 450 50 425 50 425 -50 450 -50 N -X AC_P 1 -300 100 200 R 50 50 1 1 W -X AC_N 2 -300 -100 200 R 50 50 1 1 W -X EARTH 3 -300 -300 200 R 50 50 1 1 P -ENDDRAW -ENDDEF -# -# Conn_WallSocket_Earth -# -DEF Conn_WallSocket_Earth K 0 0 Y Y 1 F N -F0 "K" 150 275 50 H V C BNN -F1 "Conn_WallSocket_Earth" 300 100 50 V V C BNN -F2 "" -300 100 50 H I C CNN -F3 "" -300 100 50 H I C CNN -DRAW -A 225 100 150 901 -901 0 1 10 f 225 250 225 -50 -C 0 -200 14 0 1 0 F -S 225 -10 160 10 0 1 0 N -S 225 90 160 110 0 1 0 N -S 225 190 160 210 0 1 0 N -P 2 0 1 8 -50 -250 50 -250 N -P 2 0 1 8 0 -200 0 -250 N -P 2 0 1 8 10 -330 -10 -330 N -P 2 0 1 8 20 -310 -20 -310 N -P 2 0 1 8 30 -290 -30 -290 N -P 2 0 1 8 40 -270 -40 -270 N -P 2 0 1 0 160 0 0 0 N -P 2 0 1 0 160 200 0 200 N -P 2 0 1 10 225 -50 225 250 N -P 4 0 1 0 0 -200 25 -200 25 100 160 100 N -X AC_P 1 -200 200 200 R 50 50 1 1 W -X AC_N 2 -200 0 200 R 50 50 1 1 W -X EARTH 3 -200 -200 200 R 50 50 1 1 P -ENDDRAW -ENDDEF -# -#End Library