major DRC reworks using magic's better DRC deck
diff --git a/gds/dsa/dsa.GDS b/gds/dsa/dsa.GDS
index cb92c5d..a28f819 100644
--- a/gds/dsa/dsa.GDS
+++ b/gds/dsa/dsa.GDS
Binary files differ
diff --git a/gds/dsa/dsa_core.GDS b/gds/dsa/dsa_core.GDS
index 638ab37..6176c22 100644
--- a/gds/dsa/dsa_core.GDS
+++ b/gds/dsa/dsa_core.GDS
Binary files differ
diff --git a/gds/dsa/sky130_drc.txt b/gds/dsa/sky130_drc.txt
index fc031d9..ec16977 100644
--- a/gds/dsa/sky130_drc.txt
+++ b/gds/dsa/sky130_drc.txt
@@ -5,6 +5,30 @@
<generator>drc: script='/Users/ryanwans/.klayout/tech/sky130/drc/sky130.lydrc'</generator>
<top-cell>TOP</top-cell>
<tags>
+ <tag>
+ <name>red</name>
+ <description/>
+ </tag>
+ <tag>
+ <name>green</name>
+ <description/>
+ </tag>
+ <tag>
+ <name>blue</name>
+ <description/>
+ </tag>
+ <tag>
+ <name>yellow</name>
+ <description/>
+ </tag>
+ <tag>
+ <name>waived</name>
+ <description/>
+ </tag>
+ <tag>
+ <name>important</name>
+ <description/>
+ </tag>
</tags>
<categories>
<category>
diff --git a/gds/dsa/spdt.GDS b/gds/dsa/spdt.GDS
index 02a8fbe..2d17515 100644
--- a/gds/dsa/spdt.GDS
+++ b/gds/dsa/spdt.GDS
Binary files differ
diff --git a/gds/lna/lna.GDS b/gds/lna/lna.GDS
index 64616b1..226eddb 100644
--- a/gds/lna/lna.GDS
+++ b/gds/lna/lna.GDS
Binary files differ
diff --git a/gds/pd/pd.GDS b/gds/pd/pd.GDS
index 307e79f..dc8bb88 100644
--- a/gds/pd/pd.GDS
+++ b/gds/pd/pd.GDS
Binary files differ
diff --git a/xschem/attenuator/dsa.sch b/xschem/attenuator/dsa.sch
index e48c1fa..6b5e6ec 100644
--- a/xschem/attenuator/dsa.sch
+++ b/xschem/attenuator/dsa.sch
@@ -106,25 +106,25 @@
C {ipin.sym} 910 -340 1 0 {name=ctr3 lab=ctr3}
C {ipin.sym} 1230 -340 1 0 {name=ctr4 lab=ctr4}
C {opin.sym} 1480 -220 0 0 {name=out lab=out}
-C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/res_xhigh_po_0p35.sym} 410 -240 3 0 {name=R1
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/res_xhigh_po_0p35.sym} 410 -240 3 1 {name=R1
W=0.35
L=1
model=res_xhigh_po_0p35
spiceprefix=X
mult=1}
-C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/res_xhigh_po_0p35.sym} 730 -240 3 0 {name=R2
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/res_xhigh_po_0p35.sym} 730 -240 1 0 {name=R2
W=0.35
L=1
model=res_xhigh_po_0p35
spiceprefix=X
mult=1}
-C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/res_xhigh_po_0p35.sym} 1050 -240 3 0 {name=R3
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/res_xhigh_po_0p35.sym} 1050 -240 3 1 {name=R3
W=0.35
L=1
model=res_xhigh_po_0p35
spiceprefix=X
mult=1}
-C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/res_xhigh_po_0p35.sym} 1370 -240 3 0 {name=R4
+C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/res_xhigh_po_0p35.sym} 1370 -240 3 1 {name=R4
W=0.35
L=1
model=res_xhigh_po_0p35
diff --git a/xschem/lownoiseamplifier/cmfb-negfb-revision.sch b/xschem/lownoiseamplifier/cmfb-negfb-revision.sch
index b8dbd86..e57c21c 100644
--- a/xschem/lownoiseamplifier/cmfb-negfb-revision.sch
+++ b/xschem/lownoiseamplifier/cmfb-negfb-revision.sch
@@ -102,6 +102,8 @@
lab=#net2}
N 260 -260 320 -260 {
lab=vdd1}
+N 620 -420 620 -370 {}
+N 500 -420 500 -370 {}
C {/Volumes/WORK_DRIVE/open_pdks/sky130/sky130A/libs.tech/xschem/sky130_fd_pr/nfet_01v8.sym} 420 -370 0 0 {name=M1
L=0.15
W=5
