diff --git a/bom/avx.gen b/bom/avx.gen index 29ed806..bbbaa68 100644 --- a/bom/avx.gen +++ b/bom/avx.gen @@ -10,14 +10,7 @@ _M=A -> M=NP0 _M=D -> M=X5R - _TOL=B -> TOL=0.10pF - _TOL=C -> TOL=0.25pF - _TOL=D -> TOL=0.5pF - _TOL=F -> TOL=1% - _TOL=J -> TOL=5% - _TOL=K -> TOL=10% - _TOL=M -> TOL=20% - _TOL=Z -> TOL=80/20% + include lib/captol.inc _V=4 -> V=4V _V=6 -> V=6.3V @@ -31,22 +24,6 @@ _V=7 -> V=500V } -# E12 scale, base multiplier is 10^-12 (pico) - -_E12_P=(??)8 -> _E12=${_E12_P:1}0f -_E12_P=(?)(?)9 -> _E12=$_E12_P:1.${_E12_P:2}p -_E12_P=(??)0 -> _E12=${_E12_P:1}p -_E12_P=(??)1 -> _E12=${_E12_P:1}0p -_E12_P=(?)(?)2 -> _E12=$_E12_P:1.${_E12_P:2}n -_E12_P=(??)3 -> _E12=${_E12_P:1}n -_E12_P=(??)4 -> _E12=${_E12_P:1}0n -_E12_P=(?)(?)5 -> _E12=$_E12_P:1.${_E12_P:2}u -_E12_P=(??)6 -> _E12=${_E12_P:1}u -_E12_P=(??)7 -> _E12=${_E12_P:1}0u - -# remove trailing zeroes - -_E12=(*).0([fpnu]) -> _E12=$_E12:1$_E12:2 -_E12=(*).0 -> _E12=$_E12:1 +include lib/e12.inc T=C -> C=${_E12}F ! diff --git a/bom/johanson.gen b/bom/johanson.gen index 070d987..42c7dc3 100644 --- a/bom/johanson.gen +++ b/bom/johanson.gen @@ -50,34 +50,9 @@ _M=Z -> M=Z5U _M=Y -> M=Y5V - _TOL=A -> TOL=0.05pF - _TOL=B -> TOL=0.10pF - _TOL=C -> TOL=0.25pF - _TOL=D -> TOL=0.5pF - _TOL=F -> TOL=1% - _TOL=G -> TOL=2% - _TOL=J -> TOL=5% - _TOL=K -> TOL=10% - _TOL=M -> TOL=20% - _TOL=Z -> TOL=80/20% + include lib/captol.inc } -# E12 scale, base multiplier is 10^-12 (pico) - -_E12_P=(??)8 -> _E12=${_E12_P:1}0f -_E12_P=(?)(?)9 -> _E12=$_E12_P:1.${_E12_P:2}p -_E12_P=(??)0 -> _E12=${_E12_P:1}p -_E12_P=(??)1 -> _E12=${_E12_P:1}0p -_E12_P=(?)(?)2 -> _E12=$_E12_P:1.${_E12_P:2}n -_E12_P=(??)3 -> _E12=${_E12_P:1}n -_E12_P=(??)4 -> _E12=${_E12_P:1}0n -_E12_P=(?)(?)5 -> _E12=$_E12_P:1.${_E12_P:2}u -_E12_P=(??)6 -> _E12=${_E12_P:1}u -_E12_P=(??)7 -> _E12=${_E12_P:1}0u - -# remove trailing zeroes - -_E12=(*).0([fpnu]) -> _E12=$_E12:1$_E12:2 -_E12=(*).0 -> _E12=$_E12:1 +include lib/e12.inc T=C -> C=${_E12}F ! diff --git a/bom/lib/captol.inc b/bom/lib/captol.inc new file mode 100644 index 0000000..7bb4406 --- /dev/null +++ b/bom/lib/captol.inc @@ -0,0 +1,12 @@ +# Must be indented !! + + _TOL=A -> TOL=0.05pF + _TOL=B -> TOL=0.1pF + _TOL=C -> TOL=0.25pF + _TOL=D -> TOL=0.5pF + _TOL=F -> TOL=1% + _TOL=G -> TOL=2% + _TOL=J -> TOL=5% + _TOL=K -> TOL=10% + _TOL=M -> TOL=20% + _TOL=Z -> TOL=80/20% diff --git a/bom/lib/e12.inc b/bom/lib/e12.inc new file mode 100644 index 0000000..02614d7 --- /dev/null +++ b/bom/lib/e12.inc @@ -0,0 +1,19 @@ +# E12 scale, base multiplier is 10^-12 (pico) + +_E12_P=(??)8 -> _E12=${_E12_P:1}0f +_E12_P=(?)(?)9 -> _E12=$_E12_P:1.${_E12_P:2}p +_E12_P=(??)0 -> _E12=${_E12_P:1}p +_E12_P=(??)1 -> _E12=${_E12_P:1}0p +_E12_P=(?)(?)2 -> _E12=$_E12_P:1.${_E12_P:2}n +_E12_P=(??)3 -> _E12=${_E12_P:1}n +_E12_P=(??)4 -> _E12=${_E12_P:1}0n +_E12_P=(?)(?)5 -> _E12=$_E12_P:1.${_E12_P:2}u +_E12_P=(??)6 -> _E12=${_E12_P:1}u +_E12_P=(??)7 -> _E12=${_E12_P:1}0u +_E12_P=(?)R(?) -> _E12=$_E12_P:1.${_E12_P:2}p # strange + +# remove trailing zeroes + +_E12=(*).0([fpnu]) -> _E12=$_E12:1$_E12:2 +_E12=(*).0 -> _E12=$_E12:1 + diff --git a/bom/murata.gen b/bom/murata.gen index 840ba53..f847044 100644 --- a/bom/murata.gen +++ b/bom/murata.gen @@ -34,34 +34,9 @@ GRM* -> T=C { _V=1H -> V=50V _V=2A -> V=100V - _TOL=W -> TOL=0.05pF - _TOL=B -> TOL=0.1pF - _TOL=C -> TOL=0.25pF - _TOL=D -> TOL=0.5pF - _TOL=F -> TOL=1% - _TOL=G -> TOL=2% - _TOL=J -> TOL=5% - _TOL=K -> TOL=10% - _TOL=M -> TOL=20% + include lib/captol.inc } -# E12 scale, base multiplier is 10^-12 (pico) - -_E12_P=(??)8 -> _E12=${_E12_P:1}0f -_E12_P=(?)(?)9 -> _E12=$_E12_P:1.${_E12_P:2}p -_E12_P=(??)0 -> _E12=${_E12_P:1}p -_E12_P=(??)1 -> _E12=${_E12_P:1}0p -_E12_P=(?)(?)2 -> _E12=$_E12_P:1.${_E12_P:2}n -_E12_P=(??)3 -> _E12=${_E12_P:1}n -_E12_P=(??)4 -> _E12=${_E12_P:1}0n -_E12_P=(?)(?)5 -> _E12=$_E12_P:1.${_E12_P:2}u -_E12_P=(??)6 -> _E12=${_E12_P:1}u -_E12_P=(??)7 -> _E12=${_E12_P:1}0u -_E12_P=(?)R(?) -> _E12=$_E12_P:1.${_E12_P:2}p # strange - -# remove trailing zeroes - -_E12=(*).0([fpnu]) -> _E12=$_E12:1$_E12:2 -_E12=(*).0 -> _E12=$_E12:1 +include lib/e12.inc T=C -> C=${_E12}F ! diff --git a/bom/tdk.gen b/bom/tdk.gen index 163acb6..9e58338 100644 --- a/bom/tdk.gen +++ b/bom/tdk.gen @@ -17,12 +17,7 @@ C* -> T=C { _FP=4532 -> FP=1812 _FP=5750 -> FP=2220 - _TOL=C -> TOL=0.25pF - _TOL=D -> TOL=0.5pF - _TOL=J -> TOL=5% - _TOL=K -> TOL=10% - _TOL=M -> TOL=20% - _TOL=Z -> TOL=80/20% + include lib/captol.inc _V=0G -> V=4V _V=0J -> V=6.3V @@ -32,23 +27,6 @@ C* -> T=C { _V=1H -> V=50V } -# E12 scale, base multiplier is 10^-12 (pico) - -_E12_P=(??)8 -> _E12=${_E12_P:1}0f -_E12_P=(?)(?)9 -> _E12=$_E12_P:1.${_E12_P:2}p -_E12_P=(??)0 -> _E12=${_E12_P:1}p -_E12_P=(??)1 -> _E12=${_E12_P:1}0p -_E12_P=(?)(?)2 -> _E12=$_E12_P:1.${_E12_P:2}n -_E12_P=(??)3 -> _E12=${_E12_P:1}n -_E12_P=(??)4 -> _E12=${_E12_P:1}0n -_E12_P=(?)(?)5 -> _E12=$_E12_P:1.${_E12_P:2}u -_E12_P=(??)6 -> _E12=${_E12_P:1}u -_E12_P=(??)7 -> _E12=${_E12_P:1}0u -_E12_P=(?)R(?) -> _E12=$_E12_P:1.${_E12_P:2}p # strange - -# remove trailing zeroes - -_E12=(*).0([fpnu]) -> _E12=$_E12:1$_E12:2 -_E12=(*).0 -> _E12=$_E12:1 +include lib/e12.inc T=C -> C=${_E12}F ! diff --git a/bom/yageo.gen b/bom/yageo.gen index ab171ce..2869861 100644 --- a/bom/yageo.gen +++ b/bom/yageo.gen @@ -7,14 +7,7 @@ CC* -> T=C { CC(????)(?)?(???)(?)??([0-9][0-9R][0-9]) -> FP=$REF:1 _TOL=$REF:2 M=$REF:3 _V=$REF:4 _E12_P=$REF:5 - _TOL=B -> TOL=0.1pF - _TOL=C -> TOL=0.25pF - _TOL=D -> TOL=0.5pF - _TOL=F -> TOL=1% - _TOL=G -> TOL=2% - _TOL=J -> TOL=5% - _TOL=K -> TOL=10% - _TOL=M -> TOL=20% + include lib/captol.inc _V=5 -> V=6.3V _V=6 -> V=10V @@ -24,23 +17,6 @@ CC* -> T=C { _V=0 -> V=100V } -# E12 scale, base multiplier is 10^-12 (pico) - -_E12_P=(??)8 -> _E12=${_E12_P:1}0f -_E12_P=(?)(?)9 -> _E12=$_E12_P:1.${_E12_P:2}p -_E12_P=(??)0 -> _E12=${_E12_P:1}p -_E12_P=(??)1 -> _E12=${_E12_P:1}0p -_E12_P=(?)(?)2 -> _E12=$_E12_P:1.${_E12_P:2}n -_E12_P=(??)3 -> _E12=${_E12_P:1}n -_E12_P=(??)4 -> _E12=${_E12_P:1}0n -_E12_P=(?)(?)5 -> _E12=$_E12_P:1.${_E12_P:2}u -_E12_P=(??)6 -> _E12=${_E12_P:1}u -_E12_P=(??)7 -> _E12=${_E12_P:1}0u -_E12_P=(?)R(?) -> _E12=$_E12_P:1.${_E12_P:2}p # strange - -# remove trailing zeroes - -_E12=(*).0([fpnu]) -> _E12=$_E12:1$_E12:2 -_E12=(*).0 -> _E12=$_E12:1 +include lib/e12.inc T=C -> C=${_E12}F !