aboutsummaryrefslogtreecommitdiffstats
path: root/hardware/kicad
diff options
context:
space:
mode:
Diffstat (limited to 'hardware/kicad')
-rw-r--r--hardware/kicad/SIMtrace.brd1532
-rw-r--r--hardware/kicad/SIMtrace.net1406
-rw-r--r--hardware/kicad/SIMtrace.sch233
3 files changed, 1790 insertions, 1381 deletions
diff --git a/hardware/kicad/SIMtrace.brd b/hardware/kicad/SIMtrace.brd
index 5aa53b2..8650e86 100644
--- a/hardware/kicad/SIMtrace.brd
+++ b/hardware/kicad/SIMtrace.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Wed 16 May 2012 19:42:17 CEST
+PCBNEW-BOARD Version 1 date Fri 18 May 2012 19:27:20 CEST
# Created by Pcbnew(2011-05-25)-stable
@@ -7,22 +7,22 @@ encoding utf-8
LayerCount 2
Ly 1FFF8001
EnabledLayers 1FFF8001
-Links 193
+Links 195
NoConn 0
Di 14376 34909 48320 56341
Ndraw 20
-Ntrack 1093
+Ntrack 1095
Nzone 0
BoardThickness 630
-Nmodule 69
+Nmodule 70
Nnets 61
$EndGENERAL
$SHEETDESCR
Sheet A4 11700 8267
Title "SIMtrace"
-Date "16 may 2012"
-Rev "1.0p"
+Date "18 may 2012"
+Rev "1.2p"
Comp "osmocom"
Comment1 "CC-BY-SA"
Comment2 ""
@@ -35,7 +35,7 @@ InternalUnit 0.000100 INCH
Layers 2
Layer[0] Back signal
Layer[15] Front signal
-TrackWidth 80
+TrackWidth 320
TrackWidthList 98
TrackWidthList 160
TrackWidthList 197
@@ -228,15 +228,15 @@ Na 39 "GND"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 40 "N-000003"
+Na 40 "N-000005"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 41 "N-000012"
+Na 41 "N-000007"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 42 "N-000013"
+Na 42 "N-000012"
St ~
$EndEQUIPOT
$EQUIPOT
@@ -252,11 +252,11 @@ Na 45 "N-000019"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 46 "N-000023"
+Na 46 "N-000022"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 47 "N-000024"
+Na 47 "N-000023"
St ~
$EndEQUIPOT
$EQUIPOT
@@ -264,51 +264,51 @@ Na 48 "N-000026"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 49 "N-000030"
+Na 49 "N-000027"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 50 "N-000034"
+Na 50 "N-000032"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 51 "N-000036"
+Na 51 "N-000037"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 52 "N-000041"
+Na 52 "N-000042"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 53 "N-000042"
+Na 53 "N-000043"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 54 "N-000045"
+Na 54 "N-000046"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 55 "N-000047"
+Na 55 "N-000048"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 56 "N-000059"
+Na 56 "N-000055"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 57 "N-000060"
+Na 57 "N-000058"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 58 "N-000061"
+Na 58 "N-000064"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 59 "N-000062"
+Na 59 "N-000067"
St ~
$EndEQUIPOT
$EQUIPOT
-Na 60 "N-000064"
+Na 60 "N-000069"
St ~
$EndEQUIPOT
$NCLASS
@@ -354,27 +354,27 @@ AddNet "/VPP_PHONE"
AddNet "/VPP_SIM"
AddNet "/WP"
AddNet "GND"
-AddNet "N-000003"
+AddNet "N-000005"
+AddNet "N-000007"
AddNet "N-000012"
-AddNet "N-000013"
AddNet "N-000016"
AddNet "N-000017"
AddNet "N-000019"
+AddNet "N-000022"
AddNet "N-000023"
-AddNet "N-000024"
AddNet "N-000026"
-AddNet "N-000030"
-AddNet "N-000034"
-AddNet "N-000036"
-AddNet "N-000041"
+AddNet "N-000027"
+AddNet "N-000032"
+AddNet "N-000037"
AddNet "N-000042"
-AddNet "N-000045"
-AddNet "N-000047"
-AddNet "N-000059"
-AddNet "N-000060"
-AddNet "N-000061"
-AddNet "N-000062"
+AddNet "N-000043"
+AddNet "N-000046"
+AddNet "N-000048"
+AddNet "N-000055"
+AddNet "N-000058"
AddNet "N-000064"
+AddNet "N-000067"
+AddNet "N-000069"
$EndNCLASS
$NCLASS
Name "Power"
@@ -453,14 +453,14 @@ $PAD
Sh "1" R 250 450 0 0 1800
Dr 0 0 0
At SMD N 00888000
-Ne 45 "N-000019"
+Ne 47 "N-000023"
Po -300 0
$EndPAD
$PAD
Sh "2" R 250 450 0 0 1800
Dr 0 0 0
At SMD N 00888000
-Ne 47 "N-000024"
+Ne 46 "N-000022"
Po 300 0
$EndPAD
$SHAPE3D
@@ -494,7 +494,7 @@ $PAD
Sh "2" R 250 450 0 0 1800
Dr 0 0 0
At SMD N 00888000
-Ne 54 "N-000045"
+Ne 54 "N-000046"
Po 300 0
$EndPAD
$SHAPE3D
@@ -528,7 +528,7 @@ $PAD
Sh "2" R 250 450 0 0 1800
Dr 0 0 0
At SMD N 00888000
-Ne 55 "N-000047"
+Ne 55 "N-000048"
Po 300 0
$EndPAD
$SHAPE3D
@@ -589,14 +589,14 @@ $PAD
Sh "1" R 250 450 0 0 0
Dr 0 0 0
At SMD N 00888000
-Ne 50 "N-000034"
+Ne 60 "N-000069"
Po -300 0
$EndPAD
$PAD
Sh "2" R 250 450 0 0 0
Dr 0 0 0
At SMD N 00888000
-Ne 53 "N-000042"
+Ne 53 "N-000043"
Po 300 0
$EndPAD
$SHAPE3D
@@ -630,7 +630,7 @@ $PAD
Sh "2" R 250 450 0 0 0
Dr 0 0 0
At SMD N 00888000
-Ne 43 "N-000016"
+Ne 44 "N-000017"
Po 300 0
$EndPAD
$SHAPE3D
@@ -664,7 +664,7 @@ $PAD
Sh "2" R 250 450 0 0 0
Dr 0 0 0
At SMD N 00888000
-Ne 57 "N-000060"
+Ne 43 "N-000016"
Po 300 0
$EndPAD
$SHAPE3D
@@ -827,7 +827,7 @@ $PAD
Sh "1" R 250 450 0 0 2700
Dr 0 0 0
At SMD N 00888000
-Ne 52 "N-000041"
+Ne 52 "N-000042"
Po -300 0
$EndPAD
$PAD
@@ -861,14 +861,14 @@ $PAD
Sh "1" R 250 450 0 0 900
Dr 0 0 0
At SMD N 00888000
-Ne 43 "N-000016"
+Ne 44 "N-000017"
Po -300 0
$EndPAD
$PAD
Sh "2" R 250 450 0 0 900
Dr 0 0 0
At SMD N 00888000
-Ne 44 "N-000017"
+Ne 48 "N-000026"
Po 300 0
$EndPAD
$SHAPE3D
@@ -963,7 +963,7 @@ $PAD
Sh "1" R 250 450 0 0 1800
Dr 0 0 0
At SMD N 00888000
-Ne 60 "N-000064"
+Ne 40 "N-000005"
Po -300 0
$EndPAD
$PAD
@@ -1133,7 +1133,7 @@ $PAD
Sh "1" R 250 450 0 0 2700
Dr 0 0 0
At SMD N 00888000
-Ne 51 "N-000036"
+Ne 50 "N-000032"
Po -300 0
$EndPAD
$PAD
@@ -1167,7 +1167,7 @@ $PAD
Sh "1" R 250 450 0 0 900
Dr 0 0 0
At SMD N 00888000
-Ne 49 "N-000030"
+Ne 51 "N-000037"
Po -300 0
$EndPAD
$PAD
@@ -1378,7 +1378,7 @@ $PAD
Sh "2" R 250 450 0 0 1800
Dr 0 0 0
At SMD N 00888000
-Ne 50 "N-000034"
+Ne 60 "N-000069"
Po 300 0
$EndPAD
$SHAPE3D
@@ -1480,7 +1480,7 @@ $PAD
Sh "2" R 250 450 0 0 900
Dr 0 0 0
At SMD N 00888000
-Ne 53 "N-000042"
+Ne 53 "N-000043"
Po 300 0
$EndPAD
$SHAPE3D
@@ -1507,14 +1507,14 @@ $PAD
Sh "1" R 250 450 0 0 900
Dr 0 0 0
At SMD N 00888000
-Ne 57 "N-000060"
+Ne 43 "N-000016"
Po -300 0
$EndPAD
$PAD
Sh "2" R 250 450 0 0 900
Dr 0 0 0
At SMD N 00888000
-Ne 43 "N-000016"
+Ne 44 "N-000017"
Po 300 0
$EndPAD
$SHAPE3D
@@ -1646,7 +1646,7 @@ $PAD
Sh "1" R 350 550 0 0 1800
Dr 0 0 0
At SMD N 00888000
-Ne 60 "N-000064"
+Ne 40 "N-000005"
Po -375 0
$EndPAD
$PAD
@@ -1683,7 +1683,7 @@ $PAD
Sh "1" R 350 550 0 0 2700
Dr 0 0 0
At SMD N 00888000
-Ne 59 "N-000062"
+Ne 45 "N-000019"
Po -375 0
$EndPAD
$PAD
@@ -1721,7 +1721,7 @@ $PAD
Sh "1" R 98 600 0 0 2700
Dr 0 0 0
At SMD N 00888000
-Ne 60 "N-000064"
+Ne 40 "N-000005"
Po -1476 2311
$EndPAD
$PAD
@@ -1756,7 +1756,7 @@ $PAD
Sh "6" O 98 600 0 0 2700
Dr 0 0 0
At SMD N 00888000
-Ne 42 "N-000013"
+Ne 57 "N-000058"
Po -492 2311
$EndPAD
$PAD
@@ -1847,7 +1847,7 @@ $PAD
Sh "19" O 600 98 0 0 2700
Dr 0 0 0
At SMD N 00888000
-Ne 47 "N-000024"
+Ne 46 "N-000022"
Po 2375 1082
$EndPAD
$PAD
@@ -2099,7 +2099,7 @@ $PAD
Sh "55" O 600 98 0 0 2700
Dr 0 0 0
At SMD N 00888000
-Ne 46 "N-000023"
+Ne 49 "N-000027"
Po -2311 -296
$EndPAD
$PAD
@@ -2141,21 +2141,21 @@ $PAD
Sh "61" O 600 98 0 0 2700
Dr 0 0 0
At SMD N 00888000
-Ne 49 "N-000030"
+Ne 51 "N-000037"
Po -2311 883
$EndPAD
$PAD
Sh "62" O 600 98 0 0 2700
Dr 0 0 0
At SMD N 00888000
-Ne 51 "N-000036"
+Ne 50 "N-000032"
Po -2311 1080
$EndPAD
$PAD
Sh "63" O 600 98 0 0 2700
Dr 0 0 0
At SMD N 00888000
-Ne 50 "N-000034"
+Ne 60 "N-000069"
Po -2311 1276
$EndPAD
$PAD
@@ -2198,7 +2198,7 @@ $PAD
Sh "2" C 600 600 0 0 0
Dr 400 0 0
At STD N 00E0FFFF
-Ne 48 "N-000026"
+Ne 56 "N-000055"
Po -1500 0
$EndPAD
$PAD
@@ -2226,7 +2226,7 @@ $PAD
Sh "6" C 600 600 0 0 0
Dr 400 0 0
At STD N 00E0FFFF
-Ne 48 "N-000026"
+Ne 56 "N-000055"
Po 2500 0
$EndPAD
$SHAPE3D
@@ -2252,7 +2252,7 @@ $PAD
Sh "1" R 315 354 0 0 0
Dr 0 0 0
At SMD N 00888000
-Ne 45 "N-000019"
+Ne 47 "N-000023"
Po -394 433
$EndPAD
$PAD
@@ -2293,7 +2293,7 @@ $PAD
Sh "2" R 315 354 0 0 900
Dr 0 0 0
At SMD N 00888000
-Ne 44 "N-000017"
+Ne 48 "N-000026"
Po 394 433
$EndPAD
$PAD
@@ -2389,7 +2389,7 @@ Po 1339 787
$EndPAD
$EndMODULE PUSH_BUTTON
$MODULE USB-MINI-B_UX60
-Po 45650 50000 900 15 4FB388C3 4DD21AF7 ~~
+Po 45650 50000 900 15 4FB6803A 4DD21AF7 ~~
Li USB-MINI-B_UX60
Cd Hirose UX60-MB-5ST
Sc 4DD21AF7
@@ -2426,14 +2426,14 @@ $PAD
Sh "2" R 197 787 0 0 900
Dr 0 0 0
At SMD N 00888000
-Ne 57 "N-000060"
+Ne 43 "N-000016"
Po -315 -886
$EndPAD
$PAD
Sh "3" R 197 787 0 0 900
Dr 0 0 0
At SMD N 00888000
-Ne 43 "N-000016"
+Ne 44 "N-000017"
Po 0 -886
$EndPAD
$PAD
@@ -2454,7 +2454,7 @@ $PAD
Sh "1" R 197 787 0 0 900
Dr 0 0 0
At SMD N 00888000
-Ne 59 "N-000062"
+Ne 45 "N-000019"
Po -630 -886
$EndPAD
$PAD
@@ -2844,7 +2844,7 @@ $PAD
Sh "2" R 250 450 0 0 1800
Dr 0 0 0
At SMD N 00888000
-Ne 58 "N-000061"
+Ne 59 "N-000067"
Po 300 0
$EndPAD
$SHAPE3D
@@ -2878,7 +2878,7 @@ $PAD
Sh "2" R 250 450 0 0 2700
Dr 0 0 0
At SMD N 00888000
-Ne 42 "N-000013"
+Ne 57 "N-000058"
Po 300 0
$EndPAD
$SHAPE3D
@@ -2912,7 +2912,7 @@ $PAD
Sh "2" R 250 450 0 0 900
Dr 0 0 0
At SMD N 00888000
-Ne 42 "N-000013"
+Ne 57 "N-000058"
Po 300 0
$EndPAD
$SHAPE3D
@@ -3015,7 +3015,7 @@ $PAD
Sh "3" R 200 120 0 0 0
Dr 0 0 0
At SMD N 00888000
-Ne 58 "N-000061"
+Ne 59 "N-000067"
Po -400 250
$EndPAD
$PAD
@@ -3085,14 +3085,14 @@ $PAD
Sh "5" R 236 433 0 0 0
Dr 0 0 0
At SMD N 00888000
-Ne 56 "N-000059"
+Ne 58 "N-000064"
Po 0 -512
$EndPAD
$PAD
Sh "4" R 236 433 0 0 0
Dr 0 0 0
At SMD N 00888000
-Ne 56 "N-000059"
+Ne 58 "N-000064"
Po 374 -512
$EndPAD
$EndMODULE SOT26
@@ -3141,7 +3141,7 @@ $PAD
Sh "1" R 600 600 0 0 2700
Dr 400 0 0
At STD N 00E0FFFF
-Ne 41 "N-000012"
+Ne 42 "N-000012"
Po -500 0
$EndPAD
$PAD
@@ -3181,7 +3181,7 @@ $PAD
Sh "2" R 598 906 0 0 1800
Dr 0 0 0
At SMD N 00888000
-Ne 56 "N-000059"
+Ne 58 "N-000064"
Po 839 0
$EndPAD
$EndMODULE SMB_STPS340U
@@ -3201,14 +3201,14 @@ $PAD
Sh "1" R 598 906 0 0 1800
Dr 0 0 0
At SMD N 00888000
-Ne 41 "N-000012"
+Ne 42 "N-000012"
Po -839 0
$EndPAD
$PAD
Sh "2" R 598 906 0 0 1800
Dr 0 0 0
At SMD N 00888000
-Ne 56 "N-000059"
+Ne 58 "N-000064"
Po 839 0
$EndPAD
$EndMODULE SMB_STPS340U
@@ -3264,7 +3264,7 @@ $PAD
Sh "7" R 197 379 0 0 2700
Dr 0 0 0
At SMD N 00888000
-Ne 40 "N-000003"
+Ne 41 "N-000007"
Po 250 1455
$EndPAD
$PAD
@@ -3350,7 +3350,7 @@ $PAD
Sh "1" R 472 472 0 0 1800
Dr 0 0 0
At SMD N 00888000
-Ne 54 "N-000045"
+Ne 54 "N-000046"
Po -413 0
$EndPAD
$PAD
@@ -3429,7 +3429,7 @@ $PAD
Sh "1" R 472 472 0 0 1800
Dr 0 0 0
At SMD N 00888000
-Ne 55 "N-000047"
+Ne 55 "N-000048"
Po -413 0
$EndPAD
$PAD
@@ -3472,7 +3472,7 @@ $PAD
Sh "3" C 600 600 0 0 0
Dr 400 0 0
At STD N 00E0FFFF
-Ne 52 "N-000041"
+Ne 52 "N-000042"
Po -4500 500
$EndPAD
$PAD
@@ -3602,7 +3602,7 @@ Ro 0.000000 0.000000 0.000000
$EndSHAPE3D
$EndMODULE PIN_ARRAY_10X2
$MODULE PIN_ARRAY_2X1
-Po 38450 38950 0 15 4EB2E5DA 4DCD07CC ~~
+Po 38250 38950 0 15 4EB2E5DA 4DCD07CC ~~
Li PIN_ARRAY_2X1
Cd Connecteurs 2 pins
Kw CONN DEV
@@ -3626,7 +3626,7 @@ $PAD
Sh "2" C 600 600 0 0 0
Dr 400 0 0
At STD N 00E0FFFF
-Ne 46 "N-000023"
+Ne 49 "N-000027"
Po 500 0
$EndPAD
$SHAPE3D
@@ -3637,7 +3637,7 @@ Ro 0.000000 0.000000 0.000000
$EndSHAPE3D
$EndMODULE PIN_ARRAY_2X1
$MODULE PIN_ARRAY_2X1
-Po 40450 38950 0 15 4EB2E5EC 4FB38928 ~~
+Po 40250 38950 0 15 4EB2E5EC 4FB38928 ~~
Li PIN_ARRAY_2X1
Cd Connecteurs 2 pins
Kw CONN DEV
@@ -3672,13 +3672,13 @@ Ro 0.000000 0.000000 0.000000
$EndSHAPE3D
$EndMODULE PIN_ARRAY_2X1
$MODULE JACK_2.5
-Po 45150 40100 1800 15 4FB38909 4DCD07C7 ~~
+Po 45150 40100 1800 15 4FB68044 4DCD07C7 ~~
Li JACK_2.5
Sc 4DCD07C7
AR /4DCBE233
Op 0 0 0
T0 2900 50 299 299 1800 59 N V 21 N "J2"
-T1 250 1450 299 299 1800 59 N V 21 N "JACK_2.5"
+T1 250 1450 299 299 1800 59 N V 21 N "SERIAL"
DS -2362 -787 -2953 -787 150 21
DS -2953 -787 -2953 787 150 21
DS -2953 787 -2362 787 150 21
@@ -3746,14 +3746,14 @@ $PAD
Sh "1" R 2165 787 0 0 1800
Dr 0 0 0
At SMD N 00888000
-Ne 49 "N-000030"
+Ne 51 "N-000037"
Po -1850 0
$EndPAD
$PAD
Sh "2" R 2165 787 0 0 1800
Dr 0 0 0
At SMD N 00888000
-Ne 51 "N-000036"
+Ne 50 "N-000032"
Po 1850 0
$EndPAD
$EndMODULE Q_49U3HMS
@@ -3774,7 +3774,7 @@ $PAD
Sh "1" R 250 450 0 0 2700
Dr 0 0 0
At SMD N 00888000
-Ne 40 "N-000003"
+Ne 41 "N-000007"
Po -300 0
$EndPAD
$PAD
@@ -3883,7 +3883,7 @@ $PAD
Sh "1" R 350 550 0 0 2700
Dr 0 0 0
At SMD N 00888000
-Ne 56 "N-000059"
+Ne 58 "N-000064"
Po -375 0
$EndPAD
$PAD
@@ -3900,6 +3900,40 @@ Of 0.000000 0.000000 0.000000
Ro 0.000000 0.000000 0.000000
$EndSHAPE3D
$EndMODULE SM0805
+$MODULE SM0603
+Po 20050 39700 2700 15 455C3716 4FB68030 ~~
+Li SM0603
+Sc 4FB68030
+AR /4FB50700
+Op 0 0 0
+At SMD
+T0 0 0 280 180 2700 45 N V 21 N "R23"
+T1 0 0 280 180 2700 45 N I 21 N "100K"
+DS -450 -250 450 -250 50 21
+DS 450 -250 450 250 50 21
+DS 450 250 -450 250 50 21
+DS -450 250 -450 -250 50 21
+$PAD
+Sh "1" R 250 450 0 0 2700
+Dr 0 0 0
+At SMD N 00888000
+Ne 39 "GND"
+Po -300 0
+$EndPAD
+$PAD
+Sh "2" R 250 450 0 0 2700
+Dr 0 0 0
+At SMD N 00888000
+Ne 19 "/RST_PHONE"
+Po 300 0
+$EndPAD
+$SHAPE3D
+Na "smd/chip_cms.wrl"
+Sc 0.080000 0.080000 0.080000
+Of 0.000000 0.000000 0.000000
+Ro 0.000000 0.000000 0.000000
+$EndSHAPE3D
+$EndMODULE SM0603
$TEXTPCB
Te "v1.2p"
Po 16300 55350 600 800 120 0
@@ -4632,44 +4666,46 @@ Po 0 32500 49750 32500 50250 80 -1
De 15 0 18 0 0
Po 0 32500 51600 32500 52100 80 -1
De 15 0 18 0 0
-Po 0 31940 47209 31733 47209 80 -1
-De 15 0 19 0 0
-Po 0 27677 45388 29912 45388 80 -1
-De 0 0 19 0 0
-Po 0 32655 48032 32365 47742 80 -1
+Po 0 20050 40000 21550 40000 98 -1
+De 15 0 19 0 400000
+Po 0 22080 40530 22080 41300 98 -1
+De 15 0 19 0 800000
+Po 0 21550 40000 22080 40530 98 -1
De 15 0 19 0 0
-Po 0 16947 41459 17441 41459 80 -1
+Po 0 16947 41459 17491 41459 98 -1
De 15 0 19 0 400000
-Po 0 23892 41603 27677 45388 80 -1
-De 0 0 19 0 0
-Po 0 23071 40782 22090 40782 80 -1
+Po 0 18950 40000 20050 40000 98 -1
+De 15 0 19 0 800000
+Po 0 17491 41459 18950 40000 98 -1
De 15 0 19 0 0
-Po 0 32655 49175 32655 48032 80 -1
-De 15 0 19 0 400800
-Po 0 29912 45388 31733 47209 80 -1
-De 0 0 19 0 0
-Po 0 22090 40782 22080 40792 80 -1
+Po 0 31940 47209 31733 47209 80 -1
De 15 0 19 0 0
-Po 3 23892 41603 23892 41603 350 -1
+Po 3 31733 47209 31733 47209 350 -1
De 15 1 19 0 0
-Po 0 32365 47634 31940 47209 80 -1
+Po 0 22080 41300 22080 40792 80 -1
+De 15 0 19 0 400800
+Po 0 23892 41603 23071 40782 80 -1
De 15 0 19 0 0
Po 0 32365 47742 32365 47634 80 -1
De 15 0 19 0 0
-Po 0 22080 40480 22080 41300 80 -1
-De 15 0 19 0 800000
-Po 0 23892 41603 23071 40782 80 -1
+Po 0 32365 47634 31940 47209 80 -1
De 15 0 19 0 0
-Po 0 21700 40100 22080 40480 80 -1
+Po 3 23892 41603 23892 41603 350 -1
+De 15 1 19 0 0
+Po 0 22090 40782 22080 40792 80 -1
De 15 0 19 0 0
-Po 0 22080 41300 22080 40792 80 -1
+Po 0 29912 45388 31733 47209 80 -1
+De 0 0 19 0 0
+Po 0 32655 49175 32655 48032 80 -1
De 15 0 19 0 400800
-Po 3 31733 47209 31733 47209 350 -1
-De 15 1 19 0 0
-Po 0 17441 41459 18800 40100 80 -1
+Po 0 23071 40782 22090 40782 80 -1
De 15 0 19 0 0
-Po 0 18800 40100 21700 40100 80 -1
+Po 0 23892 41603 27677 45388 80 -1
+De 0 0 19 0 0
+Po 0 32655 48032 32365 47742 80 -1
De 15 0 19 0 0
+Po 0 27677 45388 29912 45388 80 -1
+De 0 0 19 0 0
Po 3 30900 49700 30900 49700 350 -1
De 15 1 20 0 0
Po 0 30900 49700 31490 49247 80 -1
@@ -4846,16 +4882,16 @@ Po 0 34427 44489 34427 44046 80 -1
De 15 0 27 0 400800
Po 0 34427 44046 34340 44046 80 -1
De 15 0 27 0 0
+Po 0 39750 38950 39750 43500 98 -1
+De 0 0 28 0 400000
+Po 0 39750 43500 36650 46600 98 -1
+De 0 0 28 0 0
Po 0 35325 46899 35801 46899 98 -1
De 15 0 28 0 400000
Po 0 36100 46600 36650 46600 98 -1
De 15 0 28 0 0
Po 0 35801 46899 36100 46600 98 -1
De 15 0 28 0 0
-Po 0 39950 38950 39950 43300 98 -1
-De 0 0 28 0 400000
-Po 0 39950 43300 36650 46600 98 -1
-De 0 0 28 0 0
Po 3 36650 46600 36650 46600 350 -1
De 15 1 28 0 0
Po 0 32950 46150 31979 44967 80 -1
@@ -5072,36 +5108,36 @@ Po 0 33363 51768 33687 51768 80 -1
De 15 0 37 0 0
Po 0 36077 53212 34633 51768 80 -1
De 15 0 37 0 0
-Po 0 40950 38950 41700 38950 320 -1
+Po 0 40750 38950 41700 38950 394 -1
De 15 0 38 0 400000
+Po 0 37750 38950 35700 38950 394 -1
+De 0 0 38 0 400000
+Po 0 34206 36806 34206 37294 197 -1
+De 0 0 38 0 0
+Po 0 34200 37450 35700 38950 320 -1
+De 0 0 38 0 0
+Po 0 34200 37300 34200 37450 197 -1
+De 0 0 38 0 0
+Po 0 34206 37294 34200 37300 197 -1
+De 0 0 38 0 0
+Po 0 34100 36700 32151 36700 197 -1
+De 0 0 38 0 0
+Po 0 34100 36700 34206 36806 197 -1
+De 0 0 38 0 0
Po 0 41700 38950 42000 39250 320 -1
De 15 0 38 0 0
Po 0 42000 39250 42000 40659 320 -1
De 15 0 38 0 0
-Po 0 37950 38950 37950 39150 320 -1
+Po 0 37750 38950 37750 39150 320 -1
De 15 0 38 0 400000
-Po 0 40950 39300 40950 38950 320 -1
+Po 0 40750 39300 40750 38950 320 -1
De 15 0 38 0 800000
-Po 0 40500 39750 40950 39300 320 -1
+Po 0 40300 39750 40750 39300 320 -1
De 15 0 38 0 0
-Po 0 38550 39750 40500 39750 320 -1
+Po 0 38350 39750 40300 39750 320 -1
De 15 0 38 0 0
-Po 0 37950 39150 38550 39750 320 -1
+Po 0 37750 39150 38350 39750 320 -1
De 15 0 38 0 0
-Po 0 35700 38950 37950 38950 320 -1
-De 0 0 38 0 800000
-Po 0 34100 36700 34206 36806 197 -1
-De 0 0 38 0 0
-Po 0 34100 36700 32151 36700 197 -1
-De 0 0 38 0 0
-Po 0 34206 37294 34200 37300 197 -1
-De 0 0 38 0 0
-Po 0 34200 37300 34200 37450 197 -1
-De 0 0 38 0 0
-Po 0 34200 37450 35700 38950 320 -1
-De 0 0 38 0 0
-Po 0 34206 36806 34206 37294 197 -1
-De 0 0 38 0 0
Po 0 41700 38950 42000 39250 197 -1
De 15 0 38 0 0
Po 0 42000 39250 42000 40659 197 -1
@@ -5176,10 +5212,10 @@ Po 0 31671 50179 31550 50300 98 -1
De 15 0 38 0 0
Po 0 26700 36200 26750 36200 160 -1
De 0 0 38 0 400800
-Po 0 27250 36700 32151 36700 197 -1
-De 0 0 38 0 0
Po 0 26750 36200 27250 36700 320 -1
De 0 0 38 0 0
+Po 0 27250 36700 32151 36700 197 -1
+De 0 0 38 0 0
Po 0 24650 44223 25120 43753 160 -1
De 15 0 38 0 800400
Po 0 31986 48253 31671 48568 98 -1
@@ -5396,6 +5432,36 @@ Po 0 33178 54336 32636 54336 320 -1
De 15 0 38 0 400800
Po 0 43450 47150 43450 47200 160 -1
De 0 0 38 0 0
+Po 0 21800 39100 21800 39050 320 -1
+De 15 0 39 0 400000
+Po 0 23550 38650 24000 39100 320 -1
+De 15 0 39 0 800000
+Po 0 22200 38650 23550 38650 320 -1
+De 15 0 39 0 0
+Po 0 21800 39050 22200 38650 320 -1
+De 15 0 39 0 0
+Po 0 21800 39100 20350 39100 320 -1
+De 15 0 39 0 400000
+Po 0 20350 39100 20050 39400 320 -1
+De 15 0 39 0 800000
+Po 0 17350 38742 19392 38742 320 -1
+De 15 0 39 0 0
+Po 0 19392 38742 20050 39400 320 -1
+De 15 0 39 0 800000
+Po 0 17350 38742 17350 38700 394 -1
+De 15 0 39 0 0
+Po 0 17350 38700 17350 37352 394 -1
+De 15 0 39 0 0
+Po 0 17350 37352 18639 36063 394 -1
+De 15 0 39 0 800000
+Po 0 23939 36063 23913 36063 394 -1
+De 15 0 39 0 400000
+Po 0 23913 36063 23350 35500 394 -1
+De 15 0 39 0 0
+Po 0 23350 35500 19202 35500 394 -1
+De 15 0 39 0 0
+Po 0 19202 35500 18639 36063 394 -1
+De 15 0 39 0 800000
Po 0 37200 50800 38250 50800 320 -1
De 15 0 39 0 800000
Po 0 36955 51045 37200 50800 320 -1
@@ -5502,8 +5568,6 @@ Po 0 47350 35250 47850 35750 197 -1
De 15 0 39 0 0
Po 0 47850 35750 47850 39750 197 -1
De 0 0 39 0 0
-Po 0 23939 36039 23350 35450 394 -1
-De 15 0 39 0 0
Po 0 28747 42765 28618 42765 80 -1
De 15 0 39 0 0
Po 0 47350 35250 47850 35750 197 -1
@@ -5516,8 +5580,6 @@ Po 0 33350 42200 33350 41932 197 -1
De 15 0 39 0 400000
Po 0 34243 41239 33450 41932 98 -1
De 15 0 39 0 0
-Po 0 18652 36050 17950 36050 394 -1
-De 15 0 39 0 0
Po 0 39800 53112 39800 54225 320 -1
De 15 0 39 0 400000
Po 0 26951 43763 27344 44156 197 -1
@@ -5616,8 +5678,6 @@ Po 0 27400 39850 25500 37950 394 -1
De 0 0 39 0 0
Po 0 25500 35600 25600 35500 394 -1
De 0 0 39 0 0
-Po 0 17950 36050 17350 36650 394 -1
-De 15 0 39 0 0
Po 3 15700 42400 15700 42400 350 -1
De 15 1 39 0 0
Po 0 30500 51800 31258 51816 320 -1
@@ -5630,10 +5690,6 @@ Po 0 30400 39800 31200 39800 320 -1
De 15 0 39 0 0
Po 0 36150 43450 36150 43450 320 -1
De 15 0 39 0 0
-Po 0 23350 35450 19252 35450 394 -1
-De 15 0 39 0 0
-Po 0 17350 36650 17350 38742 394 -1
-De 15 0 39 0 0
Po 0 44764 49370 45250 49370 197 -1
De 15 0 39 0 400800
Po 0 36050 45425 36250 45450 80 -1
@@ -5652,8 +5708,6 @@ Po 0 31200 39800 31200 39800 320 -1
De 15 0 39 0 0
Po 0 32700 36200 31700 36200 197 -1
De 15 0 39 0 C00C00
-Po 0 23939 36063 23939 36039 394 -1
-De 15 0 39 0 400000
Po 0 31745 39813 33599 39803 320 -1
De 15 0 39 0 0
Po 0 33600 39802 33599 39803 320 -1
@@ -5686,14 +5740,10 @@ Po 0 33600 39800 33600 39802 320 -1
De 0 0 39 0 0
Po 0 36700 52712 36943 52712 320 -1
De 15 0 39 0 0
-Po 0 18223 39100 17865 38742 197 -1
-De 15 0 39 0 0
Po 0 26610 48500 25999 47889 197 -1
De 15 0 39 0 0
Po 0 29600 48500 28150 48500 197 -1
De 15 0 39 0 400800
-Po 0 23600 38700 24000 39100 197 -1
-De 15 0 39 0 800000
Po 0 33400 41700 33700 41400 320 -1
De 15 0 39 0 0
Po 3 31250 42050 31250 42050 350 -1
@@ -5708,8 +5758,6 @@ Po 0 15718 42383 15717 42383 320 -1
De 15 0 39 0 0
Po 0 42594 45344 42594 45394 394 -1
De 15 0 39 0 0
-Po 0 21800 39100 18223 39100 197 -1
-De 15 0 39 0 400000
Po 0 14949 39842 14949 41614 394 -1
De 15 0 39 0 0
Po 0 27400 39800 30400 39800 320 -1
@@ -5726,8 +5774,6 @@ Po 0 33700 36200 32700 36200 197 -1
De 15 0 39 0 C00C00
Po 0 30750 42400 31190 41978 320 -1
De 15 0 39 0 0
-Po 0 21800 39100 21800 39000 197 -1
-De 15 0 39 0 400000
Po 0 30432 51794 30726 51500 320 -1
De 15 0 39 0 0
Po 0 44050 49350 44050 49150 394 -1
@@ -5884,8 +5930,6 @@ Po 0 43250 46000 42594 45344 394 -1
De 15 0 39 0 0
Po 0 27400 39850 27400 39800 320 -1
De 15 0 39 0 0
-Po 0 19252 35450 18652 36050 394 -1
-De 15 0 39 0 0
Po 0 47650 50650 47650 53650 394 -1
De 15 0 39 0 0
Po 0 36483 52712 36700 52712 320 -1
@@ -5898,8 +5942,6 @@ Po 0 36150 43450 36000 43450 320 -1
De 15 0 39 0 400
Po 0 27344 44156 28093 44156 197 -1
De 15 0 39 0 0
-Po 0 17865 38742 17350 38742 197 -1
-De 15 0 39 0 0
Po 0 27000 35500 27700 36200 394 -1
De 15 0 39 0 800400
Po 0 16049 38742 14949 39842 394 -1
@@ -5912,12 +5954,8 @@ Po 0 31700 36200 30700 36200 197 -1
De 15 0 39 0 C00C00
Po 0 30750 43500 30750 42400 320 -1
De 15 0 39 0 400800
-Po 0 22100 38700 23600 38700 197 -1
-De 15 0 39 0 0
Po 0 29700 36200 28700 36200 197 -1
De 15 0 39 0 C00C00
-Po 0 21800 39000 22100 38700 197 -1
-De 15 0 39 0 0
Po 0 40600 42850 40570 42850 394 -1
De 15 0 39 0 0
Po 0 40600 43300 40600 42850 394 -1
@@ -5932,185 +5970,167 @@ Po 0 36250 45400 36050 45425 80 -1
De 15 0 39 0 800000
Po 0 16947 43034 18650 43050 80 -1
De 15 0 39 0 400800
-Po 0 33178 53736 34009 53736 80 -1
-De 15 0 40 0 400000
-Po 0 34009 53736 34045 53700 80 -1
+Po 0 27819 43763 28635 43763 197 -1
+De 15 0 40 0 0
+Po 0 30639 45324 30196 45324 98 -1
+De 15 0 40 0 400800
+Po 0 27551 43763 27819 43763 197 -1
+De 15 0 40 0 400800
+Po 0 28635 43763 30196 45324 197 -1
+De 15 0 40 0 0
+Po 0 27551 43763 27551 43763 80 -1
+De 15 0 40 0 C00800
+Po 0 25870 43753 26188 43753 197 -1
+De 15 0 40 0 400800
+Po 0 26188 43753 26647 43294 197 -1
+De 15 0 40 0 0
+Po 0 26647 43294 27082 43294 197 -1
+De 15 0 40 0 0
+Po 0 27082 43294 27283 43495 197 -1
+De 15 0 40 0 0
+Po 0 27283 43495 27551 43763 197 -1
De 15 0 40 0 800000
-Po 0 44139 54950 44400 54950 160 -1
+Po 0 33178 53736 34009 53736 80 -1
De 15 0 41 0 400000
-Po 0 45650 53700 46600 53700 320 -1
+Po 0 34009 53736 34045 53700 80 -1
De 15 0 41 0 800000
-Po 0 44400 54950 45650 53700 320 -1
-De 15 0 41 0 0
-Po 0 22900 39100 23200 39100 80 -1
-De 15 0 42 0 400000
-Po 0 29140 43272 28212 43272 80 -1
-De 15 0 42 0 0
-Po 0 31082 45214 29140 43272 80 -1
-De 15 0 42 0 0
-Po 0 24640 39700 25035 40095 80 -1
-De 15 0 42 0 0
-Po 0 28212 43272 25035 40095 80 -1
-De 15 0 42 0 0
-Po 0 31082 46308 30639 46308 80 -1
-De 15 0 42 0 800800
-Po 0 23200 39100 23800 39700 80 -1
-De 15 0 42 0 0
-Po 0 24000 39700 24640 39700 80 -1
+Po 0 44139 54950 44400 54950 160 -1
De 15 0 42 0 400000
-Po 0 23800 39700 24000 39700 80 -1
+Po 0 45650 53700 46600 53700 320 -1
De 15 0 42 0 800000
-Po 0 31082 46308 31082 45214 80 -1
+Po 0 44400 54950 45650 53700 320 -1
De 15 0 42 0 0
-Po 0 40800 46550 41800 47550 80 -1
+Po 0 40750 47300 40750 47350 80 -1
+De 15 0 43 0 400800
+Po 0 40750 47350 41550 48150 80 -1
+De 15 0 43 0 0
+Po 0 41550 48150 41800 48150 80 -1
De 15 0 43 0 800400
-Po 0 42450 48200 42750 48200 80 -1
+Po 0 41800 49750 42365 50315 80 -1
+De 15 0 43 0 0
+Po 0 42365 50315 44764 50315 80 -1
De 15 0 43 0 800400
-Po 0 40750 46550 40800 46550 80 -1
+Po 0 41800 48150 41800 49750 80 -1
De 15 0 43 0 400800
+Po 0 40800 46550 41800 47550 80 -1
+De 15 0 44 0 800400
+Po 0 42450 48200 42750 48200 80 -1
+De 15 0 44 0 800400
+Po 0 40750 46550 40800 46550 80 -1
+De 15 0 44 0 400800
Po 0 42750 48200 42750 49700 80 -1
-De 15 0 43 0 400800
+De 15 0 44 0 400800
Po 0 41800 47550 42450 48200 80 -1
-De 15 0 43 0 400800
+De 15 0 44 0 400800
Po 0 42750 49700 43050 50000 80 -1
-De 15 0 43 0 0
-Po 0 43050 50000 44764 50000 80 -1
-De 15 0 43 0 800400
-Po 0 42750 47000 42750 47600 160 -1
-De 15 0 44 0 800000
-Po 3 42750 47000 42750 47000 350 -1
-De 15 1 44 0 0
-Po 0 45406 45756 45100 45450 160 -1
De 15 0 44 0 0
-Po 0 45050 45500 44250 45500 160 -1
-De 0 0 44 0 0
-Po 0 45100 45450 45050 45500 160 -1
-De 0 0 44 0 0
-Po 0 45833 45756 45406 45756 160 -1
-De 15 0 44 0 400000
-Po 0 44250 45500 42750 47000 160 -1
-De 0 0 44 0 0
-Po 3 45100 45450 45100 45450 350 -1
-De 15 1 44 0 0
-Po 0 41806 45158 41795 45169 80 -1
-De 15 0 45 0 0
-Po 0 41795 45537 41795 45169 80 -1
-De 15 0 45 0 400800
-Po 0 41806 44533 41806 45158 80 -1
-De 15 0 45 0 400800
-Po 0 35524 42509 37191 42509 98 -1
-De 0 0 46 0 0
-Po 0 38950 40750 38950 38950 98 -1
-De 0 0 46 0 800000
-Po 0 37191 42509 38950 40750 98 -1
-De 0 0 46 0 0
-Po 0 33246 44489 33246 43977 80 -1
-De 15 0 46 0 400800
-Po 0 33246 43977 34714 42509 80 -1
-De 15 0 46 0 0
-Po 3 35524 42509 35524 42509 350 -1
-De 15 1 46 0 0
-Po 0 34714 42509 35524 42509 80 -1
-De 15 0 46 0 0
+Po 0 43050 50000 44764 50000 80 -1
+De 15 0 44 0 800400
+Po 0 44764 50630 43745 50630 197 -1
+De 15 0 45 0 400000
+Po 0 43745 50630 43500 50875 197 -1
+De 15 0 45 0 800000
Po 0 40824 45434 40475 45434 80 -1
-De 15 0 47 0 0
+De 15 0 46 0 0
Po 3 32321 48367 32321 48367 350 -1
-De 15 1 47 0 0
+De 15 1 46 0 0
Po 3 40475 45434 40475 45434 350 -1
-De 15 1 47 0 0
+De 15 1 46 0 0
Po 0 31868 48732 32233 48367 80 -1
-De 15 0 47 0 0
+De 15 0 46 0 0
Po 0 36560 48654 36010 48654 80 -1
-De 0 0 47 0 0
+De 0 0 46 0 0
Po 0 32233 48367 32321 48367 80 -1
-De 15 0 47 0 0
+De 15 0 46 0 0
Po 0 40475 45434 39780 45434 80 -1
-De 0 0 47 0 0
+De 0 0 46 0 0
Po 0 39780 45434 36560 48654 80 -1
-De 0 0 47 0 0
+De 0 0 46 0 0
Po 0 33201 48367 32321 48367 80 -1
-De 0 0 47 0 0
+De 0 0 46 0 0
Po 0 34870 47514 34054 47514 80 -1
-De 0 0 47 0 0
+De 0 0 46 0 0
Po 0 31868 49175 31868 48732 80 -1
-De 15 0 47 0 400800
+De 15 0 46 0 400800
Po 0 41195 45537 40927 45537 80 -1
-De 15 0 47 0 400800
+De 15 0 46 0 400800
Po 0 34054 47514 33201 48367 80 -1
-De 0 0 47 0 0
+De 0 0 46 0 0
Po 0 36010 48654 34870 47514 80 -1
-De 0 0 47 0 0
+De 0 0 46 0 0
Po 0 40927 45537 40824 45434 80 -1
+De 15 0 46 0 0
+Po 0 41806 45158 41795 45169 80 -1
De 15 0 47 0 0
-Po 0 46659 35659 43741 35659 80 -1
+Po 0 41795 45537 41795 45169 80 -1
+De 15 0 47 0 400800
+Po 0 41806 44533 41806 45158 80 -1
+De 15 0 47 0 400800
+Po 0 42750 47000 42750 47600 160 -1
+De 15 0 48 0 800000
+Po 3 42750 47000 42750 47000 350 -1
+De 15 1 48 0 0
+Po 0 45406 45756 45100 45450 160 -1
De 15 0 48 0 0
-Po 0 47200 36200 46659 35659 80 -1
-De 15 0 48 0 400800
-Po 0 43741 35659 43200 36200 80 -1
-De 15 0 48 0 800400
-Po 0 31800 42800 31800 42532 80 -1
-De 15 0 49 0 400800
-Po 0 32250 42350 32250 41837 80 -1
-De 15 0 49 0 0
-Po 0 32850 40700 32850 41237 80 -1
-De 15 0 49 0 400800
-Po 0 32067 44489 32067 43335 80 -1
-De 15 0 49 0 400800
-Po 0 31800 42532 32068 42532 80 -1
-De 15 0 49 0 0
-Po 0 32068 42532 32250 42350 80 -1
-De 15 0 49 0 0
-Po 0 31800 42800 31800 43068 80 -1
+Po 0 45050 45500 44250 45500 160 -1
+De 0 0 48 0 0
+Po 0 45100 45450 45050 45500 160 -1
+De 0 0 48 0 0
+Po 0 45833 45756 45406 45756 160 -1
+De 15 0 48 0 400000
+Po 0 44250 45500 42750 47000 160 -1
+De 0 0 48 0 0
+Po 3 45100 45450 45100 45450 350 -1
+De 15 1 48 0 0
+Po 0 38750 38950 38750 40950 98 -1
+De 0 0 49 0 400000
+Po 0 38750 40950 37191 42509 98 -1
+De 0 0 49 0 0
+Po 0 35524 42509 37191 42509 98 -1
+De 0 0 49 0 0
+Po 0 33246 44489 33246 43977 80 -1
De 15 0 49 0 400800
-Po 0 32067 43335 31800 43068 80 -1
+Po 0 33246 43977 34714 42509 80 -1
De 15 0 49 0 0
-Po 0 32250 41837 32850 41237 80 -1
+Po 3 35524 42509 35524 42509 350 -1
+De 15 1 49 0 0
+Po 0 34714 42509 35524 42509 80 -1
De 15 0 49 0 0
-Po 0 25050 44700 25318 44700 80 -1
-De 15 0 50 0 400800
-Po 0 31674 43974 31450 43850 80 -1
+Po 0 31870 43770 31600 43500 80 -1
De 15 0 50 0 0
-Po 0 31674 44489 31674 43974 80 -1
-De 15 0 50 0 400000
-Po 0 25050 45132 25154 45132 80 -1
+Po 0 29150 40700 29150 42200 80 -1
+De 15 0 50 0 C00000
+Po 0 31600 43500 31350 43500 80 -1
De 15 0 50 0 0
-Po 3 27997 45069 27997 45069 350 -1
-De 15 1 50 0 0
-Po 0 28131 45069 27997 45069 80 -1
-De 0 0 50 0 0
-Po 0 25318 44968 25318 44700 80 -1
+Po 0 31350 43500 31050 43800 80 -1
De 15 0 50 0 0
-Po 0 31450 43850 29500 43850 80 -1
-De 0 0 50 0 0
-Po 3 31450 43850 31450 43850 350 -1
-De 15 1 50 0 0
-Po 0 29500 43850 28131 45069 80 -1
-De 0 0 50 0 0
-Po 0 25050 45500 25050 45132 80 -1
-De 15 0 50 0 400800
-Po 0 27997 45069 25419 45069 80 -1
+Po 0 31050 43800 30450 43800 80 -1
De 15 0 50 0 0
-Po 0 25419 45069 25318 44968 80 -1
+Po 0 29700 42750 29150 42200 80 -1
+De 15 0 50 0 800000
+Po 0 29700 43050 29700 42750 80 -1
De 15 0 50 0 0
-Po 0 25154 45132 25318 44968 80 -1
+Po 0 31870 44489 31870 43770 80 -1
+De 15 0 50 0 400000
+Po 0 30450 43800 29700 43050 80 -1
De 15 0 50 0 0
-Po 0 31870 43770 31600 43500 80 -1
-De 15 0 51 0 0
-Po 0 29150 40700 29150 42200 80 -1
-De 15 0 51 0 C00000
-Po 0 31600 43500 31350 43500 80 -1
+Po 0 31800 42800 31800 42532 80 -1
+De 15 0 51 0 400800
+Po 0 32250 42350 32250 41837 80 -1
De 15 0 51 0 0
-Po 0 31350 43500 31050 43800 80 -1
+Po 0 32850 40700 32850 41237 80 -1
+De 15 0 51 0 400800
+Po 0 32067 44489 32067 43335 80 -1
+De 15 0 51 0 400800
+Po 0 31800 42532 32068 42532 80 -1
De 15 0 51 0 0
-Po 0 31050 43800 30450 43800 80 -1
+Po 0 32068 42532 32250 42350 80 -1
De 15 0 51 0 0
-Po 0 29700 42750 29150 42200 80 -1
-De 15 0 51 0 800000
-Po 0 29700 43050 29700 42750 80 -1
+Po 0 31800 42800 31800 43068 80 -1
+De 15 0 51 0 400800
+Po 0 32067 43335 31800 43068 80 -1
De 15 0 51 0 0
-Po 0 31870 44489 31870 43770 80 -1
-De 15 0 51 0 400000
-Po 0 30450 43800 29700 43050 80 -1
+Po 0 32250 41837 32850 41237 80 -1
De 15 0 51 0 0
Po 0 27700 38350 27700 37200 80 -1
De 15 0 52 0 C00C00
@@ -6128,64 +6148,82 @@ Po 0 31450 54150 30813 54150 80 -1
De 15 0 55 0 400000
Po 0 30813 54150 30663 54300 80 -1
De 15 0 55 0 800000
+Po 0 46659 35659 43741 35659 80 -1
+De 15 0 56 0 0
+Po 0 47200 36200 46659 35659 80 -1
+De 15 0 56 0 400800
+Po 0 43741 35659 43200 36200 80 -1
+De 15 0 56 0 800400
+Po 0 22900 39100 23200 39100 80 -1
+De 15 0 57 0 400000
+Po 0 29140 43272 28212 43272 80 -1
+De 15 0 57 0 0
+Po 0 31082 45214 29140 43272 80 -1
+De 15 0 57 0 0
+Po 0 24640 39700 25035 40095 80 -1
+De 15 0 57 0 0
+Po 0 28212 43272 25035 40095 80 -1
+De 15 0 57 0 0
+Po 0 31082 46308 30639 46308 80 -1
+De 15 0 57 0 800800
+Po 0 23200 39100 23800 39700 80 -1
+De 15 0 57 0 0
+Po 0 24000 39700 24640 39700 80 -1
+De 15 0 57 0 400000
+Po 0 23800 39700 24000 39700 80 -1
+De 15 0 57 0 800000
+Po 0 31082 46308 31082 45214 80 -1
+De 15 0 57 0 0
Po 0 40850 52075 41436 52075 394 -1
-De 15 0 56 0 400000
+De 15 0 58 0 400000
Po 0 41436 52075 42461 53100 394 -1
-De 15 0 56 0 800000
+De 15 0 58 0 800000
Po 0 40174 52088 40837 52088 320 -1
-De 15 0 56 0 400000
+De 15 0 58 0 400000
Po 0 40837 52088 40850 52075 320 -1
-De 15 0 56 0 800000
+De 15 0 58 0 800000
Po 0 40174 52088 39800 52088 320 -1
-De 15 0 56 0 C00000
+De 15 0 58 0 C00000
Po 0 40174 52088 40174 52088 320 -1
-De 15 0 56 0 C00000
+De 15 0 58 0 C00000
Po 0 42461 54950 42461 53100 320 -1
-De 15 0 56 0 C00000
-Po 0 40750 47300 40750 47350 80 -1
-De 15 0 57 0 400800
-Po 0 40750 47350 41550 48150 80 -1
-De 15 0 57 0 0
-Po 0 41550 48150 41800 48150 80 -1
-De 15 0 57 0 800400
-Po 0 41800 49750 42365 50315 80 -1
-De 15 0 57 0 0
-Po 0 42365 50315 44764 50315 80 -1
-De 15 0 57 0 800400
-Po 0 41800 48150 41800 49750 80 -1
-De 15 0 57 0 400800
+De 15 0 58 0 C00000
Po 0 39643 50850 39643 50061 80 -1
-De 15 0 58 0 0
+De 15 0 59 0 0
Po 0 39450 49500 39450 49868 80 -1
-De 15 0 58 0 400800
+De 15 0 59 0 400800
Po 0 39400 50850 39643 50850 80 -1
-De 15 0 58 0 400800
+De 15 0 59 0 400800
Po 0 39643 50061 39450 49868 80 -1
-De 15 0 58 0 0
-Po 0 44764 50630 43745 50630 197 -1
-De 15 0 59 0 400000
-Po 0 43745 50630 43500 50875 197 -1
-De 15 0 59 0 800000
-Po 0 27819 43763 28635 43763 197 -1
-De 15 0 60 0 0
-Po 0 30639 45324 30196 45324 98 -1
-De 15 0 60 0 400800
-Po 0 27551 43763 27819 43763 197 -1
+De 15 0 59 0 0
+Po 0 25050 44700 25318 44700 80 -1
De 15 0 60 0 400800
-Po 0 28635 43763 30196 45324 197 -1
+Po 0 31674 43974 31450 43850 80 -1
De 15 0 60 0 0
-Po 0 27551 43763 27551 43763 80 -1
-De 15 0 60 0 C00800
-Po 0 25870 43753 26188 43753 197 -1
+Po 0 31674 44489 31674 43974 80 -1
+De 15 0 60 0 400000
+Po 0 25050 45132 25154 45132 80 -1
+De 15 0 60 0 0
+Po 3 27997 45069 27997 45069 350 -1
+De 15 1 60 0 0
+Po 0 28131 45069 27997 45069 80 -1
+De 0 0 60 0 0
+Po 0 25318 44968 25318 44700 80 -1
+De 15 0 60 0 0
+Po 0 31450 43850 29500 43850 80 -1
+De 0 0 60 0 0
+Po 3 31450 43850 31450 43850 350 -1
+De 15 1 60 0 0
+Po 0 29500 43850 28131 45069 80 -1
+De 0 0 60 0 0
+Po 0 25050 45500 25050 45132 80 -1
De 15 0 60 0 400800
-Po 0 26188 43753 26647 43294 197 -1
+Po 0 27997 45069 25419 45069 80 -1
De 15 0 60 0 0
-Po 0 26647 43294 27082 43294 197 -1
+Po 0 25419 45069 25318 44968 80 -1
De 15 0 60 0 0
-Po 0 27082 43294 27283 43495 197 -1
+Po 0 25154 45132 25318 44968 80 -1
De 15 0 60 0 0
-Po 0 27283 43495 27551 43763 197 -1
-De 15 0 60 0 800000
$EndTRACK
$ZONE
$EndZONE
@@ -6835,56 +6873,58 @@ $POLYSCORNERS
42088 36750 0 0
42150 36688 0 0
42150 38820 0 0
-41990 38660 0 0
-41857 38571 0 0
-41700 38540 0 0
-41316 38540 0 0
-41261 38485 0 0
-41059 38401 0 0
-40841 38401 0 0
-40639 38485 0 0
-40499 38625 0 0
-40499 38601 0 0
-40461 38509 0 0
-40391 38439 0 0
-40300 38401 0 0
-40201 38401 0 0
-39601 38401 0 0
-39509 38439 0 0
-39439 38509 0 0
-39401 38600 0 0
-39401 38625 0 0
-39261 38485 0 0
-39059 38401 0 0
-38841 38401 0 0
-38639 38485 0 0
-38499 38625 0 0
-38499 38601 0 0
-38461 38509 0 0
-38391 38439 0 0
-38300 38401 0 0
-38201 38401 0 0
-37601 38401 0 0
-37509 38439 0 0
-37439 38509 0 0
-37401 38600 0 0
-37401 38699 0 0
-37401 39299 0 0
-37439 39391 0 0
-37509 39461 0 0
-37600 39499 0 0
-37699 39499 0 0
-37719 39499 0 0
-38260 40040 0 0
-38393 40129 0 0
-38550 40160 0 0
-40500 40160 0 0
-40657 40129 0 0
-40790 40040 0 0
-41240 39590 0 0
-41329 39457 0 0
-41348 39360 0 0
-41530 39360 0 0
+42113 38783 0 0
+42113 38779 0 0
+42016 38634 0 0
+41871 38537 0 0
+41700 38503 0 0
+41079 38503 0 0
+41061 38485 0 0
+40859 38401 0 0
+40641 38401 0 0
+40439 38485 0 0
+40299 38625 0 0
+40299 38601 0 0
+40261 38509 0 0
+40191 38439 0 0
+40100 38401 0 0
+40001 38401 0 0
+39401 38401 0 0
+39309 38439 0 0
+39239 38509 0 0
+39201 38600 0 0
+39201 38625 0 0
+39061 38485 0 0
+38859 38401 0 0
+38641 38401 0 0
+38439 38485 0 0
+38299 38625 0 0
+38299 38601 0 0
+38261 38509 0 0
+38191 38439 0 0
+38100 38401 0 0
+38001 38401 0 0
+37401 38401 0 0
+37309 38439 0 0
+37239 38509 0 0
+37201 38600 0 0
+37201 38699 0 0
+37201 39299 0 0
+37239 39391 0 0
+37309 39461 0 0
+37400 39499 0 0
+37499 39499 0 0
+37519 39499 0 0
+38060 40040 0 0
+38193 40129 0 0
+38350 40160 0 0
+40300 40160 0 0
+40457 40129 0 0
+40590 40040 0 0
+41040 39590 0 0
+41129 39457 0 0
+41140 39397 0 0
+41567 39397 0 0
41590 39420 0 0
41590 40311 0 0
41041 40311 0 0
@@ -8507,6 +8547,34 @@ $POLYSCORNERS
21326 39274 0 0
21364 39366 0 0
21368 39370 0 0
+20525 39370 0 0
+20525 39300 0 0
+20513 39300 0 0
+20525 39288 0 0
+20524 39226 0 0
+20486 39134 0 0
+20416 39064 0 0
+20325 39026 0 0
+20226 39026 0 0
+20162 39025 0 0
+20100 39087 0 0
+20100 39300 0 0
+20100 39350 0 0
+20100 39370 0 0
+20000 39370 0 0
+20000 39350 0 0
+20000 39300 0 0
+20000 39087 0 0
+19938 39025 0 0
+19874 39026 0 0
+19775 39026 0 0
+19684 39064 0 0
+19614 39134 0 0
+19576 39226 0 0
+19575 39288 0 0
+19587 39300 0 0
+19575 39300 0 0
+19575 39370 0 0
18800 39370 0 0
18674 39395 0 0
18638 39419 0 0
@@ -9952,11 +10020,11 @@ $FILLSEGMENTS
22140 38440 24422 38440
25002 38440 26298 38440
33174 38440 34530 38440
-35350 38440 37508 38440
-38392 38440 38747 38440
-39152 38440 39508 38440
-40392 38440 40747 38440
-41152 38440 42150 38440
+35350 38440 37308 38440
+38192 38440 38547 38440
+38952 38440 39308 38440
+40192 38440 40547 38440
+40952 38440 42150 38440
42150 38440 42303 38440
46070 38440 46121 38440
46793 38440 46893 38440
@@ -9967,11 +10035,11 @@ $FILLSEGMENTS
22140 38520 24422 38520
25002 38520 26314 38520
33174 38520 34610 38520
-35430 38520 37434 38520
-38465 38520 38604 38520
-39296 38520 39434 38520
-40465 38520 40604 38520
-41296 38520 42150 38520
+35430 38520 37234 38520
+38265 38520 38404 38520
+39096 38520 39234 38520
+40265 38520 40404 38520
+41785 38520 42150 38520
42150 38520 42303 38520
46070 38520 46121 38520
46793 38520 46893 38520
@@ -9982,11 +10050,11 @@ $FILLSEGMENTS
22140 38600 24422 38600
25002 38600 26350 38600
33143 38600 34690 38600
-35510 38600 37401 38600
-38498 38600 38524 38600
-39376 38600 39401 38600
-40498 38600 40524 38600
-41900 38600 42150 38600
+35510 38600 37201 38600
+38298 38600 38324 38600
+39176 38600 39201 38600
+40298 38600 40324 38600
+41965 38600 42150 38600
42150 38600 42303 38600
46070 38600 46121 38600
46793 38600 46893 38600
@@ -9997,8 +10065,8 @@ $FILLSEGMENTS
22140 38680 24422 38680
25002 38680 26404 38680
33132 38680 34770 38680
-35590 38680 37401 38680
-42010 38680 42150 38680
+35590 38680 37201 38680
+42046 38680 42150 38680
42150 38680 42303 38680
46070 38680 46121 38680
46793 38680 46893 38680
@@ -10013,8 +10081,8 @@ $FILLSEGMENTS
24356 38760 24422 38760
25002 38760 26481 38760
33167 38760 34850 38760
-35670 38760 37401 38760
-42090 38760 42150 38760
+35670 38760 37201 38760
+42100 38760 42150 38760
42150 38760 42303 38760
46070 38760 46182 38760
46793 38760 46893 38760
@@ -10029,7 +10097,7 @@ $FILLSEGMENTS
23950 38840 24050 38840
25002 38840 26561 38840
33174 38840 34930 38840
-35750 38840 37401 38840
+35750 38840 37201 38840
42170 38840 42303 38840
46070 38840 46793 38840
46793 38840 47565 38840
@@ -10043,7 +10111,7 @@ $FILLSEGMENTS
23950 38920 24050 38920
25002 38920 26641 38920
33174 38920 35010 38920
-35830 38920 37401 38920
+35830 38920 37201 38920
42250 38920 42303 38920
46070 38920 46124 38920
46793 38920 46893 38920
@@ -10059,54 +10127,62 @@ $FILLSEGMENTS
23950 39000 24050 39000
25002 39000 26721 39000
33174 39000 35090 39000
-35910 39000 37401 39000
+35910 39000 37201 39000
46070 39000 46122 39000
46793 39000 46893 39000
47565 39000 47565 39000
47565 39000 47749 39000
47749 39000 47960 39000
14740 39080 16840 39080
-16840 39080 21750 39080
+16840 39080 19668 39080
+19993 39080 20107 39080
+20432 39080 21750 39080
21750 39080 22275 39080
22275 39080 22426 39080
23950 39080 24050 39080
25002 39080 26801 39080
33174 39080 35170 39080
-35990 39080 37401 39080
+35990 39080 37201 39080
46070 39080 46122 39080
46793 39080 46893 39080
47565 39080 47565 39080
47565 39080 47749 39080
47749 39080 47960 39080
14740 39160 16840 39160
-16840 39160 21377 39160
+16840 39160 19603 39160
+20000 39160 20100 39160
+20496 39160 21377 39160
22223 39160 22275 39160
22275 39160 22426 39160
25002 39160 26881 39160
33160 39160 35250 39160
-36070 39160 37401 39160
+36070 39160 37201 39160
46070 39160 46122 39160
46793 39160 46893 39160
47565 39160 47565 39160
47565 39160 47749 39160
47749 39160 47960 39160
14740 39240 16840 39240
-16840 39240 21326 39240
+16840 39240 19575 39240
+20000 39240 20100 39240
+20524 39240 21326 39240
22275 39240 22426 39240
25002 39240 26960 39240
33112 39240 35330 39240
-36150 39240 37401 39240
+36150 39240 37201 39240
46070 39240 46122 39240
46793 39240 46893 39240
47565 39240 47565 39240
47565 39240 47749 39240
47749 39240 47960 39240
14740 39320 16840 39320
-16840 39320 21345 39320
+16840 39320 19575 39320
+20000 39320 20100 39320
+20525 39320 21345 39320
22255 39320 22445 39320
25032 39320 27080 39320
32984 39320 35410 39320
-36230 39320 37410 39320
+36230 39320 37210 39320
46070 39320 46122 39320
46793 39320 46893 39320
47565 39320 47565 39320
@@ -10115,8 +10191,8 @@ $FILLSEGMENTS
14740 39400 16840 39400
16840 39400 18666 39400
25112 39400 35490 39400
-36310 39400 37448 39400
-41341 39400 41570 39400
+36310 39400 37248 39400
+41140 39400 41570 39400
46070 39400 46122 39400
46793 39400 46893 39400
47564 39400 47565 39400
@@ -10125,8 +10201,8 @@ $FILLSEGMENTS
14740 39480 16840 39480
16840 39480 18553 39480
25192 39480 35570 39480
-36390 39480 37555 39480
-41314 39480 41590 39480
+36390 39480 37355 39480
+41114 39480 41590 39480
46070 39480 46139 39480
46793 39480 46893 39480
47548 39480 47565 39480
@@ -10135,8 +10211,8 @@ $FILLSEGMENTS
14740 39560 16840 39560
16840 39560 18473 39560
25272 39560 35650 39560
-36470 39560 37780 39560
-41261 39560 41590 39560
+36470 39560 37580 39560
+41061 39560 41590 39560
46070 39560 46188 39560
46793 39560 46893 39560
47498 39560 47565 39560
@@ -10145,8 +10221,8 @@ $FILLSEGMENTS
14740 39640 16840 39640
16840 39640 18393 39640
25352 39640 35730 39640
-36550 39640 37860 39640
-41190 39640 41590 39640
+36550 39640 37660 39640
+40990 39640 41590 39640
46070 39640 46322 39640
46732 39640 46793 39640
46793 39640 46954 39640
@@ -10156,8 +10232,8 @@ $FILLSEGMENTS
14740 39720 16840 39720
16840 39720 18313 39720
25432 39720 35810 39720
-36630 39720 37940 39720
-41110 39720 41590 39720
+36630 39720 37740 39720
+40910 39720 41590 39720
46070 39720 46083 39720
46579 39720 46793 39720
46793 39720 47565 39720
@@ -10166,8 +10242,8 @@ $FILLSEGMENTS
14740 39800 16840 39800
16840 39800 18233 39800
25512 39800 35890 39800
-36710 39800 38020 39800
-41030 39800 41590 39800
+36710 39800 37820 39800
+40830 39800 41590 39800
46661 39800 46793 39800
46793 39800 47565 39800
47565 39800 47749 39800
@@ -10175,8 +10251,8 @@ $FILLSEGMENTS
14740 39880 16840 39880
16840 39880 18153 39880
25592 39880 35970 39880
-36790 39880 38100 39880
-40950 39880 41590 39880
+36790 39880 37900 39880
+40750 39880 41590 39880
46722 39880 46793 39880
46793 39880 47565 39880
47565 39880 47749 39880
@@ -10184,8 +10260,8 @@ $FILLSEGMENTS
14740 39960 16840 39960
16840 39960 18073 39960
25672 39960 36050 39960
-36870 39960 38180 39960
-40870 39960 41590 39960
+36870 39960 37980 39960
+40670 39960 41590 39960
46755 39960 46793 39960
46793 39960 47565 39960
47565 39960 47749 39960
@@ -10193,8 +10269,8 @@ $FILLSEGMENTS
14740 40040 16840 40040
16840 40040 17993 40040
25752 40040 36130 40040
-36950 40040 38260 40040
-40790 40040 41590 40040
+36950 40040 38060 40040
+40590 40040 41590 40040
46777 40040 46793 40040
46793 40040 47565 40040
47565 40040 47749 40040
@@ -10204,8 +10280,8 @@ $FILLSEGMENTS
25832 40120 27903 40120
30397 40120 31603 40120
34097 40120 36210 40120
-37030 40120 38380 40120
-40671 40120 41590 40120
+37030 40120 38180 40120
+40471 40120 41590 40120
46777 40120 46793 40120
46793 40120 47565 40120
47565 40120 47749 40120
@@ -12256,7 +12332,7 @@ $POLYSCORNERS
34433 44260 0 0
34553 44140 0 0
34563 44113 1 0
-38651 40626 0 0
+38451 40826 0 0
37067 42210 0 0
35826 42210 0 0
35765 42149 0 0
@@ -12266,23 +12342,24 @@ $POLYSCORNERS
35164 42268 0 0
35147 42308 0 0
35152 38982 0 0
-35410 39240 0 0
-35543 39329 0 0
-35700 39360 0 0
-37426 39360 0 0
-37439 39391 0 0
-37509 39461 0 0
-37600 39499 0 0
-37699 39499 0 0
-38299 39499 0 0
-38391 39461 0 0
-38461 39391 0 0
-38499 39300 0 0
-38499 39275 0 0
-38639 39415 0 0
-38651 39419 0 0
-38651 40626 1 0
-39651 43176 0 0
+35286 39116 0 0
+35287 39121 0 0
+35384 39266 0 0
+35529 39363 0 0
+35700 39397 0 0
+37245 39397 0 0
+37309 39461 0 0
+37400 39499 0 0
+37499 39499 0 0
+38099 39499 0 0
+38191 39461 0 0
+38261 39391 0 0
+38299 39300 0 0
+38299 39275 0 0
+38439 39415 0 0
+38451 39419 0 0
+38451 40826 1 0
+39451 43377 0 0
37006 45821 0 0
36961 45710 0 0
36841 45590 0 0
@@ -12311,22 +12388,22 @@ $POLYSCORNERS
37305 42785 0 0
37306 42785 0 0
37402 42720 0 0
-39161 40962 0 0
-39161 40961 0 0
-39203 40897 0 0
-39225 40865 0 0
-39226 40864 0 0
-39248 40750 0 0
-39249 40750 0 0
-39249 39419 0 0
-39261 39415 0 0
-39401 39275 0 0
-39401 39299 0 0
-39439 39391 0 0
-39509 39461 0 0
-39600 39499 0 0
-39651 39499 0 0
-39651 43176 1 0
+38961 41162 0 0
+38961 41161 0 0
+39003 41097 0 0
+39025 41065 0 0
+39026 41064 0 0
+39048 40951 0 0
+39049 40950 0 0
+39049 39419 0 0
+39061 39415 0 0
+39201 39275 0 0
+39201 39299 0 0
+39239 39391 0 0
+39309 39461 0 0
+39400 39499 0 0
+39451 39499 0 0
+39451 43377 1 0
47960 56010 0 0
47749 56010 0 0
47749 36309 0 0
@@ -12441,57 +12518,55 @@ $POLYSCORNERS
37010 46841 0 0
37075 46685 0 0
37075 46597 0 0
-40161 43512 0 0
-40161 43511 0 0
-40203 43447 0 0
-40225 43415 0 0
-40226 43414 0 0
-40248 43301 0 0
-40249 43300 0 0
-40249 39499 0 0
-40299 39499 0 0
-40391 39461 0 0
-40461 39391 0 0
-40499 39300 0 0
-40499 39275 0 0
-40639 39415 0 0
-40841 39499 0 0
-41059 39499 0 0
-41261 39415 0 0
-41415 39261 0 0
-41499 39059 0 0
-41499 38841 0 0
-41415 38639 0 0
-41261 38485 0 0
-41059 38401 0 0
-40841 38401 0 0
-40639 38485 0 0
-40499 38625 0 0
-40499 38601 0 0
-40461 38509 0 0
-40391 38439 0 0
-40300 38401 0 0
-40201 38401 0 0
-39601 38401 0 0
-39509 38439 0 0
-39439 38509 0 0
-39401 38600 0 0
-39401 38625 0 0
-39261 38485 0 0
-39059 38401 0 0
-38841 38401 0 0
-38639 38485 0 0
-38499 38625 0 0
-38499 38601 0 0
-38461 38509 0 0
-38391 38439 0 0
-38300 38401 0 0
-38201 38401 0 0
-37601 38401 0 0
-37509 38439 0 0
-37439 38509 0 0
-37426 38540 0 0
-35870 38540 0 0
+39961 43711 0 0
+40026 43615 0 0
+40026 43614 0 0
+40029 43595 0 0
+40048 43500 0 0
+40049 43500 0 0
+40049 39499 0 0
+40099 39499 0 0
+40191 39461 0 0
+40261 39391 0 0
+40299 39300 0 0
+40299 39275 0 0
+40439 39415 0 0
+40641 39499 0 0
+40859 39499 0 0
+41061 39415 0 0
+41215 39261 0 0
+41299 39059 0 0
+41299 38841 0 0
+41215 38639 0 0
+41061 38485 0 0
+40859 38401 0 0
+40641 38401 0 0
+40439 38485 0 0
+40299 38625 0 0
+40299 38601 0 0
+40261 38509 0 0
+40191 38439 0 0
+40100 38401 0 0
+40001 38401 0 0
+39401 38401 0 0
+39309 38439 0 0
+39239 38509 0 0
+39201 38600 0 0
+39201 38625 0 0
+39061 38485 0 0
+38859 38401 0 0
+38641 38401 0 0
+38439 38485 0 0
+38299 38625 0 0
+38299 38601 0 0
+38261 38509 0 0
+38191 38439 0 0
+38100 38401 0 0
+38001 38401 0 0
+37401 38401 0 0
+37309 38439 0 0
+37245 38503 0 0
+35833 38503 0 0
34999 37669 0 0
35011 37665 0 0
35165 37511 0 0
@@ -13391,31 +13466,31 @@ $FILLSEGMENTS
34507 45292 34561 45292
35152 38982 35152 38982
35152 39062 35232 39062
-35152 39142 35312 39142
-35152 39222 35392 39222
-35152 39302 35503 39302
-38499 39302 38526 39302
-35152 39382 37436 39382
-38465 39382 38606 39382
-35152 39462 37512 39462
-38389 39462 38651 39462
-35152 39542 38651 39542
-35152 39622 38651 39622
-35151 39702 38651 39702
-35151 39782 38651 39782
-35151 39862 38651 39862
-35151 39942 38651 39942
-35151 40022 38651 40022
-35151 40102 38651 40102
-35151 40182 38651 40182
-35151 40262 38651 40262
-35150 40342 38651 40342
-35150 40422 38651 40422
-35150 40502 38651 40502
-35150 40582 38651 40582
-35150 40662 38615 40662
-35150 40742 38535 40742
-35150 40822 38455 40822
+35152 39142 35302 39142
+35152 39222 35355 39222
+35152 39302 35438 39302
+38299 39302 38326 39302
+35152 39382 35625 39382
+38265 39382 38406 39382
+35152 39462 37312 39462
+38189 39462 38451 39462
+35152 39542 38451 39542
+35152 39622 38451 39622
+35151 39702 38451 39702
+35151 39782 38451 39782
+35151 39862 38451 39862
+35151 39942 38451 39942
+35151 40022 38451 40022
+35151 40102 38451 40102
+35151 40182 38451 40182
+35151 40262 38451 40262
+35150 40342 38451 40342
+35150 40422 38451 40422
+35150 40502 38451 40502
+35150 40582 38451 40582
+35150 40662 38451 40662
+35150 40742 38451 40742
+35150 40822 38451 40822
35150 40902 38375 40902
35149 40982 38295 40982
35149 41062 38215 41062
@@ -13436,61 +13511,61 @@ $FILLSEGMENTS
35148 42182 35250 42182
35798 42182 37095 42182
35148 42262 35170 42262
-39401 39275 39401 39275
-39321 39355 39425 39355
-39249 39435 39483 39435
-39249 39515 39651 39515
-39249 39595 39651 39595
-39249 39675 39651 39675
-39249 39755 39651 39755
-39249 39835 39651 39835
-39249 39915 39651 39915
-39249 39995 39651 39995
-39249 40075 39651 40075
-39249 40155 39651 40155
-39249 40235 39651 40235
-39249 40315 39651 40315
-39249 40395 39651 40395
-39249 40475 39651 40475
-39249 40555 39651 40555
-39249 40635 39651 40635
-39249 40715 39651 40715
-39240 40795 39651 40795
-39219 40875 39651 40875
-39165 40955 39651 40955
-39088 41035 39651 41035
-39008 41115 39651 41115
-38928 41195 39651 41195
-38848 41275 39651 41275
-38768 41355 39651 41355
-38688 41435 39651 41435
-38608 41515 39651 41515
-38528 41595 39651 41595
-38448 41675 39651 41675
-38368 41755 39651 41755
-38288 41835 39651 41835
-38208 41915 39651 41915
-38128 41995 39651 41995
-38048 42075 39651 42075
-37968 42155 39651 42155
-37888 42235 39651 42235
-37808 42315 39651 42315
-37728 42395 39651 42395
-37648 42475 39651 42475
-37568 42555 39651 42555
-37488 42635 39651 42635
+39201 39275 39201 39275
+39121 39355 39225 39355
+39049 39435 39283 39435
+39049 39515 39451 39515
+39049 39595 39451 39595
+39049 39675 39451 39675
+39049 39755 39451 39755
+39049 39835 39451 39835
+39049 39915 39451 39915
+39049 39995 39451 39995
+39049 40075 39451 40075
+39049 40155 39451 40155
+39049 40235 39451 40235
+39049 40315 39451 40315
+39049 40395 39451 40395
+39049 40475 39451 40475
+39049 40555 39451 40555
+39049 40635 39451 40635
+39049 40715 39451 40715
+39049 40795 39451 40795
+39049 40875 39451 40875
+39048 40955 39451 40955
+39032 41035 39451 41035
+38992 41115 39451 41115
+38928 41195 39451 41195
+38848 41275 39451 41275
+38768 41355 39451 41355
+38688 41435 39451 41435
+38608 41515 39451 41515
+38528 41595 39451 41595
+38448 41675 39451 41675
+38368 41755 39451 41755
+38288 41835 39451 41835
+38208 41915 39451 41915
+38128 41995 39451 41995
+38048 42075 39451 42075
+37968 42155 39451 42155
+37888 42235 39451 42235
+37808 42315 39451 42315
+37728 42395 39451 42395
+37648 42475 39451 42475
+37568 42555 39451 42555
+37488 42635 39451 42635
35146 42715 35149 42715
-37408 42715 39651 42715
+37408 42715 39451 42715
35146 42795 35209 42795
-37251 42795 39651 42795
+37251 42795 39451 42795
35146 42875 35298 42875
-35752 42875 39651 42875
-35146 42955 39651 42955
-35146 43035 39651 43035
-35146 43115 39651 43115
-35146 43195 39632 43195
-35146 43275 39552 43275
-35145 43355 39472 43355
+35752 42875 39451 42875
+35146 42955 39451 42955
+35146 43035 39451 43035
+35146 43115 39451 43115
+35146 43195 39451 43195
+35146 43275 39451 43275
+35145 43355 39451 43355
35145 43435 39392 43435
35145 43515 39312 43515
35145 43595 39232 43595
@@ -13890,220 +13965,219 @@ $FILLSEGMENTS
46490 38360 47749 38360
47749 38360 47960 38360
14740 38440 29530 38440
-35770 38440 37508 38440
-38392 38440 38747 38440
-39152 38440 39508 38440
-40392 38440 40747 38440
-41152 38440 42150 38440
+35770 38440 37308 38440
+38192 38440 38547 38440
+38952 38440 39308 38440
+40192 38440 40547 38440
+40952 38440 42150 38440
42150 38440 44910 38440
46490 38440 47749 38440
47749 38440 47960 38440
14740 38520 29610 38520
-35850 38520 37434 38520
-38465 38520 38604 38520
-39296 38520 39434 38520
-40465 38520 40604 38520
-41296 38520 42150 38520
+38265 38520 38404 38520
+39096 38520 39234 38520
+40265 38520 40404 38520
+41096 38520 42150 38520
42150 38520 44910 38520
46490 38520 47749 38520
47749 38520 47960 38520
14740 38600 29690 38600
-38498 38600 38524 38600
-39376 38600 39401 38600
-40498 38600 40524 38600
-41376 38600 42150 38600
+38298 38600 38324 38600
+39176 38600 39201 38600
+40298 38600 40324 38600
+41176 38600 42150 38600
42150 38600 44910 38600
46490 38600 47749 38600
47749 38600 47960 38600
14740 38680 29770 38680
-41432 38680 42150 38680
+41232 38680 42150 38680
42150 38680 44910 38680
46490 38680 47749 38680
47749 38680 47960 38680
14740 38760 29850 38760
-41465 38760 42150 38760
+41265 38760 42150 38760
42150 38760 44910 38760
46482 38760 47749 38760
47749 38760 47960 38760
14740 38840 29930 38840
-41498 38840 42150 38840
+41298 38840 42150 38840
42150 38840 44910 38840
46463 38840 47749 38840
47749 38840 47960 38840
14740 38920 30010 38920
-41499 38920 42150 38920
+41299 38920 42150 38920
42150 38920 44910 38920
46410 38920 47749 38920
47749 38920 47960 38920
14740 39000 30090 39000
-41499 39000 42150 39000
+41299 39000 42150 39000
42150 39000 44910 39000
46332 39000 47749 39000
47749 39000 47960 39000
14740 39080 30170 39080
-41491 39080 42150 39080
+41291 39080 42150 39080
42150 39080 44910 39080
46252 39080 47749 39080
47749 39080 47960 39080
14740 39160 30250 39160
-41457 39160 42150 39160
+41257 39160 42150 39160
42150 39160 44910 39160
46172 39160 47749 39160
47749 39160 47960 39160
14740 39240 30330 39240
-41424 39240 42150 39240
+41224 39240 42150 39240
42150 39240 44910 39240
46092 39240 47749 39240
47749 39240 47960 39240
14740 39320 30410 39320
-40491 39320 40544 39320
-41356 39320 42150 39320
+40291 39320 40344 39320
+41156 39320 42150 39320
42150 39320 44859 39320
46012 39320 47749 39320
47749 39320 47960 39320
14740 39400 30490 39400
-40452 39400 40624 39400
-41276 39400 42150 39400
+40252 39400 40424 39400
+41076 39400 42150 39400
42150 39400 44779 39400
45932 39400 47749 39400
47749 39400 47960 39400
14740 39480 30570 39480
-40345 39480 40796 39480
-41105 39480 42150 39480
+40145 39480 40596 39480
+40905 39480 42150 39480
42150 39480 44699 39480
45852 39480 47749 39480
47749 39480 47960 39480
14740 39560 30650 39560
-40249 39560 42150 39560
+40049 39560 42150 39560
42150 39560 44619 39560
45772 39560 47749 39560
47749 39560 47960 39560
14740 39640 30730 39640
-40249 39640 42150 39640
+40049 39640 42150 39640
42150 39640 44539 39640
45692 39640 47749 39640
47749 39640 47960 39640
14740 39720 30810 39720
-40249 39720 42150 39720
+40049 39720 42150 39720
42150 39720 43721 39720
44217 39720 44459 39720
45612 39720 46083 39720
46579 39720 47749 39720
47749 39720 47960 39720
14740 39800 30890 39800
-40249 39800 42150 39800
+40049 39800 42150 39800
42150 39800 43638 39800
44299 39800 44379 39800
45532 39800 46000 39800
46661 39800 47749 39800
47749 39800 47960 39800
14740 39880 30970 39880
-40249 39880 42150 39880
+40049 39880 42150 39880
42150 39880 43577 39880
45452 39880 45939 39880
46722 39880 47749 39880
47749 39880 47960 39880
14740 39960 31050 39960
-40249 39960 42150 39960
+40049 39960 42150 39960
42150 39960 43544 39960
45372 39960 45906 39960
46755 39960 47749 39960
47749 39960 47960 39960
14740 40040 31130 40040
-40249 40040 42150 40040
+40049 40040 42150 40040
42150 40040 43523 40040
45292 40040 45885 40040
46777 40040 47749 40040
47749 40040 47960 40040
14740 40120 31210 40120
-40249 40120 42150 40120
+40049 40120 42150 40120
42150 40120 43523 40120
45212 40120 45885 40120
46777 40120 47749 40120
47749 40120 47960 40120
14740 40200 31290 40200
-40249 40200 42150 40200
+40049 40200 42150 40200
42150 40200 43528 40200
45132 40200 45890 40200
46773 40200 46777 40200
46777 40200 47749 40200
47749 40200 47960 40200
14740 40280 31370 40280
-40249 40280 42150 40280
+40049 40280 42150 40280
42150 40280 43562 40280
45052 40280 45924 40280
46740 40280 46777 40280
46777 40280 47749 40280
47749 40280 47960 40280
14740 40360 31450 40360
-40249 40360 42150 40360
+40049 40360 42150 40360
42150 40360 43599 40360
44972 40360 45961 40360
46702 40360 46777 40360
46777 40360 47749 40360
47749 40360 47960 40360
14740 40440 31505 40440
-40249 40440 42150 40440
+40049 40440 42150 40440
42150 40440 43679 40440
44892 40440 46041 40440
46622 40440 46777 40440
46777 40440 47749 40440
47749 40440 47960 40440
14740 40520 31505 40520
-40249 40520 42150 40520
+40049 40520 42150 40520
42150 40520 43658 40520
44812 40520 46180 40520
46482 40520 46777 40520
46777 40520 47749 40520
47749 40520 47960 40520
14740 40600 31505 40600
-40249 40600 42150 40600
+40049 40600 42150 40600
42150 40600 43578 40600
44732 40600 46777 40600
46777 40600 47749 40600
47749 40600 47960 40600
14740 40680 31505 40680
-40249 40680 42150 40680
+40049 40680 42150 40680
42150 40680 43498 40680
44652 40680 46777 40680
46777 40680 47749 40680
47749 40680 47960 40680
14740 40760 31505 40760
-40249 40760 42150 40760
+40049 40760 42150 40760
42150 40760 43418 40760
44572 40760 46777 40760
46777 40760 47749 40760
47749 40760 47960 40760
14740 40840 31505 40840
-40249 40840 42150 40840
+40049 40840 42150 40840
42150 40840 43338 40840
44492 40840 46777 40840
46777 40840 47749 40840
47749 40840 47960 40840
14740 40920 19656 40920
20043 40920 31505 40920
-40249 40920 42150 40920
+40049 40920 42150 40920
42150 40920 43258 40920
44412 40920 46777 40920
46777 40920 47749 40920
47749 40920 47960 40920
14740 41000 19549 41000
20151 41000 31505 41000
-40249 41000 42150 41000
+40049 41000 42150 41000
42150 41000 43178 41000
44332 41000 46777 41000
46777 41000 47749 41000
47749 41000 47960 41000
14740 41080 19481 41080
20219 41080 31505 41080
-40249 41080 42150 41080
+40049 41080 42150 41080
42150 41080 43098 41080
44252 41080 46777 41080
46777 41080 47749 41080
47749 41080 47960 41080
14740 41160 19447 41160
20252 41160 31505 41160
-40249 41160 42150 41160
+40049 41160 42150 41160
42150 41160 43018 41160
44172 41160 46777 41160
46777 41160 47749 41160
@@ -14111,7 +14185,7 @@ $FILLSEGMENTS
14740 41240 19425 41240
20275 41240 23656 41240
24125 41240 31505 41240
-40249 41240 42150 41240
+40049 41240 42150 41240
42150 41240 42938 41240
44092 41240 46777 41240
46777 41240 47749 41240
@@ -14119,7 +14193,7 @@ $FILLSEGMENTS
14740 41320 19425 41320
20275 41320 23574 41320
24210 41320 31505 41320
-40249 41320 42150 41320
+40049 41320 42150 41320
42150 41320 42858 41320
44012 41320 46777 41320
46777 41320 47749 41320
@@ -14127,7 +14201,7 @@ $FILLSEGMENTS
14740 41400 19432 41400
20269 41400 23516 41400
24268 41400 31505 41400
-40249 41400 42150 41400
+40049 41400 42150 41400
42150 41400 42778 41400
43932 41400 46777 41400
46777 41400 47749 41400
@@ -14136,7 +14210,7 @@ $FILLSEGMENTS
18097 41480 19465 41480
20236 41480 23482 41480
24301 41480 31505 41480
-40249 41480 42150 41480
+40049 41480 42150 41480
42150 41480 42698 41480
43852 41480 46777 41480
46777 41480 47749 41480
@@ -14145,194 +14219,194 @@ $FILLSEGMENTS
18261 41560 19509 41560
20191 41560 23467 41560
24317 41560 31505 41560
-40249 41560 42150 41560
+40049 41560 42150 41560
42150 41560 42618 41560
43772 41560 46777 41560
46777 41560 47749 41560
47749 41560 47960 41560
14740 41640 17659 41640
24339 41640 31505 41640
-40249 41640 42150 41640
+40049 41640 42150 41640
42150 41640 42538 41640
43692 41640 46777 41640
46777 41640 47749 41640
47749 41640 47960 41640
14740 41720 17614 41720
24419 41720 31505 41720
-40249 41720 42150 41720
+40049 41720 42150 41720
42150 41720 42458 41720
43612 41720 46777 41720
46777 41720 47749 41720
47749 41720 47960 41720
14740 41800 17581 41800
24499 41800 31505 41800
-40249 41800 42150 41800
+40049 41800 42150 41800
42150 41800 42378 41800
43532 41800 46777 41800
46777 41800 47749 41800
47749 41800 47960 41800
14740 41880 17575 41880
24579 41880 31505 41880
-40249 41880 42150 41880
+40049 41880 42150 41880
42150 41880 42298 41880
43452 41880 46777 41880
46777 41880 47749 41880
47749 41880 47960 41880
14740 41960 17575 41960
24659 41960 31505 41960
-40249 41960 42150 41960
+40049 41960 42150 41960
42150 41960 42218 41960
43372 41960 46777 41960
46777 41960 47749 41960
47749 41960 47960 41960
14740 42040 17598 42040
24739 42040 31505 42040
-40249 42040 42138 42040
+40049 42040 42138 42040
43292 42040 46777 42040
46777 42040 47749 42040
47749 42040 47960 42040
14740 42120 17631 42120
24819 42120 31505 42120
-40249 42120 42058 42120
+40049 42120 42058 42120
43212 42120 46777 42120
46777 42120 47749 42120
47749 42120 47960 42120
14740 42200 17699 42200
24899 42200 31505 42200
-40249 42200 41978 42200
+40049 42200 41978 42200
43132 42200 46777 42200
46777 42200 47749 42200
47749 42200 47960 42200
14740 42280 17807 42280
18990 42280 22391 42280
24979 42280 31505 42280
-40249 42280 41898 42280
+40049 42280 41898 42280
43052 42280 46777 42280
46777 42280 47749 42280
47749 42280 47960 42280
14740 42360 18250 42360
19070 42360 22404 42360
25059 42360 31505 42360
-40249 42360 41818 42360
+40049 42360 41818 42360
42972 42360 46777 42360
46777 42360 47749 42360
47749 42360 47960 42360
14740 42440 18330 42440
19150 42440 22437 42440
25139 42440 31505 42440
-40249 42440 41738 42440
+40049 42440 41738 42440
42892 42440 46777 42440
46777 42440 47749 42440
47749 42440 47960 42440
14740 42520 18410 42520
19230 42520 22490 42520
25219 42520 31505 42520
-40249 42520 41658 42520
+40049 42520 41658 42520
42812 42520 46777 42520
46777 42520 47749 42520
47749 42520 47960 42520
14740 42600 18490 42600
19310 42600 22570 42600
25299 42600 31505 42600
-40249 42600 41578 42600
+40049 42600 41578 42600
42732 42600 46777 42600
46777 42600 47749 42600
47749 42600 47960 42600
14740 42680 18570 42680
19390 42680 22836 42680
25379 42680 31505 42680
-40249 42680 41498 42680
+40049 42680 41498 42680
42652 42680 46777 42680
46777 42680 47749 42680
47749 42680 47960 42680
14740 42760 18650 42760
19470 42760 22836 42760
25459 42760 31505 42760
-40249 42760 41418 42760
+40049 42760 41418 42760
42572 42760 46777 42760
46777 42760 47749 42760
47749 42760 47960 42760
14740 42840 18730 42840
19550 42840 22867 42840
25539 42840 31505 42840
-40249 42840 41338 42840
+40049 42840 41338 42840
42492 42840 46777 42840
46777 42840 47749 42840
47749 42840 47960 42840
14740 42920 18810 42920
19630 42920 22900 42920
25619 42920 31505 42920
-40249 42920 41258 42920
+40049 42920 41258 42920
42412 42920 46777 42920
46777 42920 47749 42920
47749 42920 47960 42920
14740 43000 18890 43000
19710 43000 22979 43000
25699 43000 31505 43000
-40249 43000 41178 43000
+40049 43000 41178 43000
42332 43000 46777 43000
46777 43000 47749 43000
47749 43000 47960 43000
14740 43080 18970 43080
19790 43080 23114 43080
25779 43080 31505 43080
-40249 43080 41098 43080
+40049 43080 41098 43080
42252 43080 46777 43080
46777 43080 47749 43080
47749 43080 47960 43080
14740 43160 19050 43160
19870 43160 23377 43160
25859 43160 31505 43160
-40249 43160 41018 43160
+40049 43160 41018 43160
42172 43160 46777 43160
46777 43160 47749 43160
47749 43160 47960 43160
14740 43240 19130 43240
19950 43240 23396 43240
25939 43240 31505 43240
-40249 43240 40938 43240
+40049 43240 40938 43240
42092 43240 46777 43240
46777 43240 47749 43240
47749 43240 47960 43240
14740 43320 19210 43320
20030 43320 23429 43320
26019 43320 31505 43320
-40245 43320 40858 43320
+40049 43320 40858 43320
42012 43320 46777 43320
46777 43320 47749 43320
47749 43320 47960 43320
14740 43400 19290 43400
20245 43400 23491 43400
26099 43400 31505 43400
-40229 43400 40778 43400
+40049 43400 40778 43400
41932 43400 46777 43400
46777 43400 47749 43400
47749 43400 47960 43400
14740 43480 19370 43480
20381 43480 23585 43480
26179 43480 31231 43480
-40182 43480 40698 43480
+40049 43480 40698 43480
41852 43480 46777 43480
46777 43480 47749 43480
47749 43480 47960 43480
14740 43560 19450 43560
20461 43560 23784 43560
26259 43560 29500 43560
-40113 43560 40618 43560
+40036 43560 40618 43560
41772 43560 46777 43560
46777 43560 47749 43560
47749 43560 47960 43560
14740 43640 19530 43640
20493 43640 23864 43640
26339 43640 29299 43640
-40033 43640 40538 43640
+40010 43640 40538 43640
41692 43640 46777 43640
46777 43640 47749 43640
47749 43640 47960 43640
14740 43720 19610 43720
20525 43720 23944 43720
26419 43720 29209 43720
-39953 43720 40458 43720
+39952 43720 40458 43720
41612 43720 45756 43720
46143 43720 46777 43720
46777 43720 47749 43720
@@ -14340,7 +14414,7 @@ $FILLSEGMENTS
14740 43800 19675 43800
20525 43800 24024 43800
26499 43800 29119 43800
-39873 43800 40378 43800
+39872 43800 40378 43800
41532 43800 45649 43800
46251 43800 46777 43800
46777 43800 47749 43800
@@ -14348,7 +14422,7 @@ $FILLSEGMENTS
14740 43880 19675 43880
20525 43880 24104 43880
26579 43880 29029 43880
-39793 43880 40298 43880
+39792 43880 40298 43880
41452 43880 45581 43880
46319 43880 46777 43880
46777 43880 47749 43880
@@ -14356,7 +14430,7 @@ $FILLSEGMENTS
14740 43960 19707 43960
20494 43960 24184 43960
26659 43960 28939 43960
-39713 43960 40218 43960
+39712 43960 40218 43960
41372 43960 43380 43960
43719 43960 45547 43960
46352 43960 46777 43960
@@ -14365,7 +14439,7 @@ $FILLSEGMENTS
14740 44040 19739 44040
20461 44040 24264 44040
26739 44040 28849 44040
-39633 44040 40138 44040
+39632 44040 40138 44040
41292 44040 43259 44040
43841 44040 45525 44040
46375 44040 46777 44040
@@ -14374,7 +14448,7 @@ $FILLSEGMENTS
14740 44120 19819 44120
20381 44120 24344 44120
26819 44120 28759 44120
-39553 44120 40058 44120
+39552 44120 40058 44120
41212 44120 43185 44120
46375 44120 46777 44120
46777 44120 47749 44120
@@ -14382,7 +14456,7 @@ $FILLSEGMENTS
14740 44200 19955 44200
20245 44200 24424 44200
26899 44200 28669 44200
-39473 44200 39978 44200
+39472 44200 39978 44200
41162 44200 43152 44200
46369 44200 46375 44200
46375 44200 46777 44200
@@ -14390,7 +14464,7 @@ $FILLSEGMENTS
47749 44200 47960 44200
14740 44280 24504 44280
26979 44280 28580 44280
-39393 44280 39898 44280
+39392 44280 39898 44280
41162 44280 43125 44280
46336 44280 46375 44280
46375 44280 46777 44280
@@ -14398,7 +14472,7 @@ $FILLSEGMENTS
47749 44280 47960 44280
14740 44360 24584 44360
27059 44360 28490 44360
-39313 44360 39818 44360
+39312 44360 39818 44360
41162 44360 43125 44360
46291 44360 46375 44360
46375 44360 46777 44360
@@ -14406,7 +14480,7 @@ $FILLSEGMENTS
47749 44360 47960 44360
14740 44440 24664 44440
27139 44440 28400 44440
-39233 44440 39738 44440
+39232 44440 39738 44440
41162 44440 43128 44440
46211 44440 46375 44440
46375 44440 46777 44440
@@ -14414,7 +14488,7 @@ $FILLSEGMENTS
47749 44440 47960 44440
14740 44520 24744 44520
27219 44520 28310 44520
-39153 44520 39658 44520
+39152 44520 39658 44520
41162 44520 43161 44520
46047 44520 46375 44520
46375 44520 46777 44520
@@ -14422,7 +14496,7 @@ $FILLSEGMENTS
47749 44520 47960 44520
14740 44600 24824 44600
27299 44600 28220 44600
-39073 44600 39578 44600
+39072 44600 39578 44600
41162 44600 43199 44600
45838 44600 46375 44600
46375 44600 46777 44600
@@ -14430,7 +14504,7 @@ $FILLSEGMENTS
47749 44600 47960 44600
14740 44680 24904 44680
27379 44680 27825 44680
-38993 44680 39498 44680
+38992 44680 39498 44680
41162 44680 43279 44680
43821 44680 46375 44680
46375 44680 46777 44680
@@ -14438,7 +14512,7 @@ $FILLSEGMENTS
47749 44680 47960 44680
14740 44760 24984 44760
27459 44760 27705 44760
-38913 44760 39418 44760
+38912 44760 39418 44760
41162 44760 43429 44760
43671 44760 46375 44760
46375 44760 46777 44760
@@ -14446,67 +14520,67 @@ $FILLSEGMENTS
47749 44760 47960 44760
14740 44840 25064 44840
27539 44840 27631 44840
-38833 44840 39338 44840
+38832 44840 39338 44840
41162 44840 46375 44840
46375 44840 46777 44840
46777 44840 47749 44840
47749 44840 47960 44840
14740 44920 25144 44920
-38753 44920 39258 44920
+38752 44920 39258 44920
41162 44920 46375 44920
46375 44920 46777 44920
46777 44920 47749 44920
47749 44920 47960 44920
14740 45000 25224 45000
-38673 45000 39178 45000
+38672 45000 39178 45000
41162 45000 46375 45000
46375 45000 46777 45000
46777 45000 47749 45000
47749 45000 47960 45000
14740 45080 25304 45080
-38593 45080 39098 45080
+38592 45080 39098 45080
41162 45080 44881 45080
45317 45080 46375 45080
46375 45080 46777 45080
46777 45080 47749 45080
47749 45080 47960 45080
14740 45160 25384 45160
-38513 45160 39018 45160
+38512 45160 39018 45160
41162 45160 44789 45160
45411 45160 46375 45160
46375 45160 46777 45160
46777 45160 47749 45160
47749 45160 47960 45160
14740 45240 25464 45240
-38433 45240 38938 45240
+38432 45240 38938 45240
41162 45240 44056 45240
45473 45240 46375 45240
46375 45240 46777 45240
46777 45240 47749 45240
47749 45240 47960 45240
14740 45320 25544 45320
-38353 45320 38858 45320
+38352 45320 38858 45320
41162 45320 43963 45320
45506 45320 46375 45320
46375 45320 46777 45320
46777 45320 47749 45320
47749 45320 47960 45320
14740 45400 25624 45400
-38273 45400 38778 45400
+38272 45400 38778 45400
41162 45400 43883 45400
45525 45400 46375 45400
46375 45400 46777 45400
46777 45400 47749 45400
47749 45400 47960 45400
14740 45480 25704 45480
-38193 45480 38698 45480
+38192 45480 38698 45480
41162 45480 43803 45480
45525 45480 46375 45480
46375 45480 46777 45480
46777 45480 47749 45480
47749 45480 47960 45480
14740 45560 25784 45560
-38113 45560 38618 45560
+38112 45560 38618 45560
41162 45560 43723 45560
45515 45560 45525 45560
45525 45560 46375 45560
@@ -14514,7 +14588,7 @@ $FILLSEGMENTS
46777 45560 47749 45560
47749 45560 47960 45560
14740 45640 25864 45640
-38033 45640 38538 45640
+38032 45640 38538 45640
41162 45640 43643 45640
45482 45640 45525 45640
45525 45640 46375 45640
@@ -14522,7 +14596,7 @@ $FILLSEGMENTS
46777 45640 47749 45640
47749 45640 47960 45640
14740 45720 25944 45720
-37953 45720 38458 45720
+37952 45720 38458 45720
41162 45720 43563 45720
45431 45720 45525 45720
45525 45720 46375 45720
@@ -14530,7 +14604,7 @@ $FILLSEGMENTS
46777 45720 47749 45720
47749 45720 47960 45720
14740 45800 26024 45800
-37873 45800 38378 45800
+37872 45800 38378 45800
41154 45800 43483 45800
45351 45800 45525 45800
45525 45800 46375 45800
@@ -14538,7 +14612,7 @@ $FILLSEGMENTS
46777 45800 47749 45800
47749 45800 47960 45800
14740 45880 26104 45880
-37793 45880 38298 45880
+37792 45880 38298 45880
41134 45880 43403 45880
44781 45880 45525 45880
45525 45880 46375 45880
@@ -14546,7 +14620,7 @@ $FILLSEGMENTS
46777 45880 47749 45880
47749 45880 47960 45880
14740 45960 26184 45960
-37713 45960 38218 45960
+37712 45960 38218 45960
41081 45960 43323 45960
44831 45960 45525 45960
45525 45960 46375 45960
@@ -14554,7 +14628,7 @@ $FILLSEGMENTS
46777 45960 47749 45960
47749 45960 47960 45960
14740 46040 26264 46040
-37633 46040 38138 46040
+37632 46040 38138 46040
41003 46040 43243 46040
44864 46040 45525 46040
45525 46040 46375 46040
@@ -14562,7 +14636,7 @@ $FILLSEGMENTS
46777 46040 47749 46040
47749 46040 47960 46040
14740 46120 26344 46120
-37553 46120 38058 46120
+37552 46120 38058 46120
40923 46120 43163 46120
44875 46120 45525 46120
45525 46120 46375 46120
@@ -14570,7 +14644,7 @@ $FILLSEGMENTS
46777 46120 47749 46120
47749 46120 47960 46120
14740 46200 26424 46200
-37473 46200 37978 46200
+37472 46200 37978 46200
40843 46200 43083 46200
44875 46200 45525 46200
45525 46200 46375 46200
@@ -14578,7 +14652,7 @@ $FILLSEGMENTS
46777 46200 47749 46200
47749 46200 47960 46200
14740 46280 26504 46280
-37393 46280 37898 46280
+37392 46280 37898 46280
40763 46280 43003 46280
44857 46280 45525 46280
45525 46280 46375 46280
@@ -14586,7 +14660,7 @@ $FILLSEGMENTS
46777 46280 47749 46280
47749 46280 47960 46280
14740 46360 26584 46360
-37313 46360 37818 46360
+37312 46360 37818 46360
40683 46360 42923 46360
44823 46360 45525 46360
45525 46360 46375 46360
@@ -14594,7 +14668,7 @@ $FILLSEGMENTS
46777 46360 47749 46360
47749 46360 47960 46360
14740 46440 26664 46440
-37233 46440 37738 46440
+37232 46440 37738 46440
40603 46440 42843 46440
44761 46440 45525 46440
45525 46440 46375 46440
@@ -14602,7 +14676,7 @@ $FILLSEGMENTS
46777 46440 47749 46440
47749 46440 47960 46440
14740 46520 26744 46520
-37153 46520 37658 46520
+37152 46520 37658 46520
40523 46520 42763 46520
44669 46520 45525 46520
45525 46520 46375 46520
diff --git a/hardware/kicad/SIMtrace.net b/hardware/kicad/SIMtrace.net
index 81073a0..ec5e1a0 100644
--- a/hardware/kicad/SIMtrace.net
+++ b/hardware/kicad/SIMtrace.net
@@ -1,445 +1,485 @@
-# EESchema Netlist Version 1.1 created Wed 16 May 2012 12:56:06 CEST
+# EESchema Netlist Version 1.1 created Fri 18 May 2012 18:56:49 CEST
(
- ( /4DC804A6 PIN_ARRAY_2X1 BT1 4.5-6V
- ( 1 N-000012 )
- ( 2 GND )
- )
- ( /4DC8F975 SM0603 C1 2.2uF
- ( 1 3V3 )
- ( 2 GND )
- )
- ( /4D037E30 SM0603 C3 100nF
- ( 1 3V3 )
- ( 2 GND )
- )
- ( /4DC66392 SM0603 C4 100nF
- ( 1 3V3 )
- ( 2 GND )
- )
- ( /4DC79EDF SM0603 C5 33pF
- ( 1 N-000060 )
- ( 2 N-000016 )
- )
- ( /4D020DD3 SM0603 C6 10nF
- ( 1 GND )
- ( 2 N-000042 )
- )
- ( /4D020BDE SM0603 C7 100nF
- ( 1 3V3 )
- ( 2 GND )
- )
- ( /4D020BEB SM0603 C9 100nF
- ( 1 3V3 )
- ( 2 GND )
- )
- ( /4D020DCD SM0603 C10 1nF
- ( 1 GND )
- ( 2 N-000034 )
- )
- ( /4DC79ED8 SM0603 C11 15pF
- ( 1 /DDM )
- ( 2 GND )
- )
- ( /4DC8F97A SM0603 C12 2.2uF
- ( 1 +1.8V )
- ( 2 GND )
- )
- ( /4DC79EDC SM0603 C13 15pF
- ( 1 /DDP )
- ( 2 GND )
- )
- ( /4DC6A5DE SM0805 C14 4.7uF
- ( 1 N-000059 )
- ( 2 GND )
- )
- ( /4D020ED8 SM0603 C15 100nF
- ( 1 +1.8V )
- ( 2 GND )
- )
- ( /4DC664DD SM0603 C16 100nF
- ( 1 +1.8V )
- ( 2 GND )
- )
- ( /4CE9162F SM0603 C17 10pF
- ( 1 N-000030 )
- ( 2 GND )
- )
- ( /4CE91633 SM0603 C18 10pF
- ( 1 N-000036 )
- ( 2 GND )
- )
- ( /4DC664E0 SM0603 C19 100nF
- ( 1 +1.8V )
- ( 2 GND )
- )
- ( /4D020EDF SM0603 C20 100nF
- ( 1 +1.8V )
- ( 2 GND )
- )
- ( /4DC6A5CB SM0603 C21 1uF
- ( 1 /VCC_SIM )
- ( 2 GND )
- )
- ( /4DC6A5D9 SM0603 C22 1uF
- ( 1 3V3 )
- ( 2 GND )
- )
- ( /4DC68E45 SM0603 C23 100nF
- ( 1 N-000064 )
- ( 2 GND )
- )
- ( /4DFF9964 SM0603 C24 100nF
- ( 1 /VCC_SIM )
- ( 2 GND )
- )
- ( /4DC7A27C SMB_STPS340U D1 Schottky
- ( 1 /UDP_PUP )
- ( 2 //RESET )
- )
- ( /4DCB8C13 SMB_STPS340U D2 Schottky
- ( 1 /USBVCC )
- ( 2 N-000059 )
- )
- ( /4DCB8C0D SMB_STPS340U D3 Schottky
- ( 1 N-000012 )
- ( 2 N-000059 )
- )
- ( /4CF54717 LED-0805 D4 RED
- ( 1 N-000047 )
- ( 2 /LED_R )
- )
- ( /4CF5471F LED-0805 D5 GREEN
- ( 1 N-000045 )
- ( 2 /LED_G )
- )
- ( /4DC79E48 SM0805 FB1 FILTER
- ( 1 N-000062 )
- ( 2 /USBVCC )
- )
- ( /4DC68E1D SM0805 FB2 FILTER
- ( 1 N-000064 )
- ( 2 3V3 )
- )
- ( /4DFF8B97 SOT26 IC2 AP7332
- ( 1 /VCC_SIM )
- ( 2 GND )
- ( 3 /SIM_PWEN )
- ( 4 N-000059 )
- ( 5 N-000059 )
- ( 6 3V3 )
- )
- ( /4CE84486 TQFP_64 IC3 AT91SAM7S
- ( 1 N-000064 )
- ( 2 GND )
- ( 3 GND )
- ( 4 GND )
- ( 5 GND )
- ( 6 N-000013 )
- ( 7 3V3 )
- ( 8 +1.8V )
- ( 9 /LED_R )
- ( 10 /LED_G )
- ( 11 /I/O_PHONE )
- ( 12 +1.8V )
- ( 13 /I/O_SW )
- ( 14 /I/O_PHONE )
- ( 15 /CLK_PHONE )
- ( 16 /SC_SW )
- ( 17 GND )
- ( 18 3V3 )
- ( 19 N-000024 )
- ( 20 /WP )
- ( 21 /SCK )
- ( 22 /MOSI )
- ( 23 /RST_PHONE )
- ( 24 +1.8V )
- ( 25 /VCC_PHONE )
- ( 26 /VCC_FWD )
- ( 27 /MISO )
- ( 28 /CS )
- ( 29 /DTXD )
- ( 30 /DRXD )
- ( 31 /SW_SIM )
- ( 32 /RST_SIM )
- ( 33 /TDI )
- ( 34 /I/O_SIM )
- ( 35 /SIM_PWEN )
- ( 36 /CLK_SIM )
- ( 37 ? )
- ( 38 /CLK_PHONE )
- ( 39 //RESET )
- ( 40 /TEST )
- ( 41 /A-B-DETECT )
- ( 42 ? )
- ( 43 ? )
- ( 44 /CLK_SIM )
- ( 45 3V3 )
- ( 46 GND )
- ( 47 /I/O_SIM )
- ( 48 ? )
- ( 49 /TDO )
- ( 50 ? )
- ( 51 /TMS )
- ( 52 /BOOTLOADER )
- ( 53 /TCK )
- ( 54 +1.8V )
- ( 55 N-000023 )
- ( 56 /DDM )
- ( 57 /DDP )
- ( 58 3V3 )
- ( 59 3V3 )
- ( 60 GND )
- ( 61 N-000030 )
- ( 62 N-000036 )
- ( 63 N-000034 )
- ( 64 +1.8V )
- )
- ( /4EB57076 SSOP20_BDQ IC4 CB3Q3244
- ( 1 /SC_SW )
- ( 4 /RST_PHONE )
- ( 6 /CLK_PHONE )
- ( 8 /VPP_PHONE )
- ( 9 /I/O_SIM )
- ( 10 GND )
- ( 11 /I/O_PHONE )
- ( 12 /VPP_SIM )
- ( 14 /CLK_SIM )
- ( 16 /RST_SIM )
- ( 19 /I/O_SW )
- ( 20 3V3 )
- )
- ( /4DFF9774 SOT353 IC5 FPF2005
- ( 1 /VCC_SIM )
- ( 2 GND )
- ( 3 N-000061 )
- ( 4 /VCC_FWD )
- ( 5 /VCC_PHONE )
- )
- ( /4CFAC6EA USB-MINI-B_UX60 J1 USB-B_MINI
- ( 1 N-000062 )
- ( 2 N-000060 )
- ( 3 N-000016 )
- ( 4 /A-B-DETECT )
- ( 5 GND )
- )
- ( /4DCBE233 JACK_2.5 J2 JACK_2.5
- ( 1 GND )
- ( 2 /DRXD )
- ( 3 /DTXD )
- )
- ( /4DC68259 PIN_ARRAY_2X1 JP1 TEST
- ( 1 /TEST )
- ( 2 3V3 )
- )
- ( /4DC683ED PIN_ARRAY_2X1 JP2 ERASE
- ( 1 3V3 )
- ( 2 N-000023 )
- )
- ( /4CFCD6C9 PIN_ARRAY_10X2 P1 JTAG
- ( 1 3V3 )
- ( 2 3V3 )
- ( 3 N-000041 )
- ( 4 GND )
- ( 5 /TDI )
- ( 6 GND )
- ( 7 /TMS )
- ( 8 GND )
- ( 9 /TCK )
- ( 10 GND )
- ( 11 /TCK )
- ( 12 GND )
- ( 13 /TDO )
- ( 14 GND )
- ( 15 //RESET )
- ( 16 GND )
- ( 17 ? )
- ( 18 GND )
- ( 19 ? )
- ( 20 GND )
- )
- ( /4CE9ADCF PIN_ARRAY-6X1 P2 DEBUG
- ( 1 GND )
- ( 2 N-000026 )
- ( 3 ? )
- ( 4 /DRXD )
- ( 5 /DTXD )
- ( 6 N-000026 )
- )
- ( /4DC51F05 FFC_REBELSIM P3 REBELSIM
- ( 1 /VCC_PHONE )
- ( 2 /RST_PHONE )
- ( 3 /CLK_PHONE )
- ( 4 /I/O_PHONE )
- ( 5 /VPP_PHONE )
- ( 6 GND )
- )
- ( /4DC8FA06 SIM_AMPHENOL P4 SIM
- ( C1 /VCC_SIM )
- ( C2 /RST_SIM )
- ( C3 /CLK_SIM )
- ( C4 ? )
- ( C5 GND )
- ( C6 /VPP_SIM )
- ( C7 /I/O_SIM )
- ( C8 ? )
- ( SW1 /SW_SIM )
- ( SW2 GND )
- )
- ( /4DC7A1CA SOT23_BC847 Q1 BC847
- ( 1 /UDP_PUP )
- ( 2 N-000017 )
- ( 3 3V3 )
- )
- ( /4DC7A43A SOT23_BC847 Q2 BC847
- ( 1 N-000019 )
- ( 2 GND )
- ( 3 /UDP_PUP )
- )
- ( /4DC79ED1 SM0603 R1 100K
- ( 1 3V3 )
- ( 2 /UDP_PUP )
- )
- ( /4DC79E9A SM0603 R2 10K
- ( 1 /A-B-DETECT )
- ( 2 3V3 )
- )
- ( /4DC79ECE SM0603 R3 1K5
- ( 1 N-000016 )
- ( 2 N-000017 )
- )
- ( /4CE9A68C SM0603 R4 100K
- ( 1 N-000041 )
- ( 2 3V3 )
- )
- ( /4CE9A69A SM0603 R5 100K
- ( 1 /TDI )
- ( 2 3V3 )
- )
- ( /4CE9A6A5 SM0603 R6 100K
- ( 1 /TMS )
- ( 2 3V3 )
- )
- ( /4CE9A6A9 SM0603 R7 100K
- ( 1 /TCK )
- ( 2 3V3 )
- )
- ( /4CE9A6AE SM0603 R8 100K
- ( 1 /TDO )
- ( 2 3V3 )
- )
- ( /4DC79EAD SM0603 R9 27R
- ( 1 /DDM )
- ( 2 N-000060 )
- )
- ( /4DC79EA7 SM0603 R10 27R
- ( 1 /DDP )
- ( 2 N-000016 )
- )
- ( /4D020DC6 SM0603 R11 1K5
- ( 1 N-000034 )
- ( 2 N-000042 )
- )
- ( /4D0206C7 SM0603 R12 100K
- ( 1 3V3 )
- ( 2 //RESET )
- )
- ( /4CF7BAEE SM0603 R13 150R
- ( 1 3V3 )
- ( 2 N-000047 )
- )
- ( /4DC555D0 SM0603 R14 150R
- ( 1 3V3 )
- ( 2 N-000045 )
- )
- ( /4DC7A441 SM0603 R16 10K
- ( 1 N-000019 )
- ( 2 N-000024 )
- )
- ( /4DC799F2 SM0603 R17 10K
- ( 1 /WP )
- ( 2 GND )
- )
- ( /4DC5A30D SM0603 R18 10K
- ( 1 N-000003 )
- ( 2 3V3 )
- )
- ( /4DFF73B0 SM0603 R19 100K
- ( 1 GND )
- ( 2 /VCC_PHONE )
- )
- ( /4DFF7469 SM0603 R20 10k1%
- ( 1 /VCC_PHONE )
- ( 2 N-000013 )
- )
- ( /4DFF746C SM0603 R21 10k1%
- ( 1 GND )
- ( 2 N-000013 )
- )
- ( /4DFF9902 SM0603 R22 100K
- ( 1 /VCC_PHONE )
- ( 2 N-000061 )
- )
- ( /4D020733 PUSH_BUTTON SW1 RESET
- ( 1 //RESET )
- ( 2 GND )
- )
- ( /4DC6852C PUSH_BUTTON SW2 BOOTLOADER
- ( 1 /BOOTLOADER )
- ( 2 GND )
- )
- ( /4DC5A250 SOC008_WIDE U1 FLASH
- ( 1 /CS )
- ( 2 /MISO )
- ( 3 /WP )
- ( 4 GND )
- ( 5 /MOSI )
- ( 6 /SCK )
- ( 7 N-000003 )
- ( 8 3V3 )
- )
- ( /4CE915DE Q_49U3HMS X1 18.432MHz
- ( 1 N-000030 )
- ( 2 N-000036 )
+ ( /4FB50700 SM0603 R23 100K {Lib=R}
+ ( 1 GND )
+ ( 2 /RST_PHONE )
+ )
+ ( /4EB57076 $noname IC4 CB3Q3244 {Lib=CB3Q3244}
+ ( 1 /SC_SW )
+ ( 4 /RST_PHONE )
+ ( 6 /CLK_PHONE )
+ ( 8 /VPP_PHONE )
+ ( 9 /I/O_SIM )
+ ( 10 GND )
+ ( 11 /I/O_PHONE )
+ ( 12 /VPP_SIM )
+ ( 14 /CLK_SIM )
+ ( 16 /RST_SIM )
+ ( 19 /I/O_SW )
+ ( 20 3V3 )
+ )
+ ( /4DFF9964 SM0603 C24 100nF {Lib=C}
+ ( 1 /VCC_SIM )
+ ( 2 GND )
+ )
+ ( /4DFF9902 SM0603 R22 100K {Lib=R}
+ ( 1 /VCC_PHONE )
+ ( 2 N-000067 )
+ )
+ ( /4DFF9774 SOT353 IC5 FPF2005 {Lib=FPF200X}
+ ( 1 /VCC_SIM )
+ ( 2 GND )
+ ( 3 N-000067 )
+ ( 4 /VCC_FWD )
+ ( 5 /VCC_PHONE )
+ )
+ ( /4DFF8B97 SOT26 IC2 AP7332 {Lib=AP7332}
+ ( 1 /VCC_SIM )
+ ( 2 GND )
+ ( 3 /SIM_PWEN )
+ ( 4 N-000064 )
+ ( 5 N-000064 )
+ ( 6 3V3 )
+ )
+ ( /4DFF746C SM0603 R21 10k1% {Lib=R}
+ ( 1 GND )
+ ( 2 N-000058 )
+ )
+ ( /4DFF7469 SM0603 R20 10k1% {Lib=R}
+ ( 1 /VCC_PHONE )
+ ( 2 N-000058 )
+ )
+ ( /4DFF73B0 SM0603 R19 100K {Lib=R}
+ ( 1 GND )
+ ( 2 /VCC_PHONE )
+ )
+ ( /4DCBE233 JACK_2.5 J2 JACK_2.5 {Lib=JACK_2.5}
+ ( 1 GND )
+ ( 2 /DRXD )
+ ( 3 /DTXD )
+ )
+ ( /4DCB8C13 SMB_STPS340U D2 Schottky {Lib=ZENER}
+ ( 1 /USBVCC )
+ ( 2 N-000064 )
+ )
+ ( /4DCB8C0D SMB_STPS340U D3 Schottky {Lib=ZENER}
+ ( 1 N-000012 )
+ ( 2 N-000064 )
+ )
+ ( /4DC8FA06 SIM_AMPHENOL P4 SIM {Lib=ISO7816_NO}
+ ( C1 /VCC_SIM )
+ ( C2 /RST_SIM )
+ ( C3 /CLK_SIM )
+ ( C4 ? )
+ ( C5 GND )
+ ( C6 /VPP_SIM )
+ ( C7 /I/O_SIM )
+ ( C8 ? )
+ ( SW1 /SW_SIM )
+ ( SW2 GND )
+ )
+ ( /4DC8F97A SM0603 C12 2.2uF {Lib=C}
+ ( 1 +1.8V )
+ ( 2 GND )
+ )
+ ( /4DC8F975 SM0603 C1 2.2uF {Lib=C}
+ ( 1 3V3 )
+ ( 2 GND )
+ )
+ ( /4DC804A6 PIN_ARRAY_2X1 BT1 4.5-6V {Lib=BATTERY}
+ ( 1 N-000012 )
+ ( 2 GND )
+ )
+ ( /4DC7A441 SM0603 R16 10K {Lib=R}
+ ( 1 N-000023 )
+ ( 2 N-000022 )
+ )
+ ( /4DC7A43A SOT23_BC847 Q2 BC847 {Lib=BC847}
+ ( 1 N-000023 )
+ ( 2 GND )
+ ( 3 /UDP_PUP )
+ )
+ ( /4DC7A27C SMB_STPS340U D1 Schottky {Lib=ZENER}
+ ( 1 /UDP_PUP )
+ ( 2 //RESET )
+ )
+ ( /4DC7A1CA SOT23_BC847 Q1 BC847 {Lib=BC847}
+ ( 1 /UDP_PUP )
+ ( 2 N-000026 )
+ ( 3 3V3 )
+ )
+ ( /4DC79EDF SM0603 C5 33pF {Lib=C}
+ ( 1 N-000016 )
+ ( 2 N-000017 )
+ )
+ ( /4DC79EDC SM0603 C13 15pF {Lib=C}
+ ( 1 /DDP )
+ ( 2 GND )
+ )
+ ( /4DC79ED8 SM0603 C11 15pF {Lib=C}
+ ( 1 /DDM )
+ ( 2 GND )
+ )
+ ( /4DC79ED1 SM0603 R1 100K {Lib=R}
+ ( 1 3V3 )
+ ( 2 /UDP_PUP )
+ )
+ ( /4DC79ECE SM0603 R3 1K5 {Lib=R}
+ ( 1 N-000017 )
+ ( 2 N-000026 )
+ )
+ ( /4DC79EAD SM0603 R9 27R {Lib=R}
+ ( 1 /DDM )
+ ( 2 N-000016 )
+ )
+ ( /4DC79EA7 SM0603 R10 27R {Lib=R}
+ ( 1 /DDP )
+ ( 2 N-000017 )
+ )
+ ( /4DC79E9A SM0603 R2 10K {Lib=R}
+ ( 1 /A-B-DETECT )
+ ( 2 3V3 )
+ )
+ ( /4CFAC6EA USB-MINI-B_UX60 J1 USB-B_MINI {Lib=USB-B_MINI}
+ ( 1 N-000019 )
+ ( 2 N-000016 )
+ ( 3 N-000017 )
+ ( 4 /A-B-DETECT )
+ ( 5 GND )
+ )
+ ( /4DC79E48 SM0805 FB1 FILTER {Lib=FILTER}
+ ( 1 N-000019 )
+ ( 2 /USBVCC )
+ )
+ ( /4DC799F2 SM0603 R17 10K {Lib=R}
+ ( 1 /WP )
+ ( 2 GND )
+ )
+ ( /4DC6A5DE SM0805 C14 4.7uF {Lib=C}
+ ( 1 N-000064 )
+ ( 2 GND )
+ )
+ ( /4DC6A5D9 SM0603 C22 1uF {Lib=C}
+ ( 1 3V3 )
+ ( 2 GND )
+ )
+ ( /4DC6A5CB SM0603 C21 1uF {Lib=C}
+ ( 1 /VCC_SIM )
+ ( 2 GND )
+ )
+ ( /4DC68E45 SM0603 C23 100nF {Lib=C}
+ ( 1 N-000005 )
+ ( 2 GND )
+ )
+ ( /4DC68E1D SM0805 FB2 FILTER {Lib=FILTER}
+ ( 1 N-000005 )
+ ( 2 3V3 )
+ )
+ ( /4DC6852C PUSH_BUTTON SW2 BOOTLOADER {Lib=SW_PUSH}
+ ( 1 /BOOTLOADER )
+ ( 2 GND )
+ )
+ ( /4DC683ED PIN_ARRAY_2X1 JP2 ERASE {Lib=JUMPER}
+ ( 1 3V3 )
+ ( 2 N-000027 )
+ )
+ ( /4DC68259 PIN_ARRAY_2X1 JP1 TEST {Lib=JUMPER}
+ ( 1 /TEST )
+ ( 2 3V3 )
+ )
+ ( /4DC664E0 SM0603 C19 100nF {Lib=C}
+ ( 1 +1.8V )
+ ( 2 GND )
+ )
+ ( /4DC664DD SM0603 C16 100nF {Lib=C}
+ ( 1 +1.8V )
+ ( 2 GND )
+ )
+ ( /4DC66392 SM0603 C4 100nF {Lib=C}
+ ( 1 3V3 )
+ ( 2 GND )
+ )
+ ( /4DC5A30D SM0603 R18 10K {Lib=R}
+ ( 1 N-000007 )
+ ( 2 3V3 )
+ )
+ ( /4DC5A250 SOC008_WIDE U1 FLASH {Lib=FLASH_SPI}
+ ( 1 /CS )
+ ( 2 /MISO )
+ ( 3 /WP )
+ ( 4 GND )
+ ( 5 /MOSI )
+ ( 6 /SCK )
+ ( 7 N-000007 )
+ ( 8 3V3 )
+ )
+ ( /4DC555D0 SM0603 R14 150R {Lib=R}
+ ( 1 3V3 )
+ ( 2 N-000046 )
+ )
+ ( /4CF7BAEE SM0603 R13 150R {Lib=R}
+ ( 1 3V3 )
+ ( 2 N-000048 )
+ )
+ ( /4DC51F05 FFC_REBELSIM P3 REBELSIM {Lib=REBELSIM}
+ ( 1 /VCC_PHONE )
+ ( 2 /RST_PHONE )
+ ( 3 /CLK_PHONE )
+ ( 4 /I/O_PHONE )
+ ( 5 /VPP_PHONE )
+ ( 6 GND )
+ )
+ ( /4D037E30 SM0603 C3 100nF {Lib=C}
+ ( 1 3V3 )
+ ( 2 GND )
+ )
+ ( /4D020EDF SM0603 C20 100nF {Lib=C}
+ ( 1 +1.8V )
+ ( 2 GND )
+ )
+ ( /4D020ED8 SM0603 C15 100nF {Lib=C}
+ ( 1 +1.8V )
+ ( 2 GND )
+ )
+ ( /4D020DD3 SM0603 C6 10nF {Lib=C}
+ ( 1 GND )
+ ( 2 N-000043 )
+ )
+ ( /4D020DCD SM0603 C10 1nF {Lib=C}
+ ( 1 GND )
+ ( 2 N-000069 )
+ )
+ ( /4D020DC6 SM0603 R11 1K5 {Lib=R}
+ ( 1 N-000069 )
+ ( 2 N-000043 )
+ )
+ ( /4D020BEB SM0603 C9 100nF {Lib=C}
+ ( 1 3V3 )
+ ( 2 GND )
+ )
+ ( /4D020BDE SM0603 C7 100nF {Lib=C}
+ ( 1 3V3 )
+ ( 2 GND )
+ )
+ ( /4D020733 PUSH_BUTTON SW1 RESET {Lib=SW_PUSH}
+ ( 1 //RESET )
+ ( 2 GND )
+ )
+ ( /4D0206C7 SM0603 R12 100K {Lib=R}
+ ( 1 3V3 )
+ ( 2 //RESET )
+ )
+ ( /4CFCD6C9 pin_array_10x2 P1 JTAG {Lib=JTAG}
+ ( 1 3V3 )
+ ( 2 3V3 )
+ ( 3 N-000042 )
+ ( 4 GND )
+ ( 5 /TDI )
+ ( 6 GND )
+ ( 7 /TMS )
+ ( 8 GND )
+ ( 9 /TCK )
+ ( 10 GND )
+ ( 11 /TCK )
+ ( 12 GND )
+ ( 13 /TDO )
+ ( 14 GND )
+ ( 15 //RESET )
+ ( 16 GND )
+ ( 17 ? )
+ ( 18 GND )
+ ( 19 ? )
+ ( 20 GND )
+ )
+ ( /4CF5471F LED-0805 D5 GREEN {Lib=LED}
+ ( 1 N-000046 )
+ ( 2 /LED_G )
+ )
+ ( /4CF54717 LED-0805 D4 RED {Lib=LED}
+ ( 1 N-000048 )
+ ( 2 /LED_R )
+ )
+ ( /4CE84486 TQFP_64 IC3 AT91SAM7S {Lib=AT91SAM7S512/256/128/64/321-AU}
+ ( 1 N-000005 )
+ ( 2 GND )
+ ( 3 GND )
+ ( 4 GND )
+ ( 5 GND )
+ ( 6 N-000058 )
+ ( 7 3V3 )
+ ( 8 +1.8V )
+ ( 9 /LED_R )
+ ( 10 /LED_G )
+ ( 11 /I/O_PHONE )
+ ( 12 +1.8V )
+ ( 13 /I/O_SW )
+ ( 14 /I/O_PHONE )
+ ( 15 /CLK_PHONE )
+ ( 16 /SC_SW )
+ ( 17 GND )
+ ( 18 3V3 )
+ ( 19 N-000022 )
+ ( 20 /WP )
+ ( 21 /SCK )
+ ( 22 /MOSI )
+ ( 23 /RST_PHONE )
+ ( 24 +1.8V )
+ ( 25 /VCC_PHONE )
+ ( 26 /VCC_FWD )
+ ( 27 /MISO )
+ ( 28 /CS )
+ ( 29 /DTXD )
+ ( 30 /DRXD )
+ ( 31 /SW_SIM )
+ ( 32 /RST_SIM )
+ ( 33 /TDI )
+ ( 34 /I/O_SIM )
+ ( 35 /SIM_PWEN )
+ ( 36 /CLK_SIM )
+ ( 37 ? )
+ ( 38 /CLK_PHONE )
+ ( 39 //RESET )
+ ( 40 /TEST )
+ ( 41 /A-B-DETECT )
+ ( 42 ? )
+ ( 43 ? )
+ ( 44 /CLK_SIM )
+ ( 45 3V3 )
+ ( 46 GND )
+ ( 47 /I/O_SIM )
+ ( 48 ? )
+ ( 49 /TDO )
+ ( 50 ? )
+ ( 51 /TMS )
+ ( 52 /BOOTLOADER )
+ ( 53 /TCK )
+ ( 54 +1.8V )
+ ( 55 N-000027 )
+ ( 56 /DDM )
+ ( 57 /DDP )
+ ( 58 3V3 )
+ ( 59 3V3 )
+ ( 60 GND )
+ ( 61 N-000037 )
+ ( 62 N-000032 )
+ ( 63 N-000069 )
+ ( 64 +1.8V )
+ )
+ ( /4CE9ADCF PIN_ARRAY-6X1 P2 DEBUG {Lib=DEBUG}
+ ( 1 GND )
+ ( 2 N-000055 )
+ ( 3 ? )
+ ( 4 /DRXD )
+ ( 5 /DTXD )
+ ( 6 N-000055 )
+ )
+ ( /4CE9A6AE SM0603 R8 100K {Lib=R}
+ ( 1 /TDO )
+ ( 2 3V3 )
+ )
+ ( /4CE9A6A9 SM0603 R7 100K {Lib=R}
+ ( 1 /TCK )
+ ( 2 3V3 )
+ )
+ ( /4CE9A6A5 SM0603 R6 100K {Lib=R}
+ ( 1 /TMS )
+ ( 2 3V3 )
+ )
+ ( /4CE9A69A SM0603 R5 100K {Lib=R}
+ ( 1 /TDI )
+ ( 2 3V3 )
+ )
+ ( /4CE9A68C SM0603 R4 100K {Lib=R}
+ ( 1 N-000042 )
+ ( 2 3V3 )
+ )
+ ( /4CE91633 SM0603 C18 10pF {Lib=C}
+ ( 1 N-000032 )
+ ( 2 GND )
+ )
+ ( /4CE9162F SM0603 C17 10pF {Lib=C}
+ ( 1 N-000037 )
+ ( 2 GND )
+ )
+ ( /4CE915DE Q_49U3HMS X1 18.432MHz {Lib=CRYSTAL}
+ ( 1 N-000037 )
+ ( 2 N-000032 )
)
)
*
{ Allowed footprints by component:
-$component C1
+$component R23
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component C24
SM*
C?
C1-1
$endlist
-$component C3
+$component R22
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R21
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R20
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R19
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component D2
+ D?
+ SO*
SM*
- C?
- C1-1
$endlist
-$component C4
+$component D3
+ D?
+ SO*
SM*
- C?
- C1-1
$endlist
-$component C5
+$component C12
SM*
C?
C1-1
$endlist
-$component C6
+$component C1
SM*
C?
C1-1
$endlist
-$component C7
+$component R16
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component D1
+ D?
+ SO*
SM*
- C?
- C1-1
$endlist
-$component C9
+$component C5
SM*
C?
C1-1
$endlist
-$component C10
+$component C13
SM*
C?
C1-1
@@ -449,42 +489,96 @@ $component C11
C?
C1-1
$endlist
-$component C12
+$component R1
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R3
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R9
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R10
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R2
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R17
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component C14
SM*
C?
C1-1
$endlist
-$component C13
+$component C22
SM*
C?
C1-1
$endlist
-$component C14
+$component C21
SM*
C?
C1-1
$endlist
-$component C15
+$component C23
SM*
C?
C1-1
$endlist
-$component C16
+$component C19
SM*
C?
C1-1
$endlist
-$component C17
+$component C16
SM*
C?
C1-1
$endlist
-$component C18
+$component C4
SM*
C?
C1-1
$endlist
-$component C19
+$component R18
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R14
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component R13
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component C3
SM*
C?
C1-1
@@ -494,42 +588,44 @@ $component C20
C?
C1-1
$endlist
-$component C21
+$component C15
SM*
C?
C1-1
$endlist
-$component C22
+$component C6
SM*
C?
C1-1
$endlist
-$component C23
+$component C10
SM*
C?
C1-1
$endlist
-$component C24
+$component R11
+ R?
+ SM0603
+ SM0805
+ R?-*
+$endlist
+$component C9
SM*
C?
C1-1
$endlist
-$component D1
- D?
- SO*
- SM*
-$endlist
-$component D2
- D?
- SO*
+$component C7
SM*
+ C?
+ C1-1
$endlist
-$component D3
- D?
- SO*
- SM*
+$component R12
+ R?
+ SM0603
+ SM0805
+ R?-*
$endlist
-$component D4
+$component D5
LED-3MM
LED-5MM
LED-10MM
@@ -538,7 +634,7 @@ $component D4
LED-1206
LEDV
$endlist
-$component D5
+$component D4
LED-3MM
LED-5MM
LED-10MM
@@ -547,131 +643,363 @@ $component D5
LED-1206
LEDV
$endlist
-$component R1
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R2
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R3
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R4
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R5
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R6
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R7
- R?
- SM0603
- SM0805
- R?-*
-$endlist
$component R8
R?
SM0603
SM0805
R?-*
$endlist
-$component R9
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R10
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R11
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R12
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R13
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R14
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R16
- R?
- SM0603
- SM0805
- R?-*
-$endlist
-$component R17
+$component R7
R?
SM0603
SM0805
R?-*
$endlist
-$component R18
+$component R6
R?
SM0603
SM0805
R?-*
$endlist
-$component R19
+$component R5
R?
SM0603
SM0805
R?-*
$endlist
-$component R20
+$component R4
R?
SM0603
SM0805
R?-*
$endlist
-$component R21
- R?
- SM0603
- SM0805
- R?-*
+$component C18
+ SM*
+ C?
+ C1-1
$endlist
-$component R22
- R?
- SM0603
- SM0805
- R?-*
+$component C17
+ SM*
+ C?
+ C1-1
$endlist
$endfootprintlist
}
+{ Pin List by Nets
+Net 1 "/CLK_SIM" "CLK_SIM"
+ P4 C3
+ IC3 44
+ IC4 14
+ IC3 36
+Net 2 "/SC_SW" "SC_SW"
+ IC3 16
+ IC4 1
+Net 3 "/RST_SIM" "RST_SIM"
+ IC3 32
+ P4 C2
+ IC4 16
+Net 4 "GND" "GND"
+ IC3 2
+ J1 5
+ IC3 3
+ IC3 5
+ J2 1
+ C6 1
+ C10 1
+ C13 2
+ C11 2
+ IC3 4
+ C17 2
+ P2 1
+ P1 16
+ P1 18
+ C18 2
+ IC3 17
+ IC3 60
+ IC3 46
+ P1 14
+ Q2 2
+ C14 2
+ C7 2
+ C22 2
+ P1 12
+ C21 2
+ IC4 10
+ C9 2
+ U1 4
+ C24 2
+ SW2 2
+ P1 4
+ P1 6
+ P1 8
+ C23 2
+ P1 10
+ SW1 2
+ P1 20
+ P3 6
+ R17 2
+ P4 C5
+ P4 SW2
+ R23 1
+ C12 2
+ C1 2
+ IC2 2
+ IC5 2
+ R21 1
+ R19 1
+ BT1 2
+ C15 2
+ C20 2
+ C4 2
+ C3 2
+ C16 2
+ C19 2
+Net 5 "" ""
+ C23 1
+ IC3 1
+ FB2 1
+Net 6 "3V3" "3V3"
+ IC3 7
+ C3 1
+ P1 2
+ IC3 58
+ JP1 2
+ JP2 1
+ R13 1
+ U1 8
+ R2 2
+ R18 2
+ R1 1
+ C22 1
+ IC3 59
+ R14 1
+ IC3 45
+ C4 1
+ IC3 18
+ C1 1
+ R4 2
+ R6 2
+ FB2 2
+ IC4 20
+ R7 2
+ R12 1
+ C7 1
+ C9 1
+ R5 2
+ P1 1
+ IC2 6
+ Q1 3
+ R8 2
+Net 7 "" ""
+ R18 1
+ U1 7
+Net 8 "/I/O_SIM" "I/O_SIM"
+ IC3 47
+ P4 C7
+ IC3 34
+ IC4 9
+Net 9 "/CS" "CS"
+ U1 1
+ IC3 28
+Net 12 "" ""
+ D3 1
+ BT1 1
+Net 13 "/VCC_PHONE" "VCC_PHONE"
+ R20 1
+ R22 1
+ IC3 25
+ IC5 5
+ P3 1
+ R19 2
+Net 15 "/DRXD" "DRXD"
+ P2 4
+ IC3 30
+ J2 2
+Net 16 "" ""
+ R9 2
+ C5 1
+ J1 2
+Net 17 "" ""
+ R10 2
+ R3 1
+ J1 3
+ C5 2
+Net 18 "/DDM" "DDM"
+ R9 1
+ C11 1
+ IC3 56
+Net 19 "" ""
+ J1 1
+ FB1 1
+Net 20 "/USBVCC" "USBVCC"
+ FB1 2
+ D2 1
+Net 22 "" ""
+ IC3 19
+ R16 2
+Net 23 "" ""
+ R16 1
+ Q2 1
+Net 24 "/UDP_PUP" "UDP_PUP"
+ Q1 1
+ D1 1
+ R1 2
+ Q2 3
+Net 25 "//RESET" "/RESET"
+ D1 2
+ R12 2
+ IC3 39
+ P1 15
+ SW1 1
+Net 26 "" ""
+ Q1 2
+ R3 2
+Net 27 "" ""
+ JP2 2
+ IC3 55
+Net 28 "/MISO" "MISO"
+ IC3 27
+ U1 2
+Net 30 "/A-B-DETECT" "A-B-DETECT"
+ J1 4
+ IC3 41
+ R2 1
+Net 31 "/MOSI" "MOSI"
+ U1 5
+ IC3 22
+Net 32 "" ""
+ X1 2
+ IC3 62
+ C18 1
+Net 33 "/I/O_SW" "I/O_SW"
+ IC4 19
+ IC3 13
+Net 37 "" ""
+ IC3 61
+ X1 1
+ C17 1
+Net 38 "/TCK" "TCK"
+ R7 1
+ P1 11
+ P1 9
+ IC3 53
+Net 40 "/SCK" "SCK"
+ U1 6
+ IC3 21
+Net 42 "" ""
+ P1 3
+ R4 1
+Net 43 "" ""
+ R11 2
+ C6 2
+Net 44 "/SIM_PWEN" "SIM_PWEN"
+ IC3 35
+ IC2 3
+Net 45 "/SW_SIM" "SW_SIM"
+ IC3 31
+ P4 SW1
+Net 46 "" ""
+ R14 2
+ D5 1
+Net 47 "/LED_G" "LED_G"
+ IC3 10
+ D5 2
+Net 48 "" ""
+ D4 1
+ R13 2
+Net 49 "/LED_R" "LED_R"
+ D4 2
+ IC3 9
+Net 50 "/WP" "WP"
+ R17 1
+ IC3 20
+ U1 3
+Net 51 "/TEST" "TEST"
+ IC3 40
+ JP1 1
+Net 52 "/I/O_PHONE" "I/O_PHONE"
+ IC3 11
+ IC4 11
+ IC3 14
+ P3 4
+Net 53 "/VCC_SIM" "VCC_SIM"
+ IC5 1
+ C24 1
+ IC2 1
+ C21 1
+ P4 C1
+Net 54 "/TDO" "TDO"
+ IC3 49
+ R8 1
+ P1 13
+Net 55 "" ""
+ P2 6
+ P2 2
+Net 56 "/TMS" "TMS"
+ P1 7
+ R6 1
+ IC3 51
+Net 57 "/TDI" "TDI"
+ IC3 33
+ P1 5
+ R5 1
+Net 58 "" ""
+ IC3 6
+ R21 2
+ R20 2
+Net 59 "/BOOTLOADER" "BOOTLOADER"
+ IC3 52
+ SW2 1
+Net 60 "/RST_PHONE" "RST_PHONE"
+ IC4 4
+ P3 2
+ IC3 23
+ R23 2
+Net 61 "/CLK_PHONE" "CLK_PHONE"
+ IC3 15
+ IC4 6
+ P3 3
+ IC3 38
+Net 62 "/DDP" "DDP"
+ R10 1
+ IC3 57
+ C13 1
+Net 63 "/DTXD" "DTXD"
+ J2 3
+ IC3 29
+ P2 5
+Net 64 "" ""
+ D2 2
+ D3 2
+ IC2 5
+ IC2 4
+ C14 1
+Net 65 "/VPP_SIM" "VPP_SIM"
+ P4 C6
+ IC4 12
+Net 66 "/VCC_FWD" "VCC_FWD"
+ IC3 26
+ IC5 4
+Net 67 "" ""
+ IC5 3
+ R22 2
+Net 68 "/VPP_PHONE" "VPP_PHONE"
+ IC4 8
+ P3 5
+Net 69 "" ""
+ C10 2
+ R11 1
+ IC3 63
+Net 70 "+1.8V" "+1.8V"
+ C19 1
+ C12 1
+ IC3 64
+ IC3 54
+ IC3 24
+ IC3 12
+ C15 1
+ IC3 8
+ C20 1
+ C16 1
+}
+#End
diff --git a/hardware/kicad/SIMtrace.sch b/hardware/kicad/SIMtrace.sch
index 5b15e93..73f5d3a 100644
--- a/hardware/kicad/SIMtrace.sch
+++ b/hardware/kicad/SIMtrace.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2 date Do 17 Mai 2012 16:14:52 CEST
+EESchema Schematic File Version 2 date Fri 18 May 2012 19:22:02 CEST
LIBS:power
LIBS:device
LIBS:transistors
@@ -38,7 +38,7 @@ $Descr A4 11700 8267
encoding utf-8
Sheet 1 1
Title "SIMtrace hardware"
-Date "17 may 2012"
+Date "18 may 2012"
Rev "v1.2p"
Comp "osmocom"
Comment1 "CC-BY-SA"
@@ -47,7 +47,9 @@ Comment3 ""
Comment4 ""
$EndDescr
Wire Wire Line
- 8600 1700 8400 1700
+ 8300 2200 7450 2200
+Wire Wire Line
+ 7450 2400 8600 2400
Wire Wire Line
10550 6350 9850 6350
Wire Wire Line
@@ -85,8 +87,6 @@ Wire Wire Line
Wire Wire Line
1900 6500 1750 6500
Wire Wire Line
- 7450 2300 8500 2300
-Wire Wire Line
650 5450 1250 5450
Wire Wire Line
2050 6850 2050 7350
@@ -303,8 +303,6 @@ Wire Wire Line
Wire Wire Line
8350 2600 7450 2600
Wire Wire Line
- 8700 2400 7450 2400
-Wire Wire Line
8350 4000 7450 4000
Connection ~ 8200 2600
Wire Wire Line
@@ -675,7 +673,6 @@ Wire Wire Line
8800 3200 8800 2200
Wire Wire Line
7650 1350 7650 1700
-Connection ~ 8400 2300
Wire Wire Line
7700 4900 7550 4900
Wire Wire Line
@@ -693,11 +690,7 @@ Wire Wire Line
Wire Wire Line
1250 5650 650 5650
Wire Wire Line
- 8400 2300 8400 2200
-Wire Wire Line
8200 2000 8200 2500
-Wire Wire Line
- 8350 2200 7450 2200
Connection ~ 900 5450
Wire Wire Line
900 6200 900 5450
@@ -727,7 +720,21 @@ Wire Wire Line
7850 6650 7850 5850
Wire Wire Line
8600 2400 8600 2200
-Connection ~ 8600 2400
+Wire Wire Line
+ 8600 1700 8600 1600
+Wire Wire Line
+ 7450 2300 8400 2300
+Wire Wire Line
+ 8400 2300 8400 2200
+$Comp
+L GND #PWR01
+U 1 1 4FB67F39
+P 8600 1600
+F 0 "#PWR01" H 8600 1600 30 0001 C CNN
+F 1 "GND" H 8600 1530 30 0001 C CNN
+ 1 8600 1600
+ -1 0 0 1
+$EndComp
$Comp
L R R23
U 1 1 4FB50700
@@ -763,10 +770,10 @@ NoConn ~ 9600 3050
Text Label 2650 5600 3 60 ~ 0
VCC_SIM
$Comp
-L GND #PWR01
+L GND #PWR02
U 1 1 4DFF996C
P 2250 6150
-F 0 "#PWR01" H 2250 6150 30 0001 C CNN
+F 0 "#PWR02" H 2250 6150 30 0001 C CNN
F 1 "GND" H 2250 6080 30 0001 C CNN
1 2250 6150
1 0 0 -1
@@ -782,10 +789,10 @@ F 2 "SM0603" H 2250 5850 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #PWR02
+L GND #PWR03
U 1 1 4DFF9910
P 1650 6100
-F 0 "#PWR02" H 1650 6100 30 0001 C CNN
+F 0 "#PWR03" H 1650 6100 30 0001 C CNN
F 1 "GND" H 1650 6030 30 0001 C CNN
1 1650 6100
1 0 0 -1
@@ -831,10 +838,10 @@ F 2 "SOT26" H 2500 6750 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #PWR03
+L GND #PWR04
U 1 1 4DFF74F0
P 8300 5100
-F 0 "#PWR03" H 8300 5100 30 0001 C CNN
+F 0 "#PWR04" H 8300 5100 30 0001 C CNN
F 1 "GND" H 8300 5030 30 0001 C CNN
1 8300 5100
0 -1 -1 0
@@ -860,10 +867,10 @@ F 2 "SM0603" H 7950 4900 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L GND #PWR04
+L GND #PWR05
U 1 1 4DFF73E0
P 8400 1600
-F 0 "#PWR04" H 8400 1600 30 0001 C CNN
+F 0 "#PWR05" H 8400 1600 30 0001 C CNN
F 1 "GND" H 8400 1530 30 0001 C CNN
1 8400 1600
-1 0 0 1
@@ -881,10 +888,10 @@ $EndComp
Text Label 7600 2300 0 60 ~ 0
VCC_PHONE
$Comp
-L GND #PWR05
+L GND #PWR06
U 1 1 4DFDBB3F
P 10750 4550
-F 0 "#PWR05" H 10750 4550 30 0001 C CNN
+F 0 "#PWR06" H 10750 4550 30 0001 C CNN
F 1 "GND" H 10750 4480 30 0001 C CNN
1 10750 4550
0 -1 -1 0
@@ -965,55 +972,55 @@ F 2 "SM0603" H 950 4400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L 3V3 #PWR06
+L 3V3 #PWR07
U 1 1 4DC820B7
P 10900 5950
-F 0 "#PWR06" H 10900 6050 40 0001 C CNN
+F 0 "#PWR07" H 10900 6050 40 0001 C CNN
F 1 "3V3" H 10900 6075 40 0000 C CNN
1 10900 5950
0 1 1 0
$EndComp
$Comp
-L 3V3 #PWR07
+L 3V3 #PWR08
U 1 1 4DC815E7
P 7500 6650
-F 0 "#PWR07" H 7500 6750 40 0001 C CNN
+F 0 "#PWR08" H 7500 6750 40 0001 C CNN
F 1 "3V3" H 7500 6775 40 0000 C CNN
1 7500 6650
-1 0 0 1
$EndComp
$Comp
-L 3V3 #PWR08
+L 3V3 #PWR09
U 1 1 4DC80D4F
P 6400 6850
-F 0 "#PWR08" H 6400 6950 40 0001 C CNN
+F 0 "#PWR09" H 6400 6950 40 0001 C CNN
F 1 "3V3" H 6400 6975 40 0000 C CNN
1 6400 6850
0 1 1 0
$EndComp
$Comp
-L PWR_FLAG #FLG09
+L PWR_FLAG #FLG010
U 1 1 4DC80677
P 900 3700
-F 0 "#FLG09" H 900 3970 30 0001 C CNN
+F 0 "#FLG010" H 900 3970 30 0001 C CNN
F 1 "PWR_FLAG" H 900 3930 30 0000 C CNN
1 900 3700
-1 0 0 1
$EndComp
$Comp
-L GND #PWR010
+L GND #PWR011
U 1 1 4DC804F4
P 900 7500
-F 0 "#PWR010" H 900 7500 30 0001 C CNN
+F 0 "#PWR011" H 900 7500 30 0001 C CNN
F 1 "GND" H 900 7430 30 0001 C CNN
1 900 7500
1 0 0 -1
$EndComp
$Comp
-L PWR_FLAG #FLG011
+L PWR_FLAG #FLG012
U 1 1 4DC804C2
P 1900 6500
-F 0 "#FLG011" H 1900 6770 30 0001 C CNN
+F 0 "#FLG012" H 1900 6770 30 0001 C CNN
F 1 "PWR_FLAG" H 1900 6730 30 0000 C CNN
1 1900 6500
1 0 0 -1
@@ -1029,10 +1036,10 @@ F 2 "PIN_ARRAY_2X1" H 900 7200 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L 3V3 #PWR012
+L 3V3 #PWR013
U 1 1 4DC80254
P 3750 6650
-F 0 "#PWR012" H 3750 6750 40 0001 C CNN
+F 0 "#PWR013" H 3750 6750 40 0001 C CNN
F 1 "3V3" H 3750 6775 40 0000 C CNN
1 3750 6650
0 1 1 0
@@ -1063,10 +1070,10 @@ F 5 "100mA" V 9050 1350 50 0000 C CNN "Field2"
0 1 -1 0
$EndComp
$Comp
-L GND #PWR013
+L GND #PWR014
U 1 1 4DC7A434
P 8150 1100
-F 0 "#PWR013" H 8150 1100 30 0001 C CNN
+F 0 "#PWR014" H 8150 1100 30 0001 C CNN
F 1 "GND" H 8150 1030 30 0001 C CNN
1 8150 1100
0 1 1 0
@@ -1090,10 +1097,10 @@ F 5 "500mA" H 1450 550 50 0000 C CNN "Field2"
1 0 0 -1
$EndComp
$Comp
-L 3V3 #PWR014
+L 3V3 #PWR015
U 1 1 4DC7A233
P 1300 1100
-F 0 "#PWR014" H 1300 1200 40 0001 C CNN
+F 0 "#PWR015" H 1300 1200 40 0001 C CNN
F 1 "3V3" H 1300 1225 40 0000 C CNN
1 1300 1100
1 0 0 -1
@@ -1111,10 +1118,10 @@ F 5 "100mA" H 950 1400 50 0000 C CNN "Field2"
1 0 0 -1
$EndComp
$Comp
-L 3V3 #PWR015
+L 3V3 #PWR016
U 1 1 4DC79FE6
P 1350 3550
-F 0 "#PWR015" H 1350 3650 40 0001 C CNN
+F 0 "#PWR016" H 1350 3650 40 0001 C CNN
F 1 "3V3" H 1350 3675 40 0000 C CNN
1 1350 3550
-1 0 0 1
@@ -1122,10 +1129,10 @@ $EndComp
Text Label 1550 3500 1 60 ~ 0
A-B-DETECT
$Comp
-L GND #PWR016
+L GND #PWR017
U 1 1 4DC79F9B
P 2850 3450
-F 0 "#PWR016" H 2850 3450 30 0001 C CNN
+F 0 "#PWR017" H 2850 3450 30 0001 C CNN
F 1 "GND" H 2850 3380 30 0001 C CNN
1 2850 3450
0 1 1 0
@@ -1234,10 +1241,10 @@ F 6 "39Ohm" H 750 2350 50 0000 C CNN "Field3"
-1 0 0 1
$EndComp
$Comp
-L GND #PWR017
+L GND #PWR018
U 1 1 4DC799FC
P 9100 2650
-F 0 "#PWR017" H 9100 2650 30 0001 C CNN
+F 0 "#PWR018" H 9100 2650 30 0001 C CNN
F 1 "GND" H 9100 2580 30 0001 C CNN
1 9100 2650
1 0 0 -1
@@ -1253,64 +1260,64 @@ F 2 "SM0603" H 9100 2300 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #PWR018
+L GND #PWR019
U 1 1 4DC790F9
P 6200 1350
-F 0 "#PWR018" H 6200 1350 30 0001 C CNN
+F 0 "#PWR019" H 6200 1350 30 0001 C CNN
F 1 "GND" H 6200 1280 30 0001 C CNN
1 6200 1350
0 1 1 0
$EndComp
$Comp
-L GND #PWR019
+L GND #PWR020
U 1 1 4DC790AF
P 7650 5200
-F 0 "#PWR019" H 7650 5200 30 0001 C CNN
+F 0 "#PWR020" H 7650 5200 30 0001 C CNN
F 1 "GND" H 7650 5130 30 0001 C CNN
1 7650 5200
0 -1 -1 0
$EndComp
$Comp
-L GND #PWR020
+L GND #PWR021
U 1 1 4DC6ABFD
P 9650 3800
-F 0 "#PWR020" H 9650 3800 30 0001 C CNN
+F 0 "#PWR021" H 9650 3800 30 0001 C CNN
F 1 "GND" H 9650 3730 30 0001 C CNN
1 9650 3800
0 1 1 0
$EndComp
$Comp
-L GND #PWR021
+L GND #PWR022
U 1 1 4DC6A8EB
P 1150 3650
-F 0 "#PWR021" H 1150 3650 30 0001 C CNN
+F 0 "#PWR022" H 1150 3650 30 0001 C CNN
F 1 "GND" H 1150 3580 30 0001 C CNN
1 1150 3650
1 0 0 -1
$EndComp
$Comp
-L GND #PWR022
+L GND #PWR023
U 1 1 4DC6A5F7
P 1750 7250
-F 0 "#PWR022" H 1750 7250 30 0001 C CNN
+F 0 "#PWR023" H 1750 7250 30 0001 C CNN
F 1 "GND" H 1750 7180 30 0001 C CNN
1 1750 7250
1 0 0 -1
$EndComp
$Comp
-L GND #PWR023
+L GND #PWR024
U 1 1 4DC6A5F4
P 3600 7250
-F 0 "#PWR023" H 3600 7250 30 0001 C CNN
+F 0 "#PWR024" H 3600 7250 30 0001 C CNN
F 1 "GND" H 3600 7180 30 0001 C CNN
1 3600 7250
1 0 0 -1
$EndComp
$Comp
-L GND #PWR024
+L GND #PWR025
U 1 1 4DC6A5F0
P 3100 7250
-F 0 "#PWR024" H 3100 7250 30 0001 C CNN
+F 0 "#PWR025" H 3100 7250 30 0001 C CNN
F 1 "GND" H 3100 7180 30 0001 C CNN
1 3100 7250
1 0 0 -1
@@ -1346,10 +1353,10 @@ F 2 "SM0603" H 3100 7000 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #PWR025
+L GND #PWR026
U 1 1 4DC6A577
P 2950 7250
-F 0 "#PWR025" H 2950 7250 30 0001 C CNN
+F 0 "#PWR026" H 2950 7250 30 0001 C CNN
F 1 "GND" H 2950 7180 30 0001 C CNN
1 2950 7250
1 0 0 -1
@@ -1407,10 +1414,10 @@ F 2 "SM0603" H 7900 5450 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #PWR026
+L GND #PWR027
U 1 1 4DC68E36
P 8250 5450
-F 0 "#PWR026" H 8250 5450 30 0001 C CNN
+F 0 "#PWR027" H 8250 5450 30 0001 C CNN
F 1 "GND" H 8250 5380 30 0001 C CNN
1 8250 5450
0 -1 -1 0
@@ -1449,19 +1456,19 @@ F 2 "PUSH_BUTTON" H 6700 1350 60 0001 C CNN
-1 0 0 -1
$EndComp
$Comp
-L 3V3 #PWR027
+L 3V3 #PWR028
U 1 1 4DC68405
P 4450 650
-F 0 "#PWR027" H 4450 750 40 0001 C CNN
+F 0 "#PWR028" H 4450 750 40 0001 C CNN
F 1 "3V3" H 4450 775 40 0000 C CNN
1 4450 650
1 0 0 -1
$EndComp
$Comp
-L 3V3 #PWR028
+L 3V3 #PWR029
U 1 1 4DC683FB
P 5050 950
-F 0 "#PWR028" H 5050 1050 40 0001 C CNN
+F 0 "#PWR029" H 5050 1050 40 0001 C CNN
F 1 "3V3" H 5050 1075 40 0000 C CNN
1 5050 950
1 0 0 -1
@@ -1487,28 +1494,28 @@ F 2 "PIN_ARRAY_2X1" H 4750 1300 60 0001 C CNN
0 -1 -1 0
$EndComp
$Comp
-L GND #PWR029
+L GND #PWR030
U 1 1 4DC665D5
P 3350 5750
-F 0 "#PWR029" H 3350 5750 30 0001 C CNN
+F 0 "#PWR030" H 3350 5750 30 0001 C CNN
F 1 "GND" H 3350 5680 30 0001 C CNN
1 3350 5750
0 1 1 0
$EndComp
$Comp
-L GND #PWR030
+L GND #PWR031
U 1 1 4DC665D1
P 3200 5500
-F 0 "#PWR030" H 3200 5500 30 0001 C CNN
+F 0 "#PWR031" H 3200 5500 30 0001 C CNN
F 1 "GND" H 3200 5430 30 0001 C CNN
1 3200 5500
1 0 0 -1
$EndComp
$Comp
-L 1V8 #PWR031
+L 1V8 #PWR032
U 1 1 4DC6650D
P 3500 5000
-F 0 "#PWR031" H 3500 5140 20 0001 C CNN
+F 0 "#PWR032" H 3500 5140 20 0001 C CNN
F 1 "1V8" H 3500 5110 30 0000 C CNN
1 3500 5000
0 -1 -1 0
@@ -1544,19 +1551,19 @@ F 2 "SM0603" H 2000 4800 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L 3V3 #PWR032
+L 3V3 #PWR033
U 1 1 4DC662E1
P 1300 4300
-F 0 "#PWR032" H 1300 4400 40 0001 C CNN
+F 0 "#PWR033" H 1300 4400 40 0001 C CNN
F 1 "3V3" H 1300 4425 40 0000 C CNN
1 1300 4300
0 -1 -1 0
$EndComp
$Comp
-L GND #PWR033
+L GND #PWR034
U 1 1 4DC66159
P 950 4700
-F 0 "#PWR033" H 950 4700 30 0001 C CNN
+F 0 "#PWR034" H 950 4700 30 0001 C CNN
F 1 "GND" H 950 4630 30 0001 C CNN
1 950 4700
1 0 0 -1
@@ -1578,10 +1585,10 @@ MOSI
Text Label 7600 3400 0 60 ~ 0
SCK
$Comp
-L GND #PWR034
+L GND #PWR035
U 1 1 4DC5A389
P 9250 2150
-F 0 "#PWR034" H 9250 2150 30 0001 C CNN
+F 0 "#PWR035" H 9250 2150 30 0001 C CNN
F 1 "GND" H 9250 2080 30 0001 C CNN
1 9250 2150
1 0 0 -1
@@ -1597,10 +1604,10 @@ F 2 "SM0603" H 10950 1600 60 0001 C CNN
-1 0 0 1
$EndComp
$Comp
-L 3V3 #PWR035
+L 3V3 #PWR036
U 1 1 4DC5A300
P 10700 1200
-F 0 "#PWR035" H 10700 1300 40 0001 C CNN
+F 0 "#PWR036" H 10700 1300 40 0001 C CNN
F 1 "3V3" H 10700 1325 40 0000 C CNN
1 10700 1200
1 0 0 -1
@@ -1626,10 +1633,10 @@ CLK_SIM
Text Label 9300 6250 1 60 ~ 0
RST_SIM
$Comp
-L GND #PWR036
+L GND #PWR037
U 1 1 4DC55B6C
P 10100 5950
-F 0 "#PWR036" H 10100 5950 30 0001 C CNN
+F 0 "#PWR037" H 10100 5950 30 0001 C CNN
F 1 "GND" H 10100 5880 30 0001 C CNN
1 10100 5950
0 1 1 0
@@ -1665,28 +1672,28 @@ F 2 "FFC_REBELSIM" H 10900 6500 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L 3V3 #PWR037
+L 3V3 #PWR038
U 1 1 4DC5061E
P 2050 4400
-F 0 "#PWR037" H 2050 4500 40 0001 C CNN
+F 0 "#PWR038" H 2050 4500 40 0001 C CNN
F 1 "3V3" H 2050 4525 40 0000 C CNN
1 2050 4400
0 -1 -1 0
$EndComp
$Comp
-L GND #PWR038
+L GND #PWR039
U 1 1 4D037F90
P 1550 4900
-F 0 "#PWR038" H 1550 4900 30 0001 C CNN
+F 0 "#PWR039" H 1550 4900 30 0001 C CNN
F 1 "GND" H 1550 4830 30 0001 C CNN
1 1550 4900
1 0 0 -1
$EndComp
$Comp
-L GND #PWR039
+L GND #PWR040
U 1 1 4D037F8C
P 1900 5100
-F 0 "#PWR039" H 1900 5100 30 0001 C CNN
+F 0 "#PWR040" H 1900 5100 30 0001 C CNN
F 1 "GND" H 1900 5030 30 0001 C CNN
1 1900 5100
0 1 1 0
@@ -1740,10 +1747,10 @@ F 2 "SM0603" H 3500 5400 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #PWR040
+L GND #PWR041
U 1 1 4D020E3B
P 1850 3950
-F 0 "#PWR040" H 1850 3950 30 0001 C CNN
+F 0 "#PWR041" H 1850 3950 30 0001 C CNN
F 1 "GND" H 1850 3880 30 0001 C CNN
1 1850 3950
0 1 1 0
@@ -1799,10 +1806,10 @@ F 2 "SM0603" H 2400 4900 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #PWR041
+L GND #PWR042
U 1 1 4D020854
P 4450 850
-F 0 "#PWR041" H 4450 850 30 0001 C CNN
+F 0 "#PWR042" H 4450 850 30 0001 C CNN
F 1 "GND" H 4450 780 30 0001 C CNN
1 4450 850
-1 0 0 1
@@ -1844,10 +1851,10 @@ $EndComp
Text Label 10000 6550 0 60 ~ 0
I/O_PHONE
$Comp
-L GND #PWR042
+L GND #PWR043
U 1 1 4CF7CFEB
P 10100 6750
-F 0 "#PWR042" H 10100 6750 30 0001 C CNN
+F 0 "#PWR043" H 10100 6750 30 0001 C CNN
F 1 "GND" H 10100 6680 30 0001 C CNN
1 10100 6750
0 1 1 0
@@ -1865,10 +1872,10 @@ RST_SIM
Text Label 9150 4850 2 60 ~ 0
VCC_SIM
$Comp
-L GND #PWR043
+L GND #PWR044
U 1 1 4CF7C43B
P 10800 4850
-F 0 "#PWR043" H 10800 4850 30 0001 C CNN
+F 0 "#PWR044" H 10800 4850 30 0001 C CNN
F 1 "GND" H 10800 4780 30 0001 C CNN
1 10800 4850
0 -1 -1 0
@@ -1942,10 +1949,10 @@ F 2 "PIN_ARRAY-6X1" H 9950 3100 60 0001 C CNN
1 0 0 -1
$EndComp
$Comp
-L GND #PWR044
+L GND #PWR045
U 1 1 4CE9AA96
P 9450 2700
-F 0 "#PWR044" H 9450 2700 30 0001 C CNN
+F 0 "#PWR045" H 9450 2700 30 0001 C CNN
F 1 "GND" H 9450 2630 30 0001 C CNN
1 9450 2700
-1 0 0 1
@@ -1960,19 +1967,19 @@ Text Label 4450 2200 0 60 ~ 0
TDI
NoConn ~ 5050 2600
$Comp
-L GND #PWR045
+L GND #PWR046
U 1 1 4CE9A7C1
P 3900 2000
-F 0 "#PWR045" H 3900 2000 30 0001 C CNN
+F 0 "#PWR046" H 3900 2000 30 0001 C CNN
F 1 "GND" H 3900 1930 30 0001 C CNN
1 3900 2000
1 0 0 -1
$EndComp
$Comp
-L 3V3 #PWR046
+L 3V3 #PWR047
U 1 1 4CE9A701
P 1600 950
-F 0 "#PWR046" H 1600 1050 40 0001 C CNN
+F 0 "#PWR047" H 1600 1050 40 0001 C CNN
F 1 "3V3" H 1600 1075 40 0000 C CNN
1 1600 950
1 0 0 -1
@@ -2030,10 +2037,10 @@ $EndComp
NoConn ~ 2900 1900
NoConn ~ 2900 1800
$Comp
-L 1V8 #PWR047
+L 1V8 #PWR048
U 1 1 4CE94C54
P 3200 4850
-F 0 "#PWR047" H 3200 4990 20 0001 C CNN
+F 0 "#PWR048" H 3200 4990 20 0001 C CNN
F 1 "1V8" H 3200 4960 30 0000 C CNN
1 3200 4850
1 0 0 -1
@@ -2059,19 +2066,19 @@ DDM
Text Label 4350 2900 0 60 ~ 0
DDP
$Comp
-L 3V3 #PWR048
+L 3V3 #PWR049
U 1 1 4CE91A30
P 750 4100
-F 0 "#PWR048" H 750 4200 40 0001 C CNN
+F 0 "#PWR049" H 750 4200 40 0001 C CNN
F 1 "3V3" H 750 4225 40 0000 C CNN
1 750 4100
0 -1 -1 0
$EndComp
$Comp
-L GND #PWR049
+L GND #PWR050
U 1 1 4CE9163C
P 3600 3400
-F 0 "#PWR049" H 3600 3400 30 0001 C CNN
+F 0 "#PWR050" H 3600 3400 30 0001 C CNN
F 1 "GND" H 3600 3330 30 0001 C CNN
1 3600 3400
0 1 1 0
@@ -2107,10 +2114,10 @@ F 2 "Q_49U3HMS" H 4450 3400 60 0001 C CNN
0 1 1 0
$EndComp
$Comp
-L GND #PWR050
+L GND #PWR051
U 1 1 4CE8FFA5
P 4750 6150
-F 0 "#PWR050" H 4750 6150 30 0001 C CNN
+F 0 "#PWR051" H 4750 6150 30 0001 C CNN
F 1 "GND" H 4750 6080 30 0001 C CNN
1 4750 6150
1 0 0 -1