switch routing corrected

1 files changed, 301 insertions, 267 deletions

diff --git a/hardware/kicad/SIMtrace.brd b/hardware/kicad/SIMtrace.brd
index 64f362e..910b3ef 100644
--- a/hardware/kicad/SIMtrace.brd
+++ b/hardware/kicad/SIMtrace.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Mi 15 Jun 2011 12:41:39 CEST
+PCBNEW-BOARD Version 1 date Mi 15 Jun 2011 13:50:48 CEST
 
 # Created by Pcbnew(2010-00-09 BZR 23xx)-stable
 
@@ -10,7 +10,7 @@ Links 180
 NoConn 0
 Di 14401 34909 48426 56341
 Ndraw 7
-Ntrack 894
+Ntrack 904
 Nzone 0
 BoardThickness 630
 Nmodule 64
@@ -21,7 +21,7 @@ $SHEETDESCR
 Sheet A4 11700 8267
 Title "SIMtrace"
 Date "15 jun 2011"
-Rev "v0.9.1"
+Rev "v0.9.2"
 Comp "osmocom"
 Comment1 "CC-BY-SA"
 Comment2 ""
@@ -55,7 +55,7 @@ TextPcbSize 600 800
 EdgeModWidth 50
 TextModSize 600 600
 TextModWidth 120
-PadSize 315 354
+PadSize 1260 394
 PadDrill 0
 Pad2MaskClearance 100
 AuxiliaryAxisOrg 62750 26200
@@ -836,90 +836,6 @@ Of 0.000000 0.000000 0.000000
 Ro 0.000000 0.000000 0.000000
 $EndSHAPE3D
 $EndMODULE  PIN_ARRAY_2X1
-$MODULE PUSH_BUTTON
-Po 23350 36900 0 15 4DCFACE4 4DCD07D2 ~~
-Li PUSH_BUTTON
-Sc 4DCD07D2
-AR /4DC6852C
-Op 0 0 0
-T0 -50 50 600 600 0 120 N V 21 N"SW2"
-T1 -1150 1900 600 600 0 120 N V 21 N"BOOTLOADER"
-DC 0 0 394 0 150 21
-DS -1280 1181 1280 1181 150 21
-DS 1280 1181 1280 -1181 150 21
-DS 1280 -1181 -1280 -1181 150 21
-DS -1280 -1181 -1280 1181 150 21
-$PAD
-Sh "3" R 1260 394 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po -1339 787
-$EndPAD
-$PAD
-Sh "1" R 1260 394 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 34 "3V3"
-Po -1339 -787
-$EndPAD
-$PAD
-Sh "2" R 1260 394 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 4 "/BOOTLOADER"
-Po 1339 -787
-$EndPAD
-$PAD
-Sh "4" R 1260 394 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po 1339 787
-$EndPAD
-$EndMODULE  PUSH_BUTTON
-$MODULE PUSH_BUTTON
-Po 44770 42033 0 15 4DCFAD67 4DCD07D4 ~~
-Li PUSH_BUTTON
-Sc 4DCD07D4
-AR /4D020733
-Op 0 0 0
-T0 -20 17 600 600 0 120 N V 21 N"SW1"
-T1 2680 -33 600 600 900 120 N V 21 N"RESET"
-DC 0 0 394 0 150 21
-DS -1280 1181 1280 1181 150 21
-DS 1280 1181 1280 -1181 150 21
-DS 1280 -1181 -1280 -1181 150 21
-DS -1280 -1181 -1280 1181 150 21
-$PAD
-Sh "3" R 1260 394 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po -1339 787
-$EndPAD
-$PAD
-Sh "1" R 1260 394 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 2 "//RESET"
-Po -1339 -787
-$EndPAD
-$PAD
-Sh "2" R 1260 394 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 35 "GND"
-Po 1339 -787
-$EndPAD
-$PAD
-Sh "4" R 1260 394 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po 1339 787
-$EndPAD
-$EndMODULE  PUSH_BUTTON
 $MODULE Q_49U3HMS
 Po 31000 40700 1800 15 451B832A 4DCD07D5 ~~
 Li Q_49U3HMS
@@ -3548,6 +3464,90 @@ Ne 34 "3V3"
 Po 0 -433
 $EndPAD
 $EndMODULE  SOT23_BC847
