fix HV nwell spacing violations
diff --git a/comparator/comparator.mag b/comparator/comparator.mag
index 0d339c0..41166d9 100644
--- a/comparator/comparator.mag
+++ b/comparator/comparator.mag
@@ -1,9 +1,9 @@
magic
tech sky130A
-timestamp 1632918758
+timestamp 1632928825
<< nwell >>
rect 210 -330 730 240
-rect 920 -770 1320 -140
+rect 930 -770 1320 -140
<< pwell >>
rect -250 -190 140 230
rect -310 -240 140 -190
@@ -19,9 +19,9 @@
rect 60 -960 78 -860
rect 190 -1030 205 -930
<< pmos >>
-rect 980 -460 998 -160
-rect 1050 -460 1068 -160
-rect 980 -750 995 -550
+rect 990 -460 1008 -160
+rect 1060 -460 1078 -160
+rect 990 -750 1005 -550
<< mvnmos >>
rect 20 110 120 170
rect 20 0 120 60
@@ -67,26 +67,26 @@
rect 240 -1020 250 -940
rect 205 -1030 250 -1020
<< pdiff >>
-rect 940 -170 980 -160
-rect 940 -450 950 -170
-rect 970 -450 980 -170
-rect 940 -460 980 -450
-rect 998 -170 1050 -160
-rect 998 -450 1010 -170
-rect 1040 -450 1050 -170
-rect 998 -460 1050 -450
-rect 1068 -170 1110 -160
-rect 1068 -450 1080 -170
-rect 1100 -450 1110 -170
-rect 1068 -460 1110 -450
-rect 940 -560 980 -550
-rect 940 -740 950 -560
-rect 970 -740 980 -560
-rect 940 -750 980 -740
-rect 995 -560 1040 -550
-rect 995 -740 1010 -560
-rect 1030 -740 1040 -560
-rect 995 -750 1040 -740
+rect 950 -170 990 -160
+rect 950 -450 960 -170
+rect 980 -450 990 -170
+rect 950 -460 990 -450
+rect 1008 -170 1060 -160
+rect 1008 -450 1020 -170
+rect 1050 -450 1060 -170
+rect 1008 -460 1060 -450
+rect 1078 -170 1120 -160
+rect 1078 -450 1090 -170
+rect 1110 -450 1120 -170
+rect 1078 -460 1120 -450
+rect 950 -560 990 -550
+rect 950 -740 960 -560
+rect 980 -740 990 -560
+rect 950 -750 990 -740
+rect 1005 -560 1050 -550
+rect 1005 -740 1020 -560
+rect 1040 -740 1050 -560
+rect 1005 -750 1050 -740
<< mvndiff >>
rect 20 200 120 210
rect 20 180 30 200
@@ -174,11 +174,11 @@
rect 160 -1020 180 -940
rect 220 -1020 240 -940
<< pdiffc >>
-rect 950 -450 970 -170
-rect 1010 -450 1040 -170
-rect 1080 -450 1100 -170
-rect 950 -740 970 -560
-rect 1010 -740 1030 -560
+rect 960 -450 980 -170
+rect 1020 -450 1050 -170
+rect 1090 -450 1110 -170
+rect 960 -740 980 -560
+rect 1020 -740 1040 -560
<< mvndiffc >>
rect 30 180 110 200
rect 30 70 110 100
@@ -208,10 +208,9 @@
rect -115 -1025 -100 -285
rect -230 -1040 -100 -1025
<< nsubdiff >>
-rect 600 185 710 200
+rect 600 185 690 200
rect 600 -275 615 185
-rect 695 -275 710 185
-rect 600 -290 710 -275
+rect 600 -290 690 -275
rect 1200 -175 1300 -160
rect 1200 -735 1215 -175
rect 1285 -735 1300 -175
@@ -220,7 +219,7 @@
rect -215 -160 -115 -40
rect -215 -1025 -115 -285
<< nsubdiffcont >>
-rect 615 -275 695 185
+rect 615 -275 690 185
rect 1215 -735 1285 -175
<< poly >>
rect -60 160 20 170
@@ -257,12 +256,12 @@
rect 120 -300 150 -240
rect 220 -250 250 -200
rect 400 -250 550 -200
-rect 980 -110 1020 -100
-rect 980 -130 990 -110
-rect 1010 -130 1068 -110
-rect 980 -140 1068 -130
-rect 980 -160 998 -140
-rect 1050 -160 1068 -140
+rect 990 -110 1030 -100
+rect 990 -130 1000 -110
+rect 1020 -130 1078 -110
+rect 990 -140 1078 -130
+rect 990 -160 1008 -140
+rect 1060 -160 1078 -140
rect 160 -360 210 -350
rect 160 -370 170 -360
rect 60 -390 170 -370
@@ -273,9 +272,9 @@
rect 170 -460 230 -430
rect 280 -460 340 -430
rect 390 -460 450 -400
-rect 980 -490 998 -460
-rect 1050 -490 1068 -460
-rect 980 -550 995 -520
+rect 990 -490 1008 -460
+rect 1060 -490 1078 -460
+rect 990 -550 1005 -520
rect 60 -590 120 -560
rect 170 -590 230 -560
rect 280 -580 340 -560
@@ -302,7 +301,7 @@
rect 350 -710 368 -690
rect 60 -790 120 -760
rect 440 -780 480 -770
-rect 980 -780 995 -750
+rect 990 -780 1005 -750
rect 440 -800 450 -780
rect 470 -800 480 -780
rect 140 -820 180 -810
@@ -313,11 +312,11 @@
rect 60 -860 78 -840
rect 140 -850 180 -840
rect 440 -880 480 -800
-rect 800 -790 1120 -780
-rect 800 -830 810 -790
-rect 850 -830 1070 -790
-rect 1110 -830 1120 -790
-rect 800 -840 1120 -830
+rect 730 -790 1130 -780
+rect 730 -830 740 -790
+rect 840 -830 1020 -790
+rect 1120 -830 1130 -790
+rect 730 -840 1130 -830
rect 190 -910 480 -880
rect 190 -930 205 -910
rect 60 -990 78 -960
@@ -328,7 +327,7 @@
rect -50 10 -10 50
rect 440 20 460 40
rect -40 -230 -10 -200
-rect 990 -130 1010 -110
+rect 1000 -130 1020 -110
rect 170 -390 200 -360
rect 0 -630 20 -610
rect 300 -610 330 -580
@@ -336,8 +335,8 @@
rect 365 -680 385 -660
rect 450 -800 470 -780
rect 150 -840 170 -820
-rect 810 -830 850 -790
-rect 1070 -830 1110 -790
+rect 740 -830 840 -790
+rect 1020 -830 1120 -790
<< locali >>
rect 20 200 470 210
rect 20 180 30 200
@@ -384,9 +383,9 @@
rect 390 -280 400 -260
rect 250 -290 400 -280
rect 600 -290 610 200
-rect 940 -130 990 -110
-rect 1010 -130 1020 -110
-rect 940 -170 970 -130
+rect 870 -130 1000 -110
+rect 1020 -130 1030 -110
+rect 870 -170 980 -130
rect 160 -360 210 -350
rect 160 -370 170 -360
rect 130 -390 170 -370
@@ -401,11 +400,10 @@
rect 20 -630 30 -610
rect 130 -590 160 -550
rect 350 -470 380 -400
-rect 940 -420 950 -170
-rect 870 -450 950 -420
-rect 870 -460 970 -450
-rect 1080 -170 1120 -160
-rect 1100 -450 1120 -170
+rect 870 -450 960 -170
+rect 870 -460 980 -450
+rect 1090 -170 1130 -160
+rect 1110 -450 1130 -170
rect 350 -580 380 -550
rect 130 -620 230 -590
rect 280 -610 300 -580
@@ -425,26 +423,26 @@
rect 400 -780 850 -770
rect 400 -800 450 -780
rect 470 -790 850 -780
-rect 470 -800 810 -790
-rect 380 -810 810 -800
+rect 470 -800 740 -790
rect 140 -820 270 -810
rect 140 -840 150 -820
rect 170 -840 270 -820
rect 140 -850 270 -840
-rect 800 -830 810 -810
-rect 800 -850 850 -830
+rect 380 -830 740 -800
+rect 840 -830 850 -790
+rect 380 -850 850 -830
rect 240 -870 270 -850
rect 870 -870 910 -460
rect 240 -910 910 -870
-rect 940 -560 970 -550
-rect 940 -740 950 -560
-rect 940 -900 970 -740
-rect 1080 -780 1120 -450
+rect 940 -560 980 -550
+rect 940 -740 960 -560
+rect 940 -900 980 -740
+rect 1090 -780 1130 -450
rect 1200 -750 1210 -160
-rect 1060 -790 1120 -780
-rect 1060 -830 1070 -790
-rect 1110 -830 1120 -790
-rect 1060 -840 1120 -830
+rect 1010 -790 1130 -780
+rect 1010 -830 1020 -790
+rect 1120 -830 1130 -790
+rect 1010 -840 1130 -830
rect 150 -940 180 -930
rect 150 -1000 160 -940
rect 940 -960 1450 -900
@@ -477,11 +475,10 @@
rect 250 -190 260 -160
rect 260 -190 390 -160
rect 390 -190 400 -160
-rect 610 185 710 200
+rect 610 185 690 200
rect 610 -275 615 185
-rect 615 -275 695 185
-rect 695 -275 710 185
-rect 610 -290 710 -275
+rect 615 -275 690 185
+rect 610 -290 690 -275
rect 20 -470 50 -460
rect 20 -550 30 -470
rect 30 -550 50 -470
@@ -489,9 +486,9 @@
rect 240 -470 270 -460
rect 240 -550 270 -470
rect 240 -560 270 -550
-rect 1010 -170 1040 -160
-rect 1010 -450 1040 -170
-rect 1010 -460 1040 -450
+rect 1020 -170 1050 -160
+rect 1020 -450 1050 -170
+rect 1020 -460 1050 -450
rect 460 -470 490 -460
rect 460 -550 480 -470
rect 480 -550 490 -470
@@ -514,10 +511,10 @@
rect 90 -870 120 -860
rect 90 -950 110 -870
rect 110 -950 120 -870
-rect 1010 -560 1040 -550
-rect 1010 -740 1030 -560
-rect 1030 -740 1040 -560
-rect 1010 -750 1040 -740
+rect 1020 -560 1050 -550
+rect 1020 -740 1040 -560
+rect 1040 -740 1050 -560
+rect 1020 -750 1050 -740
rect 1210 -175 1300 -160
rect 1210 -735 1215 -175
rect 1215 -735 1285 -175
@@ -562,7 +559,7 @@
rect -400 -1040 -230 -270
rect -110 -300 -100 -270
rect 600 -290 610 -200
-rect 710 -290 800 200
+rect 690 -290 800 200
rect 1200 -150 1400 300
rect -110 -310 130 -300
rect -110 -340 20 -310
@@ -613,16 +610,16 @@
rect -400 -1060 190 -1050
rect -400 -1100 -100 -1060
rect 600 -1100 800 -290
-rect 1000 -160 1400 -150
-rect 1000 -460 1010 -160
-rect 1040 -460 1210 -160
-rect 1000 -470 1210 -460
+rect 1010 -160 1400 -150
+rect 1010 -460 1020 -160
+rect 1050 -460 1210 -160
+rect 1010 -470 1210 -460
rect 1200 -540 1210 -470
-rect 1000 -550 1210 -540
-rect 1000 -750 1010 -550
-rect 1040 -750 1210 -550
+rect 1010 -550 1210 -540
+rect 1010 -750 1020 -550
+rect 1050 -750 1210 -550
rect 1300 -750 1400 -160
-rect 1000 -760 1400 -750
+rect 1010 -760 1400 -750
rect 1200 -1100 1400 -760
<< labels >>
rlabel metal1 -400 -1100 -100 -1080 1 VGND
diff --git a/comparator/comparator.spice b/comparator/comparator.spice
index 586c10a..90fbc7c 100644
--- a/comparator/comparator.spice
+++ b/comparator/comparator.spice
@@ -1,26 +1,26 @@
-* SPICE3 file created from comparator.ext - technology: sky130A
+* SPICE3 file created from /mnt/c/Users/Harry/magic-practice/caravel_user_project_analog/comparator/comparator.ext - technology: sky130A
.subckt comparator VGND VDD3v3 VDD1v8 VOUT BIASN VN VP
X0 VPAMP VP ISINK VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
X1 VGND BIASN ISINK VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
X2 VOPAMP VOP DIFFSINK VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
X3 VON VNAMP VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
-X4 VDD1v8 VONAMP VONAMP VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=3e+06u l=180000u
-X5 DECISINK VON VOP VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X6 ISINK VN VNAMP VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X7 DECISINK VOP VON VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
+X4 DECISINK VON VOP VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
+X5 ISINK VN VNAMP VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
+X6 DECISINK VOP VON VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
+X7 VDD1v8 VOPAMP VOUT VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=2e+06u l=150000u
X8 DIFFSINK VONAMP VGND VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
X9 VPAMP VPAMP VDD3v3 VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
X10 ISINK BIASN VGND VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
X11 DIFFSINK VON VONAMP VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=180000u
X12 VON VON DECISINK VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X13 VOUT VOPAMP VGND VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=150000u
-X14 VDD1v8 VOPAMP VOUT VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=2e+06u l=150000u
+X13 VOPAMP VONAMP VDD1v8 VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=3e+06u l=180000u
+X14 VOUT VOPAMP VGND VGND sky130_fd_pr__nfet_01v8 ad=0p pd=0u as=0p ps=0u w=1e+06u l=150000u
X15 VDD3v3 VNAMP VNAMP VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
X16 VOP VOP DECISINK VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X17 VOPAMP VONAMP VDD1v8 VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=3e+06u l=180000u
-X18 DECISINK DECISINK VGND VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
-X19 VDD3v3 VPAMP VOP VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
-C0 VOPAMP VGND 2.64fF
+X17 DECISINK DECISINK VGND VGND sky130_fd_pr__nfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1e+06u l=600000u
+X18 VDD3v3 VPAMP VOP VDD3v3 sky130_fd_pr__pfet_g5v0d10v5 ad=0p pd=0u as=0p ps=0u w=1.5e+06u l=500000u
+X19 VDD1v8 VONAMP VONAMP VDD1v8 sky130_fd_pr__pfet_01v8 ad=0p pd=0u as=0p ps=0u w=3e+06u l=180000u
+C0 VOPAMP VGND 2.89fF
C1 VON VGND 2.03fF
.ends
diff --git a/gds/comparator.gds b/gds/comparator.gds
index be37cda..d3dea0b 100644
--- a/gds/comparator.gds
+++ b/gds/comparator.gds
Binary files differ
diff --git a/gds/user_analog_project_wrapper.gds b/gds/user_analog_project_wrapper.gds
index e69de29..6e7cd0c 100644
--- a/gds/user_analog_project_wrapper.gds
+++ b/gds/user_analog_project_wrapper.gds
Binary files differ
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index 6e9400f..a244c9f 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,6 +1,6 @@
magic
tech sky130A
-timestamp 1632920072
+timestamp 1632928998
<< locali >>
rect 1320 49160 1490 49220
rect 1320 49050 1490 49110
@@ -746,7 +746,7 @@
rect 292000 0 292050 352000
rect -50 -50 292050 0
use comparator comparator_0
-timestamp 1632918758
+timestamp 1632928825
transform 1 0 1920 0 1 49050
box -430 -1100 1450 300
<< labels >>
diff --git a/signoff/user_analog_project_wrapper_xor/total.txt b/signoff/user_analog_project_wrapper_xor/total.txt
index 05b29a4..f7c9cac 100644
--- a/signoff/user_analog_project_wrapper_xor/total.txt
+++ b/signoff/user_analog_project_wrapper_xor/total.txt
@@ -1 +1 @@
-Total XOR differences = 0
\ No newline at end of file
+Total XOR differences = 1
\ No newline at end of file
diff --git a/signoff/user_analog_project_wrapper_xor/user_analog_project_wrapper.xor.gds b/signoff/user_analog_project_wrapper_xor/user_analog_project_wrapper.xor.gds
index 823641d..c4f55a1 100644
--- a/signoff/user_analog_project_wrapper_xor/user_analog_project_wrapper.xor.gds
+++ b/signoff/user_analog_project_wrapper_xor/user_analog_project_wrapper.xor.gds
Binary files differ
diff --git a/signoff/user_analog_project_wrapper_xor/user_analog_project_wrapper.xor.gds.png b/signoff/user_analog_project_wrapper_xor/user_analog_project_wrapper.xor.gds.png
index 886caa9..9ebf694 100644
--- a/signoff/user_analog_project_wrapper_xor/user_analog_project_wrapper.xor.gds.png
+++ b/signoff/user_analog_project_wrapper_xor/user_analog_project_wrapper.xor.gds.png
Binary files differ
diff --git a/signoff/user_analog_project_wrapper_xor/user_analog_project_wrapper.xor.xml b/signoff/user_analog_project_wrapper_xor/user_analog_project_wrapper.xor.xml
index d812444..421073a 100644
--- a/signoff/user_analog_project_wrapper_xor/user_analog_project_wrapper.xor.xml
+++ b/signoff/user_analog_project_wrapper_xor/user_analog_project_wrapper.xor.xml
@@ -41,5 +41,16 @@
</cell>
</cells>
<items>
+ <item>
+ <tags/>
+ <category>'235/4'</category>
+ <cell>user_analog_project_wrapper</cell>
+ <visited>false</visited>
+ <multiplicity>1</multiplicity>
+ <image/>
+ <values>
+ <value>polygon: (2920,0;2920,3520;0,3520;0,3624.005;3024.005,3624.005;3024.005,0)</value>
+ </values>
+ </item>
</items>
</report-database>
diff --git a/signoff/user_analog_project_wrapper_xor/xor.log b/signoff/user_analog_project_wrapper_xor/xor.log
index 7f16b9b..45ae4f2 100644
--- a/signoff/user_analog_project_wrapper_xor/xor.log
+++ b/signoff/user_analog_project_wrapper_xor/xor.log
@@ -8,10 +8,10 @@
"_input" in: _drc_engine.rb:1373
Elapsed: 0.010s
"_input" in: _drc_engine.rb:1373
-Elapsed: 0.010s
+Elapsed: 0.020s
"^" in: _drc_engine.rb:1414
Elapsed: 0.010s
-XOR differences: 0
+XOR differences: 1
"_output" in: _drc_engine.rb:1479
Elapsed: 0.010s
--- Running XOR for 69/20 ---
@@ -43,6 +43,6 @@
Elapsed: 0.010s
XOR differences: 0
"_output" in: _drc_engine.rb:1479
-Elapsed: 0.010s
+Elapsed: 0.000s
Writing layout file: gds/user_analog_project_wrapper.xor.gds ..
-Total run time: 0.180s
+Total run time: 0.200s
