Consolidated EMI filters

library/device.dcm

@@ -145,16 +145,16 @@ D Diode
 K diode
 $ENDCMP
 #
-$CMP EMI_FILTER
+$CMP EMI_FILTER_2pin
-D EMI Filter, three pins
-K electromagnetic interference noise
-$ENDCMP
-#
-$CMP FILTER
 D EMI Filter, two pins
 K emi electromagnetic interference noise
 $ENDCMP
 #
+$CMP EMI_FILTER_3pin
+D EMI Filter, three pins
+K electromagnetic interference noise
+$ENDCMP
+#
 $CMP FUSE
 D Fuse, generic
 K fuse

library/device.lib

@@ -681,11 +681,29 @@ X A 2 100 0 70 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# EMI_FILTER
+# EMI_FILTER_2pin
 #
-DEF EMI_FILTER FL 0 40 Y N 1 F N
+DEF EMI_FILTER_2pin FL 0 40 Y N 1 F N
+F0 "FL" 0 150 50 H V C CNN
+F1 "EMI_FILTER_2pin" 0 -100 50 H V C CNN
+F2 "" -50 0 50 H V C CNN
+F3 "" -50 0 50 H V C CNN
+DRAW
+A -100 0 50 1 1799 0 1 0 N -50 0 -150 0
+A -50 0 0 0 0 0 1 0 N -50 0 -50 0
+A 0 0 50 1 1799 0 1 0 N 50 0 -50 0
+A 100 0 50 1 1799 0 1 0 N 150 0 50 0
+S -175 75 175 -50 0 1 10 f
+X 1 1 -300 0 150 R 50 50 1 1 P
+X 2 2 300 0 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# EMI_FILTER_3pin
+#
+DEF EMI_FILTER_3pin FL 0 40 Y N 1 F N
 F0 "FL" -300 150 50 H V L CNN
-F1 "EMI_FILTER" 0 150 50 H V L CNN
+F1 "EMI_FILTER_3pin" 0 150 50 H V L CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -702,24 +720,6 @@ X VO 3 300 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# FILTER
-#
-DEF FILTER FL 0 40 Y N 1 F N
-F0 "FL" 0 150 50 H V C CNN
-F1 "FILTER" 0 -100 50 H V C CNN
-F2 "" -50 0 50 H V C CNN
-F3 "" -50 0 50 H V C CNN
-DRAW
-A -100 0 50 1 1799 0 1 0 N -50 0 -150 0
-A -50 0 0 0 0 0 1 0 N -50 0 -50 0
-A 0 0 50 1 1799 0 1 0 N 50 0 -50 0
-A 100 0 50 1 1799 0 1 0 N 150 0 50 0
-S -175 75 175 -50 0 1 10 f
-X 1 1 -300 0 150 R 50 50 1 1 P
-X 2 2 300 0 150 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # FUSE
 #
 DEF FUSE F 0 10 Y Y 1 F N