+$MODULE PUSH_BUTTON
+Po 44770 42033 1800 15 4DF89ADE 4DCD07D4 ~~
+Li PUSH_BUTTON
+Sc 4DCD07D4
+AR /4D020733
+Op 0 0 0
+T0 0 1732 600 600 1800 120 N V 21 N"SW1"
+T1 0 -1772 600 600 1800 120 N V 21 N"RESET"
+DC 0 0 394 0 150 21
+DS -1280 1181 1280 1181 150 21
+DS 1280 1181 1280 -1181 150 21
+DS 1280 -1181 -1280 -1181 150 21
+DS -1280 -1181 -1280 1181 150 21
+$PAD
+Sh "2" R 1260 394 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 35 "GND"
+Po -1339 787
+$EndPAD
+$PAD
+Sh "1" R 1260 394 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 2 "//RESET"
+Po -1339 -787
+$EndPAD
+$PAD
+Sh "1'" R 1260 394 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 1339 -787
+$EndPAD
+$PAD
+Sh "2'" R 1260 394 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 1339 787
+$EndPAD
+$EndMODULE  PUSH_BUTTON
+$MODULE PUSH_BUTTON
+Po 23350 36900 1800 15 4DF89C94 4DCD07D2 ~~
+Li PUSH_BUTTON
+Sc 4DCD07D2
+AR /4DC6852C
+Op 0 0 0
+T0 3200 -50 600 600 1800 120 N V 21 N"SW2"
+T1 1200 -2000 600 600 1800 120 N V 21 N"BOOTLOADER"
+DC 0 0 394 0 150 21
+DS -1280 1181 1280 1181 150 21
+DS 1280 1181 1280 -1181 150 21
+DS 1280 -1181 -1280 -1181 150 21
+DS -1280 -1181 -1280 1181 150 21
+$PAD
+Sh "2" R 1260 394 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 4 "/BOOTLOADER"
+Po -1339 787
+$EndPAD
+$PAD
+Sh "1" R 1260 394 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 34 "3V3"
+Po -1339 -787
+$EndPAD
+$PAD
+Sh "1'" R 1260 394 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 1339 -787
+$EndPAD
+$PAD
+Sh "2'" R 1260 394 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 1339 787
+$EndPAD
+$EndMODULE  PUSH_BUTTON
 $DRAWSEGMENT
 Po 0 14450 56300 14450 34950 80
 De 28 0 900 0 0
@@ -3669,14 +3669,20 @@ Po 0 29754 47546 29807 47493 80 -1
 De 15 0 1 0 0
 Po 0 29807 47493 29811 47489 80 -1
 De 15 0 1 0 0
-Po 3 35908 47209 35908 47209 350 -1
-De 15 1 2 0 0
-Po 0 44905 41947 44905 43750 80 -1
+Po 0 44905 43750 45179 43750 80 -1
+De 15 0 2 0 800
+Po 0 45179 43750 46109 42820 80 -1
 De 15 0 2 0 400
-Po 0 44204 41246 44905 41947 80 -1
-De 15 0 2 0 0
-Po 0 43431 41246 44204 41246 80 -1
+Po 0 41442 41267 41767 41267 80 -1
 De 15 0 2 0 800
+Po 0 45389 42100 46109 42820 80 -1
+De 15 0 2 0 400
+Po 0 42600 42100 45389 42100 80 -1
+De 15 0 2 0 0
+Po 0 41767 41267 42600 42100 80 -1
+De 15 0 2 0 0
+Po 3 35908 47209 35908 47209 350 -1
+De 15 1 2 0 0
 Po 0 35881 47209 35908 47209 80 -1
 De 15 0 2 0 0
 Po 0 35768 47096 35881 47209 80 -1
@@ -3693,12 +3699,6 @@ Po 0 35047 38547 37346 38547 80 -1
 De 15 0 2 0 0
 Po 0 33700 37200 35047 38547 80 -1
 De 15 0 2 0 800
-Po 0 42658 41246 43431 41246 80 -1
-De 15 0 2 0 400
-Po 0 42637 41267 42658 41246 80 -1
-De 15 0 2 0 0
-Po 0 41442 41267 42637 41267 80 -1
-De 15 0 2 0 800
 Po 0 35901 47202 35908 47209 80 -1
 De 0 0 2 0 0
 Po 0 35901 39401 35901 47202 80 -1
@@ -4465,6 +4465,34 @@ Po 0 35332 53863 33952 52483 80 -1
 De 15 0 33 0 0
 Po 0 35332 54242 35332 53863 80 -1
 De 15 0 33 0 800
