layout_final
diff --git a/mag/VCO/VCO.mag b/mag/VCO/VCO.mag index a39652b..9e6a33c 100644 --- a/mag/VCO/VCO.mag +++ b/mag/VCO/VCO.mag
@@ -1,39 +1,40 @@ magic tech sky130A magscale 1 2 -timestamp 1608331039 +timestamp 1608340973 << nwell >> -rect 8339 5532 9230 5539 -rect -5124 5192 9230 5532 -rect -5124 5190 8274 5192 -rect 7802 4352 8106 4888 -rect 8339 4870 8442 4884 -rect 8135 4352 8400 4870 -rect -4314 4350 7650 4352 -rect -4256 4160 7650 4350 -rect 7700 4160 8400 4352 -rect -4254 3922 7585 4160 -rect 8054 3926 8400 4160 -rect 8732 3924 9228 5192 +rect -5124 5197 6787 5532 +rect -5124 5195 5831 5197 +rect -5124 5190 5094 5195 +rect 3800 4889 5996 4893 +rect 3800 4875 5999 4889 +rect 3800 4122 5996 4875 +rect 4280 4023 4727 4122 +rect 4280 3871 4475 4023 +rect 5514 3923 5996 4122 +rect 6289 3929 6785 5197 << pwell >> -rect 8006 3903 8400 3908 -rect -4312 3480 7546 3832 -rect 7999 3670 8400 3903 -rect 7996 3248 8400 3670 -rect 8006 3228 8400 3248 -rect 7928 3220 8400 3228 -rect 8602 3220 9258 3906 -rect 8132 2800 9260 3220 -rect -5124 2464 9268 2800 +rect 5563 3908 5957 3913 +rect 5556 3689 5957 3908 +rect 5761 3427 5957 3689 +rect 5553 3253 5957 3427 +rect 5563 3251 5957 3253 +rect 5582 3225 5957 3251 +rect 6159 3225 6802 3911 +rect 5689 2805 6802 3225 +rect 5650 2804 6802 2805 +rect 4729 2800 6802 2804 +rect -5124 2469 6802 2800 +rect -5124 2464 6798 2469 << psubdiff >> -rect 8150 3154 8210 3190 -rect 9074 3154 9160 3190 -rect 8154 3052 8214 3088 -rect 9078 3052 9164 3088 -rect 8156 2958 8216 2994 -rect 9080 2958 9166 2994 -rect 8156 2846 8216 2882 -rect 9080 2846 9166 2882 +rect 5707 3159 5767 3195 +rect 6631 3159 6717 3195 +rect 5711 3057 5771 3093 +rect 6635 3057 6721 3093 +rect 5713 2963 5773 2999 +rect 6637 2963 6723 2999 +rect 5713 2851 5773 2887 +rect 6637 2851 6723 2887 rect -4962 2652 -4902 2692 rect -3534 2652 -3488 2692 rect -3072 2666 -3012 2706 @@ -42,10 +43,8 @@ rect 988 2676 1034 2716 rect 2298 2666 2358 2706 rect 3726 2666 3772 2706 -rect 7708 2694 7768 2734 -rect 9136 2694 9182 2734 -rect 4998 2638 5058 2678 -rect 6426 2638 6472 2678 +rect 5265 2699 5325 2739 +rect 6693 2699 6739 2739 rect -4964 2556 -4904 2596 rect -3536 2556 -3490 2596 rect -3074 2570 -3014 2610 @@ -54,10 +53,8 @@ rect 986 2580 1032 2620 rect 2296 2570 2356 2610 rect 3724 2570 3770 2610 -rect 7706 2598 7766 2638 -rect 9134 2598 9180 2638 -rect 4996 2542 5056 2582 -rect 6424 2542 6470 2582 +rect 5263 2603 5323 2643 +rect 6691 2603 6737 2643 << nsubdiff >> rect -4908 5400 -4866 5440 rect -3574 5400 -3540 5440 @@ -67,10 +64,8 @@ rect 1242 5394 1276 5434 rect 2266 5422 2308 5462 rect 3600 5422 3634 5462 -rect 4890 5394 4932 5434 -rect 6224 5394 6258 5434 -rect 7238 5422 7280 5462 -rect 8572 5422 8606 5462 +rect 4795 5427 4837 5467 +rect 6129 5427 6163 5467 rect -4912 5304 -4870 5344 rect -3578 5304 -3544 5344 rect -2728 5308 -2686 5348 @@ -79,180 +74,60 @@ rect 1238 5298 1272 5338 rect 2262 5326 2304 5366 rect 3596 5326 3630 5366 -rect 4886 5298 4928 5338 -rect 6220 5298 6254 5338 -rect 7234 5326 7276 5366 -rect 8568 5326 8602 5366 -rect 7908 4700 7982 4740 -rect 7908 4452 7982 4516 -rect 7714 4222 7778 4296 -rect 7962 4222 8002 4296 +rect 4791 5331 4833 5371 +rect 6125 5331 6159 5371 +rect 5465 4705 5539 4745 +rect 5465 4461 5539 4521 << psubdiffcont >> -rect 8210 3154 9074 3190 -rect 8214 3052 9078 3088 -rect 8216 2958 9080 2994 -rect 8216 2846 9080 2882 +rect 5767 3159 6631 3195 +rect 5771 3057 6635 3093 +rect 5773 2963 6637 2999 +rect 5773 2851 6637 2887 rect -4902 2652 -3534 2692 rect -3012 2666 -1644 2706 rect -380 2676 988 2716 rect 2358 2666 3726 2706 -rect 7768 2694 9136 2734 -rect 5058 2638 6426 2678 +rect 5325 2699 6693 2739 rect -4904 2556 -3536 2596 rect -3014 2570 -1646 2610 rect -382 2580 986 2620 rect 2356 2570 3724 2610 -rect 7766 2598 9134 2638 -rect 5056 2542 6424 2582 +rect 5323 2603 6691 2643 << nsubdiffcont >> rect -4866 5400 -3574 5440 rect -2682 5404 -1390 5444 rect -50 5394 1242 5434 rect 2308 5422 3600 5462 -rect 4932 5394 6224 5434 -rect 7280 5422 8572 5462 +rect 4837 5427 6129 5467 rect -4870 5304 -3578 5344 rect -2686 5308 -1394 5348 rect -54 5298 1238 5338 rect 2304 5326 3596 5366 -rect 4928 5298 6220 5338 -rect 7276 5326 8568 5366 -rect 7908 4516 7982 4700 -rect 7778 4222 7962 4296 +rect 4833 5331 6125 5371 +rect 5465 4521 5539 4705 << poly >> -rect -4386 3920 -4320 3936 -rect -4386 3886 -4370 3920 -rect -4336 3886 -4320 3920 -rect -4386 3870 -4320 3886 -rect -3834 3916 -3768 3932 -rect -3834 3882 -3818 3916 -rect -3784 3882 -3768 3916 -rect -3834 3866 -3768 3882 -rect -3258 3922 -3192 3938 -rect -3258 3888 -3242 3922 -rect -3208 3888 -3192 3922 -rect -3258 3872 -3192 3888 -rect -2694 3922 -2628 3938 -rect -2694 3888 -2678 3922 -rect -2644 3888 -2628 3922 -rect -2694 3872 -2628 3888 -rect -2124 3920 -2058 3936 -rect -2124 3886 -2108 3920 -rect -2074 3886 -2058 3920 -rect -2124 3870 -2058 3886 -rect -1558 3922 -1492 3938 -rect -1558 3888 -1542 3922 -rect -1508 3888 -1492 3922 -rect -1558 3872 -1492 3888 -rect -996 3922 -930 3938 -rect -996 3888 -980 3922 -rect -946 3888 -930 3922 -rect -996 3872 -930 3888 -rect -412 3924 -346 3940 -rect -412 3890 -396 3924 -rect -362 3890 -346 3924 -rect -412 3874 -346 3890 -rect 154 3920 220 3936 -rect 154 3886 170 3920 -rect 204 3886 220 3920 -rect 154 3870 220 3886 -rect 724 3922 790 3938 -rect 724 3888 740 3922 -rect 774 3888 790 3922 -rect 724 3872 790 3888 -rect 1286 3922 1352 3938 -rect 1286 3888 1302 3922 -rect 1336 3888 1352 3922 -rect 1286 3872 1352 3888 -rect 1848 3920 1914 3936 -rect 1848 3886 1864 3920 -rect 1898 3886 1914 3920 -rect 1848 3870 1914 3886 -rect 2422 3924 2488 3940 -rect 2422 3890 2438 3924 -rect 2472 3890 2488 3924 -rect 2422 3874 2488 3890 -rect 2992 3920 3058 3936 -rect 2992 3886 3008 3920 -rect 3042 3886 3058 3920 -rect 2992 3870 3058 3886 -rect 3560 3920 3626 3936 -rect 3560 3886 3576 3920 -rect 3610 3886 3626 3920 -rect 3560 3870 3626 3886 -rect 4140 3922 4206 3938 -rect 4140 3888 4156 3922 -rect 4190 3888 4206 3922 -rect 4140 3872 4206 3888 -rect 4708 3922 4774 3938 -rect 4708 3888 4724 3922 -rect 4758 3888 4774 3922 -rect 4708 3872 4774 3888 -rect 5276 3920 5342 3936 -rect 5276 3886 5292 3920 -rect 5326 3886 5342 3920 -rect 5276 3870 5342 3886 -rect 5850 3922 5916 3938 -rect 5850 3888 5866 3922 -rect 5900 3888 5916 3922 -rect 5850 3872 5916 3888 -rect 6414 3920 6480 3936 -rect 6414 3886 6430 3920 -rect 6464 3886 6480 3920 -rect 6414 3870 6480 3886 -rect 6984 3920 7050 3936 -rect 7542 3930 7608 3934 -rect 6984 3886 7000 3920 -rect 7034 3886 7050 3920 -rect 6984 3870 7050 3886 -rect 7538 3920 7608 3930 -rect 8216 3920 8246 4699 -rect 8659 3938 8689 3953 -rect 7538 3918 8246 3920 -rect 7538 3914 7558 3918 -rect 7538 3880 7554 3914 -rect 7592 3886 8246 3918 -rect 7592 3884 7608 3886 -rect 7588 3880 7608 3884 -rect 7538 3868 7608 3880 -rect 7538 3864 7604 3868 -rect 8216 3371 8246 3886 -rect 8610 3922 8689 3938 -rect 8610 3888 8626 3922 -rect 8660 3920 8689 3922 -rect 9008 3920 9038 4403 -rect 8660 3888 9038 3920 -rect 8610 3886 9038 3888 -rect 8610 3872 8689 3886 -rect 8624 3870 8689 3872 -rect 8659 3857 8689 3870 -rect 9008 3485 9038 3886 +rect 5496 3942 5610 3958 +rect 5496 3902 5512 3942 +rect 5592 3925 5610 3942 +rect 5773 3925 5803 4704 +rect 6216 3943 6246 3958 +rect 5592 3902 5803 3925 +rect 5496 3891 5803 3902 +rect 5496 3884 5610 3891 +rect 5773 3376 5803 3891 +rect 6167 3927 6246 3943 +rect 6167 3893 6183 3927 +rect 6217 3925 6246 3927 +rect 6565 3925 6595 4408 +rect 6217 3893 6595 3925 +rect 6167 3891 6595 3893 +rect 6167 3877 6246 3891 +rect 6181 3875 6246 3877 +rect 6216 3862 6246 3875 +rect 6565 3490 6595 3891 << polycont >> -rect -4370 3886 -4336 3920 -rect -3818 3882 -3784 3916 -rect -3242 3888 -3208 3922 -rect -2678 3888 -2644 3922 -rect -2108 3886 -2074 3920 -rect -1542 3888 -1508 3922 -rect -980 3888 -946 3922 -rect -396 3890 -362 3924 -rect 170 3886 204 3920 -rect 740 3888 774 3922 -rect 1302 3888 1336 3922 -rect 1864 3886 1898 3920 -rect 2438 3890 2472 3924 -rect 3008 3886 3042 3920 -rect 3576 3886 3610 3920 -rect 4156 3888 4190 3922 -rect 4724 3888 4758 3922 -rect 5292 3886 5326 3920 -rect 5866 3888 5900 3922 -rect 6430 3886 6464 3920 -rect 7000 3886 7034 3920 -rect 7558 3914 7592 3918 -rect 7554 3884 7592 3914 -rect 7554 3880 7588 3884 -rect 8626 3888 8660 3922 +rect 5512 3902 5592 3942 +rect 6183 3893 6217 3927 << locali >> rect -4908 5400 -4866 5440 rect -3574 5400 -3540 5440 @@ -267,24 +142,19 @@ rect 2266 5428 2280 5462 rect 3610 5428 3648 5462 rect 3682 5428 3712 5462 +rect 4795 5433 4809 5467 +rect 6139 5433 6177 5467 +rect 6211 5433 6241 5467 rect 2266 5422 2308 5428 rect 3600 5422 3634 5428 -rect 4890 5400 4904 5434 -rect 6234 5400 6272 5434 -rect 6306 5400 6336 5434 -rect 7238 5428 7252 5462 -rect 8582 5428 8620 5462 -rect 8654 5428 8684 5462 -rect 7238 5422 7280 5428 -rect 8572 5422 8606 5428 +rect 4795 5427 4837 5433 +rect 6129 5427 6163 5433 rect -92 5394 -50 5400 rect 1242 5394 1276 5400 -rect 4890 5394 4932 5400 -rect 6224 5394 6258 5400 +rect 4791 5367 4833 5371 +rect 6125 5367 6159 5371 rect 2262 5362 2304 5366 rect 3596 5362 3630 5366 -rect 7234 5362 7276 5366 -rect 8568 5362 8602 5366 rect -2728 5344 -2686 5348 rect -1394 5344 -1360 5348 rect -4912 5304 -4870 5344 @@ -302,107 +172,50 @@ rect 2262 5328 2272 5362 rect 3602 5328 3640 5362 rect 3674 5328 3704 5362 -rect 4886 5334 4928 5338 -rect 6220 5334 6254 5338 +rect 4791 5333 4801 5367 +rect 6131 5333 6169 5367 +rect 6203 5333 6233 5367 +rect 4791 5331 4833 5333 +rect 6125 5331 6159 5333 rect 2262 5326 2304 5328 rect 3596 5326 3630 5328 -rect 4886 5300 4896 5334 -rect 6226 5300 6264 5334 -rect 6298 5300 6328 5334 -rect 7234 5328 7244 5362 -rect 8574 5328 8612 5362 -rect 8646 5328 8676 5362 -rect 7234 5326 7276 5328 -rect 8568 5326 8602 5328 rect -96 5298 -54 5300 rect 1238 5298 1272 5300 -rect 4886 5298 4928 5300 -rect 6220 5298 6254 5300 -rect 7908 4712 7982 4740 -rect 7908 4700 7926 4712 -rect 7960 4700 7982 4712 -rect 7908 4496 7982 4516 -rect 7908 4462 7926 4496 -rect 7960 4462 7982 4496 -rect 7908 4452 7982 4462 -rect 7926 4432 7960 4452 -rect 7714 4278 7778 4296 -rect 7962 4278 8002 4296 -rect 7694 4244 7724 4278 -rect 7758 4244 7778 4278 -rect 7974 4244 8002 4278 -rect 7714 4222 7778 4244 -rect 7962 4222 8002 4244 -rect -4386 3886 -4370 3920 -rect -4336 3886 -4320 3920 -rect -3834 3882 -3818 3916 -rect -3784 3882 -3768 3916 -rect -3258 3888 -3242 3922 -rect -3208 3888 -3192 3922 -rect -2694 3888 -2678 3922 -rect -2644 3888 -2628 3922 -rect -2124 3886 -2108 3920 -rect -2074 3886 -2058 3920 -rect -1558 3888 -1542 3922 -rect -1508 3888 -1492 3922 -rect -996 3888 -980 3922 -rect -946 3888 -930 3922 -rect -412 3890 -396 3924 -rect -362 3890 -346 3924 -rect 154 3886 170 3920 -rect 204 3886 220 3920 -rect 724 3888 740 3922 -rect 774 3888 790 3922 -rect 1286 3888 1302 3922 -rect 1336 3888 1352 3922 -rect 1848 3886 1864 3920 -rect 1898 3886 1914 3920 -rect 2422 3890 2438 3924 -rect 2472 3890 2488 3924 -rect 2992 3886 3008 3920 -rect 3042 3886 3058 3920 -rect 3560 3886 3576 3920 -rect 3610 3886 3626 3920 -rect 4140 3888 4156 3922 -rect 4190 3888 4206 3922 -rect 4708 3888 4724 3922 -rect 4758 3888 4774 3922 -rect 5276 3886 5292 3920 -rect 5326 3886 5342 3920 -rect 5850 3888 5866 3922 -rect 5900 3888 5916 3922 -rect 6414 3886 6430 3920 -rect 6464 3886 6480 3920 -rect 6984 3886 7000 3920 -rect 7034 3886 7050 3920 -rect 7542 3914 7558 3918 -rect 7538 3880 7554 3914 -rect 7592 3884 7608 3918 -rect 8610 3888 8626 3922 -rect 8660 3888 8676 3922 -rect 7588 3880 7604 3884 -rect 8150 3154 8210 3190 -rect 9074 3154 9160 3190 -rect 8154 3054 8164 3088 -rect 8198 3054 8214 3088 -rect 9078 3054 9100 3088 -rect 9134 3054 9164 3088 -rect 8154 3052 8214 3054 -rect 9078 3052 9164 3054 -rect 8156 2960 8166 2994 -rect 8200 2960 8216 2994 -rect 9080 2960 9102 2994 -rect 9136 2960 9166 2994 -rect 8156 2958 8216 2960 -rect 9080 2958 9166 2960 -rect 8156 2848 8166 2882 -rect 8200 2848 8216 2882 -rect 9080 2848 9102 2882 -rect 9136 2848 9166 2882 -rect 8156 2846 8216 2848 -rect 9080 2846 9166 2848 -rect 7708 2732 7768 2734 -rect 9136 2732 9182 2734 +rect 5465 4717 5539 4745 +rect 5465 4705 5483 4717 +rect 5517 4705 5539 4717 +rect 5465 4501 5539 4521 +rect 5465 4467 5483 4501 +rect 5517 4467 5539 4501 +rect 5465 4461 5539 4467 +rect 5496 3942 5610 3958 +rect 5496 3902 5512 3942 +rect 5592 3902 5610 3942 +rect 5496 3884 5610 3902 +rect 6167 3893 6183 3927 +rect 6217 3893 6233 3927 +rect 5707 3159 5767 3195 +rect 6631 3159 6717 3195 +rect 5711 3059 5721 3093 +rect 5755 3059 5771 3093 +rect 6635 3059 6657 3093 +rect 6691 3059 6721 3093 +rect 5711 3057 5771 3059 +rect 6635 3057 6721 3059 +rect 5713 2965 5723 2999 +rect 5757 2965 5773 2999 +rect 6637 2965 6659 2999 +rect 6693 2965 6723 2999 +rect 5713 2963 5773 2965 +rect 6637 2963 6723 2965 +rect 5713 2853 5723 2887 +rect 5757 2853 5773 2887 +rect 6637 2853 6659 2887 +rect 6693 2853 6723 2887 +rect 5713 2851 5773 2853 +rect 6637 2851 6723 2853 +rect 5265 2737 5325 2739 +rect 6693 2737 6739 2739 rect -440 2714 -380 2716 rect 988 2714 1034 2716 rect -3072 2704 -3012 2706 @@ -421,20 +234,14 @@ rect -1644 2666 -1598 2670 rect 2298 2670 2330 2704 rect 3732 2670 3772 2704 -rect 7708 2698 7740 2732 -rect 9142 2698 9182 2732 -rect 7708 2694 7768 2698 -rect 9136 2694 9182 2698 +rect 5265 2703 5297 2737 +rect 6699 2703 6739 2737 +rect 5265 2699 5325 2703 +rect 6693 2699 6739 2703 rect 2298 2666 2358 2670 rect 3726 2666 3772 2670 -rect 4998 2676 5058 2678 -rect 6426 2676 6472 2678 -rect 4998 2642 5030 2676 -rect 6432 2642 6472 2676 -rect 4998 2638 5058 2642 -rect 6426 2638 6472 2642 -rect 7706 2632 7766 2638 -rect 9134 2632 9180 2638 +rect 5263 2637 5323 2643 +rect 6691 2637 6737 2643 rect -442 2614 -382 2620 rect 986 2614 1032 2620 rect -3074 2604 -3014 2610 @@ -449,12 +256,8 @@ rect 3724 2604 3770 2610 rect 2296 2570 2330 2604 rect 3732 2570 3770 2604 -rect 7706 2598 7740 2632 -rect 9142 2598 9180 2632 -rect 4996 2576 5056 2582 -rect 6424 2576 6470 2582 -rect 4996 2542 5030 2576 -rect 6432 2542 6470 2576 +rect 5263 2603 5297 2637 +rect 6699 2603 6737 2637 << viali >> rect -2710 5410 -2682 5444 rect -2682 5410 -2676 5444 @@ -522,50 +325,28 @@ rect 3576 5428 3600 5462 rect 3600 5428 3610 5462 rect 3648 5428 3682 5462 -rect 4904 5400 4932 5434 -rect 4932 5400 4938 5434 -rect 4976 5400 5010 5434 -rect 5048 5400 5082 5434 -rect 5120 5400 5154 5434 -rect 5192 5400 5226 5434 -rect 5264 5400 5298 5434 -rect 5336 5400 5370 5434 -rect 5408 5400 5442 5434 -rect 5480 5400 5514 5434 -rect 5552 5400 5586 5434 -rect 5624 5400 5658 5434 -rect 5696 5400 5730 5434 -rect 5768 5400 5802 5434 -rect 5840 5400 5874 5434 -rect 5912 5400 5946 5434 -rect 5984 5400 6018 5434 -rect 6056 5400 6090 5434 -rect 6128 5400 6162 5434 -rect 6200 5400 6224 5434 -rect 6224 5400 6234 5434 -rect 6272 5400 6306 5434 -rect 7252 5428 7280 5462 -rect 7280 5428 7286 5462 -rect 7324 5428 7358 5462 -rect 7396 5428 7430 5462 -rect 7468 5428 7502 5462 -rect 7540 5428 7574 5462 -rect 7612 5428 7646 5462 -rect 7684 5428 7718 5462 -rect 7756 5428 7790 5462 -rect 7828 5428 7862 5462 -rect 7900 5428 7934 5462 -rect 7972 5428 8006 5462 -rect 8044 5428 8078 5462 -rect 8116 5428 8150 5462 -rect 8188 5428 8222 5462 -rect 8260 5428 8294 5462 -rect 8332 5428 8366 5462 -rect 8404 5428 8438 5462 -rect 8476 5428 8510 5462 -rect 8548 5428 8572 5462 -rect 8572 5428 8582 5462 -rect 8620 5428 8654 5462 +rect 4809 5433 4837 5467 +rect 4837 5433 4843 5467 +rect 4881 5433 4915 5467 +rect 4953 5433 4987 5467 +rect 5025 5433 5059 5467 +rect 5097 5433 5131 5467 +rect 5169 5433 5203 5467 +rect 5241 5433 5275 5467 +rect 5313 5433 5347 5467 +rect 5385 5433 5419 5467 +rect 5457 5433 5491 5467 +rect 5529 5433 5563 5467 +rect 5601 5433 5635 5467 +rect 5673 5433 5707 5467 +rect 5745 5433 5779 5467 +rect 5817 5433 5851 5467 +rect 5889 5433 5923 5467 +rect 5961 5433 5995 5467 +rect 6033 5433 6067 5467 +rect 6105 5433 6129 5467 +rect 6129 5433 6139 5467 +rect 6177 5433 6211 5467 rect -2718 5310 -2686 5344 rect -2686 5310 -2684 5344 rect -2646 5310 -2612 5344 @@ -632,127 +413,77 @@ rect 3568 5328 3596 5362 rect 3596 5328 3602 5362 rect 3640 5328 3674 5362 -rect 4896 5300 4928 5334 -rect 4928 5300 4930 5334 -rect 4968 5300 5002 5334 -rect 5040 5300 5074 5334 -rect 5112 5300 5146 5334 -rect 5184 5300 5218 5334 -rect 5256 5300 5290 5334 -rect 5328 5300 5362 5334 -rect 5400 5300 5434 5334 -rect 5472 5300 5506 5334 -rect 5544 5300 5578 5334 -rect 5616 5300 5650 5334 -rect 5688 5300 5722 5334 -rect 5760 5300 5794 5334 -rect 5832 5300 5866 5334 -rect 5904 5300 5938 5334 -rect 5976 5300 6010 5334 -rect 6048 5300 6082 5334 -rect 6120 5300 6154 5334 -rect 6192 5300 6220 5334 -rect 6220 5300 6226 5334 -rect 6264 5300 6298 5334 -rect 7244 5328 7276 5362 -rect 7276 5328 7278 5362 -rect 7316 5328 7350 5362 -rect 7388 5328 7422 5362 -rect 7460 5328 7494 5362 -rect 7532 5328 7566 5362 -rect 7604 5328 7638 5362 -rect 7676 5328 7710 5362 -rect 7748 5328 7782 5362 -rect 7820 5328 7854 5362 -rect 7892 5328 7926 5362 -rect 7964 5328 7998 5362 -rect 8036 5328 8070 5362 -rect 8108 5328 8142 5362 -rect 8180 5328 8214 5362 -rect 8252 5328 8286 5362 -rect 8324 5328 8358 5362 -rect 8396 5328 8430 5362 -rect 8468 5328 8502 5362 -rect 8540 5328 8568 5362 -rect 8568 5328 8574 5362 -rect 8612 5328 8646 5362 -rect 7926 4700 7960 4712 -rect 7926 4678 7960 4700 -rect 7926 4606 7960 4640 -rect 7926 4534 7960 4568 -rect 7926 4462 7960 4496 -rect 7724 4244 7758 4278 -rect 7796 4244 7830 4278 -rect 7868 4244 7902 4278 -rect 7940 4244 7962 4278 -rect 7962 4244 7974 4278 -rect -4370 3886 -4336 3920 -rect -3818 3882 -3784 3916 -rect -3242 3888 -3208 3922 -rect -2678 3888 -2644 3922 -rect -2108 3886 -2074 3920 -rect -1542 3888 -1508 3922 -rect -980 3888 -946 3922 -rect -396 3890 -362 3924 -rect 170 3886 204 3920 -rect 740 3888 774 3922 -rect 1302 3888 1336 3922 -rect 1864 3886 1898 3920 -rect 2438 3890 2472 3924 -rect 3008 3886 3042 3920 -rect 3576 3886 3610 3920 -rect 4156 3888 4190 3922 -rect 4724 3888 4758 3922 -rect 5292 3886 5326 3920 -rect 5866 3888 5900 3922 -rect 6430 3886 6464 3920 -rect 7000 3886 7034 3920 -rect 7558 3914 7592 3918 -rect 7554 3884 7592 3914 -rect 8626 3888 8660 3922 -rect 7554 3880 7588 3884 -rect 8164 3054 8198 3088 -rect 8236 3054 8270 3088 -rect 8308 3054 8342 3088 -rect 8380 3054 8414 3088 -rect 8452 3054 8486 3088 -rect 8524 3054 8558 3088 -rect 8596 3054 8630 3088 -rect 8668 3054 8702 3088 -rect 8740 3054 8774 3088 -rect 8812 3054 8846 3088 -rect 8884 3054 8918 3088 -rect 8956 3054 8990 3088 -rect 9028 3054 9062 3088 -rect 9100 3054 9134 3088 -rect 8166 2960 8200 2994 -rect 8238 2960 8272 2994 -rect 8310 2960 8344 2994 -rect 8382 2960 8416 2994 -rect 8454 2960 8488 2994 -rect 8526 2960 8560 2994 -rect 8598 2960 8632 2994 -rect 8670 2960 8704 2994 -rect 8742 2960 8776 2994 -rect 8814 2960 8848 2994 -rect 8886 2960 8920 2994 -rect 8958 2960 8992 2994 -rect 9030 2960 9064 2994 -rect 9102 2960 9136 2994 -rect 8166 2848 8200 2882 -rect 8238 2848 8272 2882 -rect 8310 2848 8344 2882 -rect 8382 2848 8416 2882 -rect 8454 2848 8488 2882 -rect 8526 2848 8560 2882 -rect 8598 2848 8632 2882 -rect 8670 2848 8704 2882 -rect 8742 2848 8776 2882 -rect 8814 2848 8848 2882 -rect 8886 2848 8920 2882 -rect 8958 2848 8992 2882 -rect 9030 2848 9064 2882 -rect 9102 2848 9136 2882 +rect 4801 5333 4833 5367 +rect 4833 5333 4835 5367 +rect 4873 5333 4907 5367 +rect 4945 5333 4979 5367 +rect 5017 5333 5051 5367 +rect 5089 5333 5123 5367 +rect 5161 5333 5195 5367 +rect 5233 5333 5267 5367 +rect 5305 5333 5339 5367 +rect 5377 5333 5411 5367 +rect 5449 5333 5483 5367 +rect 5521 5333 5555 5367 +rect 5593 5333 5627 5367 +rect 5665 5333 5699 5367 +rect 5737 5333 5771 5367 +rect 5809 5333 5843 5367 +rect 5881 5333 5915 5367 +rect 5953 5333 5987 5367 +rect 6025 5333 6059 5367 +rect 6097 5333 6125 5367 +rect 6125 5333 6131 5367 +rect 6169 5333 6203 5367 +rect 5483 4705 5517 4717 +rect 5483 4683 5517 4705 +rect 5483 4611 5517 4645 +rect 5483 4539 5517 4573 +rect 5483 4467 5517 4501 +rect 5512 3902 5592 3942 +rect 6183 3893 6217 3927 +rect 5721 3059 5755 3093 +rect 5793 3059 5827 3093 +rect 5865 3059 5899 3093 +rect 5937 3059 5971 3093 +rect 6009 3059 6043 3093 +rect 6081 3059 6115 3093 +rect 6153 3059 6187 3093 +rect 6225 3059 6259 3093 +rect 6297 3059 6331 3093 +rect 6369 3059 6403 3093 +rect 6441 3059 6475 3093 +rect 6513 3059 6547 3093 +rect 6585 3059 6619 3093 +rect 6657 3059 6691 3093 +rect 5723 2965 5757 2999 +rect 5795 2965 5829 2999 +rect 5867 2965 5901 2999 +rect 5939 2965 5973 2999 +rect 6011 2965 6045 2999 +rect 6083 2965 6117 2999 +rect 6155 2965 6189 2999 +rect 6227 2965 6261 2999 +rect 6299 2965 6333 2999 +rect 6371 2965 6405 2999 +rect 6443 2965 6477 2999 +rect 6515 2965 6549 2999 +rect 6587 2965 6621 2999 +rect 6659 2965 6693 2999 +rect 5723 2853 5757 2887 +rect 5795 2853 5829 2887 +rect 5867 2853 5901 2887 +rect 5939 2853 5973 2887 +rect 6011 2853 6045 2887 +rect 6083 2853 6117 2887 +rect 6155 2853 6189 2887 +rect 6227 2853 6261 2887 +rect 6299 2853 6333 2887 +rect 6371 2853 6405 2887 +rect 6443 2853 6477 2887 +rect 6515 2853 6549 2887 +rect 6587 2853 6621 2887 +rect 6659 2853 6693 2887 rect -3040 2670 -3012 2704 rect -3012 2670 -3006 2704 rect -2968 2670 -2934 2704 @@ -819,50 +550,28 @@ rect 3626 2670 3660 2704 rect 3698 2670 3726 2704 rect 3726 2670 3732 2704 -rect 7740 2698 7768 2732 -rect 7768 2698 7774 2732 -rect 7812 2698 7846 2732 -rect 7884 2698 7918 2732 -rect 7956 2698 7990 2732 -rect 8028 2698 8062 2732 -rect 8100 2698 8134 2732 -rect 8172 2698 8206 2732 -rect 8244 2698 8278 2732 -rect 8316 2698 8350 2732 -rect 8388 2698 8422 2732 -rect 8460 2698 8494 2732 -rect 8532 2698 8566 2732 -rect 8604 2698 8638 2732 -rect 8676 2698 8710 2732 -rect 8748 2698 8782 2732 -rect 8820 2698 8854 2732 -rect 8892 2698 8926 2732 -rect 8964 2698 8998 2732 -rect 9036 2698 9070 2732 -rect 9108 2698 9136 2732 -rect 9136 2698 9142 2732 -rect 5030 2642 5058 2676 -rect 5058 2642 5064 2676 -rect 5102 2642 5136 2676 -rect 5174 2642 5208 2676 -rect 5246 2642 5280 2676 -rect 5318 2642 5352 2676 -rect 5390 2642 5424 2676 -rect 5462 2642 5496 2676 -rect 5534 2642 5568 2676 -rect 5606 2642 5640 2676 -rect 5678 2642 5712 2676 -rect 5750 2642 5784 2676 -rect 5822 2642 5856 2676 -rect 5894 2642 5928 2676 -rect 5966 2642 6000 2676 -rect 6038 2642 6072 2676 -rect 6110 2642 6144 2676 -rect 6182 2642 6216 2676 -rect 6254 2642 6288 2676 -rect 6326 2642 6360 2676 -rect 6398 2642 6426 2676 -rect 6426 2642 6432 2676 +rect 5297 2703 5325 2737 +rect 5325 2703 5331 2737 +rect 5369 2703 5403 2737 +rect 5441 2703 5475 2737 +rect 5513 2703 5547 2737 +rect 5585 2703 5619 2737 +rect 5657 2703 5691 2737 +rect 5729 2703 5763 2737 +rect 5801 2703 5835 2737 +rect 5873 2703 5907 2737 +rect 5945 2703 5979 2737 +rect 6017 2703 6051 2737 +rect 6089 2703 6123 2737 +rect 6161 2703 6195 2737 +rect 6233 2703 6267 2737 +rect 6305 2703 6339 2737 +rect 6377 2703 6411 2737 +rect 6449 2703 6483 2737 +rect 6521 2703 6555 2737 +rect 6593 2703 6627 2737 +rect 6665 2703 6693 2737 +rect 6693 2703 6699 2737 rect -3040 2570 -3014 2604 rect -3014 2570 -3006 2604 rect -2968 2570 -2934 2604 @@ -929,52 +638,31 @@ rect 3626 2570 3660 2604 rect 3698 2570 3724 2604 rect 3724 2570 3732 2604 -rect 7740 2598 7766 2632 -rect 7766 2598 7774 2632 -rect 7812 2598 7846 2632 -rect 7884 2598 7918 2632 -rect 7956 2598 7990 2632 -rect 8028 2598 8062 2632 -rect 8100 2598 8134 2632 -rect 8172 2598 8206 2632 -rect 8244 2598 8278 2632 -rect 8316 2598 8350 2632 -rect 8388 2598 8422 2632 -rect 8460 2598 8494 2632 -rect 8532 2598 8566 2632 -rect 8604 2598 8638 2632 -rect 8676 2598 8710 2632 -rect 8748 2598 8782 2632 -rect 8820 2598 8854 2632 -rect 8892 2598 8926 2632 -rect 8964 2598 8998 2632 -rect 9036 2598 9070 2632 -rect 9108 2598 9134 2632 -rect 9134 2598 9142 2632 -rect 5030 2542 5056 2576 -rect 5056 2542 5064 2576 -rect 5102 2542 5136 2576 -rect 5174 2542 5208 2576 -rect 5246 2542 5280 2576 -rect 5318 2542 5352 2576 -rect 5390 2542 5424 2576 -rect 5462 2542 5496 2576 -rect 5534 2542 5568 2576 -rect 5606 2542 5640 2576 -rect 5678 2542 5712 2576 -rect 5750 2542 5784 2576 -rect 5822 2542 5856 2576 -rect 5894 2542 5928 2576 -rect 5966 2542 6000 2576 -rect 6038 2542 6072 2576 -rect 6110 2542 6144 2576 -rect 6182 2542 6216 2576 -rect 6254 2542 6288 2576 -rect 6326 2542 6360 2576 -rect 6398 2542 6424 2576 -rect 6424 2542 6432 2576 +rect 5297 2603 5323 2637 +rect 5323 2603 5331 2637 +rect 5369 2603 5403 2637 +rect 5441 2603 5475 2637 +rect 5513 2603 5547 2637 +rect 5585 2603 5619 2637 +rect 5657 2603 5691 2637 +rect 5729 2603 5763 2637 +rect 5801 2603 5835 2637 +rect 5873 2603 5907 2637 +rect 5945 2603 5979 2637 +rect 6017 2603 6051 2637 +rect 6089 2603 6123 2637 +rect 6161 2603 6195 2637 +rect 6233 2603 6267 2637 +rect 6305 2603 6339 2637 +rect 6377 2603 6411 2637 +rect 6449 2603 6483 2637 +rect 6521 2603 6555 2637 +rect 6593 2603 6627 2637 +rect 6665 2603 6691 2637 +rect 6691 2603 6699 2637 << metal1 >> -rect -5122 5462 9233 5516 +rect -5122 5467 6790 5516 +rect -5122 5462 4809 5467 rect -5122 5444 2280 5462 rect -5122 5410 -2710 5444 rect -2676 5410 -2638 5444 @@ -1038,51 +726,31 @@ rect 3466 5428 3504 5462 rect 3538 5428 3576 5462 rect 3610 5428 3648 5462 -rect 3682 5434 7252 5462 -rect 3682 5428 4904 5434 -rect 1324 5400 4904 5428 -rect 4938 5400 4976 5434 -rect 5010 5400 5048 5434 -rect 5082 5400 5120 5434 -rect 5154 5400 5192 5434 -rect 5226 5400 5264 5434 -rect 5298 5400 5336 5434 -rect 5370 5400 5408 5434 -rect 5442 5400 5480 5434 -rect 5514 5400 5552 5434 -rect 5586 5400 5624 5434 -rect 5658 5400 5696 5434 -rect 5730 5400 5768 5434 -rect 5802 5400 5840 5434 -rect 5874 5400 5912 5434 -rect 5946 5400 5984 5434 -rect 6018 5400 6056 5434 -rect 6090 5400 6128 5434 -rect 6162 5400 6200 5434 -rect 6234 5400 6272 5434 -rect 6306 5428 7252 5434 -rect 7286 5428 7324 5462 -rect 7358 5428 7396 5462 -rect 7430 5428 7468 5462 -rect 7502 5428 7540 5462 -rect 7574 5428 7612 5462 -rect 7646 5428 7684 5462 -rect 7718 5428 7756 5462 -rect 7790 5428 7828 5462 -rect 7862 5428 7900 5462 -rect 7934 5428 7972 5462 -rect 8006 5428 8044 5462 -rect 8078 5428 8116 5462 -rect 8150 5428 8188 5462 -rect 8222 5428 8260 5462 -rect 8294 5428 8332 5462 -rect 8366 5428 8404 5462 -rect 8438 5428 8476 5462 -rect 8510 5428 8548 5462 -rect 8582 5428 8620 5462 -rect 8654 5428 9233 5462 -rect 6306 5400 9233 5428 -rect -5122 5362 9233 5400 +rect 3682 5433 4809 5462 +rect 4843 5433 4881 5467 +rect 4915 5433 4953 5467 +rect 4987 5433 5025 5467 +rect 5059 5433 5097 5467 +rect 5131 5433 5169 5467 +rect 5203 5433 5241 5467 +rect 5275 5433 5313 5467 +rect 5347 5433 5385 5467 +rect 5419 5433 5457 5467 +rect 5491 5433 5529 5467 +rect 5563 5433 5601 5467 +rect 5635 5433 5673 5467 +rect 5707 5433 5745 5467 +rect 5779 5433 5817 5467 +rect 5851 5433 5889 5467 +rect 5923 5433 5961 5467 +rect 5995 5433 6033 5467 +rect 6067 5433 6105 5467 +rect 6139 5433 6177 5467 +rect 6211 5433 6790 5467 +rect 3682 5428 6790 5433 +rect 1324 5400 6790 5428 +rect -5122 5367 6790 5400 +rect -5122 5362 4801 5367 rect -5122 5344 2272 5362 rect -5122 5310 -2718 5344 rect -2684 5310 -2646 5344 @@ -1146,264 +814,176 @@ rect 3458 5328 3496 5362 rect 3530 5328 3568 5362 rect 3602 5328 3640 5362 -rect 3674 5334 7244 5362 -rect 3674 5328 4896 5334 -rect 1316 5300 4896 5328 -rect 4930 5300 4968 5334 -rect 5002 5300 5040 5334 -rect 5074 5300 5112 5334 -rect 5146 5300 5184 5334 -rect 5218 5300 5256 5334 -rect 5290 5300 5328 5334 -rect 5362 5300 5400 5334 -rect 5434 5300 5472 5334 -rect 5506 5300 5544 5334 -rect 5578 5300 5616 5334 -rect 5650 5300 5688 5334 -rect 5722 5300 5760 5334 -rect 5794 5300 5832 5334 -rect 5866 5300 5904 5334 -rect 5938 5300 5976 5334 -rect 6010 5300 6048 5334 -rect 6082 5300 6120 5334 -rect 6154 5300 6192 5334 -rect 6226 5300 6264 5334 -rect 6298 5328 7244 5334 -rect 7278 5328 7316 5362 -rect 7350 5328 7388 5362 -rect 7422 5328 7460 5362 -rect 7494 5328 7532 5362 -rect 7566 5328 7604 5362 -rect 7638 5328 7676 5362 -rect 7710 5328 7748 5362 -rect 7782 5328 7820 5362 -rect 7854 5328 7892 5362 -rect 7926 5328 7964 5362 -rect 7998 5328 8036 5362 -rect 8070 5328 8108 5362 -rect 8142 5328 8180 5362 -rect 8214 5328 8252 5362 -rect 8286 5328 8324 5362 -rect 8358 5328 8396 5362 -rect 8430 5328 8468 5362 -rect 8502 5328 8540 5362 -rect 8574 5328 8612 5362 -rect 8646 5328 9233 5362 -rect 6298 5300 9233 5328 -rect -5122 5198 9233 5300 -rect -4874 5051 -4832 5198 +rect 3674 5333 4801 5362 +rect 4835 5333 4873 5367 +rect 4907 5333 4945 5367 +rect 4979 5333 5017 5367 +rect 5051 5333 5089 5367 +rect 5123 5333 5161 5367 +rect 5195 5333 5233 5367 +rect 5267 5333 5305 5367 +rect 5339 5333 5377 5367 +rect 5411 5333 5449 5367 +rect 5483 5333 5521 5367 +rect 5555 5333 5593 5367 +rect 5627 5333 5665 5367 +rect 5699 5333 5737 5367 +rect 5771 5333 5809 5367 +rect 5843 5333 5881 5367 +rect 5915 5333 5953 5367 +rect 5987 5333 6025 5367 +rect 6059 5333 6097 5367 +rect 6131 5333 6169 5367 +rect 6203 5333 6790 5367 +rect 3674 5328 6790 5333 +rect 1316 5300 6790 5328 +rect -5122 5199 6790 5300 +rect -5122 5198 -3779 5199 +rect -3442 5198 6790 5199 +rect -4874 5053 -4832 5198 rect -4804 5082 -4794 5142 rect -4734 5082 -4724 5142 -rect -3768 5054 -3726 5198 -rect -3698 5088 -3688 5148 -rect -3628 5088 -3618 5148 +rect -4874 5051 -4804 5053 rect -4874 4888 -4790 5051 +rect -210 5049 -134 5198 +rect -103 5077 -93 5137 +rect -33 5077 -23 5137 rect -4726 5040 -4470 5046 rect -4736 5032 -4470 5040 -rect -4874 4886 -4832 4888 rect -4740 4882 -4730 5032 rect -4674 4882 -4470 5032 rect -4896 3112 -4822 3114 rect -4898 2932 -4822 3112 rect -4736 3109 -4470 4882 -rect -3768 5042 -3698 5054 -rect -3768 4752 -3688 5042 -rect -3768 4751 -3698 4752 -rect -3636 4352 -3499 5046 -rect 7850 4712 8202 4866 -rect 7850 4678 7926 4712 -rect 7960 4678 8202 4712 -rect 7850 4640 8202 4678 -rect 7850 4606 7926 4640 -rect 7960 4606 8202 4640 -rect 7850 4568 8202 4606 -rect 8741 4706 9233 5198 -rect 7850 4534 7926 4568 -rect 7960 4534 8202 4568 -rect 7850 4496 8202 4534 -rect 7850 4462 7926 4496 -rect 7960 4462 8202 4496 -rect 7850 4352 8202 4462 -rect -4314 4278 8202 4352 -rect -4314 4244 7724 4278 -rect 7758 4244 7796 4278 -rect 7830 4244 7868 4278 -rect 7902 4244 7940 4278 -rect 7974 4244 8202 4278 -rect -4314 4172 8202 4244 -rect -4388 3934 -4318 3938 -rect -4394 3866 -4384 3934 -rect -4314 3866 -4304 3934 -rect -3254 3922 -3196 3928 -rect -3830 3916 -3772 3922 -rect -3830 3882 -3818 3916 -rect -3784 3882 -3772 3916 -rect -3254 3888 -3242 3922 -rect -3208 3888 -3196 3922 -rect -3254 3882 -3196 3888 -rect -2690 3922 -2632 3928 -rect -2690 3888 -2678 3922 -rect -2644 3888 -2632 3922 -rect -2690 3882 -2632 3888 -rect -2120 3920 -2062 3926 -rect -2120 3886 -2108 3920 -rect -2074 3886 -2062 3920 -rect -3830 3876 -3772 3882 -rect -2120 3880 -2062 3886 -rect -1554 3922 -1496 3928 -rect -1554 3888 -1542 3922 -rect -1508 3888 -1496 3922 -rect -1554 3882 -1496 3888 -rect -992 3922 -934 3928 -rect -992 3888 -980 3922 -rect -946 3888 -934 3922 -rect -992 3882 -934 3888 -rect -408 3924 -350 3930 -rect -408 3890 -396 3924 -rect -362 3890 -350 3924 -rect -408 3884 -350 3890 -rect 158 3920 216 3926 -rect 158 3886 170 3920 -rect 204 3886 216 3920 -rect 158 3880 216 3886 -rect 728 3922 786 3928 -rect 728 3888 740 3922 -rect 774 3888 786 3922 -rect 728 3882 786 3888 -rect 1290 3922 1348 3928 -rect 1290 3888 1302 3922 -rect 1336 3888 1348 3922 -rect 1290 3882 1348 3888 -rect 1852 3920 1910 3926 -rect 1852 3886 1864 3920 -rect 1898 3886 1910 3920 -rect 1852 3880 1910 3886 -rect 2426 3924 2484 3930 -rect 2426 3890 2438 3924 -rect 2472 3890 2484 3924 -rect 2426 3884 2484 3890 -rect 2996 3920 3054 3926 -rect 2996 3886 3008 3920 -rect 3042 3886 3054 3920 -rect 2996 3880 3054 3886 -rect 3564 3920 3622 3926 -rect 3564 3886 3576 3920 -rect 3610 3886 3622 3920 -rect 3564 3880 3622 3886 -rect 4144 3922 4202 3928 -rect 4144 3888 4156 3922 -rect 4190 3888 4202 3922 -rect 4144 3882 4202 3888 -rect 4712 3922 4770 3928 -rect 4712 3888 4724 3922 -rect 4758 3888 4770 3922 -rect 4712 3882 4770 3888 -rect 5280 3920 5338 3926 -rect 5280 3886 5292 3920 -rect 5326 3886 5338 3920 -rect 5280 3880 5338 3886 -rect 5854 3922 5912 3928 -rect 5854 3888 5866 3922 -rect 5900 3888 5912 3922 -rect 5854 3882 5912 3888 -rect 6418 3920 6476 3926 -rect 6418 3886 6430 3920 -rect 6464 3886 6476 3920 -rect 6418 3880 6476 3886 -rect 6988 3920 7046 3926 -rect 7546 3920 7604 3924 -rect 6988 3886 7000 3920 -rect 7034 3886 7046 3920 -rect 6988 3880 7046 3886 -rect 7542 3918 7604 3920 -rect 7542 3914 7558 3918 -rect 7542 3880 7554 3914 -rect 7592 3884 7604 3918 -rect 7588 3880 7604 3884 -rect 7542 3878 7604 3880 -rect 8258 3922 8292 4592 -rect 8741 4451 9231 4706 -rect 8960 4160 8994 4451 -rect 8584 3922 8594 3938 -rect 8664 3922 8674 3938 -rect 8258 3886 8594 3922 -rect 8664 3920 8689 3922 -rect 9050 3920 9082 4350 -rect 7542 3874 7600 3878 -rect 8168 3624 8202 3684 +rect -210 5036 -106 5049 +rect -210 4761 -87 5036 +rect -32 5035 -1 5039 +rect -32 4220 135 5035 +rect -29 4207 135 4220 +rect 3939 4871 4093 4872 +rect 3939 4717 5759 4871 +rect 3939 4683 5483 4717 +rect 5517 4683 5759 4717 +rect 3939 4645 5759 4683 +rect 3939 4611 5483 4645 +rect 5517 4611 5759 4645 +rect 3939 4573 5759 4611 +rect 6298 4711 6790 5198 +rect 3939 4570 5483 4573 +rect 3939 4121 4311 4570 +rect 5422 4539 5483 4570 +rect 5517 4539 5759 4573 +rect 5422 4501 5759 4539 +rect 5422 4467 5483 4501 +rect 5517 4467 5759 4501 +rect 5422 4178 5759 4467 +rect 5567 4177 5759 4178 +rect 4936 3930 4946 4016 +rect 5118 4002 5128 4016 +rect 5118 3958 5605 4002 +rect 5118 3944 5610 3958 +rect 5118 3930 5128 3944 +rect 5494 3942 5610 3944 +rect 5494 3902 5512 3942 +rect 5592 3902 5610 3942 +rect -4419 3829 -4286 3892 +rect 5494 3884 5610 3902 +rect 5815 3927 5849 4597 +rect 6298 4456 6788 4711 +rect 6517 4165 6551 4456 +rect 6089 3927 6099 3944 +rect 6220 3943 6230 3944 +rect 6221 3927 6231 3943 +rect 5815 3891 6099 3927 +rect 6221 3925 6246 3927 +rect 6607 3925 6639 4355 +rect 5504 3881 5562 3884 +rect -4430 3743 -4420 3829 +rect -4275 3828 -4265 3829 +rect -4275 3754 -4229 3828 +rect 4209 3754 4628 3828 +rect -4275 3743 -4265 3754 +rect 4231 3660 4498 3691 +rect 4231 3645 4254 3660 +rect 4227 3590 4254 3645 +rect 4244 3574 4254 3590 +rect 4340 3636 4498 3660 +rect 4340 3590 4351 3636 +rect 4340 3574 4350 3590 rect -4767 2937 -4470 3109 -rect -3770 2956 -3696 3138 rect -4736 2935 -4470 2937 +rect -179 2943 -89 3157 rect -4898 2804 -4862 2932 rect -4834 2848 -4824 2902 rect -4764 2848 -4754 2902 -rect -3768 2804 -3732 2956 -rect -3640 2950 -3608 3532 -rect 7804 3520 8202 3624 -rect 8168 3444 8202 3520 -rect 8258 3474 8292 3886 -rect 8584 3870 8594 3886 -rect 8664 3886 8693 3920 -rect 9050 3886 9347 3920 -rect 8664 3870 8674 3886 -rect 8343 3351 8400 3419 -rect 8960 3417 8996 3620 -rect 9050 3526 9082 3886 -rect 8092 3220 8400 3351 -rect 8602 3220 9243 3417 -rect 8093 3088 9245 3220 -rect 8093 3054 8164 3088 -rect 8198 3054 8236 3088 -rect 8270 3054 8308 3088 -rect 8342 3054 8380 3088 -rect 8414 3054 8452 3088 -rect 8486 3054 8524 3088 -rect 8558 3054 8596 3088 -rect 8630 3054 8668 3088 -rect 8702 3054 8740 3088 -rect 8774 3054 8812 3088 -rect 8846 3054 8884 3088 -rect 8918 3054 8956 3088 -rect 8990 3054 9028 3088 -rect 9062 3054 9100 3088 -rect 9134 3054 9245 3088 -rect 8093 2994 9245 3054 -rect 8093 2960 8166 2994 -rect 8200 2960 8238 2994 -rect 8272 2960 8310 2994 -rect 8344 2960 8382 2994 -rect 8416 2960 8454 2994 -rect 8488 2960 8526 2994 -rect 8560 2960 8598 2994 -rect 8632 2960 8670 2994 -rect 8704 2960 8742 2994 -rect 8776 2960 8814 2994 -rect 8848 2960 8886 2994 -rect 8920 2960 8958 2994 -rect 8992 2960 9030 2994 -rect 9064 2960 9102 2994 -rect 9136 2960 9245 2994 -rect -3702 2844 -3692 2898 -rect -3632 2844 -3622 2898 -rect 8093 2882 9245 2960 -rect 8093 2848 8166 2882 -rect 8200 2848 8238 2882 -rect 8272 2848 8310 2882 -rect 8344 2848 8382 2882 -rect 8416 2848 8454 2882 -rect 8488 2848 8526 2882 -rect 8560 2848 8598 2882 -rect 8632 2848 8670 2882 -rect 8704 2848 8742 2882 -rect 8776 2848 8814 2882 -rect 8848 2848 8886 2882 -rect 8920 2848 8958 2882 -rect 8992 2848 9030 2882 -rect 9064 2848 9102 2882 -rect 9136 2848 9245 2882 -rect 8093 2804 9245 2848 -rect -5118 2732 9245 2804 -rect -5118 2714 7740 2732 +rect -3768 2804 -3732 2805 +rect -179 2804 -137 2943 +rect -109 2857 -99 2911 +rect -39 2857 -29 2911 +rect 204 2804 379 3501 +rect 5815 3479 5849 3891 +rect 6089 3874 6099 3891 +rect 6221 3891 6250 3925 +rect 6607 3891 6897 3925 +rect 6221 3875 6231 3891 +rect 6220 3874 6230 3875 +rect 4650 2804 5165 3414 +rect 5900 3356 5957 3424 +rect 6517 3422 6553 3625 +rect 6607 3531 6639 3891 +rect 5649 3225 5957 3356 +rect 6159 3225 6800 3422 +rect 5650 3093 6802 3225 +rect 5650 3059 5721 3093 +rect 5755 3059 5793 3093 +rect 5827 3059 5865 3093 +rect 5899 3059 5937 3093 +rect 5971 3059 6009 3093 +rect 6043 3059 6081 3093 +rect 6115 3059 6153 3093 +rect 6187 3059 6225 3093 +rect 6259 3059 6297 3093 +rect 6331 3059 6369 3093 +rect 6403 3059 6441 3093 +rect 6475 3059 6513 3093 +rect 6547 3059 6585 3093 +rect 6619 3059 6657 3093 +rect 6691 3059 6802 3093 +rect 5650 2999 6802 3059 +rect 5650 2965 5723 2999 +rect 5757 2965 5795 2999 +rect 5829 2965 5867 2999 +rect 5901 2965 5939 2999 +rect 5973 2965 6011 2999 +rect 6045 2965 6083 2999 +rect 6117 2965 6155 2999 +rect 6189 2965 6227 2999 +rect 6261 2965 6299 2999 +rect 6333 2965 6371 2999 +rect 6405 2965 6443 2999 +rect 6477 2965 6515 2999 +rect 6549 2965 6587 2999 +rect 6621 2965 6659 2999 +rect 6693 2965 6802 2999 +rect 5650 2887 6802 2965 +rect 5650 2853 5723 2887 +rect 5757 2853 5795 2887 +rect 5829 2853 5867 2887 +rect 5901 2853 5939 2887 +rect 5973 2853 6011 2887 +rect 6045 2853 6083 2887 +rect 6117 2853 6155 2887 +rect 6189 2853 6227 2887 +rect 6261 2853 6299 2887 +rect 6333 2853 6371 2887 +rect 6405 2853 6443 2887 +rect 6477 2853 6515 2887 +rect 6549 2853 6587 2887 +rect 6621 2853 6659 2887 +rect 6693 2853 6802 2887 +rect 5650 2804 6802 2853 +rect -5118 2737 6804 2804 +rect -5118 2714 5297 2737 rect -5118 2704 -408 2714 rect -5118 2670 -3040 2704 rect -3006 2670 -2968 2704 @@ -1445,7 +1025,7 @@ rect 778 2680 816 2714 rect 850 2680 888 2714 rect 922 2680 960 2714 -rect 994 2704 7740 2714 +rect 994 2704 5297 2714 rect 994 2680 2330 2704 rect -1638 2670 2330 2680 rect 2364 2670 2402 2704 @@ -1467,53 +1047,31 @@ rect 3516 2670 3554 2704 rect 3588 2670 3626 2704 rect 3660 2670 3698 2704 -rect 3732 2698 7740 2704 -rect 7774 2698 7812 2732 -rect 7846 2698 7884 2732 -rect 7918 2698 7956 2732 -rect 7990 2698 8028 2732 -rect 8062 2698 8100 2732 -rect 8134 2698 8172 2732 -rect 8206 2698 8244 2732 -rect 8278 2698 8316 2732 -rect 8350 2698 8388 2732 -rect 8422 2698 8460 2732 -rect 8494 2698 8532 2732 -rect 8566 2698 8604 2732 -rect 8638 2698 8676 2732 -rect 8710 2698 8748 2732 -rect 8782 2698 8820 2732 -rect 8854 2698 8892 2732 -rect 8926 2698 8964 2732 -rect 8998 2698 9036 2732 -rect 9070 2698 9108 2732 -rect 9142 2698 9245 2732 -rect 3732 2676 9245 2698 -rect 3732 2670 5030 2676 -rect -5118 2642 5030 2670 -rect 5064 2642 5102 2676 -rect 5136 2642 5174 2676 -rect 5208 2642 5246 2676 -rect 5280 2642 5318 2676 -rect 5352 2642 5390 2676 -rect 5424 2642 5462 2676 -rect 5496 2642 5534 2676 -rect 5568 2642 5606 2676 -rect 5640 2642 5678 2676 -rect 5712 2642 5750 2676 -rect 5784 2642 5822 2676 -rect 5856 2642 5894 2676 -rect 5928 2642 5966 2676 -rect 6000 2642 6038 2676 -rect 6072 2642 6110 2676 -rect 6144 2642 6182 2676 -rect 6216 2642 6254 2676 -rect 6288 2642 6326 2676 -rect 6360 2642 6398 2676 -rect 6432 2642 9245 2676 -rect -5118 2632 9245 2642 -rect -5118 2624 7740 2632 -rect -5114 2614 7740 2624 +rect 3732 2703 5297 2704 +rect 5331 2703 5369 2737 +rect 5403 2703 5441 2737 +rect 5475 2703 5513 2737 +rect 5547 2703 5585 2737 +rect 5619 2703 5657 2737 +rect 5691 2703 5729 2737 +rect 5763 2703 5801 2737 +rect 5835 2703 5873 2737 +rect 5907 2703 5945 2737 +rect 5979 2703 6017 2737 +rect 6051 2703 6089 2737 +rect 6123 2703 6161 2737 +rect 6195 2703 6233 2737 +rect 6267 2703 6305 2737 +rect 6339 2703 6377 2737 +rect 6411 2703 6449 2737 +rect 6483 2703 6521 2737 +rect 6555 2703 6593 2737 +rect 6627 2703 6665 2737 +rect 6699 2703 6804 2737 +rect 3732 2670 6804 2703 +rect -5118 2637 6804 2670 +rect -5118 2624 5297 2637 +rect -5114 2614 5297 2624 rect -5114 2604 -408 2614 rect -5114 2570 -3040 2604 rect -3006 2570 -2968 2604 @@ -1555,7 +1113,7 @@ rect 778 2580 816 2614 rect 850 2580 888 2614 rect 922 2580 960 2614 -rect 994 2604 7740 2614 +rect 994 2604 5297 2614 rect 994 2580 2330 2604 rect -1638 2570 2330 2580 rect 2364 2570 2402 2604 @@ -1577,96 +1135,108 @@ rect 3516 2570 3554 2604 rect 3588 2570 3626 2604 rect 3660 2570 3698 2604 -rect 3732 2598 7740 2604 -rect 7774 2598 7812 2632 -rect 7846 2598 7884 2632 -rect 7918 2598 7956 2632 -rect 7990 2598 8028 2632 -rect 8062 2598 8100 2632 -rect 8134 2598 8172 2632 -rect 8206 2598 8244 2632 -rect 8278 2598 8316 2632 -rect 8350 2598 8388 2632 -rect 8422 2598 8460 2632 -rect 8494 2598 8532 2632 -rect 8566 2598 8604 2632 -rect 8638 2598 8676 2632 -rect 8710 2598 8748 2632 -rect 8782 2598 8820 2632 -rect 8854 2598 8892 2632 -rect 8926 2598 8964 2632 -rect 8998 2598 9036 2632 -rect 9070 2598 9108 2632 -rect 9142 2598 9245 2632 -rect 3732 2576 9245 2598 -rect 3732 2570 5030 2576 -rect -5114 2542 5030 2570 -rect 5064 2542 5102 2576 -rect 5136 2542 5174 2576 -rect 5208 2542 5246 2576 -rect 5280 2542 5318 2576 -rect 5352 2542 5390 2576 -rect 5424 2542 5462 2576 -rect 5496 2542 5534 2576 -rect 5568 2542 5606 2576 -rect 5640 2542 5678 2576 -rect 5712 2542 5750 2576 -rect 5784 2542 5822 2576 -rect 5856 2542 5894 2576 -rect 5928 2542 5966 2576 -rect 6000 2542 6038 2576 -rect 6072 2542 6110 2576 -rect 6144 2542 6182 2576 -rect 6216 2542 6254 2576 -rect 6288 2542 6326 2576 -rect 6360 2542 6398 2576 -rect 6432 2542 9245 2576 -rect -5114 2462 9245 2542 +rect 3732 2603 5297 2604 +rect 5331 2603 5369 2637 +rect 5403 2603 5441 2637 +rect 5475 2603 5513 2637 +rect 5547 2603 5585 2637 +rect 5619 2603 5657 2637 +rect 5691 2603 5729 2637 +rect 5763 2603 5801 2637 +rect 5835 2603 5873 2637 +rect 5907 2603 5945 2637 +rect 5979 2603 6017 2637 +rect 6051 2603 6089 2637 +rect 6123 2603 6161 2637 +rect 6195 2603 6233 2637 +rect 6267 2603 6305 2637 +rect 6339 2603 6377 2637 +rect 6411 2603 6449 2637 +rect 6483 2603 6521 2637 +rect 6555 2603 6593 2637 +rect 6627 2603 6665 2637 +rect 6699 2603 6804 2637 +rect 3732 2570 6804 2603 +rect -5114 2462 6804 2570 << via1 >> rect -4794 5082 -4734 5142 -rect -3688 5088 -3628 5148 +rect -93 5077 -33 5137 rect -4730 4882 -4674 5032 -rect -4384 3920 -4314 3934 -rect -4384 3886 -4370 3920 -rect -4370 3886 -4336 3920 -rect -4336 3886 -4314 3920 -rect -4384 3866 -4314 3886 -rect 8594 3922 8664 3938 -rect 8594 3888 8626 3922 -rect 8626 3888 8660 3922 -rect 8660 3888 8664 3922 +rect 4946 3930 5118 4016 +rect 6099 3943 6220 3944 +rect 6099 3927 6221 3943 +rect 6099 3893 6183 3927 +rect 6183 3893 6217 3927 +rect 6217 3893 6221 3927 +rect -4420 3743 -4275 3829 +rect 4254 3574 4340 3660 rect -4824 2848 -4764 2902 -rect 8594 3870 8664 3888 -rect -3692 2844 -3632 2898 +rect -99 2857 -39 2911 +rect 6099 3875 6221 3893 +rect 6099 3874 6220 3875 << metal2 >> rect -4794 5148 -4734 5152 -rect -3688 5148 -3628 5158 -rect -4802 5142 -3688 5148 +rect -4802 5144 -4734 5148 +rect -93 5144 -33 5147 +rect -4802 5142 -31 5144 rect -4802 5090 -4794 5142 -rect -4734 5090 -3688 5142 +rect -4796 5086 -4794 5090 +rect -4734 5137 -31 5142 +rect -4734 5086 -93 5137 rect -4794 5072 -4734 5082 -rect -4696 5042 -4658 5090 -rect -3688 5078 -3628 5088 +rect -4696 5042 -4658 5086 +rect -33 5086 -31 5137 +rect -93 5067 -33 5077 rect -4730 5032 -4658 5042 rect -4674 4884 -4658 5032 rect -4730 4872 -4674 4882 -rect -4386 3938 8676 3954 -rect -4386 3934 8594 3938 -rect -4386 3866 -4384 3934 -rect -4314 3870 8594 3934 -rect 8664 3870 8676 3938 -rect -4314 3866 8676 3870 -rect -4386 3842 8676 3866 +rect 979 4879 6229 5029 +rect 979 4558 1148 4879 +rect -4425 4408 1148 4558 +rect -4425 3829 -4275 4408 +rect 4946 4016 5118 4026 +rect 4946 3920 5118 3930 +rect 6079 3959 6229 4879 +rect 6079 3944 6233 3959 +rect 6079 3874 6099 3944 +rect 6220 3943 6233 3944 +rect 6221 3875 6233 3943 +rect 6220 3874 6233 3875 +rect 6079 3850 6233 3874 +rect 6151 3847 6233 3850 +rect -4425 3751 -4420 3829 +rect -4420 3733 -4275 3743 +rect 4254 3660 4340 3670 +rect -39 2955 -3 3624 +rect 4163 3574 4254 3660 +rect 4254 3564 4340 3574 +rect 4499 3314 4555 3753 +rect 4499 3258 6895 3314 rect -4824 2910 -4764 2912 -rect -4836 2902 -3632 2910 +rect -4836 2909 -4764 2910 +rect -99 2911 -39 2923 +rect -4836 2902 -99 2909 rect -4836 2848 -4824 2902 -rect -4764 2898 -3632 2902 -rect -4764 2848 -3692 2898 +rect -4764 2857 -99 2902 +rect -4764 2853 -39 2857 rect -4824 2838 -4764 2848 -rect -3692 2834 -3632 2844 +rect -99 2847 -39 2853 +use via_li_m1 via_li_m1_4 +array 0 13 72 0 0 74 +timestamp 1607692587 +transform 1 0 5705 0 1 3141 +box 4 0 76 74 +use sky130_fd_pr__nfet_01v8_R7545W sky130_fd_pr__nfet_01v8_R7545W_0 +timestamp 1608229183 +transform 1 0 5788 0 1 3563 +box -211 -330 211 330 +use sky130_fd_pr__nfet_01v8_9TXQ83 sky130_fd_pr__nfet_01v8_9TXQ83_1 +timestamp 1608229483 +transform 1 0 6580 0 1 3579 +box -211 -264 211 264 use sky130_fd_pr__nfet_01v8_ZE46K8 sky130_fd_pr__nfet_01v8_ZE46K8_0 timestamp 1608322001 -transform -1 0 -3669 0 -1 3045 +transform -1 0 -64 0 -1 3056 box -211 -319 211 319 use via_li_m1 via_li_m1_1 array 0 19 72 0 0 74 @@ -1682,35 +1252,21 @@ timestamp 1608249442 transform -1 0 -4795 0 -1 3024 box -211 -300 211 300 -use sky130_fd_pr__nfet_01v8_9TXQ83 sky130_fd_pr__nfet_01v8_9TXQ83_1 -timestamp 1608229483 -transform 1 0 9023 0 1 3574 -box -211 -264 211 264 -use sky130_fd_pr__nfet_01v8_R7545W sky130_fd_pr__nfet_01v8_R7545W_0 -timestamp 1608229183 -transform 1 0 8231 0 1 3560 -box -211 -330 211 330 -use via_li_m1 via_li_m1_4 -array 0 13 72 0 0 74 -timestamp 1607692587 -transform 1 0 8148 0 1 3136 -box 4 0 76 74 -use inverter inverter_1 -array 0 20 569 0 0 858 -timestamp 1608329555 -transform 1 0 990 0 1 3228 -box -5393 252 -4418 1124 use sky130_fd_pr__pfet_01v8_373K6R sky130_fd_pr__pfet_01v8_373K6R_0 timestamp 1608255150 -transform 1 0 9023 0 1 4269 +transform 1 0 6580 0 1 4274 box -211 -327 211 327 use sky130_fd_pr__pfet_01v8_3FZUWK sky130_fd_pr__pfet_01v8_3FZUWK_0 timestamp 1608254796 -transform 1 0 8231 0 1 4426 +transform 1 0 5788 0 1 4431 box -211 -436 211 459 +use sky130_fd_pr__pfet_01v8_35M7SP sky130_fd_pr__pfet_01v8_35M7SP_0 +timestamp 1608253040 +transform 1 0 -4755 0 1 4963 +box -211 -309 211 309 use sky130_fd_pr__pfet_01v8_3DPBUK sky130_fd_pr__pfet_01v8_3DPBUK_0 timestamp 1608330103 -transform 1 0 -3653 0 1 4904 +transform 1 0 -58 0 1 4899 box -211 -242 211 369 use via_li_m1 via_li_m1_3 array 0 19 72 0 0 74 @@ -1722,13 +1278,23 @@ timestamp 1607692587 transform 1 0 -4906 0 1 5386 box 4 0 76 74 +use nand nand_0 +timestamp 1608325973 +transform 1 0 4710 0 1 4083 +box -267 -910 511 767 +use inverter inverter_1 +array 0 19 430 0 0 936 +timestamp 1608336920 +transform 1 0 935 0 1 3178 +box -5252 188 -4822 1124 << labels >> -rlabel metal1 9050 3886 9347 3920 1 out_vco rlabel metal1 -5114 2462 -3040 2804 1 vss rlabel metal1 -5122 5198 -2718 5516 1 vdd -rlabel metal2 -4764 2848 -3692 2910 1 in -rlabel space -4324 3520 8202 3624 1 9 -rlabel metal1 -4314 4172 7952 4352 1 10 -rlabel metal2 -4734 5090 -3688 5148 1 5 -rlabel space 8258 3886 8689 3922 1 out_ring +rlabel metal2 -4734 5086 -93 5144 1 5 +rlabel metal2 -4764 2853 -99 2909 1 in +rlabel space -32 4122 135 5035 1 10 +rlabel space 204 2714 379 3510 1 9 +rlabel space 5815 3891 6246 3927 1 out_ring +rlabel metal1 6607 3891 6897 3925 1 out_vco +rlabel metal2 4499 3258 6895 3314 1 en << end >>
diff --git a/mag/VCO/inverter.mag b/mag/VCO/inverter.mag index ccf7e27..0006a75 100644 --- a/mag/VCO/inverter.mag +++ b/mag/VCO/inverter.mag
@@ -1,39 +1,72 @@ magic tech sky130A magscale 1 2 -timestamp 1608329555 +timestamp 1608336920 << nwell >> -rect -5304 932 -4420 1124 +rect -5252 1004 -4822 1124 +rect -5252 694 -4826 1004 << pwell >> -rect -5246 544 -4824 604 -rect -5314 266 -4462 418 +rect -5250 504 -4822 546 +rect -5250 418 -4826 504 +rect -5252 266 -4826 418 +rect -5250 192 -4826 266 +rect -5182 188 -4826 192 +<< psubdiff >> +rect -5252 240 -5188 294 +rect -4884 240 -4822 294 << nsubdiff >> -rect -5216 972 -5190 1026 -rect -4886 972 -4862 1026 +rect -5214 974 -5188 1028 +rect -4884 974 -4860 1028 +<< psubdiffcont >> +rect -5188 240 -4884 294 << nsubdiffcont >> -rect -5190 972 -4886 1026 +rect -5188 974 -4884 1028 << poly >> -rect -5048 692 -5018 931 -rect -5393 658 -5018 692 -rect -5048 415 -5018 658 -rect -4800 631 -4747 718 +rect -5048 650 -5018 931 +rect -5180 634 -5018 650 +rect -5180 594 -5164 634 +rect -5084 594 -5018 634 +rect -5180 576 -5018 594 +rect -5048 351 -5018 576 +<< polycont >> +rect -5164 594 -5084 634 << locali >> -rect -5216 972 -5190 1026 -rect -4886 972 -4862 1026 +rect -5252 974 -5188 1028 +rect -4884 974 -4822 1028 +rect -5180 634 -5066 650 +rect -5180 594 -5164 634 +rect -5084 594 -5066 634 +rect -5180 576 -5066 594 +rect -5252 240 -5188 294 +rect -4884 240 -4822 294 +<< viali >> +rect -5164 594 -5084 634 << metal1 >> -rect -5304 944 -4418 1056 +rect -5252 944 -4822 1056 rect -5096 826 -5062 944 -rect -5006 692 -4971 838 -rect -5006 658 -4775 692 -rect -5094 396 -5060 531 -rect -5006 437 -4971 658 -rect -5314 292 -4462 396 +rect -5006 650 -4971 838 +rect -5252 634 -5066 650 +rect -5252 594 -5164 634 +rect -5084 594 -5066 634 +rect -5252 576 -5066 594 +rect -5006 576 -4822 650 +rect -5132 408 -5122 484 +rect -5070 408 -5060 484 +rect -5006 373 -4971 576 +rect -5252 228 -4822 332 +<< via1 >> +rect -5122 408 -5070 484 +<< metal2 >> +rect -5122 484 -5070 494 +rect -5252 408 -5122 482 +rect -5070 408 -4822 482 +rect -5252 396 -4822 408 +use sky130_fd_pr__nfet_01v8_PUCP6T inv_nfet +timestamp 1608326735 +transform 1 0 -5033 0 1 443 +box -211 -255 211 77 use sky130_fd_pr__pfet_01v8_35M7SK sky130_fd_pr__pfet_01v8_35M7SK_0 timestamp 1608326616 transform 1 0 -5033 0 1 822 box -211 -128 211 188 -use sky130_fd_pr__nfet_01v8_PUCP6T inv_nfet -timestamp 1608326735 -transform 1 0 -5033 0 1 507 -box -211 -255 211 77 << end >>
diff --git a/mag/VCO/nand.mag b/mag/VCO/nand.mag index a915891..845e4b8 100644 --- a/mag/VCO/nand.mag +++ b/mag/VCO/nand.mag
@@ -100,14 +100,14 @@ rect 274 -496 342 -489 rect 274 -499 341 -496 rect -228 -648 -124 -638 -use sky130_fd_pr__nfet_01v8_TFZGL8 sky130_fd_pr__nfet_01v8_TFZGL8_0 -timestamp 1608325973 -transform 1 0 201 0 1 -421 -box -263 -255 263 255 use sky130_fd_pr__pfet_01v8_H49BFK sky130_fd_pr__pfet_01v8_H49BFK_0 timestamp 1608325295 transform 1 0 210 0 1 256 box -263 -309 263 309 +use sky130_fd_pr__nfet_01v8_TFZGL8 sky130_fd_pr__nfet_01v8_TFZGL8_0 +timestamp 1608325973 +transform 1 0 201 0 1 -421 +box -263 -255 263 255 << labels >> rlabel metal1 -98 383 289 438 1 A rlabel nwell -48 500 459 725 1 vdd
diff --git a/mag/VCO/sky130_fd_pr__nfet_01v8_PUCP6T.ext b/mag/VCO/sky130_fd_pr__nfet_01v8_PUCP6T.ext new file mode 100644 index 0000000..e945d0c --- /dev/null +++ b/mag/VCO/sky130_fd_pr__nfet_01v8_PUCP6T.ext
@@ -0,0 +1,13 @@ +timestamp 1608326735 +version 8.3 +tech sky130A +style ngspice() +scale 1000 1 500000 +resistclasses 2200000 3050000 1700000 3050000 120000 197000 114000 191000 120000 197000 114000 191000 48200 319800 2000000 48200 48200 12200 125 125 47 47 29 5 +parameters sky130_fd_pr__nfet_01v8 l=l w=w +node "a_15_n45#" 222 28.2716 15 -45 ndif 0 0 0 0 0 0 0 0 5220 296 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3332 264 4140 272 0 0 0 0 0 0 0 0 0 0 +node "a_n73_n45#" 222 28.2716 -73 -45 ndif 0 0 0 0 0 0 0 0 5220 296 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3332 264 4140 272 0 0 0 0 0 0 0 0 0 0 +node "a_n15_n71#" 238 53.011 -15 -71 p 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4440 356 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +substrate "VSUBS" 0 0 -211 -255 pw 0 0 134618 1482 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +cap "a_n73_n45#" "a_15_n45#" 156.317 +device msubckt sky130_fd_pr__nfet_01v8 -15 -45 -14 -44 l=30 w=90 "VSUBS" "a_n15_n71#" 60 0 "a_n73_n45#" 90 0 "a_15_n45#" 90 0
diff --git a/mag/VCO/sky130_fd_pr__pfet_01v8_35M7SK.ext b/mag/VCO/sky130_fd_pr__pfet_01v8_35M7SK.ext new file mode 100644 index 0000000..3bd0e16 --- /dev/null +++ b/mag/VCO/sky130_fd_pr__pfet_01v8_35M7SK.ext
@@ -0,0 +1,16 @@ +timestamp 1608326616 +version 8.3 +tech sky130A +style ngspice() +scale 1000 1 500000 +resistclasses 2200000 3050000 1700000 3050000 120000 197000 114000 191000 120000 197000 114000 191000 48200 319800 2000000 48200 48200 12200 125 125 47 47 29 5 +parameters sky130_fd_pr__pfet_01v8 l=l w=w +node "a_15_n90#" 679 28.02 15 -90 pdif 0 0 0 0 0 0 0 0 0 0 10440 476 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6392 444 8280 452 0 0 0 0 0 0 0 0 0 0 +node "a_n73_n90#" 679 28.02 -73 -90 pdif 0 0 0 0 0 0 0 0 0 0 10440 476 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6392 444 8280 452 0 0 0 0 0 0 0 0 0 0 +node "a_n15_n126#" 389 55.529 -15 -126 p 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7260 544 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +node "w_n211_n128#" 2270 400.056 -211 -128 nw 0 0 0 0 133352 1476 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +substrate "VSUBS" 0 0 -1073741817 -1073741817 space 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +cap "w_n211_n128#" "a_n73_n90#" 0.2516 +cap "w_n211_n128#" "a_15_n90#" 0.2516 +cap "a_n73_n90#" "a_15_n90#" 307.746 +device msubckt sky130_fd_pr__pfet_01v8 -15 -90 -14 -89 l=30 w=180 "w_n211_n128#" "a_n15_n126#" 60 0 "a_n73_n90#" 180 0 "a_15_n90#" 180 0