Date:2010-09-12 21:47:08 (13 years 6 months ago)
Author:Werner Almesberger
Commit:f2824f1d3592554857613705903ebc4cac62975d
Message:Moved all capacitor tolerance and _E12_P translations to shared includes.

- bom/lib/captol.inc: translation of all capacitor tolerance values
- bom/lib/e12.inc: translation of E12 values (for pico-based scale for now)
- bom/avx.gen, bom/johanson.gen, bom/murata.gen, bom/tdk.gen, bom/yageo.gen:
include libraries instead of copying the same tables
Files: bom/avx.gen (2 diffs)
bom/johanson.gen (1 diff)
bom/lib/captol.inc (1 diff)
bom/lib/e12.inc (1 diff)
bom/murata.gen (1 diff)
bom/tdk.gen (2 diffs)
bom/yageo.gen (2 diffs)

Change Details

bom/avx.gen
1010    _M=A -> M=NP0
1111    _M=D -> M=X5R
1212
13    _TOL=B -> TOL=0.10pF
14    _TOL=C -> TOL=0.25pF
15    _TOL=D -> TOL=0.5pF
16    _TOL=F -> TOL=1%
17    _TOL=J -> TOL=5%
18    _TOL=K -> TOL=10%
19    _TOL=M -> TOL=20%
20    _TOL=Z -> TOL=80/20%
13    include lib/captol.inc
2114
2215    _V=4 -> V=4V
2316    _V=6 -> V=6.3V
...... 
3124    _V=7 -> V=500V
3225}
3326
34# E12 scale, base multiplier is 10^-12 (pico)
35
36_E12_P=(??)8 -> _E12=${_E12_P:1}0f
37_E12_P=(?)(?)9 -> _E12=$_E12_P:1.${_E12_P:2}p
38_E12_P=(??)0 -> _E12=${_E12_P:1}p
39_E12_P=(??)1 -> _E12=${_E12_P:1}0p
40_E12_P=(?)(?)2 -> _E12=$_E12_P:1.${_E12_P:2}n
41_E12_P=(??)3 -> _E12=${_E12_P:1}n
42_E12_P=(??)4 -> _E12=${_E12_P:1}0n
43_E12_P=(?)(?)5 -> _E12=$_E12_P:1.${_E12_P:2}u
44_E12_P=(??)6 -> _E12=${_E12_P:1}u
45_E12_P=(??)7 -> _E12=${_E12_P:1}0u
46
47# remove trailing zeroes
48
49_E12=(*).0([fpnu]) -> _E12=$_E12:1$_E12:2
50_E12=(*).0 -> _E12=$_E12:1
27include lib/e12.inc
5128
5229T=C -> C=${_E12}F !
bom/johanson.gen
5050    _M=Z -> M=Z5U
5151    _M=Y -> M=Y5V
5252
53    _TOL=A -> TOL=0.05pF
54    _TOL=B -> TOL=0.10pF
55    _TOL=C -> TOL=0.25pF
56    _TOL=D -> TOL=0.5pF
57    _TOL=F -> TOL=1%
58    _TOL=G -> TOL=2%
59    _TOL=J -> TOL=5%
60    _TOL=K -> TOL=10%
61    _TOL=M -> TOL=20%
62    _TOL=Z -> TOL=80/20%
53    include lib/captol.inc
6354}
6455
65# E12 scale, base multiplier is 10^-12 (pico)
66
67_E12_P=(??)8 -> _E12=${_E12_P:1}0f
68_E12_P=(?)(?)9 -> _E12=$_E12_P:1.${_E12_P:2}p
69_E12_P=(??)0 -> _E12=${_E12_P:1}p
70_E12_P=(??)1 -> _E12=${_E12_P:1}0p
71_E12_P=(?)(?)2 -> _E12=$_E12_P:1.${_E12_P:2}n
72_E12_P=(??)3 -> _E12=${_E12_P:1}n
73_E12_P=(??)4 -> _E12=${_E12_P:1}0n
74_E12_P=(?)(?)5 -> _E12=$_E12_P:1.${_E12_P:2}u
75_E12_P=(??)6 -> _E12=${_E12_P:1}u
76_E12_P=(??)7 -> _E12=${_E12_P:1}0u
77
78# remove trailing zeroes
79
80_E12=(*).0([fpnu]) -> _E12=$_E12:1$_E12:2
81_E12=(*).0 -> _E12=$_E12:1
56include lib/e12.inc
8257
8358T=C -> C=${_E12}F !
bom/lib/captol.inc
1# Must be indented !!
2
3    _TOL=A -> TOL=0.05pF
4    _TOL=B -> TOL=0.1pF
5    _TOL=C -> TOL=0.25pF
6    _TOL=D -> TOL=0.5pF
7    _TOL=F -> TOL=1%
8    _TOL=G -> TOL=2%
9    _TOL=J -> TOL=5%
10    _TOL=K -> TOL=10%
11    _TOL=M -> TOL=20%
12    _TOL=Z -> TOL=80/20%
bom/lib/e12.inc
1# E12 scale, base multiplier is 10^-12 (pico)
2
3_E12_P=(??)8 -> _E12=${_E12_P:1}0f
4_E12_P=(?)(?)9 -> _E12=$_E12_P:1.${_E12_P:2}p
5_E12_P=(??)0 -> _E12=${_E12_P:1}p
6_E12_P=(??)1 -> _E12=${_E12_P:1}0p
7_E12_P=(?)(?)2 -> _E12=$_E12_P:1.${_E12_P:2}n
8_E12_P=(??)3 -> _E12=${_E12_P:1}n
9_E12_P=(??)4 -> _E12=${_E12_P:1}0n
10_E12_P=(?)(?)5 -> _E12=$_E12_P:1.${_E12_P:2}u
11_E12_P=(??)6 -> _E12=${_E12_P:1}u
12_E12_P=(??)7 -> _E12=${_E12_P:1}0u
13_E12_P=(?)R(?) -> _E12=$_E12_P:1.${_E12_P:2}p # strange
14
15# remove trailing zeroes
16
17_E12=(*).0([fpnu]) -> _E12=$_E12:1$_E12:2
18_E12=(*).0 -> _E12=$_E12:1
19
bom/murata.gen
3434    _V=1H -> V=50V
3535    _V=2A -> V=100V
3636
37    _TOL=W -> TOL=0.05pF
38    _TOL=B -> TOL=0.1pF
39    _TOL=C -> TOL=0.25pF
40    _TOL=D -> TOL=0.5pF
41    _TOL=F -> TOL=1%
42    _TOL=G -> TOL=2%
43    _TOL=J -> TOL=5%
44    _TOL=K -> TOL=10%
45    _TOL=M -> TOL=20%
37    include lib/captol.inc
4638}
4739
48# E12 scale, base multiplier is 10^-12 (pico)
49
50_E12_P=(??)8 -> _E12=${_E12_P:1}0f
51_E12_P=(?)(?)9 -> _E12=$_E12_P:1.${_E12_P:2}p
52_E12_P=(??)0 -> _E12=${_E12_P:1}p
53_E12_P=(??)1 -> _E12=${_E12_P:1}0p
54_E12_P=(?)(?)2 -> _E12=$_E12_P:1.${_E12_P:2}n
55_E12_P=(??)3 -> _E12=${_E12_P:1}n
56_E12_P=(??)4 -> _E12=${_E12_P:1}0n
57_E12_P=(?)(?)5 -> _E12=$_E12_P:1.${_E12_P:2}u
58_E12_P=(??)6 -> _E12=${_E12_P:1}u
59_E12_P=(??)7 -> _E12=${_E12_P:1}0u
60_E12_P=(?)R(?) -> _E12=$_E12_P:1.${_E12_P:2}p # strange
61
62# remove trailing zeroes
63
64_E12=(*).0([fpnu]) -> _E12=$_E12:1$_E12:2
65_E12=(*).0 -> _E12=$_E12:1
40include lib/e12.inc
6641
6742T=C -> C=${_E12}F !
bom/tdk.gen
1717    _FP=4532 -> FP=1812
1818    _FP=5750 -> FP=2220
1919
20    _TOL=C -> TOL=0.25pF
21    _TOL=D -> TOL=0.5pF
22    _TOL=J -> TOL=5%
23    _TOL=K -> TOL=10%
24    _TOL=M -> TOL=20%
25    _TOL=Z -> TOL=80/20%
20    include lib/captol.inc
2621
2722    _V=0G -> V=4V
2823    _V=0J -> V=6.3V
...... 
3227    _V=1H -> V=50V
3328}
3429
35# E12 scale, base multiplier is 10^-12 (pico)
36
37_E12_P=(??)8 -> _E12=${_E12_P:1}0f
38_E12_P=(?)(?)9 -> _E12=$_E12_P:1.${_E12_P:2}p
39_E12_P=(??)0 -> _E12=${_E12_P:1}p
40_E12_P=(??)1 -> _E12=${_E12_P:1}0p
41_E12_P=(?)(?)2 -> _E12=$_E12_P:1.${_E12_P:2}n
42_E12_P=(??)3 -> _E12=${_E12_P:1}n
43_E12_P=(??)4 -> _E12=${_E12_P:1}0n
44_E12_P=(?)(?)5 -> _E12=$_E12_P:1.${_E12_P:2}u
45_E12_P=(??)6 -> _E12=${_E12_P:1}u
46_E12_P=(??)7 -> _E12=${_E12_P:1}0u
47_E12_P=(?)R(?) -> _E12=$_E12_P:1.${_E12_P:2}p # strange
48
49# remove trailing zeroes
50
51_E12=(*).0([fpnu]) -> _E12=$_E12:1$_E12:2
52_E12=(*).0 -> _E12=$_E12:1
30include lib/e12.inc
5331
5432T=C -> C=${_E12}F !
bom/yageo.gen
77    CC(????)(?)?(???)(?)??([0-9][0-9R][0-9]) ->
88        FP=$REF:1 _TOL=$REF:2 M=$REF:3 _V=$REF:4 _E12_P=$REF:5
99
10    _TOL=B -> TOL=0.1pF
11    _TOL=C -> TOL=0.25pF
12    _TOL=D -> TOL=0.5pF
13    _TOL=F -> TOL=1%
14    _TOL=G -> TOL=2%
15    _TOL=J -> TOL=5%
16    _TOL=K -> TOL=10%
17    _TOL=M -> TOL=20%
10    include lib/captol.inc
1811
1912    _V=5 -> V=6.3V
2013    _V=6 -> V=10V
...... 
2417    _V=0 -> V=100V
2518}
2619
27# E12 scale, base multiplier is 10^-12 (pico)
28
29_E12_P=(??)8 -> _E12=${_E12_P:1}0f
30_E12_P=(?)(?)9 -> _E12=$_E12_P:1.${_E12_P:2}p
31_E12_P=(??)0 -> _E12=${_E12_P:1}p
32_E12_P=(??)1 -> _E12=${_E12_P:1}0p
33_E12_P=(?)(?)2 -> _E12=$_E12_P:1.${_E12_P:2}n
34_E12_P=(??)3 -> _E12=${_E12_P:1}n
35_E12_P=(??)4 -> _E12=${_E12_P:1}0n
36_E12_P=(?)(?)5 -> _E12=$_E12_P:1.${_E12_P:2}u
37_E12_P=(??)6 -> _E12=${_E12_P:1}u
38_E12_P=(??)7 -> _E12=${_E12_P:1}0u
39_E12_P=(?)R(?) -> _E12=$_E12_P:1.${_E12_P:2}p # strange
40
41# remove trailing zeroes
42
43_E12=(*).0([fpnu]) -> _E12=$_E12:1$_E12:2
44_E12=(*).0 -> _E12=$_E12:1
20include lib/e12.inc
4521
4622T=C -> C=${_E12}F !

Archive Download the corresponding diff file



interactive