Update
diff --git a/def/user_project_wrapper.def b/def/user_project_wrapper.def index 95e3383..bb74fc6 100644 --- a/def/user_project_wrapper.def +++ b/def/user_project_wrapper.def
@@ -2591,7 +2591,7 @@ TRACKS X 1700 DO 859 STEP 3400 LAYER met5 ; TRACKS Y 1700 DO 1035 STEP 3400 LAYER met5 ; -VIAS 8 ; +VIAS 7 ; - via2_FR + RECT met2 ( -140 -185 ) ( 140 185 ) + RECT via2 ( -100 -100 ) ( 100 100 ) @@ -2649,15 +2649,6 @@ + ENCLOSURE 500 300 500 310 + ROWCOL 2 3 ; -- via4_1740x3000 - -+ VIARULE M4M5_PR - + CUTSIZE 800 800 - + LAYERS met4 via4 met5 - + CUTSPACING 800 800 - + ENCLOSURE 470 300 470 310 - + ROWCOL 2 1 - ; END VIAS COMPONENTS 1 ; @@ -5835,34 +5826,10 @@ SPECIALNETS 8 ; - vccd1 ( PIN vccd1 ) + ROUTED met4 0 + SHAPE STRIPE ( 2576450 3255640 ) via4_5000x3000 - NEW met4 0 + SHAPE STRIPE ( 2550175 3255640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 2081655 3255640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1988800 3255640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1520280 3255640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1418045 3255640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 949525 3255640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 877020 3255640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 408500 3255640 ) via4_1740x3000 NEW met4 0 + SHAPE STRIPE ( 363290 3255640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 2576450 3075640 ) via4_5000x3000 - NEW met4 0 + SHAPE STRIPE ( 2550175 3075640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 2081655 3075640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1988800 3075640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1520280 3075640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1418045 3075640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 949525 3075640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 877020 3075640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 408500 3075640 ) via4_1740x3000 NEW met4 0 + SHAPE STRIPE ( 363290 3075640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 2576450 2895640 ) via4_5000x3000 - NEW met4 0 + SHAPE STRIPE ( 2550175 2895640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 2081655 2895640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1988800 2895640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1520280 2895640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1418045 2895640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 949525 2895640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 877020 2895640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 408500 2895640 ) via4_1740x3000 NEW met4 0 + SHAPE STRIPE ( 363290 2895640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 2576450 2715640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 363290 2715640 ) via4_5000x3000 @@ -5885,24 +5852,8 @@ NEW met4 0 + SHAPE STRIPE ( 2576450 1095640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 363290 1095640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 2576450 915640 ) via4_5000x3000 - NEW met4 0 + SHAPE STRIPE ( 2543555 915640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 2075035 915640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1969235 915640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1500715 915640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1406460 915640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 937940 915640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 870405 915640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 401885 915640 ) via4_1740x3000 NEW met4 0 + SHAPE STRIPE ( 363290 915640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 2576450 735640 ) via4_5000x3000 - NEW met4 0 + SHAPE STRIPE ( 2543555 735640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 2075035 735640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1969235 735640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1500715 735640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1406460 735640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 937940 735640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 870405 735640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 401885 735640 ) via4_1740x3000 NEW met4 0 + SHAPE STRIPE ( 363290 735640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 2576450 555640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 363290 555640 ) via4_5000x3000 @@ -18877,24 +18828,8 @@ + ROUTED met4 0 + SHAPE STRIPE ( 2583250 3345640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 356490 3345640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 2583250 3165640 ) via4_5000x3000 - NEW met4 0 + SHAPE STRIPE ( 2553575 3165640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 2078255 3165640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1992200 3165640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1516880 3165640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1421445 3165640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 946125 3165640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 880420 3165640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 405100 3165640 ) via4_1740x3000 NEW met4 0 + SHAPE STRIPE ( 356490 3165640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 2583250 2985640 ) via4_5000x3000 - NEW met4 0 + SHAPE STRIPE ( 2553575 2985640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 2078255 2985640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1992200 2985640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1516880 2985640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1421445 2985640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 946125 2985640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 880420 2985640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 405100 2985640 ) via4_1740x3000 NEW met4 0 + SHAPE STRIPE ( 356490 2985640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 2583250 2805640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 356490 2805640 ) via4_5000x3000 @@ -18919,24 +18854,8 @@ NEW met4 0 + SHAPE STRIPE ( 2583250 1005640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 356490 1005640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 2583250 825640 ) via4_5000x3000 - NEW met4 0 + SHAPE STRIPE ( 2546955 825640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 2071635 825640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1972635 825640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1497315 825640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1409860 825640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 934540 825640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 873805 825640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 398485 825640 ) via4_1740x3000 NEW met4 0 + SHAPE STRIPE ( 356490 825640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 2583250 645640 ) via4_5000x3000 - NEW met4 0 + SHAPE STRIPE ( 2546955 645640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 2071635 645640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1972635 645640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1497315 645640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 1409860 645640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 934540 645640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 873805 645640 ) via4_1740x3000 - NEW met4 0 + SHAPE STRIPE ( 398485 645640 ) via4_1740x3000 NEW met4 0 + SHAPE STRIPE ( 356490 645640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 2583250 465640 ) via4_5000x3000 NEW met4 0 + SHAPE STRIPE ( 356490 465640 ) via4_5000x3000
diff --git a/gds/user_project_wrapper.gds.gz b/gds/user_project_wrapper.gds.gz index 1ef0841..05d1ffd 100644 --- a/gds/user_project_wrapper.gds.gz +++ b/gds/user_project_wrapper.gds.gz Binary files differ
diff --git a/mag/user_project_wrapper.mag b/mag/user_project_wrapper.mag index 1cca60f..4fb2564 100644 --- a/mag/user_project_wrapper.mag +++ b/mag/user_project_wrapper.mag
@@ -1,7 +1,7 @@ magic tech sky130A magscale 1 2 -timestamp 1625247689 +timestamp 1625084089 << locali >> rect 292405 10965 292497 10999 rect 277593 10455 277627 10761 @@ -951866,62 +951866,6 @@ rect 72776 650850 72860 651086 rect 73096 650850 73158 651086 rect 72158 650828 73158 650850 -rect 81526 651406 81874 651428 -rect 81526 651170 81582 651406 -rect 81818 651170 81874 651406 -rect 81526 651086 81874 651170 -rect 81526 650850 81582 651086 -rect 81818 650850 81874 651086 -rect 81526 650828 81874 650850 -rect 175230 651406 175578 651428 -rect 175230 651170 175286 651406 -rect 175522 651170 175578 651406 -rect 175230 651086 175578 651170 -rect 175230 650850 175286 651086 -rect 175522 650850 175578 651086 -rect 175230 650828 175578 650850 -rect 189731 651406 190079 651428 -rect 189731 651170 189787 651406 -rect 190023 651170 190079 651406 -rect 189731 651086 190079 651170 -rect 189731 650850 189787 651086 -rect 190023 650850 190079 651086 -rect 189731 650828 190079 650850 -rect 283435 651406 283783 651428 -rect 283435 651170 283491 651406 -rect 283727 651170 283783 651406 -rect 283435 651086 283783 651170 -rect 283435 650850 283491 651086 -rect 283727 650850 283783 651086 -rect 283435 650828 283783 650850 -rect 303882 651406 304230 651428 -rect 303882 651170 303938 651406 -rect 304174 651170 304230 651406 -rect 303882 651086 304230 651170 -rect 303882 650850 303938 651086 -rect 304174 650850 304230 651086 -rect 303882 650828 304230 650850 -rect 397586 651406 397934 651428 -rect 397586 651170 397642 651406 -rect 397878 651170 397934 651406 -rect 397586 651086 397934 651170 -rect 397586 650850 397642 651086 -rect 397878 650850 397934 651086 -rect 397586 650828 397934 650850 -rect 416157 651406 416505 651428 -rect 416157 651170 416213 651406 -rect 416449 651170 416505 651406 -rect 416157 651086 416505 651170 -rect 416157 650850 416213 651086 -rect 416449 650850 416505 651086 -rect 416157 650828 416505 650850 -rect 509861 651406 510209 651428 -rect 509861 651170 509917 651406 -rect 510153 651170 510209 651406 -rect 509861 651086 510209 651170 -rect 509861 650850 509917 651086 -rect 510153 650850 510209 651086 -rect 509861 650828 510209 650850 rect 514790 651406 515790 651428 rect 514790 651170 514852 651406 rect 515088 651170 515172 651406 @@ -952103,62 +952047,6 @@ rect 71416 632850 71500 633086 rect 71736 632850 71798 633086 rect 70798 632828 71798 632850 -rect 80846 633406 81194 633428 -rect 80846 633170 80902 633406 -rect 81138 633170 81194 633406 -rect 80846 633086 81194 633170 -rect 80846 632850 80902 633086 -rect 81138 632850 81194 633086 -rect 80846 632828 81194 632850 -rect 175910 633406 176258 633428 -rect 175910 633170 175966 633406 -rect 176202 633170 176258 633406 -rect 175910 633086 176258 633170 -rect 175910 632850 175966 633086 -rect 176202 632850 176258 633086 -rect 175910 632828 176258 632850 -rect 189051 633406 189399 633428 -rect 189051 633170 189107 633406 -rect 189343 633170 189399 633406 -rect 189051 633086 189399 633170 -rect 189051 632850 189107 633086 -rect 189343 632850 189399 633086 -rect 189051 632828 189399 632850 -rect 284115 633406 284463 633428 -rect 284115 633170 284171 633406 -rect 284407 633170 284463 633406 -rect 284115 633086 284463 633170 -rect 284115 632850 284171 633086 -rect 284407 632850 284463 633086 -rect 284115 632828 284463 632850 -rect 303202 633406 303550 633428 -rect 303202 633170 303258 633406 -rect 303494 633170 303550 633406 -rect 303202 633086 303550 633170 -rect 303202 632850 303258 633086 -rect 303494 632850 303550 633086 -rect 303202 632828 303550 632850 -rect 398266 633406 398614 633428 -rect 398266 633170 398322 633406 -rect 398558 633170 398614 633406 -rect 398266 633086 398614 633170 -rect 398266 632850 398322 633086 -rect 398558 632850 398614 633086 -rect 398266 632828 398614 632850 -rect 415477 633406 415825 633428 -rect 415477 633170 415533 633406 -rect 415769 633170 415825 633406 -rect 415477 633086 415825 633170 -rect 415477 632850 415533 633086 -rect 415769 632850 415825 633086 -rect 415477 632828 415825 632850 -rect 510541 633406 510889 633428 -rect 510541 633170 510597 633406 -rect 510833 633170 510889 633406 -rect 510541 633086 510889 633170 -rect 510541 632850 510597 633086 -rect 510833 632850 510889 633086 -rect 510541 632828 510889 632850 rect 516150 633406 517150 633428 rect 516150 633170 516212 633406 rect 516448 633170 516532 633406 @@ -952331,62 +952219,6 @@ rect 72776 614850 72860 615086 rect 73096 614850 73158 615086 rect 72158 614828 73158 614850 -rect 81526 615406 81874 615428 -rect 81526 615170 81582 615406 -rect 81818 615170 81874 615406 -rect 81526 615086 81874 615170 -rect 81526 614850 81582 615086 -rect 81818 614850 81874 615086 -rect 81526 614828 81874 614850 -rect 175230 615406 175578 615428 -rect 175230 615170 175286 615406 -rect 175522 615170 175578 615406 -rect 175230 615086 175578 615170 -rect 175230 614850 175286 615086 -rect 175522 614850 175578 615086 -rect 175230 614828 175578 614850 -rect 189731 615406 190079 615428 -rect 189731 615170 189787 615406 -rect 190023 615170 190079 615406 -rect 189731 615086 190079 615170 -rect 189731 614850 189787 615086 -rect 190023 614850 190079 615086 -rect 189731 614828 190079 614850 -rect 283435 615406 283783 615428 -rect 283435 615170 283491 615406 -rect 283727 615170 283783 615406 -rect 283435 615086 283783 615170 -rect 283435 614850 283491 615086 -rect 283727 614850 283783 615086 -rect 283435 614828 283783 614850 -rect 303882 615406 304230 615428 -rect 303882 615170 303938 615406 -rect 304174 615170 304230 615406 -rect 303882 615086 304230 615170 -rect 303882 614850 303938 615086 -rect 304174 614850 304230 615086 -rect 303882 614828 304230 614850 -rect 397586 615406 397934 615428 -rect 397586 615170 397642 615406 -rect 397878 615170 397934 615406 -rect 397586 615086 397934 615170 -rect 397586 614850 397642 615086 -rect 397878 614850 397934 615086 -rect 397586 614828 397934 614850 -rect 416157 615406 416505 615428 -rect 416157 615170 416213 615406 -rect 416449 615170 416505 615406 -rect 416157 615086 416505 615170 -rect 416157 614850 416213 615086 -rect 416449 614850 416505 615086 -rect 416157 614828 416505 614850 -rect 509861 615406 510209 615428 -rect 509861 615170 509917 615406 -rect 510153 615170 510209 615406 -rect 509861 615086 510209 615170 -rect 509861 614850 509917 615086 -rect 510153 614850 510209 615086 -rect 509861 614828 510209 614850 rect 514790 615406 515790 615428 rect 514790 615170 514852 615406 rect 515088 615170 515172 615406 @@ -952568,62 +952400,6 @@ rect 71416 596850 71500 597086 rect 71736 596850 71798 597086 rect 70798 596828 71798 596850 -rect 80846 597406 81194 597428 -rect 80846 597170 80902 597406 -rect 81138 597170 81194 597406 -rect 80846 597086 81194 597170 -rect 80846 596850 80902 597086 -rect 81138 596850 81194 597086 -rect 80846 596828 81194 596850 -rect 175910 597406 176258 597428 -rect 175910 597170 175966 597406 -rect 176202 597170 176258 597406 -rect 175910 597086 176258 597170 -rect 175910 596850 175966 597086 -rect 176202 596850 176258 597086 -rect 175910 596828 176258 596850 -rect 189051 597406 189399 597428 -rect 189051 597170 189107 597406 -rect 189343 597170 189399 597406 -rect 189051 597086 189399 597170 -rect 189051 596850 189107 597086 -rect 189343 596850 189399 597086 -rect 189051 596828 189399 596850 -rect 284115 597406 284463 597428 -rect 284115 597170 284171 597406 -rect 284407 597170 284463 597406 -rect 284115 597086 284463 597170 -rect 284115 596850 284171 597086 -rect 284407 596850 284463 597086 -rect 284115 596828 284463 596850 -rect 303202 597406 303550 597428 -rect 303202 597170 303258 597406 -rect 303494 597170 303550 597406 -rect 303202 597086 303550 597170 -rect 303202 596850 303258 597086 -rect 303494 596850 303550 597086 -rect 303202 596828 303550 596850 -rect 398266 597406 398614 597428 -rect 398266 597170 398322 597406 -rect 398558 597170 398614 597406 -rect 398266 597086 398614 597170 -rect 398266 596850 398322 597086 -rect 398558 596850 398614 597086 -rect 398266 596828 398614 596850 -rect 415477 597406 415825 597428 -rect 415477 597170 415533 597406 -rect 415769 597170 415825 597406 -rect 415477 597086 415825 597170 -rect 415477 596850 415533 597086 -rect 415769 596850 415825 597086 -rect 415477 596828 415825 596850 -rect 510541 597406 510889 597428 -rect 510541 597170 510597 597406 -rect 510833 597170 510889 597406 -rect 510541 597086 510889 597170 -rect 510541 596850 510597 597086 -rect 510833 596850 510889 597086 -rect 510541 596828 510889 596850 rect 516150 597406 517150 597428 rect 516150 597170 516212 597406 rect 516448 597170 516532 597406 @@ -952796,62 +952572,6 @@ rect 72776 578850 72860 579086 rect 73096 578850 73158 579086 rect 72158 578828 73158 578850 -rect 81526 579406 81874 579428 -rect 81526 579170 81582 579406 -rect 81818 579170 81874 579406 -rect 81526 579086 81874 579170 -rect 81526 578850 81582 579086 -rect 81818 578850 81874 579086 -rect 81526 578828 81874 578850 -rect 175230 579406 175578 579428 -rect 175230 579170 175286 579406 -rect 175522 579170 175578 579406 -rect 175230 579086 175578 579170 -rect 175230 578850 175286 579086 -rect 175522 578850 175578 579086 -rect 175230 578828 175578 578850 -rect 189731 579406 190079 579428 -rect 189731 579170 189787 579406 -rect 190023 579170 190079 579406 -rect 189731 579086 190079 579170 -rect 189731 578850 189787 579086 -rect 190023 578850 190079 579086 -rect 189731 578828 190079 578850 -rect 283435 579406 283783 579428 -rect 283435 579170 283491 579406 -rect 283727 579170 283783 579406 -rect 283435 579086 283783 579170 -rect 283435 578850 283491 579086 -rect 283727 578850 283783 579086 -rect 283435 578828 283783 578850 -rect 303882 579406 304230 579428 -rect 303882 579170 303938 579406 -rect 304174 579170 304230 579406 -rect 303882 579086 304230 579170 -rect 303882 578850 303938 579086 -rect 304174 578850 304230 579086 -rect 303882 578828 304230 578850 -rect 397586 579406 397934 579428 -rect 397586 579170 397642 579406 -rect 397878 579170 397934 579406 -rect 397586 579086 397934 579170 -rect 397586 578850 397642 579086 -rect 397878 578850 397934 579086 -rect 397586 578828 397934 578850 -rect 416157 579406 416505 579428 -rect 416157 579170 416213 579406 -rect 416449 579170 416505 579406 -rect 416157 579086 416505 579170 -rect 416157 578850 416213 579086 -rect 416449 578850 416505 579086 -rect 416157 578828 416505 578850 -rect 509861 579406 510209 579428 -rect 509861 579170 509917 579406 -rect 510153 579170 510209 579406 -rect 509861 579086 510209 579170 -rect 509861 578850 509917 579086 -rect 510153 578850 510209 579086 -rect 509861 578828 510209 578850 rect 514790 579406 515790 579428 rect 514790 579170 514852 579406 rect 515088 579170 515172 579406 @@ -956744,62 +956464,6 @@ rect 72776 182850 72860 183086 rect 73096 182850 73158 183086 rect 72158 182828 73158 182850 -rect 80203 183406 80551 183428 -rect 80203 183170 80259 183406 -rect 80495 183170 80551 183406 -rect 80203 183086 80551 183170 -rect 80203 182850 80259 183086 -rect 80495 182850 80551 183086 -rect 80203 182828 80551 182850 -rect 173907 183406 174255 183428 -rect 173907 183170 173963 183406 -rect 174199 183170 174255 183406 -rect 173907 183086 174255 183170 -rect 173907 182850 173963 183086 -rect 174199 182850 174255 183086 -rect 173907 182828 174255 182850 -rect 187414 183406 187762 183428 -rect 187414 183170 187470 183406 -rect 187706 183170 187762 183406 -rect 187414 183086 187762 183170 -rect 187414 182850 187470 183086 -rect 187706 182850 187762 183086 -rect 187414 182828 187762 182850 -rect 281118 183406 281466 183428 -rect 281118 183170 281174 183406 -rect 281410 183170 281466 183406 -rect 281118 183086 281466 183170 -rect 281118 182850 281174 183086 -rect 281410 182850 281466 183086 -rect 281118 182828 281466 182850 -rect 299969 183406 300317 183428 -rect 299969 183170 300025 183406 -rect 300261 183170 300317 183406 -rect 299969 183086 300317 183170 -rect 299969 182850 300025 183086 -rect 300261 182850 300317 183086 -rect 299969 182828 300317 182850 -rect 393673 183406 394021 183428 -rect 393673 183170 393729 183406 -rect 393965 183170 394021 183406 -rect 393673 183086 394021 183170 -rect 393673 182850 393729 183086 -rect 393965 182850 394021 183086 -rect 393673 182828 394021 182850 -rect 414833 183406 415181 183428 -rect 414833 183170 414889 183406 -rect 415125 183170 415181 183406 -rect 414833 183086 415181 183170 -rect 414833 182850 414889 183086 -rect 415125 182850 415181 183086 -rect 414833 182828 415181 182850 -rect 508537 183406 508885 183428 -rect 508537 183170 508593 183406 -rect 508829 183170 508885 183406 -rect 508537 183086 508885 183170 -rect 508537 182850 508593 183086 -rect 508829 182850 508885 183086 -rect 508537 182828 508885 182850 rect 514790 183406 515790 183428 rect 514790 183170 514852 183406 rect 515088 183170 515172 183406 @@ -956981,62 +956645,6 @@ rect 71416 164850 71500 165086 rect 71736 164850 71798 165086 rect 70798 164828 71798 164850 -rect 79523 165406 79871 165428 -rect 79523 165170 79579 165406 -rect 79815 165170 79871 165406 -rect 79523 165086 79871 165170 -rect 79523 164850 79579 165086 -rect 79815 164850 79871 165086 -rect 79523 164828 79871 164850 -rect 174587 165406 174935 165428 -rect 174587 165170 174643 165406 -rect 174879 165170 174935 165406 -rect 174587 165086 174935 165170 -rect 174587 164850 174643 165086 -rect 174879 164850 174935 165086 -rect 174587 164828 174935 164850 -rect 186734 165406 187082 165428 -rect 186734 165170 186790 165406 -rect 187026 165170 187082 165406 -rect 186734 165086 187082 165170 -rect 186734 164850 186790 165086 -rect 187026 164850 187082 165086 -rect 186734 164828 187082 164850 -rect 281798 165406 282146 165428 -rect 281798 165170 281854 165406 -rect 282090 165170 282146 165406 -rect 281798 165086 282146 165170 -rect 281798 164850 281854 165086 -rect 282090 164850 282146 165086 -rect 281798 164828 282146 164850 -rect 299289 165406 299637 165428 -rect 299289 165170 299345 165406 -rect 299581 165170 299637 165406 -rect 299289 165086 299637 165170 -rect 299289 164850 299345 165086 -rect 299581 164850 299637 165086 -rect 299289 164828 299637 164850 -rect 394353 165406 394701 165428 -rect 394353 165170 394409 165406 -rect 394645 165170 394701 165406 -rect 394353 165086 394701 165170 -rect 394353 164850 394409 165086 -rect 394645 164850 394701 165086 -rect 394353 164828 394701 164850 -rect 414153 165406 414501 165428 -rect 414153 165170 414209 165406 -rect 414445 165170 414501 165406 -rect 414153 165086 414501 165170 -rect 414153 164850 414209 165086 -rect 414445 164850 414501 165086 -rect 414153 164828 414501 164850 -rect 509217 165406 509565 165428 -rect 509217 165170 509273 165406 -rect 509509 165170 509565 165406 -rect 509217 165086 509565 165170 -rect 509217 164850 509273 165086 -rect 509509 164850 509565 165086 -rect 509217 164828 509565 164850 rect 516150 165406 517150 165428 rect 516150 165170 516212 165406 rect 516448 165170 516532 165406 @@ -957211,62 +956819,6 @@ rect 72776 146850 72860 147086 rect 73096 146850 73158 147086 rect 72158 146828 73158 146850 -rect 80203 147406 80551 147428 -rect 80203 147170 80259 147406 -rect 80495 147170 80551 147406 -rect 80203 147086 80551 147170 -rect 80203 146850 80259 147086 -rect 80495 146850 80551 147086 -rect 80203 146828 80551 146850 -rect 173907 147406 174255 147428 -rect 173907 147170 173963 147406 -rect 174199 147170 174255 147406 -rect 173907 147086 174255 147170 -rect 173907 146850 173963 147086 -rect 174199 146850 174255 147086 -rect 173907 146828 174255 146850 -rect 187414 147406 187762 147428 -rect 187414 147170 187470 147406 -rect 187706 147170 187762 147406 -rect 187414 147086 187762 147170 -rect 187414 146850 187470 147086 -rect 187706 146850 187762 147086 -rect 187414 146828 187762 146850 -rect 281118 147406 281466 147428 -rect 281118 147170 281174 147406 -rect 281410 147170 281466 147406 -rect 281118 147086 281466 147170 -rect 281118 146850 281174 147086 -rect 281410 146850 281466 147086 -rect 281118 146828 281466 146850 -rect 299969 147406 300317 147428 -rect 299969 147170 300025 147406 -rect 300261 147170 300317 147406 -rect 299969 147086 300317 147170 -rect 299969 146850 300025 147086 -rect 300261 146850 300317 147086 -rect 299969 146828 300317 146850 -rect 393673 147406 394021 147428 -rect 393673 147170 393729 147406 -rect 393965 147170 394021 147406 -rect 393673 147086 394021 147170 -rect 393673 146850 393729 147086 -rect 393965 146850 394021 147086 -rect 393673 146828 394021 146850 -rect 414833 147406 415181 147428 -rect 414833 147170 414889 147406 -rect 415125 147170 415181 147406 -rect 414833 147086 415181 147170 -rect 414833 146850 414889 147086 -rect 415125 146850 415181 147086 -rect 414833 146828 415181 146850 -rect 508537 147406 508885 147428 -rect 508537 147170 508593 147406 -rect 508829 147170 508885 147406 -rect 508537 147086 508885 147170 -rect 508537 146850 508593 147086 -rect 508829 146850 508885 147086 -rect 508537 146828 508885 146850 rect 514790 147406 515790 147428 rect 514790 147170 514852 147406 rect 515088 147170 515172 147406 @@ -957447,62 +956999,6 @@ rect 71416 128850 71500 129086 rect 71736 128850 71798 129086 rect 70798 128828 71798 128850 -rect 79523 129406 79871 129428 -rect 79523 129170 79579 129406 -rect 79815 129170 79871 129406 -rect 79523 129086 79871 129170 -rect 79523 128850 79579 129086 -rect 79815 128850 79871 129086 -rect 79523 128828 79871 128850 -rect 174587 129406 174935 129428 -rect 174587 129170 174643 129406 -rect 174879 129170 174935 129406 -rect 174587 129086 174935 129170 -rect 174587 128850 174643 129086 -rect 174879 128850 174935 129086 -rect 174587 128828 174935 128850 -rect 186734 129406 187082 129428 -rect 186734 129170 186790 129406 -rect 187026 129170 187082 129406 -rect 186734 129086 187082 129170 -rect 186734 128850 186790 129086 -rect 187026 128850 187082 129086 -rect 186734 128828 187082 128850 -rect 281798 129406 282146 129428 -rect 281798 129170 281854 129406 -rect 282090 129170 282146 129406 -rect 281798 129086 282146 129170 -rect 281798 128850 281854 129086 -rect 282090 128850 282146 129086 -rect 281798 128828 282146 128850 -rect 299289 129406 299637 129428 -rect 299289 129170 299345 129406 -rect 299581 129170 299637 129406 -rect 299289 129086 299637 129170 -rect 299289 128850 299345 129086 -rect 299581 128850 299637 129086 -rect 299289 128828 299637 128850 -rect 394353 129406 394701 129428 -rect 394353 129170 394409 129406 -rect 394645 129170 394701 129406 -rect 394353 129086 394701 129170 -rect 394353 128850 394409 129086 -rect 394645 128850 394701 129086 -rect 394353 128828 394701 128850 -rect 414153 129406 414501 129428 -rect 414153 129170 414209 129406 -rect 414445 129170 414501 129406 -rect 414153 129086 414501 129170 -rect 414153 128850 414209 129086 -rect 414445 128850 414501 129086 -rect 414153 128828 414501 128850 -rect 509217 129406 509565 129428 -rect 509217 129170 509273 129406 -rect 509509 129170 509565 129406 -rect 509217 129086 509565 129170 -rect 509217 128850 509273 129086 -rect 509509 128850 509565 129086 -rect 509217 128828 509565 128850 rect 516150 129406 517150 129428 rect 516150 129170 516212 129406 rect 516448 129170 516532 129406 @@ -999975,22 +999471,6 @@ rect 72220 650850 72456 651086 rect 72540 650850 72776 651086 rect 72860 650850 73096 651086 -rect 81582 651170 81818 651406 -rect 81582 650850 81818 651086 -rect 175286 651170 175522 651406 -rect 175286 650850 175522 651086 -rect 189787 651170 190023 651406 -rect 189787 650850 190023 651086 -rect 283491 651170 283727 651406 -rect 283491 650850 283727 651086 -rect 303938 651170 304174 651406 -rect 303938 650850 304174 651086 -rect 397642 651170 397878 651406 -rect 397642 650850 397878 651086 -rect 416213 651170 416449 651406 -rect 416213 650850 416449 651086 -rect 509917 651170 510153 651406 -rect 509917 650850 510153 651086 rect 514852 651170 515088 651406 rect 515172 651170 515408 651406 rect 515492 651170 515728 651406 @@ -1000005,22 +999485,6 @@ rect 70860 632850 71096 633086 rect 71180 632850 71416 633086 rect 71500 632850 71736 633086 -rect 80902 633170 81138 633406 -rect 80902 632850 81138 633086 -rect 175966 633170 176202 633406 -rect 175966 632850 176202 633086 -rect 189107 633170 189343 633406 -rect 189107 632850 189343 633086 -rect 284171 633170 284407 633406 -rect 284171 632850 284407 633086 -rect 303258 633170 303494 633406 -rect 303258 632850 303494 633086 -rect 398322 633170 398558 633406 -rect 398322 632850 398558 633086 -rect 415533 633170 415769 633406 -rect 415533 632850 415769 633086 -rect 510597 633170 510833 633406 -rect 510597 632850 510833 633086 rect 516212 633170 516448 633406 rect 516532 633170 516768 633406 rect 516852 633170 517088 633406 @@ -1000035,22 +999499,6 @@ rect 72220 614850 72456 615086 rect 72540 614850 72776 615086 rect 72860 614850 73096 615086 -rect 81582 615170 81818 615406 -rect 81582 614850 81818 615086 -rect 175286 615170 175522 615406 -rect 175286 614850 175522 615086 -rect 189787 615170 190023 615406 -rect 189787 614850 190023 615086 -rect 283491 615170 283727 615406 -rect 283491 614850 283727 615086 -rect 303938 615170 304174 615406 -rect 303938 614850 304174 615086 -rect 397642 615170 397878 615406 -rect 397642 614850 397878 615086 -rect 416213 615170 416449 615406 -rect 416213 614850 416449 615086 -rect 509917 615170 510153 615406 -rect 509917 614850 510153 615086 rect 514852 615170 515088 615406 rect 515172 615170 515408 615406 rect 515492 615170 515728 615406 @@ -1000065,22 +999513,6 @@ rect 70860 596850 71096 597086 rect 71180 596850 71416 597086 rect 71500 596850 71736 597086 -rect 80902 597170 81138 597406 -rect 80902 596850 81138 597086 -rect 175966 597170 176202 597406 -rect 175966 596850 176202 597086 -rect 189107 597170 189343 597406 -rect 189107 596850 189343 597086 -rect 284171 597170 284407 597406 -rect 284171 596850 284407 597086 -rect 303258 597170 303494 597406 -rect 303258 596850 303494 597086 -rect 398322 597170 398558 597406 -rect 398322 596850 398558 597086 -rect 415533 597170 415769 597406 -rect 415533 596850 415769 597086 -rect 510597 597170 510833 597406 -rect 510597 596850 510833 597086 rect 516212 597170 516448 597406 rect 516532 597170 516768 597406 rect 516852 597170 517088 597406 @@ -1000095,22 +999527,6 @@ rect 72220 578850 72456 579086 rect 72540 578850 72776 579086 rect 72860 578850 73096 579086 -rect 81582 579170 81818 579406 -rect 81582 578850 81818 579086 -rect 175286 579170 175522 579406 -rect 175286 578850 175522 579086 -rect 189787 579170 190023 579406 -rect 189787 578850 190023 579086 -rect 283491 579170 283727 579406 -rect 283491 578850 283727 579086 -rect 303938 579170 304174 579406 -rect 303938 578850 304174 579086 -rect 397642 579170 397878 579406 -rect 397642 578850 397878 579086 -rect 416213 579170 416449 579406 -rect 416213 578850 416449 579086 -rect 509917 579170 510153 579406 -rect 509917 578850 510153 579086 rect 514852 579170 515088 579406 rect 515172 579170 515408 579406 rect 515492 579170 515728 579406 @@ -1000464,22 +999880,6 @@ rect 72220 182850 72456 183086 rect 72540 182850 72776 183086 rect 72860 182850 73096 183086 -rect 80259 183170 80495 183406 -rect 80259 182850 80495 183086 -rect 173963 183170 174199 183406 -rect 173963 182850 174199 183086 -rect 187470 183170 187706 183406 -rect 187470 182850 187706 183086 -rect 281174 183170 281410 183406 -rect 281174 182850 281410 183086 -rect 300025 183170 300261 183406 -rect 300025 182850 300261 183086 -rect 393729 183170 393965 183406 -rect 393729 182850 393965 183086 -rect 414889 183170 415125 183406 -rect 414889 182850 415125 183086 -rect 508593 183170 508829 183406 -rect 508593 182850 508829 183086 rect 514852 183170 515088 183406 rect 515172 183170 515408 183406 rect 515492 183170 515728 183406 @@ -1000494,22 +999894,6 @@ rect 70860 164850 71096 165086 rect 71180 164850 71416 165086 rect 71500 164850 71736 165086 -rect 79579 165170 79815 165406 -rect 79579 164850 79815 165086 -rect 174643 165170 174879 165406 -rect 174643 164850 174879 165086 -rect 186790 165170 187026 165406 -rect 186790 164850 187026 165086 -rect 281854 165170 282090 165406 -rect 281854 164850 282090 165086 -rect 299345 165170 299581 165406 -rect 299345 164850 299581 165086 -rect 394409 165170 394645 165406 -rect 394409 164850 394645 165086 -rect 414209 165170 414445 165406 -rect 414209 164850 414445 165086 -rect 509273 165170 509509 165406 -rect 509273 164850 509509 165086 rect 516212 165170 516448 165406 rect 516532 165170 516768 165406 rect 516852 165170 517088 165406 @@ -1000531,22 +999915,6 @@ rect 72220 146850 72456 147086 rect 72540 146850 72776 147086 rect 72860 146850 73096 147086 -rect 80259 147170 80495 147406 -rect 80259 146850 80495 147086 -rect 173963 147170 174199 147406 -rect 173963 146850 174199 147086 -rect 187470 147170 187706 147406 -rect 187470 146850 187706 147086 -rect 281174 147170 281410 147406 -rect 281174 146850 281410 147086 -rect 300025 147170 300261 147406 -rect 300025 146850 300261 147086 -rect 393729 147170 393965 147406 -rect 393729 146850 393965 147086 -rect 414889 147170 415125 147406 -rect 414889 146850 415125 147086 -rect 508593 147170 508829 147406 -rect 508593 146850 508829 147086 rect 514852 147170 515088 147406 rect 515172 147170 515408 147406 rect 515492 147170 515728 147406 @@ -1000561,22 +999929,6 @@ rect 70860 128850 71096 129086 rect 71180 128850 71416 129086 rect 71500 128850 71736 129086 -rect 79579 129170 79815 129406 -rect 79579 128850 79815 129086 -rect 174643 129170 174879 129406 -rect 174643 128850 174879 129086 -rect 186790 129170 187026 129406 -rect 186790 128850 187026 129086 -rect 281854 129170 282090 129406 -rect 281854 128850 282090 129086 -rect 299345 129170 299581 129406 -rect 299345 128850 299581 129086 -rect 394409 129170 394645 129406 -rect 394409 128850 394645 129086 -rect 414209 129170 414445 129406 -rect 414209 128850 414445 129086 -rect 509273 129170 509509 129406 -rect 509273 128850 509509 129086 rect 516212 129170 516448 129406 rect 516532 129170 516768 129406 rect 516852 129170 517088 129406 @@ -1004003,14 +1003355,6 @@ rect 1804 651428 2404 651430 rect 37804 651428 38404 651430 rect 72158 651428 73158 651430 -rect 81526 651428 81874 651430 -rect 175230 651428 175578 651430 -rect 189731 651428 190079 651430 -rect 283435 651428 283783 651430 -rect 303882 651428 304230 651430 -rect 397586 651428 397934 651430 -rect 416157 651428 416505 651430 -rect 509861 651428 510209 651430 rect 514790 651428 515790 651430 rect 541804 651428 542404 651430 rect 577804 651428 578404 651430 @@ -1004022,15 +1003366,7 @@ rect 38222 651170 72220 651406 rect 72456 651170 72540 651406 rect 72776 651170 72860 651406 -rect 73096 651170 81582 651406 -rect 81818 651170 175286 651406 -rect 175522 651170 189787 651406 -rect 190023 651170 283491 651406 -rect 283727 651170 303938 651406 -rect 304174 651170 397642 651406 -rect 397878 651170 416213 651406 -rect 416449 651170 509917 651406 -rect 510153 651170 514852 651406 +rect 73096 651170 514852 651406 rect 515088 651170 515172 651406 rect 515408 651170 515492 651406 rect 515728 651170 541986 651406 @@ -1004044,15 +1003380,7 @@ rect 38222 650850 72220 651086 rect 72456 650850 72540 651086 rect 72776 650850 72860 651086 -rect 73096 650850 81582 651086 -rect 81818 650850 175286 651086 -rect 175522 650850 189787 651086 -rect 190023 650850 283491 651086 -rect 283727 650850 303938 651086 -rect 304174 650850 397642 651086 -rect 397878 650850 416213 651086 -rect 416449 650850 509917 651086 -rect 510153 650850 514852 651086 +rect 73096 650850 514852 651086 rect 515088 650850 515172 651086 rect 515408 650850 515492 651086 rect 515728 650850 541986 651086 @@ -1004064,14 +1003392,6 @@ rect 1804 650826 2404 650828 rect 37804 650826 38404 650828 rect 72158 650826 73158 650828 -rect 81526 650826 81874 650828 -rect 175230 650826 175578 650828 -rect 189731 650826 190079 650828 -rect 283435 650826 283783 650828 -rect 303882 650826 304230 650828 -rect 397586 650826 397934 650828 -rect 416157 650826 416505 650828 -rect 509861 650826 510209 650828 rect 514790 650826 515790 650828 rect 541804 650826 542404 650828 rect 577804 650826 578404 650828 @@ -1004167,14 +1003487,6 @@ rect 19804 633428 20404 633430 rect 55804 633428 56404 633430 rect 70798 633428 71798 633430 -rect 80846 633428 81194 633430 -rect 175910 633428 176258 633430 -rect 189051 633428 189399 633430 -rect 284115 633428 284463 633430 -rect 303202 633428 303550 633430 -rect 398266 633428 398614 633430 -rect 415477 633428 415825 633430 -rect 510541 633428 510889 633430 rect 516150 633428 517150 633430 rect 523804 633428 524404 633430 rect 559804 633428 560404 633430 @@ -1004186,15 +1003498,7 @@ rect 56222 633170 70860 633406 rect 71096 633170 71180 633406 rect 71416 633170 71500 633406 -rect 71736 633170 80902 633406 -rect 81138 633170 175966 633406 -rect 176202 633170 189107 633406 -rect 189343 633170 284171 633406 -rect 284407 633170 303258 633406 -rect 303494 633170 398322 633406 -rect 398558 633170 415533 633406 -rect 415769 633170 510597 633406 -rect 510833 633170 516212 633406 +rect 71736 633170 516212 633406 rect 516448 633170 516532 633406 rect 516768 633170 516852 633406 rect 517088 633170 523986 633406 @@ -1004208,15 +1003512,7 @@ rect 56222 632850 70860 633086 rect 71096 632850 71180 633086 rect 71416 632850 71500 633086 -rect 71736 632850 80902 633086 -rect 81138 632850 175966 633086 -rect 176202 632850 189107 633086 -rect 189343 632850 284171 633086 -rect 284407 632850 303258 633086 -rect 303494 632850 398322 633086 -rect 398558 632850 415533 633086 -rect 415769 632850 510597 633086 -rect 510833 632850 516212 633086 +rect 71736 632850 516212 633086 rect 516448 632850 516532 633086 rect 516768 632850 516852 633086 rect 517088 632850 523986 633086 @@ -1004228,14 +1003524,6 @@ rect 19804 632826 20404 632828 rect 55804 632826 56404 632828 rect 70798 632826 71798 632828 -rect 80846 632826 81194 632828 -rect 175910 632826 176258 632828 -rect 189051 632826 189399 632828 -rect 284115 632826 284463 632828 -rect 303202 632826 303550 632828 -rect 398266 632826 398614 632828 -rect 415477 632826 415825 632828 -rect 510541 632826 510889 632828 rect 516150 632826 517150 632828 rect 523804 632826 524404 632828 rect 559804 632826 560404 632828 @@ -1004323,14 +1003611,6 @@ rect 1804 615428 2404 615430 rect 37804 615428 38404 615430 rect 72158 615428 73158 615430 -rect 81526 615428 81874 615430 -rect 175230 615428 175578 615430 -rect 189731 615428 190079 615430 -rect 283435 615428 283783 615430 -rect 303882 615428 304230 615430 -rect 397586 615428 397934 615430 -rect 416157 615428 416505 615430 -rect 509861 615428 510209 615430 rect 514790 615428 515790 615430 rect 541804 615428 542404 615430 rect 577804 615428 578404 615430 @@ -1004342,15 +1003622,7 @@ rect 38222 615170 72220 615406 rect 72456 615170 72540 615406 rect 72776 615170 72860 615406 -rect 73096 615170 81582 615406 -rect 81818 615170 175286 615406 -rect 175522 615170 189787 615406 -rect 190023 615170 283491 615406 -rect 283727 615170 303938 615406 -rect 304174 615170 397642 615406 -rect 397878 615170 416213 615406 -rect 416449 615170 509917 615406 -rect 510153 615170 514852 615406 +rect 73096 615170 514852 615406 rect 515088 615170 515172 615406 rect 515408 615170 515492 615406 rect 515728 615170 541986 615406 @@ -1004364,15 +1003636,7 @@ rect 38222 614850 72220 615086 rect 72456 614850 72540 615086 rect 72776 614850 72860 615086 -rect 73096 614850 81582 615086 -rect 81818 614850 175286 615086 -rect 175522 614850 189787 615086 -rect 190023 614850 283491 615086 -rect 283727 614850 303938 615086 -rect 304174 614850 397642 615086 -rect 397878 614850 416213 615086 -rect 416449 614850 509917 615086 -rect 510153 614850 514852 615086 +rect 73096 614850 514852 615086 rect 515088 614850 515172 615086 rect 515408 614850 515492 615086 rect 515728 614850 541986 615086 @@ -1004384,14 +1003648,6 @@ rect 1804 614826 2404 614828 rect 37804 614826 38404 614828 rect 72158 614826 73158 614828 -rect 81526 614826 81874 614828 -rect 175230 614826 175578 614828 -rect 189731 614826 190079 614828 -rect 283435 614826 283783 614828 -rect 303882 614826 304230 614828 -rect 397586 614826 397934 614828 -rect 416157 614826 416505 614828 -rect 509861 614826 510209 614828 rect 514790 614826 515790 614828 rect 541804 614826 542404 614828 rect 577804 614826 578404 614828 @@ -1004487,14 +1003743,6 @@ rect 19804 597428 20404 597430 rect 55804 597428 56404 597430 rect 70798 597428 71798 597430 -rect 80846 597428 81194 597430 -rect 175910 597428 176258 597430 -rect 189051 597428 189399 597430 -rect 284115 597428 284463 597430 -rect 303202 597428 303550 597430 -rect 398266 597428 398614 597430 -rect 415477 597428 415825 597430 -rect 510541 597428 510889 597430 rect 516150 597428 517150 597430 rect 523804 597428 524404 597430 rect 559804 597428 560404 597430 @@ -1004506,15 +1003754,7 @@ rect 56222 597170 70860 597406 rect 71096 597170 71180 597406 rect 71416 597170 71500 597406 -rect 71736 597170 80902 597406 -rect 81138 597170 175966 597406 -rect 176202 597170 189107 597406 -rect 189343 597170 284171 597406 -rect 284407 597170 303258 597406 -rect 303494 597170 398322 597406 -rect 398558 597170 415533 597406 -rect 415769 597170 510597 597406 -rect 510833 597170 516212 597406 +rect 71736 597170 516212 597406 rect 516448 597170 516532 597406 rect 516768 597170 516852 597406 rect 517088 597170 523986 597406 @@ -1004528,15 +1003768,7 @@ rect 56222 596850 70860 597086 rect 71096 596850 71180 597086 rect 71416 596850 71500 597086 -rect 71736 596850 80902 597086 -rect 81138 596850 175966 597086 -rect 176202 596850 189107 597086 -rect 189343 596850 284171 597086 -rect 284407 596850 303258 597086 -rect 303494 596850 398322 597086 -rect 398558 596850 415533 597086 -rect 415769 596850 510597 597086 -rect 510833 596850 516212 597086 +rect 71736 596850 516212 597086 rect 516448 596850 516532 597086 rect 516768 596850 516852 597086 rect 517088 596850 523986 597086 @@ -1004548,14 +1003780,6 @@ rect 19804 596826 20404 596828 rect 55804 596826 56404 596828 rect 70798 596826 71798 596828 -rect 80846 596826 81194 596828 -rect 175910 596826 176258 596828 -rect 189051 596826 189399 596828 -rect 284115 596826 284463 596828 -rect 303202 596826 303550 596828 -rect 398266 596826 398614 596828 -rect 415477 596826 415825 596828 -rect 510541 596826 510889 596828 rect 516150 596826 517150 596828 rect 523804 596826 524404 596828 rect 559804 596826 560404 596828 @@ -1004643,14 +1003867,6 @@ rect 1804 579428 2404 579430 rect 37804 579428 38404 579430 rect 72158 579428 73158 579430 -rect 81526 579428 81874 579430 -rect 175230 579428 175578 579430 -rect 189731 579428 190079 579430 -rect 283435 579428 283783 579430 -rect 303882 579428 304230 579430 -rect 397586 579428 397934 579430 -rect 416157 579428 416505 579430 -rect 509861 579428 510209 579430 rect 514790 579428 515790 579430 rect 541804 579428 542404 579430 rect 577804 579428 578404 579430 @@ -1004662,15 +1003878,7 @@ rect 38222 579170 72220 579406 rect 72456 579170 72540 579406 rect 72776 579170 72860 579406 -rect 73096 579170 81582 579406 -rect 81818 579170 175286 579406 -rect 175522 579170 189787 579406 -rect 190023 579170 283491 579406 -rect 283727 579170 303938 579406 -rect 304174 579170 397642 579406 -rect 397878 579170 416213 579406 -rect 416449 579170 509917 579406 -rect 510153 579170 514852 579406 +rect 73096 579170 514852 579406 rect 515088 579170 515172 579406 rect 515408 579170 515492 579406 rect 515728 579170 541986 579406 @@ -1004684,15 +1003892,7 @@ rect 38222 578850 72220 579086 rect 72456 578850 72540 579086 rect 72776 578850 72860 579086 -rect 73096 578850 81582 579086 -rect 81818 578850 175286 579086 -rect 175522 578850 189787 579086 -rect 190023 578850 283491 579086 -rect 283727 578850 303938 579086 -rect 304174 578850 397642 579086 -rect 397878 578850 416213 579086 -rect 416449 578850 509917 579086 -rect 510153 578850 514852 579086 +rect 73096 578850 514852 579086 rect 515088 578850 515172 579086 rect 515408 578850 515492 579086 rect 515728 578850 541986 579086 @@ -1004704,14 +1003904,6 @@ rect 1804 578826 2404 578828 rect 37804 578826 38404 578828 rect 72158 578826 73158 578828 -rect 81526 578826 81874 578828 -rect 175230 578826 175578 578828 -rect 189731 578826 190079 578828 -rect 283435 578826 283783 578828 -rect 303882 578826 304230 578828 -rect 397586 578826 397934 578828 -rect 416157 578826 416505 578828 -rect 509861 578826 510209 578828 rect 514790 578826 515790 578828 rect 541804 578826 542404 578828 rect 577804 578826 578404 578828 @@ -1007491,14 +1006683,6 @@ rect 1804 183428 2404 183430 rect 37804 183428 38404 183430 rect 72158 183428 73158 183430 -rect 80203 183428 80551 183430 -rect 173907 183428 174255 183430 -rect 187414 183428 187762 183430 -rect 281118 183428 281466 183430 -rect 299969 183428 300317 183430 -rect 393673 183428 394021 183430 -rect 414833 183428 415181 183430 -rect 508537 183428 508885 183430 rect 514790 183428 515790 183430 rect 541804 183428 542404 183430 rect 577804 183428 578404 183430 @@ -1007510,15 +1006694,7 @@ rect 38222 183170 72220 183406 rect 72456 183170 72540 183406 rect 72776 183170 72860 183406 -rect 73096 183170 80259 183406 -rect 80495 183170 173963 183406 -rect 174199 183170 187470 183406 -rect 187706 183170 281174 183406 -rect 281410 183170 300025 183406 -rect 300261 183170 393729 183406 -rect 393965 183170 414889 183406 -rect 415125 183170 508593 183406 -rect 508829 183170 514852 183406 +rect 73096 183170 514852 183406 rect 515088 183170 515172 183406 rect 515408 183170 515492 183406 rect 515728 183170 541986 183406 @@ -1007532,15 +1006708,7 @@ rect 38222 182850 72220 183086 rect 72456 182850 72540 183086 rect 72776 182850 72860 183086 -rect 73096 182850 80259 183086 -rect 80495 182850 173963 183086 -rect 174199 182850 187470 183086 -rect 187706 182850 281174 183086 -rect 281410 182850 300025 183086 -rect 300261 182850 393729 183086 -rect 393965 182850 414889 183086 -rect 415125 182850 508593 183086 -rect 508829 182850 514852 183086 +rect 73096 182850 514852 183086 rect 515088 182850 515172 183086 rect 515408 182850 515492 183086 rect 515728 182850 541986 183086 @@ -1007552,14 +1006720,6 @@ rect 1804 182826 2404 182828 rect 37804 182826 38404 182828 rect 72158 182826 73158 182828 -rect 80203 182826 80551 182828 -rect 173907 182826 174255 182828 -rect 187414 182826 187762 182828 -rect 281118 182826 281466 182828 -rect 299969 182826 300317 182828 -rect 393673 182826 394021 182828 -rect 414833 182826 415181 182828 -rect 508537 182826 508885 182828 rect 514790 182826 515790 182828 rect 541804 182826 542404 182828 rect 577804 182826 578404 182828 @@ -1007655,14 +1006815,6 @@ rect 19804 165428 20404 165430 rect 55804 165428 56404 165430 rect 70798 165428 71798 165430 -rect 79523 165428 79871 165430 -rect 174587 165428 174935 165430 -rect 186734 165428 187082 165430 -rect 281798 165428 282146 165430 -rect 299289 165428 299637 165430 -rect 394353 165428 394701 165430 -rect 414153 165428 414501 165430 -rect 509217 165428 509565 165430 rect 516150 165428 517150 165430 rect 523804 165428 524404 165430 rect 559804 165428 560404 165430 @@ -1007674,15 +1006826,7 @@ rect 56222 165170 70860 165406 rect 71096 165170 71180 165406 rect 71416 165170 71500 165406 -rect 71736 165170 79579 165406 -rect 79815 165170 174643 165406 -rect 174879 165170 186790 165406 -rect 187026 165170 281854 165406 -rect 282090 165170 299345 165406 -rect 299581 165170 394409 165406 -rect 394645 165170 414209 165406 -rect 414445 165170 509273 165406 -rect 509509 165170 516212 165406 +rect 71736 165170 516212 165406 rect 516448 165170 516532 165406 rect 516768 165170 516852 165406 rect 517088 165170 523986 165406 @@ -1007696,15 +1006840,7 @@ rect 56222 164850 70860 165086 rect 71096 164850 71180 165086 rect 71416 164850 71500 165086 -rect 71736 164850 79579 165086 -rect 79815 164850 174643 165086 -rect 174879 164850 186790 165086 -rect 187026 164850 281854 165086 -rect 282090 164850 299345 165086 -rect 299581 164850 394409 165086 -rect 394645 164850 414209 165086 -rect 414445 164850 509273 165086 -rect 509509 164850 516212 165086 +rect 71736 164850 516212 165086 rect 516448 164850 516532 165086 rect 516768 164850 516852 165086 rect 517088 164850 523986 165086 @@ -1007716,14 +1006852,6 @@ rect 19804 164826 20404 164828 rect 55804 164826 56404 164828 rect 70798 164826 71798 164828 -rect 79523 164826 79871 164828 -rect 174587 164826 174935 164828 -rect 186734 164826 187082 164828 -rect 281798 164826 282146 164828 -rect 299289 164826 299637 164828 -rect 394353 164826 394701 164828 -rect 414153 164826 414501 164828 -rect 509217 164826 509565 164828 rect 516150 164826 517150 164828 rect 523804 164826 524404 164828 rect 559804 164826 560404 164828 @@ -1007811,14 +1006939,6 @@ rect 1804 147428 2404 147430 rect 37804 147428 38404 147430 rect 72158 147428 73158 147430 -rect 80203 147428 80551 147430 -rect 173907 147428 174255 147430 -rect 187414 147428 187762 147430 -rect 281118 147428 281466 147430 -rect 299969 147428 300317 147430 -rect 393673 147428 394021 147430 -rect 414833 147428 415181 147430 -rect 508537 147428 508885 147430 rect 514790 147428 515790 147430 rect 541804 147428 542404 147430 rect 577804 147428 578404 147430 @@ -1007830,15 +1006950,7 @@ rect 38222 147170 72220 147406 rect 72456 147170 72540 147406 rect 72776 147170 72860 147406 -rect 73096 147170 80259 147406 -rect 80495 147170 173963 147406 -rect 174199 147170 187470 147406 -rect 187706 147170 281174 147406 -rect 281410 147170 300025 147406 -rect 300261 147170 393729 147406 -rect 393965 147170 414889 147406 -rect 415125 147170 508593 147406 -rect 508829 147170 514852 147406 +rect 73096 147170 514852 147406 rect 515088 147170 515172 147406 rect 515408 147170 515492 147406 rect 515728 147170 541986 147406 @@ -1007852,15 +1006964,7 @@ rect 38222 146850 72220 147086 rect 72456 146850 72540 147086 rect 72776 146850 72860 147086 -rect 73096 146850 80259 147086 -rect 80495 146850 173963 147086 -rect 174199 146850 187470 147086 -rect 187706 146850 281174 147086 -rect 281410 146850 300025 147086 -rect 300261 146850 393729 147086 -rect 393965 146850 414889 147086 -rect 415125 146850 508593 147086 -rect 508829 146850 514852 147086 +rect 73096 146850 514852 147086 rect 515088 146850 515172 147086 rect 515408 146850 515492 147086 rect 515728 146850 541986 147086 @@ -1007872,14 +1006976,6 @@ rect 1804 146826 2404 146828 rect 37804 146826 38404 146828 rect 72158 146826 73158 146828 -rect 80203 146826 80551 146828 -rect 173907 146826 174255 146828 -rect 187414 146826 187762 146828 -rect 281118 146826 281466 146828 -rect 299969 146826 300317 146828 -rect 393673 146826 394021 146828 -rect 414833 146826 415181 146828 -rect 508537 146826 508885 146828 rect 514790 146826 515790 146828 rect 541804 146826 542404 146828 rect 577804 146826 578404 146828 @@ -1007975,14 +1007071,6 @@ rect 19804 129428 20404 129430 rect 55804 129428 56404 129430 rect 70798 129428 71798 129430 -rect 79523 129428 79871 129430 -rect 174587 129428 174935 129430 -rect 186734 129428 187082 129430 -rect 281798 129428 282146 129430 -rect 299289 129428 299637 129430 -rect 394353 129428 394701 129430 -rect 414153 129428 414501 129430 -rect 509217 129428 509565 129430 rect 516150 129428 517150 129430 rect 523804 129428 524404 129430 rect 559804 129428 560404 129430 @@ -1007994,15 +1007082,7 @@ rect 56222 129170 70860 129406 rect 71096 129170 71180 129406 rect 71416 129170 71500 129406 -rect 71736 129170 79579 129406 -rect 79815 129170 174643 129406 -rect 174879 129170 186790 129406 -rect 187026 129170 281854 129406 -rect 282090 129170 299345 129406 -rect 299581 129170 394409 129406 -rect 394645 129170 414209 129406 -rect 414445 129170 509273 129406 -rect 509509 129170 516212 129406 +rect 71736 129170 516212 129406 rect 516448 129170 516532 129406 rect 516768 129170 516852 129406 rect 517088 129170 523986 129406 @@ -1008016,15 +1007096,7 @@ rect 56222 128850 70860 129086 rect 71096 128850 71180 129086 rect 71416 128850 71500 129086 -rect 71736 128850 79579 129086 -rect 79815 128850 174643 129086 -rect 174879 128850 186790 129086 -rect 187026 128850 281854 129086 -rect 282090 128850 299345 129086 -rect 299581 128850 394409 129086 -rect 394645 128850 414209 129086 -rect 414445 128850 509273 129086 -rect 509509 128850 516212 129086 +rect 71736 128850 516212 129086 rect 516448 128850 516532 129086 rect 516768 128850 516852 129086 rect 517088 128850 523986 129086 @@ -1008036,14 +1007108,6 @@ rect 19804 128826 20404 128828 rect 55804 128826 56404 128828 rect 70798 128826 71798 128828 -rect 79523 128826 79871 128828 -rect 174587 128826 174935 128828 -rect 186734 128826 187082 128828 -rect 281798 128826 282146 128828 -rect 299289 128826 299637 128828 -rect 394353 128826 394701 128828 -rect 414153 128826 414501 128828 -rect 509217 128826 509565 128828 rect 516150 128826 517150 128828 rect 523804 128826 524404 128828 rect 559804 128826 560404 128828 @@ -1010441,7 +1009505,7 @@ rect 570604 -7506 571204 -7504 rect 591900 -7506 592500 -7504 use user_proj_example mprj -timestamp 1625247689 +timestamp 1625084089 transform 1 0 70000 0 1 88000 box 0 0 447948 592008 << labels >>
diff --git a/maglef/user_project_wrapper.lef.mag b/maglef/user_project_wrapper.lef.mag index cf2d6d2..7d0096b 100644 --- a/maglef/user_project_wrapper.lef.mag +++ b/maglef/user_project_wrapper.lef.mag
@@ -1,7 +1,7 @@ magic tech sky130A magscale 1 2 -timestamp 1625247939 +timestamp 1625084509 << obsli1 >> rect 34529 2533 523911 680008 << obsm1 >> @@ -5296,8 +5296,8 @@ string LEFclass BLOCK string FIXED_BBOX 0 0 584000 704000 string LEFview TRUE -string GDS_FILE /openLANE_flow/designs/user_project_wrapper/runs/4kb_sram/results/magic/user_project_wrapper.gds -string GDS_END 161855430 -string GDS_START 148008784 +string GDS_FILE /openLANE_flow/designs/user_project_wrapper/runs/DRC_CLEAN/results/magic/user_project_wrapper.gds +string GDS_END 340729504 +string GDS_START 326905898 << end >>
diff --git a/verilog/gl/user_project_wrapper.v b/verilog/gl/user_project_wrapper.v index e87c4e8..99e6bd1 100644 --- a/verilog/gl/user_project_wrapper.v +++ b/verilog/gl/user_project_wrapper.v
@@ -60,8 +60,8 @@ .wbs_we_i(wbs_we_i), .wbs_ack_o(wbs_ack_o), .user_clock2(user_clock2), - .vccd1(vccd1), .vssd1(vssd1), + .vccd1(vccd1), .analog_io({analog_io[28], analog_io[27], analog_io[26],