Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

sch legacy plugin: fix compatibility issues with old library 2.2 version

pull/3/merge
jean-pierre charras 9 years ago
parent
de46873dfe
commit
430a09a5a0
3 changed files with 252 additions and 255 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 92
      demos/electric/electric-cache.lib
  2. 60
      demos/electric/electric.sch
  3. 7
      eeschema/sch_legacy_plugin.cpp

92
demos/electric/electric-cache.lib
View File

@ -6,8 +6,8 @@ EESchema-LIBRARY Version 2.3
DEF A_1KVA EA 0 10 N Y 1 F N
F0 "EA" -90 200 40 H V C CNN
F1 "A_1KVA" 0 130 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
C -20 10 31 0 1 0 N
@ -27,8 +27,8 @@ ENDDEF
DEF C_3x1.5mm2 EC 0 10 N Y 1 F N
F0 "EC" -170 130 40 H V C CNN
F1 "C_3x1.5mm2" 0 -100 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
C -30 50 10 0 1 0 F
@ -47,8 +47,8 @@ ENDDEF
DEF C_3x2.5mm2 EC 0 10 N Y 1 F N
F0 "EC" -170 130 40 H V C CNN
F1 "C_3x2.5mm2" 0 -100 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
C -30 50 10 0 1 0 F
@ -67,8 +67,8 @@ ENDDEF
DEF C_3x6mm2 EC 0 10 N Y 1 F N
F0 "EC" -170 130 40 H V C CNN
F1 "C_3x6mm2" 0 -100 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
C -30 50 10 0 1 0 F
@ -87,8 +87,8 @@ ENDDEF
DEF D_06A ED 0 10 N Y 1 F N
F0 "ED" -160 120 40 H V C CNN
F1 "D_06A" -100 -80 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
P 3 0 1 0 -100 0 60 100 60 100 N
@ -104,8 +104,8 @@ ENDDEF
DEF D_10A ED 0 10 N Y 1 F N
F0 "ED" -160 120 40 H V C CNN
F1 "D_10A" -100 -80 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
P 3 0 1 0 -100 0 60 100 60 100 N
@ -121,8 +121,8 @@ ENDDEF
DEF D_16A ED 0 10 N Y 1 F N
F0 "ED" -160 120 40 H V C CNN
F1 "D_16A" -100 -80 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
P 3 0 1 0 -100 0 60 100 60 100 N
@ -138,8 +138,8 @@ ENDDEF
DEF D_32A ED 0 10 N Y 1 F N
F0 "ED" -160 120 40 H V C CNN
F1 "D_32A" -100 -80 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
P 3 0 1 0 -100 0 60 100 60 100 N
@ -155,8 +155,8 @@ ENDDEF
DEF G_Th_3KVA EG 0 10 N Y 1 F N
F0 "EG" -160 120 40 H V C CNN
F1 "G_Th_3KVA" 0 -120 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
T 0 0 0 70 0 0 0 G Normal 0 C C
P 2 0 0 0 200 -200 200 -200 N
@ -170,8 +170,8 @@ ENDDEF
DEF I_25A_LUM EI 0 10 N Y 1 F N
F0 "EI" -160 120 40 H V C CNN
F1 "I_25A_LUM" 0 -100 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
C 0 0 36 0 1 0 N
@ -188,8 +188,8 @@ ENDDEF
DEF J_40A_30mA EJ 0 10 N Y 1 F N
F0 "EJ" -210 180 40 H V C CNN
F1 "J_40A_30mA" -20 -120 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
T 0 120 200 20 0 0 0 OFS Normal 0 C C
P 2 0 0 0 200 -200 200 -200 N
@ -213,8 +213,8 @@ ENDDEF
DEF O_600VA EO 0 10 N Y 1 F N
F0 "EO" -70 120 40 H V C CNN
F1 "O_600VA" -40 -150 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
C -20 0 31 0 1 0 N
@ -253,8 +253,8 @@ ENDDEF
DEF O_900VA EO 0 10 N Y 1 F N
F0 "EO" -70 120 40 H V C CNN
F1 "O_900VA" -40 -150 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
C -20 0 31 0 1 0 N
@ -293,8 +293,8 @@ ENDDEF
DEF P_10A EP 0 10 N Y 1 F N
F0 "EP" -160 120 40 H V C CNN
F1 "P_10A" -80 -140 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
A 0 0 80 891 -891 0 0 0 N 1 80 1 -80
P 2 0 0 0 200 -200 200 -200 N
@ -307,8 +307,8 @@ ENDDEF
DEF Q_25A_2F2O EQ 0 10 N Y 1 F N
F0 "EQ" -160 120 40 H V C CNN
F1 "Q_25A_2F2O" 0 -140 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
T 0 90 150 20 0 0 0 O+F Normal 0 C C
S -100 -30 100 -70 0 0 0 N
@ -333,8 +333,8 @@ ENDDEF
DEF Q_2A_12O_40KV EQ 0 10 N Y 1 F N
F0 "EQ" -160 120 40 H V C CNN
F1 "Q_2A_12O_40KV" 0 -730 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
S -100 -580 100 -620 0 0 0 N
P 2 0 0 0 200 -200 200 -200 N
@ -386,8 +386,8 @@ ENDDEF
DEF R_16A_30mA ER 0 10 N Y 1 F N
F0 "ER" -210 180 40 H V C CNN
F1 "R_16A_30mA" 0 -200 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
T 0 20 -100 50 0 0 0 M Normal 0 C C
T 0 120 200 20 0 0 0 OF Normal 0 C C
@ -417,8 +417,8 @@ ENDDEF
DEF S_63A ES 0 10 N Y 1 F N
F0 "ES" -210 180 40 H V C CNN
F1 "S_63A" 0 -110 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
T 0 120 200 20 0 0 0 OFS Normal 0 C C
P 2 0 0 0 200 -200 200 -200 N
@ -445,8 +445,8 @@ ENDDEF
DEF V_A10A EV 0 10 N Y 1 F N
F0 "EV" -160 120 40 H V C CNN
F1 "V_A10A" -60 -140 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
T 0 0 0 70 0 0 0 A Normal 0 C C
P 2 0 0 0 200 -200 200 -200 N
@ -462,8 +462,8 @@ ENDDEF
DEF V_F50Hz EV 0 10 N Y 1 F N
F0 "EV" -160 120 40 H V C CNN
F1 "V_F50Hz" -40 -140 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
T 0 0 0 50 0 0 0 Hz Normal 0 C C
P 2 0 0 0 200 -200 200 -200 N
@ -477,8 +477,8 @@ ENDDEF
DEF V_U400V EV 0 10 N Y 1 F N
F0 "EV" -160 120 40 H V C CNN
F1 "V_U400V" -60 -140 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
T 0 0 0 70 0 0 0 V Normal 0 C C
P 2 0 0 0 200 -200 200 -200 N
@ -492,8 +492,8 @@ ENDDEF
DEF W_15KA EW 0 10 N Y 1 F N
F0 "EW" -160 120 40 H V C CNN
F1 "W_15KA" -50 -210 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
S -120 60 120 -60 0 1 0 N
@ -512,8 +512,8 @@ ENDDEF
DEF Y_ELC EY 0 10 N Y 1 F N
F0 "EY" -10 120 40 H V C CNN
F1 "Y_ELC" 60 -120 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F2 "" 0 0 60 H I C CNN
F3 "" 0 0 60 H I C CNN
DRAW
P 2 0 0 0 200 -200 200 -200 N
P 3 0 0 0 -50 10 -50 -10 -50 -10 N

