diff options
| author | 2015-07-22 23:13:01 +0200 | |
|---|---|---|
| committer | 2015-07-23 22:39:39 +0200 | |
| commit | c2a192ec92c8dc1c055e42a7075326332f2685fe (patch) | |
| tree | 7e7af18b7b7679beb983fd602293b36ad9e0ef70 /nl_examples | |
| parent | 907a751fc49cba393d4f69cf7f578436730deeee (diff) | |
Consolidate the scattered model parsing code. Now models support
recursive models,e.g. DIODE("1N914(IS=1e-15)"). Removed ".model" from
model definitions. (nw)
Diffstat (limited to 'nl_examples')
| -rw-r--r-- | nl_examples/congo_bongo.c | 14 | ||||
| -rw-r--r-- | nl_examples/kidniki.c | 4 | ||||
| -rw-r--r-- | nl_examples/msx_mixer_stage.c | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/nl_examples/congo_bongo.c b/nl_examples/congo_bongo.c index bb7520b65db..25f8258f290 100644 --- a/nl_examples/congo_bongo.c +++ b/nl_examples/congo_bongo.c @@ -70,16 +70,18 @@ NETLIST_START(dummy) NET_C(RO.2, GND) // FIXME: Same as 1N4148 - NET_MODEL(".model 1S2075 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75)") - NET_MODEL(".model 2SC1941 NPN(IS=46.416f BF=210 NF=1.0022 VAF=600 IKF=500m ISE=60f NE=1.5 BR=2.0122 NR=1.0022 VAR=10G IKR=10G ISC=300p NC=2 RB=13.22 IRB=10G RBM=13.22 RE=100m RC=790m CJE=26.52p VJE=900m MJE=518m TF=1.25n XTF=10 VTF=10 ITF=500m PTF=0 CJC=4.89p VJC=750m MJC=237m XCJC=500m TR=100n CJS=0 VJS=750m MJS=500m XTB=1.5 EG=1.11 XTI=3 KF=0 AF=1 FC=500m)") + NET_MODEL("1S2075 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75)") + NET_MODEL("2SC1941 NPN(IS=46.416f BF=210 NF=1.0022 VAF=600 IKF=500m ISE=60f NE=1.5 BR=2.0122 NR=1.0022 VAR=10G IKR=10G ISC=300p NC=2 RB=13.22 IRB=10G RBM=13.22 RE=100m RC=790m CJE=26.52p VJE=900m MJE=518m TF=1.25n XTF=10 VTF=10 ITF=500m PTF=0 CJC=4.89p VJC=750m MJC=237m XCJC=500m TR=100n CJS=0 VJS=750m MJS=500m XTB=1.5 EG=1.11 XTI=3 KF=0 AF=1 FC=500m)") INCLUDE(CongoBongo_schematics) /* The opamp actually has an FPF of about 500k. This doesn't work here and causes oscillations. * FPF here therefore about half the Solver clock. */ - PARAM(XU16.B.MODEL, "MB3614_SLOW") - PARAM(XU17.C.MODEL, "MB3614_SLOW") + PARAM(XU16.B.MODEL, "MB3614(UGF=11k)") + PARAM(XU17.C.MODEL, "MB3614(UGF=11k)") + //PARAM(XU16.B.MODEL, "MB3614_SLOW") + //PARAM(XU17.C.MODEL, "MB3614_SLOW") OPTIMIZE_FRONTIER(C51.1, RES_K(20), 50) OPTIMIZE_FRONTIER(R77.2, RES_K(20), 50) @@ -390,8 +392,8 @@ NETLIST_START(opamp_mod) NET_C(RP1.1, G1.OP) NET_C(CP1.1, RP1.1) - DIODE(DP,".model tt D(IS=1e-15 N=1)") - DIODE(DN,".model tt D(IS=1e-15 N=1)") + DIODE(DP,"D(IS=1e-15 N=1)") + DIODE(DN,"D(IS=1e-15 N=1)") #if 1 NET_C(DP.K, fUH.Q) NET_C(fUL.Q, DN.A) diff --git a/nl_examples/kidniki.c b/nl_examples/kidniki.c index dfe1b057e5e..9e2b0052dae 100644 --- a/nl_examples/kidniki.c +++ b/nl_examples/kidniki.c @@ -20,8 +20,8 @@ NETLIST_START(dummy) PARAM(Solver.LTE, 1e-1) #endif //FIXME proper models! - NET_MODEL(".model 2SC945 NPN(Is=2.04f Xti=3 Eg=1.11 Vaf=6 Bf=400 Ikf=20m Xtb=1.5 Br=3.377 Rc=1 Cjc=1p Mjc=.3333 Vjc=.75 Fc=.5 Cje=25p Mje=.3333 Vje=.75 Tr=450n Tf=20n Itf=0 Vtf=0 Xtf=0 VCEO=45V ICrating=150M MFG=Toshiba)") - NET_MODEL(".model 1S1588 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75 mfg=OnSemi type=silicon)") + NET_MODEL("2SC945 NPN(Is=2.04f Xti=3 Eg=1.11 Vaf=6 Bf=400 Ikf=20m Xtb=1.5 Br=3.377 Rc=1 Cjc=1p Mjc=.3333 Vjc=.75 Fc=.5 Cje=25p Mje=.3333 Vje=.75 Tr=450n Tf=20n Itf=0 Vtf=0 Xtf=0 VCEO=45V ICrating=150M MFG=Toshiba)") + NET_MODEL("1S1588 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75 mfg=OnSemi type=silicon)") //NET_C(R44.1, XU1.7) diff --git a/nl_examples/msx_mixer_stage.c b/nl_examples/msx_mixer_stage.c index 779280fcbc9..ddc1cd70cfd 100644 --- a/nl_examples/msx_mixer_stage.c +++ b/nl_examples/msx_mixer_stage.c @@ -24,7 +24,7 @@ NETLIST_START(msx) ANALOG_INPUT(SOUND, 5) ANALOG_INPUT(SND, 5) - NET_MODEL(".model ss9014 NPN(is=2.87599e-14 bf=377.5 vaf=123 ikf=1.1841 ise=4.7863e-15 ne=1.5 br=4.79 var=11.29 ikr=0.275423 isc=1.44544e-14 nc=1.5 rb=200 irb=1e-5 rbm=10 re=0.56 rc=5 cje=1.7205e-11 vje=0.6905907 mje=0.3193434 tf=5.89463e-10 cjc=6.2956p vjc=0.4164212 mjc=0.2559546 xcjc=0.451391 xtb=1.8881 eg=1.2415 xti=3 fc=0.5 Vceo=45 Icrating=0.1 mfg=Fairchild)") + NET_MODEL("ss9014 NPN(is=2.87599e-14 bf=377.5 vaf=123 ikf=1.1841 ise=4.7863e-15 ne=1.5 br=4.79 var=11.29 ikr=0.275423 isc=1.44544e-14 nc=1.5 rb=200 irb=1e-5 rbm=10 re=0.56 rc=5 cje=1.7205e-11 vje=0.6905907 mje=0.3193434 tf=5.89463e-10 cjc=6.2956p vjc=0.4164212 mjc=0.2559546 xcjc=0.451391 xtb=1.8881 eg=1.2415 xti=3 fc=0.5 Vceo=45 Icrating=0.1 mfg=Fairchild)") RES(R24, RES_K(51)) RES(R23, RES_K(5)) |
