From 1516e413872ae2fb918083d1d8fff52f6082952d Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Tue, 6 Nov 2012 15:07:44 -0300 Subject: [PATCH] whirl/cpu/: flip CON2 (to LEDs) and increase width of power traces For 2 A we need a trace width of about 0.4 mm, not 0.3 mm. --- whirl/cpu/cpu.brd | 975 ++++++++++++++++++++++------------------------ whirl/cpu/cpu.sch | 53 +-- 2 files changed, 500 insertions(+), 528 deletions(-) diff --git a/whirl/cpu/cpu.brd b/whirl/cpu/cpu.brd index 7314bb4..caedcb0 100644 --- a/whirl/cpu/cpu.brd +++ b/whirl/cpu/cpu.brd @@ -1,4 +1,4 @@ -PCBNEW-BOARD Version 1 date Mon Nov 5 19:43:49 2012 +PCBNEW-BOARD Version 1 date Tue Nov 6 15:06:17 2012 # Created by Pcbnew(2012-04-11 BZR 3505)-testing @@ -7,12 +7,11 @@ encoding utf-8 LayerCount 2 Ly 1FFF8001 EnabledLayers 1FFF8001 -VisibleLayers 1FFFFFFF Links 58 NoConn 0 Di 48178 33513 58299 50837 Ndraw 5 -Ntrack 275 +Ntrack 270 Nzone 0 BoardThickness 630 Nmodule 15 @@ -22,7 +21,7 @@ $EndGENERAL $SHEETDESCR Sheet A4 11693 8268 Title "" -Date "5 nov 2012" +Date "6 nov 2012" Rev "" Comp "" Comment1 "" @@ -56,12 +55,12 @@ TextPcbSize 600 800 EdgeModWidth 59 TextModSize 600 600 TextModWidth 120 -PadSize 600 600 +PadSize 320 320 PadDrill 320 Pad2MaskClearance 100 AuxiliaryAxisOrg 0 0 VisibleElements FFFFFBBF -PcbPlotParams (pcbplotparams (layerselection 3178497) (usegerberextensions true) (excludeedgelayer true) (linewidth 60) (plotframeref false) (viasonmask false) (mode 1) (useauxorigin false) (hpglpennumber 1) (hpglpenspeed 20) (hpglpendiameter 15) (hpglpenoverlay 2) (pscolor true) (psnegative false) (psa4output false) (plotreference true) (plotvalue true) (plotothertext true) (plotinvisibletext false) (padsonsilk false) (subtractmaskfromsilk false) (outputformat 1) (mirror false) (drillshape 1) (scaleselection 1) (outputdirectory "")) +PcbPlotParams (pcbplotparams (layerselection 3178497) (usegerberextensions true) (excludeedgelayer true) (linewidth 60) (plotframeref false) (viasonmask false) (mode 1) (useauxorigin false) (hpglpennumber 1) (hpglpenspeed 20) (hpglpendiameter 15) (hpglpenoverlay 0) (pscolor true) (psnegative false) (psa4output false) (plotreference true) (plotvalue true) (plotothertext true) (plotinvisibletext false) (padsonsilk false) (subtractmaskfromsilk false) (outputformat 1) (mirror false) (drillshape 1) (scaleselection 1) (outputdirectory "")) $EndSETUP $EQUIPOT @@ -194,7 +193,7 @@ $NCLASS Name "Power" Desc "" Clearance 79 -TrackWidth 118 +TrackWidth 157 ViaDia 394 ViaDrill 100 uViaDia 200 @@ -432,7 +431,7 @@ $PAD Sh "30" R 178 512 0 0 0 Dr 0 0 0 At SMD N 00888000 -Ne 7 "/LCLK" +Ne 0 "" Po -472 -1663 $EndPAD $PAD @@ -446,7 +445,7 @@ $PAD Sh "32" R 177 512 0 0 0 Dr 0 0 0 At SMD N 00888000 -Ne 0 "" +Ne 7 "/LCLK" Po -1101 -1663 $EndPAD $EndMODULE QFP32 @@ -672,51 +671,51 @@ Po 0 -5000 $EndPAD $EndMODULE PAD_80x80_6x100mil $MODULE PAD_2mm_6x50mil -Po 53346 34350 900 15 5000D223 50982997 ~~ +Po 51083 34350 2700 15 50994DD3 50982997 ~~ Li PAD_2mm_6x50mil Sc 50982997 AR /5098082E Op 0 0 0 At SMD -T0 0 -150 200 200 900 40 N V 25 N "CON2" -T1 0 150 200 200 900 40 N I 25 N "CONN_6" +T0 0 -150 200 200 2700 40 N V 25 N "CON2" +T1 0 150 200 200 2700 40 N I 25 N "CONN_6" $PAD -Sh "1" O 786 196 0 0 900 +Sh "1" O 786 196 0 0 2700 Dr 0 0 0 At SMD N 00808000 Ne 10 "/SCLK" Po 0 0 $EndPAD $PAD -Sh "2" O 786 197 0 0 900 +Sh "2" O 786 197 0 0 2700 Dr 0 0 0 At SMD N 00808000 Ne 7 "/LCLK" Po 0 -499 $EndPAD $PAD -Sh "3" O 786 197 0 0 900 +Sh "3" O 786 197 0 0 2700 Dr 0 0 0 At SMD N 00808000 Ne 6 "/DS" Po 0 -999 $EndPAD $PAD -Sh "4" O 786 197 0 0 900 +Sh "4" O 786 197 0 0 2700 Dr 0 0 0 At SMD N 00808000 Ne 3 "/CTRL_3V" Po 0 -1499 $EndPAD $PAD -Sh "5" O 786 197 0 0 900 +Sh "5" O 786 197 0 0 2700 Dr 0 0 0 At SMD N 00808000 Ne 23 "GND" Po 0 -1999 $EndPAD $PAD -Sh "6" O 786 197 0 0 900 +Sh "6" O 786 197 0 0 2700 Dr 0 0 0 At SMD N 00808000 Ne 18 "/VLED" @@ -1178,7 +1177,7 @@ Po 0 -3000 $EndPAD $EndMODULE PAD_120x60_4x100mil $TEXTPCB -Te "121005" +Te "121006" Po 56496 48228 600 591 98 900 De 0 0 0 Normal C $EndTEXTPCB @@ -1199,10 +1198,10 @@ Po 0 48228 50787 48228 33563 49 De 28 0 900 0 0 $EndDRAWSEGMENT $TRACK -Po 0 53898 39133 53937 39172 79 -1 -De 15 0 1 50982F2C 0 Po 0 53041 39133 53898 39133 79 -1 De 15 0 1 0 0 +Po 0 53898 39133 53937 39172 79 -1 +De 15 0 1 50982F2C 0 Po 0 55944 45550 51160 45550 79 -1 De 15 0 2 0 0 Po 0 50787 45177 50787 41733 79 -1 @@ -1219,338 +1218,334 @@ Po 0 51221 41299 51083 41437 79 -1 De 15 0 2 509834E7 0 Po 3 51083 41437 51083 41437 300 -1 De 15 1 2 0 0 -Po 0 55287 41437 55020 41437 118 -1 -De 15 0 3 50983A00 0 -Po 0 52263 35236 55020 37993 118 -1 -De 0 0 3 50983A50 0 -Po 0 55020 37993 55020 41437 118 -1 -De 0 0 3 50983A52 0 -Po 0 55582 41142 55287 41437 118 -1 +Po 0 50668 39448 50982 39762 157 -1 +De 15 0 3 50982F7F 0 +Po 0 50532 43366 50591 43307 157 -1 +De 15 0 3 50982FF4 0 +Po 0 50982 39762 53041 39762 157 -1 +De 15 0 3 50982F82 0 +Po 0 50492 39448 50668 39448 157 -1 +De 15 0 3 50982F8F 0 +Po 0 55836 40373 55836 40776 157 -1 De 15 0 3 0 0 -Po 3 51870 35236 51870 35236 394 -1 -De 15 1 3 0 0 -Po 0 54233 41437 55020 41437 118 -1 -De 15 0 3 509839FA 0 -Po 0 51476 48622 54232 45866 118 -1 +Po 0 53937 41141 54233 41437 157 -1 +De 15 0 3 0 0 +Po 0 55836 40776 55906 40846 157 -1 +De 15 0 3 5098307A 0 +Po 0 51771 48917 52854 48917 157 -1 +De 15 0 3 50995122 0 +Po 0 52854 48917 53378 49441 157 -1 +De 15 0 3 50995125 0 +Po 0 51476 48622 51771 48917 157 -1 +De 15 0 3 0 0 +Po 0 55906 40846 55906 41142 157 -1 +De 15 0 3 5098307B 0 +Po 0 49715 39448 50492 39448 157 -1 +De 15 0 3 0 0 +Po 0 50532 43721 49492 43721 157 -1 +De 15 0 3 0 0 +Po 0 49715 39448 48839 39448 157 -1 +De 15 0 3 0 0 +Po 0 48839 39448 48819 39468 157 -1 +De 15 0 3 50982FB8 0 +Po 0 50591 43307 50591 43012 157 -1 +De 15 0 3 50982FF5 0 +Po 0 53378 49441 53378 49803 157 -1 +De 15 0 3 50995127 0 +Po 0 50532 43721 50532 43366 157 -1 +De 15 0 3 0 0 +Po 0 50492 39074 50492 39448 157 -1 +De 15 0 3 50982F8D 0 +Po 0 49715 38819 50237 38819 157 -1 +De 15 0 3 0 0 +Po 0 50237 38819 50492 39074 157 -1 +De 15 0 3 50982F8B 0 +Po 0 49492 43721 49409 43638 157 -1 +De 15 0 3 50982FF8 0 +Po 0 49212 48622 48622 48032 157 -1 +De 15 0 3 509839BD 0 +Po 0 52582 35554 52756 35728 157 -1 +De 15 0 3 50994EDA 0 +Po 0 51476 48622 54232 45866 157 -1 De 0 0 3 0 0 -Po 0 54232 45866 54232 42225 118 -1 -De 0 0 3 509839E2 0 -Po 0 54232 42225 55020 41437 118 -1 -De 0 0 3 509839EC 0 +Po 0 52582 34350 52582 35554 157 -1 +De 15 0 3 0 0 +Po 0 51476 48622 49212 48622 157 -1 +De 15 0 3 0 0 Po 3 55020 41437 55020 41437 394 -1 De 15 1 3 0 0 -Po 0 51870 35236 52263 35236 118 -1 -De 0 0 3 0 0 -Po 0 51771 48917 51476 48622 118 -1 -De 15 0 3 509839AE 0 -Po 0 48622 48032 48622 43638 118 -1 +Po 0 48622 48032 48622 43638 157 -1 De 15 0 3 509839C2 0 -Po 0 53378 49803 53378 48949 118 -1 +Po 0 49409 43638 48622 43638 157 -1 De 15 0 3 0 0 +Po 0 48622 39666 48622 43638 157 -1 +De 15 0 3 50983688 0 +Po 0 48819 39469 48622 39666 157 -1 +De 15 0 3 50983685 0 +Po 0 48819 39468 48819 39469 157 -1 +De 15 0 3 0 0 +Po 0 54233 41437 55020 41437 157 -1 +De 15 0 3 509839FA 0 +Po 3 52756 35728 52756 35728 394 -1 +De 15 1 3 0 0 +Po 0 55287 41437 55020 41437 157 -1 +De 15 0 3 50983A00 0 +Po 0 55582 41142 55287 41437 157 -1 +De 15 0 3 0 0 +Po 0 54232 42225 55020 41437 157 -1 +De 0 0 3 509839EC 0 Po 3 51476 48622 51476 48622 394 -1 De 15 1 3 0 0 -Po 0 49212 48622 48622 48032 118 -1 -De 15 0 3 509839BD 0 -Po 0 53346 48917 51771 48917 118 -1 -De 15 0 3 509839AD 0 -Po 0 55906 41142 55582 41142 118 -1 +Po 0 55582 40373 55582 41142 157 -1 De 15 0 3 0 0 -Po 0 48819 39468 48819 39469 118 -1 -De 15 0 3 0 0 -Po 0 49409 43638 48622 43638 118 -1 -De 15 0 3 0 0 -Po 0 51847 34350 51847 35213 118 -1 -De 15 0 3 0 0 -Po 0 51847 35213 51870 35236 118 -1 -De 15 0 3 5098387D 0 -Po 0 51476 48622 49212 48622 118 -1 -De 15 0 3 0 0 -Po 0 50532 43721 50532 43366 118 -1 -De 15 0 3 0 0 -Po 0 50532 43366 50591 43307 118 -1 -De 15 0 3 50982FF4 0 -Po 0 55836 40373 55836 40776 118 -1 -De 15 0 3 0 0 -Po 0 53937 41141 54233 41437 118 -1 -De 15 0 3 0 0 -Po 0 50591 43307 50591 43012 118 -1 -De 15 0 3 50982FF5 0 -Po 0 49715 39448 48839 39448 118 -1 -De 15 0 3 0 0 -Po 0 48839 39448 48819 39468 118 -1 -De 15 0 3 50982FB8 0 -Po 0 49492 43721 49409 43638 118 -1 -De 15 0 3 50982FF8 0 -Po 0 55582 40373 55582 41142 118 -1 -De 15 0 3 0 0 -Po 0 49715 39448 50492 39448 118 -1 -De 15 0 3 0 0 -Po 0 55836 40776 55906 40846 118 -1 -De 15 0 3 5098307A 0 -Po 0 50237 38819 50492 39074 118 -1 -De 15 0 3 50982F8B 0 -Po 0 49715 38819 50237 38819 118 -1 -De 15 0 3 0 0 -Po 0 50492 39448 50668 39448 118 -1 -De 15 0 3 50982F8F 0 -Po 0 50492 39074 50492 39448 118 -1 -De 15 0 3 50982F8D 0 -Po 0 55906 40846 55906 41142 118 -1 -De 15 0 3 5098307B 0 -Po 0 53378 48949 53346 48917 118 -1 -De 15 0 3 509839A6 0 -Po 0 50668 39448 50982 39762 118 -1 -De 15 0 3 50982F7F 0 -Po 0 48622 39666 48622 43638 118 -1 -De 15 0 3 50983688 0 -Po 0 48819 39469 48622 39666 118 -1 -De 15 0 3 50983685 0 -Po 0 50982 39762 53041 39762 118 -1 -De 15 0 3 50982F82 0 -Po 0 50532 43721 49492 43721 118 -1 +Po 0 52756 35728 55020 37992 157 -1 +De 0 0 3 50994EE3 0 +Po 0 55020 37992 55020 41437 157 -1 +De 0 0 3 50994EE4 0 +Po 0 55906 41142 55582 41142 157 -1 De 15 0 3 0 0 +Po 0 54232 45866 54232 42225 157 -1 +De 0 0 3 509839E2 0 +Po 0 51850 40639 51850 41064 79 -1 +De 15 0 4 0 0 Po 0 55944 43820 53269 43820 79 -1 De 15 0 4 0 0 -Po 0 51772 42323 53269 43820 79 -1 -De 15 0 4 509834D6 0 Po 0 51772 41142 51772 42323 79 -1 De 15 0 4 509834D5 0 Po 0 51850 41064 51772 41142 79 -1 De 15 0 4 509834D3 0 -Po 0 51850 40639 51850 41064 79 -1 -De 15 0 4 0 0 +Po 0 51772 42323 53269 43820 79 -1 +De 15 0 4 509834D6 0 Po 0 51535 42381 53407 44253 79 -1 De 15 0 5 0 0 Po 0 53407 44253 55944 44253 79 -1 De 15 0 5 50983CA3 0 Po 0 51535 40639 51535 42381 79 -1 De 15 0 5 0 0 -Po 0 52347 35349 52347 34350 79 -1 -De 15 0 6 5098388B 0 -Po 0 51968 35728 52347 35349 79 -1 -De 15 0 6 5098388A 0 -Po 0 51181 35728 51968 35728 79 -1 -De 15 0 6 50983887 0 -Po 0 50592 37313 50592 36317 79 -1 +Po 0 50592 37313 50592 36219 79 -1 De 15 0 6 0 0 -Po 0 50592 36317 51181 35728 79 -1 -De 15 0 6 50983885 0 -Po 0 50906 37313 50906 36299 79 -1 +Po 0 52082 34729 52082 34350 79 -1 +De 15 0 6 50994F0A 0 +Po 0 50592 36219 52082 34729 79 -1 +De 15 0 6 50994F07 0 +Po 0 50277 37313 50277 36140 79 -1 De 15 0 7 0 0 -Po 0 52166 35925 52847 35244 79 -1 -De 15 0 7 50983890 0 -Po 0 52847 35244 52847 34350 79 -1 -De 15 0 7 50983892 0 -Po 0 50906 36299 51280 35925 79 -1 -De 15 0 7 5098388E 0 -Po 0 51280 35925 52166 35925 79 -1 -De 15 0 7 5098388F 0 +Po 0 51582 34835 51582 34350 79 -1 +De 15 0 7 50994F04 0 +Po 0 50277 36140 51582 34835 79 -1 +De 15 0 7 50994F00 0 +Po 0 52479 40639 52479 41160 79 -1 +De 15 0 8 0 0 +Po 0 49409 46638 49917 46638 79 -1 +De 15 0 8 0 0 +Po 0 51673 45473 50788 46358 79 -1 +De 0 0 8 50983623 0 Po 3 50197 46358 50197 46358 300 -1 De 15 1 8 0 0 +Po 0 49917 46638 50197 46358 79 -1 +De 15 0 8 5098362F 0 +Po 0 50788 46358 50197 46358 79 -1 +De 0 0 8 50983627 0 +Po 3 52756 41437 52756 41437 300 -1 +De 15 1 8 0 0 Po 0 55944 46417 50256 46417 79 -1 De 15 0 8 0 0 -Po 0 50256 46417 50197 46358 79 -1 -De 15 0 8 50983CE5 0 -Po 0 49917 46638 50197 46358 79 -1 -De 15 0 8 5098362F 0 -Po 0 49409 46638 49917 46638 79 -1 -De 15 0 8 0 0 -Po 0 52756 41536 51673 42619 79 -1 -De 0 0 8 5098361C 0 -Po 0 51673 42619 51673 45473 79 -1 -De 0 0 8 50983620 0 -Po 0 51673 45473 50788 46358 79 -1 -De 0 0 8 50983623 0 -Po 0 50788 46358 50197 46358 79 -1 -De 0 0 8 50983627 0 -Po 0 52479 40639 52479 41160 79 -1 -De 15 0 8 0 0 -Po 3 52756 41437 52756 41437 300 -1 -De 15 1 8 0 0 -Po 0 52479 41160 52756 41437 79 -1 -De 15 0 8 50983419 0 Po 0 52756 41437 52756 41536 79 -1 De 0 0 8 0 0 -Po 0 56004 43012 56594 43602 79 -1 -De 15 0 9 50983F47 0 -Po 0 55708 43012 56004 43012 79 -1 -De 15 0 9 50983F44 0 -Po 0 54134 41831 54527 41831 79 -1 -De 15 0 9 0 0 -Po 0 54527 41831 55708 43012 79 -1 -De 15 0 9 50983F41 0 -Po 0 56594 43602 56594 44489 79 -1 -De 15 0 9 50983F4A 0 -Po 0 56594 44489 56397 44686 79 -1 -De 15 0 9 50983F4B 0 -Po 0 56397 44686 55944 44686 79 -1 -De 15 0 9 50983F4D 0 -Po 0 50197 45768 50067 45638 79 -1 -De 15 0 9 50983607 0 +Po 0 52479 41160 52756 41437 79 -1 +De 15 0 8 50983419 0 +Po 0 51673 42619 51673 45473 79 -1 +De 0 0 8 50983620 0 +Po 0 52756 41536 51673 42619 79 -1 +De 0 0 8 5098361C 0 +Po 0 50256 46417 50197 46358 79 -1 +De 15 0 8 50983CE5 0 Po 0 50067 45638 49409 45638 79 -1 De 15 0 9 50983608 0 -Po 0 52559 41831 52165 41437 79 -1 -De 15 0 9 50983534 0 -Po 0 52165 41437 51280 42322 79 -1 -De 0 0 9 0 0 +Po 0 52164 41436 52165 41437 79 -1 +De 15 0 9 5098342E 0 +Po 3 52165 41437 52165 41437 300 -1 +De 15 1 9 0 0 +Po 0 50787 45768 50197 45768 79 -1 +De 0 0 9 50983601 0 +Po 0 50197 45768 50067 45638 79 -1 +De 15 0 9 50983607 0 Po 0 51280 42322 51280 45275 79 -1 De 0 0 9 509835FA 0 +Po 0 52165 41437 51280 42322 79 -1 +De 0 0 9 0 0 Po 3 50197 45768 50197 45768 300 -1 De 15 1 9 0 0 Po 0 51280 45275 50787 45768 79 -1 De 0 0 9 509835FF 0 -Po 3 52165 41437 52165 41437 300 -1 -De 15 1 9 0 0 -Po 0 52164 41436 52165 41437 79 -1 -De 15 0 9 5098342E 0 -Po 0 52164 40639 52164 41436 79 -1 -De 15 0 9 0 0 -Po 0 50787 45768 50197 45768 79 -1 -De 0 0 9 50983601 0 +Po 0 56004 43012 56594 43602 79 -1 +De 15 0 9 50983F47 0 Po 0 54134 41831 52559 41831 79 -1 De 15 0 9 50983532 0 -Po 0 51378 36122 51673 36122 79 -1 -De 0 0 10 509838A5 0 -Po 0 50197 36516 50591 36122 79 -1 -De 0 0 10 0 0 -Po 0 53346 35138 53346 34350 79 -1 -De 15 0 10 509838AF 0 -Po 3 51870 36319 51870 36319 300 -1 -De 15 1 10 0 0 -Po 0 51673 36122 51870 36319 79 -1 -De 0 0 10 509838A6 0 -Po 0 51870 36319 52165 36319 79 -1 -De 15 0 10 509838AD 0 -Po 0 52165 36319 53346 35138 79 -1 -De 15 0 10 509838AE 0 -Po 3 50197 36516 50197 36516 300 -1 -De 15 1 10 0 0 +Po 0 52559 41831 52165 41437 79 -1 +De 15 0 9 50983534 0 +Po 0 56397 44686 55944 44686 79 -1 +De 15 0 9 50983F4D 0 +Po 0 56594 44489 56397 44686 79 -1 +De 15 0 9 50983F4B 0 +Po 0 52164 40639 52164 41436 79 -1 +De 15 0 9 0 0 +Po 0 54134 41831 54527 41831 79 -1 +De 15 0 9 0 0 +Po 0 55708 43012 56004 43012 79 -1 +De 15 0 9 50983F44 0 +Po 0 56594 43602 56594 44489 79 -1 +De 15 0 9 50983F4A 0 +Po 0 54527 41831 55708 43012 79 -1 +De 15 0 9 50983F41 0 +Po 0 49114 37992 49114 37599 79 -1 +De 15 0 10 50994EF3 0 +Po 0 49114 37599 50098 36615 79 -1 +De 15 0 10 50994EF4 0 Po 0 49312 38190 49114 37992 79 -1 -De 15 0 10 50983842 0 +De 15 0 10 50994EF1 0 +Po 0 51083 34941 51083 34350 79 -1 +De 15 0 10 50994EFC 0 +Po 0 50098 35926 51083 34941 79 -1 +De 15 0 10 50994EFA 0 Po 0 49715 38190 49312 38190 79 -1 De 15 0 10 0 0 -Po 0 50591 36122 51378 36122 79 -1 -De 0 0 10 509838A2 0 -Po 0 49114 37599 50197 36516 79 -1 -De 15 0 10 5098384E 0 -Po 0 49114 37992 49114 37599 79 -1 -De 15 0 10 5098384C 0 -Po 0 51969 45669 50689 46949 79 -1 -De 0 0 11 50983657 0 -Po 0 55944 46850 52264 46850 79 -1 -De 15 0 11 0 0 -Po 0 52264 46850 52165 46949 79 -1 -De 15 0 11 50983CF3 0 -Po 0 52165 46949 50197 46949 79 -1 -De 15 0 11 50983CF6 0 -Po 3 50197 46949 50197 46949 300 -1 -De 15 1 11 0 0 -Po 0 53041 40077 53167 40077 79 -1 -De 15 0 11 0 0 -Po 0 53167 40077 53346 40256 79 -1 -De 15 0 11 5098340B 0 -Po 0 53346 40256 53346 41437 79 -1 -De 15 0 11 5098340C 0 -Po 0 51969 42913 51969 45669 79 -1 -De 0 0 11 50983655 0 -Po 0 53346 41536 51969 42913 79 -1 -De 0 0 11 50983651 0 +Po 0 50098 36615 50098 35926 79 -1 +De 15 0 10 50994EF6 0 Po 0 53346 41437 53346 41536 79 -1 De 0 0 11 0 0 +Po 0 52264 46850 52165 46949 79 -1 +De 15 0 11 50983CF3 0 +Po 0 53346 40256 53346 41437 79 -1 +De 15 0 11 5098340C 0 Po 0 49508 47638 50197 46949 79 -1 De 15 0 11 50983663 0 -Po 0 49409 47638 49508 47638 79 -1 -De 15 0 11 0 0 Po 0 50689 46949 50197 46949 79 -1 De 0 0 11 5098365A 0 Po 3 53346 41437 53346 41437 300 -1 De 15 1 11 0 0 -Po 0 51850 37313 51850 36930 79 -1 -De 15 0 12 0 0 -Po 0 54823 33957 56595 33957 79 -1 -De 15 0 12 509838BC 0 +Po 0 51969 42913 51969 45669 79 -1 +De 0 0 11 50983655 0 +Po 0 52165 46949 50197 46949 79 -1 +De 15 0 11 50983CF6 0 +Po 0 53041 40077 53167 40077 79 -1 +De 15 0 11 0 0 +Po 0 49409 47638 49508 47638 79 -1 +De 15 0 11 0 0 +Po 3 50197 46949 50197 46949 300 -1 +De 15 1 11 0 0 +Po 0 51969 45669 50689 46949 79 -1 +De 0 0 11 50983657 0 +Po 0 55944 46850 52264 46850 79 -1 +De 15 0 11 0 0 +Po 0 53167 40077 53346 40256 79 -1 +De 15 0 11 5098340B 0 +Po 0 53346 41536 51969 42913 79 -1 +De 0 0 11 50983651 0 +Po 0 55118 33957 56595 33957 79 -1 +De 15 0 12 50994E5F 0 Po 0 57450 34812 57450 35788 79 -1 De 15 0 12 509838C6 0 +Po 0 52461 36220 53445 36220 79 -1 +De 15 0 12 50994E57 0 +Po 0 53445 36220 53642 36023 79 -1 +De 15 0 12 50994E58 0 +Po 0 53642 36023 53642 35433 79 -1 +De 15 0 12 50994E5A 0 +Po 0 53642 35433 55118 33957 79 -1 +De 15 0 12 50994E5E 0 Po 0 56595 33957 57450 34812 79 -1 De 15 0 12 509838C3 0 -Po 0 51850 36930 54823 33957 79 -1 -De 15 0 12 509838B4 0 -Po 0 54921 34154 55816 34154 79 -1 -De 15 0 13 509838CA 0 -Po 0 52164 36911 54921 34154 79 -1 -De 15 0 13 509838C9 0 -Po 0 55816 34154 56338 34676 79 -1 -De 15 0 13 509838CE 0 +Po 0 51850 37313 51850 36831 79 -1 +De 15 0 12 0 0 +Po 0 51850 36831 52461 36220 79 -1 +De 15 0 12 50994E56 0 +Po 0 52164 36911 52658 36417 79 -1 +De 15 0 13 50994E33 0 +Po 0 55118 34252 56201 34252 79 -1 +De 15 0 13 50994E3B 0 +Po 0 53839 36122 53839 35531 79 -1 +De 15 0 13 50994E39 0 +Po 0 53544 36417 53839 36122 79 -1 +De 15 0 13 50994E37 0 +Po 0 53839 35531 55118 34252 79 -1 +De 15 0 13 50994E3A 0 +Po 0 56338 34389 56338 34676 79 -1 +De 15 0 13 50994E4A 0 +Po 0 56201 34252 56338 34389 79 -1 +De 15 0 13 50994E41 0 +Po 0 52658 36417 53544 36417 79 -1 +De 15 0 13 50994E34 0 Po 0 52164 37313 52164 36911 79 -1 De 15 0 13 0 0 Po 0 53041 38190 53444 38190 79 -1 De 15 0 14 0 0 -Po 0 53444 38190 53543 38091 79 -1 -De 15 0 14 509838D7 0 -Po 0 53543 38091 53543 37599 79 -1 -De 15 0 14 509838DB 0 -Po 0 53543 37599 53740 37402 79 -1 -De 15 0 14 509838DC 0 Po 0 53740 37402 54232 37402 79 -1 De 15 0 14 509838DD 0 -Po 0 54232 37402 54594 37764 79 -1 -De 15 0 14 509838DE 0 +Po 0 53543 38091 53543 37599 79 -1 +De 15 0 14 509838DB 0 Po 0 54594 37764 55474 37764 79 -1 De 15 0 14 509838E1 0 +Po 0 53543 37599 53740 37402 79 -1 +De 15 0 14 509838DC 0 +Po 0 54232 37402 54594 37764 79 -1 +De 15 0 14 509838DE 0 +Po 0 53444 38190 53543 38091 79 -1 +De 15 0 14 509838D7 0 Po 0 53639 37208 54918 37208 79 -1 De 15 0 15 509838E8 0 -Po 0 53041 37875 53168 37875 79 -1 -De 15 0 15 0 0 -Po 0 53248 37795 53248 37599 79 -1 -De 15 0 15 509838E5 0 -Po 0 53248 37599 53639 37208 79 -1 -De 15 0 15 509838E6 0 Po 0 53168 37875 53248 37795 79 -1 De 15 0 15 509838E4 0 -Po 0 52479 37313 52479 36989 79 -1 -De 15 0 16 0 0 -Po 0 52479 36989 52816 36652 79 -1 -De 15 0 16 509838D2 0 +Po 0 53248 37599 53639 37208 79 -1 +De 15 0 15 509838E6 0 +Po 0 53248 37795 53248 37599 79 -1 +De 15 0 15 509838E5 0 +Po 0 53041 37875 53168 37875 79 -1 +De 15 0 15 0 0 Po 0 52816 36652 54362 36652 79 -1 De 15 0 16 509838D4 0 +Po 0 52479 36989 52816 36652 79 -1 +De 15 0 16 509838D2 0 +Po 0 52479 37313 52479 36989 79 -1 +De 15 0 16 0 0 Po 0 55944 45118 53090 45118 118 -1 De 15 0 17 0 0 Po 0 53090 45118 52439 44467 118 -1 De 15 0 17 50983554 0 Po 0 52439 44467 50787 44467 118 -1 De 15 0 17 50983558 0 -Po 0 50847 34488 50847 34350 118 -1 -De 15 0 18 5098391E 0 -Po 0 48819 37303 48819 36516 118 -1 +Po 0 48819 37303 48819 36516 157 -1 De 0 0 18 0 0 -Po 0 48819 36516 50847 34488 118 -1 -De 15 0 18 5098391D 0 -Po 3 48819 36516 48819 36516 394 -1 -De 15 1 18 0 0 +Po 0 50197 49409 48819 48031 157 -1 +De 0 0 18 509836B5 0 +Po 0 54134 34350 53582 34350 157 -1 +De 15 0 18 0 0 +Po 0 50591 34744 48819 36516 157 -1 +De 0 0 18 5099516D 0 +Po 0 53740 34744 50591 34744 157 -1 +De 0 0 18 50995167 0 Po 3 50197 49409 50197 49409 394 -1 De 15 1 18 0 0 -Po 0 50984 49409 50197 49409 118 -1 +Po 0 54134 34350 53740 34744 157 -1 +De 0 0 18 0 0 +Po 0 50984 49409 50197 49409 157 -1 De 15 0 18 5098369E 0 -Po 0 48819 48031 48819 37303 118 -1 +Po 0 48819 48031 48819 37303 157 -1 De 0 0 18 509836B6 0 -Po 0 50197 49409 48819 48031 118 -1 -De 0 0 18 509836B5 0 -Po 0 51378 49803 50984 49409 118 -1 +Po 3 54134 34350 54134 34350 394 -1 +De 15 1 18 0 0 +Po 0 51378 49803 50984 49409 157 -1 De 15 0 18 0 0 -Po 0 54354 39765 53937 39765 79 -1 -De 15 0 19 50982F32 0 -Po 0 54903 39950 54539 39950 79 -1 -De 15 0 19 0 0 Po 0 54539 39950 54354 39765 79 -1 De 15 0 19 50982F31 0 Po 0 53620 39448 53937 39765 79 -1 De 15 0 19 50982F2E 0 +Po 0 54354 39765 53937 39765 79 -1 +De 15 0 19 50982F32 0 Po 0 53041 39448 53620 39448 79 -1 De 15 0 19 0 0 -Po 0 54598 39440 54331 39173 79 -1 -De 15 0 20 50982F44 0 -Po 0 54331 39173 54331 38780 79 -1 -De 15 0 20 50982F45 0 +Po 0 54903 39950 54539 39950 79 -1 +De 15 0 19 0 0 Po 0 54055 38504 53937 38504 79 -1 De 15 0 20 50982F47 0 Po 0 53937 38504 53041 38504 79 -1 @@ -1561,16 +1556,20 @@ Po 0 54903 39440 54598 39440 79 -1 De 15 0 20 0 0 Po 0 53937 38188 53937 38504 79 -1 De 15 0 20 0 0 -Po 0 49016 39961 49016 40256 79 -1 -De 15 0 21 509834FC 0 -Po 0 51042 42282 51042 43721 79 -1 -De 15 0 21 50983502 0 +Po 0 54598 39440 54331 39173 79 -1 +De 15 0 20 50982F44 0 +Po 0 54331 39173 54331 38780 79 -1 +De 15 0 20 50982F45 0 +Po 0 49715 39762 49215 39762 79 -1 +De 15 0 21 0 0 Po 0 49215 39762 49016 39961 79 -1 De 15 0 21 509834FB 0 Po 0 49016 40256 51042 42282 79 -1 De 15 0 21 50983500 0 -Po 0 49715 39762 49215 39762 79 -1 -De 15 0 21 0 0 +Po 0 51042 42282 51042 43721 79 -1 +De 15 0 21 50983502 0 +Po 0 49016 39961 49016 40256 79 -1 +De 15 0 21 509834FC 0 Po 0 51221 37313 51221 36673 79 -1 De 15 0 22 0 0 Po 0 51221 36673 51378 36516 79 -1 @@ -1587,168 +1586,158 @@ Po 3 50197 45177 50197 45177 300 -1 De 15 1 22 0 0 Po 0 50197 45177 49658 44638 79 -1 De 15 0 22 509835E1 0 -Po 0 55020 48622 56693 46949 118 -1 -De 15 0 23 0 0 -Po 0 56693 46949 56693 45984 118 -1 -De 15 0 23 50983D26 0 -Po 0 49508 36516 48819 37205 118 -1 -De 15 0 23 0 0 -Po 0 56693 45984 56693 45669 118 -1 -De 15 0 23 50983D37 0 -Po 0 56988 37302 56894 37208 118 -1 -De 15 0 23 50983EBE 0 -Po 0 55944 45984 56693 45984 118 -1 -De 15 0 23 0 0 -Po 3 56988 38287 56988 38287 394 -1 -De 15 1 23 0 0 -Po 0 56092 38287 56988 38287 118 -1 -De 15 0 23 0 0 -Po 0 56988 39440 56988 38287 118 -1 -De 15 0 23 0 0 -Po 0 50788 35236 51280 35236 118 -1 -De 15 0 23 50983A94 0 -Po 0 57776 44586 57776 41930 118 -1 -De 15 0 23 50983D2C 0 -Po 0 56988 40452 56988 41142 118 -1 -De 15 0 23 0 0 -Po 0 54331 48622 55020 48622 118 -1 -De 15 0 23 0 0 -Po 0 57776 41930 56988 41142 118 -1 -De 15 0 23 50983D05 0 -Po 0 56988 41142 56298 41142 118 -1 -De 15 0 23 50983D08 0 -Po 0 48819 37205 48819 38484 118 -1 -De 15 0 23 50983A87 0 -Po 0 48819 38484 48819 38878 118 -1 -De 15 0 23 50983A91 0 -Po 0 49409 36615 49508 36516 118 -1 -De 0 0 23 50983A78 0 -Po 0 49409 41634 49409 36615 118 -1 -De 0 0 23 0 0 -Po 0 49695 38484 48819 38484 118 -1 -De 15 0 23 50983A8F 0 -Po 0 52067 35728 54528 38189 118 -1 -De 0 0 23 50983A4A 0 -Po 0 49715 38504 49695 38484 118 -1 -De 15 0 23 0 0 -Po 0 54528 38189 54528 40945 118 -1 -De 0 0 23 50983A4C 0 -Po 0 54331 40453 54528 40650 118 -1 -De 15 0 23 50983A18 0 -Po 0 50787 47835 50197 47835 118 -1 -De 0 0 23 0 0 -Po 0 50197 47835 49409 47047 118 -1 -De 0 0 23 50983A70 0 -Po 0 49409 47047 49409 41634 118 -1 -De 0 0 23 50983A73 0 -Po 0 51280 35236 51280 35433 118 -1 -De 0 0 23 0 0 -Po 0 51280 35433 51575 35728 118 -1 -De 0 0 23 50983A43 0 -Po 3 50787 47835 50787 47835 394 -1 -De 15 1 23 0 0 -Po 0 56988 38287 56988 37302 118 -1 -De 15 0 23 0 0 -Po 0 54528 40650 54528 40945 118 -1 -De 15 0 23 50983A19 0 -Po 3 54528 40945 54528 40945 394 -1 -De 15 1 23 0 0 -Po 0 54528 40945 52854 42619 118 -1 -De 0 0 23 50983A1D 0 -Po 0 52854 42619 52854 45768 118 -1 -De 0 0 23 50983A1E 0 -Po 0 52854 45768 50787 47835 118 -1 -De 0 0 23 50983A22 0 -Po 0 54331 48622 52559 48622 118 -1 -De 15 0 23 0 0 -Po 0 52559 48622 51772 47835 118 -1 -De 15 0 23 509839D5 0 -Po 0 51772 47835 50787 47835 118 -1 -De 15 0 23 509839D9 0 -Po 0 51575 35728 52067 35728 118 -1 -De 0 0 23 50983A49 0 -Po 0 49508 36516 50788 35236 118 -1 -De 15 0 23 0 0 -Po 0 51004 38504 51319 38819 118 -1 +Po 0 51004 38504 51319 38819 157 -1 De 15 0 23 50982F70 0 -Po 0 54378 48669 54331 48622 118 -1 -De 15 0 23 5098395F 0 +Po 0 51319 38819 53041 38819 157 -1 +De 15 0 23 50982F71 0 +Po 0 55836 38287 56092 38287 157 -1 +De 15 0 23 50983096 0 +Po 0 52559 48622 51772 47835 157 -1 +De 15 0 23 509839D5 0 +Po 0 53937 40453 53937 40749 157 -1 +De 15 0 23 50983A16 0 +Po 0 55582 38287 55836 38287 157 -1 +De 15 0 23 50983092 0 Po 3 54331 48622 54331 48622 394 -1 De 15 1 23 0 0 -Po 0 49409 42638 49409 41634 118 -1 +Po 0 54378 48669 54331 48622 157 -1 +De 15 0 23 5098395F 0 +Po 0 54378 49803 54378 48669 157 -1 De 15 0 23 0 0 -Po 3 49409 41634 49409 41634 394 -1 +Po 0 49715 38504 51004 38504 157 -1 +De 15 0 23 0 0 +Po 0 55582 39440 55709 39567 118 -1 +De 15 0 23 509830A0 0 +Po 0 55582 38761 55582 38287 157 -1 +De 15 0 23 0 0 +Po 0 55582 38761 55582 39440 118 -1 +De 15 0 23 0 0 +Po 0 55020 48622 56693 46949 157 -1 +De 15 0 23 0 0 +Po 0 54331 48622 55020 48622 157 -1 +De 15 0 23 0 0 +Po 0 56693 46949 56693 45984 157 -1 +De 15 0 23 50983D26 0 +Po 3 50787 47835 50787 47835 394 -1 De 15 1 23 0 0 -Po 0 56894 37208 57144 37208 118 -1 +Po 0 54331 48622 52559 48622 157 -1 +De 15 0 23 0 0 +Po 0 51772 47835 50787 47835 157 -1 +De 15 0 23 509839D9 0 +Po 0 53937 40157 53937 40453 157 -1 De 15 0 23 0 0 Po 0 57144 37208 57380 36972 118 -1 De 15 0 23 50983908 0 -Po 0 54378 49803 54378 48669 118 -1 +Po 0 56894 37208 57144 37208 118 -1 De 15 0 23 0 0 -Po 0 56092 38761 56092 38287 118 -1 -De 15 0 23 0 0 -Po 0 51347 34350 51347 35169 118 -1 -De 15 0 23 0 0 -Po 0 55836 38287 56092 38287 118 -1 -De 15 0 23 50983096 0 -Po 0 55582 39440 55709 39567 118 -1 -De 15 0 23 509830A0 0 -Po 0 56515 39440 56988 39440 118 -1 -De 15 0 23 0 0 -Po 0 55582 38761 55582 38287 118 -1 -De 15 0 23 0 0 -Po 0 53898 38819 53937 38780 118 -1 -De 15 0 23 50982F2A 0 -Po 0 55582 38761 55582 39440 118 -1 -De 15 0 23 0 0 -Po 3 51280 35236 51280 35236 394 -1 +Po 3 49409 41634 49409 41634 394 -1 De 15 1 23 0 0 -Po 0 51347 35169 51280 35236 118 -1 -De 15 0 23 50983874 0 -Po 0 55836 38761 55836 38287 118 -1 +Po 0 49409 42638 49409 41634 157 -1 De 15 0 23 0 0 -Po 0 53041 38819 53898 38819 118 -1 +Po 0 53041 38819 53898 38819 157 -1 De 15 0 23 0 0 -Po 0 55836 39440 55709 39567 118 -1 -De 15 0 23 509830A5 0 -Po 0 53937 37796 54134 37796 118 -1 +Po 0 53898 38819 53937 38780 157 -1 +De 15 0 23 50982F2A 0 +Po 0 54625 38287 55582 38287 157 -1 +De 15 0 23 50983085 0 +Po 0 54528 40650 54528 40945 157 -1 +De 15 0 23 50983A19 0 +Po 0 54134 37796 54625 38287 157 -1 +De 15 0 23 50983083 0 +Po 0 56515 39440 56988 39440 157 -1 De 15 0 23 0 0 -Po 0 55836 38761 55836 39440 118 -1 +Po 0 56988 39440 56988 40452 157 -1 +De 15 0 23 5098309E 0 +Po 0 56988 40452 56988 41142 157 -1 +De 15 0 23 0 0 +Po 0 49625 42422 49409 42638 157 -1 +De 15 0 23 50982FEC 0 +Po 0 50591 42422 49625 42422 157 -1 +De 15 0 23 0 0 +Po 0 53937 40453 54331 40453 157 -1 +De 15 0 23 0 0 +Po 0 52854 42619 52854 45768 157 -1 +De 0 0 23 50983A1E 0 +Po 0 54331 40453 54528 40650 157 -1 +De 15 0 23 50983A18 0 +Po 0 53937 37796 54134 37796 157 -1 De 15 0 23 0 0 Po 0 55836 39440 55709 39567 118 -1 De 15 0 23 509830A3 0 -Po 0 51319 38819 53041 38819 118 -1 -De 15 0 23 50982F71 0 +Po 0 54528 40945 52854 42619 157 -1 +De 0 0 23 50983A1D 0 +Po 0 52854 45768 50787 47835 157 -1 +De 0 0 23 50983A22 0 +Po 0 49074 39133 48819 38878 157 -1 +De 15 0 23 50982FBF 0 +Po 0 49715 39133 49074 39133 157 -1 +De 15 0 23 0 0 +Po 0 55836 39440 55709 39567 118 -1 +De 15 0 23 509830A5 0 +Po 0 56693 45669 57776 44586 157 -1 +De 15 0 23 50983D29 0 +Po 0 56693 45984 56693 45669 157 -1 +De 15 0 23 50983D37 0 +Po 0 57776 44586 57776 41930 157 -1 +De 15 0 23 50983D2C 0 +Po 3 54528 40945 54528 40945 394 -1 +De 15 1 23 0 0 +Po 0 48819 38484 48819 38878 118 -1 +De 15 0 23 50983A91 0 +Po 0 48819 37205 48819 38484 157 -1 +De 15 0 23 50983A87 0 +Po 0 49508 36516 48819 37205 157 -1 +De 15 0 23 0 0 +Po 0 49409 41634 49409 36615 157 -1 +De 0 0 23 0 0 +Po 0 55836 38761 55836 39440 118 -1 +De 15 0 23 0 0 +Po 0 56515 39440 55836 39440 157 -1 +De 15 0 23 0 0 +Po 0 57776 41930 56988 41142 157 -1 +De 15 0 23 50983D05 0 Po 3 49508 36516 49508 36516 394 -1 De 15 1 23 0 0 -Po 0 56515 39440 55836 39440 118 -1 +Po 0 49409 36615 49508 36516 157 -1 +De 0 0 23 50983A78 0 +Po 3 56988 38287 56988 38287 394 -1 +De 15 1 23 0 0 +Po 0 56988 41142 56298 41142 157 -1 +De 15 0 23 50983D08 0 +Po 0 49715 38504 49695 38484 118 -1 De 15 0 23 0 0 -Po 0 54134 37796 54625 38287 118 -1 -De 15 0 23 50983083 0 -Po 0 54625 38287 55582 38287 118 -1 -De 15 0 23 50983085 0 -Po 0 55582 38287 55836 38287 118 -1 -De 15 0 23 50983092 0 -Po 0 56693 45669 57776 44586 118 -1 -De 15 0 23 50983D29 0 -Po 0 49715 39133 49074 39133 118 -1 +Po 0 49695 38484 48819 38484 118 -1 +De 15 0 23 50983A8F 0 +Po 0 56988 39440 56988 38287 157 -1 De 15 0 23 0 0 -Po 0 49074 39133 48819 38878 118 -1 -De 15 0 23 50982FBF 0 -Po 0 53937 40453 54331 40453 118 -1 +Po 0 56092 38287 56988 38287 157 -1 De 15 0 23 0 0 -Po 0 50591 42422 49625 42422 118 -1 +Po 0 56988 37302 56894 37208 157 -1 +De 15 0 23 50983EBE 0 +Po 0 56988 38287 56988 37302 157 -1 De 15 0 23 0 0 -Po 0 49625 42422 49409 42638 118 -1 -De 15 0 23 50982FEC 0 -Po 0 56988 39440 56988 40452 118 -1 -De 15 0 23 5098309E 0 -Po 0 53937 40157 53937 40453 118 -1 +Po 0 55836 38761 55836 38287 157 -1 De 15 0 23 0 0 -Po 0 53937 40453 53937 40749 118 -1 -De 15 0 23 50983A16 0 -Po 0 49715 38504 51004 38504 118 -1 +Po 0 53082 34350 53082 35168 157 -1 De 15 0 23 0 0 +Po 0 55944 45984 56693 45984 157 -1 +De 15 0 23 0 0 +Po 0 53937 35236 56988 38287 157 -1 +De 0 0 23 50994ED3 0 +Po 0 53150 35236 53937 35236 157 -1 +De 0 0 23 50994ED2 0 +Po 3 53150 35236 53150 35236 394 -1 +De 15 1 23 0 0 +Po 0 49409 47047 49409 41634 157 -1 +De 0 0 23 50983A73 0 +Po 0 50787 47835 50197 47835 157 -1 +De 0 0 23 0 0 +Po 0 50197 47835 49409 47047 157 -1 +De 0 0 23 50983A70 0 +Po 0 56092 38761 56092 38287 157 -1 +De 15 0 23 0 0 +Po 0 53082 35168 53150 35236 157 -1 +De 15 0 23 50994ECD 0 $EndTRACK $ZONE $EndZONE @@ -1763,14 +1752,14 @@ ZSmoothing 0 0 ZCorner 50689 50197 0 ZCorner 50689 49508 0 ZCorner 49114 47933 0 -ZCorner 49114 35531 0 -ZCorner 48327 35531 0 +ZCorner 49114 33957 0 +ZCorner 48327 33957 0 ZCorner 48327 50197 1 $POLYSCORNERS 50639 50147 0 0 48502 50147 0 0 -48502 35581 0 0 -49064 35581 0 0 +48502 34007 0 0 +49064 34007 0 0 49064 36422 0 0 49062 36427 0 0 49062 36604 0 0 @@ -1813,41 +1802,37 @@ $POLYSCORNERS 55466 41526 0 0 55466 41349 0 0 55398 41185 0 0 -55329 41115 0 0 -55329 37993 0 0 -55328 37992 0 0 -55305 37875 0 0 -55304 37874 0 0 -55282 37841 0 0 -55238 37775 0 0 -55238 37774 0 0 -52481 35018 0 0 -52381 34951 0 0 -52263 34927 0 0 -52191 34927 0 0 -52123 34858 0 0 -51959 34790 0 0 -51782 34790 0 0 -51618 34858 0 0 -51492 34983 0 0 -51424 35147 0 0 -51424 35324 0 0 -51492 35488 0 0 -51617 35614 0 0 -51781 35682 0 0 -51958 35682 0 0 -52122 35614 0 0 -52163 35572 0 0 -54711 38120 0 0 -54711 41115 0 0 +55348 41134 0 0 +55348 37992 0 0 +55347 37991 0 0 +55348 37991 0 0 +55323 37866 0 0 +55252 37760 0 0 +55248 37757 0 0 +53202 35710 0 0 +53202 35640 0 0 +53134 35476 0 0 +53009 35350 0 0 +52845 35282 0 0 +52668 35282 0 0 +52504 35350 0 0 +52378 35475 0 0 +52310 35639 0 0 +52310 35816 0 0 +52378 35980 0 0 +52503 36106 0 0 +52667 36174 0 0 +52738 36174 0 0 +54692 38127 0 0 +54692 41134 0 0 54642 41184 0 0 54574 41348 0 0 -54574 41446 0 0 -54014 42007 0 0 -53947 42107 0 0 -53923 42225 0 0 -53923 45738 0 0 -53745 45916 0 0 +54574 41419 0 0 +54000 41993 0 0 +53929 42099 0 0 +53904 42225 0 0 +53904 45730 0 0 +53745 45889 0 0 53745 41517 0 0 53745 41358 0 0 53684 41211 0 0 @@ -1895,40 +1880,14 @@ $POLYSCORNERS 51457 36915 0 0 51604 36854 0 0 51716 36742 0 0 -51735 36695 0 0 -51790 36718 0 0 -51949 36718 0 0 -52096 36657 0 0 -52208 36545 0 0 -52269 36399 0 0 -52269 36240 0 0 -52208 36093 0 0 -52096 35981 0 0 -51950 35920 0 0 -51879 35920 0 0 -51877 35918 0 0 -51784 35855 0 0 -51673 35833 0 0 -51378 35833 0 0 -50591 35833 0 0 -50480 35855 0 0 -50387 35918 0 0 -50188 36117 0 0 -50118 36117 0 0 -49971 36178 0 0 -49859 36290 0 0 -49798 36436 0 0 -49798 36595 0 0 -49859 36742 0 0 -49971 36854 0 0 -50117 36915 0 0 -50276 36915 0 0 -50423 36854 0 0 -50535 36742 0 0 -50596 36596 0 0 -50596 36525 0 0 -50710 36411 0 0 -50989 36411 0 0 +51777 36596 0 0 +51777 36437 0 0 +51716 36290 0 0 +51604 36178 0 0 +51458 36117 0 0 +51299 36117 0 0 +51152 36178 0 0 +51040 36290 0 0 50979 36436 0 0 50979 36507 0 0 49993 37493 0 0 @@ -1974,8 +1933,8 @@ $POLYSCORNERS 53572 41775 0 0 53684 41663 0 0 53745 41517 0 0 -53745 45916 0 0 -51485 48176 0 0 +53745 45889 0 0 +51458 48176 0 0 51388 48176 0 0 51224 48244 0 0 51098 48369 0 0 @@ -1988,14 +1947,12 @@ $POLYSCORNERS 51728 49000 0 0 51854 48875 0 0 51922 48711 0 0 -51922 48612 0 0 -54450 46085 0 0 -54450 46084 0 0 -54517 45984 0 0 -54540 45866 0 0 -54541 45866 0 0 -54541 42352 0 0 -55010 41883 0 0 +51922 48640 0 0 +54464 46098 0 0 +54535 45992 0 0 +54560 45866 0 0 +54560 42361 0 0 +55038 41883 0 0 55108 41883 0 0 55272 41815 0 0 55398 41690 0 0 @@ -2004,7 +1961,20 @@ $POLYSCORNERS 51034 50513 0 0 51034 49192 0 0 49459 47617 0 0 -49459 34007 0 0 +49459 36340 0 0 +50727 35072 0 0 +53740 35072 0 0 +53865 35047 0 0 +53866 35047 0 0 +53972 34976 0 0 +54152 34796 0 0 +54222 34796 0 0 +54386 34728 0 0 +54512 34603 0 0 +54580 34439 0 0 +54580 34262 0 0 +54512 34098 0 0 +54421 34007 0 0 57895 34007 0 0 57895 50513 1 0 $endPOLYSCORNERS @@ -2028,13 +1998,13 @@ ZCorner 56299 39075 0 ZCorner 55512 39075 0 ZCorner 55512 38386 1 $POLYSCORNERS -55225 40986 0 0 +55206 40979 0 0 55119 40943 0 0 54922 40943 0 0 54740 41018 0 0 -54678 41080 0 0 -54380 41080 0 0 -54352 41051 0 0 +54697 41061 0 0 +54388 41061 0 0 +54352 41024 0 0 54352 40984 0 0 54307 40875 0 0 54233 40801 0 0 @@ -2058,8 +2028,8 @@ $POLYSCORNERS 55005 40777 0 0 55089 40861 0 0 55198 40906 0 0 -55225 40906 0 0 -55225 40986 1 0 +55206 40906 0 0 +55206 40979 1 0 55268 38228 0 0 55198 38228 0 0 55089 38273 0 0 @@ -2197,11 +2167,10 @@ $POLYSCORNERS 55103 41931 0 0 55118 41931 0 0 55300 41856 0 0 -55380 41775 0 0 -55423 41767 0 0 -55424 41767 0 0 -55539 41689 0 0 -55694 41534 0 0 +55357 41798 0 0 +55431 41784 0 0 +55553 41703 0 0 +55713 41542 0 0 55749 41557 0 0 55867 41557 0 0 56063 41557 0 0 diff --git a/whirl/cpu/cpu.sch b/whirl/cpu/cpu.sch index 5300a30..a32fdb3 100644 --- a/whirl/cpu/cpu.sch +++ b/whirl/cpu/cpu.sch @@ -1,4 +1,4 @@ -EESchema Schematic File Version 2 date Mon Nov 5 18:50:49 2012 +EESchema Schematic File Version 2 date Tue Nov 6 14:48:14 2012 LIBS:c LIBS:r LIBS:Atmega8 @@ -17,7 +17,7 @@ $Descr A4 11693 8268 encoding utf-8 Sheet 1 1 Title "" -Date "5 nov 2012" +Date "6 nov 2012" Rev "" Comp "" Comment1 "" @@ -50,7 +50,7 @@ P 1200 2750 F 0 "CON2" H 1200 3100 60 0000 C CNN F 1 "CONN_6" H 1200 2400 60 0000 C CNN 1 1200 2750 - -1 0 0 -1 + -1 0 0 1 $EndComp $Comp L C C2 @@ -242,7 +242,7 @@ CTRL_3V NoConn ~ 6200 3300 Text Label 8400 1050 0 60 ~ 0 VLED -Text Label 2000 3000 0 60 ~ 0 +Text Label 2000 2500 0 60 ~ 0 VLED $Comp L GND #PWR010 @@ -253,13 +253,13 @@ F 1 "GND" H 1800 3130 30 0001 C CNN 1 1800 3200 1 0 0 -1 $EndComp -Text Label 2000 2800 0 60 ~ 0 -CTRL_3V -Text Label 2000 2500 0 60 ~ 0 -SCLK Text Label 2000 2700 0 60 ~ 0 +CTRL_3V +Text Label 2000 3000 0 60 ~ 0 +SCLK +Text Label 2000 2800 0 60 ~ 0 DS -Text Label 2000 2600 0 60 ~ 0 +Text Label 2000 2900 0 60 ~ 0 LCLK Text Label 9300 2900 0 60 ~ 0 SCLK_DAT1 @@ -354,7 +354,6 @@ F 1 "EVQQ7" H 5140 6120 60 0000 C CNN 1 0 0 -1 $EndComp NoConn ~ 6200 4100 -NoConn ~ 3800 2800 NoConn ~ 3800 2900 NoConn ~ 3800 3100 NoConn ~ 3800 3200 @@ -525,25 +524,13 @@ Wire Wire Line Wire Wire Line 7400 5000 8900 5000 Wire Wire Line - 3400 2500 1600 2500 -Wire Wire Line - 1600 2700 3800 2700 -Wire Wire Line - 2500 3000 1600 3000 + 2500 2500 1600 2500 Wire Wire Line 8300 1050 8900 1050 Wire Wire Line - 1600 2900 1800 2900 + 1800 2600 1800 3200 Wire Wire Line - 1800 2900 1800 3200 -Wire Wire Line - 1600 2800 2500 2800 -Wire Wire Line - 3400 2500 3400 3000 -Wire Wire Line - 3400 3000 3800 3000 -Wire Wire Line - 1600 2600 3800 2600 + 1600 2700 2500 2700 Wire Wire Line 2900 6100 2900 6300 Wire Wire Line @@ -636,4 +623,20 @@ Wire Wire Line 7800 6100 7800 2600 Wire Wire Line 7800 2600 6200 2600 +Wire Wire Line + 1600 2600 1800 2600 +Wire Wire Line + 3800 2700 2900 2700 +Wire Wire Line + 2900 2700 2900 2800 +Wire Wire Line + 2900 2800 1600 2800 +Wire Wire Line + 3800 2800 3000 2800 +Wire Wire Line + 3000 2800 3000 2900 +Wire Wire Line + 3000 2900 1600 2900 +Wire Wire Line + 3800 3000 1600 3000 $EndSCHEMATC