+Po 0 23884 38500 23884 37534 80 -1
+De 15 0 34 0 0
+Po 0 23884 37534 23900 37550 80 -1
+De 15 0 34 0 0
+Po 0 23900 37550 23900 37600 80 -1
+De 15 0 34 0 0
+Po 0 23900 37600 23900 37550 80 -1
+De 15 0 34 0 0
+Po 0 24689 37687 24037 37687 80 -1
+De 15 0 34 0 800
+Po 0 24037 37687 23900 37550 80 -1
+De 15 0 34 0 0
+Po 0 23300 36100 23627 35773 80 -1
+De 15 0 34 0 0
+Po 0 26700 36200 26273 35773 80 -1
+De 15 0 34 0 800
+Po 0 26273 35773 23627 35773 80 -1
+De 15 0 34 0 0
+Po 0 23900 37550 23300 36950 80 -1
+De 15 0 34 0 0
+Po 0 23300 36950 23300 36100 80 -1
+De 15 0 34 0 0
+Po 0 23884 40446 23884 38500 80 -1
+De 15 0 34 0 0
+Po 0 23884 38500 23884 38492 80 -1
+De 15 0 34 0 0
+Po 0 23884 38492 24689 37687 80 -1
+De 15 0 34 0 400
 Po 0 44700 47600 45450 47600 80 -1
 De 15 0 34 0 800
 Po 0 46800 45300 46250 44750 80 -1
@@ -4575,14 +4603,6 @@ Po 0 24874 43381 25456 43381 80 -1
 De 15 0 34 0 0
 Po 0 24781 43474 24874 43381 80 -1
 De 15 0 34 0 0
-Po 0 23124 35773 22784 36113 80 -1
-De 15 0 34 0 0
-Po 0 26273 35773 23124 35773 80 -1
-De 15 0 34 0 0
-Po 0 26700 36200 26273 35773 80 -1
-De 15 0 34 0 800
-Po 0 22011 36113 22784 36113 80 -1
-De 15 0 34 0 800
 Po 0 34332 52337 34332 51958 80 -1
 De 15 0 34 0 400
 Po 0 36369 52337 34332 52337 80 -1
@@ -4655,14 +4675,6 @@ Po 0 36400 39750 35957 39750 80 -1
 De 15 0 34 0 800
 Po 0 32700 39000 30700 39000 80 -1
 De 15 0 34 0 C00
-Po 0 23701 37030 22784 36113 80 -1
-De 15 0 34 0 0
-Po 0 23701 40340 23701 37030 80 -1
-De 15 0 34 0 0
-Po 0 23778 40340 23701 40340 80 -1
-De 15 0 34 0 0
-Po 0 23884 40446 23778 40340 80 -1
-De 15 0 34 0 0
 Po 0 23884 41959 23884 40446 80 -1
 De 15 0 34 0 0
 Po 0 23701 42142 23884 41959 80 -1
@@ -4751,6 +4763,34 @@ Po 0 40400 39700 39050 38350 80 -1
 De 0 0 34 0 800
 Po 0 39050 38350 39050 36000 80 -1
 De 0 0 34 0 400
+Po 0 27700 36200 27700 35850 80 -1
+De 15 0 35 0 800
+Po 0 23400 35550 23150 35800 80 -1
+De 15 0 35 0 0
+Po 0 27400 35550 23400 35550 80 -1
+De 15 0 35 0 0
+Po 0 27700 35850 27400 35550 80 -1
+De 15 0 35 0 0
+Po 0 23669 40582 23669 37919 80 -1
+De 15 0 35 0 0
+Po 0 23669 40582 23701 40614 80 -1
+De 15 0 35 0 0
+Po 0 23701 40614 23701 41789 80 -1
+De 15 0 35 0 0
+Po 0 23701 41789 23173 42317 80 -1
+De 15 0 35 0 0
+Po 0 23173 42317 20869 42317 80 -1
+De 15 0 35 0 0
+Po 0 20869 42317 20550 41998 80 -1
+De 15 0 35 0 0
+Po 0 20550 41998 20550 41693 80 -1
+De 15 0 35 0 0
+Po 0 23669 37919 23000 37250 80 -1
+De 15 0 35 0 0
+Po 0 23000 37250 23000 35950 80 -1
+De 15 0 35 0 0
+Po 0 23000 35950 23150 35800 80 -1
+De 15 0 35 0 0
 Po 0 42600 44200 42600 44527 80 -1
 De 15 0 35 0 0
 Po 0 39550 41850 41800 44100 80 -1
@@ -5041,26 +5081,6 @@ Po 0 32326 54553 32326 52344 80 -1
 De 15 0 35 0 0
 Po 0 28700 36200 27700 36200 80 -1
 De 15 0 35 0 C00
