ota+comparator in progress
diff --git a/mag/sky130_sc_ams__comparator_1.mag b/mag/sky130_sc_ams__comparator_1.mag
index 3cafbb0..2ecfe80 100644
--- a/mag/sky130_sc_ams__comparator_1.mag
+++ b/mag/sky130_sc_ams__comparator_1.mag
@@ -1,7 +1,7 @@
magic
-tech sky130A
+tech sky130B
magscale 1 2
-timestamp 1637198379
+timestamp 1647118226
<< nwell >>
rect -38 414 4914 582
rect -38 261 130 414
diff --git a/mag/sky130_sc_ams__ota_1.mag b/mag/sky130_sc_ams__ota_1.mag
index 5c0cae4..0b45396 100644
--- a/mag/sky130_sc_ams__ota_1.mag
+++ b/mag/sky130_sc_ams__ota_1.mag
@@ -1,7 +1,7 @@
magic
-tech sky130A
+tech sky130B
magscale 1 2
-timestamp 1635177953
+timestamp 1647118226
<< nwell >>
rect -38 414 6754 582
rect -38 339 4302 414
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index b2e3cb4..bcd04e5 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,13 +1,15 @@
magic
tech sky130B
magscale 1 2
-timestamp 1647103104
-<< error_s >>
-rect 547866 677232 548116 677427
+timestamp 1647124351
<< dnwell >>
rect 561940 685328 563006 686342
<< pwell >>
rect 562058 685450 562858 686250
+<< locali >>
+rect 548026 677495 548438 677529
+rect 543778 677268 543874 677316
+rect 548026 676951 548440 676985
<< metal1 >>
rect 561180 686400 561428 686442
rect 561180 686254 561216 686400
@@ -38,18 +40,36 @@
rect 225178 683618 560962 683790
rect 224866 683613 560962 683618
rect 224866 683612 226828 683613
+rect 548032 677464 548438 677560
+rect 543766 677426 543886 677436
+rect 543766 677372 543776 677426
+rect 543876 677372 543886 677426
+rect 543766 677262 543886 677372
+rect 543162 677002 543810 677016
+rect 543162 676932 543168 677002
+rect 543794 676932 543810 677002
+rect 543162 676920 543810 676932
+rect 548029 676920 548440 677016
<< via1 >>
rect 561216 686254 561378 686400
rect 561216 685764 561378 685910
rect 326572 684652 326878 684824
rect 224872 683618 225178 683790
+rect 554512 677472 555148 677550
+rect 543776 677372 543876 677426
+rect 543168 676932 543794 677002
<< metal2 >>
+rect 512622 703358 513362 703376
rect 415430 703206 416162 703216
rect 415430 702616 415440 703206
rect 416152 702616 416162 703206
rect 415430 702606 416162 702616
rect 467610 703066 468342 703076
rect -193 -193 193 700125
+rect 172840 699800 173580 699824
+rect 172840 699100 172858 699800
+rect 173558 699100 173580 699800
+rect 172840 699084 173580 699100
rect 224634 698474 225366 698484
rect 224634 697884 224644 698474
rect 225356 697884 225366 698474
@@ -68,11 +88,14 @@
rect 467610 702476 467620 703066
rect 468332 702476 468342 703066
rect 467610 702466 468342 702476
+rect 512622 702658 512642 703358
+rect 513342 702658 513362 703358
+rect 467832 686486 468157 702466
+rect 512622 687290 513362 702658
rect 522684 702928 523010 702938
rect 522684 702578 522694 702928
rect 523000 702578 523010 702928
rect 568938 702909 569264 702910
-rect 467832 686486 468157 702466
rect 522684 702447 523010 702578
rect 568933 702900 569264 702909
rect 568933 702550 568942 702900
@@ -81,9 +104,16 @@
rect 568933 700536 569264 702550
rect 522681 700196 562334 700528
rect 564007 700208 569264 700536
+rect 512622 687282 513364 687290
+rect 512622 686566 512642 687282
+rect 513342 686566 513364 687282
rect 562009 686923 562327 700196
rect 564010 687532 564332 700208
rect 568933 700207 569264 700208
+rect 512622 686565 512766 686566
+rect 513264 686565 513364 686566
+rect 512622 686558 513364 686565
+rect 512624 686550 513364 686558
rect 467832 686484 560486 686486
rect 467832 686400 561462 686484
rect 467832 686254 561216 686400
@@ -118,6 +148,35 @@
rect 583036 681176 583046 681526
rect 562127 681170 583046 681176
rect 582202 681166 583046 681170
+rect 543766 677426 543886 677696
+rect 555482 677560 559312 677618
+rect 554504 677550 559312 677560
+rect 554504 677472 554512 677550
+rect 555148 677472 559312 677550
+rect 554504 677464 559312 677472
+rect 543766 677372 543776 677426
+rect 543876 677372 543886 677426
+rect 543766 677364 543886 677372
+rect 555482 677362 559312 677464
+rect 512642 677336 542642 677338
+rect 512624 677308 542642 677336
+rect 512624 676608 512642 677308
+rect 513342 677140 542642 677308
+rect 513342 677016 542784 677140
+rect 513342 677002 543810 677016
+rect 513342 676932 543168 677002
+rect 543794 676932 543810 677002
+rect 513342 676920 543810 676932
+rect 513342 676796 542784 676920
+rect 513342 676608 542642 676796
+rect 512624 676598 542642 676608
+rect 512624 676582 513360 676598
+rect 558568 642500 559308 677362
+rect 558568 642478 583348 642500
+rect 558568 641778 582624 642478
+rect 583324 641778 583348 642478
+rect 558568 641760 583348 641778
+rect 558568 641758 559308 641760
rect 524 -800 636 480
rect 1706 -800 1818 480
rect 2888 -800 3000 480
@@ -614,13 +673,21 @@
rect 583250 -800 583362 480
<< via2 >>
rect 415440 702616 416152 703206
+rect 172858 699100 173558 699800
rect 224644 697884 225356 698474
rect 326344 697884 327056 698474
rect 467620 702476 468332 703066
+rect 512642 702658 513342 703358
rect 522694 702578 523000 702928
rect 568942 702550 569254 702900
+rect 512642 686566 513342 687282
+rect 512766 686565 513264 686566
rect 582730 681176 583036 681526
+rect 512642 676608 513342 677308
+rect 582624 641778 583324 642478
<< metal3 >>
+rect 165596 704800 170590 704804
+rect 175896 704800 180890 704804
rect 16194 702300 21194 704800
rect 68194 702300 73194 704800
rect 120194 702300 125194 704800
@@ -644,7 +711,10 @@
rect 465394 702476 467620 703066
rect 468332 702476 470394 703066
rect 465394 702300 470394 702476
-rect 510594 702340 515394 704800
+rect 510594 703358 515394 704800
+rect 510594 702658 512642 703358
+rect 513342 702658 515394 703358
+rect 510594 702340 515394 702658
rect 520594 702928 525394 704800
rect 520594 702578 522694 702928
rect 523000 702578 525394 702928
@@ -653,9 +723,16 @@
rect 566594 702550 568942 702900
rect 569254 702550 571594 702900
rect 566594 702300 571594 702550
+rect 165596 701002 170590 702300
+rect 175896 701002 180890 702300
+rect 165556 699800 180890 701002
+rect 165556 699100 172858 699800
+rect 173558 699100 180890 699800
+rect 165556 698298 180890 699100
rect 217296 699170 222286 702300
rect 227598 699170 232588 702300
rect 217296 698474 232588 699170
+rect 165556 698198 180868 698298
rect 217296 697884 224644 698474
rect 225356 697884 232588 698474
rect 217296 697340 232588 697884
@@ -665,13 +742,28 @@
rect 318994 697884 326344 698474
rect 327056 697884 334288 698474
rect 318994 697340 334288 697884
+rect 512612 687282 513364 687312
+rect 512612 686566 512642 687282
+rect 513342 686566 513364 687282
+rect 512612 686565 512766 686566
+rect 513264 686565 513364 686566
+rect 512612 686542 513364 686565
rect -800 680242 1700 685242
+rect 512622 677308 513362 686542
rect 582300 681526 584802 682984
rect 582300 681176 582730 681526
rect 583036 681176 584802 681526
rect 582300 677984 584802 681176
+rect 512622 676758 512642 677308
+rect 512624 676608 512642 676758
+rect 513342 676758 513362 677308
+rect 513342 676608 513360 676758
+rect 512624 676582 513360 676608
rect -800 643842 1660 648642
-rect 582340 639784 584800 644584
+rect 582340 642478 584800 644584
+rect 582340 641778 582624 642478
+rect 583324 641778 584800 642478
+rect 582340 639784 584800 641778
rect -800 633842 1660 638642
rect 582340 629784 584800 634584
rect 583520 589472 584800 589584
@@ -860,12 +952,12 @@
transform 1 0 562058 0 1 685450
box 0 0 864 800
use sky130_sc_ams__comparator_1 sky130_sc_ams__comparator_1_0
-timestamp 1637198379
-transform 1 0 543202 0 1 676968
+timestamp 1647118226
+transform 1 0 543156 0 1 676968
box -38 -48 4914 592
use sky130_sc_ams__ota_1 sky130_sc_ams__ota_1_0
-timestamp 1635177953
-transform -1 0 554874 0 -1 677512
+timestamp 1647118226
+transform 1 0 548438 0 1 676968
box -38 -48 6754 592
<< labels >>
flabel metal3 s 583520 269230 584800 269342 0 FreeSans 1120 0 0 0 gpio_analog[0]
@@ -2018,8 +2110,6 @@
port 561 nsew signal bidirectional
flabel metal3 s 520594 702340 525394 704800 0 FreeSans 1920 180 0 0 vssa1
port 562 nsew signal bidirectional
-flabel metal3 s 510594 702340 515394 704800 0 FreeSans 1920 180 0 0 vssa1
-port 563 nsew signal bidirectional
flabel metal3 s 582340 146830 584800 151630 0 FreeSans 1120 0 0 0 vssa1
port 564 nsew signal bidirectional
flabel metal3 s 582340 136830 584800 141630 0 FreeSans 1120 0 0 0 vssa1
@@ -2248,6 +2338,8 @@
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 metal3 s 510594 702340 515394 704800 0 FreeSans 1920 180 0 0 vssa1
+port 563 nsew signal bidirectional
<< properties >>
string FIXED_BBOX 0 0 584000 704000
<< end >>
