From e232f7df20aefcca1349547a77f59015b474f240 Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Thu, 21 Jun 2012 18:56:16 -0600 Subject: [PATCH 1/3] flipped U8 to make more sense in the schematic --- hardware/lollipop/lollipop.brd | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/hardware/lollipop/lollipop.brd b/hardware/lollipop/lollipop.brd index f951cb31..4d188081 100644 --- a/hardware/lollipop/lollipop.brd +++ b/hardware/lollipop/lollipop.brd @@ -1,4 +1,4 @@ -PCBNEW-BOARD Version 1 date Thu Jun 21 18:44:32 2012 +PCBNEW-BOARD Version 1 date Thu Jun 21 18:55:35 2012 # Created by Pcbnew(2011-06-30 BZR 3033)-stable @@ -8,7 +8,7 @@ LayerCount 4 Ly 1FFF8007 EnabledLayers 1FFF8007 Links 383 -NoConn 55 +NoConn 53 Di 20440 8924 38560 29076 Ndraw 12 Ntrack 1406 @@ -2030,19 +2030,19 @@ Le 1341 $EndPAD $EndMODULE GSG-HP-DEA $MODULE GSG-HP-DEA -Po 26550 16250 0 15 4FB69E07 4FB82D0E ~P +Po 26550 16250 1800 15 4FB69E07 4FB82D0E ~P Li GSG-HP-DEA Sc 4FB82D0E AR /4F94CF02 Op 0 0 0 -T0 0 0 157 118 0 30 N V 21 N "U8" -T1 0 0 157 118 0 30 N I 21 N "TX_HIGHPASS_FILTER" +T0 0 0 157 118 1800 30 N V 21 N "U8" +T1 0 0 157 118 1800 30 N I 21 N "TX_HIGHPASS_FILTER" DS -236 197 -315 197 118 21 DS 236 197 315 197 118 21 DS 236 -197 315 -197 118 21 DS -315 -197 -236 -197 118 21 $PAD -Sh "1" R 315 236 0 0 0 +Sh "1" R 315 236 0 0 1800 Dr 0 0 0 At SMD N 00888000 Ne 68 "N-000059" @@ -2050,7 +2050,7 @@ Po -433 0 Le 1341 $EndPAD $PAD -Sh "3" R 315 236 0 0 0 +Sh "3" R 315 236 0 0 1800 Dr 0 0 0 At SMD N 00888000 Ne 67 "N-000058" @@ -2058,7 +2058,7 @@ Po 433 0 Le -1983002225 $EndPAD $PAD -Sh "4" R 315 315 0 0 0 +Sh "4" R 315 315 0 0 1800 Dr 130 0 0 At STD N 00C8FFFF Ne 27 "GND" @@ -2066,7 +2066,7 @@ Po 0 -276 Le -1954803880 $EndPAD $PAD -Sh "2" R 315 315 0 0 0 +Sh "2" R 315 315 0 0 1800 Dr 130 0 0 At STD N 00C8FFFF Ne 27 "GND" @@ -8149,11 +8149,11 @@ De 15 0 26 0 0 Po 0 28610 24500 28413 24697 60 -1 De 15 0 26 0 0 Po 0 25360 17000 25360 16930 160 -1 -De 15 0 27 0 C00000 +De 15 0 27 0 400000 Po 3 25510 16780 25510 16780 250 -1 De 15 1 27 0 0 Po 0 25360 16930 25510 16780 160 -1 -De 15 0 27 0 400000 +De 15 0 27 0 0 Po 0 26246 17262 26246 17104 200 -1 De 15 0 27 0 400000 Po 3 26300 17050 26300 17050 250 -1 @@ -9155,9 +9155,9 @@ De 15 0 44 0 800000 Po 0 25650 14100 25838 13912 200 -1 De 15 0 44 0 0 Po 0 25754 17538 25362 17538 200 -1 -De 15 0 45 0 C00000 +De 15 0 45 0 400000 Po 0 25362 17538 25350 17550 200 -1 -De 15 0 45 0 C00000 +De 15 0 45 0 800000 Po 0 28095 17540 28540 17540 90 -1 De 15 0 46 0 400000 Po 0 28540 17540 28690 17690 90 -1 @@ -9298,9 +9298,9 @@ Po 0 25920 19513 26367 19960 200 -1 De 15 0 66 0 800000 Po 0 25860 15800 25860 15993 200 -1 De 15 0 67 0 400000 -Po 0 27339 16606 26983 16250 200 -1 -De 15 0 67 0 800000 Po 0 25860 15993 26117 16250 200 -1 +De 15 0 67 0 800000 +Po 0 27339 16606 26983 16250 200 -1 De 15 0 68 0 800000 Po 0 27544 16606 27339 16606 200 -1 De 15 0 68 0 400000 @@ -9535,9 +9535,9 @@ De 15 0 100 0 0 Po 0 28300 18540 28095 18540 90 -1 De 15 0 100 0 800000 Po 0 26246 17538 26843 17538 200 -1 -De 15 0 101 0 C00000 +De 15 0 101 0 400000 Po 0 26843 17538 26845 17540 200 -1 -De 15 0 101 0 C00000 +De 15 0 101 0 800000 Po 0 24191 17500 24380 17500 90 -1 De 15 0 102 0 400000 Po 0 24440 17440 24380 17500 200 -1 From 10133bdf27ba4808106f32b5410d155ee1085b96 Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Thu, 21 Jun 2012 19:10:58 -0600 Subject: [PATCH 2/3] redid highpass filter module now that I understand the drawing in the datasheet --- hardware/kicad/hackrf.mod | 93 +++++++------ hardware/lollipop/lollipop.brd | 244 +++++++++++++++++++-------------- 2 files changed, 184 insertions(+), 153 deletions(-) diff --git a/hardware/kicad/hackrf.mod b/hardware/kicad/hackrf.mod index ece6ad6f..efc08c0f 100644 --- a/hardware/kicad/hackrf.mod +++ b/hardware/kicad/hackrf.mod @@ -1,4 +1,4 @@ -PCBNEW-LibModule-V1 Thu Jun 21 18:19:07 2012 +PCBNEW-LibModule-V1 Thu Jun 21 19:04:23 2012 # encoding utf-8 $INDEX GSG-HEADER-1x3 @@ -6693,51 +6693,6 @@ Po -98 -167 Le 343506680 $EndPAD $EndMODULE GSG-SKY13317-373LF -$MODULE GSG-HP-DEA -Po 0 0 0 15 4FB69E07 00000000 ~~ -Li GSG-HP-DEA -Sc 00000000 -AR -Op 0 0 0 -T0 0 0 157 118 0 30 N V 21 N "GSG-HP-DEA" -T1 0 0 157 118 0 30 N I 21 N "VAL**" -DS -236 197 -315 197 118 21 -DS 236 197 315 197 118 21 -DS 236 -197 315 -197 118 21 -DS -315 -197 -236 -197 118 21 -$PAD -Sh "1" R 315 236 0 0 0 -Dr 0 0 0 -At SMD N 00888000 -Ne 0 "" -Po -433 0 -Le 1341 -$EndPAD -$PAD -Sh "3" R 315 236 0 0 0 -Dr 0 0 0 -At SMD N 00888000 -Ne 0 "" -Po 433 0 -Le -1983002225 -$EndPAD -$PAD -Sh "4" R 315 315 0 0 0 -Dr 130 0 0 -At STD N 00C8FFFF -Ne 0 "" -Po 0 -276 -Le -1954803880 -$EndPAD -$PAD -Sh "2" R 315 315 0 0 0 -Dr 130 0 0 -At STD N 00C8FFFF -Ne 0 "" -Po 0 276 -Le 1341 -$EndPAD -$EndMODULE GSG-HP-DEA $MODULE GSG-CX2156NL Po 0 0 0 15 4FB6B2B7 00000000 ~~ Li GSG-CX2156NL @@ -7749,7 +7704,7 @@ $MODULE GSG-LP0603 Po 0 0 0 15 4FE3B99C 00000000 ~~ Li GSG-LP0603 Sc 00000000 -AR +AR Op 0 0 0 T0 0 0 157 118 0 30 N V 21 N "GSG-LP0603" T1 0 0 157 118 0 30 N I 21 N "VAL**" @@ -7792,4 +7747,48 @@ Po -246 -138 Le -1954803976 $EndPAD $EndMODULE GSG-LP0603 +$MODULE GSG-HP-DEA +Po 0 0 0 15 4FE3C48C 00000000 ~~ +Li GSG-HP-DEA +Sc 00000000 +AR +Op 0 0 0 +T0 0 0 157 118 0 30 N V 21 N "GSG-HP-DEA" +T1 0 0 157 118 0 30 N I 21 N "VAL**" +DS -200 -220 -520 -220 80 21 +DS -520 -220 -520 220 80 21 +DS -520 220 -200 220 80 21 +$PAD +Sh "1" R 197 276 0 0 0 +Dr 0 0 0 +At SMD N 00888000 +Ne 0 "" +Po -335 0 +Le 1341 +$EndPAD +$PAD +Sh "3" R 197 276 0 0 0 +Dr 0 0 0 +At SMD N 00888000 +Ne 0 "" +Po 335 0 +Le -1983002225 +$EndPAD +$PAD +Sh "4" R 236 197 0 0 0 +Dr 0 0 0 +At SMD N 00888000 +Ne 0 "" +Po 0 -177 +Le -1954803880 +$EndPAD +$PAD +Sh "2" R 236 197 0 0 0 +Dr 0 0 0 +At SMD N 00888000 +Ne 0 "" +Po 0 177 +Le 1341 +$EndPAD +$EndMODULE GSG-HP-DEA $EndLIBRARY diff --git a/hardware/lollipop/lollipop.brd b/hardware/lollipop/lollipop.brd index 4d188081..94eeb2c0 100644 --- a/hardware/lollipop/lollipop.brd +++ b/hardware/lollipop/lollipop.brd @@ -1,4 +1,4 @@ -PCBNEW-BOARD Version 1 date Thu Jun 21 18:55:35 2012 +PCBNEW-BOARD Version 1 date Thu Jun 21 19:09:48 2012 # Created by Pcbnew(2011-06-30 BZR 3033)-stable @@ -11,7 +11,7 @@ Links 383 NoConn 53 Di 20440 8924 38560 29076 Ndraw 12 -Ntrack 1406 +Ntrack 1423 Nzone 0 BoardThickness 630 Nmodule 130 @@ -37,7 +37,7 @@ Layer[0] Back signal Layer[1] Inner2 signal Layer[2] Inner3 signal Layer[15] Front signal -TrackWidth 160 +TrackWidth 200 TrackWidthList 90 TrackWidthList 160 TrackWidthList 200 @@ -62,11 +62,11 @@ MicroViaMinSize 200 MicroViaMinDrill 50 TextPcbWidth 120 TextPcbSize 600 800 -EdgeModWidth 150 +EdgeModWidth 80 TextModSize 600 600 -TextModWidth 120 -PadSize 600 600 -PadDrill 320 +TextModWidth 80 +PadSize 236 197 +PadDrill 0 Pad2MaskClearance 100 Pad2PasteClearanceRatio -0.12 AuxiliaryAxisOrg 0 0 @@ -638,6 +638,94 @@ AddNet "N-000119" AddNet "N-000123" AddNet "VCC" $EndNCLASS +$MODULE GSG-HP-DEA +Po 26800 19960 0 15 4FE3C48C 4FB6B94B ~~ +Li GSG-HP-DEA +Sc 4FB6B94B +AR /4F94D4F4 +Op 0 0 0 +T0 0 0 157 118 0 30 N V 21 N "U11" +T1 0 0 157 118 0 30 N I 21 N "TX_HIGHPASS_FILTER" +DS -200 -220 -520 -220 80 21 +DS -520 -220 -520 220 80 21 +DS -520 220 -200 220 80 21 +$PAD +Sh "1" R 197 276 0 0 0 +Dr 0 0 0 +At SMD N 00888000 +Ne 66 "N-000056" +Po -335 0 +Le 1341 +$EndPAD +$PAD +Sh "3" R 197 276 0 0 0 +Dr 0 0 0 +At SMD N 00888000 +Ne 65 "N-000055" +Po 335 0 +Le -1983002225 +$EndPAD +$PAD +Sh "4" R 236 197 0 0 0 +Dr 0 0 0 +At SMD N 00888000 +Ne 27 "GND" +Po 0 -177 +Le -1954803880 +$EndPAD +$PAD +Sh "2" R 236 197 0 0 0 +Dr 0 0 0 +At SMD N 00888000 +Ne 27 "GND" +Po 0 177 +Le 1341 +$EndPAD +$EndMODULE GSG-HP-DEA +$MODULE GSG-HP-DEA +Po 26550 16250 1800 15 4FE3C48C 4FB82D0E ~~ +Li GSG-HP-DEA +Sc 4FB82D0E +AR /4F94CF02 +Op 0 0 0 +T0 0 0 157 118 1800 30 N V 21 N "U8" +T1 0 0 157 118 1800 30 N I 21 N "TX_HIGHPASS_FILTER" +DS -200 -220 -520 -220 80 21 +DS -520 -220 -520 220 80 21 +DS -520 220 -200 220 80 21 +$PAD +Sh "1" R 197 276 0 0 1800 +Dr 0 0 0 +At SMD N 00888000 +Ne 68 "N-000059" +Po -335 0 +Le 1341 +$EndPAD +$PAD +Sh "3" R 197 276 0 0 1800 +Dr 0 0 0 +At SMD N 00888000 +Ne 67 "N-000058" +Po 335 0 +Le -1983002225 +$EndPAD +$PAD +Sh "4" R 236 197 0 0 1800 +Dr 0 0 0 +At SMD N 00888000 +Ne 27 "GND" +Po 0 -177 +Le -1954803880 +$EndPAD +$PAD +Sh "2" R 236 197 0 0 1800 +Dr 0 0 0 +At SMD N 00888000 +Ne 27 "GND" +Po 0 177 +Le 1341 +$EndPAD +$EndMODULE GSG-HP-DEA $MODULE GSG-S-PVQFN-14 Po 29500 24500 1800 15 4FE0A018 4FB6B941 ~~ Li GSG-S-PVQFN-14 @@ -1984,96 +2072,6 @@ Po 167 0 Le 343506872 $EndPAD $EndMODULE GSG-LXES1UBBB1-008 -$MODULE GSG-HP-DEA -Po 26800 19960 0 15 4FB69E07 4FB6B94B ~P -Li GSG-HP-DEA -Sc 4FB6B94B -AR /4F94D4F4 -Op 0 0 0 -T0 0 0 157 118 0 30 N V 21 N "U11" -T1 0 0 157 118 0 30 N I 21 N "TX_HIGHPASS_FILTER" -DS -236 197 -315 197 118 21 -DS 236 197 315 197 118 21 -DS 236 -197 315 -197 118 21 -DS -315 -197 -236 -197 118 21 -$PAD -Sh "1" R 315 236 0 0 0 -Dr 0 0 0 -At SMD N 00888000 -Ne 66 "N-000056" -Po -433 0 -Le 1341 -$EndPAD -$PAD -Sh "3" R 315 236 0 0 0 -Dr 0 0 0 -At SMD N 00888000 -Ne 65 "N-000055" -Po 433 0 -Le -1983002225 -$EndPAD -$PAD -Sh "4" R 315 315 0 0 0 -Dr 130 0 0 -At STD N 00C8FFFF -Ne 27 "GND" -Po 0 -276 -Le -1954803880 -$EndPAD -$PAD -Sh "2" R 315 315 0 0 0 -Dr 130 0 0 -At STD N 00C8FFFF -Ne 27 "GND" -Po 0 276 -Le 1341 -$EndPAD -$EndMODULE GSG-HP-DEA -$MODULE GSG-HP-DEA -Po 26550 16250 1800 15 4FB69E07 4FB82D0E ~P -Li GSG-HP-DEA -Sc 4FB82D0E -AR /4F94CF02 -Op 0 0 0 -T0 0 0 157 118 1800 30 N V 21 N "U8" -T1 0 0 157 118 1800 30 N I 21 N "TX_HIGHPASS_FILTER" -DS -236 197 -315 197 118 21 -DS 236 197 315 197 118 21 -DS 236 -197 315 -197 118 21 -DS -315 -197 -236 -197 118 21 -$PAD -Sh "1" R 315 236 0 0 1800 -Dr 0 0 0 -At SMD N 00888000 -Ne 68 "N-000059" -Po -433 0 -Le 1341 -$EndPAD -$PAD -Sh "3" R 315 236 0 0 1800 -Dr 0 0 0 -At SMD N 00888000 -Ne 67 "N-000058" -Po 433 0 -Le -1983002225 -$EndPAD -$PAD -Sh "4" R 315 315 0 0 1800 -Dr 130 0 0 -At STD N 00C8FFFF -Ne 27 "GND" -Po 0 -276 -Le -1954803880 -$EndPAD -$PAD -Sh "2" R 315 315 0 0 1800 -Dr 130 0 0 -At STD N 00C8FFFF -Ne 27 "GND" -Po 0 276 -Le 1341 -$EndPAD -$EndMODULE GSG-HP-DEA $MODULE GSG-HHM1595A1 Po 28000 19860 0 15 4FB6B4A3 4FB6C772 ~P Li GSG-HHM1595A1 @@ -8148,6 +8146,34 @@ Po 0 28413 24697 28023 24697 60 -1 De 15 0 26 0 0 Po 0 28610 24500 28413 24697 60 -1 De 15 0 26 0 0 +Po 0 26800 19783 26800 19560 200 -1 +De 15 0 27 0 400000 +Po 3 26800 19560 26800 19560 250 -1 +De 15 1 27 0 0 +Po 0 26800 20137 26800 20360 200 -1 +De 15 0 27 0 400000 +Po 3 26800 20360 26800 20360 250 -1 +De 15 1 27 0 0 +Po 0 26800 20137 26800 19960 200 -1 +De 15 0 27 0 400000 +Po 3 26800 19960 26800 19960 250 -1 +De 15 1 27 0 0 +Po 0 26800 19960 26800 19783 200 -1 +De 15 0 27 0 800000 +Po 0 26550 16073 26550 15850 200 -1 +De 15 0 27 0 400000 +Po 3 26550 15850 26550 15850 250 -1 +De 15 1 27 0 0 +Po 0 26550 16427 26550 16650 200 -1 +De 15 0 27 0 400000 +Po 3 26550 16650 26550 16650 250 -1 +De 15 1 27 0 0 +Po 0 26550 16427 26550 16250 200 -1 +De 15 0 27 0 400000 +Po 3 26550 16250 26550 16250 250 -1 +De 15 1 27 0 0 +Po 0 26550 16250 26550 16073 200 -1 +De 15 0 27 0 800000 Po 0 25360 17000 25360 16930 160 -1 De 15 0 27 0 400000 Po 3 25510 16780 25510 16780 250 -1 @@ -9288,22 +9314,28 @@ Po 0 32902 16035 32902 15163 90 -1 De 15 0 64 0 400000 Po 0 32902 15163 32915 15150 90 -1 De 15 0 64 0 800000 -Po 0 27744 20116 27389 20116 200 -1 +Po 0 27744 20116 27291 20116 200 -1 De 15 0 65 0 400000 -Po 0 27389 20116 27233 19960 200 -1 +Po 0 27291 20116 27135 19960 200 -1 De 15 0 65 0 800000 -Po 0 25920 19340 25920 19513 200 -1 +Po 0 25920 19340 25920 19510 200 -1 De 15 0 66 0 400000 -Po 0 25920 19513 26367 19960 200 -1 +Po 0 26370 19960 26465 19960 200 -1 +De 15 0 66 0 C00000 +Po 0 25920 19510 26370 19960 200 -1 De 15 0 66 0 800000 -Po 0 25860 15800 25860 15993 200 -1 +Po 0 25860 15800 25860 15980 200 -1 De 15 0 67 0 400000 -Po 0 25860 15993 26117 16250 200 -1 +Po 0 26130 16250 26215 16250 200 -1 +De 15 0 67 0 C00000 +Po 0 25860 15980 26130 16250 200 -1 De 15 0 67 0 800000 -Po 0 27339 16606 26983 16250 200 -1 -De 15 0 68 0 800000 -Po 0 27544 16606 27339 16606 200 -1 +Po 0 27544 16606 27336 16606 200 -1 De 15 0 68 0 400000 +Po 0 26980 16250 26885 16250 200 -1 +De 15 0 68 0 C00000 +Po 0 27336 16606 26980 16250 200 -1 +De 15 0 68 0 800000 Po 0 26496 13912 27043 13912 200 -1 De 15 0 69 0 400000 Po 0 27043 13912 27055 13900 200 -1 From 9535249efc0fa08190a1a47bc44ba7fd17f6d6d6 Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Thu, 21 Jun 2012 19:11:56 -0600 Subject: [PATCH 3/3] forgot to redo zones --- hardware/lollipop/lollipop.brd | 823 ++++++++++----------------------- 1 file changed, 249 insertions(+), 574 deletions(-) diff --git a/hardware/lollipop/lollipop.brd b/hardware/lollipop/lollipop.brd index 94eeb2c0..15cb002e 100644 --- a/hardware/lollipop/lollipop.brd +++ b/hardware/lollipop/lollipop.brd @@ -1,4 +1,4 @@ -PCBNEW-BOARD Version 1 date Thu Jun 21 19:09:48 2012 +PCBNEW-BOARD Version 1 date Thu Jun 21 19:11:32 2012 # Created by Pcbnew(2011-06-30 BZR 3033)-stable @@ -11658,115 +11658,50 @@ $POLYSCORNERS 27289 21471 0 0 27244 21361 0 0 27160 21277 0 0 -27127 21263 0 0 -27127 20427 0 0 -27127 20359 0 0 -27127 20328 0 0 -27127 20144 0 0 -27127 20113 0 0 -27127 20045 0 0 -27101 19983 0 0 -27078 19960 0 0 -27101 19937 0 0 -27127 19875 0 0 -27127 19807 0 0 -27127 19776 0 0 -27127 19592 0 0 -27127 19561 0 0 -27127 19493 0 0 -27101 19431 0 0 -27053 19383 0 0 -26991 19357 0 0 -26892 19357 0 0 -26877 19372 0 0 -26877 16717 0 0 -26877 16649 0 0 -26877 16618 0 0 -26877 16434 0 0 -26877 16403 0 0 -26877 16335 0 0 -26851 16273 0 0 -26828 16250 0 0 -26851 16227 0 0 -26877 16165 0 0 -26877 16097 0 0 -26877 16066 0 0 -26877 15882 0 0 -26877 15851 0 0 -26877 15783 0 0 -26851 15721 0 0 -26803 15673 0 0 -26741 15647 0 0 -26642 15647 0 0 -26600 15689 0 0 -26600 15924 0 0 -26835 15924 0 0 -26877 15882 0 0 -26877 16066 0 0 -26835 16024 0 0 -26600 16024 0 0 -26600 16241 0 0 -26600 16259 0 0 -26600 16476 0 0 -26835 16476 0 0 -26877 16434 0 0 -26877 16618 0 0 -26835 16576 0 0 -26600 16576 0 0 -26600 16811 0 0 -26642 16853 0 0 -26741 16853 0 0 -26803 16827 0 0 -26851 16779 0 0 -26877 16717 0 0 -26877 19372 0 0 -26850 19399 0 0 -26850 19634 0 0 -27085 19634 0 0 -27127 19592 0 0 -27127 19776 0 0 -27085 19734 0 0 -26850 19734 0 0 -26850 19951 0 0 -26850 19969 0 0 -26850 20186 0 0 -27085 20186 0 0 -27127 20144 0 0 -27127 20328 0 0 -27085 20286 0 0 -26850 20286 0 0 -26850 20521 0 0 -26892 20563 0 0 -26991 20563 0 0 -27053 20537 0 0 -27101 20489 0 0 -27127 20427 0 0 -27127 21263 0 0 27050 21231 0 0 26931 21231 0 0 26821 21276 0 0 -26750 21347 0 0 -26750 20521 0 0 -26750 20286 0 0 -26750 20186 0 0 -26750 19969 0 0 -26750 19951 0 0 -26750 19734 0 0 -26750 19634 0 0 -26750 19399 0 0 -26708 19357 0 0 -26609 19357 0 0 -26547 19383 0 0 -26500 19430 0 0 -26500 16811 0 0 -26500 16576 0 0 -26500 16476 0 0 -26500 16259 0 0 -26500 16241 0 0 -26500 16024 0 0 -26500 15924 0 0 -26500 15689 0 0 -26475 15664 0 0 +26737 21360 0 0 +26691 21470 0 0 +26691 21589 0 0 +26736 21699 0 0 +26820 21783 0 0 +26930 21829 0 0 +27049 21829 0 0 +27159 21784 0 0 +27243 21700 0 0 +27289 21590 0 0 +27289 21619 0 0 +27251 21710 0 0 +27251 21829 0 0 +27296 21939 0 0 +27380 22023 0 0 +27490 22069 0 0 +27609 22069 0 0 +27719 22024 0 0 +27803 21940 0 0 +27849 21830 0 0 +27849 22413 0 0 +27820 22401 0 0 +27701 22401 0 0 +27591 22446 0 0 +27590 22447 0 0 +27530 22387 0 0 +27420 22341 0 0 +27301 22341 0 0 +27191 22386 0 0 +27109 22468 0 0 +27109 22381 0 0 +27064 22271 0 0 +26980 22187 0 0 +26870 22141 0 0 +26751 22141 0 0 +26641 22186 0 0 +26579 22248 0 0 +26579 21840 0 0 +26579 21721 0 0 +26534 21611 0 0 +26475 21552 0 0 26475 11095 0 0 26475 10906 0 0 26465 10881 0 0 @@ -11824,110 +11759,7 @@ $POLYSCORNERS 26269 11403 0 0 26402 11269 0 0 26475 11095 0 0 -26475 15664 0 0 -26458 15647 0 0 -26359 15647 0 0 -26297 15673 0 0 -26249 15721 0 0 -26223 15783 0 0 -26223 15851 0 0 -26223 15882 0 0 -26265 15924 0 0 -26500 15924 0 0 -26500 16024 0 0 -26265 16024 0 0 -26223 16066 0 0 -26223 16097 0 0 -26223 16165 0 0 -26249 16227 0 0 -26272 16250 0 0 -26249 16273 0 0 -26223 16335 0 0 -26223 16403 0 0 -26223 16434 0 0 -26265 16476 0 0 -26500 16476 0 0 -26500 16576 0 0 -26265 16576 0 0 -26223 16618 0 0 -26223 16649 0 0 -26223 16717 0 0 -26249 16779 0 0 -26297 16827 0 0 -26359 16853 0 0 -26458 16853 0 0 -26500 16811 0 0 -26500 19430 0 0 -26499 19431 0 0 -26473 19493 0 0 -26473 19561 0 0 -26473 19592 0 0 -26515 19634 0 0 -26750 19634 0 0 -26750 19734 0 0 -26515 19734 0 0 -26473 19776 0 0 -26473 19807 0 0 -26473 19875 0 0 -26499 19937 0 0 -26522 19960 0 0 -26499 19983 0 0 -26473 20045 0 0 -26473 20113 0 0 -26473 20144 0 0 -26515 20186 0 0 -26750 20186 0 0 -26750 20286 0 0 -26515 20286 0 0 -26473 20328 0 0 -26473 20359 0 0 -26473 20427 0 0 -26499 20489 0 0 -26547 20537 0 0 -26609 20563 0 0 -26708 20563 0 0 -26750 20521 0 0 -26750 21347 0 0 -26737 21360 0 0 -26691 21470 0 0 -26691 21589 0 0 -26736 21699 0 0 -26820 21783 0 0 -26930 21829 0 0 -27049 21829 0 0 -27159 21784 0 0 -27243 21700 0 0 -27289 21590 0 0 -27289 21619 0 0 -27251 21710 0 0 -27251 21829 0 0 -27296 21939 0 0 -27380 22023 0 0 -27490 22069 0 0 -27609 22069 0 0 -27719 22024 0 0 -27803 21940 0 0 -27849 21830 0 0 -27849 22413 0 0 -27820 22401 0 0 -27701 22401 0 0 -27591 22446 0 0 -27590 22447 0 0 -27530 22387 0 0 -27420 22341 0 0 -27301 22341 0 0 -27191 22386 0 0 -27109 22468 0 0 -27109 22381 0 0 -27064 22271 0 0 -26980 22187 0 0 -26870 22141 0 0 -26751 22141 0 0 -26641 22186 0 0 -26579 22248 0 0 -26579 21840 0 0 -26579 21721 0 0 -26534 21611 0 0 +26475 21552 0 0 26450 21527 0 0 26340 21481 0 0 26221 21481 0 0 @@ -15251,14 +15083,14 @@ $POLYSCORNERS 26860 13222 0 0 26860 14972 0 0 26851 14976 0 0 -26789 15038 0 0 -26789 14520 0 0 -26789 14401 0 0 -26744 14291 0 0 -26660 14207 0 0 -26550 14161 0 0 -26431 14161 0 0 -26321 14206 0 0 +26799 15028 0 0 +26799 14510 0 0 +26799 14391 0 0 +26754 14281 0 0 +26670 14197 0 0 +26560 14151 0 0 +26441 14151 0 0 +26331 14196 0 0 26255 14272 0 0 26180 14197 0 0 26070 14151 0 0 @@ -15272,14 +15104,14 @@ $POLYSCORNERS 25950 14749 0 0 26069 14749 0 0 26179 14704 0 0 -26245 14638 0 0 -26320 14713 0 0 -26430 14759 0 0 -26549 14759 0 0 -26659 14714 0 0 -26743 14630 0 0 -26789 14520 0 0 -26789 15038 0 0 +26255 14628 0 0 +26330 14703 0 0 +26440 14749 0 0 +26559 14749 0 0 +26669 14704 0 0 +26753 14620 0 0 +26799 14510 0 0 +26799 15028 0 0 26767 15060 0 0 26721 15170 0 0 26721 15289 0 0 @@ -15441,21 +15273,23 @@ $POLYSCORNERS 27104 18731 0 0 27020 18647 0 0 26910 18601 0 0 -26882 18601 0 0 -26882 16718 0 0 -26882 16648 0 0 -26882 16334 0 0 -26855 16270 0 0 -26835 16250 0 0 -26855 16230 0 0 -26882 16166 0 0 -26882 16096 0 0 -26882 15782 0 0 -26855 15718 0 0 -26806 15669 0 0 -26742 15642 0 0 -26672 15642 0 0 -26580 15642 0 0 +26849 18601 0 0 +26849 16710 0 0 +26849 16591 0 0 +26804 16481 0 0 +26773 16450 0 0 +26803 16420 0 0 +26849 16310 0 0 +26849 16191 0 0 +26804 16081 0 0 +26773 16050 0 0 +26803 16020 0 0 +26849 15910 0 0 +26849 15791 0 0 +26804 15681 0 0 +26720 15597 0 0 +26610 15551 0 0 +26580 15551 0 0 26580 15292 0 0 26580 15149 0 0 26525 15017 0 0 @@ -15473,47 +15307,34 @@ $POLYSCORNERS 26423 15525 0 0 26525 15424 0 0 26580 15292 0 0 -26580 15642 0 0 -26358 15642 0 0 -26294 15669 0 0 -26245 15718 0 0 -26218 15782 0 0 -26218 15852 0 0 -26218 16166 0 0 -26245 16230 0 0 -26265 16250 0 0 -26245 16270 0 0 -26218 16334 0 0 -26218 16404 0 0 -26218 16718 0 0 -26245 16782 0 0 -26294 16831 0 0 -26358 16858 0 0 -26428 16858 0 0 -26742 16858 0 0 -26806 16831 0 0 -26855 16782 0 0 -26882 16718 0 0 -26882 18601 0 0 -26791 18601 0 0 -26681 18646 0 0 -26599 18728 0 0 -26599 18160 0 0 -26599 18041 0 0 -26554 17931 0 0 -26470 17847 0 0 -26360 17801 0 0 -26241 17801 0 0 -26131 17846 0 0 -26047 17930 0 0 -26025 17982 0 0 -26004 17931 0 0 -25949 17876 0 0 -25949 17060 0 0 -25949 16941 0 0 -25904 16831 0 0 -25820 16747 0 0 -25749 16717 0 0 +26580 15551 0 0 +26491 15551 0 0 +26381 15596 0 0 +26297 15680 0 0 +26251 15790 0 0 +26251 15909 0 0 +26296 16019 0 0 +26327 16050 0 0 +26297 16080 0 0 +26251 16190 0 0 +26251 16309 0 0 +26296 16419 0 0 +26327 16450 0 0 +26297 16480 0 0 +26251 16590 0 0 +26251 16709 0 0 +26268 16751 0 0 +26241 16751 0 0 +26131 16796 0 0 +26047 16880 0 0 +26025 16932 0 0 +26004 16881 0 0 +25920 16797 0 0 +25810 16751 0 0 +25809 16751 0 0 +25809 16721 0 0 +25764 16611 0 0 +25749 16596 0 0 25749 15470 0 0 25749 15351 0 0 25704 15241 0 0 @@ -15583,12 +15404,11 @@ $POLYSCORNERS 25619 15664 0 0 25703 15580 0 0 25749 15470 0 0 -25749 16717 0 0 -25710 16701 0 0 -25591 16701 0 0 -25481 16746 0 0 -25397 16830 0 0 -25359 16920 0 0 +25749 16596 0 0 +25680 16527 0 0 +25570 16481 0 0 +25451 16481 0 0 +25359 16518 0 0 25359 16080 0 0 25359 15961 0 0 25314 15851 0 0 @@ -15606,17 +15426,145 @@ $POLYSCORNERS 25229 16274 0 0 25313 16190 0 0 25359 16080 0 0 -25359 16920 0 0 -25351 16940 0 0 -25351 17059 0 0 -25396 17169 0 0 -25480 17253 0 0 -25590 17299 0 0 -25709 17299 0 0 -25819 17254 0 0 -25903 17170 0 0 -25949 17060 0 0 -25949 17876 0 0 +25359 16518 0 0 +25341 16526 0 0 +25257 16610 0 0 +25211 16720 0 0 +25211 16839 0 0 +25256 16949 0 0 +25340 17033 0 0 +25450 17079 0 0 +25451 17079 0 0 +25451 17109 0 0 +25496 17219 0 0 +25580 17303 0 0 +25690 17349 0 0 +25809 17349 0 0 +25919 17304 0 0 +26003 17220 0 0 +26024 17167 0 0 +26046 17219 0 0 +26130 17303 0 0 +26240 17349 0 0 +26359 17349 0 0 +26469 17304 0 0 +26553 17220 0 0 +26599 17110 0 0 +26599 16991 0 0 +26581 16949 0 0 +26609 16949 0 0 +26719 16904 0 0 +26803 16820 0 0 +26849 16710 0 0 +26849 18601 0 0 +26791 18601 0 0 +26681 18646 0 0 +26597 18730 0 0 +26551 18840 0 0 +26551 18959 0 0 +26596 19069 0 0 +26680 19153 0 0 +26790 19199 0 0 +26909 19199 0 0 +27019 19154 0 0 +27103 19070 0 0 +27149 18960 0 0 +27149 21272 0 0 +27099 21251 0 0 +27099 20420 0 0 +27099 20301 0 0 +27054 20191 0 0 +27023 20160 0 0 +27053 20130 0 0 +27099 20020 0 0 +27099 19901 0 0 +27054 19791 0 0 +27023 19760 0 0 +27053 19730 0 0 +27099 19620 0 0 +27099 19501 0 0 +27054 19391 0 0 +26970 19307 0 0 +26860 19261 0 0 +26741 19261 0 0 +26631 19306 0 0 +26547 19390 0 0 +26501 19500 0 0 +26501 19619 0 0 +26546 19729 0 0 +26577 19760 0 0 +26547 19790 0 0 +26501 19900 0 0 +26501 20019 0 0 +26546 20129 0 0 +26577 20160 0 0 +26547 20190 0 0 +26501 20300 0 0 +26501 20419 0 0 +26546 20529 0 0 +26630 20613 0 0 +26740 20659 0 0 +26859 20659 0 0 +26969 20614 0 0 +27053 20530 0 0 +27099 20420 0 0 +27099 21251 0 0 +27050 21231 0 0 +26931 21231 0 0 +26821 21276 0 0 +26737 21360 0 0 +26691 21470 0 0 +26691 21589 0 0 +26736 21699 0 0 +26820 21783 0 0 +26930 21829 0 0 +27049 21829 0 0 +27159 21784 0 0 +27243 21700 0 0 +27289 21590 0 0 +27289 21619 0 0 +27251 21710 0 0 +27251 21829 0 0 +27296 21939 0 0 +27380 22023 0 0 +27490 22069 0 0 +27609 22069 0 0 +27719 22024 0 0 +27803 21940 0 0 +27849 21830 0 0 +27849 22413 0 0 +27820 22401 0 0 +27701 22401 0 0 +27591 22446 0 0 +27590 22447 0 0 +27530 22387 0 0 +27420 22341 0 0 +27301 22341 0 0 +27191 22386 0 0 +27109 22468 0 0 +27109 22381 0 0 +27064 22271 0 0 +26980 22187 0 0 +26870 22141 0 0 +26751 22141 0 0 +26641 22186 0 0 +26579 22248 0 0 +26579 21840 0 0 +26579 21721 0 0 +26534 21611 0 0 +26450 21527 0 0 +26340 21481 0 0 +26221 21481 0 0 +26111 21526 0 0 +26099 21538 0 0 +26099 18610 0 0 +26099 18491 0 0 +26054 18381 0 0 +25973 18300 0 0 +26003 18270 0 0 +26049 18160 0 0 +26049 18041 0 0 +26004 17931 0 0 25920 17847 0 0 25810 17801 0 0 25691 17801 0 0 @@ -15770,112 +15718,7 @@ $POLYSCORNERS 25969 18804 0 0 26053 18720 0 0 26099 18610 0 0 -26099 18491 0 0 -26054 18381 0 0 -25973 18300 0 0 -26003 18270 0 0 -26024 18217 0 0 -26046 18269 0 0 -26130 18353 0 0 -26240 18399 0 0 -26359 18399 0 0 -26469 18354 0 0 -26553 18270 0 0 -26599 18160 0 0 -26599 18728 0 0 -26597 18730 0 0 -26551 18840 0 0 -26551 18959 0 0 -26596 19069 0 0 -26680 19153 0 0 -26790 19199 0 0 -26909 19199 0 0 -27019 19154 0 0 -27103 19070 0 0 -27149 18960 0 0 -27149 21272 0 0 -27132 21265 0 0 -27132 20428 0 0 -27132 20358 0 0 -27132 20044 0 0 -27105 19980 0 0 -27085 19960 0 0 -27105 19940 0 0 -27132 19876 0 0 -27132 19806 0 0 -27132 19492 0 0 -27105 19428 0 0 -27056 19379 0 0 -26992 19352 0 0 -26922 19352 0 0 -26608 19352 0 0 -26544 19379 0 0 -26495 19428 0 0 -26468 19492 0 0 -26468 19562 0 0 -26468 19876 0 0 -26495 19940 0 0 -26515 19960 0 0 -26495 19980 0 0 -26468 20044 0 0 -26468 20114 0 0 -26468 20428 0 0 -26495 20492 0 0 -26544 20541 0 0 -26608 20568 0 0 -26678 20568 0 0 -26992 20568 0 0 -27056 20541 0 0 -27105 20492 0 0 -27132 20428 0 0 -27132 21265 0 0 -27050 21231 0 0 -26931 21231 0 0 -26821 21276 0 0 -26737 21360 0 0 -26691 21470 0 0 -26691 21589 0 0 -26736 21699 0 0 -26820 21783 0 0 -26930 21829 0 0 -27049 21829 0 0 -27159 21784 0 0 -27243 21700 0 0 -27289 21590 0 0 -27289 21619 0 0 -27251 21710 0 0 -27251 21829 0 0 -27296 21939 0 0 -27380 22023 0 0 -27490 22069 0 0 -27609 22069 0 0 -27719 22024 0 0 -27803 21940 0 0 -27849 21830 0 0 -27849 22413 0 0 -27820 22401 0 0 -27701 22401 0 0 -27591 22446 0 0 -27590 22447 0 0 -27530 22387 0 0 -27420 22341 0 0 -27301 22341 0 0 -27191 22386 0 0 -27109 22468 0 0 -27109 22381 0 0 -27064 22271 0 0 -26980 22187 0 0 -26870 22141 0 0 -26751 22141 0 0 -26641 22186 0 0 -26579 22248 0 0 -26579 21840 0 0 -26579 21721 0 0 -26534 21611 0 0 -26450 21527 0 0 -26340 21481 0 0 -26221 21481 0 0 -26111 21526 0 0 +26099 21538 0 0 26027 21610 0 0 25981 21720 0 0 25981 21839 0 0 @@ -17693,178 +17536,10 @@ $POLYSCORNERS 27274 21435 0 0 27244 21361 0 0 27160 21277 0 0 -27127 21263 0 0 -27127 20427 0 0 -27127 20359 0 0 -27127 20328 0 0 -27127 20144 0 0 -27127 20113 0 0 -27127 20045 0 0 -27101 19983 0 0 -27078 19960 0 0 -27101 19937 0 0 -27127 19875 0 0 -27127 19807 0 0 -27127 19776 0 0 -27127 19592 0 0 -27127 19561 0 0 -27127 19493 0 0 -27101 19431 0 0 -27053 19383 0 0 -26991 19357 0 0 -26892 19357 0 0 -26877 19372 0 0 -26877 16717 0 0 -26877 16649 0 0 -26877 16618 0 0 -26877 16434 0 0 -26877 16403 0 0 -26877 16335 0 0 -26851 16273 0 0 -26828 16250 0 0 -26851 16227 0 0 -26877 16165 0 0 -26877 16097 0 0 -26877 16066 0 0 -26877 15882 0 0 -26877 15851 0 0 -26877 15783 0 0 -26851 15721 0 0 -26803 15673 0 0 -26741 15647 0 0 -26642 15647 0 0 -26600 15689 0 0 -26600 15924 0 0 -26835 15924 0 0 -26877 15882 0 0 -26877 16066 0 0 -26835 16024 0 0 -26600 16024 0 0 -26600 16241 0 0 -26600 16259 0 0 -26600 16476 0 0 -26835 16476 0 0 -26877 16434 0 0 -26877 16618 0 0 -26835 16576 0 0 -26600 16576 0 0 -26600 16811 0 0 -26642 16853 0 0 -26741 16853 0 0 -26803 16827 0 0 -26851 16779 0 0 -26877 16717 0 0 -26877 19372 0 0 -26850 19399 0 0 -26850 19634 0 0 -27085 19634 0 0 -27127 19592 0 0 -27127 19776 0 0 -27085 19734 0 0 -26850 19734 0 0 -26850 19951 0 0 -26850 19969 0 0 -26850 20186 0 0 -27085 20186 0 0 -27127 20144 0 0 -27127 20328 0 0 -27085 20286 0 0 -26850 20286 0 0 -26850 20521 0 0 -26892 20563 0 0 -26991 20563 0 0 -27053 20537 0 0 -27101 20489 0 0 -27127 20427 0 0 -27127 21263 0 0 27050 21231 0 0 26931 21231 0 0 26821 21276 0 0 26775 21321 0 0 -26750 21296 0 0 -26750 20521 0 0 -26750 20286 0 0 -26750 20186 0 0 -26750 19969 0 0 -26750 19951 0 0 -26750 19734 0 0 -26750 19634 0 0 -26750 19399 0 0 -26708 19357 0 0 -26609 19357 0 0 -26547 19383 0 0 -26500 19430 0 0 -26500 16811 0 0 -26500 16576 0 0 -26500 16476 0 0 -26500 16259 0 0 -26500 16241 0 0 -26500 16024 0 0 -26500 15924 0 0 -26500 15689 0 0 -26458 15647 0 0 -26359 15647 0 0 -26297 15673 0 0 -26249 15721 0 0 -26223 15783 0 0 -26223 15851 0 0 -26223 15882 0 0 -26265 15924 0 0 -26500 15924 0 0 -26500 16024 0 0 -26265 16024 0 0 -26223 16066 0 0 -26223 16097 0 0 -26223 16165 0 0 -26249 16227 0 0 -26272 16250 0 0 -26249 16273 0 0 -26223 16335 0 0 -26223 16403 0 0 -26223 16434 0 0 -26265 16476 0 0 -26500 16476 0 0 -26500 16576 0 0 -26265 16576 0 0 -26223 16618 0 0 -26223 16649 0 0 -26223 16717 0 0 -26249 16779 0 0 -26297 16827 0 0 -26359 16853 0 0 -26458 16853 0 0 -26500 16811 0 0 -26500 19430 0 0 -26499 19431 0 0 -26473 19493 0 0 -26473 19561 0 0 -26473 19592 0 0 -26515 19634 0 0 -26750 19634 0 0 -26750 19734 0 0 -26515 19734 0 0 -26473 19776 0 0 -26473 19807 0 0 -26473 19875 0 0 -26499 19937 0 0 -26522 19960 0 0 -26499 19983 0 0 -26473 20045 0 0 -26473 20113 0 0 -26473 20144 0 0 -26515 20186 0 0 -26750 20186 0 0 -26750 20286 0 0 -26515 20286 0 0 -26473 20328 0 0 -26473 20359 0 0 -26473 20427 0 0 -26499 20489 0 0 -26547 20537 0 0 -26609 20563 0 0 -26708 20563 0 0 -26750 20521 0 0 -26750 21296 0 0 26605 21151 0 0 26538 21107 0 0 26460 21091 0 0