-Po 0 20550 41998 20550 41693 80 -1
-De 15 0 35 0 0
-Po 0 20869 42317 20550 41998 80 -1
-De 15 0 35 0 0
-Po 0 23173 42317 20869 42317 80 -1
-De 15 0 35 0 0
-Po 0 23701 41789 23173 42317 80 -1
-De 15 0 35 0 0
-Po 0 23701 40614 23701 41789 80 -1
-De 15 0 35 0 0
-Po 0 21237 38150 23701 40614 80 -1
-De 15 0 35 0 0
-Po 0 21237 35601 21237 38150 80 -1
-De 15 0 35 0 0
-Po 0 21259 35579 21237 35601 80 -1
-De 15 0 35 0 0
-Po 0 27079 35579 21259 35579 80 -1
-De 15 0 35 0 0
-Po 0 27700 36200 27079 35579 80 -1
-De 15 0 35 0 800
 Po 0 31800 41509 31800 42133 80 -1
 De 15 0 35 0 0
 Po 0 31928 41381 31800 41509 80 -1
@@ -5955,7 +5975,25 @@ $POLYSCORNERS
 21132 37440 0 0
 21170 37349 0 0
 21240 37279 0 0
-21332 37241 0 0
+21331 37241 0 1
+21331 36559 0 0
+21240 36521 0 0
+21170 36451 0 0
+21132 36359 0 0
+21132 35866 0 0
+21170 35775 0 0
+21240 35705 0 0
+21332 35667 0 0
+22691 35667 0 0
+22782 35705 0 0
+22852 35775 0 0
+22890 35867 0 0
+22890 36360 0 0
+22852 36451 0 0
+22782 36521 0 0
+22690 36559 0 0
+21331 36559 0 1
+21331 37241 0 0
 22691 37241 0 0
 22782 37279 0 0
 22852 37349 0 0
@@ -5978,29 +6016,16 @@ $POLYSCORNERS
 23408 40665 0 0
 23564 40730 0 0
 23594 40760 0 0
-23594 40608 0 0
-23590 40608 0 0
-23496 40545 0 0
-23433 40451 0 0
-23411 40340 0 0
-23411 37150 0 0
-22782 36521 0 0
-22690 36559 0 0
-21331 36559 0 0
-21240 36521 0 0
-21170 36451 0 0
-21132 36359 0 0
-21132 35866 0 0
-21170 35775 0 0
-21240 35705 0 0
-21332 35667 0 0
-22691 35667 0 0
-22782 35705 0 0
-22918 35569 0 0
-22918 35568 0 0
-22919 35568 0 0
-23013 35505 0 0
-23124 35483 0 0
+23594 37654 0 0
+23095 37155 0 0
+23032 37061 0 0
+23010 36950 0 0
+23010 36100 0 0
+23032 35989 0 0
+23095 35895 0 0
+23422 35568 0 0
+23516 35505 0 0
+23627 35483 0 0
 26273 35483 0 0
 26384 35505 0 0
 26478 35568 0 0
@@ -7453,25 +7478,6 @@ $POLYSCORNERS
 42498 43279 0 0
 42568 43349 0 0
 42579 43376 0 0
-42751 43376 0 1
-42751 43266 0 0
-42660 43228 0 0
-42590 43158 0 0
-42552 43066 0 0
-42552 42573 0 0
-42590 42482 0 0
-42660 42412 0 0
-42752 42374 0 0
-44111 42374 0 0
-44202 42412 0 0
-44272 42482 0 0
-44310 42574 0 0
-44310 43067 0 0
-44272 43158 0 0
-44202 43228 0 0
-44110 43266 0 0
-42751 43266 0 1
-42751 43376 0 0
 43417 43377 0 0
 43528 43399 0 0
 43622 43462 0 0
@@ -7481,16 +7487,36 @@ $POLYSCORNERS
 44477 43460 0 0
 44515 43369 0 0
 44585 43299 0 0
-44615 43286 0 0
-44615 42067 0 0
-44202 41654 0 0
-44110 41692 0 0
-42751 41692 0 0
-42660 41654 0 0
-42590 41584 0 0
-42578 41557 0 0
-41809 41557 0 0
-41778 41633 0 0
+44677 43261 0 0
+45134 43261 0 0
+45221 43297 0 0
+45314 43204 0 0
+45268 43158 0 0
+45230 43066 0 0
+45230 42573 0 0
+45268 42482 0 0
+45314 42435 0 0
+45269 42390 0 0
+44149 42390 0 0
+44202 42412 0 0
+44272 42482 0 0
+44310 42574 0 0
+44310 43067 0 0
+44272 43158 0 0
+44202 43228 0 0
+44110 43266 0 0
+42751 43266 0 0
+42660 43228 0 0
+42590 43158 0 0
+42552 43066 0 0
+42552 42573 0 0
+42590 42482 0 0
+42660 42412 0 0
+42713 42389 0 0
+42600 42390 0 0
+42489 42368 0 0
+42394 42304 0 0
+41750 41660 0 0
 41708 41703 0 0
 41616 41741 0 0
 41378 41740 0 0