60
demos/electric/electric.sch
View File

@ -1,12 +1,10 @@
EESchema Schematic File Version 2
LIBS:electric-rescue
LIBS:power
LIBS:elec-unifil
LIBS:device
LIBS:conn
LIBS:regul
LIBS:electric-cache
EELAYER 25 0
EELAYER 26 0
EELAYER END
$Descr A4 11693 8268
encoding utf-8
@ -137,10 +135,10 @@ Wire Wire Line
Wire Wire Line
850 3350 1200 3350
$Comp
L R_16A_30mA ER01
L R_16A_30mA ER1
U 1 1 416242BF
P 1450 2150
F 0 "ER01" H 1400 2380 40 0000 C CNN
F 0 "ER1" H 1400 2380 40 0000 C CNN
F 1 "R_16A_30mA" H 1450 1950 40 0000 C CNN
F 2 "Courbe D" H 1450 1900 30 0000 C CNN
F 3 "" H 1450 2150 60 0001 C CNN
@ -150,10 +148,10 @@ $EndComp
Wire Wire Line
850 2750 1200 2750
$Comp
L C_3x2.5mm2 EC?
L C_3x2.5mm2 EC102
U 1 1 41652EC2
P 2950 6950
F 0 "EC?" H 2780 7080 40 0000 C CNN
F 0 "EC102" H 2780 7080 40 0000 C CNN
F 1 "C_3x2.5mm2" H 2950 6850 40 0000 C CNN
F 2 "" H 2950 6950 60 0001 C CNN
F 3 "" H 2950 6950 60 0001 C CNN
@ -283,10 +281,10 @@ F 3 "" H 6300 3350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
L C_3x2.5mm2 EC?
L C_3x2.5mm2 EC101
U 1 1 41642129
P 2950 6600
F 0 "EC?" H 2780 6730 40 0000 C CNN
F 0 "EC101" H 2780 6730 40 0000 C CNN
F 1 "C_3x2.5mm2" H 2950 6500 40 0000 C CNN
F 2 "" H 2950 6600 60 0001 C CNN
F 3 "" H 2950 6600 60 0001 C CNN
@ -821,7 +819,7 @@ F 3 "" H 2550 6100 60 0001 C CNN
$EndComp
$Comp
L D_16A ED54
U 1 1 4162F875
U 1 1 5831E95C
P 2550 5750
F 0 "ED54" H 2390 5870 40 0000 C CNN
F 1 "D_16A" H 2450 5670 40 0000 C CNN
@ -865,7 +863,7 @@ F 3 "" H 2550 4700 60 0001 C CNN
$EndComp
$Comp
L D_16A ED50
U 1 1 4162F848
U 1 1 5831E958
P 2550 4350
F 0 "ED50" H 2390 4470 40 0000 C CNN
F 1 "D_16A" H 2450 4270 40 0000 C CNN
@ -887,7 +885,7 @@ F 3 "" H 8550 6100 60 0001 C CNN
$EndComp
$Comp
L D_16A ED63
U 1 1 4162F862
U 1 1 5831E95B
P 8550 5750
F 0 "ED63" H 8390 5870 40 0000 C CNN
F 1 "D_16A" H 8450 5670 40 0000 C CNN
@ -898,7 +896,7 @@ F 3 "" H 8550 5750 60 0001 C CNN
$EndComp
$Comp
L D_16A ED62
U 1 1 4162F856
U 1 1 5831E95A
P 8550 5400
F 0 "ED62" H 8390 5520 40 0000 C CNN
F 1 "D_16A" H 8450 5320 40 0000 C CNN
@ -909,7 +907,7 @@ F 3 "" H 8550 5400 60 0001 C CNN
$EndComp
$Comp
L D_16A ED61
U 1 1 4162F84D
U 1 1 5831E959
P 8550 4800
F 0 "ED61" H 8390 4920 40 0000 C CNN
F 1 "D_16A" H 8450 4720 40 0000 C CNN
@ -1042,7 +1040,7 @@ F 3 "" H 5900 3350 60 0001 C CNN
$EndComp
$Comp
L D_06A ED32
U 1 1 4162F2EE
U 1 1 5831E955
P 8550 3600
F 0 "ED32" H 8390 3720 40 0000 C CNN
F 1 "D_06A" H 8450 3520 40 0000 C CNN
@ -1053,7 +1051,7 @@ F 3 "" H 8550 3600 60 0001 C CNN
$EndComp
$Comp
L D_06A ED33
U 1 1 4162F2D8
U 1 1 5831E954
P 8550 3950
F 0 "ED33" H 8390 4070 40 0000 C CNN
F 1 "D_06A" H 8450 3870 40 0000 C CNN
@ -1109,7 +1107,7 @@ F 3 "" H 8550 2400 60 0001 C CNN
$EndComp
$Comp
L D_06A ED31
U 1 1 4162F2D8
U 1 1 5831E953
P 8550 3250
F 0 "ED31" H 8390 3370 40 0000 C CNN
F 1 "D_06A" H 8450 3170 40 0000 C CNN
@ -1120,7 +1118,7 @@ F 3 "" H 8550 3250 60 0001 C CNN
$EndComp
$Comp
L D_06A ED11
U 1 1 4162F301
U 1 1 5831E957
P 8550 650
F 0 "ED11" H 8390 770 40 0000 C CNN
F 1 "D_06A" H 8450 570 40 0000 C CNN
@ -1131,7 +1129,7 @@ F 3 "" H 8550 650 60 0001 C CNN
$EndComp
$Comp
L D_06A ED12
U 1 1 4162F2F6
U 1 1 5831E956
P 8550 1000
F 0 "ED12" H 8390 1120 40 0000 C CNN
F 1 "D_06A" H 8450 920 40 0000 C CNN
@ -1164,7 +1162,7 @@ F 3 "wc2, douche, lingerie" H 10180 1680 40 0000 C CNN
$EndComp
$Comp
L D_10A ED25
U 1 1 4162F22A
U 1 1 5831E952
P 5900 1900
F 0 "ED25" H 5740 2020 40 0000 C CNN
F 1 "D_10A" H 5800 1820 40 0000 C CNN
@ -1175,7 +1173,7 @@ F 3 "" H 5900 1900 60 0001 C CNN
$EndComp
$Comp
L D_10A ED22
U 1 1 4162F1F7
U 1 1 5831E951
P 5900 1500
F 0 "ED22" H 5740 1620 40 0000 C CNN
F 1 "D_10A" H 5800 1420 40 0000 C CNN
@ -1186,7 +1184,7 @@ F 3 "" H 5900 1500 60 0001 C CNN
$EndComp
$Comp
L D_10A ED21
U 1 1 4162F1F0
U 1 1 5831E950
P 5900 1150
F 0 "ED21" H 5750 1250 40 0000 C CNN
F 1 "D_10A" H 5800 1070 40 0000 C CNN
@ -1197,7 +1195,7 @@ F 3 "" H 5900 1150 60 0001 C CNN
$EndComp
$Comp
L D_10A ED20
U 1 1 4162F1CA
U 1 1 5831E94F
P 5900 800
F 0 "ED20" H 5740 920 40 0000 C CNN
F 1 "D_10A" H 5800 720 40 0000 C CNN
@ -1314,10 +1312,10 @@ F 3 "" H 4250 2400 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
L Q_25A_2F2O EQ1b
L Q_25A_2F2O EQ1b101
U 1 1 416245A7
P 2800 2400
F 0 "EQ1b" H 2700 2550 40 0000 C CNN
F 0 "EQ1b101" H 2700 2550 40 0000 C CNN
F 1 "Q_25A_2F2O" H 2800 2260 40 0000 C CNN
F 2 "" H 2800 2400 60 0001 C CNN
F 3 "" H 2800 2400 60 0001 C CNN
@ -1336,10 +1334,10 @@ F 3 "" H 2400 2400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
L Q_25A_2F2O EQ1a
L Q_25A_2F2O EQ1a101
U 1 1 41624555
P 2000 2400
F 0 "EQ1a" H 1900 2550 40 0000 C CNN
F 0 "EQ1a101" H 1900 2550 40 0000 C CNN
F 1 "Q_25A_2F2O" H 2000 2260 40 0000 C CNN
F 2 "" H 2000 2400 60 0001 C CNN
F 3 "" H 2000 2400 60 0001 C CNN
@ -1391,10 +1389,10 @@ F 3 "" H 1450 3350 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
L R_16A_30mA ER02
L R_16A_30mA ER2
U 1 1 416242F0
P 1450 2750
F 0 "ER02" H 1240 2930 40 0000 C CNN
F 0 "ER2" H 1240 2930 40 0000 C CNN
F 1 "R_16A_30mA" H 1450 2550 40 0000 C CNN
F 2 "Courbe B" H 1450 2500 30 0000 C CNN
F 3 "" H 1450 2750 60 0001 C CNN
@ -1439,10 +1437,10 @@ $EndComp
Wire Wire Line
1350 1350 1350 1500
$Comp
L W_15KA EW01
L W_15KA EW1
U 1 1 41618802
P 1800 1150
F 0 "EW01" H 1800 1300 40 0000 C CNN
F 0 "EW1" H 1800 1300 40 0000 C CNN
F 1 "W_15KA" H 1800 950 40 0000 C CNN
F 2 "" H 1800 1150 60 0001 C CNN
F 3 "" H 1800 1150 60 0001 C CNN

