Add files via upload
diff --git a/caravel/mag/10bitdac_cap_layout_design.mag b/caravel/mag/10bitdac_cap_layout_design.mag
index 3fd6402..c799ed3 100644
--- a/caravel/mag/10bitdac_cap_layout_design.mag
+++ b/caravel/mag/10bitdac_cap_layout_design.mag
@@ -1,14 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1625518311
-<< error_s >>
-rect 210181 57576 210301 57604
-rect 210209 57560 210301 57576
-rect 210209 57528 210225 57560
-rect 210257 57528 210301 57560
-rect 210209 57512 210301 57528
-rect 210273 57484 210301 57512
+timestamp 1625522882
<< locali >>
rect 1224 111478 1280 111678
rect 166990 55698 167030 58214
@@ -72,11 +65,11 @@
rect 205764 57504 210286 57512
rect 205764 57500 205956 57504
use cap_28p cap_28p_0
-timestamp 1625518311
+timestamp 1625521741
transform 1 0 210498 0 1 53878
-box -1968 -2452 24820 24898
+box -4490 -5036 28216 26860
use 10bitdac_layout 10bitdac_layout_0
-timestamp 1625518311
+timestamp 1625520517
transform 1 0 428 0 1 57644
box -428 -57692 205056 54770
<< labels >>
diff --git a/caravel/mag/2bitdac_layout.mag b/caravel/mag/2bitdac_layout.mag
index 3d4cf89..ca58a0a 100644
--- a/caravel/mag/2bitdac_layout.mag
+++ b/caravel/mag/2bitdac_layout.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1625518311
+timestamp 1625520517
<< locali >>
rect 400 1308 2254 1310
rect 2630 1308 3014 1310
@@ -300,34 +300,34 @@
rect 1732 25 1854 89
rect 1656 22 1854 25
rect 1656 18 1772 22
-use res500_layout res500_layout_0
-timestamp 1625518311
-transform 0 1 288 -1 0 598
-box 218 -288 598 -90
-use res500_layout res500_layout_1
-timestamp 1625518311
-transform 0 1 288 -1 0 -34
-box 218 -288 598 -90
-use res500_layout res500_layout_2
-timestamp 1625518311
-transform 0 1 296 -1 0 1046
-box 218 -288 598 -90
-use res250_layout res250_layout_0
-timestamp 1625518311
-transform 0 1 340 -1 0 -598
-box 218 -342 484 -90
-use switch_layout switch_layout_0
-timestamp 1625518311
-transform 1 0 3868 0 1 -434
-box 40 154 2460 1180
-use switch_layout switch_layout_1
-timestamp 1625518311
-transform 1 0 764 0 1 -1230
-box 40 154 2460 1180
use switch_layout switch_layout_2
-timestamp 1625518311
+timestamp 1625520517
transform 1 0 732 0 1 50
box 40 154 2460 1180
+use switch_layout switch_layout_1
+timestamp 1625520517
+transform 1 0 764 0 1 -1230
+box 40 154 2460 1180
+use switch_layout switch_layout_0
+timestamp 1625520517
+transform 1 0 3868 0 1 -434
+box 40 154 2460 1180
+use res250_layout res250_layout_0
+timestamp 1625520517
+transform 0 1 340 -1 0 -598
+box 218 -342 484 -90
+use res500_layout res500_layout_2
+timestamp 1625520517
+transform 0 1 296 -1 0 1046
+box 218 -288 598 -90
+use res500_layout res500_layout_1
+timestamp 1625520517
+transform 0 1 288 -1 0 -34
+box 218 -288 598 -90
+use res500_layout res500_layout_0
+timestamp 1625520517
+transform 0 1 288 -1 0 598
+box 218 -288 598 -90
<< labels >>
rlabel locali s 200 816 200 816 4 vref1
rlabel locali s 196 412 196 412 4 x1_inp1
diff --git a/caravel/mag/3bitdac_layout.mag b/caravel/mag/3bitdac_layout.mag
index 5942ac3..2dbd922 100644
--- a/caravel/mag/3bitdac_layout.mag
+++ b/caravel/mag/3bitdac_layout.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1625518311
+timestamp 1625520517
<< locali >>
rect 180 2182 232 2372
rect 8780 1550 9674 1556
@@ -162,22 +162,22 @@
rect 5438 -216 6872 -176
rect 4730 -332 6872 -216
rect 4730 -336 5494 -332
-use 2bitdac_layout 2bitdac_layout_0
-timestamp 1625518311
-transform 1 0 -24 0 1 -1650
-box -10 -1298 6502 1430
-use 2bitdac_layout 2bitdac_layout_1
-timestamp 1625518311
-transform 1 0 10 0 1 1234
-box -10 -1298 6502 1430
-use res250_layout res250_layout_0
-timestamp 1625518311
-transform 0 1 296 -1 0 28
-box 218 -342 484 -90
use switch_layout switch_layout_0
-timestamp 1625518311
+timestamp 1625520517
transform 1 0 7394 0 1 -310
box 40 154 2460 1180
+use res250_layout res250_layout_0
+timestamp 1625520517
+transform 0 1 296 -1 0 28
+box 218 -342 484 -90
+use 2bitdac_layout 2bitdac_layout_1
+timestamp 1625520517
+transform 1 0 10 0 1 1234
+box -10 -1298 6502 1430
+use 2bitdac_layout 2bitdac_layout_0
+timestamp 1625520517
+transform 1 0 -24 0 1 -1650
+box -10 -1298 6502 1430
<< labels >>
rlabel locali s -2 -2910 -2 -2910 4 inp2
rlabel locali s 206 2306 206 2306 4 inp1
diff --git a/caravel/mag/4bitdac_layout.mag b/caravel/mag/4bitdac_layout.mag
index 047df3c..f5e4088 100644
--- a/caravel/mag/4bitdac_layout.mag
+++ b/caravel/mag/4bitdac_layout.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1625518311
+timestamp 1625520517
<< locali >>
rect 232 5402 290 5482
rect 13190 3488 13240 3490
@@ -204,22 +204,22 @@
rect 11850 762 11860 826
rect 11924 762 11926 826
rect 11850 750 11926 762
-use 3bitdac_layout 3bitdac_layout_0
-timestamp 1625518311
-transform 1 0 48 0 1 -2954
-box -54 -3060 10120 2664
-use 3bitdac_layout 3bitdac_layout_1
-timestamp 1625518311
-transform 1 0 54 0 1 3060
-box -54 -3060 10120 2664
-use res250_layout res250_layout_0
-timestamp 1625518311
-transform 0 -1 -48 1 0 -668
-box 218 -342 484 -90
use switch_layout switch_layout_0
-timestamp 1625518311
+timestamp 1625520517
transform 1 0 10954 0 1 -454
box 40 154 2460 1180
+use res250_layout res250_layout_0
+timestamp 1625520517
+transform 0 -1 -48 1 0 -668
+box 218 -342 484 -90
+use 3bitdac_layout 3bitdac_layout_1
+timestamp 1625520517
+transform 1 0 54 0 1 3060
+box -54 -3060 10120 2664
+use 3bitdac_layout 3bitdac_layout_0
+timestamp 1625520517
+transform 1 0 48 0 1 -2954
+box -54 -3060 10120 2664
<< labels >>
rlabel locali s 13434 248 13434 248 4 out_v
rlabel locali s 10976 102 10976 102 4 d3
diff --git a/caravel/mag/5bitdac_layout.mag b/caravel/mag/5bitdac_layout.mag
index 1b6f858..c99795e 100644
--- a/caravel/mag/5bitdac_layout.mag
+++ b/caravel/mag/5bitdac_layout.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1625518311
+timestamp 1625520517
<< locali >>
rect 236 11484 292 11620
rect 13494 6278 16080 6312
@@ -241,22 +241,22 @@
rect 14698 1562 14728 1626
rect 14792 1562 14814 1626
rect 14698 1540 14814 1562
-use 4bitdac_layout 4bitdac_layout_0
-timestamp 1625518311
-transform 1 0 -64 0 1 -5936
-box -6 -6048 13514 5724
-use 4bitdac_layout 4bitdac_layout_1
-timestamp 1625518311
-transform 1 0 6 0 1 6048
-box -6 -6048 13514 5724
-use res250_layout res250_layout_0
-timestamp 1625518311
-transform 1 0 -230 0 1 -62
-box 218 -342 484 -90
use switch_layout switch_layout_0
-timestamp 1625518311
+timestamp 1625520517
transform 1 0 13800 0 1 336
box 40 154 2460 1180
+use res250_layout res250_layout_0
+timestamp 1625520517
+transform 1 0 -230 0 1 -62
+box 218 -342 484 -90
+use 4bitdac_layout 4bitdac_layout_1
+timestamp 1625520517
+transform 1 0 6 0 1 6048
+box -6 -6048 13514 5724
+use 4bitdac_layout 4bitdac_layout_0
+timestamp 1625520517
+transform 1 0 -64 0 1 -5936
+box -6 -6048 13514 5724
<< labels >>
rlabel locali s 36 -122 36 -122 4 x1_vref5
rlabel locali s 188 -432 188 -432 4 x2_vref1
diff --git a/caravel/mag/6bitdac_layout.mag b/caravel/mag/6bitdac_layout.mag
index aacbeea..0b53084 100644
--- a/caravel/mag/6bitdac_layout.mag
+++ b/caravel/mag/6bitdac_layout.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1625518311
+timestamp 1625520517
<< locali >>
rect 302 23654 358 23734
rect 16410 13092 19408 13156
@@ -339,22 +339,22 @@
rect 18030 962 18120 978
rect 14660 -9304 14784 -9234
rect 14668 -10260 14784 -9304
-use 5bitdac_layout 5bitdac_layout_0
-timestamp 1625518311
-transform 1 0 -32 0 1 -11978
-box -70 -12070 16372 11772
-use 5bitdac_layout 5bitdac_layout_1
-timestamp 1625518311
-transform 1 0 68 0 1 12070
-box -70 -12070 16372 11772
-use res250_layout res250_layout_0
-timestamp 1625518311
-transform 1 0 -462 0 1 -66
-box 218 -342 484 -90
use switch_layout switch_layout_0
-timestamp 1625518311
+timestamp 1625520517
transform 1 0 17134 0 1 -222
box 40 154 2460 1180
+use res250_layout res250_layout_0
+timestamp 1625520517
+transform 1 0 -462 0 1 -66
+box 218 -342 484 -90
+use 5bitdac_layout 5bitdac_layout_1
+timestamp 1625520517
+transform 1 0 68 0 1 12070
+box -70 -12070 16372 11772
+use 5bitdac_layout 5bitdac_layout_0
+timestamp 1625520517
+transform 1 0 -32 0 1 -11978
+box -70 -12070 16372 11772
<< labels >>
rlabel locali s 19666 494 19666 494 4 out_v
rlabel locali s 17138 330 17138 330 4 d5
diff --git a/caravel/mag/7bitdac_layout.mag b/caravel/mag/7bitdac_layout.mag
index bbbf57b..3714e56 100644
--- a/caravel/mag/7bitdac_layout.mag
+++ b/caravel/mag/7bitdac_layout.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1625518311
+timestamp 1625520517
<< locali >>
rect 19916 48682 19962 48686
rect 19916 48680 19964 48682
@@ -554,22 +554,22 @@
rect 43790 25502 43811 25566
rect 43875 25502 43890 25566
rect 43790 25494 43890 25502
-use 6bitdac_layout 6bitdac_layout_0
-timestamp 1625518311
-transform 1 0 244 0 1 24130
-box -244 -24130 19716 23842
-use 6bitdac_layout 6bitdac_layout_1
-timestamp 1625518311
-transform 1 0 20506 0 1 24092
-box -244 -24130 19716 23842
-use res250_layout res250_layout_0
-timestamp 1625518311
-transform 1 0 -176 0 1 -20
-box 218 -342 484 -90
use switch_layout switch_layout_0
-timestamp 1625518311
+timestamp 1625520517
transform 1 0 42896 0 1 24336
box 40 154 2460 1180
+use res250_layout res250_layout_0
+timestamp 1625520517
+transform 1 0 -176 0 1 -20
+box 218 -342 484 -90
+use 6bitdac_layout 6bitdac_layout_1
+timestamp 1625520517
+transform 1 0 20506 0 1 24092
+box -244 -24130 19716 23842
+use 6bitdac_layout 6bitdac_layout_0
+timestamp 1625520517
+transform 1 0 244 0 1 24130
+box -244 -24130 19716 23842
<< labels >>
rlabel locali s 86 -116 86 -116 4 x1_vref5
rlabel locali s 254 -402 254 -402 4 x2_vref1
diff --git a/caravel/mag/8bitdac_layout.mag b/caravel/mag/8bitdac_layout.mag
index d13ac4d..67f56bb 100644
--- a/caravel/mag/8bitdac_layout.mag
+++ b/caravel/mag/8bitdac_layout.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1625518311
+timestamp 1625520517
<< locali >>
rect 45770 51554 90780 51562
rect 95360 51554 96184 51558
@@ -394,22 +394,22 @@
rect 94810 27466 94820 27530
rect 94884 27466 94888 27530
rect 94810 27460 94888 27466
-use res250_layout res250_layout_0
-timestamp 1625518311
-transform 1 0 20392 0 1 2302
-box 218 -342 484 -90
-use 7bitdac_layout 7bitdac_layout_0
-timestamp 1625518311
-transform 1 0 252 0 1 2456
-box -252 -2456 45562 48686
-use 7bitdac_layout 7bitdac_layout_1
-timestamp 1625518311
-transform 1 0 47558 0 1 2444
-box -252 -2456 45562 48686
use switch_layout switch_layout_0
-timestamp 1625518311
+timestamp 1625520517
transform 1 0 93914 0 1 26310
box 40 154 2460 1180
+use 7bitdac_layout 7bitdac_layout_1
+timestamp 1625520517
+transform 1 0 47558 0 1 2444
+box -252 -2456 45562 48686
+use 7bitdac_layout 7bitdac_layout_0
+timestamp 1625520517
+transform 1 0 252 0 1 2456
+box -252 -2456 45562 48686
+use res250_layout res250_layout_0
+timestamp 1625520517
+transform 1 0 20392 0 1 2302
+box 218 -342 484 -90
<< labels >>
rlabel locali s 20652 2264 20652 2264 4 x1_vref5
rlabel locali s 20812 1868 20812 1868 4 x2_vref1
diff --git a/caravel/mag/9bitdac_layout.mag b/caravel/mag/9bitdac_layout.mag
index b8f53ba..29c2905 100644
--- a/caravel/mag/9bitdac_layout.mag
+++ b/caravel/mag/9bitdac_layout.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1625518311
+timestamp 1625520517
<< locali >>
rect 143604 52756 173468 52758
rect 143604 52718 198410 52756
@@ -550,22 +550,22 @@
rect 197032 27851 197049 27915
rect 197113 27851 197128 27915
rect 197032 27834 197128 27851
-use res250_layout res250_layout_0
-timestamp 1625518311
-transform 1 0 67642 0 1 3396
-box 218 -342 484 -90
-use 8bitdac_layout 8bitdac_layout_0
-timestamp 1625518311
-transform 1 0 98026 0 1 1086
-box 0 -1232 96520 51562
-use 8bitdac_layout 8bitdac_layout_1
-timestamp 1625518311
-transform 1 0 0 0 1 1232
-box 0 -1232 96520 51562
use switch_layout switch_layout_0
-timestamp 1625518311
+timestamp 1625520517
transform 1 0 196132 0 1 26700
box 40 154 2460 1180
+use 8bitdac_layout 8bitdac_layout_1
+timestamp 1625520517
+transform 1 0 0 0 1 1232
+box 0 -1232 96520 51562
+use 8bitdac_layout 8bitdac_layout_0
+timestamp 1625520517
+transform 1 0 98026 0 1 1086
+box 0 -1232 96520 51562
+use res250_layout res250_layout_0
+timestamp 1625520517
+transform 1 0 67642 0 1 3396
+box 218 -342 484 -90
<< labels >>
rlabel locali s 198666 27404 198666 27404 4 out_v
rlabel metal4 s 197072 27958 197072 27958 4 vdd!
diff --git a/caravel/mag/INV.mag b/caravel/mag/INV.mag
index 049d478..a99878b 100644
--- a/caravel/mag/INV.mag
+++ b/caravel/mag/INV.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1625518311
+timestamp 1625520517
<< nwell >>
rect 0 334 288 550
rect 0 0 282 334
diff --git a/caravel/mag/cap_28p.mag b/caravel/mag/cap_28p.mag
index c531be4..8bed494 100644
--- a/caravel/mag/cap_28p.mag
+++ b/caravel/mag/cap_28p.mag
@@ -1,6 +1,6 @@
magic
tech sky130A
-timestamp 1625518311
+timestamp 1625521741
<< metal1 >>
rect -984 12417 -496 12449
rect -984 11818 12410 12417
@@ -8,12 +8,7 @@
rect -984 -1226 -464 -1163
rect 11855 -1226 12375 -1163
<< metal3 >>
-rect -984 12417 -496 12449
-rect -984 11818 12410 12417
-rect -984 11706 12375 11818
-rect -984 -442 -260 11706
-rect 11803 -442 12375 11706
-rect -984 -1163 12375 -442
-rect -984 -1226 -464 -1163
-rect 11855 -1226 12375 -1163
+rect -2245 -2518 14108 13430
+<< mimcap >>
+rect -1093 -1334 12488 12433
<< end >>
diff --git a/caravel/mag/res250_layout.mag b/caravel/mag/res250_layout.mag
index 39c7095..82531bd 100644
--- a/caravel/mag/res250_layout.mag
+++ b/caravel/mag/res250_layout.mag
@@ -1,6 +1,9 @@
magic
tech sky130A
-timestamp 1625518311
+timestamp 1625520517
+<< error_p >>
+rect 119 -123 140 -94
+rect 205 -124 226 -93
<< ndiff >>
rect 119 -100 140 -94
rect 119 -117 121 -100
diff --git a/caravel/mag/res500_layout.mag b/caravel/mag/res500_layout.mag
index bf6bd0e..d6b246a 100644
--- a/caravel/mag/res500_layout.mag
+++ b/caravel/mag/res500_layout.mag
@@ -1,7 +1,10 @@
magic
tech sky130A
magscale 1 2
-timestamp 1625518311
+timestamp 1625520517
+<< error_p >>
+rect 238 -246 280 -188
+rect 528 -240 570 -184
<< ndiff >>
rect 238 -200 280 -188
rect 238 -234 242 -200
diff --git a/caravel/mag/switch_layout.mag b/caravel/mag/switch_layout.mag
index fcf5938..90c87b1 100644
--- a/caravel/mag/switch_layout.mag
+++ b/caravel/mag/switch_layout.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1625518311
+timestamp 1625520517
<< nwell >>
rect 506 622 602 1172
rect 1210 1100 1380 1122
@@ -229,14 +229,14 @@
rect 847 633 960 667
rect 790 622 960 633
rect 512 182 612 324
-use INV INV_0
-timestamp 1625518311
-transform 1 0 602 0 1 622
-box -88 -440 290 550
use INV INV_1
-timestamp 1625518311
+timestamp 1625520517
transform 1 0 224 0 1 622
box -88 -440 290 550
+use INV INV_0
+timestamp 1625520517
+transform 1 0 602 0 1 622
+box -88 -440 290 550
<< labels >>
rlabel metal1 s 544 1068 544 1068 4 vdd!
rlabel metal1 s 540 216 540 216 4 gnd!
diff --git a/caravel/mag/user_analog_project_wrapper.mag b/caravel/mag/user_analog_project_wrapper.mag
index 8af32c3..639abd0 100644
--- a/caravel/mag/user_analog_project_wrapper.mag
+++ b/caravel/mag/user_analog_project_wrapper.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1625518311
+timestamp 1625522882
<< locali >>
rect 46054 508408 47990 508612
rect 1388 508124 18224 508148
@@ -1513,15 +1513,14 @@
rect 582340 225230 584800 230030
rect -800 214888 1660 219688
rect -800 204888 1660 209688
+rect 582340 191430 584800 196230
+rect 582340 181430 584800 186230
rect -800 175696 1660 177688
rect -800 175569 4126 175696
rect -800 174953 3108 175569
rect 3964 174953 4126 175569
rect -800 174836 4126 174953
rect -800 172888 1660 174836
-rect 233894 172718 265130 202950
-rect 582340 191430 584800 196230
-rect 582340 181430 584800 186230
rect -800 162888 1660 167688
rect 582340 146830 584800 151630
rect 582340 136830 584800 141630
@@ -1600,8 +1599,6 @@
<< via3 >>
rect 120858 677386 124122 679290
rect 163 644260 1347 645284
-<< mimcap >>
-rect 235850 174040 262698 201416
<< metal4 >>
rect 120366 679290 125496 680040
rect 120366 679074 120858 679290
@@ -1646,9 +1643,9 @@
rect 234602 180872 234690 188632
rect 234606 180162 234670 180872
use 10bitdac_cap_layout_design 10bitdac_cap_layout_design_0
-timestamp 1625518311
+timestamp 1625522882
transform 1 0 27354 0 1 122658
-box 0 -48 235318 112414
+box 0 -48 238714 112414
<< labels >>
flabel metal3 s 583520 269230 584800 269342 0 FreeSans 8338 0 0 0 gpio_analog[0]
flabel metal3 s -800 381864 480 381976 0 FreeSans 8338 0 0 0 gpio_analog[10]