@@ -7934,18 +7960,18 @@ $FILLSEGMENTS
 41810 35350 48010 35350
 14690 35430 38210 35430
 41890 35430 48010 35430
-14690 35510 23006 35510
+14690 35510 23509 35510
 26392 35510 36588 35510
 36998 35510 37102 35510
 37512 35510 37800 35510
 42301 35510 48010 35510
-14690 35590 22897 35590
+14690 35590 23400 35590
 26500 35590 36527 35590
 37000 35590 37100 35590
 37574 35590 37684 35590
 42416 35590 48010 35590
 14690 35670 21325 35670
-22699 35670 22817 35670
+22699 35670 23320 35670
 26855 35670 27562 35670
 27816 35670 28562 35670
 28816 35670 29562 35670
@@ -7960,6 +7986,7 @@ $FILLSEGMENTS
 37599 35670 37604 35670
 42496 35670 48010 35670
 14690 35750 21195 35750
+22827 35750 23240 35750
 27026 35750 27413 35750
 27988 35750 28413 35750
 28988 35750 29413 35750
@@ -7973,6 +8000,7 @@ $FILLSEGMENTS
 37000 35750 37100 35750
 42541 35750 48010 35750
 14690 35830 21148 35830
+22875 35830 23160 35830
 27106 35830 27400 35830
 27999 35830 28400 35830
 28999 35830 29400 35830
@@ -7986,6 +8014,7 @@ $FILLSEGMENTS
 37000 35830 37100 35830
 42574 35830 48010 35830
 14690 35910 21132 35910
+22890 35910 23085 35910
 27174 35910 27260 35910
 27340 35910 27480 35910
 27919 35910 28061 35910
@@ -8017,6 +8046,7 @@ $FILLSEGMENTS
 37000 35910 37100 35910
 42599 35910 48010 35910
 14690 35990 21132 35990
+22890 35990 23032 35990
 27420 35990 27560 35990
 27839 35990 27981 35990
 28202 35990 28203 35990
@@ -8046,6 +8076,7 @@ $FILLSEGMENTS
 36201 35990 37100 35990
 42599 35990 48010 35990
 14690 36070 21132 36070
+22890 36070 23016 36070
 27500 36070 27640 36070
 27759 36070 27901 36070
 28500 36070 28640 36070
@@ -8068,6 +8099,7 @@ $FILLSEGMENTS
 37000 36070 37100 36070
 42599 36070 48010 36070
 14690 36150 21132 36150
+22890 36150 23010 36150
 27580 36150 27821 36150
 28580 36150 28821 36150
 29580 36150 29821 36150
@@ -8081,6 +8113,7 @@ $FILLSEGMENTS
 37000 36150 37100 36150
 42581 36150 48010 36150
 14690 36230 21132 36230
+22890 36230 23010 36230
 27599 36230 27800 36230
 28599 36230 28800 36230
 29599 36230 29800 36230
@@ -8096,6 +8129,7 @@ $FILLSEGMENTS
 39548 36230 39551 36230
 42548 36230 48010 36230
 14690 36310 21132 36310
+22890 36310 23010 36310
 27519 36310 27661 36310
 27740 36310 27880 36310
 28519 36310 28661 36310
@@ -8120,6 +8154,7 @@ $FILLSEGMENTS
 39515 36310 39584 36310
 42515 36310 48010 36310
 14690 36390 21144 36390
+22877 36390 23010 36390
 27439 36390 27581 36390
 27820 36390 27960 36390
 28439 36390 28581 36390
@@ -8145,6 +8180,7 @@ $FILLSEGMENTS
 39436 36390 39664 36390
 43909 36390 48010 36390
 14690 36470 21189 36470
+22833 36470 23010 36470
 27181 36470 27223 36470
 27359 36470 27501 36470
 27900 36470 28040 36470
@@ -8179,7 +8215,7 @@ $FILLSEGMENTS
 39348 36470 39751 36470
 44004 36470 48010 36470
 14690 36550 21309 36550
-22711 36550 22811 36550
+22711 36550 23010 36550
 27126 36550 27421 36550
 27980 36550 28421 36550
 28980 36550 29421 36550
@@ -8193,7 +8229,7 @@ $FILLSEGMENTS
 44084 36550 46329 36550
 46800 36550 46986 36550
 47458 36550 48010 36550
-14690 36630 22891 36630
+14690 36630 23010 36630
 27046 36630 27406 36630
 27993 36630 28406 36630
 28993 36630 29406 36630
@@ -8207,7 +8243,7 @@ $FILLSEGMENTS
 44164 36630 46220 36630
 46843 36630 46943 36630
 47566 36630 48010 36630