7
eeschema/sch_legacy_plugin.cpp
View File

@ -2364,9 +2364,9 @@ LIB_PART* SCH_LEGACY_PLUGIN_CACHE::loadPart( FILE_LINE_READER& aReader )
reference.SetText( prefix );
}
// In version 2.0 and earlier, this parameter was a '0' which was just a place holder.
// In version 2.2 and earlier, this parameter was a '0' which was just a place holder.
// The was no concept of interchangeable multiple unit symbols.
if( LIB_VERSION( m_versionMajor, m_versionMinor ) <= LIB_VERSION( 2, 0 ) )
if( LIB_VERSION( m_versionMajor, m_versionMinor ) <= LIB_VERSION( 2, 2 ) )
{
// Nothing needs to be set since the default setting for symbols with multiple
// units were never interchangeable. Just parse the 0 an move on.
@ -2735,12 +2735,11 @@ LIB_ARC* SCH_LEGACY_PLUGIN_CACHE::loadArc( std::unique_ptr< LIB_PART >& aPart,
arc->SetUnit( parseInt( aReader, line, &line ) );
arc->SetConvert( parseInt( aReader, line, &line ) );
arc->SetWidth( parseInt( aReader, line, &line ) );
arc->SetFillMode( parseFillMode( aReader, line, &line ) );
// Actual Coordinates of arc ends are read from file
if( *line != 0 )
{
arc->SetFillMode( parseFillMode( aReader, line, &line ) );
wxPoint arcStart, arcEnd;
arcStart.x = parseInt( aReader, line, &line );

Write Preview
Loading…
Cancel
Save