drc-resolved
diff --git a/gds/user_analog_project_wrapper.gds b/gds/user_analog_project_wrapper.gds
index 3d2ab97..fa44b6f 100644
--- a/gds/user_analog_project_wrapper.gds
+++ b/gds/user_analog_project_wrapper.gds
Binary files differ
diff --git a/mag/cp.ext b/mag/cp.ext
index 9dd7e12..b9bda49 100644
--- a/mag/cp.ext
+++ b/mag/cp.ext
@@ -1,4 +1,4 @@
-timestamp 1640906950
+timestamp 1640911630
version 8.3
tech sky130A
style ngspice()
@@ -14,28 +14,28 @@
node "a_6370_0#" 2001 0 6370 0 pdif 0 0 0 0 0 0 0 0 0 0 1368000 7960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1132800 7720 0 0 0 0 0 0 0 0 0 0 0 0
node "a_3060_0#" 6901 -135.4 3060 0 pdif 0 0 0 0 0 0 0 0 0 0 4104000 23880 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3398400 23160 528000 4880 0 0 0 0 0 0 0 0 0 0
node "a_1710_0#" 3581 5050.11 1710 0 pdif 0 0 0 0 0 0 0 0 684000 4360 1368000 7960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1490400 10040 0 0 1996800 17200 115200 1920 1147200 11840 0 0 0 0 0 0 0 0
-node "out" 3763 4860.96 5400 -2900 p 0 0 0 0 0 0 0 0 684000 4360 1368000 7960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2134800 13620 0 0 1948400 16040 979200 8640 0 0 0 0 0 0 0 0 0 0
-node "a_1710_n2840#" 3920 4600.4 1710 -2840 ndif 0 0 0 0 0 0 0 0 684000 4360 1368000 7960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2779200 17200 0 0 1804800 13760 436400 7560 115200 1920 1147200 11840 0 0 0 0 0 0
+node "out" 3763 4879.44 5400 -2900 p 0 0 0 0 0 0 0 0 684000 4360 1368000 7960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2134800 13620 0 0 1948400 16040 979200 8640 0 0 0 0 0 0 0 0 0 0
+node "a_1710_n2840#" 3920 4632.08 1710 -2840 ndif 0 0 0 0 0 0 0 0 684000 4360 1368000 7960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2779200 17200 0 0 1804800 13760 436400 7560 115200 1920 1147200 11840 0 0 0 0 0 0
node "a_10_n50#" 3989 2430.18 10 -50 p 0 0 0 0 0 0 0 0 684000 4360 1368000 7960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2779200 17200 0 0 1936200 15780 239200 4200 0 0 0 0 0 0 0 0 0 0
node "upbar" 658 1347.77 6750 -50 p 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1444800 9060 0 0 126800 2040 0 0 0 0 0 0 0 0 0 0 0 0
-node "vdd!" 13744 126954 -490 -160 nw 0 0 0 0 40009000 27420 0 0 78300 1120 5472000 31840 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 745200 5020 0 0 5020800 35580 890500 11940 278100 4220 278100 4220 3226600 19660 0 0 0 0
-substrate "gnd!" 0 0 -370 -2840 ndif 0 0 0 0 0 0 0 0 3419400 21800 81200 1140 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1389600 8600 0 0 3496900 27940 662400 7900 280800 4240 280800 4240 4550400 19920 0 0 0 0
-cap "vdd!" "out" 281.2
-cap "a_10_n50#" "a_1710_0#" 41.6842
-cap "vdd!" "a_1710_n2840#" 254.08
+node "vdd!" 18302 139352 -830 -170 nw 0 0 0 0 43093400 28900 0 0 704700 10080 5472000 31840 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 745200 5020 0 0 5560800 43900 1430500 20260 818100 12540 818100 12540 6272200 36660 0 0 0 0
+substrate "gnd!" 0 0 -370 -2840 ndif 0 0 0 0 0 0 0 0 3419400 21800 243600 3420 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1389600 8600 0 0 3637300 30060 802800 10020 421200 6360 421200 6360 4550400 19920 0 0 0 0
cap "a_10_n50#" "vbias" 192.9
+cap "vdd!" "a_7110_0#" 42.55
cap "out" "a_1710_0#" 841.733
cap "a_1710_n2840#" "a_1710_0#" 828.847
-cap "upbar" "a_1710_n2840#" 291.6
-cap "vdd!" "a_3060_n2840#" 320.4
+cap "a_10_n50#" "a_1710_0#" 41.6842
cap "vdd!" "a_6370_0#" 402.828
-cap "vdd!" "a_3060_0#" 1788.27
-cap "vdd!" "a_1710_0#" 707.2
cap "a_1710_n2840#" "out" 606.81
+cap "vdd!" "a_3060_0#" 1788.27
+cap "vdd!" "a_1710_0#" 714.147
+cap "vdd!" "out" 376.075
+cap "upbar" "a_1710_n2840#" 291.6
+cap "vdd!" "a_1710_n2840#" 254.08
cap "vdd!" "a_10_n50#" 530.297
cap "vdd!" "upbar" 149.92
cap "a_1710_0#" "down" 320.4
-cap "vdd!" "a_7110_0#" 42.55
+cap "vdd!" "a_3060_n2840#" 320.4
cap "upbar" "down" 20.625
device msubckt sky130_fd_pr__nfet_01v8 8100 -2840 8101 -2839 l=360 w=1800 "gnd!" "a_1710_0#" 720 0 "a_7110_n2840#" 1800 0 "out" 1800 0
device msubckt sky130_fd_pr__nfet_01v8 6750 -2840 6751 -2839 l=360 w=1800 "gnd!" "down" 720 0 "gnd!" 1800 0 "a_7110_n2840#" 1800 0
diff --git a/mag/cp.mag b/mag/cp.mag
index e616f32..585b355 100644
--- a/mag/cp.mag
+++ b/mag/cp.mag
@@ -1,9 +1,10 @@
magic
tech sky130A
-timestamp 1640906950
+timestamp 1640911461
<< nwell >>
-rect -245 1860 4500 2030
-rect -245 -80 4495 1860
+rect 4500 2030 4690 2035
+rect -415 -80 4690 2030
+rect -415 -85 -245 -80
<< nmos >>
rect 5 -1420 185 -520
rect 675 -1420 855 -520
@@ -614,19 +615,69 @@
rect 4275 365 4375 465
rect 4275 40 4375 140
<< psubdiff >>
+rect 905 -1540 1050 -1525
+rect 905 -1650 920 -1540
+rect 1035 -1650 1050 -1540
+rect 905 -1665 1050 -1650
rect 2045 -1540 2190 -1525
rect 2045 -1650 2060 -1540
rect 2175 -1650 2190 -1540
+rect 4175 -1540 4320 -1525
rect 2045 -1665 2190 -1650
+rect 4175 -1650 4190 -1540
+rect 4305 -1650 4320 -1540
+rect 4175 -1665 4320 -1650
<< nsubdiff >>
+rect 1005 1995 1150 2010
+rect 1005 1885 1020 1995
+rect 1135 1885 1150 1995
+rect 1005 1875 1150 1885
rect 2045 1995 2190 2010
rect 2045 1885 2060 1995
rect 2175 1885 2190 1995
+rect 4040 1995 4185 2010
rect 2045 1875 2190 1885
+rect 4040 1885 4055 1995
+rect 4170 1885 4185 1995
+rect 4040 1875 4185 1885
+rect -395 1800 -250 1815
+rect 4520 1805 4665 1820
+rect -395 1690 -380 1800
+rect -265 1690 -250 1800
+rect -395 1680 -250 1690
+rect -395 1100 -250 1115
+rect -395 990 -380 1100
+rect -265 990 -250 1100
+rect -395 980 -250 990
+rect -395 495 -250 510
+rect -395 385 -380 495
+rect -265 385 -250 495
+rect -395 375 -250 385
+rect 4520 1695 4535 1805
+rect 4650 1695 4665 1805
+rect 4520 1685 4665 1695
+rect 4520 1105 4665 1120
+rect 4520 995 4535 1105
+rect 4650 995 4665 1105
+rect 4520 985 4665 995
+rect 4520 500 4665 515
+rect 4520 390 4535 500
+rect 4650 390 4665 500
+rect 4520 380 4665 390
<< psubdiffcont >>
+rect 920 -1650 1035 -1540
rect 2060 -1650 2175 -1540
+rect 4190 -1650 4305 -1540
<< nsubdiffcont >>
+rect 1020 1885 1135 1995
rect 2060 1885 2175 1995
+rect 4055 1885 4170 1995
+rect -380 1690 -265 1800
+rect -380 990 -265 1100
+rect -380 385 -265 495
+rect 4535 1695 4650 1805
+rect 4535 995 4650 1105
+rect 4535 390 4650 500
<< poly >>
rect 3405 1935 3525 1940
rect 3405 1835 3415 1935
@@ -741,11 +792,18 @@
rect -155 2000 -20 2010
rect -155 1890 -145 2000
rect -30 1890 -20 2000
+rect -390 1800 -255 1810
+rect -390 1690 -380 1800
+rect -265 1690 -255 1800
rect -155 1785 -20 1890
rect 515 2000 650 2010
rect 515 1890 525 2000
rect 640 1890 650 2000
rect 515 1785 650 1890
+rect 1010 1995 1145 2005
+rect 1010 1885 1020 1995
+rect 1135 1885 1145 1995
+rect 1010 1880 1145 1885
rect 2050 1995 2185 2005
rect 2050 1885 2060 1995
rect 2175 1885 2185 1995
@@ -753,11 +811,17 @@
rect 2905 2000 3040 2010
rect 2905 1890 2915 2000
rect 3030 1890 3040 2000
+rect 4045 1995 4180 2005
rect 2905 1785 3040 1890
rect 3405 1935 3525 1940
rect 3405 1835 3415 1935
rect 3515 1835 3525 1935
+rect 4045 1885 4055 1995
+rect 4170 1885 4180 1995
+rect 4045 1880 4180 1885
rect 3405 1825 3525 1835
+rect 4525 1805 4660 1815
+rect -390 1685 -255 1690
rect -170 1715 -10 1785
rect -170 1615 -140 1715
rect -40 1615 -10 1715
@@ -765,11 +829,19 @@
rect -170 1330 -140 1430
rect -40 1330 -10 1430
rect -170 1115 -10 1330
+rect -390 1100 -255 1110
+rect -390 990 -380 1100
+rect -265 990 -255 1100
+rect -390 985 -255 990
rect -170 1015 -140 1115
rect -40 1015 -10 1115
rect -170 800 -10 1015
rect -170 700 -140 800
rect -40 700 -10 800
+rect -390 495 -255 505
+rect -390 385 -380 495
+rect -265 385 -255 495
+rect -390 380 -255 385
rect -170 465 -10 700
rect -170 365 -140 465
rect -40 365 -10 465
@@ -1007,6 +1079,9 @@
rect 4245 1715 4405 1785
rect 4245 1615 4275 1715
rect 4375 1615 4405 1715
+rect 4525 1695 4535 1805
+rect 4650 1695 4660 1805
+rect 4525 1690 4660 1695
rect 4245 1430 4405 1615
rect 4245 1330 4275 1430
rect 4375 1330 4405 1430
@@ -1014,11 +1089,19 @@
rect 4245 1015 4275 1115
rect 4375 1015 4405 1115
rect 4245 800 4405 1015
+rect 4525 1105 4660 1115
+rect 4525 995 4535 1105
+rect 4650 995 4660 1105
+rect 4525 990 4660 995
rect 4245 700 4275 800
rect 4375 700 4405 800
rect 4245 465 4405 700
rect 4245 365 4275 465
rect 4375 365 4405 465
+rect 4525 500 4660 510
+rect 4525 390 4535 500
+rect 4650 390 4660 500
+rect 4525 385 4660 390
rect 4245 140 4405 365
rect 4245 40 4275 140
rect 4375 40 4405 140
@@ -1295,6 +1378,10 @@
rect 515 -1650 525 -1540
rect 640 -1650 650 -1540
rect 515 -1660 650 -1650
+rect 910 -1540 1045 -1530
+rect 910 -1650 920 -1540
+rect 1035 -1650 1045 -1540
+rect 910 -1660 1045 -1650
rect 2050 -1540 2185 -1530
rect 2050 -1650 2060 -1540
rect 2175 -1650 2185 -1540
@@ -1306,12 +1393,21 @@
rect 3405 -1560 3415 -1460
rect 3515 -1560 3525 -1460
rect 3405 -1570 3525 -1560
+rect 4180 -1540 4315 -1530
rect 2910 -1660 3045 -1650
+rect 4180 -1650 4190 -1540
+rect 4305 -1650 4315 -1540
+rect 4180 -1660 4315 -1650
<< viali >>
rect -145 1890 -30 2000
+rect -380 1690 -265 1800
rect 525 1890 640 2000
+rect 1020 1885 1135 1995
rect 2060 1885 2175 1995
rect 2915 1890 3030 2000
+rect 4055 1885 4170 1995
+rect -380 990 -265 1100
+rect -380 385 -265 495
rect 230 40 330 140
rect 1205 40 1305 140
rect 1575 700 1675 800
@@ -1320,6 +1416,9 @@
rect 2250 45 2350 145
rect 2555 700 2655 800
rect 2925 365 3025 465
+rect 4535 1695 4650 1805
+rect 4535 995 4650 1105
+rect 4535 390 4650 500
rect 1390 -135 1490 -35
rect 2740 -135 2840 -35
rect 4090 -135 4190 -35
@@ -1337,8 +1436,10 @@
rect 2925 -910 3025 -810
rect -145 -1650 -30 -1540
rect 525 -1650 640 -1540
+rect 920 -1650 1035 -1540
rect 2060 -1650 2175 -1540
rect 2920 -1650 3035 -1540
+rect 4190 -1650 4305 -1540
<< metal1 >>
rect -155 2000 -20 2010
rect -155 1890 -145 2000
@@ -1348,6 +1449,10 @@
rect 515 1890 525 2000
rect 640 1890 650 2000
rect 515 1880 650 1890
+rect 1010 1995 1145 2005
+rect 1010 1885 1020 1995
+rect 1135 1885 1145 1995
+rect 1010 1880 1145 1885
rect 2050 1995 2185 2005
rect 2050 1885 2060 1995
rect 2175 1885 2185 1995
@@ -1356,16 +1461,44 @@
rect 2905 1890 2915 2000
rect 3030 1890 3040 2000
rect 2905 1880 3040 1890
+rect 4045 1995 4180 2005
+rect 4045 1885 4055 1995
+rect 4170 1885 4180 1995
+rect 4045 1880 4180 1885
+rect -390 1800 -255 1810
+rect -390 1690 -380 1800
+rect -265 1690 -255 1800
+rect 4525 1805 4660 1815
+rect 4525 1695 4535 1805
+rect 4650 1695 4660 1805
+rect 4525 1690 4660 1695
+rect -390 1685 -255 1690
+rect -390 1100 -255 1110
+rect -390 990 -380 1100
+rect -265 990 -255 1100
+rect 4525 1105 4660 1115
+rect 4525 995 4535 1105
+rect 4650 995 4660 1105
+rect 4525 990 4660 995
+rect -390 985 -255 990
rect 1565 800 2665 810
rect 1565 700 1575 800
rect 1675 700 1880 800
rect 1980 700 2555 800
rect 2655 700 2665 800
rect 1565 690 2665 700
+rect -390 495 -255 505
+rect -390 385 -380 495
+rect -265 385 -255 495
+rect 4525 500 4660 510
+rect -390 380 -255 385
rect 2240 465 3035 475
rect 2240 365 2250 465
rect 2350 365 2925 465
rect 3025 365 3035 465
+rect 4525 390 4535 500
+rect 4650 390 4660 500
+rect 4525 385 4660 390
rect 2240 355 3035 365
rect 220 140 340 150
rect 220 40 230 140
@@ -1447,6 +1580,10 @@
rect 515 -1650 525 -1540
rect 640 -1650 650 -1540
rect 515 -1660 650 -1650
+rect 910 -1540 1045 -1530
+rect 910 -1650 920 -1540
+rect 1035 -1650 1045 -1540
+rect 910 -1660 1045 -1650
rect 2050 -1540 2185 -1530
rect 2050 -1650 2060 -1540
rect 2175 -1650 2185 -1540
@@ -1455,19 +1592,33 @@
rect 2910 -1650 2920 -1540
rect 3035 -1650 3045 -1540
rect 2910 -1660 3045 -1650
+rect 4180 -1540 4315 -1530
+rect 4180 -1650 4190 -1540
+rect 4305 -1650 4315 -1540
+rect 4180 -1660 4315 -1650
<< via1 >>
rect -145 1890 -30 2000
rect 525 1890 640 2000
+rect 1020 1885 1135 1995
rect 2060 1885 2175 1995
rect 2915 1890 3030 2000
+rect 4055 1885 4170 1995
+rect -380 1690 -265 1800
+rect 4535 1695 4650 1805
+rect -380 990 -265 1100
+rect 4535 995 4650 1105
+rect -380 385 -265 495
+rect 4535 390 4650 500
rect 1390 -135 1490 -35
rect 4090 -135 4190 -35
rect 1390 -485 1490 -385
rect 4090 -485 4190 -385
rect -145 -1650 -30 -1540
rect 525 -1650 640 -1540
+rect 920 -1650 1035 -1540
rect 2060 -1650 2175 -1540
rect 2920 -1650 3035 -1540
+rect 4190 -1650 4305 -1540
<< metal2 >>
rect -155 2000 -20 2010
rect -155 1890 -145 2000
@@ -1477,6 +1628,10 @@
rect 515 1890 525 2000
rect 640 1890 650 2000
rect 515 1880 650 1890
+rect 1010 1995 1145 2005
+rect 1010 1885 1020 1995
+rect 1135 1885 1145 1995
+rect 1010 1880 1145 1885
rect 2050 1995 2185 2005
rect 2050 1885 2060 1995
rect 2175 1885 2185 1995
@@ -1485,6 +1640,34 @@
rect 2905 1890 2915 2000
rect 3030 1890 3040 2000
rect 2905 1880 3040 1890
+rect 4045 1995 4180 2005
+rect 4045 1885 4055 1995
+rect 4170 1885 4180 1995
+rect 4045 1880 4180 1885
+rect -390 1800 -255 1810
+rect -390 1690 -380 1800
+rect -265 1690 -255 1800
+rect 4525 1805 4660 1815
+rect 4525 1695 4535 1805
+rect 4650 1695 4660 1805
+rect 4525 1690 4660 1695
+rect -390 1685 -255 1690
+rect -390 1100 -255 1110
+rect -390 990 -380 1100
+rect -265 990 -255 1100
+rect 4525 1105 4660 1115
+rect 4525 995 4535 1105
+rect 4650 995 4660 1105
+rect 4525 990 4660 995
+rect -390 985 -255 990
+rect -390 495 -255 505
+rect -390 385 -380 495
+rect -265 385 -255 495
+rect 4525 500 4660 510
+rect 4525 390 4535 500
+rect 4650 390 4660 500
+rect 4525 385 4660 390
+rect -390 380 -255 385
rect 1380 -35 1500 -25
rect 1380 -135 1390 -35
rect 1490 -135 1500 -35
@@ -1508,6 +1691,10 @@
rect 515 -1650 525 -1540
rect 640 -1650 650 -1540
rect 515 -1660 650 -1650
+rect 910 -1540 1045 -1530
+rect 910 -1650 920 -1540
+rect 1035 -1650 1045 -1540
+rect 910 -1660 1045 -1650
rect 2050 -1540 2185 -1530
rect 2050 -1650 2060 -1540
rect 2175 -1650 2185 -1540
@@ -1516,17 +1703,31 @@
rect 2910 -1650 2920 -1540
rect 3035 -1650 3045 -1540
rect 2910 -1660 3045 -1650
+rect 4180 -1540 4315 -1530
+rect 4180 -1650 4190 -1540
+rect 4305 -1650 4315 -1540
+rect 4180 -1660 4315 -1650
<< via2 >>
rect -145 1890 -30 2000
rect 525 1890 640 2000
+rect 1020 1885 1135 1995
rect 2060 1885 2175 1995
rect 2915 1890 3030 2000
+rect 4055 1885 4170 1995
+rect -380 1690 -265 1800
+rect 4535 1695 4650 1805
+rect -380 990 -265 1100
+rect 4535 995 4650 1105
+rect -380 385 -265 495
+rect 4535 390 4650 500
rect 1390 -135 1490 -35
rect 4090 -135 4190 -35
rect -145 -1650 -30 -1540
rect 525 -1650 640 -1540
+rect 920 -1650 1035 -1540
rect 2060 -1650 2175 -1540
rect 2920 -1650 3035 -1540
+rect 4190 -1650 4305 -1540
<< metal3 >>
rect -155 2000 -20 2010
rect -155 1890 -145 2000
@@ -1536,6 +1737,10 @@
rect 515 1890 525 2000
rect 640 1890 650 2000
rect 515 1880 650 1890
+rect 1010 1995 1145 2005
+rect 1010 1885 1020 1995
+rect 1135 1885 1145 1995
+rect 1010 1880 1145 1885
rect 2050 1995 2185 2005
rect 2050 1885 2060 1995
rect 2175 1885 2185 1995
@@ -1544,6 +1749,34 @@
rect 2905 1890 2915 2000
rect 3030 1890 3040 2000
rect 2905 1880 3040 1890
+rect 4045 1995 4180 2005
+rect 4045 1885 4055 1995
+rect 4170 1885 4180 1995
+rect 4045 1880 4180 1885
+rect -390 1800 -255 1810
+rect -390 1690 -380 1800
+rect -265 1690 -255 1800
+rect 4525 1805 4660 1815
+rect 4525 1695 4535 1805
+rect 4650 1695 4660 1805
+rect 4525 1690 4660 1695
+rect -390 1685 -255 1690
+rect -390 1100 -255 1110
+rect -390 990 -380 1100
+rect -265 990 -255 1100
+rect 4525 1105 4660 1115
+rect 4525 995 4535 1105
+rect 4650 995 4660 1105
+rect 4525 990 4660 995
+rect -390 985 -255 990
+rect -390 495 -255 505
+rect -390 385 -380 495
+rect -265 385 -255 495
+rect 4525 500 4660 510
+rect 4525 390 4535 500
+rect 4650 390 4660 500
+rect 4525 385 4660 390
+rect -390 380 -255 385
rect 1380 -35 1500 -25
rect 4080 -35 4200 -25
rect 1380 -135 1390 -35
@@ -1559,6 +1792,10 @@
rect 515 -1650 525 -1540
rect 640 -1650 650 -1540
rect 515 -1660 650 -1650
+rect 910 -1540 1045 -1530
+rect 910 -1650 920 -1540
+rect 1035 -1650 1045 -1540
+rect 910 -1660 1045 -1650
rect 2050 -1540 2185 -1530
rect 2050 -1650 2060 -1540
rect 2175 -1650 2185 -1540
@@ -1567,32 +1804,72 @@
rect 2910 -1650 2920 -1540
rect 3035 -1650 3045 -1540
rect 2910 -1660 3045 -1650
+rect 4180 -1540 4315 -1530
+rect 4180 -1650 4190 -1540
+rect 4305 -1650 4315 -1540
+rect 4180 -1660 4315 -1650
<< via3 >>
rect -145 1890 -30 2000
rect 525 1890 640 2000
+rect 1020 1885 1135 1995
rect 2060 1885 2175 1995
rect 2915 1890 3030 2000
+rect 4055 1885 4170 1995
+rect -380 1690 -265 1800
+rect 4535 1695 4650 1805
+rect -380 990 -265 1100
+rect 4535 995 4650 1105
+rect -380 385 -265 495
+rect 4535 390 4650 500
rect -145 -1650 -30 -1540
rect 525 -1650 640 -1540
+rect 920 -1650 1035 -1540
rect 2060 -1650 2175 -1540
rect 2920 -1650 3035 -1540
+rect 4190 -1650 4305 -1540
<< metal4 >>
-rect -245 2000 4500 2030
-rect -245 1890 -145 2000
+rect 4500 2030 4690 2035
+rect -415 2000 4690 2030
+rect -415 1890 -145 2000
rect -30 1890 525 2000
rect 640 1995 2915 2000
-rect 640 1890 2060 1995
-rect -245 1885 2060 1890
+rect 640 1890 1020 1995
+rect -415 1885 1020 1890
+rect 1135 1885 2060 1995
rect 2175 1890 2915 1995
-rect 3030 1890 4500 2000
-rect 2175 1885 4500 1890
-rect -245 1860 4500 1885
+rect 3030 1995 4690 2000
+rect 3030 1890 4055 1995
+rect 2175 1885 4055 1890
+rect 4170 1885 4690 1995
+rect -415 1860 4690 1885
+rect -415 1800 -245 1860
+rect -415 1690 -380 1800
+rect -265 1690 -245 1800
+rect -415 1100 -245 1690
+rect -415 990 -380 1100
+rect -265 990 -245 1100
+rect -415 495 -245 990
+rect -415 385 -380 495
+rect -265 385 -245 495
+rect -415 -85 -245 385
+rect 4500 1805 4690 1860
+rect 4500 1695 4535 1805
+rect 4650 1695 4690 1805
+rect 4500 1105 4690 1695
+rect 4500 995 4535 1105
+rect 4650 995 4690 1105
+rect 4500 500 4690 995
+rect 4500 390 4535 500
+rect 4650 390 4690 500
+rect 4500 -80 4690 390
rect -245 -1540 4495 -1475
rect -245 -1650 -145 -1540
rect -30 -1650 525 -1540
-rect 640 -1650 2060 -1540
+rect 640 -1650 920 -1540
+rect 1035 -1650 2060 -1540
rect 2175 -1650 2920 -1540
-rect 3035 -1650 4495 -1540
+rect 3035 -1650 4190 -1540
+rect 4305 -1650 4495 -1540
rect -245 -1715 4495 -1650
<< labels >>
rlabel locali 430 -435 430 -435 1 vbias
diff --git a/mag/user_analog_project_wrapper.ext b/mag/user_analog_project_wrapper.ext
index d375ac8..b929c85 100644
--- a/mag/user_analog_project_wrapper.ext
+++ b/mag/user_analog_project_wrapper.ext
@@ -1,4 +1,4 @@
-timestamp 1640909904
+timestamp 1640911630
version 8.3
tech sky130A
style ngspice()
@@ -1385,12 +1385,9 @@
node "io_analog[1]" 82 91732 566594 702300 m3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 497300 4200 259700 2040 69682400 78900 107764700 76660 0 0 0 0 0 0
node "io_analog[3]" 132 195439 413394 702300 m3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 648900 5760 313500 2240 13544800 30700 427749500 261480 0 0 0 0 0 0
node "io_analog[2]" 74 103560 465394 702300 m3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 708000 4820 422500 2600 43183600 62740 150550400 128060 0 0 0 0 0 0
+node "w_534690_682780#" 2061 2427.03 534690 682780 nw 0 0 0 0 171600 1660 0 0 78300 1120 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 67500 1040 67500 1040 67500 1040 171600 1660 1425600 9300 0 0 0 0
+node "w_534750_683750#" 17515 3366 534750 683750 nw 0 0 0 0 1122000 7460 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
substrate "VSUBS" 0 0 -1073741817 -1073741817 space 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-cap "io_analog[6]" "io_analog[6]" 21250
-cap "io_analog[0]" "vdda1" 18313.2
-cap "io_clamp_high[0]" "io_analog[4]" 525
-cap "io_clamp_low[0]" "io_clamp_high[0]" 525
-cap "io_analog[4]" "io_clamp_low[0]" 525
cap "io_clamp_high[1]" "io_analog[5]" 525
cap "io_clamp_low[1]" "io_clamp_high[1]" 525
cap "io_analog[5]" "io_clamp_low[1]" 525
@@ -1399,41 +1396,52 @@
cap "io_clamp_low[2]" "io_clamp_high[2]" 525
cap "io_analog[6]" "io_clamp_low[2]" 525
cap "io_analog[4]" "io_analog[4]" 26250
+cap "io_analog[5]" "io_analog[5]" 26250
+cap "io_analog[5]" "io_analog[5]" 26250
+cap "io_analog[4]" "io_analog[4]" 21250
+cap "io_analog[1]" "io_analog[0]" 12301.4
+cap "io_analog[6]" "io_analog[6]" 26250
+cap "io_analog[4]" "io_analog[4]" 21250
+cap "io_analog[5]" "io_analog[5]" 21250
+cap "io_analog[6]" "io_analog[6]" 26250
+cap "io_analog[0]" "vdda1" 18313.2
cap "io_analog[1]" "vdda1" 23516.2
-cap "io_analog[5]" "io_analog[5]" 26250
+cap "io_analog[5]" "io_analog[5]" 21250
cap "io_analog[2]" "vdda1" 219.25
-cap "io_analog[3]" "vssa1" 6389.64
-cap "io_analog[0]" "io_analog[1]" 12301.4
-cap "io_analog[2]" "vssa1" 9275.17
-cap "io_analog[5]" "io_analog[5]" 26250
-cap "io_analog[4]" "io_analog[4]" 21250
-cap "io_analog[6]" "io_analog[6]" 26250
-cap "io_analog[4]" "io_analog[4]" 21250
-cap "io_analog[5]" "io_analog[5]" 21250
-cap "io_analog[6]" "io_analog[6]" 26250
-cap "io_analog[5]" "io_analog[5]" 21250
cap "io_analog[6]" "io_analog[6]" 21250
-cap "cp_1/down" "cp_1/gnd!" 439.89
-cap "io_analog[1]" "cp_1/gnd!" -55.89
+cap "io_analog[3]" "vssa1" 6389.64
+cap "io_analog[2]" "vssa1" 9275.17
+cap "io_analog[6]" "io_analog[6]" 21250
+cap "w_534750_683750#" "w_534690_682780#" 224.4
+cap "io_clamp_high[0]" "io_analog[4]" 525
+cap "io_clamp_low[0]" "io_clamp_high[0]" 525
+cap "io_analog[4]" "io_clamp_low[0]" 525
+cap "cp_1/gnd!" "cp_1/down" 439.89
+cap "cp_1/gnd!" "io_analog[1]" -20.89
cap "cp_1/vbias" "cp_1/gnd!" 6.79412
cap "cp_1/vbias" "cp_1/gnd!" 8.73529
cap "cp_1/vbias" "cp_1/gnd!" 6.79412
cap "cp_1/vbias" "cp_1/gnd!" 8.73529
cap "cp_1/a_10_n50#" "cp_1/vbias" 31.68
+cap "cp_1/a_1710_n2840#" "cp_1/a_1710_0#" 37.5
+cap "cp_1/a_1710_n2840#" "cp_1/a_3060_0#" 99.11
+cap "cp_1/a_1710_n2840#" "cp_1/a_3060_0#" 243.801
+cap "cp_1/a_3060_0#" "w_534690_682780#" 1083.86
+cap "w_534750_683750#" "w_534690_682780#" -39.04
+cap "cp_1/a_3060_0#" "w_534690_682780#" 904.4
+cap "w_534750_683750#" "w_534690_682780#" -28
+cap "cp_1/a_3060_0#" "w_534690_682780#" 50.49
+cap "cp_1/a_3060_0#" "w_534690_682780#" 119.25
+cap "w_534750_683750#" "w_534690_682780#" -15.96
cap "cp_1/vdd!" "cp_1/vdd!" 27.826
-cap "vdda1" "cp_1/vdd!" 1551.39
-cap "cp_1/vdd!" "cp_1/vdd!" -86.128
-cap "cp_1/upbar" "cp_1/vdd!" 47.412
-cap "cp_1/upbar" "vdda1" 158.709
-cap "cp_1/vdd!" "vdda1" 115.602
-cap "cp_1/vdd!" "cp_1/upbar" 41.9025
-cap "vdda1" "cp_1/vdd!" 907.12
-cap "cp_1/vdd!" "cp_1/vdd!" -53.44
-cap "cp_1/vdd!" "vdda1" 80.16
-merge "cp_1/vdd!" "vdda1" -1712.62 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -340996 -6910 0 0 0 0 0 0
-merge "cp_1/gnd!" "VSUBS" -13727.1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -23935494 -31934 0 0 0 0 0 0
+cap "cp_1/vdd!" "cp_1/upbar" 248.023
+merge "cp_1/a_1710_n2840#" "vdda1" -20146.9 0 0 0 0 -5982920 -15262 0 0 173200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 168900 0 168900 0 168900 0 1321396 -4792 832050 -9472 0 0 0 0
+merge "vdda1" "cp_1/vdd!"
+merge "cp_1/vdd!" "w_534690_682780#"
+merge "w_534690_682780#" "w_534750_683750#"
+merge "cp_1/gnd!" "VSUBS" -13903.4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -24058574 -32614 0 0 0 0 0 0
merge "VSUBS" "vssa1"
merge "cp_1/down" "io_analog[1]" -8142.87 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -163500 -2410 -16700 -870 -226500 -1840 -12500000 -15000 0 0 0 0 0 0
-merge "cp_1/vbias" "io_analog[3]" -6961.44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -4800 -480 0 0 0 0 -12500000 -15000 0 0 0 0 0 0
-merge "cp_1/upbar" "io_analog[2]" -6940.42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 57280 -460 0 0 0 0 -12500000 -15000 0 0 0 0 0 0
-merge "cp_1/out" "io_analog[0]" -2913.49 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 118080 -860 0 0 -4960000 -6468 0 0 0 0 0 0
+merge "cp_1/vbias" "io_analog[3]" -6896.59 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 65310 -480 0 0 0 0 -12500000 -15000 0 0 0 0 0 0
+merge "cp_1/upbar" "io_analog[2]" -6942.45 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 55080 -460 0 0 0 0 -12500000 -15000 0 0 0 0 0 0
+merge "cp_1/out" "io_analog[0]" -3017.14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 148470 -1462 0 0 -4960000 -6468 0 0 0 0 0 0
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index 69a6b9f..0a66561 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,12 +1,26 @@
magic
tech sky130A
-timestamp 1640909904
+timestamp 1640911630
+<< nwell >>
+rect 267375 341875 267540 343575
+rect 267345 341390 267565 341585
+<< nsubdiff >>
+rect 267385 341545 267530 341560
+rect 267385 341435 267400 341545
+rect 267515 341435 267530 341545
+rect 267385 341425 267530 341435
+<< nsubdiffcont >>
+rect 267400 341435 267515 341545
<< locali >>
rect 269115 344405 269450 344440
rect 269115 344175 269175 344405
rect 269395 344175 269450 344405
rect 269115 344115 269450 344175
rect 269115 343570 269240 344115
+rect 267390 341545 267525 341555
+rect 267390 341435 267400 341545
+rect 267515 341435 267525 341545
+rect 267390 341430 267525 341435
rect 264705 341365 264990 341370
rect 264705 341335 265860 341365
rect 264705 341145 264745 341335
@@ -23,6 +37,7 @@
rect 269425 339640 269690 339665
<< viali >>
rect 269175 344175 269395 344405
+rect 267400 341435 267515 341545
rect 264745 341145 264945 341335
rect 269450 339665 269650 339860
<< metal1 >>
@@ -30,6 +45,10 @@
rect 269125 344175 269175 344405
rect 269395 344175 269450 344405
rect 269125 344115 269450 344175
+rect 267390 341545 267525 341555
+rect 267390 341435 267400 341545
+rect 267515 341435 267525 341545
+rect 267390 341430 267525 341435
rect 271080 341440 271560 341540
rect 271080 341425 271175 341440
rect 264705 341335 264990 341370
@@ -46,6 +65,7 @@
rect 269425 339640 269690 339665
<< via1 >>
rect 269175 344175 269395 344405
+rect 267400 341435 267515 341545
rect 264745 341145 264945 341335
rect 271175 341215 271445 341440
rect 269450 339665 269650 339860
@@ -61,12 +81,16 @@
rect 258080 341680 265020 341795
rect 258080 341415 258305 341680
rect 258580 341415 265020 341680
+rect 267390 341545 267525 341555
+rect 267390 341435 267400 341545
+rect 267515 341435 267525 341545
+rect 267390 341430 267525 341435
+rect 271015 341440 271885 341650
rect 258080 341335 265020 341415
rect 258080 341320 264745 341335
rect 264675 341145 264745 341320
rect 264945 341145 265020 341335
rect 264675 341060 265020 341145
-rect 271015 341440 271885 341650
rect 271015 341215 271175 341440
rect 271445 341215 271885 341440
rect 271015 341055 271885 341215
@@ -583,6 +607,7 @@
<< via2 >>
rect 257385 346685 257665 346945
rect 258305 341415 258580 341680
+rect 267400 341435 267515 341545
rect 289895 340525 290110 340765
rect 284225 336220 284650 336600
<< metal3 >>
@@ -626,6 +651,10 @@
rect 268871 343815 276940 343822
rect 268570 343498 276940 343815
rect 268570 343495 269005 343498
+rect 267345 341545 267565 341585
+rect 267345 341435 267400 341545
+rect 267515 341435 267565 341545
+rect 267345 341390 267565 341435
rect 260728 340169 265658 340179
rect 260728 339909 265698 340169
rect 260768 339899 265698 339909
@@ -808,6 +837,8 @@
rect 291760 1363 292400 1419
rect -400 772 240 828
rect 291760 772 292400 828
+<< via3 >>
+rect 267400 341435 267515 341545
<< metal4 >>
rect 82797 351150 85297 352400
rect 87947 351150 90447 352400
@@ -815,6 +846,10 @@
rect 113797 351150 116297 352400
rect 159497 351150 161997 352400
rect 164647 351150 167147 352400
+rect 267375 341545 267540 343575
+rect 267375 341435 267400 341545
+rect 267515 341435 267540 341545
+rect 267375 341415 267540 341435
<< metal5 >>
rect 82797 351150 85297 352400
rect 87947 351150 90447 352400
@@ -828,9 +863,9 @@
rect 292000 0 292050 352000
rect -50 -50 292050 0
use cp cp_1
-timestamp 1640906950
+timestamp 1640911630
transform 1 0 265700 0 1 341635
-box -245 -1715 4500 2030
+box -415 -1715 4690 2035
<< labels >>
flabel metal3 s 291760 134615 292400 134671 0 FreeSans 560 0 0 0 gpio_analog[0]
port 0 nsew signal bidirectional