-14690 36710 22971 36710
+14690 36710 23010 36710
 27162 36710 27449 36710
 27951 36710 28449 36710
 28951 36710 29449 36710
@@ -8221,7 +8257,7 @@ $FILLSEGMENTS
 44244 36710 46181 36710
 46843 36710 46943 36710
 47606 36710 48010 36710
-14690 36790 23051 36790
+14690 36790 23010 36790
 27224 36790 27334 36790
 28066 36790 28334 36790
 29066 36790 29334 36790
@@ -8235,7 +8271,7 @@ $FILLSEGMENTS
 44324 36790 46172 36790
 46843 36790 46943 36790
 47614 36790 48010 36790
-14690 36870 23131 36870
+14690 36870 23010 36870
 27249 36870 27254 36870
 28146 36870 28254 36870
 29146 36870 29254 36870
@@ -8249,7 +8285,7 @@ $FILLSEGMENTS
 44404 36870 46172 36870
 46843 36870 46943 36870
 47615 36870 48010 36870
-14690 36950 23211 36950
+14690 36950 23010 36950
 28191 36950 28210 36950
 29191 36950 29210 36950
 30191 36950 30210 36950
@@ -8261,37 +8297,37 @@ $FILLSEGMENTS
 44484 36950 46172 36950
 46843 36950 46943 36950
 47615 36950 48010 36950
-14690 37030 23291 37030
+14690 37030 23025 37030
 36224 37030 40670 37030
 44564 37030 46172 37030
 46843 37030 46943 37030
 47615 37030 48010 37030
-14690 37110 23371 37110
+14690 37110 23064 37110
 36249 37110 40750 37110
 43795 37110 43824 37110
 44644 37110 46172 37110
 46843 37110 46943 37110
 47615 37110 48010 37110
-14690 37190 23411 37190
+14690 37190 23130 37190
 36249 37190 40830 37190
 43795 37190 43904 37190
 44724 37190 46172 37190
 46843 37190 46943 37190
 47615 37190 48010 37190
 14690 37270 21262 37270
-22761 37270 23411 37270
+22761 37270 23210 37270
 36249 37270 40910 37270
 43795 37270 43984 37270
 44804 37270 46192 37270
 46843 37270 46943 37270
 47594 37270 48010 37270
 14690 37350 21170 37350
-22853 37350 23411 37350
+22853 37350 23290 37350
 36231 37350 40990 37350
 43795 37350 44064 37350
 44884 37350 48010 37350
 14690 37430 21137 37430
-22886 37430 23411 37430
+22886 37430 23370 37430
 35198 37430 35201 37430
 36198 37430 41070 37430
 43795 37430 44144 37430
@@ -8299,7 +8335,7 @@ $FILLSEGMENTS
 46843 37430 46943 37430
 47572 37430 48010 37430
 14690 37510 21132 37510
-22890 37510 23411 37510
+22890 37510 23450 37510
 35165 37510 35234 37510
 36165 37510 41151 37510
 43795 37510 44224 37510
@@ -8307,7 +8343,7 @@ $FILLSEGMENTS
 46843 37510 46943 37510
 47614 37510 48010 37510
 14690 37590 21132 37590
-22890 37590 23411 37590
+22890 37590 23530 37590
 35086 37590 35314 37590
 36086 37590 41341 37590
 43795 37590 44304 37590
@@ -8315,7 +8351,7 @@ $FILLSEGMENTS
 46843 37590 46943 37590
 47614 37590 48010 37590
 14690 37670 21132 37670
-22890 37670 23411 37670
+22890 37670 23594 37670
 34998 37670 35401 37670
 35998 37670 42353 37670
 43795 37670 44384 37670
@@ -8323,170 +8359,170 @@ $FILLSEGMENTS
 46843 37670 46943 37670
 47614 37670 48010 37670
 14690 37750 21132 37750
-22890 37750 23411 37750
+22890 37750 23594 37750
 34660 37750 42353 37750
 43795 37750 44464 37750
 45284 37750 46171 37750
 46843 37750 46943 37750
 47614 37750 48010 37750
 14690 37830 21132 37830
-22890 37830 23411 37830
+22890 37830 23594 37830
 34740 37830 42353 37830
 43795 37830 44544 37830
 45364 37830 46171 37830
 46843 37830 46943 37830
 47614 37830 48010 37830
 14690 37910 21132 37910
-22890 37910 23411 37910
+22890 37910 23594 37910
 34820 37910 42368 37910
 43779 37910 44624 37910
 45444 37910 46172 37910
 46843 37910 46943 37910
 47614 37910 48010 37910
 14690 37990 21155 37990
