Res_amp con un par de errores DRC
diff --git a/mag/afernandez_residue_amplifier/DFlipFlop.mag b/mag/afernandez_residue_amplifier/DFlipFlop.mag
index 8d4f93a..9e0dd10 100644
--- a/mag/afernandez_residue_amplifier/DFlipFlop.mag
+++ b/mag/afernandez_residue_amplifier/DFlipFlop.mag
@@ -109,11 +109,11 @@
rect 153 1320 163 1432
rect 219 1320 229 1432
rect 153 1315 229 1320
-use clock_inverter *clock_inverter_0 ~/sky130-mpw2-fulgor/clock_inverter/mag
+use clock_inverter *clock_inverter_0
timestamp 1623799048
transform 1 0 -1244 0 1 0
box 0 0 1244 3068
-use latch_diff *latch_diff_1 ~/sky130-mpw2-fulgor/latch_diff/mag
+use latch_diff *latch_diff_1
timestamp 1623798783
transform -1 0 1707 0 -1 2352
box -33 -716 1147 2352
diff --git a/mag/afernandez_residue_amplifier/buffer_no_inv_x05.mag b/mag/afernandez_residue_amplifier/buffer_no_inv_x05.mag
index 300e13a..a29603b 100644
--- a/mag/afernandez_residue_amplifier/buffer_no_inv_x05.mag
+++ b/mag/afernandez_residue_amplifier/buffer_no_inv_x05.mag
@@ -11,7 +11,7 @@
<< metal2 >>
rect 14 526 39 552
rect 823 529 848 555
-use inverter_min inverter_min_1 ~/sky130-mpw2-fulgor/inverter_min/mag
+use inverter_min inverter_min_1
timestamp 1624038681
transform 1 0 485 0 1 -6
box -53 16 369 1179
diff --git a/mag/afernandez_residue_amplifier/clock_inverter.mag b/mag/afernandez_residue_amplifier/clock_inverter.mag
index 958b6a3..426331d 100644
--- a/mag/afernandez_residue_amplifier/clock_inverter.mag
+++ b/mag/afernandez_residue_amplifier/clock_inverter.mag
@@ -64,7 +64,7 @@
rect 520 40 530 154
rect 714 40 724 154
rect 520 35 724 40
-use inverter_cp_x1 *inverter_cp_x1_1 ~/sky130-mpw2-fulgor/inverter_cp_x1/mag
+use inverter_cp_x1 *inverter_cp_x1_1
timestamp 1623798692
transform 1 0 0 0 1 2292
box 0 -758 622 776
@@ -76,7 +76,7 @@
timestamp 1623798692
transform 1 0 0 0 -1 776
box 0 -758 622 776
-use trans_gate *trans_gate_0 ~/sky130-mpw2-fulgor/trans_gate/mag
+use trans_gate *trans_gate_0
timestamp 1623610677
transform 1 0 675 0 -1 723
box -53 -811 569 723
diff --git a/mag/afernandez_residue_amplifier/delay_cell_buff.mag b/mag/afernandez_residue_amplifier/delay_cell_buff.mag
index ec1dfca..2902697 100644
--- a/mag/afernandez_residue_amplifier/delay_cell_buff.mag
+++ b/mag/afernandez_residue_amplifier/delay_cell_buff.mag
@@ -381,7 +381,7 @@
rect 11805 503 11815 559
rect 11734 498 11815 503
rect 85 52 11012 112
-use mux_2to1_logic mux_2to1_logic_1 ~/sky130-mpw2-fulgor/mux_2to1_logic/mag
+use mux_2to1_logic mux_2to1_logic_1
timestamp 1624063007
transform 1 0 1949 0 -1 1770
box -475 -633 999 607
@@ -389,7 +389,7 @@
timestamp 1624063007
transform 1 0 475 0 -1 1770
box -475 -633 999 607
-use buffer_no_inv_x05 buffer_no_inv_x05_0 ~/sky130-mpw2-fulgor/buffer_no_inv_x05/mag
+use buffer_no_inv_x05 buffer_no_inv_x05_0
timestamp 1624038785
transform 1 0 -10 0 1 -10
box 10 10 854 1173
@@ -465,7 +465,7 @@
timestamp 1624038785
transform 1 0 10962 0 1 -10
box 10 10 854 1173
-use nand_logic nand_logic_0 ~/sky130-mpw2-fulgor/nand_logic/mag
+use nand_logic nand_logic_0
timestamp 1623952422
transform 1 0 10695 0 -1 1870
box -219 -731 833 707
diff --git a/mag/afernandez_residue_amplifier/mux_2to1_logic.mag b/mag/afernandez_residue_amplifier/mux_2to1_logic.mag
index 768486f..afedecd 100644
--- a/mag/afernandez_residue_amplifier/mux_2to1_logic.mag
+++ b/mag/afernandez_residue_amplifier/mux_2to1_logic.mag
@@ -143,7 +143,7 @@
timestamp 1623900471
transform 1 0 210 0 1 277
box -263 -330 263 330
-use inverter_min inverter_min_0 ~/sky130-mpw2-fulgor/inverter_min/mag
+use inverter_min inverter_min_0
timestamp 1624038681
transform 1 0 -422 0 1 -600
box -53 16 369 1179
diff --git a/mag/afernandez_residue_amplifier/res_amp_lin_prog.mag b/mag/afernandez_residue_amplifier/res_amp_lin_prog.mag
index 344b8cf..c2e986a 100644
--- a/mag/afernandez_residue_amplifier/res_amp_lin_prog.mag
+++ b/mag/afernandez_residue_amplifier/res_amp_lin_prog.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1624119678
+timestamp 1624395098
<< nwell >>
rect 19730 11269 20704 12071
rect 19753 11233 20704 11269
@@ -450,15 +450,19 @@
rect 19485 10325 19486 10465
rect 19282 10324 19486 10325
rect 19283 10315 19485 10324
-use res_amp_lin res_amp_lin_0 ~/sky130-mpw2-fulgor/res_amp_lin/mag
+use inverter_min_x4 inverter_min_x4_0
+timestamp 1624049879
+transform 1 0 18411 0 -1 8928
+box -53 -616 665 643
+use res_amp_lin res_amp_lin_0
timestamp 1624115960
transform 1 0 13177 0 1 11829
box 1054 -2058 5121 915
-use delay_cell_buff delay_cell_buff_0 ~/sky130-mpw2-fulgor/delay_cell_buff/mag
+use delay_cell_buff delay_cell_buff_0
timestamp 1624063007
transform 1 0 6173 0 1 7077
box -208 0 11816 2601
-use sky130_fd_pr__nfet_01v8_lvt_72JNYZ sky130_fd_pr__nfet_01v8_lvt_72JNYZ_0 ~/sky130-mpw2-fulgor/iref_ctrl_res_amp/mag
+use sky130_fd_pr__nfet_01v8_lvt_72JNYZ sky130_fd_pr__nfet_01v8_lvt_72JNYZ_0
timestamp 1624032293
transform 1 0 20195 0 -1 9465
box -311 -310 311 310
@@ -466,10 +470,6 @@
timestamp 1624030292
transform 1 0 20214 0 1 10085
box -407 -310 407 310
-use inverter_min_x4 inverter_min_x4_0 ~/sky130-mpw2-fulgor/inverter_min_x4/mag
-timestamp 1623895985
-transform 1 0 18411 0 -1 8928
-box -53 -616 665 643
use sky130_fd_pr__nfet_01v8_lvt_72JNYZ sky130_fd_pr__nfet_01v8_lvt_72JNYZ_1
timestamp 1624032293
transform 1 0 20195 0 1 13001
@@ -486,7 +486,7 @@
timestamp 1624030292
transform 1 0 20214 0 -1 12381
box -407 -310 407 310
-use iref_ctrl_res_amp iref_ctrl_res_amp_0 ~/sky130-mpw2-fulgor/iref_ctrl_res_amp/mag
+use iref_ctrl_res_amp iref_ctrl_res_amp_0
timestamp 1624113259
transform 1 0 15406 0 -1 14113
box -586 -686 2888 1369
diff --git a/mag/afernandez_residue_amplifier/res_amp_sync_v2.mag b/mag/afernandez_residue_amplifier/res_amp_sync_v2.mag
index 63b3724..68af2f1 100644
--- a/mag/afernandez_residue_amplifier/res_amp_sync_v2.mag
+++ b/mag/afernandez_residue_amplifier/res_amp_sync_v2.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1624120204
+timestamp 1624395098
<< nwell >>
rect 3636 6239 4733 7015
rect 7538 6935 8332 7015
@@ -352,56 +352,56 @@
rect 2926 -1313 5650 -1241
rect 5909 -1313 5910 -1241
rect -92 -1314 5910 -1313
-use DFlipFlop DFlipFlop_4 ~/sky130-mpw2-fulgor/DFlipFlop/mag
-timestamp 1623898709
-transform 1 0 4910 0 -1 879
-box -1244 0 1740 3068
-use DFlipFlop DFlipFlop_3
-timestamp 1623898709
-transform 1 0 1926 0 -1 879
-box -1244 0 1740 3068
use DFlipFlop DFlipFlop_2
-timestamp 1623898709
+timestamp 1624049879
transform 1 0 1926 0 1 879
box -1244 0 1740 3068
-use nand_logic nand_logic_0 ~/sky130-mpw2-fulgor/nand_logic/mag
+use DFlipFlop DFlipFlop_3
+timestamp 1624049879
+transform 1 0 1926 0 -1 879
+box -1244 0 1740 3068
+use DFlipFlop DFlipFlop_4
+timestamp 1624049879
+transform 1 0 4910 0 -1 879
+box -1244 0 1740 3068
+use nand_logic nand_logic_0
timestamp 1623952422
transform 1 0 3885 0 1 3205
box -219 -731 833 707
use DFlipFlop DFlipFlop_0
-timestamp 1623898709
+timestamp 1624049879
transform 1 0 1926 0 1 3947
box -1244 0 1740 3068
-use inverter_min_x4 inverter_min_x4_4 ~/sky130-mpw2-fulgor/inverter_min_x4/mag
-timestamp 1623895985
-transform 1 0 4115 0 -1 1602
-box -53 -616 665 643
-use inverter_min_x16 inverter_min_x16_0 ~/sky130-mpw2-fulgor/inverter_min_x16/mag
+use inverter_min_x16 inverter_min_x16_0
timestamp 1624046389
transform 1 0 4833 0 -1 1602
box -53 -616 1817 643
-use inverter_min_x4 inverter_min_x4_3
-timestamp 1623895985
-transform 1 0 6541 0 1 3224
-box -53 -616 665 643
use nand_logic nand_logic_1
timestamp 1623952422
transform 1 0 5655 0 1 3205
box -219 -731 833 707
use inverter_min_x4 inverter_min_x4_1
-timestamp 1623895985
+timestamp 1624049879
transform 1 0 4771 0 1 3224
box -53 -616 665 643
+use inverter_min_x4 inverter_min_x4_3
+timestamp 1624049879
+transform 1 0 6541 0 1 3224
+box -53 -616 665 643
+use inverter_min_x4 inverter_min_x4_4
+timestamp 1624049879
+transform 1 0 4115 0 -1 1602
+box -53 -616 665 643
use DFlipFlop DFlipFlop_1
-timestamp 1623898709
+timestamp 1624049879
transform 1 0 5798 0 1 3947
box -1244 0 1740 3068
use inverter_min_x4 inverter_min_x4_0
-timestamp 1623895985
+timestamp 1624049879
transform 1 0 3795 0 1 6292
box -53 -616 665 643
use inverter_min_x4 inverter_min_x4_2
-timestamp 1623895985
+timestamp 1624049879
transform 1 0 7667 0 1 6292
box -53 -616 665 643
<< labels >>
diff --git a/mag/afernandez_residue_amplifier/res_amp_top.mag b/mag/afernandez_residue_amplifier/res_amp_top.mag
index a472b13..83b2d48 100644
--- a/mag/afernandez_residue_amplifier/res_amp_top.mag
+++ b/mag/afernandez_residue_amplifier/res_amp_top.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1624371743
+timestamp 1624395098
<< nwell >>
rect 18234 4138 21604 4172
<< pwell >>
@@ -892,15 +892,15 @@
rect 20467 -611 20491 -605
rect 19795 -635 20491 -611
rect -4958 -972 -4262 -948
-use res_amp_lin_prog res_amp_lin_prog_0 ~/sky130-mpw2-fulgor/res_amp_lin_prog/mag
-timestamp 1624314836
+use res_amp_lin_prog res_amp_lin_prog_0
+timestamp 1624395098
transform 1 0 -5726 0 1 -7077
box 5835 7077 21302 14799
-use res_amp_sync_v2 res_amp_sync_v2_0 ~/sky130-mpw2-fulgor/res_amp_sync_v2/mag
-timestamp 1624314836
+use res_amp_sync_v2 res_amp_sync_v2_0
+timestamp 1624395098
transform 1 0 -899 0 1 4870
box -92 -2189 8342 7015
-use source_follower_buff_diff source_follower_buff_diff_0 ~/sky130-mpw2-fulgor/source_follower_buff_diff/mag
+use source_follower_buff_diff source_follower_buff_diff_0
timestamp 1624113565
transform 1 0 17170 0 1 1168
box 863 -174 10692 6158
diff --git a/mag/afernandez_residue_amplifier/source_follower_buff_diff.mag b/mag/afernandez_residue_amplifier/source_follower_buff_diff.mag
index dd27df0..c5ad543 100644
--- a/mag/afernandez_residue_amplifier/source_follower_buff_diff.mag
+++ b/mag/afernandez_residue_amplifier/source_follower_buff_diff.mag
@@ -62,11 +62,11 @@
rect 2818 2001 2828 2057
rect 2752 1460 2828 2001
rect 863 1384 2828 1460
-use source_follower_buff_nmos source_follower_buff_nmos_1 ~/sky130-mpw2-fulgor/source_follower_buff_nmos/mag
+use source_follower_buff_nmos source_follower_buff_nmos_1
timestamp 1624043228
transform 1 0 3483 0 -1 4622
box 336 -1409 7209 1545
-use source_follower_buff_pmos source_follower_buff_pmos_1 ~/sky130-mpw2-fulgor/source_follower_buff_pmos/mag
+use source_follower_buff_pmos source_follower_buff_pmos_1
timestamp 1624113565
transform 1 0 1078 0 -1 4373
box -51 -311 3503 1296
diff --git a/mag/afernandez_residue_amplifier/source_follower_buff_nmos.mag b/mag/afernandez_residue_amplifier/source_follower_buff_nmos.mag
index f6b9467..1163b52 100644
--- a/mag/afernandez_residue_amplifier/source_follower_buff_nmos.mag
+++ b/mag/afernandez_residue_amplifier/source_follower_buff_nmos.mag
@@ -870,7 +870,7 @@
rect 5928 -503 5994 -285
rect 5928 -921 5994 -703
rect 5928 -1131 5994 -1121
-use sky130_fd_pr__nfet_01v8_lvt_9B2JY7 sky130_fd_pr__nfet_01v8_lvt_9B2JY7_0 ~/sky130-mpw2-fulgor/iref_ctrl_res_amp/mag
+use sky130_fd_pr__nfet_01v8_lvt_9B2JY7 sky130_fd_pr__nfet_01v8_lvt_9B2JY7_0
timestamp 1624020979
transform 1 0 791 0 1 -1029
box -455 -310 455 310
diff --git a/mag/afernandez_residue_amplifier/source_follower_buff_pmos.mag b/mag/afernandez_residue_amplifier/source_follower_buff_pmos.mag
index 00283c9..871bcbe 100644
--- a/mag/afernandez_residue_amplifier/source_follower_buff_pmos.mag
+++ b/mag/afernandez_residue_amplifier/source_follower_buff_pmos.mag
@@ -217,7 +217,7 @@
timestamp 1623976832
transform 1 0 2584 0 1 185
box -807 -384 807 384
-use sky130_fd_pr__nfet_01v8_lvt_9B2JY7 sky130_fd_pr__nfet_01v8_lvt_9B2JY7_0 ~/sky130-mpw2-fulgor/iref_ctrl_res_amp/mag
+use sky130_fd_pr__nfet_01v8_lvt_9B2JY7 sky130_fd_pr__nfet_01v8_lvt_9B2JY7_0
timestamp 1624020979
transform 1 0 404 0 1 259
box -455 -310 455 310
diff --git a/mag/div_by_2.mag b/mag/div_by_2.mag
index 3a1029b..75c777b 100644
--- a/mag/div_by_2.mag
+++ b/mag/div_by_2.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1624049879
+timestamp 1624395098
<< nwell >>
rect 2984 2989 4228 3068
rect 3203 118 4219 142
@@ -171,6 +171,14 @@
timestamp 1624049879
transform 1 0 1244 0 -1 3068
box -1244 0 1740 3068
+use inverter_min_x4 inverter_min_x4_0
+timestamp 1624049879
+transform 1 0 3563 0 1 2346
+box -53 -616 665 643
+use inverter_min_x4 inverter_min_x4_1
+timestamp 1624049879
+transform 1 0 3563 0 -1 723
+box -53 -616 665 643
use clock_inverter clock_inverter_0
timestamp 1624049879
transform 1 0 -1244 0 1 0
@@ -183,14 +191,6 @@
timestamp 1624049879
transform 1 0 3037 0 1 2345
box -53 -615 473 655
-use inverter_min_x4 inverter_min_x4_0
-timestamp 1624049879
-transform 1 0 3563 0 1 2346
-box -53 -616 665 643
-use inverter_min_x4 inverter_min_x4_1
-timestamp 1624049879
-transform 1 0 3563 0 -1 723
-box -53 -616 665 643
<< labels >>
rlabel metal1 -1244 2944 2984 2998 1 vdd
rlabel metal1 -1244 1498 1313 1570 1 vss
diff --git a/mag/div_by_5.mag b/mag/div_by_5.mag
index 0443b11..24bac88 100644
--- a/mag/div_by_5.mag
+++ b/mag/div_by_5.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1624049879
+timestamp 1624395098
<< nwell >>
rect -556 2925 0 3068
rect -556 2664 57 2925
diff --git a/mag/ring_osc_buffer.mag b/mag/ring_osc_buffer.mag
index 2dee5e6..17802d1 100644
--- a/mag/ring_osc_buffer.mag
+++ b/mag/ring_osc_buffer.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1624049879
+timestamp 1624395098
<< nwell >>
rect 1 1259 1963 1270
rect 1 744 1961 1259
@@ -14,10 +14,6 @@
rect 1078 519 1490 603
rect 1796 519 1963 597
rect 0 40 1963 94
-use inverter_min_x2 inverter_min_x2_0
-timestamp 1624049879
-transform 1 0 54 0 1 615
-box -53 -615 473 655
use inverter_min_x4 inverter_min_x4_0
timestamp 1624049879
transform 1 0 580 0 1 616
@@ -26,6 +22,10 @@
timestamp 1624049879
transform 1 0 1298 0 1 616
box -53 -616 665 643
+use inverter_min_x2 inverter_min_x2_0
+timestamp 1624049879
+transform 1 0 54 0 1 615
+box -53 -615 473 655
<< labels >>
rlabel metal1 1 535 213 589 1 in_vco
rlabel metal1 397 523 639 603 1 o1
diff --git a/mag/top_pll_v1.mag b/mag/top_pll_v1.mag
index e187d4b..c2cdbea 100644
--- a/mag/top_pll_v1.mag
+++ b/mag/top_pll_v1.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1624049879
+timestamp 1624395098
<< nwell >>
rect 0 2846 20536 2860
rect 0 2838 6183 2846
@@ -543,15 +543,15 @@
transform 1 0 14447 0 1 -174
box -422 0 3882 2956
use ring_osc_buffer ring_osc_buffer_0
-timestamp 1624049879
+timestamp 1624395098
transform 1 0 18509 0 1 653
box 0 0 1963 1270
use div_by_5 div_by_5_0
-timestamp 1624049879
+timestamp 1624395098
transform -1 0 13250 0 1 -3418
box -556 0 13892 3068
use div_by_2 div_by_2_0
-timestamp 1624049879
+timestamp 1624395098
transform -1 0 18034 0 -1 -350
box -1244 0 4228 3068
<< labels >>
diff --git a/mag/top_pll_v2.mag b/mag/top_pll_v2.mag
index 53c8407..ecf9c0b 100644
--- a/mag/top_pll_v2.mag
+++ b/mag/top_pll_v2.mag
@@ -1,7 +1,7 @@
magic
tech sky130A
magscale 1 2
-timestamp 1624054096
+timestamp 1624395098
<< nwell >>
rect 0 2846 20536 2860
rect 0 2838 6183 2846
@@ -524,15 +524,15 @@
transform 1 0 15820 0 1 -9473
box -16462 -24206 34360 5780
use div_by_2 div_by_2_0
-timestamp 1624049879
+timestamp 1624395098
transform -1 0 18034 0 -1 -350
box -1244 0 4228 3068
use div_by_5 div_by_5_0
-timestamp 1624049879
+timestamp 1624395098
transform -1 0 13250 0 1 -3418
box -556 0 13892 3068
use ring_osc_buffer ring_osc_buffer_0
-timestamp 1624049879
+timestamp 1624395098
transform 1 0 18509 0 1 653
box 0 0 1963 1270
use ring_osc ring_osc_0
diff --git a/mag/user_analog_project_wrapper.gds b/mag/user_analog_project_wrapper.gds
new file mode 100644
index 0000000..94592d2
--- /dev/null
+++ b/mag/user_analog_project_wrapper.gds
Binary files differ
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index 19b388a..126eb99 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 1624376995
+timestamp 1624395098
<< nwell >>
rect 14730 660108 64962 661110
rect 14730 660034 64841 660108
@@ -389,13 +389,12 @@
rect 125227 636972 144160 637047
rect 145498 636972 145544 637369
rect 144160 636927 145498 636937
-rect 152624 510676 153820 510686
-rect 1323 510540 152624 510561
rect 368681 635516 368816 635526
rect 368681 635411 368816 635421
rect 368680 633678 368815 633688
rect 368680 633573 368815 633583
-rect 1323 510540 74118 51056
+rect 152624 510676 153820 510686
+rect 1323 510540 152624 510561
rect 1323 510538 73012 510540
rect 1323 510236 1358 510538
rect 2171 510260 73012 510538
@@ -404,9 +403,6 @@
rect 1323 510212 152624 510236
rect 153820 510212 153853 510561
rect 152624 510195 153820 510205
-rect 74070 510260 74118 510540
-rect 2171 510236 74118 510260
-rect 1323 510212 74118 510236
rect 1326 467320 145524 467339
rect 1326 467316 144170 467320
rect 1326 467014 1361 467316
@@ -1023,20 +1019,7 @@
rect 93805 695867 95820 695904
rect 93805 693909 93859 695867
rect 95764 693909 95820 695867
-rect 166763 695391 169263 702300
-rect 177015 695391 179515 702300
-rect 218640 697309 221140 702300
rect 93805 683893 95820 693909
-rect 166762 692889 179515 695391
-rect 211648 693981 211658 695778
-rect 214091 695500 214101 695778
-rect 214091 693981 214151 695500
-rect 218640 694902 218717 697309
-rect 221066 694902 221140 697309
-rect 218640 694879 221140 694902
-rect 223860 697338 226360 697368
-rect 223860 694931 223921 697338
-rect 226270 694931 226360 697338
rect 124995 692109 125005 692310
rect 93805 681853 93843 683893
rect 93833 681797 93843 681853
@@ -1089,7 +1072,10 @@
rect 133410 622007 133420 624630
rect 137480 611839 139980 658887
rect 149955 658524 152455 697124
+rect 166763 695391 169263 702300
+rect 177015 695391 179515 702300
rect 218640 697309 221140 702300
+rect 166762 692889 179515 695391
rect 211648 693981 211658 695778
rect 214091 695500 214101 695778
rect 214091 693981 214151 695500
@@ -1099,30 +1085,7 @@
rect 223860 697338 226360 697368
rect 223860 694931 223921 697338
rect 226270 694931 226360 697338
-rect 137480 607168 137755 611839
-rect 139770 607168 139980 611839
-rect 137480 607076 139980 607168
-rect 144145 637403 145521 637418
-rect 144145 636937 144160 637403
-rect 145498 636937 145521 637403
-rect 72999 510260 73012 510540
-rect 74070 510260 74122 510540
-rect 72999 510192 74122 510260
-rect -800 509166 480 509278
-rect -800 507984 490 508096
-rect -800 506802 480 506914
-rect -800 505620 480 505732
-rect -800 468308 480 468420
-rect 1351 467316 2184 467321
-rect -800 467230 480 467238
-rect 1351 467230 1361 467316
-rect -800 467126 1361 467230
-rect 304 467118 1361 467126
-rect 1351 467014 1361 467118
-rect 2174 467014 2184 467316
-rect 1351 467009 2184 467014
-rect 144145 467320 145521 636937
-rect 171983 635570 174483 692889
+rect 171983 684070 174483 692889
rect 207536 692355 210036 692388
rect 207536 690328 207591 692355
rect 209950 690328 210036 692355
@@ -1135,6 +1098,10 @@
rect 198285 687830 198295 688219
rect 199269 687830 199279 688219
rect 198285 687825 199279 687830
+rect 171983 681570 192882 684070
+rect 190382 667305 192882 681570
+rect 190367 664796 190377 667305
+rect 192874 664796 192884 667305
rect 157073 660502 197718 660507
rect 157073 659472 157083 660502
rect 197708 659472 197718 660502
@@ -1149,10 +1116,6 @@
rect 214642 687875 214652 688703
rect 223860 688191 226360 694931
rect 228892 697352 231392 702300
-rect 510296 701790 510306 704716
-rect 510456 697694 510466 701790
-rect 525573 697694 525583 704716
-rect 566594 702300 571594 704800
rect 242722 699634 242732 702134
rect 245232 702114 245242 702134
rect 245232 699634 315546 702114
@@ -1200,7 +1163,6 @@
rect 202795 684082 202805 684706
rect 247109 684706 247152 684711
rect 247109 684082 247119 684706
-rect 582300 677984 584800 682984
rect 209899 659015 212399 659121
rect 209899 658377 209986 659015
rect 212293 658377 212399 659015
@@ -1300,8 +1262,6 @@
rect 360862 636883 361058 642012
rect 368630 641752 368826 642905
rect 368630 641556 370520 641752
-rect 171973 633070 171983 635570
-rect 174483 633070 174493 635570
rect 368671 635516 368826 635521
rect 368671 635421 368681 635516
rect 368816 635421 368826 635516
@@ -1322,7 +1282,6 @@
rect 368815 633588 368847 633678
rect 368815 633583 368825 633588
rect 368670 633578 368825 633583
-rect 171983 633065 174483 633070
rect 371879 632836 372075 641457
rect 582340 639784 584800 644584
rect 371440 632640 372075 632836
@@ -1337,9 +1296,6 @@
rect 359292 630047 359302 630284
rect 358816 616322 359302 630047
rect 582340 629784 584800 634584
-rect 209899 607161 210137 611733
-rect 212245 607161 212399 611733
-rect 209899 606979 212399 607161
rect 361089 628771 361575 628785
rect 360254 628619 360264 628648
rect 360218 628346 360264 628619
@@ -1365,6 +1321,12 @@
rect 352226 613265 360609 613751
rect 360123 612028 360609 613265
rect 365504 613072 365990 614551
+rect 209899 607161 210137 611733
+rect 212245 607161 212399 611733
+rect 209899 606979 212399 607161
+rect 152609 510205 152624 510676
+rect 153820 510205 153837 510676
+rect 152609 510169 153837 510205
rect 144145 467013 144170 467320
rect 145472 467013 145521 467320
rect 144145 466948 145521 467013
@@ -1420,9 +1382,6 @@
rect 582340 540677 582466 545159
rect 584684 540677 584800 545159
rect 582340 540562 584800 540677
-rect 152609 510205 152624 510676
-rect 153820 510205 153837 510676
-rect 152609 510169 153837 510205
rect 583520 500050 584800 500162
rect 583520 498868 584800 498980
rect 583520 497686 584800 497798
@@ -1566,9 +1525,6 @@
rect 23042 660657 64017 661269
rect 23042 660101 64017 660657
rect 93859 693909 95764 695867
-rect 211658 693981 214091 695778
-rect 218717 694902 221066 697309
-rect 223921 694931 226270 697338
rect 93843 681797 95721 683893
rect 125005 690355 125955 692310
rect 83765 660846 124071 661487
@@ -1579,11 +1535,9 @@
rect 211658 693981 214091 695778
rect 218717 694902 221066 697309
rect 223921 694931 226270 697338
-rect 137755 607168 139770 611839
rect 207591 690328 209950 692355
+rect 190377 664796 192874 667305
rect 157083 659472 197708 660502
-rect 510306 701790 525573 704716
-rect 510466 697694 525573 701790
rect 242732 699634 245232 702134
rect 228965 694945 231314 697352
rect 227277 688115 230750 688664
@@ -1591,7 +1545,6 @@
rect 202805 684082 247109 684711
rect 137755 607168 139770 611839
rect 156500 620709 206836 624128
-rect 210137 607161 212245 611733
rect 510306 701790 525573 704716
rect 510466 697694 525573 701790
rect 567875 696717 570375 698736
@@ -1610,13 +1563,13 @@
rect 366160 655840 367510 658340
rect 325555 648363 328055 650863
rect 347636 636697 348086 637147
-rect 171983 633070 174483 635570
rect 352236 630044 352702 630281
rect 356375 630025 356841 630262
rect 358826 630047 359292 630284
rect 360264 628346 360662 628648
rect 361132 628469 361530 628771
rect 362048 628436 362446 628738
+rect 210137 607161 212245 611733
rect 582403 554118 584710 555256
rect 582340 551658 584800 554118
rect 582403 550629 584710 551658
@@ -1709,23 +1662,13 @@
rect 117567 673232 142936 677786
rect 75277 673096 142936 673232
rect 31160 673047 142936 673096
-rect 145430 677818 260437 677876
+rect 145430 677841 260437 677876
+rect 145430 677818 216578 677841
rect 145430 673110 171320 677818
-rect 184865 677761 260437 677818
-rect 184865 673124 216750 677761
-rect 31160 677786 260437 677902
-rect 31160 677668 101968 677786
-rect 46493 673232 101968 677668
-rect 117567 677761 260437 677786
-rect 117567 673232 216750 677761
-rect 46493 673154 216750 673232
-rect 31160 673124 216750 673154
-rect 232071 673124 260437 677761
-rect 184865 673110 260437 673124
-rect 145430 673047 260437 673110
-rect 31160 673035 260437 673047
-rect 31160 673035 260437 67312
-rect 31160 673035 260437 673124
+rect 184865 673110 216578 677818
+rect 145430 673047 216578 673110
+rect 31160 673035 216578 673047
+rect 232215 673035 260437 677841
rect 274962 677887 467817 677902
rect 274962 673047 452327 677887
rect 467023 673047 467817 677887
@@ -1739,16 +1682,29 @@
rect 373474 669227 374826 669228
rect 309393 668158 311895 668159
rect 371787 668158 373139 668159
+rect 190376 667305 192875 667306
+rect 190376 664796 190377 667305
+rect 192874 667299 192875 667305
+rect 192874 664799 235517 667299
rect 309393 665658 309394 668158
rect 311894 665658 371788 668158
rect 373138 665658 373148 668158
rect 309393 665657 311895 665658
rect 371787 665657 373139 665658
-rect 305177 664670 307679 664671
-rect 369972 664670 371324 664671
+rect 192874 664796 192875 664799
+rect 190376 664795 192875 664796
rect 23041 660101 23042 661270
rect 64017 660101 64018 661270
rect 83764 660179 83765 661488
+rect 83764 660178 124072 660179
+rect 23041 660100 64018 660101
+rect 157082 659472 157083 660503
+rect 197702 660502 197709 660503
+rect 197708 659472 197709 660502
+rect 157082 659471 197709 659472
+rect 233017 635570 235517 664799
+rect 305177 664670 307679 664671
+rect 369972 664670 371324 664671
rect 305177 662170 305178 664670
rect 307678 662170 369973 664670
rect 371323 662170 371333 664670
@@ -1756,12 +1712,6 @@
rect 369972 662169 371324 662170
rect 301224 661655 303726 661656
rect 368198 661655 369550 661656
-rect 83764 660178 124072 660179
-rect 23041 660100 64018 660101
-rect 157082 659472 157083 660503
-rect 197702 660502 197709 660503
-rect 197708 659472 197709 660502
-rect 157082 659471 197709 659472
rect 301224 659155 301225 661655
rect 303725 659155 368199 661655
rect 369549 659155 369559 661655
@@ -1794,15 +1744,12 @@
rect 347635 637147 348087 637148
rect 335766 636697 347636 637147
rect 348086 636697 348087 637147
-rect 171982 635570 174484 635571
rect 335766 635570 338266 636697
rect 347635 636696 348087 636697
rect 383342 635788 383892 637319
rect 376970 635579 383892 635788
-rect 171973 633070 171983 635570
-rect 174483 633070 338266 635570
+rect 233017 633070 338266 635570
rect 376994 633304 383892 633513
-rect 171982 633069 174484 633070
rect 352335 630282 352605 632949
rect 352235 630281 352703 630282
rect 352235 630044 352236 630281
@@ -1841,13 +1788,13 @@
rect 156499 624128 206837 624129
rect 156499 624087 156500 624128
rect 206836 620708 206837 624128
+rect 275302 624644 345528 625028
+rect 275302 617580 311280 624644
+rect 345358 623908 345528 624644
+rect 345358 621915 380146 623908
+rect 345358 617580 345528 621915
+rect 275302 617272 345528 617580
rect 2575 611839 212044 611907
-rect 275302 623908 345528 625028
-rect 275302 621915 344840 623908
-rect 345283 621915 380146 623908
-rect 275302 617272 345528 621915
-rect 2575 611840 139145 611907
-rect 2575 611839 139771 611840
rect 2575 611726 137755 611839
rect 2575 607093 2646 611726
rect 5007 607168 137755 611726
@@ -1859,16 +1806,12 @@
rect 5007 607160 212246 607161
rect 5007 607093 212044 607160
rect 2575 607040 212044 607093
-rect 139770 607168 139771 611839
-rect 5007 607167 139771 607168
-rect 5007 607093 139145 607167
-rect 2575 607040 139145 607093
rect 30038 599282 561785 599316
rect 30038 583701 30180 599282
-rect 46130 599215 561785 599282
-rect 46130 599210 195444 599215
+rect 46130 599210 561785 599282
rect 46130 599176 147711 599210
-rect 151098 599176 195444 599210
+rect 151098 599184 561785 599210
+rect 151098 599176 381126 599184
rect 46130 599172 124862 599176
rect 46130 599145 51929 599172
rect 67434 599127 124862 599172
@@ -1880,18 +1823,17 @@
rect 79747 583498 100668 598859
rect 30038 583445 100668 583498
rect 116512 583547 124862 598859
-rect 154759 598949 195444 599176
+rect 154759 599126 381126 599176
+rect 154759 599018 289653 599126
+rect 154759 598949 195851 599018
rect 154759 583674 172469 598949
-rect 187791 583674 195444 598949
-rect 154759 583586 195444 583674
-rect 225341 599184 561785 599215
-rect 225341 599126 381126 599184
-rect 225341 583586 289653 599126
-rect 154759 583547 216750 583586
+rect 187791 583729 195851 598949
+rect 227970 583729 289653 599018
+rect 187791 583674 289653 583729
+rect 154759 583547 289653 583674
rect 116512 583507 147711 583547
-rect 151098 583507 216750 583547
-rect 116512 583462 216750 583507
-rect 220863 583497 289653 583586
+rect 151098 583507 289653 583547
+rect 116512 583497 289653 583507
rect 319550 598747 381126 599126
rect 319550 583865 338602 598747
rect 353942 583865 381126 598747
@@ -1901,79 +1843,50 @@
rect 319550 583536 487932 583555
rect 525630 598800 561785 599165
rect 525630 584066 546176 598800
-rect 46130 599011 561785 599282
-rect 46130 598859 510429 599011
-rect 46130 583701 100668 598859
-rect 30038 583445 100668 583701
-rect 116512 598747 510429 598859
-rect 116512 583865 338602 598747
-rect 353942 583865 510429 598747
-rect 116512 583750 510429 583865
-rect 525629 598800 561785 599011
-rect 525629 584066 546176 598800
rect 561217 584066 561785 598800
rect 525630 583536 561785 584066
rect 319550 583497 561785 583536
-rect 220863 583462 561785 583497
-rect 116512 583445 561785 583462
-rect 525629 583750 561785 584066
-rect 116512 583445 561785 583750
+rect 116512 583445 561785 583497
rect 20619 555772 584769 555900
rect 32921 555640 584769 555772
-rect 32921 555437 259862 555640
-rect 32921 555414 199487 555437
+rect 32921 555464 259862 555640
+rect 32921 555414 199695 555464
rect 32921 540298 40996 555414
-rect 70830 555351 199487 555414
+rect 70830 555351 199695 555414
rect 70830 540407 128975 555351
-rect 159252 540493 199487 555351
-rect 229764 540493 259862 555437
-rect 159252 540435 259862 540493
-rect 32921 555641 584769 555772
-rect 32921 540306 216832 555641
-rect 232047 555640 584769 555641
-rect 232047 540435 259862 555640
+rect 159252 540409 199695 555351
+rect 229967 540435 259862 555464
rect 275226 555601 584769 555640
rect 275226 555588 452164 555601
rect 275226 555313 385148 555588
rect 275226 540435 293791 555313
-rect 159252 540407 293791 540435
+rect 229967 540409 293791 540435
+rect 159252 540407 293791 540409
rect 70830 540369 293791 540407
rect 324068 540644 385148 555313
rect 415425 540644 452164 555588
rect 324068 540369 452164 540644
rect 70830 540298 452164 540369
rect 32921 540202 452164 540298
-rect 275226 540435 452164 555601
-rect 232047 540306 452164 540435
-rect 32921 540202 452164 540306
rect 20619 540149 452164 540202
rect 467493 555349 584769 555601
rect 467493 540466 491313 555349
rect 521955 555256 584769 555349
rect 521955 554118 582403 555256
-rect 467493 555256 584769 555601
-rect 467493 554118 582403 555256
rect 584710 554119 584769 555256
rect 584710 554118 584801 554119
rect 521955 551658 582340 554118
-rect 467493 551658 582340 554118
rect 584800 551658 584801 554118
rect 521955 550629 582403 551658
-rect 467493 550629 582403 551658
rect 584710 551657 584801 551658
rect 584710 550629 584769 551657
rect 521955 549950 584769 550629
rect 521955 546246 582340 549950
rect 521955 545159 585071 546246
rect 521955 540677 582466 545159
-rect 467493 549950 584769 550629
-rect 467493 546246 582340 549950
-rect 467493 545159 585071 546246
-rect 467493 540677 582466 545159
rect 584684 540677 585071 545159
rect 521955 540466 585071 540677
rect 467493 540149 585071 540466
-rect 467493 540149 585071 540677
rect 20619 540029 585071 540149
rect 102586 432559 557291 432965
rect 102586 432558 338894 432559
@@ -2008,7 +1921,6 @@
rect 563330 224854 583937 224949
rect 100326 151702 584154 151892
rect 100326 151653 545482 151702
-rect 100326 151653 584154 151892
rect 100326 151638 338641 151653
rect 100326 136586 100582 151638
rect 116556 136586 338641 151638
@@ -2017,8 +1929,6 @@
rect 561448 151577 584154 151702
rect 561448 136619 578907 151577
rect 354383 136610 578907 136619
-rect 354383 151577 584154 151653
-rect 354383 136610 578907 151577
rect 583774 136610 584154 151577
rect 354383 136461 584154 136610
rect 100326 136443 584154 136461
@@ -2039,7 +1949,7 @@
rect 101968 673232 117567 677786
rect 142936 673047 145430 677876
rect 171320 673110 184865 677818
-rect 216750 673124 232071 677761
+rect 216578 672994 232215 677841
rect 260437 671893 274962 678175
rect 452327 673047 467023 677887
rect 23042 661269 64017 661882
@@ -2069,6 +1979,9 @@
rect 156376 620709 156500 624087
rect 156500 620709 206836 624087
rect 156376 619144 206836 620709
+rect 259670 617074 275302 625270
+rect 311280 617580 345358 624644
+rect 380146 621915 380589 623908
rect 30180 599145 46130 599282
rect 147711 599176 151098 599210
rect 51929 599145 67434 599172
@@ -2076,27 +1989,20 @@
rect 41447 583668 67434 583701
rect 41447 583663 67237 583668
rect 77083 583498 79747 599127
-rect 259670 617074 275302 625270
-rect 344840 621915 345283 623908
-rect 380146 621915 380589 623908
-rect 30180 583701 46130 599282
rect 100668 583221 116512 598859
rect 124862 583547 154759 599176
rect 172469 583674 187791 598949
-rect 195444 583586 225341 599215
+rect 195851 583729 227970 599018
rect 147711 583507 151098 583547
-rect 216750 583462 220863 583586
rect 289653 583497 319550 599126
rect 338602 583865 353942 598747
rect 381126 583555 411023 599184
rect 487932 583536 525630 599165
-rect 510429 583750 525629 599011
rect 546176 584066 561217 598800
rect 17921 540202 32921 555772
rect 40996 540298 70830 555414
rect 128975 540407 159252 555351
-rect 199487 540493 229764 555437
-rect 216832 540306 232047 555641
+rect 199695 540409 229967 555464
rect 259862 540435 275226 555640
rect 293791 540369 324068 555313
rect 385148 540644 415425 555588
@@ -2153,7 +2059,6 @@
rect 72119 673096 72143 677857
rect 75277 677536 75301 677857
rect 142912 677876 145454 677900
-rect 216581 677882 232247 683193
rect 101944 677786 117591 677810
rect 75277 673096 75313 677536
rect 101944 677524 101968 677786
@@ -2168,39 +2073,27 @@
rect 14313 617977 64306 618001
rect 30017 599282 46173 617977
rect 72165 615148 75313 673072
-rect 30960 661906 46833 673154
rect 101864 673232 101968 677524
rect 117567 677524 117591 677786
rect 142912 677705 142936 677876
-rect 216581 677761 232247 683193
rect 117567 673232 117672 677524
rect 77216 613098 79845 671573
rect 101864 662858 117672 673232
rect 142885 673047 142936 677705
rect 145430 677705 145454 677876
+rect 216581 677865 232247 683193
rect 171296 677818 184889 677842
rect 145430 673047 145500 677705
rect 171296 677636 171320 677818
-rect 216581 673124 216750 677761
-rect 232071 673124 232247 677761
rect 83741 662834 124109 662858
-rect 23018 661882 64041 661906
-rect 23018 660101 23042 661882
-rect 64017 660101 64041 661882
rect 83741 660179 83765 662834
rect 124085 660179 124109 662834
rect 83741 660155 124109 660179
-rect 23018 660077 64041 660101
rect 83025 624733 133434 624757
rect 83025 624707 83049 624733
rect 82949 624683 83049 624707
rect 133410 624707 133434 624733
rect 133410 624683 133512 624707
-rect 14313 624437 64306 624461
-rect 14313 618001 14337 624437
-rect 64282 618001 64306 624437
-rect 14313 617977 64306 618001
-rect 30017 599282 46173 617977
rect 82949 617893 82973 624683
rect 133488 617893 133512 624683
rect 82949 617869 133512 617893
@@ -2229,19 +2122,14 @@
rect 77058 583524 77083 599127
rect 77059 583498 77083 583524
rect 79747 583612 79845 599127
-rect 46130 586019 46173 599282
+rect 100463 598859 116619 617869
rect 142885 615246 145500 673047
rect 171295 673110 171320 677636
rect 184865 673110 184889 677818
rect 171295 673086 184889 673110
-rect 216576 677761 232247 677882
-rect 216576 673124 216750 677761
-rect 232071 673124 232247 677761
+rect 216554 677841 232247 677865
rect 79747 583498 79771 583612
rect 77059 583474 79771 583498
-rect 100463 598859 116619 617869
-rect 46130 583701 46154 586019
-rect 30156 583677 46154 583701
rect 100463 583221 100668 598859
rect 116512 583221 116619 598859
rect 59313 580076 59633 581098
@@ -2271,12 +2159,14 @@
rect 32695 225102 33235 240605
rect 17569 224794 33235 225102
rect 100463 432558 116619 583221
-rect 216581 555641 232247 673124
rect 124759 599200 126962 599322
rect 147647 599210 151189 672301
rect 171295 661444 184887 673086
-rect 216576 673052 232247 673124
+rect 216554 672994 216578 677841
+rect 232215 673051 232247 677841
rect 259666 678175 275332 678276
+rect 232215 672994 232239 673051
+rect 216554 672970 232239 672994
rect 157059 661420 197726 661444
rect 157059 659472 157083 661420
rect 197702 659472 197726 661420
@@ -2294,199 +2184,10 @@
rect 124759 583547 124862 599176
rect 154759 583547 154813 599176
rect 172171 598949 188327 619120
-rect 172171 583913 172469 598949
-rect 172445 583674 172469 583913
-rect 187791 583913 188327 598949
-rect 195244 599239 197447 599322
-rect 216590 599239 221090 670681
-rect 222642 614688 226272 673052
+rect 218723 615607 222084 672970
rect 259666 671893 260437 678175
rect 274962 671893 275332 678175
-rect 195244 599215 225365 599239
-rect 187791 583674 187815 583913
-rect 172445 583650 187815 583674
-rect 124759 583523 147711 583547
-rect 124759 560338 126962 583523
-rect 133661 579201 133981 583523
-rect 140605 579201 140925 583523
-rect 147549 583507 147711 583523
-rect 151098 583523 154813 583547
-rect 151098 583507 151122 583523
-rect 147549 583483 151122 583507
-rect 147549 578864 147869 583483
-rect 154493 579201 154813 583523
-rect 195244 583586 195444 599215
-rect 225341 583586 225365 599215
-rect 195244 583562 216750 583586
-rect 195244 579563 197447 583562
-rect 195244 579361 197522 579563
-rect 128823 555375 131710 577101
-rect 135608 555375 138495 576885
-rect 143114 555375 146001 576957
-rect 149754 555375 152641 577029
-rect 156683 555375 159570 576740
-rect 195244 573243 197447 579361
-rect 197480 573243 197522 579361
-rect 204146 579361 204466 583562
-rect 197842 579262 203810 579286
-rect 197842 573342 197866 579262
-rect 199308 573342 202195 577261
-rect 203786 573342 203810 579262
-rect 197842 573318 203810 573342
-rect 195244 572839 197522 573243
-rect 195244 566721 197447 572839
-rect 197480 566721 197522 572839
-rect 199308 572764 202195 573318
-rect 204146 573243 204188 579361
-rect 204424 573243 204466 579361
-rect 211090 579361 211410 583562
-rect 216726 583462 216750 583562
-rect 220863 583562 225365 583586
-rect 220863 583462 220887 583562
-rect 216726 583438 220887 583462
-rect 204786 579262 210754 579286
-rect 204786 573342 204810 579262
-rect 206093 573342 208980 577045
-rect 210730 573342 210754 579262
-rect 204786 573318 210754 573342
-rect 204146 572839 204466 573243
-rect 197842 572740 203810 572764
-rect 197842 566820 197866 572740
-rect 199308 566820 202195 572740
-rect 203786 566820 203810 572740
-rect 197842 566796 203810 566820
-rect 195244 566317 197522 566721
-rect 195244 560498 197447 566317
-rect 197202 560199 197244 560498
-rect 197480 560199 197522 566317
-rect 199308 566242 202195 566796
-rect 204146 566721 204188 572839
-rect 204424 566721 204466 572839
-rect 206093 572764 208980 573318
-rect 211090 573243 211132 579361
-rect 211368 573243 211410 579361
-rect 218034 579361 218354 583438
-rect 211730 579262 217698 579286
-rect 211730 573342 211754 579262
-rect 213599 573342 216486 577117
-rect 217674 573342 217698 579262
-rect 211730 573318 217698 573342
-rect 211090 572839 211410 573243
-rect 204786 572740 210754 572764
-rect 204786 566820 204810 572740
-rect 206093 566820 208980 572740
-rect 210730 566820 210754 572740
-rect 204786 566796 210754 566820
-rect 204146 566317 204466 566721
-rect 197842 566218 203810 566242
-rect 197842 560298 197866 566218
-rect 199308 560298 202195 566218
-rect 203786 560298 203810 566218
-rect 197842 560274 203810 560298
-rect 197202 559997 197522 560199
-rect 128823 555351 159570 555375
-rect 128823 540407 128975 555351
-rect 159252 540407 159570 555351
-rect 128823 540383 159570 540407
-rect 128823 540159 131710 540383
-rect 135608 540308 138495 540383
-rect 149754 540308 152641 540383
-rect 156683 540308 159570 540383
-rect 199308 555461 202195 560274
-rect 204146 560199 204188 566317
-rect 204424 560199 204466 566317
-rect 206093 566242 208980 566796
-rect 211090 566721 211132 572839
-rect 211368 566721 211410 572839
-rect 213599 572764 216486 573318
-rect 218034 573243 218076 579361
-rect 218312 573243 218354 579361
-rect 224978 579361 225298 583562
-rect 218674 579262 224642 579286
-rect 218674 573342 218698 579262
-rect 220239 573342 223126 577189
-rect 224618 573342 224642 579262
-rect 218674 573318 224642 573342
-rect 218034 572839 218354 573243
-rect 211730 572740 217698 572764
-rect 211730 566820 211754 572740
-rect 213599 566820 216486 572740
-rect 217674 566820 217698 572740
-rect 211730 566796 217698 566820
-rect 211090 566317 211410 566721
-rect 204786 566218 210754 566242
-rect 204786 560298 204810 566218
-rect 206093 560298 208980 566218
-rect 210730 560298 210754 566218
-rect 204786 560274 210754 560298
-rect 204146 559997 204466 560199
-rect 206093 555461 208980 560274
-rect 211090 560199 211132 566317
-rect 211368 560199 211410 566317
-rect 213599 566242 216486 566796
-rect 218034 566721 218076 572839
-rect 218312 566721 218354 572839
-rect 220239 572764 223126 573318
-rect 224978 573243 225020 579361
-rect 225256 573243 225298 579361
-rect 225618 579262 231586 579286
-rect 225618 573342 225642 579262
-rect 227168 573342 230055 576900
-rect 231562 573342 231586 579262
-rect 225618 573318 231586 573342
-rect 224978 572839 225298 573243
-rect 218674 572740 224642 572764
-rect 218674 566820 218698 572740
-rect 220239 566820 223126 572740
-rect 224618 566820 224642 572740
-rect 218674 566796 224642 566820
-rect 218034 566317 218354 566721
-rect 211730 566218 217698 566242
-rect 211730 560298 211754 566218
-rect 213599 560298 216486 566218
-rect 217674 560298 217698 566218
-rect 211730 560274 217698 560298
-rect 211090 559997 211410 560199
-rect 213599 555461 216486 560274
-rect 218034 560199 218076 566317
-rect 218312 560199 218354 566317
-rect 220239 566242 223126 566796
-rect 224978 566721 225020 572839
-rect 225256 566721 225298 572839
-rect 227168 572764 230055 573318
-rect 225618 572740 231586 572764
-rect 225618 566820 225642 572740
-rect 227168 566820 230055 572740
-rect 231562 566820 231586 572740
-rect 225618 566796 231586 566820
-rect 224978 566317 225298 566721
-rect 218674 566218 224642 566242
-rect 218674 560298 218698 566218
-rect 220239 560298 223126 566218
-rect 224618 560298 224642 566218
-rect 218674 560274 224642 560298
-rect 218034 559997 218354 560199
-rect 220239 555461 223126 560274
-rect 224978 560199 225020 566317
-rect 225256 560199 225298 566317
-rect 227168 566242 230055 566796
-rect 225618 566218 231586 566242
-rect 225618 560298 225642 566218
-rect 227168 560298 230055 566218
-rect 231562 560298 231586 566218
-rect 225618 560274 231586 560298
-rect 224978 559997 225298 560199
-rect 227168 555461 230055 560274
-rect 199308 555437 230055 555461
-rect 199308 540493 199487 555437
-rect 229764 540493 230055 555437
-rect 199308 540469 230055 540493
-rect 199308 540159 202195 540469
-rect 206093 540308 208980 540469
-rect 213599 540159 216486 540469
-rect 220239 540308 223126 540469
-rect 227168 540308 230055 540469
-rect 259666 555640 275332 671893
+rect 223844 599042 227386 658283
rect 259666 625294 275332 671893
rect 352750 647598 355250 687718
rect 441224 684427 443724 693921
@@ -2516,7 +2217,7 @@
rect 259646 625270 275332 625294
rect 259646 617074 259670 625270
rect 275302 617074 275332 625270
-rect 344840 623932 345283 631382
+rect 344840 624668 345283 631382
rect 346785 627046 347228 631405
rect 360291 628672 360633 637262
rect 361009 637228 361033 637566
@@ -2542,34 +2243,163 @@
rect 360240 628322 360686 628346
rect 378201 627046 378644 630294
rect 346785 625053 378644 627046
-rect 344816 623908 345307 623932
-rect 344816 621915 344840 623908
-rect 345283 621915 345307 623908
-rect 344816 621891 345307 621915
+rect 311256 624644 345382 624668
+rect 311256 617580 311280 624644
+rect 345358 617580 345382 624644
+rect 311256 617556 345382 617580
rect 259646 617050 275332 617074
-rect 216581 540306 216832 555641
-rect 232047 540306 232247 555641
-rect 216581 540080 232247 540306
+rect 195827 599018 227994 599042
+rect 195827 598960 195851 599018
+rect 172171 583913 172469 598949
+rect 172445 583674 172469 583913
+rect 187791 583913 188327 598949
+rect 187791 583674 187815 583913
+rect 172445 583650 187815 583674
+rect 195244 583729 195851 598960
+rect 227970 583729 227994 599018
+rect 195244 583705 227994 583729
+rect 124759 583523 147711 583547
+rect 124759 560338 126962 583523
+rect 133661 579201 133981 583523
+rect 140605 579201 140925 583523
+rect 147549 583507 147711 583523
+rect 151098 583523 154813 583547
+rect 151098 583507 151122 583523
+rect 147549 583483 151122 583507
+rect 147549 578864 147869 583483
+rect 154493 579201 154813 583523
+rect 195244 579563 197447 583705
+rect 195244 579361 197522 579563
+rect 128823 555375 131710 577101
+rect 135608 555375 138495 576885
+rect 143114 555375 146001 576957
+rect 149754 555375 152641 577029
+rect 156683 555375 159570 576740
+rect 195244 573243 197447 579361
+rect 197480 573243 197522 579361
+rect 204146 579361 204466 583705
+rect 197842 579262 203810 579286
+rect 197842 573342 197866 579262
+rect 199308 573342 202195 577261
+rect 203786 573342 203810 579262
+rect 197842 573318 203810 573342
+rect 195244 572839 197522 573243
+rect 195244 566721 197447 572839
+rect 197480 566721 197522 572839
+rect 199308 572764 202195 573318
+rect 204146 573243 204188 579361
+rect 204424 573243 204466 579361
+rect 211090 579361 211410 583705
+rect 204786 579262 210754 579286
+rect 204786 573342 204810 579262
+rect 206093 573342 208980 577045
+rect 210730 573342 210754 579262
+rect 204786 573318 210754 573342
+rect 204146 572839 204466 573243
+rect 197842 572740 203810 572764
+rect 197842 566820 197866 572740
+rect 199308 566820 202195 572740
+rect 203786 566820 203810 572740
+rect 197842 566796 203810 566820
+rect 195244 566317 197522 566721
+rect 195244 560199 197447 566317
+rect 197480 560199 197522 566317
+rect 199308 566242 202195 566796
+rect 204146 566721 204188 572839
+rect 204424 566721 204466 572839
+rect 206093 572764 208980 573318
+rect 211090 573243 211132 579361
+rect 211368 573243 211410 579361
+rect 211730 579262 216581 579286
+rect 211730 573342 211754 579262
+rect 218034 579243 218354 583705
+rect 224978 579243 225298 583705
+rect 213599 573342 216486 577117
+rect 211730 573318 216581 573342
+rect 211090 572839 211410 573243
+rect 204786 572740 210754 572764
+rect 204786 566820 204810 572740
+rect 206093 566820 208980 572740
+rect 210730 566820 210754 572740
+rect 204786 566796 210754 566820
+rect 204146 566317 204466 566721
+rect 197842 566218 203810 566242
+rect 197842 560298 197866 566218
+rect 199308 560298 202195 566218
+rect 203786 560298 203810 566218
+rect 197842 560274 203810 560298
+rect 195244 560051 197522 560199
+rect 197202 559997 197522 560051
+rect 128823 555351 159570 555375
+rect 128823 540407 128975 555351
+rect 159252 540407 159570 555351
+rect 199308 555488 202195 560274
+rect 204146 560199 204188 566317
+rect 204424 560199 204466 566317
+rect 206093 566242 208980 566796
+rect 211090 566721 211132 572839
+rect 211368 566721 211410 572839
+rect 213599 572764 216486 573318
+rect 211730 572740 216581 572764
+rect 211730 566820 211754 572740
+rect 213599 566820 216486 572740
+rect 211730 566796 216581 566820
+rect 211090 566317 211410 566721
+rect 204786 566218 210754 566242
+rect 204786 560298 204810 566218
+rect 206093 560298 208980 566218
+rect 210730 560298 210754 566218
+rect 204786 560274 210754 560298
+rect 204146 559997 204466 560199
+rect 206093 555488 208980 560274
+rect 211090 560199 211132 566317
+rect 211368 560199 211410 566317
+rect 213599 566242 216486 566796
+rect 211730 566218 216581 566242
+rect 211730 560298 211754 566218
+rect 213599 560298 216486 566218
+rect 211730 560274 216581 560298
+rect 211090 559997 211410 560199
+rect 213599 555488 216486 560274
+rect 220132 555488 223019 578371
+rect 227397 555488 230284 578371
+rect 199308 555464 230284 555488
+rect 199308 540415 199695 555464
+rect 128823 540383 159570 540407
+rect 199671 540409 199695 540415
+rect 229967 540415 230284 555464
rect 259666 555640 275332 617050
-rect 346785 598771 354541 625053
+rect 312320 604344 315940 617556
+rect 319399 604291 323019 617556
+rect 326025 604364 329645 617556
+rect 333307 604619 336927 617556
+rect 340152 604546 343772 617556
+rect 346785 615384 354541 625053
rect 380146 623932 380589 631171
rect 380122 623908 380613 623932
rect 380122 621915 380146 623908
rect 380589 621915 380613 623908
rect 380122 621891 380613 621915
-rect 338578 598747 354541 598771
-rect 381102 599184 411047 599208
+rect 345371 602316 354541 615384
+rect 317349 600961 317669 602316
+rect 324293 600961 324613 602316
+rect 331237 600961 331557 602316
+rect 338181 600961 338501 602316
+rect 345125 600961 354541 602316
+rect 317349 600926 354541 600961
rect 289452 599150 291655 599152
-rect 289452 599126 319574 599150
+rect 317078 599150 354541 600926
+rect 289452 599126 354541 599150
rect 289452 583497 289653 599126
-rect 319550 583497 319574 599126
-rect 338578 598747 353966 598771
-rect 338578 597776 338602 598747
+rect 319550 598747 354541 599126
+rect 319550 598383 338602 598747
+rect 319550 583497 319574 598383
+rect 338578 597776 338602 598383
rect 289452 583473 319574 583497
rect 338385 583865 338602 597776
-rect 353942 597776 353966 598747
+rect 353942 583865 354541 598747
+rect 381102 599184 411047 599208
rect 381102 598681 381126 599184
-rect 353942 583865 354541 597776
rect 289452 579107 291655 583473
rect 289452 578905 291730 579107
rect 289452 572787 291655 578905
@@ -2629,6 +2459,12 @@
rect 291410 559541 291730 559743
rect 259666 540435 259862 555640
rect 275226 540435 275332 555640
+rect 229967 540409 229991 540415
+rect 199671 540385 229991 540409
+rect 128823 540159 131710 540383
+rect 135608 540308 138495 540383
+rect 149754 540308 152641 540383
+rect 156683 540308 159570 540383
rect 100463 417422 101051 432558
rect 116402 417422 116619 432558
rect 100463 151638 116619 417422
@@ -2731,8 +2567,6 @@
rect 259666 225941 259755 240427
rect 259731 225260 259755 225941
rect 275011 225941 275332 240427
-rect 338385 583865 338602 597776
-rect 353942 583865 354541 598747
rect 338385 432559 354541 583865
rect 380930 583555 381126 598681
rect 411023 583555 411047 599184
@@ -2963,18 +2797,6 @@
rect 100463 136586 100582 151638
rect 116556 136586 116619 151638
rect 338385 151653 354541 417742
-rect 451976 555601 467642 673047
-rect 510173 599011 525839 697694
-rect 510173 584602 510429 599011
-rect 510405 583750 510429 584602
-rect 525629 584602 525839 599011
-rect 546152 598800 561241 598824
-rect 546152 598734 546176 598800
-rect 525629 583750 525653 584602
-rect 510405 583726 525653 583750
-rect 545384 584066 546176 598734
-rect 561217 598734 561241 598800
-rect 561217 584066 561540 598734
rect 451976 540149 452164 555601
rect 467493 540149 467642 555601
rect 491490 555373 494377 560729
@@ -3083,7 +2905,6 @@
rect 100463 136311 116619 136586
rect 338617 136461 338641 136722
rect 354383 136722 354541 151653
-rect 545384 137728 561540 417276
rect 545384 151702 561540 417276
rect 545384 137728 545482 151702
rect 354383 136461 354407 136722
@@ -3097,71 +2918,76 @@
rect -100 0 0 704000
rect 584000 0 584100 704000
rect -100 -100 584100 0
-use res_amp_top res_amp_top_0 ~/caravel_analog_fulgor/mag/afernandez_residue_amplifier
-timestamp 1624371743
-transform 1 0 349695 0 1 630386
-box -5005 -972 31038 12726
-use sky130_fd_pr__cap_mim_m3_2_2Y8F6P sky130_fd_pr__cap_mim_m3_2_2Y8F6P_0
-array 0 0 6724 0 8 6522
-timestamp 1624129585
-transform 1 0 74005 0 1 616157
-box -3351 -3261 3373 3261
use mimcap_decoup_1x5 mimcap_decoup_1x5_0
array 0 0 34500 0 2 6522
timestamp 1624376995
transform 1 0 38481 0 1 560871
box 0 -159 34500 6363
+use top_pll_v1 top_pll_v1_0
+timestamp 1624395098
+transform 1 0 14782 0 1 657248
+box -642 -33679 50180 2860
+use sky130_fd_pr__cap_mim_m3_2_2Y8F6P sky130_fd_pr__cap_mim_m3_2_2Y8F6P_0
+array 0 0 6724 0 8 6522
+timestamp 1624129585
+transform 1 0 74005 0 1 616157
+box -3351 -3261 3373 3261
+use top_pll_v2 *top_pll_v2_0
+timestamp 1624395098
+transform -1 0 133068 0 1 657248
+box -642 -33679 50180 2860
use mimcap_decoup_1x5 mimcap_decoup_1x5_1
array 0 0 34500 0 2 6522
timestamp 1624376995
transform 1 0 126717 0 1 559996
box 0 -159 34500 6363
-use mimcap_decoup_1x5 mimcap_decoup_1x5_2
-array 0 0 34500 0 2 6522
-timestamp 1624376995
-transform 1 0 197202 0 1 560156
-box 0 -159 34500 6363
use sky130_fd_pr__cap_mim_m3_2_2Y8F6P sky130_fd_pr__cap_mim_m3_2_2Y8F6P_1
array 0 0 6724 0 8 6522
timestamp 1624129585
transform 1 0 144463 0 1 616442
box -3351 -3261 3373 3261
+use top_pll_v1 *top_pll_v1_1
+timestamp 1624395098
+transform -1 0 206380 0 1 656706
+box -642 -33679 50180 2860
use sky130_fd_pr__cap_mim_m3_2_2Y8F6P sky130_fd_pr__cap_mim_m3_2_2Y8F6P_2
-array 0 0 6724 0 8 6522
+array 0 0 6724 0 6 6522
timestamp 1624129585
-transform -1 0 224277 0 1 616942
+transform 1 0 220679 0 1 616773
box -3351 -3261 3373 3261
-use top_pll_v1 top_pll_v1_0
-timestamp 1624049879
-transform 1 0 14782 0 1 657248
-box -642 -33679 50180 2860
-use top_pll_v2 *top_pll_v2_0
-timestamp 1624054096
-transform -1 0 133068 0 1 657248
-box -642 -33679 50180 2860
+use mimcap_decoup_1x5 mimcap_decoup_1x5_2
+array 0 0 34500 0 2 6522
+timestamp 1624376995
+transform 1 0 197202 0 1 560156
+box 0 -159 34500 6363
use bias bias_0
timestamp 1624049879
transform 1 0 202834 0 -1 687483
box -54 -412 44317 2238
-use top_pll_v1 top_pll_v1_1
-timestamp 1624049879
-transform -1 0 206380 0 1 656706
-box -642 -33679 50180 2860
-use mimcap_decoup_1x5 mimcap_decoup_1x5_5
-array 0 0 34500 0 2 6522
+use mimcap_decoup_1x5 mimcap_decoup_1x5_6
+array 0 0 34500 0 1 6522
timestamp 1624376995
-transform 1 0 489384 0 1 560611
-box 0 -159 34500 6363
-use mimcap_decoup_1x5 mimcap_decoup_1x5_4
-array 0 0 34500 0 2 6522
-timestamp 1624376995
-transform 1 0 382888 0 1 560156
+transform -1 0 345445 0 1 602155
box 0 -159 34500 6363
use mimcap_decoup_1x5 mimcap_decoup_1x5_3
array 0 0 34500 0 2 6522
timestamp 1624376995
transform 1 0 291410 0 1 559700
box 0 -159 34500 6363
+use res_amp_top res_amp_top_0 ~/caravel_analog_fulgor/mag/afernandez_residue_amplifier
+timestamp 1624395098
+transform 1 0 349695 0 1 630386
+box -5005 -972 31038 12726
+use mimcap_decoup_1x5 mimcap_decoup_1x5_4
+array 0 0 34500 0 2 6522
+timestamp 1624376995
+transform 1 0 382888 0 1 560156
+box 0 -159 34500 6363
+use mimcap_decoup_1x5 mimcap_decoup_1x5_5
+array 0 0 34500 0 2 6522
+timestamp 1624376995
+transform 1 0 489384 0 1 560611
+box 0 -159 34500 6363
<< labels >>
flabel metal3 s 583520 269230 584800 269342 0 FreeSans 1120 0 0 0 gpio_analog[0]
port 0 nsew signal bidirectional
