Merge pull request #104 from samdolt/issue_97

Rework of device.lib

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

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

library/device.dcm

@@ -1,83 +1,51 @@
 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 Condensateur non polarise
+D Unpolarized capacitor
-$ENDCMP
-#
-$CMP CAPAPOL
-D Condensateur polarise
-$ENDCMP
-#
-$CMP CERAMIC_FILTER
-D Ceramic filter
-K FILTER
-$ENDCMP
-#
-$CMP CODING_SWITCH
-D CODING SWITCH 4 Bits
-K SWITCH
 $ENDCMP
 #
 $CMP CP
-D Condensateur polarise
+D Polarised capacitor
 $ENDCMP
 #
 $CMP CP1
-D Condensateur polarise
+D Polarised capacitor
 $ENDCMP
 #
-$CMP DIODE
+$CMP CP1_Small
-D Diode simple
+D Polarised capacitor
-K DEV DIODE
 $ENDCMP
 #
-$CMP DIODESCH
+$CMP CP_Small
-D Diode schottky
+D Polarised capacitor
-K DEV DIODE
 $ENDCMP
 #
-$CMP DISPLAY
+$CMP CTRIM
-D Afficheur LCD nLignes
+D Variable capacitor
-K DEV
+K trimmer
 $ENDCMP
 #
-$CMP DISPLAY_3_LIGNE
+$CMP C_Small
-D DISPLAY EA7123-12C
+D Unpolarized capacitor
 $ENDCMP
 #
-$CMP DISPLAY_BL
+$CMP Coded_Switch
-D Afficheur LCD nLignes
+D 4 bits rotary switch
-K DEV
+K Rotary, Hex
 $ENDCMP
 #
-$CMP DOUBLE_SCHOTTKY
+$CMP Crystal
-D Double diode Shottky (Serie)
+D Two pin crystal
-K DEV DIODE
+K Quartz, Ceramic, Filter, Resonator
 $ENDCMP
 #
-$CMP DOUBLE_SCH_KCOM
+$CMP Crystal_Small
-D Double diode Shottky Cathodes communes
+D Two pin crystal
-K DEV DIODE
+K Quartz, Resonator, Ceramic, Filter
 $ENDCMP
 #
-$CMP DPST
+$CMP D
-D Interrupteur double
+D Diode
-K switch
 $ENDCMP
 #
 $CMP DUAL_POT
@@ -85,9 +53,35 @@ D Potentionmetre
 K R
 $ENDCMP
 #
-$CMP DUAL_SWITCH_INV
+$CMP D_Schottky
-D Dual Switch inverseur
+D Diode schottky
-K switch
+$ENDCMP
+#
+$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
 $ENDCMP
 #
 $CMP EMI_FILTER
@@ -105,6 +99,24 @@ 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
+$ENDCMP
+#
+$CMP Jumper_NO_Small
+D Jumper normally open
+K Jumper, Link
+$ENDCMP
+#
 $CMP LED
 K LED
 $ENDCMP
@@ -119,6 +131,24 @@ D Common Cathode RGB LED
 K RGB LED
 $ENDCMP
 #
+$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 Led_x2
+D LED DOUBLE type Bicolore
+K LED
+$ENDCMP
+#
 $CMP PHOTORESISTOR
 D Photo resistor
 $ENDCMP
@@ -128,11 +158,6 @@ D Potentionmetre
 K R
 $ENDCMP
 #
-$CMP Photores
-D Photores
-K R PR Photo Photoresistor
-$ENDCMP
-#
 $CMP Q_NIGBT_CEG
 D Transistor N-IGBT (general)
 K igbt n-igbt transistor
@@ -394,7 +419,7 @@ K pnp transistor
 $ENDCMP
 #
 $CMP R
-D Resistance
+D Resistor
 K R DEV
 $ENDCMP
 #
@@ -413,6 +438,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
@@ -447,6 +476,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

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

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