-22866 37990 23411 37990
+22866 37990 23594 37990
 34900 37990 42417 37990
 43731 37990 44704 37990
 45524 37990 46172 37990
 46843 37990 46943 37990
 47614 37990 48010 37990
 14690 38070 21215 38070
-22807 38070 23411 38070
+22807 38070 23594 38070
 34980 38070 42547 38070
 43599 38070 44784 38070
 45604 38070 46204 38070
 46843 38070 46943 38070
 47581 38070 48010 38070
-14690 38150 23411 38150
+14690 38150 23594 38150
 35060 38150 44864 38150
 45684 38150 46278 38150
 46822 38150 46964 38150
 47508 38150 48010 38150
-14690 38230 23411 38230
+14690 38230 23594 38230
 35140 38230 43869 38230
 44171 38230 44944 38230
 45764 38230 46231 38230
 46533 38230 48010 38230
-14690 38310 23411 38310
+14690 38310 23594 38310
 37504 38310 43729 38310
 44310 38310 45024 38310
 45844 38310 46091 38310
 46672 38310 48010 38310
-14690 38390 23411 38390
+14690 38390 23594 38390
 37599 38390 43649 38390
 44390 38390 45104 38390
 45924 38390 46011 38390
 46752 38390 48010 38390
-14690 38470 23411 38470
+14690 38470 23594 38470
 37679 38470 43611 38470
 44427 38470 45184 38470
 46789 38470 48010 38470
-14690 38550 23411 38550
+14690 38550 23594 38550
 37759 38550 43578 38550
 44461 38550 45264 38550
 46823 38550 48010 38550
-14690 38630 23411 38630
+14690 38630 23594 38630
 37839 38630 43573 38630
 44465 38630 45344 38630
 46827 38630 48010 38630
-14690 38710 23411 38710
+14690 38710 23594 38710
 37919 38710 43573 38710
 44465 38710 45424 38710
 46827 38710 48010 38710
-14690 38790 23411 38790
+14690 38790 23594 38790
 37999 38790 43594 38790
 44443 38790 45504 38790
 46805 38790 48010 38790
-14690 38870 23411 38870
+14690 38870 23594 38870
 38079 38870 43627 38870
 44410 38870 45540 38870
 46772 38870 48010 38870
-14690 38950 23411 38950
+14690 38950 23594 38950
 38159 38950 43688 38950
 44349 38950 45540 38950
 46711 38950 48010 38950
-14690 39030 23411 39030
+14690 39030 23594 39030
 38239 39030 43770 39030
 44266 39030 45242 39030
 46628 39030 48010 39030
-14690 39110 23411 39110
+14690 39110 23594 39110
 38319 39110 45147 39110
 46513 39110 48010 39110
-14690 39190 23411 39190
+14690 39190 23594 39190
 38399 39190 38958 39190
 39842 39190 40198 39190
 40603 39190 45114 39190
 46547 39190 48010 39190
-14690 39270 23411 39270
+14690 39270 23594 39270
 38479 39270 38885 39270
 39916 39270 40054 39270
 40746 39270 45109 39270
 46551 39270 48010 39270
-14690 39350 23411 39350
+14690 39350 23594 39350
 38559 39350 38851 39350
 39949 39350 39974 39350
 40826 39350 45109 39350
 46551 39350 48010 39350
-14690 39430 23411 39430
+14690 39430 23594 39430
 38639 39430 38851 39430
 40883 39430 45109 39430
 46551 39430 48010 39430
-14690 39510 23411 39510
+14690 39510 23594 39510
 38719 39510 38851 39510
 40916 39510 45109 39510
 46551 39510 48010 39510
-14690 39590 23411 39590
+14690 39590 23594 39590
 38799 39590 38851 39590
 40949 39590 45109 39590
 46551 39590 48010 39590
-14690 39670 23411 39670
+14690 39670 23594 39670
 40949 39670 45109 39670
 46551 39670 48010 39670
-14690 39750 23411 39750
+14690 39750 23594 39750
 40949 39750 45109 39750
 46551 39750 48010 39750
 14690 39830 18333 39830
-22132 39830 23411 39830
+22132 39830 23594 39830
 40940 39830 45109 39830
 46551 39830 48010 39830
 14690 39910 18229 39910
-22236 39910 23411 39910
+22236 39910 23594 39910
 41020 39910 45109 39910
 46551 39910 48010 39910
 14690 39990 18149 39990
-22316 39990 23411 39990
+22316 39990 23594 39990
 41100 39990 45109 39990
 46551 39990 48010 39990
 14690 40070 18069 40070
