Merge branch 'main' of https://github.com/NohealthyBBQ/sloci_caravel into main
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index 34a5473..a6bb31b 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1662923024
+timestamp 1662950076
<< metal1 >>
rect 14920 682870 15420 682910
rect 14920 682040 14960 682870
@@ -633,15 +633,9 @@
rect 23190 668680 23210 669080
rect 23370 668680 23390 669080
rect 23190 668640 23390 668680
-rect -800 648610 1660 648642
-rect -800 648410 4990 648610
-rect -800 643970 1680 648410
-rect 4680 643970 4990 648410
-rect -800 643842 4990 643970
-rect 1200 638642 4990 643842
+rect -800 643842 944 648642
rect 582340 639784 584800 644584
-rect -800 633880 4990 638642
-rect -800 633842 1660 633880
+rect -800 633842 944 638642
rect 582340 629784 584800 634584
rect 583520 589472 584800 589584
rect 583520 588290 584800 588402
@@ -768,8 +762,16 @@
rect -800 204888 1660 209688
rect 582340 191430 584800 196230
rect 582340 181430 584800 186230
-rect -800 172888 1660 177688
-rect -800 162888 1660 167688
+rect 1650 177690 20600 178000
+rect 982 177688 20600 177690
+rect -800 177600 20600 177688
+rect -800 172888 11600 177600
+rect 982 172300 11600 172888
+rect 20200 172300 20600 177600
+rect 982 171900 20600 172300
+rect 982 167688 5298 171900
+rect -800 162890 5298 167688
+rect -800 162888 1660 162890
rect 582340 146830 584800 151630
rect 582340 136830 584800 141630
rect -800 124776 480 124888
@@ -836,8 +838,8 @@
rect 42560 688410 43180 689440
rect 40770 676130 41640 677240
rect 23210 668680 23370 669080
-rect 1680 643970 4680 648410
rect 860 559570 4260 564080
+rect 11600 172300 20200 177600
<< metal4 >>
rect 165594 702300 170594 704800
rect 175894 702300 180894 704800
@@ -862,25 +864,31 @@
rect 23190 669080 23390 669110
rect 23190 668680 23210 669080
rect 23370 668680 23390 669080
-rect 1380 648410 5010 648620
-rect 1380 643970 1680 648410
-rect 4680 643970 5010 648410
-rect 1380 643770 5010 643970
rect 23190 608120 23390 668680
rect 26600 633690 28120 662640
rect 26090 633500 28790 633690
rect 26090 631620 26270 633500
rect 28580 631620 28790 633500
rect 26090 631490 28790 631620
+rect 32100 620300 39650 620900
+rect 32100 614050 32850 620300
+rect 38700 614050 39650 620300
+rect 32100 613600 39650 614050
rect 21660 603350 25780 608120
rect 690 564080 4450 564270
rect 690 559570 860 564080
rect 4260 559570 4450 564080
rect 690 559400 4450 559570
+rect 30150 178000 39650 613600
+rect 11100 177600 39650 178000
+rect 11100 172300 11600 177600
+rect 20200 172300 39650 177600
+rect 11100 171950 39650 172300
+rect 11100 171900 34150 171950
<< via4 >>
rect 60910 675440 65380 675970
-rect 1680 643970 4680 648410
rect 26270 631620 28580 633500
+rect 32850 614050 38700 620300
rect 860 559570 4260 564080
<< metal5 >>
rect 165594 702300 170594 704800
@@ -892,21 +900,20 @@
rect 60790 675970 65590 676060
rect 60790 675440 60910 675970
rect 65380 675440 65590 675970
-rect 33890 648790 34330 675040
-rect 39240 648790 39680 674940
-rect 42370 648790 42840 674830
-rect 44740 648790 45180 675000
-rect 45790 648790 46240 663160
-rect 60790 652300 65590 675440
-rect 1390 648620 46250 648790
-rect 1380 648410 46250 648620
-rect 1380 643970 1680 648410
-rect 4680 643970 46250 648410
-rect 1380 643770 46250 643970
rect 26080 633500 28810 633710
rect 26080 631620 26270 633500
rect 28580 631620 28810 633500
rect 26080 564330 28810 631620
+rect 33890 625850 34330 675040
+rect 39240 625850 39680 674940
+rect 42370 625850 42840 674830
+rect 44740 625850 45180 675000
+rect 45790 625850 46240 663160
+rect 60790 652300 65590 675440
+rect 32150 620300 51000 625850
+rect 32150 614050 32850 620300
+rect 38700 614050 51000 620300
+rect 32150 613550 51000 614050
rect 60820 564330 65590 652300
rect 26080 564320 65590 564330
rect 1770 564270 65590 564320
@@ -921,9 +928,9 @@
rect 584000 0 584100 704000
rect -100 -100 584100 0
use VCO VCO_0
-timestamp 1662920576
+timestamp 1662950076
transform 1 0 -7837 0 1 638742
-box 31141 20430 65400 41673
+box 31141 20430 65400 41698
<< labels >>
flabel metal3 s 583520 269230 584800 269342 0 FreeSans 1120 0 0 0 gpio_analog[0]
port 0 nsew signal bidirectional
@@ -2304,17 +2311,16 @@
port 676 nsew signal input
flabel metal2 s 6434 -800 6546 480 0 FreeSans 1120 90 0 0 wbs_we_i
port 677 nsew signal input
-flabel metal5 4680 643770 46250 648790 0 FreeSans 16000 0 0 0 VCCD
flabel metal5 26080 559400 65590 564330 0 FreeSans 16000 0 0 0 GND
rlabel metal2 56980 508120 57120 660100 1 CTRL1
rlabel metal2 56720 466080 56860 660460 1 CTRL2
rlabel metal2 56480 421660 56620 660980 1 CTRL3
rlabel metal2 56200 378460 56340 661580 1 CTRL4
rlabel metal2 55960 335220 56100 662500 1 CTRL5
-flabel metal3 17070 688210 41870 689330 0 FreeSans 8000 0 0 0 OUTA
-flabel metal3 43180 688360 70760 689480 0 FreeSans 8000 0 0 0 OUTB
flabel metal1 14920 668060 15420 682040 0 FreeSans 8000 0 0 0 VCTRL
flabel metal4 21660 603350 25780 608120 0 FreeSans 8000 0 0 0 REF
+rlabel metal3 17070 688210 41870 689330 1 OUT0
+rlabel metal3 43180 688360 70760 689480 1 OUT180
<< properties >>
string FIXED_BBOX 0 0 584000 704000
<< end >>
