luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make @spice_get_current work for pnp and npn symbols

This commit is contained in:
stefan schippers 2024-12-21 00:49:44 +01:00
parent 954d10eb25
commit 6682965dba
4 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/token.c
View File

@ -4001,6 +4001,8 @@ const char *translate(int inst, const char* s)
dbg(1, "prefix=%c, path=%s\n", prefix, path);
vsource = (prefix == 'v') || (prefix == 'e');
if(vsource) my_snprintf(fqdev, len, "i(%c.%s%s.%s)", prefix, path, instname, dev);
else if(prefix == 'q')
my_snprintf(fqdev, len, "i(@%c.%s%s.%s[ic])", prefix, path, instname, dev);
else if(prefix == 'd' || prefix == 'm')
my_snprintf(fqdev, len, "i(@%c.%s%s.%s[id])", prefix, path, instname, dev);
else if(prefix == 'i')
@ -4132,11 +4134,13 @@ const char *translate(int inst, const char* s)
int vsource = (prefix == 'v') || (prefix == 'e');
if(path[0]) {
if(vsource) my_snprintf(fqdev, len, "i(%c.%s%s)", prefix, path, dev);
else if(prefix=='q') my_snprintf(fqdev, len, "i(@%c.%s%s[ic])", prefix, path, dev);
else if(prefix=='d' || prefix == 'm') my_snprintf(fqdev, len, "i(@%c.%s%s[id])", prefix, path, dev);
else if(prefix=='i') my_snprintf(fqdev, len, "i(@%c.%s%s[current])", prefix, path, dev);
else my_snprintf(fqdev, len, "i(@%c.%s%s[i])", prefix, path, dev);
} else {
if(vsource) my_snprintf(fqdev, len, "i(%s)", dev);
else if(prefix == 'q') my_snprintf(fqdev, len, "i(@%s[ic])", dev);
else if(prefix == 'd' || prefix == 'm') my_snprintf(fqdev, len, "i(@%s[id])", dev);
else if(prefix == 'i') my_snprintf(fqdev, len, "i(@%s[current])", dev);
else my_snprintf(fqdev, len, "i(@%s[i])", dev);

3
xschem_library/devices/npn.sym
View File

@ -1,4 +1,4 @@
v {xschem version=3.4.4 file_version=1.2
v {xschem version=3.4.6 file_version=1.2
*
* This file is part of XSCHEM,
* a schematic capture and Spice/Vhdl/Verilog netlisting tool for circuit
@ -57,3 +57,4 @@ T {@#1:pinnumber} -5 6.25 0 1 0.2 0.2 {layer=13}
T {@#0:net_name} 25 -33.75 0 0 0.15 0.15 {layer=15 hide=instance}
T {@#2:net_name} 25 23.75 0 0 0.15 0.15 {layer=15 hide=instance}
T {@#1:net_name} -6.25 -12.5 0 1 0.15 0.15 {layer=15 hide=instance}
T {@spice_get_current} 40 -22.5 0 0 0.2 0.2 {layer=17}

3
xschem_library/devices/pnp.sym
View File

@ -1,4 +1,4 @@
v {xschem version=3.4.4 file_version=1.2
v {xschem version=3.4.6 file_version=1.2
*
* This file is part of XSCHEM,
* a schematic capture and Spice/Vhdl/Verilog netlisting tool for circuit
@ -55,3 +55,4 @@ T {@#1:pinnumber} -5 6.25 0 1 0.2 0.2 {layer=13}
T {@#2:net_name} 25 -33.75 0 0 0.15 0.15 {layer=15 hide=instance}
T {@#0:net_name} 25 23.75 0 0 0.15 0.15 {layer=15 hide=instance}
T {@#1:net_name} -6.25 -12.5 0 1 0.15 0.15 {layer=15 hide=instance}
T {@spice_get_current} 40 11.25 0 0 0.2 0.2 {layer=17}

28
xschem_library/examples/tesla.sch
View File

@ -1,4 +1,4 @@
v {xschem version=3.4.5 file_version=1.2
v {xschem version=3.4.6 file_version=1.2
*
* This file is part of XSCHEM,
* a schematic capture and Spice/Vhdl/Verilog netlisting tool for circuit
@ -25,15 +25,15 @@ V {}
S {}
E {}
B 2 10 -270 390 -110 {flags=graph
y1=-5400
y2=5400
y1=-6800
y2=6800
ypos1=0
ypos2=2
divy=5
subdivy=1
unity=k
x1=0.000952652
x2=0.000957538
x1=4e-10
x2=0.001
divx=5
subdivx=1
node=hv
@ -42,15 +42,15 @@ dataset=0
unitx=u
}
B 2 10 -440 390 -280 {flags=graph
y1=-0.9
y1=-0.8
y2=13
ypos1=0
ypos2=2
divy=5
subdivy=1
unity=1
x1=0.000952652
x2=0.000957538
x1=4e-10
x2=0.001
divx=5
subdivx=1
@ -130,12 +130,12 @@ N 860 -610 860 -600 {lab=HV}
N 880 -610 880 -600 {lab=HV}
N 860 -620 860 -610 {lab=HV}
N 880 -620 880 -610 {lab=HV}
N 810 -430 810 -400 {lab=#net1}
N 810 -490 870 -490 {lab=HV}
N 790 -430 790 -400 {lab=#net1}
N 790 -490 870 -490 {lab=HV}
N 580 -430 580 -400 {lab=#net2}
N 520 -430 520 -340 {lab=#net3}
N 520 -340 720 -340 {lab=#net3}
N 810 -340 870 -340 {lab=FB}
N 790 -340 870 -340 {lab=FB}
N 520 -490 580 -490 {lab=VCC}
N 580 -680 580 -490 {lab=VCC}
N 870 -530 870 -490 {lab=HV}
@ -158,7 +158,7 @@ C {code.sym} 1140 -170 0 0 {
name=STIMULI
value=".option SCALE=1e-6 PARHIER=LOCAL RUNLVL=6 post MODMONTE=1
.option sampling_method = SRS
.option method=gear
.option method=gear savecurrents
vvss vss 0 dc 0
.save all
@ -199,9 +199,9 @@ C {lab_pin.sym} 870 -560 0 1 {name=p4 lab=HV}
C {capa.sym} 1010 -450 0 0 {name=C1 m=1 value=1p}
C {lab_pin.sym} 1010 -250 0 0 {name=p3 lab=VSS}
C {ind.sym} 580 -460 2 1 {name=L1 value=9.8u}
C {ind.sym} 810 -460 0 1 {name=L2 value=9.1m}
C {ind.sym} 790 -460 0 1 {name=L2 value=9.1m}
C {k.sym} 700 -460 0 0 {name=K0 K=0.15 L1=L1 L2=L2}
C {res.sym} 810 -370 0 0 {name=R0 m=1 value=.32}
C {res.sym} 790 -370 0 0 {name=R0 m=1 value=.32}
C {capa.sym} 870 -460 0 1 {name=C0 m=1 value=4.1p}
C {res.sym} 580 -370 0 1 {name=R3 m=1 value=0.22}
C {capa.sym} 520 -460 0 0 {name=C5 m=1 value=13p}