relinked missing schematic symbols
diff --git a/xschem/attenuator/basic-invert.sch b/xschem/attenuator/basic-invert.sch
index c8a3de0..5afc19d 100644
--- a/xschem/attenuator/basic-invert.sch
+++ b/xschem/attenuator/basic-invert.sch
@@ -1,10 +1,10 @@
-v {xschem version=2.9.9 file_version=1.2 }
+v {xschem version=3.0.0 file_version=1.2 }
G {}
K {}
V {}
S {}
E {}
-N 170 -200 170 -160 { lab=xxx}
+N 170 -200 170 -160 { lab=out}
N 170 -290 170 -260 { lab=vdd}
N 170 -100 170 -70 { lab=gnd}
N 170 -230 190 -230 { lab=vdd}
@@ -13,12 +13,12 @@
N 170 -130 190 -130 { lab=gnd}
N 190 -130 190 -100 { lab=gnd}
N 170 -100 190 -100 { lab=gnd}
-N 170 -180 260 -180 { lab=xxx}
+N 170 -180 260 -180 { lab=out}
N 100 -230 130 -230 { lab=in}
N 100 -230 100 -130 { lab=in}
N 100 -130 130 -130 { lab=in}
N 60 -180 100 -180 { lab=in}
-C {sky130_fd_pr/nfet_01v8.sym} 150 -130 0 0 {name=M1
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/nfet_01v8.sym} 150 -130 0 0 {name=M1
L=0.15
W=1
nf=1
@@ -32,7 +32,7 @@
model=nfet_01v8
spiceprefix=X
}
-C {sky130_fd_pr/pfet_01v8.sym} 150 -230 0 0 {name=M2
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/pfet_01v8.sym} 150 -230 0 0 {name=M2
L=0.15
W=1
nf=1
@@ -46,7 +46,7 @@
model=pfet_01v8
spiceprefix=X
}
-C {devices/ipin.sym} 60 -180 0 0 {name=in lab=in}
-C {devices/ipin.sym} 170 -70 3 0 {name=gnd lab=gnd}
-C {devices/ipin.sym} 170 -290 1 0 {name=vdd lab=vdd}
-C {devices/opin.sym} 260 -180 0 0 {name=out lab=out}
+C {ipin.sym} 60 -180 0 0 {name=pn lab=in}
+C {ipin.sym} 170 -70 3 0 {name=pnd lab=gnd}
+C {ipin.sym} 170 -290 1 0 {name=pdd lab=vdd}
+C {opin.sym} 260 -180 0 0 {name=put lab=out}
diff --git a/xschem/attenuator/dsa.sch b/xschem/attenuator/dsa.sch
index 3a6b082..f8a43fb 100644
--- a/xschem/attenuator/dsa.sch
+++ b/xschem/attenuator/dsa.sch
@@ -1,4 +1,4 @@
-v {xschem version=2.9.9 file_version=1.2 }
+v {xschem version=3.0.0 file_version=1.2 }
G {}
K {}
V {}
@@ -50,12 +50,12 @@
N 960 -90 1280 -90 { lab=vbias}
N 1280 -110 1280 -90 { lab=vbias}
N 200 -90 320 -90 { lab=vbias}
-N 280 -110 280 -70 { lab=gnd}
-N 600 -110 600 -70 { lab=gnd}
-N 920 -110 920 -70 { lab=gnd}
-N 1240 -110 1240 -70 { lab=gnd}
-N 200 -70 1240 -70 { lab=gnd}
-C {devices/code.sym} -130 -330 0 0 {name=TT_MODELS
+N 280 -110 280 -70 { lab=vdd}
+N 600 -110 600 -70 { lab=vdd}
+N 920 -110 920 -70 { lab=vdd}
+N 1240 -110 1240 -70 { lab=vdd}
+N 200 -70 1240 -70 { lab=vdd}
+C {code.sym} -130 -330 0 0 {name=sT_MODELS
only_toplevel=true
format="tcleval( @value )"
value="** manual skywater pdks install (with patches applied)
@@ -68,40 +68,36 @@
.param mc_pr_switch=0
"
spice_ignore=false}
-C {devices/code.sym} -130 -180 0 0 {name=NGSPICE only_toplevel=false value="
-.tran 0.000001s 0.0001s
-.save all
-"}
-C {devices/res.sym} 470 -190 3 0 {name=R1
+C {res.sym} 470 -190 3 0 {name=R1
value=50
footprint=1206
device=resistor
m=1}
-C {devices/res.sym} 790 -190 3 0 {name=R2
+C {res.sym} 790 -190 3 0 {name=R2
value=200
footprint=1206
device=resistor
m=1}
C {transgate-full.sym} 40 50 0 0 {name=XDTG1}
C {transgate-full.sym} 360 50 0 0 {name=XDTG2}
-C {devices/res.sym} 1110 -190 3 0 {name=R3
+C {res.sym} 1110 -190 3 0 {name=R3
value=1k
footprint=1206
device=resistor
m=1}
C {transgate-full.sym} 680 50 0 0 {name=XDTG3}
-C {devices/res.sym} 1430 -190 3 0 {name=R4
+C {res.sym} 1430 -190 3 0 {name=R4
value=10k
footprint=1206
device=resistor
m=1}
C {transgate-full.sym} 1000 50 0 0 {name=XDTG4}
-C {devices/ipin.sym} 320 -300 1 0 {name=cntrl1 lab=cntrl1}
-C {devices/ipin.sym} 640 -300 1 0 {name=cntrl2 lab=cntrl2}
-C {devices/ipin.sym} 960 -300 1 0 {name=cntrl3 lab=cntrl3}
-C {devices/ipin.sym} 1280 -300 1 0 {name=cntrl4 lab=cntrl4}
-C {devices/ipin.sym} 200 -170 0 0 {name=in lab=in}
-C {devices/opin.sym} 1560 -170 0 0 {name=out lab=out}
-C {devices/ipin.sym} 200 -120 0 0 {name=gnd lab=gnd}
-C {devices/ipin.sym} 200 -90 0 0 {name=vbias lab=vbias}
-C {devices/ipin.sym} 200 -70 0 0 {name=vdd lab=vdd}
+C {ipin.sym} 320 -300 1 0 {name=pntrl1 lab=cntrl1}
+C {ipin.sym} 640 -300 1 0 {name=pntrl2 lab=cntrl2}
+C {ipin.sym} 960 -300 1 0 {name=pntrl3 lab=cntrl3}
+C {ipin.sym} 1280 -300 1 0 {name=pntrl4 lab=cntrl4}
+C {ipin.sym} 200 -170 0 0 {name=pn lab=in}
+C {opin.sym} 1560 -170 0 0 {name=put lab=out}
+C {ipin.sym} 200 -120 0 0 {name=pnd lab=gnd}
+C {ipin.sym} 200 -90 0 0 {name=pbias lab=vbias}
+C {ipin.sym} 200 -70 0 0 {name=pdd lab=vdd}
diff --git a/xschem/attenuator/gate-switch.sch b/xschem/attenuator/gate-switch.sch
index 1c16366..0641bb7 100644
--- a/xschem/attenuator/gate-switch.sch
+++ b/xschem/attenuator/gate-switch.sch
@@ -1,4 +1,4 @@
-v {xschem version=2.9.9 file_version=1.2 }
+v {xschem version=3.0.0 file_version=1.2 }
G {}
K {}
V {}
@@ -16,8 +16,8 @@
N 255 -180 255 -155 { lab=gnd}
N 255 -180 300 -180 { lab=gnd}
N 255 -115 255 -100 { lab=cntrl1}
-N 255 -325 255 -310 { lab=cntrl1}
-C {sky130_fd_pr/pfet_01v8.sym} 255 -290 1 0 {name=M5
+N 255 -325 255 -310 { lab=cntrl2}
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/pfet_01v8.sym} 255 -290 1 0 {name=M5
L=0.15
W=1
nf=1
@@ -31,7 +31,7 @@
model=pfet_01v8
spiceprefix=X
}
-C {sky130_fd_pr/nfet_01v8.sym} 255 -135 1 1 {name=M6
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/nfet_01v8.sym} 255 -135 1 1 {name=M6
L=0.15
W=1
nf=1
@@ -45,9 +45,9 @@
model=nfet_01v8
spiceprefix=X
}
-C {devices/ipin.sym} 120 -210 0 0 {name=in lab=in}
-C {devices/ipin.sym} 255 -245 3 0 {name=vbias lab=vbias}
-C {devices/ipin.sym} 300 -180 2 0 {name=gnd lab=gnd}
-C {devices/opin.sym} 400 -210 0 0 {name=out lab=out}
-C {devices/ipin.sym} 255 -100 3 0 {name=cntrl1 lab=cntrl1}
-C {devices/ipin.sym} 255 -325 1 0 {name=cntrl2 lab=cntrl2}
+C {ipin.sym} 120 -210 0 0 {name=pn lab=in}
+C {ipin.sym} 255 -245 3 0 {name=pbias lab=vbias}
+C {ipin.sym} 300 -180 2 0 {name=pnd lab=gnd}
+C {opin.sym} 400 -210 0 0 {name=put lab=out}
+C {ipin.sym} 255 -100 3 0 {name=pntrl1 lab=cntrl1}
+C {ipin.sym} 255 -325 1 0 {name=pntrl2 lab=cntrl2}
diff --git a/xschem/attenuator/transgate-full.sch b/xschem/attenuator/transgate-full.sch
index 1ac7df1..57b3c1f 100644
--- a/xschem/attenuator/transgate-full.sch
+++ b/xschem/attenuator/transgate-full.sch
@@ -1,4 +1,4 @@
-v {xschem version=2.9.9 file_version=1.2 }
+v {xschem version=3.0.0 file_version=1.2 }
G {}
K {}
V {}
@@ -44,7 +44,7 @@
N 820 -190 860 -190 { lab=vbias}
N 740 -320 740 -300 { lab=gnd}
N 850 -190 850 -170 { lab=vbias}
-C {devices/code.sym} 140 -470 0 0 {name=TT_MODELS
+C {code.sym} 140 -470 0 0 {name=sT_MODELS
only_toplevel=true
format="tcleval( @value )"
value="** manual skywater pdks install (with patches applied)
@@ -60,10 +60,10 @@
C {basic-invert.sym} 550 -220 0 0 {name=XI1}
C {gate-switch.sym} 660 -310 0 0 {name=XTG1}
C {gate-switch.sym} 660 -50 0 0 {name=XTG2}
-C {devices/ipin.sym} 590 -380 0 0 {name=cntrl lab=cntrl}
-C {devices/ipin.sym} 710 -440 1 0 {name=vdd lab=vdd}
-C {devices/ipin.sym} 400 -380 0 0 {name=in lab=in}
-C {devices/ipin.sym} 740 -300 3 0 {name=gnd lab=gnd}
-C {devices/ipin.sym} 850 -170 3 0 {name=vbias lab=vbias}
-C {devices/opin.sym} 1020 -250 0 0 {name=out2 lab=out2}
-C {devices/opin.sym} 1020 -510 0 0 {name=out1 lab=out1}
+C {ipin.sym} 590 -380 0 0 {name=pntrl lab=cntrl}
+C {ipin.sym} 710 -440 1 0 {name=pdd lab=vdd}
+C {ipin.sym} 400 -380 0 0 {name=pn lab=in}
+C {ipin.sym} 740 -300 3 0 {name=pnd lab=gnd}
+C {ipin.sym} 850 -170 3 0 {name=pbias lab=vbias}
+C {opin.sym} 1020 -250 0 0 {name=put2 lab=out2}
+C {opin.sym} 1020 -510 0 0 {name=put1 lab=out1}
diff --git a/xschem/compiled.sch b/xschem/compiled.sch
index d4440b0..b5b55d9 100644
--- a/xschem/compiled.sch
+++ b/xschem/compiled.sch
@@ -4,133 +4,219 @@
V {}
S {}
E {}
-N 1230 -340 1230 -320 {
+N 1490 -560 1490 -540 {
lab=GND}
-N 1230 -540 1230 -520 {lab=#net1}
-N 1270 -340 1270 -320 {
+N 1490 -760 1490 -740 {lab=#net1}
+N 1530 -560 1530 -540 {
lab=#net2}
-N 1270 -320 1290 -320 {
+N 1530 -540 1550 -540 {
lab=#net2}
-N 1350 -320 1370 -320 {
+N 1610 -540 1630 -540 {
lab=GND}
-N 1270 -540 1270 -520 {
+N 1530 -760 1530 -740 {
lab=#net3}
-N 1270 -540 1290 -540 {
+N 1530 -760 1550 -760 {
lab=#net3}
-N 1350 -540 1370 -540 {
+N 1610 -760 1630 -760 {
lab=GND}
-N 1360 -430 1380 -430 {
+N 1620 -650 1640 -650 {
lab=#net4}
-N 1120 -400 1140 -400 {
+N 1380 -620 1400 -620 {
lab=#net5}
-N 1120 -400 1120 -340 {
+N 1380 -620 1380 -560 {
lab=#net5}
-N 1120 -460 1140 -460 {
+N 1380 -680 1400 -680 {
lab=#net6}
-N 1120 -520 1120 -460 {
+N 1380 -740 1380 -680 {
lab=#net6}
-N 1010 -520 1120 -520 {
+N 1270 -740 1380 -740 {
lab=#net6}
-N 1010 -340 1120 -340 {
+N 1270 -560 1380 -560 {
lab=#net5}
-N 1050 -430 1070 -430 {
+N 1310 -650 1330 -650 {
lab=#net7}
-N 1070 -450 1070 -430 {
+N 1330 -670 1330 -650 {
lab=#net7}
-N 1070 -430 1070 -410 {
+N 1330 -650 1330 -630 {
lab=#net7}
-N 1070 -520 1070 -510 {
+N 1330 -740 1330 -730 {
lab=#net6}
-N 1070 -350 1070 -340 {
+N 1330 -570 1330 -560 {
lab=#net5}
-N 1070 -340 1070 -320 {
+N 1330 -560 1330 -540 {
lab=#net5}
-N 1070 -540 1070 -520 {
+N 1330 -760 1330 -740 {
lab=#net6}
-N 1360 -450 1380 -450 {
+N 1620 -670 1640 -670 {
lab=#net8}
-N 1360 -410 1380 -410 {
+N 1620 -630 1640 -630 {
lab=#net9}
-N 1380 -480 1380 -450 {
+N 1640 -700 1640 -670 {
lab=#net8}
-N 1380 -480 1530 -480 {
+N 1640 -700 1790 -700 {
lab=#net8}
-N 1380 -410 1380 -380 {
+N 1640 -630 1640 -600 {
lab=#net9}
-N 1380 -380 1530 -380 {
+N 1640 -600 1790 -600 {
lab=#net9}
-N 930 -520 950 -520 {
+N 1190 -740 1210 -740 {
lab=#net10}
-N 930 -340 950 -340 {
+N 1190 -560 1210 -560 {
lab=#net11}
-N 900 -520 930 -520 {
+N 1160 -740 1190 -740 {
lab=#net10}
-N 900 -340 930 -340 {
+N 1160 -560 1190 -560 {
lab=#net11}
-N 600 -440 600 -420 {
+N 860 -660 860 -640 {
lab=#net12}
-N 720 -440 720 -420 {
+N 980 -660 980 -640 {
lab=#net13}
-N 480 -440 480 -420 {
+N 740 -660 740 -640 {
lab=#net14}
-N 360 -440 360 -420 {
+N 620 -660 620 -640 {
lab=#net15}
-C {/Volumes/WORK_DRIVE/caravel_automatic_gain_control/xschem/lownoiseamplifier/csfd-abstract.sym} 1060 -320 0 0 {name=XLNA1}
-C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1230 -320 0 0 {name=l1 lab=GND}
-C {/Users/ryanwans/xschem/xschem_library/devices/vsource.sym} 1230 -570 2 0 {name=V1 value="1.8"}
-C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1230 -600 2 0 {name=l2 lab=GND}
-C {res.sym} 1320 -320 1 0 {name=R1
+N 1840 -660 1860 -660 {
+lab=#net8}
+N 1840 -640 1860 -640 {
+lab=#net9}
+N 1840 -640 1840 -600 {
+lab=#net9}
+N 1790 -600 1840 -600 {
+lab=#net9}
+N 1840 -700 1840 -660 {
+lab=#net8}
+N 1790 -700 1840 -700 {
+lab=#net8}
+N 1780 -760 1780 -700 {
+lab=#net8}
+N 1780 -600 1780 -520 {
+lab=#net9}
+N 2050 -650 2080 -650 {
+lab=#net16}
+N 2080 -650 2080 -630 {
+lab=#net16}
+N 2080 -650 2120 -650 {
+lab=#net16}
+N 2140 -650 2140 -630 {
+lab=#net16}
+N 2120 -650 2140 -650 {
+lab=#net16}
+N 2080 -570 2080 -550 {
+lab=GND}
+N 2140 -570 2140 -550 {
+lab=GND}
+N 2140 -650 2180 -650 {
+lab=#net16}
+N 580 -660 620 -660 {
+lab=#net15}
+N 740 -680 740 -660 {
+lab=#net14}
+N 580 -680 740 -680 {
+lab=#net14}
+N 860 -640 860 -630 {
+lab=#net12}
+N 610 -630 860 -630 {
+lab=#net12}
+N 610 -640 610 -630 {
+lab=#net12}
+N 580 -640 610 -640 {
+lab=#net12}
+N 580 -620 980 -620 {
+lab=#net13}
+N 980 -640 980 -620 {
+lab=#net13}
+N 460 -740 560 -740 {
+lab=#net17}
+N 460 -560 560 -560 {
+lab=#net18}
+C {/Volumes/WORK_DRIVE/caravel_automatic_gain_control/xschem/lownoiseamplifier/csfd-abstract.sym} 1320 -540 0 0 {name=XLNA1}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1490 -540 0 0 {name=l1 lab=GND}
+C {/Users/ryanwans/xschem/xschem_library/devices/vsource.sym} 1490 -790 2 0 {name=V1 value="1.8"}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1490 -820 2 0 {name=l2 lab=GND}
+C {res.sym} 1580 -540 1 0 {name=R1
value=13k
footprint=1206
device=resistor
m=1}
-C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1370 -320 3 0 {name=l3 lab=GND}
-C {res.sym} 1320 -540 1 1 {name=R2
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1630 -540 3 0 {name=l3 lab=GND}
+C {res.sym} 1580 -760 1 1 {name=R2
value=13k
footprint=1206
device=resistor
m=1}
-C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1370 -540 3 1 {name=l4 lab=GND}
-C {res.sym} 1410 -430 1 0 {name=R3
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1630 -760 3 1 {name=l4 lab=GND}
+C {res.sym} 1670 -650 1 0 {name=R3
value=250
footprint=1206
device=resistor
m=1}
-C {/Users/ryanwans/xschem/xschem_library/devices/vsource.sym} 1470 -430 3 0 {name=V2 value="1.8"}
-C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1500 -430 3 0 {name=l5 lab=GND}
-C {/Users/ryanwans/xschem/xschem_library/devices/vsource.sym} 1020 -430 1 0 {name=V3 value="1.8"}
-C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 990 -430 1 0 {name=l6 lab=GND}
-C {res.sym} 1070 -480 2 0 {name=R4
+C {/Users/ryanwans/xschem/xschem_library/devices/vsource.sym} 1730 -650 3 0 {name=V2 value="1.8"}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1760 -650 3 0 {name=l5 lab=GND}
+C {/Users/ryanwans/xschem/xschem_library/devices/vsource.sym} 1280 -650 1 0 {name=V3 value="1.8"}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1250 -650 1 0 {name=l6 lab=GND}
+C {res.sym} 1330 -700 2 0 {name=R4
value=800
footprint=1206
device=resistor
m=1}
-C {res.sym} 1070 -380 0 0 {name=R5
+C {res.sym} 1330 -600 0 0 {name=R5
value=800
footprint=1206
device=resistor
m=1}
-C {res.sym} 1070 -570 2 0 {name=R6
+C {res.sym} 1330 -790 2 0 {name=R6
value=1k
footprint=1206
device=resistor
m=1}
-C {res.sym} 1070 -290 0 0 {name=R7
+C {res.sym} 1330 -510 0 0 {name=R7
value=1k
footprint=1206
device=resistor
m=1}
-C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1070 -600 2 0 {name=l7 lab=GND}
-C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1070 -260 0 0 {name=l8 lab=GND}
-C {capa.sym} 980 -520 3 0 {name=C1
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1330 -820 2 0 {name=l7 lab=GND}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1330 -480 0 0 {name=l8 lab=GND}
+C {capa.sym} 1240 -740 3 0 {name=C1
m=1
value=500u
footprint=1206
device="ceramic capacitor"}
-C {capa.sym} 980 -340 3 0 {name=C2
+C {capa.sym} 1240 -560 3 0 {name=C2
m=1
value=500u
footprint=1206
device="ceramic capacitor"}
-C {/Volumes/WORK_DRIVE/caravel_automatic_gain_control/xschem/attenuator/dsa.sym} 160 -100 0 0 {name=XDSA1}
-C {/Volumes/WORK_DRIVE/caravel_automatic_gain_control/xschem/attenuator/dsa.sym} 160 -760 2 1 {name=XDSA2}
+C {/Volumes/WORK_DRIVE/caravel_automatic_gain_control/xschem/attenuator/dsa.sym} 420 -320 0 0 {name=XDSA1}
+C {/Volumes/WORK_DRIVE/caravel_automatic_gain_control/xschem/attenuator/dsa.sym} 420 -980 2 1 {name=XDSA2}
+C {/Volumes/WORK_DRIVE/caravel_automatic_gain_control/xschem/powerdetector/balaced-pd.sym} 1810 -550 0 0 {name=X1}
+C {/Users/ryanwans/xschem/xschem_library/devices/vsource.sym} 1920 -740 2 0 {name=V4 value="0.5"}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1920 -770 2 0 {name=l9 lab=GND}
+C {/Users/ryanwans/xschem/xschem_library/devices/vsource.sym} 1990 -740 2 0 {name=V5 value="1.8"}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1990 -770 2 0 {name=l10 lab=GND}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 1960 -590 0 0 {name=l11 lab=GND}
+C {capa.sym} 2080 -600 0 0 {name=C3
+m=1
+value=200p
+footprint=1206
+device="ceramic capacitor"}
+C {res.sym} 2140 -600 0 0 {name=R8
+value=500k
+footprint=1206
+device=resistor
+m=1}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 2080 -550 0 0 {name=l12 lab=GND}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 2140 -550 0 0 {name=l13 lab=GND}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 800 -480 0 0 {name=l14 lab=GND}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 800 -820 2 0 {name=l15 lab=GND}
+C {/Users/ryanwans/xschem/xschem_library/devices/vsource.sym} 860 -850 2 0 {name=V6 value="1.8"}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 860 -880 2 0 {name=l16 lab=GND}
+C {/Users/ryanwans/xschem/xschem_library/devices/vsource.sym} 860 -450 0 1 {name=V7 value="1.8"}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 860 -420 0 1 {name=l17 lab=GND}
+C {/Users/ryanwans/xschem/xschem_library/devices/vsource.sym} 920 -850 2 0 {name=V8 value="1.4"}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 920 -880 2 0 {name=V9 value="1.4"}
+C {/Users/ryanwans/xschem/xschem_library/devices/vsource.sym} 920 -450 0 0 {name=V10 value="1.4"}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 920 -420 0 0 {name=V11 value="1.4"}
+C {/Users/ryanwans/xschem/xschem_library/devices/vsource.sym} 430 -740 1 0 {name=V12 value="SIN(0.2 0.2 40000 0 0 180)"}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 400 -740 1 0 {name=V13 value="1.4"}
+C {/Users/ryanwans/xschem/xschem_library/devices/vsource.sym} 430 -560 1 0 {name=V14 value="SIN(0.2 0.2 40000)"}
+C {/Users/ryanwans/xschem/xschem_library/devices/gnd.sym} 400 -560 1 0 {name=V15 value="1.4"}
diff --git a/xschem/powerdetector/balaced-pd.sch b/xschem/powerdetector/balaced-pd.sch
index b973db2..0d44ffe 100644
--- a/xschem/powerdetector/balaced-pd.sch
+++ b/xschem/powerdetector/balaced-pd.sch
@@ -1,4 +1,4 @@
-v {xschem version=2.9.9 file_version=1.2 }
+v {xschem version=3.0.0 file_version=1.2 }
G {}
K {}
V {}
@@ -84,9 +84,11 @@
N -20 -50 0 -50 { lab=gnd}
N 0 -80 0 -50 { lab=gnd}
N -20 -80 0 -80 { lab=gnd}
-N -300 -170 -300 -150 {}
-N -140 40 330 40 {}
-C {devices/code.sym} 530 -170 0 0 {name=TT_MODELS
+N -300 -170 -300 -150 {
+lab=output}
+N -140 40 330 40 {
+lab=gnd}
+C {code.sym} 490 -350 0 0 {name=sT_MODELS
only_toplevel=true
format="tcleval( @value )"
value="** manual skywater pdks install (with patches applied)
@@ -99,30 +101,13 @@
.param mc_pr_switch=0
"
spice_ignore=false}
-C {devices/code.sym} 530 -320 0 0 {name="pepper, chilli, cinnamon" only_toplevel=false value="
-.tran 0.0005s 0.5s
-"}
-C {devices/ipin.sym} 40 -300 1 0 {name=vdd lab=vdd}
-C {devices/ipin.sym} -50 60 3 0 {name=gnd lab=gnd}
-C {devices/opin.sym} -420 -150 2 0 {name=output lab=output}
-C {devices/ipin.sym} 180 -40 3 0 {name=in1 lab=in1}
-C {devices/ipin.sym} 480 -40 3 0 {name=in2 lab=in2}
-C {devices/ipin.sym} 170 -120 1 0 {name=vbias lab=vbias}
-C {sky130_fd_pr/nfet_01v8.sym} -40 -80 0 0 {name=M10
-L=0.15
-W=1
-nf=1
-mult=1
-ad="'int((nf+1)/2) * W/nf * 0.29'"
-pd="'2*int((nf+1)/2) * (W/nf + 0.29)'"
-as="'int((nf+2)/2) * W/nf * 0.29'"
-ps="'2*int((nf+2)/2) * (W/nf + 0.29)'"
-nrd="'0.29 / W'" nrs="'0.29 / W'"
-sa=0 sb=0 sd=0
-model=nfet_01v8
-spiceprefix=X
-}
-C {sky130_fd_pr/pfet_01v8.sym} -280 -210 0 1 {name=M11
+C {ipin.sym} 40 -300 1 0 {name=pdd lab=vdd}
+C {ipin.sym} -50 60 3 0 {name=pnd lab=gnd}
+C {opin.sym} -420 -150 2 0 {name=putput lab=output}
+C {ipin.sym} 180 -40 3 0 {name=pn1 lab=in1}
+C {ipin.sym} 480 -40 3 0 {name=pn2 lab=in2}
+C {ipin.sym} 170 -120 1 0 {name=pbias lab=vbias}
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/pfet_01v8.sym} -280 -210 0 1 {name=M11
L=0.15
W=1
nf=1
@@ -136,7 +121,77 @@
model=pfet_01v8
spiceprefix=X
}
-C {sky130_fd_pr/pfet_01v8.sym} 60 -210 0 1 {name=M3
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/nfet_01v8.sym} -120 -80 0 1 {name=M2
+L=0.15
+W=1
+nf=1
+mult=1
+ad="'int((nf+1)/2) * W/nf * 0.29'"
+pd="'2*int((nf+1)/2) * (W/nf + 0.29)'"
+as="'int((nf+2)/2) * W/nf * 0.29'"
+ps="'2*int((nf+2)/2) * (W/nf + 0.29)'"
+nrd="'0.29 / W'" nrs="'0.29 / W'"
+sa=0 sb=0 sd=0
+model=nfet_01v8
+spiceprefix=X
+}
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/nfet_01v8.sym} -40 -80 0 0 {name=M1
+L=0.15
+W=1
+nf=1
+mult=1
+ad="'int((nf+1)/2) * W/nf * 0.29'"
+pd="'2*int((nf+1)/2) * (W/nf + 0.29)'"
+as="'int((nf+2)/2) * W/nf * 0.29'"
+ps="'2*int((nf+2)/2) * (W/nf + 0.29)'"
+nrd="'0.29 / W'" nrs="'0.29 / W'"
+sa=0 sb=0 sd=0
+model=nfet_01v8
+spiceprefix=X
+}
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/nfet_01v8.sym} 120 -80 0 1 {name=M5
+L=0.15
+W=1
+nf=1
+mult=1
+ad="'int((nf+1)/2) * W/nf * 0.29'"
+pd="'2*int((nf+1)/2) * (W/nf + 0.29)'"
+as="'int((nf+2)/2) * W/nf * 0.29'"
+ps="'2*int((nf+2)/2) * (W/nf + 0.29)'"
+nrd="'0.29 / W'" nrs="'0.29 / W'"
+sa=0 sb=0 sd=0
+model=nfet_01v8
+spiceprefix=X
+}
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/nfet_01v8.sym} 230 -80 0 0 {name=M6
+L=0.15
+W=1
+nf=1
+mult=1
+ad="'int((nf+1)/2) * W/nf * 0.29'"
+pd="'2*int((nf+1)/2) * (W/nf + 0.29)'"
+as="'int((nf+2)/2) * W/nf * 0.29'"
+ps="'2*int((nf+2)/2) * (W/nf + 0.29)'"
+nrd="'0.29 / W'" nrs="'0.29 / W'"
+sa=0 sb=0 sd=0
+model=nfet_01v8
+spiceprefix=X
+}
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/nfet_01v8.sym} 430 -80 0 1 {name=M7
+L=0.15
+W=1
+nf=1
+mult=1
+ad="'int((nf+1)/2) * W/nf * 0.29'"
+pd="'2*int((nf+1)/2) * (W/nf + 0.29)'"
+as="'int((nf+2)/2) * W/nf * 0.29'"
+ps="'2*int((nf+2)/2) * (W/nf + 0.29)'"
+nrd="'0.29 / W'" nrs="'0.29 / W'"
+sa=0 sb=0 sd=0
+model=nfet_01v8
+spiceprefix=X
+}
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/pfet_01v8.sym} 60 -210 0 1 {name=M3
L=0.15
W=1
nf=1
@@ -150,7 +205,7 @@
model=pfet_01v8
spiceprefix=X
}
-C {sky130_fd_pr/pfet_01v8.sym} -160 -210 0 0 {name=M4
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/pfet_01v8.sym} -160 -210 0 0 {name=M4
L=0.15
W=1
nf=1
@@ -164,7 +219,7 @@
model=pfet_01v8
spiceprefix=X
}
-C {sky130_fd_pr/pfet_01v8.sym} 310 -210 0 0 {name=M8
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/pfet_01v8.sym} 310 -210 0 0 {name=M8
L=0.15
W=1
nf=1
@@ -178,59 +233,3 @@
model=pfet_01v8
spiceprefix=X
}
-C {sky130_fd_pr/nfet_01v8.sym} 230 -80 0 0 {name=M1
-L=0.15
-W=1
-nf=1
-mult=1
-ad="'int((nf+1)/2) * W/nf * 0.29'"
-pd="'2*int((nf+1)/2) * (W/nf + 0.29)'"
-as="'int((nf+2)/2) * W/nf * 0.29'"
-ps="'2*int((nf+2)/2) * (W/nf + 0.29)'"
-nrd="'0.29 / W'" nrs="'0.29 / W'"
-sa=0 sb=0 sd=0
-model=nfet_01v8
-spiceprefix=X
-}
-C {sky130_fd_pr/nfet_01v8.sym} -120 -80 0 1 {name=M2
-L=0.15
-W=1
-nf=1
-mult=1
-ad="'int((nf+1)/2) * W/nf * 0.29'"
-pd="'2*int((nf+1)/2) * (W/nf + 0.29)'"
-as="'int((nf+2)/2) * W/nf * 0.29'"
-ps="'2*int((nf+2)/2) * (W/nf + 0.29)'"
-nrd="'0.29 / W'" nrs="'0.29 / W'"
-sa=0 sb=0 sd=0
-model=nfet_01v8
-spiceprefix=X
-}
-C {sky130_fd_pr/nfet_01v8.sym} 430 -80 0 1 {name=M5
-L=0.15
-W=1
-nf=1
-mult=1
-ad="'int((nf+1)/2) * W/nf * 0.29'"
-pd="'2*int((nf+1)/2) * (W/nf + 0.29)'"
-as="'int((nf+2)/2) * W/nf * 0.29'"
-ps="'2*int((nf+2)/2) * (W/nf + 0.29)'"
-nrd="'0.29 / W'" nrs="'0.29 / W'"
-sa=0 sb=0 sd=0
-model=nfet_01v8
-spiceprefix=X
-}
-C {sky130_fd_pr/nfet_01v8.sym} 120 -80 0 1 {name=M6
-L=0.15
-W=1
-nf=1
-mult=1
-ad="'int((nf+1)/2) * W/nf * 0.29'"
-pd="'2*int((nf+1)/2) * (W/nf + 0.29)'"
-as="'int((nf+2)/2) * W/nf * 0.29'"
-ps="'2*int((nf+2)/2) * (W/nf + 0.29)'"
-nrd="'0.29 / W'" nrs="'0.29 / W'"
-sa=0 sb=0 sd=0
-model=nfet_01v8
-spiceprefix=X
-}