-22396 40070 23411 40070
+22396 40070 23594 40070
 41180 40070 45109 40070
 46551 40070 48010 40070
 14690 40150 17989 40150
-22476 40150 23411 40150
+22476 40150 23594 40150
 41260 40150 45109 40150
 46551 40150 48010 40150
 14690 40230 17909 40230
-22556 40230 23411 40230
+22556 40230 23594 40230
 41332 40230 45109 40230
 46551 40230 48010 40230
 14690 40310 15184 40310
 17057 40310 17829 40310
-22636 40310 23411 40310
+22636 40310 23594 40310
 41381 40310 45109 40310
 46551 40310 48010 40310
 14690 40390 15085 40390
 17155 40390 17749 40390
-22716 40390 23420 40390
+22716 40390 23594 40390
 41397 40390 45109 40390
 46551 40390 48010 40390
 14690 40470 15050 40470
 17190 40470 17669 40470
-22796 40470 23445 40470
+22796 40470 23594 40470
 41400 40470 45113 40470
 46547 40470 48010 40470
 14690 40550 15044 40550
 17196 40550 17589 40550
-22853 40550 23503 40550
+22853 40550 23594 40550
 44493 40550 45146 40550
 46513 40550 48010 40550
 14690 40630 15044 40630
@@ -9878,7 +9914,6 @@ $FILLSEGMENTS
 37985 41583 38065 41583
 38450 41583 38550 41583
 38935 41583 39971 41583
-41798 41583 42589 41583
 27608 41663 28860 41663
 29440 41663 31031 41663
 37023 41663 37082 41663
@@ -9886,72 +9921,71 @@ $FILLSEGMENTS
 38019 41663 38032 41663
 38450 41663 38550 41663
 38969 41663 40051 41663
-41748 41663 42681 41663
-44180 41663 44211 41663
+41747 41663 41753 41663
 27688 41743 28860 41743
 29440 41743 31031 41743
 37500 41743 37600 41743
 38020 41743 38030 41743
 38450 41743 38550 41743
 38970 41743 40131 41743
-41375 41743 44291 41743
+41375 41743 41833 41743
 27768 41823 28860 41823
 29440 41823 31031 41823
 37500 41823 40211 41823
-41295 41823 44371 41823
+41295 41823 41913 41823
 27848 41903 28811 41903
 29490 41903 30195 41903
 30550 41903 30650 41903
 31005 41903 31031 41903
 38916 41903 40322 41903
-41185 41903 44451 41903
+41185 41903 41993 41903
 27928 41983 28715 41983
 29585 41983 30144 41983
 30550 41983 30650 41983
-38974 41983 44531 41983
+38974 41983 42073 41983
 28008 42063 28682 42063
 29619 42063 30126 42063
 30550 42063 30650 42063
-38957 42063 44611 42063
+38957 42063 42153 42063
 28088 42143 28676 42143
 29624 42143 30180 42143
 30550 42143 30650 42143
-38908 42143 44615 42143
+38908 42143 42233 42143
 28168 42223 28676 42223
 29624 42223 30650 42223
-39873 42223 44615 42223
+39873 42223 42313 42223
 28248 42303 28676 42303
-39963 42303 44615 42303
+39963 42303 42393 42303
 28328 42383 28676 42383
-40043 42383 42731 42383
-44133 42383 44615 42383
+40043 42383 42564 42383
 28408 42463 28692 42463
 40123 42463 42609 42463
-44253 42463 44615 42463
+44253 42463 45287 42463
 28488 42543 28741 42543
 40203 42543 42565 42543
-44298 42543 44615 42543
+44298 42543 45243 42543
 28568 42623 28698 42623
 40283 42623 42552 42623
-44310 42623 44615 42623
+44310 42623 45230 42623
 28648 42703 28676 42703
 40361 42703 42552 42703
-44310 42703 44615 42703
+44310 42703 45230 42703
 40414 42783 42552 42783
-44310 42783 44615 42783
+44310 42783 45230 42783
 40433 42863 42552 42863
-44310 42863 44615 42863
+44310 42863 45230 42863
 40440 42943 42552 42943
-44310 42943 44615 42943
+44310 42943 45230 42943
 40440 43023 42552 43023
-44310 43023 44615 43023
+44310 43023 45230 43023
 40440 43103 42567 43103
-44294 43103 44615 43103
+44294 43103 45245 43103
 40440 43183 42615 43183
-44247 43183 44615 43183
+44247 43183 45293 43183
 40440 43263 41941 43263
 42460 43263 42743 43263
-44117 43263 44615 43263
+44117 43263 44673 43263
+45139 43263 45255 43263
 40440 43343 41838 43343
 42562 43343 44541 43343
 40440 43423 41802 43423