Merge branch 'main' of https://github.com/NohealthyBBQ/sloci_caravel into main
merging
diff --git a/mag/VCO.mag b/mag/VCO.mag
index 11000f1..e5ef994 100644
--- a/mag/VCO.mag
+++ b/mag/VCO.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1663026790
+timestamp 1663029804
<< locali >>
rect 33895 33140 34005 33155
rect 33895 33085 33910 33140
@@ -630,35 +630,35 @@
transform 1 0 26070 0 1 10600
box 10225 10400 29180 26030
use cap_bank X4
-timestamp 1663026790
+timestamp 1663029804
transform 1 0 52305 0 -1 34725
box 3300 -1540 5112 5514
use cap_bank X5
-timestamp 1663026790
+timestamp 1663029804
transform 1 0 54405 0 -1 34725
box 3300 -1540 5112 5514
use cap_bank X6
-timestamp 1663026790
+timestamp 1663029804
transform 1 0 52305 0 1 22905
box 3300 -1540 5112 5514
use cap_bank X7
-timestamp 1663026790
+timestamp 1663029804
transform 1 0 54405 0 1 22905
box 3300 -1540 5112 5514
use cap_bank X8
-timestamp 1663026790
+timestamp 1663029804
transform 1 0 56505 0 1 22905
box 3300 -1540 5112 5514
use cap_bank X9
-timestamp 1663026790
+timestamp 1663029804
transform 1 0 58605 0 1 22905
box 3300 -1540 5112 5514
use cap_bank X10
-timestamp 1663026790
+timestamp 1663029804
transform 1 0 56505 0 -1 34725
box 3300 -1540 5112 5514
use cap_bank X11
-timestamp 1663026790
+timestamp 1663029804
transform 1 0 58605 0 -1 34725
box 3300 -1540 5112 5514
use bias_calc bias_calc_0
diff --git a/mag/cap_bank.mag b/mag/cap_bank.mag
index b1e7fa7..2c76d7b 100644
--- a/mag/cap_bank.mag
+++ b/mag/cap_bank.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1663026790
+timestamp 1663029804
<< locali >>
rect 4525 -40 4560 105
rect 5040 -40 5075 105
@@ -232,6 +232,20 @@
rect 3760 -1470 3880 -1180
rect 4950 -1480 5050 -1180
<< metal3 >>
+rect 4065 1460 4855 1475
+rect 4065 1240 4080 1460
+rect 4275 1240 4855 1460
+rect 4065 1220 4855 1240
+rect 3895 610 4450 625
+rect 3895 415 3910 610
+rect 4085 415 4450 610
+rect 3895 400 4450 415
+rect 3730 -1180 3900 -1150
+rect 3730 -1470 3760 -1180
+rect 3880 -1470 3900 -1180
+rect 3730 -1510 3900 -1470
+rect 4200 -1275 4450 400
+rect 4605 -880 4855 1220
rect 4950 910 5110 920
rect 4950 90 4980 910
rect 5080 90 5110 910
@@ -241,55 +255,39 @@
rect 5080 -530 5110 -30
rect 4950 -550 5110 -530
rect 4950 -650 5110 -630
-rect 4950 -1030 4980 -650
+rect 4950 -880 4980 -650
+rect 4605 -1030 4980 -880
rect 5080 -1030 5110 -650
-rect 4950 -1060 5110 -1030
-rect 3730 -1180 3900 -1150
-rect 3730 -1470 3760 -1180
-rect 3880 -1470 3900 -1180
-rect 3730 -1510 3900 -1470
+rect 4605 -1060 5110 -1030
rect 4920 -1180 5080 -1150
-rect 4920 -1480 4950 -1180
+rect 4920 -1275 4950 -1180
+rect 4200 -1480 4950 -1275
rect 5050 -1480 5080 -1180
-rect 4920 -1510 5080 -1480
+rect 4200 -1510 5080 -1480
<< via3 >>
-rect 4980 90 5080 910
-rect 4980 -530 5080 -30
-rect 4980 -1030 5080 -650
+rect 4080 1240 4275 1460
+rect 3910 415 4085 610
rect 3760 -1470 3880 -1180
-rect 4950 -1480 5050 -1180
+rect 4980 90 5080 910
+rect 4980 -530 5080 -220
<< metal4 >>
-rect 4370 2260 4890 2540
-rect 3995 1330 4670 1490
-rect 4055 610 4210 1000
-rect 4055 400 4370 610
-rect 3730 -1180 4090 -500
-rect 3730 -1470 3760 -1180
-rect 3880 -1470 4090 -1180
-rect 3730 -1510 4090 -1470
-rect 4210 -1335 4370 400
-rect 4510 -815 4670 1330
-rect 4730 -185 4890 2260
+rect 4065 1460 4290 1475
+rect 4065 1240 4080 1460
+rect 4275 1240 4290 1460
+rect 4065 1220 4290 1240
+rect 4510 -185 4670 3260
rect 4950 910 5110 4368
rect 4950 90 4980 910
rect 5080 90 5110 910
rect 4950 60 5110 90
-rect 4950 -30 5110 0
-rect 4950 -185 4980 -30
-rect 4730 -530 4980 -185
-rect 5080 -530 5110 -30
-rect 4730 -560 5110 -530
-rect 4950 -650 5110 -630
-rect 4950 -815 4980 -650
-rect 4510 -1030 4980 -815
-rect 5080 -1030 5110 -650
-rect 4510 -1060 5110 -1030
-rect 4510 -1070 5080 -1060
-rect 4755 -1180 5080 -1150
-rect 4755 -1335 4950 -1180
-rect 4210 -1480 4950 -1335
-rect 5050 -1480 5080 -1180
-rect 4210 -1510 5080 -1480
+rect 4510 -220 5110 -185
+rect 3730 -1180 4090 -500
+rect 4510 -530 4980 -220
+rect 5080 -530 5110 -220
+rect 4510 -560 5110 -530
+rect 3730 -1470 3760 -1180
+rect 3880 -1470 4090 -1180
+rect 3730 -1510 4090 -1470
<< metal5 >>
rect 3380 3710 4990 4830
rect 3380 3700 4930 3710
