D2 and D3 now also use STPS340U instead of 1N5819

6 files changed, 522 insertions, 611 deletions

diff --git a/hardware/kicad/SIMtrace.brd b/hardware/kicad/SIMtrace.brd
index 92d1e90..4786407 100644
--- a/hardware/kicad/SIMtrace.brd
+++ b/hardware/kicad/SIMtrace.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Sa 02 Jul 2011 13:35:09 CEST
+PCBNEW-BOARD Version 1 date Sa 02 Jul 2011 19:50:23 CEST
 
 # Created by Pcbnew(2011-06-08)-testing
 
@@ -9,9 +9,9 @@ Ly 1FFF8001
 EnabledLayers 1FFF8001
 Links 192
 NoConn 0
-Di 14325 34909 48376 56341
+Di 14325 34909 48371 56341
 Ndraw 20
-Ntrack 980
+Ntrack 979
 Nzone 0
 BoardThickness 630
 Nmodule 69
@@ -379,13 +379,13 @@ uViaDia 200
 uViaDrill 50
 $EndNCLASS
 $MODULE FFC_REBELSIM
-Po 16750 42050 2700 15 4E0EF85E 4DCD07C6 ~~
+Po 16750 42050 2700 15 4E0F589F 4DCD07C6 ~~
 Li FFC_REBELSIM
 Sc 4DCD07C6
 AR /4DC51F05
 Op 0 0 0
 T0 100 900 600 600 2700 120 N V 21 N "P3"
-T1 2850 400 600 600 3600 120 N V 21 N "FFC"
+T1 2850 -400 600 600 3600 120 N V 21 N "FFC_SIM"
 DS -2087 1693 -2087 0 150 21
 DS -2087 0 2087 0 150 21
 DS 2087 0 2087 1693 150 21
@@ -415,6 +415,7 @@ Dr 0 0 0
 At SMD N 00888000
 Ne 5 "/CLK_PHONE"
 Po -197 -197
+Le -9474193
 $EndPAD
 $PAD
 Sh "4" R 236 787 0 0 2700
@@ -458,13 +459,13 @@ Le 1107296256
 $EndPAD
 $EndMODULE  FFC_REBELSIM
 $MODULE JACK_2.5
-Po 45150 40100 1800 15 4E0EFA59 4DCD07C7 ~~
+Po 45150 40100 1800 15 4E0F5891 4DCD07C7 ~~
 Li JACK_2.5
 Sc 4DCD07C7
 AR /4DCBE233
 Op 0 0 0
 T0 200 1500 600 600 1800 120 N I 21 N "J2"
-T1 -400 -2350 600 600 1800 120 N V 21 N "JACK_2.5"
+T1 1650 -1700 600 600 1800 120 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
@@ -581,6 +582,7 @@ Dr 400 0 0
 At STD N 00E0FFFF
 Ne 29 "/TMS"
 Po -2500 500
+Le -328966
 $EndPAD
 $PAD
 Sh "8" C 600 600 0 0 0
@@ -628,6 +630,7 @@ Dr 400 0 0
 At STD N 00E0FFFF
 Ne 27 "/TDO"
 Po 500 500
+Le -2368549
 $EndPAD
 $PAD
 Sh "14" C 600 600 0 0 0
@@ -667,6 +670,7 @@ Dr 400 0 0
 At STD N 00E0FFFF
 Ne 37 "GND"
 Po 2500 -500
+Le -197380
 $EndPAD
 $PAD
 Sh "19" C 600 600 0 0 0
@@ -2169,7 +2173,7 @@ Ro 0.000000 0.000000 0.000000
 $EndSHAPE3D
 $EndMODULE  SM0805
 $MODULE SM0805
-Po 43900 52700 2700 15 4DFB171D 4DCD0826 ~~
+Po 42150 51300 2700 15 4DFB171D 4DCD0826 ~~
 Li SM0805
 Sc 4DCD0826
 AR /4DC79E48
@@ -2205,52 +2209,6 @@ Of 0.000000 0.000000 0.000000
 Ro 0.000000 0.000000 0.000000
 $EndSHAPE3D
 $EndMODULE  SM0805
-$MODULE SOD123
-Po 43300 54850 1800 15 4DFFC496 4DCD0828 ~~
-Li SOD123
-Sc 4DCD0828
-AR /4DCB8C0D
-Op 0 0 0
-T0 -1300 -50 300 300 1800 59 N V 21 N "D3"
-T1 0 -50 300 300 1800 59 N I 21 N "1N5819"
-$PAD
-Sh "2" R 358 480 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 56 "N-000063"
-Po 645 0
-$EndPAD
-$PAD
-Sh "1" R 358 480 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 40 "N-000019"
-Po -645 0
-$EndPAD
-$EndMODULE  SOD123
-$MODULE SOD123
-Po 43300 53950 1800 15 4DFFC42C 4DCD082A ~~
-Li SOD123
-Sc 4DCD082A
-AR /4DCB8C13
-Op 0 0 0
-T0 -1300 -50 300 300 1800 59 N V 21 N "D2"
-T1 0 -50 300 300 1800 59 N I 21 N "1N5819"
-$PAD
-Sh "2" R 358 480 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 56 "N-000063"
-Po 645 0
-$EndPAD
-$PAD
-Sh "1" R 358 480 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 31 "/USBVCC"
-Po -645 0
-$EndPAD
-$EndMODULE  SOD123
 $MODULE TQFP_64
 Po 32950 46800 2700 15 4DFDBDC2 4DCD0831 ~~
 Li TQFP_64
@@ -2939,7 +2897,7 @@ Po 1339 787
 $EndPAD
 $EndMODULE  PUSH_BUTTON
 $MODULE USB-MINI-B_UX60
-Po 45650 50000 900 15 4E0EF940 4DD21AF7 ~~
+Po 45650 50000 900 15 4E0F58A6 4DD21AF7 ~~
 Li USB-MINI-B_UX60
 Cd Hirose UX60-MB-5ST
 Sc 4DD21AF7
@@ -3913,6 +3871,64 @@ Ne 18 "/MOSI"
 Po -750 1455
 $EndPAD
 $EndMODULE  SOC008_WIDE
+$MODULE SMB_STPS340U
+Po 43300 53100 1800 15 4E0F59B2 4DCD082A ~~
+Li SMB_STPS340U
+Sc 4DCD082A
+AR /4DCB8C13
+Op 0 0 0
+T0 0 350 299 299 1800 59 N V 21 N "D2"
+T1 0 0 299 299 1800 59 N I 21 N "Schottky"
+DS -846 -709 846 -709 100 21
+DS 846 -709 846 709 100 21
+DS 846 709 -846 709 100 21
+DS -846 709 -846 -709 100 21
+$PAD
+Sh "1" R 598 906 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 31 "/USBVCC"
+Po -839 0
+Le 96820
+$EndPAD
+$PAD
+Sh "2" R 598 906 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 56 "N-000063"
+Po 839 0
+Le 42725632
+$EndPAD
+$EndMODULE  SMB_STPS340U
+$MODULE SMB_STPS340U
+Po 43300 54950 1800 15 4E0F59B9 4DCD0828 ~~
+Li SMB_STPS340U
+Sc 4DCD0828
+AR /4DCB8C0D
+Op 0 0 0
+T0 0 350 299 299 1800 59 N V 21 N "D3"
+T1 -100 50 299 299 1800 59 N I 21 N "Schottky"
+DS -846 -709 846 -709 100 21
+DS 846 -709 846 709 100 21
+DS 846 709 -846 709 100 21
+DS -846 709 -846 -709 100 21
+$PAD
+Sh "1" R 598 906 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 40 "N-000019"
+Po -839 0
+Le 18
+$EndPAD
+$PAD
+Sh "2" R 598 906 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 56 "N-000063"
+Po 839 0
+Le 3
+$EndPAD
+$EndMODULE  SMB_STPS340U
 $TEXTPCB
 Te "v1.0"
 Po 16300 55350 600 800 120 0
@@ -3933,12 +3949,12 @@ De 21 1 0 Normal
 $EndTEXTPCB
 $TEXTPCB
 Te "|<"
-Po 43250 54850 300 300 59 0
+Po 43300 55300 300 300 59 0
 De 21 1 0 Normal
 $EndTEXTPCB
 $TEXTPCB
 Te "|<"
-Po 43250 53950 300 300 59 0
+Po 43300 53450 300 300 59 0
 De 21 1 0 Normal
 $EndTEXTPCB
 $TEXTPCB
@@ -4162,14 +4178,8 @@ Po 0 37584 41084 38865 41084 80 -1
 De 15 0 2 0 0
 Po 0 33700 37200 37584 41084 80 -1
 De 15 0 2 0 400800
-Po 0 44072 49685 44764 49685 80 -1
-De 15 0 3 0 800400
-Po 0 43750 49363 44072 49685 80 -1
-De 15 0 3 0 0
-Po 0 43750 47450 43750 49363 80 -1
-De 15 0 3 0 400800
-Po 0 35969 46702 35325 46702 80 -1
-De 15 0 3 0 800400
+Po 0 44764 49685 45735 49685 80 -1
+De 15 0 3 0 400000
 Po 0 36091 46580 35969 46702 80 -1
 De 15 0 3 0 0
 Po 0 38439 46580 36091 46580 80 -1
@@ -4178,21 +4188,29 @@ Po 0 40824 48965 38439 46580 80 -1
 De 15 0 3 0 0
 Po 0 40824 49965 40824 48965 80 -1
 De 15 0 3 0 0
-Po 0 43503 52644 40824 49965 80 -1
+Po 0 35969 46702 35325 46702 80 -1
+De 15 0 3 0 800400
+Po 0 40824 50424 40824 49965 80 -1
+De 15 0 3 0 0
+Po 0 41700 51300 40824 50424 80 -1
 De 15 0 3 0 0
-Po 0 45161 52644 43503 52644 80 -1
+Po 0 42900 51300 41700 51300 80 -1
 De 15 0 3 0 0
-Po 0 45515 52290 45161 52644 80 -1
+Po 0 44000 52400 42900 51300 80 -1
 De 15 0 3 0 0
-Po 0 45515 51111 45515 52290 80 -1
+Po 0 45800 52400 44000 52400 80 -1
 De 15 0 3 0 0
-Po 0 45301 50897 45515 51111 80 -1
+Po 0 46150 52050 45800 52400 80 -1
 De 15 0 3 0 0
-Po 0 45301 49707 45301 50897 80 -1
+Po 0 46150 50100 46150 52050 80 -1
 De 15 0 3 0 0
-Po 0 45279 49685 45301 49707 80 -1
+Po 0 45735 49685 46150 50100 80 -1
 De 15 0 3 0 0
-Po 0 44764 49685 45279 49685 80 -1
+Po 0 44072 49685 44764 49685 80 -1
+De 15 0 3 0 800400
+Po 0 43750 49363 44072 49685 80 -1
+De 15 0 3 0 0
+Po 0 43750 47450 43750 49363 80 -1
 De 15 0 3 0 400800
 Po 0 23939 37637 24712 37637 80 -1
 De 15 0 4 0 400800
@@ -4862,10 +4880,12 @@ Po 0 45833 46544 46154 46223 80 -1
 De 15 0 30 0 400800
 Po 0 46154 46223 46154 45254 80 -1
 De 15 0 30 0 0
-Po 0 43900 53075 43900 53905 160 -1
-De 15 0 31 0 400800
-Po 0 43900 53905 43945 53950 160 -1
-De 15 0 31 0 800400
+Po 0 44139 53100 43950 53100 160 -1
+De 15 0 31 0 400000
+Po 0 42525 51675 42150 51675 160 -1
+De 15 0 31 0 800000
+Po 0 43950 53100 42525 51675 160 -1
+De 15 0 31 0 0
 Po 0 40444 49400 40444 49194 80 -1
 De 15 0 32 0 0
 Po 0 36939 48600 35218 50321 80 -1
@@ -5440,14 +5460,6 @@ Po 0 44764 49370 44227 49370 80 -1
 De 15 0 37 0 400800
 Po 0 44764 49370 45300 49370 80 -1
 De 15 0 37 0 400800
-Po 0 46000 55300 46600 54700 160 -1
-De 15 0 37 0 800400
-Po 0 40492 55300 46000 55300 160 -1
-De 15 0 37 0 0
-Po 0 40450 55258 40492 55300 160 -1
-De 15 0 37 0 0
-Po 0 40450 54850 40450 55258 160 -1
-De 15 0 37 0 400800
 Po 0 22826 36403 23166 36063 80 -1
 De 15 0 37 0 0
 Po 0 19752 36403 22826 36403 80 -1
@@ -5754,12 +5766,12 @@ Po 0 41806 44533 41806 45158 80 -1
 De 15 0 39 0 400800
 Po 0 41795 45537 41795 45169 80 -1
 De 15 0 39 0 400800
-Po 0 45417 53700 44267 54850 80 -1
+Po 0 44139 54950 44400 54950 160 -1
+De 15 0 40 0 400000
+Po 0 45650 53700 46600 53700 160 -1
+De 15 0 40 0 800000
+Po 0 44400 54950 45650 53700 160 -1
 De 15 0 40 0 0
-Po 0 46600 53700 45417 53700 80 -1
-De 15 0 40 0 400800
-Po 0 43945 54850 44267 54850 80 -1
-De 15 0 40 0 400800
 Po 0 43050 50000 44764 50000 80 -1
 De 15 0 41 0 800400
 Po 0 42750 49700 43050 50000 80 -1
@@ -5910,12 +5922,10 @@ Po 0 40750 47350 41550 48150 80 -1
 De 15 0 53 0 0
 Po 0 40750 47300 40750 47350 80 -1
 De 15 0 53 0 400800
-Po 0 44764 50630 44220 50630 160 -1
-De 15 0 54 0 400800
-Po 0 43900 50950 43900 52325 160 -1
-De 15 0 54 0 800400
-Po 0 44220 50630 43900 50950 160 -1
-De 15 0 54 0 0
+Po 0 44764 50630 42445 50630 160 -1
+De 15 0 54 0 400000
+Po 0 42445 50630 42150 50925 160 -1
+De 15 0 54 0 800000
 Po 0 39643 50061 39450 49868 80 -1
 De 15 0 55 0 0
 Po 0 39643 50850 39643 50061 80 -1
@@ -5924,16 +5934,20 @@ Po 0 39400 50850 39643 50850 80 -1
 De 15 0 55 0 400800
 Po 0 39450 49500 39450 49868 80 -1
 De 15 0 55 0 400800
-Po 0 42655 53950 42655 53919 160 -1
-De 15 0 56 0 400800
-Po 0 42655 53919 41074 52338 160 -1
-De 15 0 56 0 800400
+Po 0 42461 54950 42461 53100 160 -1
+De 15 0 56 0 C00000
+Po 0 42461 54950 41150 54950 160 -1
+De 15 0 56 0 400000
+Po 0 41150 54950 41050 54850 160 -1
+De 15 0 56 0 800000
+Po 0 42461 53100 42300 53100 160 -1
+De 15 0 56 0 400000
+Po 0 42300 53100 41538 52338 160 -1
+De 15 0 56 0 0
+Po 0 41538 52338 41074 52338 160 -1
+De 15 0 56 0 800000
 Po 0 41074 52338 40700 52338 160 -1
 De 15 0 56 0 C00C00
-Po 0 41050 54850 42655 54850 160 -1
-De 15 0 56 0 C00C00
-Po 0 42655 53950 42655 54850 160 -1
-De 15 0 56 0 C00C00
 Po 0 40700 52338 41074 52338 80 -1
 De 15 0 56 0 C00C00
 Po 0 27283 43495 27283 43763 80 -1
@@ -6691,76 +6705,59 @@ $POLYSCORNERS
 45713 45224 0 0
 45839 45350 1 0
 47960 56010 0 0
-47631 56010 0 0
-47631 52196 0 0
-47631 52097 0 0
-47631 51113 0 0
-47631 48888 0 0
-47631 48789 0 0
-47631 47805 0 0
-47593 47713 0 0
-47565 47685 0 0
-47565 38923 0 0
-47565 38699 0 0
-47564 38280 0 0
-47564 38181 0 0
-47526 38090 0 0
-47456 38020 0 0
-47364 37982 0 0
-46955 37981 0 0
-46893 38043 0 0
-46893 38761 0 0
-47503 38761 0 0
-47565 38699 0 0
-47565 38923 0 0
-47503 38861 0 0
-46893 38861 0 0
-46893 39579 0 0
-46955 39641 0 0
-47364 39640 0 0
-47456 39602 0 0
-47526 39532 0 0
-47564 39441 0 0
-47564 39342 0 0
-47565 38923 0 0
-47565 47685 0 0
-47523 47643 0 0
-47432 47605 0 0
-47333 47605 0 0
-46467 47605 0 0
-46375 47643 0 0
-46305 47713 0 0
-46267 47804 0 0
-46267 47903 0 0
-46267 48887 0 0
-46305 48979 0 0
-46375 49049 0 0
-46466 49087 0 0
-46565 49087 0 0
-47431 49087 0 0
-47523 49049 0 0
-47593 48979 0 0
-47631 48888 0 0
-47631 51113 0 0
-47593 51021 0 0
-47523 50951 0 0
-47432 50913 0 0
-47333 50913 0 0
-46467 50913 0 0
-46375 50951 0 0
-46305 51021 0 0
-46267 51112 0 0
-46267 51211 0 0
-46267 52195 0 0
-46305 52287 0 0
-46375 52357 0 0
-46466 52395 0 0
-46565 52395 0 0
-47431 52395 0 0
-47523 52357 0 0
-47593 52287 0 0
-47631 52196 0 0
-47631 56010 0 0
+47149 56010 0 0
+47149 54050 0 0
+47149 53951 0 0
+47149 53351 0 0
+47111 53259 0 0
+47041 53189 0 0
+46950 53151 0 0
+46851 53151 0 0
+46251 53151 0 0
+46159 53189 0 0
+46089 53259 0 0
+46051 53350 0 0
+46051 53370 0 0
+45650 53370 0 0
+45524 53395 0 0
+45488 53419 0 0
+45416 53467 0 0
+44588 54295 0 0
+44579 54286 0 0
+44488 54248 0 0
+44389 54248 0 0
+43791 54248 0 0
+43699 54286 0 0
+43629 54356 0 0
+43591 54447 0 0
+43591 54546 0 0
+43591 55452 0 0
+43629 55544 0 0
+43699 55614 0 0
+43790 55652 0 0
+43889 55652 0 0
+44487 55652 0 0
+44579 55614 0 0
+44649 55544 0 0
+44687 55453 0 0
+44687 55354 0 0
+44687 55129 0 0
+45786 54030 0 0
+46051 54030 0 0
+46051 54049 0 0
+46089 54141 0 0
+46159 54211 0 0
+46250 54249 0 0
+46312 54249 0 0
+46292 54322 0 0
+46600 54629 0 0
+46908 54322 0 0
+46887 54249 0 0
+46949 54249 0 0
+47041 54211 0 0
+47111 54141 0 0
+47149 54050 0 0
+47149 56010 0 0
 47143 56010 0 0
 47143 54779 0 0
 47132 54566 0 0
@@ -6905,15 +6902,26 @@ $POLYSCORNERS
 41403 53719 0 0
 41441 53628 0 0
 41441 53529 0 0
-41441 53171 0 0
-42227 53957 0 0
-42227 54239 0 0
-42265 54331 0 0
-42325 54391 0 0
-42325 54409 0 0
-42265 54469 0 0
-42243 54520 0 0
-41400 54520 0 0
+41441 53097 0 0
+41413 53029 0 0
+41453 52934 0 0
+41453 52765 0 0
+41421 52687 0 0
+41913 53179 0 0
+41913 53602 0 0
+41951 53694 0 0
+42021 53764 0 0
+42112 53802 0 0
+42131 53802 0 0
+42131 54248 0 0
+42113 54248 0 0
+42021 54286 0 0
+41951 54356 0 0
+41913 54447 0 0
+41913 54546 0 0
+41913 54620 0 0
+41424 54620 0 0
+41424 54576 0 0
 41386 54484 0 0
 41316 54414 0 0
 41225 54376 0 0
@@ -6939,149 +6947,115 @@ $POLYSCORNERS
 40974 55324 0 0
 41224 55324 0 0
 41316 55286 0 0
-41386 55216 0 0
-41401 55180 0 0
-42243 55180 0 0
-42265 55231 0 0
-42335 55301 0 0
-42426 55339 0 0
-42525 55339 0 0
-42883 55339 0 0
-42975 55301 0 0
-43045 55231 0 0
-43083 55140 0 0
-43083 55041 0 0
-43083 54561 0 0
-43045 54469 0 0
-42985 54409 0 0
-42985 54391 0 0
-43045 54331 0 0
-43083 54240 0 0
-43083 54141 0 0
-43083 53661 0 0
-43045 53569 0 0
-42975 53499 0 0
-42884 53461 0 0
-42785 53461 0 0
-42663 53461 0 0
-41441 52238 0 0
-41441 52073 0 0
-41403 51981 0 0
-41333 51911 0 0
-41242 51873 0 0
-41143 51873 0 0
-40907 51873 0 0
-40887 51881 0 0
-40868 51873 0 0
-40769 51873 0 0
-40533 51873 0 0
-40513 51881 0 0
-40494 51873 0 0
-40395 51873 0 0
-40159 51873 0 0
-40067 51911 0 0
-39997 51981 0 0
-39985 52008 0 0
-39898 52008 0 0
-40845 51061 0 0
-40908 50967 0 0
-40930 50856 0 0
-40930 50481 0 0
-43297 52849 0 0
-43298 52849 0 0
-43376 52901 0 0
-43376 52949 0 0
-43376 53299 0 0
-43414 53391 0 0
-43484 53461 0 0
-43570 53496 0 0
-43570 53554 0 0
-43555 53569 0 0
-43517 53660 0 0
-43517 53759 0 0
-43517 54239 0 0
-43555 54331 0 0
-43624 54400 0 0
-43555 54469 0 0
-43517 54560 0 0
-43517 54659 0 0
-43517 55139 0 0
-43555 55231 0 0
-43625 55301 0 0
-43716 55339 0 0
-43815 55339 0 0
-44173 55339 0 0
-44265 55301 0 0
-44335 55231 0 0
-44373 55140 0 0
-44373 55118 0 0
-44378 55118 0 0
-44472 55055 0 0
-45537 53990 0 0
-46051 53990 0 0
-46051 54049 0 0
-46089 54141 0 0
-46159 54211 0 0
-46250 54249 0 0
-46312 54249 0 0
-46292 54322 0 0
-46600 54629 0 0
-46908 54322 0 0
-46887 54249 0 0
-46949 54249 0 0
-47041 54211 0 0
-47111 54141 0 0
-47149 54050 0 0
-47149 53951 0 0
-47149 53351 0 0
-47111 53259 0 0
-47041 53189 0 0
-46950 53151 0 0
-46851 53151 0 0
-46251 53151 0 0
-46159 53189 0 0
-46089 53259 0 0
-46051 53350 0 0
-46051 53410 0 0
-45417 53410 0 0
-45306 53432 0 0
-45212 53495 0 0
-44286 54420 0 0
-44266 54400 0 0
-44335 54331 0 0
-44373 54240 0 0
-44373 54141 0 0
-44373 53661 0 0
-44335 53569 0 0
-44265 53499 0 0
-44244 53490 0 0
-44316 53461 0 0
-44386 53391 0 0
-44424 53300 0 0
-44424 53201 0 0
-44424 52934 0 0
-45161 52934 0 0
-45272 52912 0 0
-45366 52849 0 0
-45720 52496 0 0
-45720 52495 0 0
-45783 52401 0 0
-45804 52290 0 0
-45805 52290 0 0
-45805 51111 0 0
-45800 51088 0 0
-45891 51051 0 0
-46011 50932 0 0
-46077 50775 0 0
-46077 50605 0 0
-46012 50448 0 0
-45893 50328 0 0
-45736 50262 0 0
-45591 50262 0 0
-45591 49738 0 0
-45734 49738 0 0
-45891 49673 0 0
-46011 49554 0 0
+41322 55280 0 0
+41913 55280 0 0
+41913 55452 0 0
+41951 55544 0 0
+42021 55614 0 0
+42112 55652 0 0
+42211 55652 0 0
+42809 55652 0 0
+42901 55614 0 0
+42971 55544 0 0
+43009 55453 0 0
+43009 55354 0 0
+43009 54448 0 0
+42971 54356 0 0
+42901 54286 0 0
+42810 54248 0 0
+42791 54248 0 0
+42791 53802 0 0
+42809 53802 0 0
+42901 53764 0 0
+42971 53694 0 0
+43009 53603 0 0
+43009 53504 0 0
+43009 52625 0 0
+43591 53207 0 0
+43591 53602 0 0
+43629 53694 0 0
+43699 53764 0 0
+43790 53802 0 0
+43889 53802 0 0
+44487 53802 0 0
+44579 53764 0 0
+44649 53694 0 0
+44687 53603 0 0
+44687 53504 0 0
+44687 52690 0 0
+45800 52690 0 0
+45911 52668 0 0
+46005 52605 0 0
+46314 52296 0 0
+46375 52357 0 0
+46466 52395 0 0
+46565 52395 0 0
+47431 52395 0 0
+47523 52357 0 0
+47593 52287 0 0
+47631 52196 0 0
+47631 52097 0 0
+47631 51113 0 0
+47631 48888 0 0
+47631 48789 0 0
+47631 47805 0 0
+47593 47713 0 0
+47565 47685 0 0
+47565 38923 0 0
+47565 38699 0 0
+47564 38280 0 0
+47564 38181 0 0
+47526 38090 0 0
+47456 38020 0 0
+47364 37982 0 0
+46955 37981 0 0
+46893 38043 0 0
+46893 38761 0 0
+47503 38761 0 0
+47565 38699 0 0
+47565 38923 0 0
+47503 38861 0 0
+46893 38861 0 0
+46893 39579 0 0
+46955 39641 0 0
+47364 39640 0 0
+47456 39602 0 0
+47526 39532 0 0
+47564 39441 0 0
+47564 39342 0 0
+47565 38923 0 0
+47565 47685 0 0
+47523 47643 0 0
+47432 47605 0 0
+47333 47605 0 0
+46467 47605 0 0
+46375 47643 0 0
+46305 47713 0 0
+46267 47804 0 0
+46267 47903 0 0
+46267 48887 0 0
+46305 48979 0 0
+46375 49049 0 0
+46466 49087 0 0
+46565 49087 0 0
+47431 49087 0 0
+47523 49049 0 0
+47593 48979 0 0
+47631 48888 0 0
+47631 51113 0 0
+47593 51021 0 0
+47523 50951 0 0
+47432 50913 0 0
+47333 50913 0 0
+46467 50913 0 0
+46440 50924 0 0
+46440 50100 0 0
+46439 50099 0 0
+46418 49989 0 0
+46417 49988 0 0
+46355 49895 0 0
+46354 49894 0 0
+46011 49551 0 0
 46077 49397 0 0
 46077 49227 0 0
 46012 49070 0 0
@@ -10814,14 +10788,14 @@ $FILLSEGMENTS
 17590 49480 18009 49480
 19505 49480 19596 49480
 19596 49480 19861 49480
-46043 49480 47631 49480
+46042 49480 47631 49480
 47631 49480 47960 49480
 14740 49560 16596 49560
 16596 49560 16990 49560
 16990 49560 17590 49560
 17590 49560 19596 49560
 19596 49560 19861 49560
-46005 49560 47631 49560
+46020 49560 47631 49560
 47631 49560 47960 49560
 14740 49640 14989 49640
 16525 49640 16596 49640
@@ -10830,7 +10804,7 @@ $FILLSEGMENTS
 17590 49640 17989 49640
 19525 49640 19596 49640
 19596 49640 19872 49640
-45925 49640 47631 49640
+46100 49640 47631 49640
 47631 49640 47960 49640
 14740 49720 14936 49720
 16577 49720 16596 49720
@@ -10839,28 +10813,28 @@ $FILLSEGMENTS
 17590 49720 17936 49720
 19577 49720 19596 49720
 19596 49720 19900 49720
-45778 49720 47631 49720
+46180 49720 47631 49720
 47631 49720 47960 49720
 14740 49800 14918 49800
 16596 49800 16990 49800
 16990 49800 17590 49800
 17590 49800 17918 49800
 19596 49800 19956 49800
-45591 49800 47631 49800
+46260 49800 47631 49800
 47631 49800 47960 49800
 14740 49880 14918 49880
 16596 49880 16990 49880
 16990 49880 17590 49880
 17590 49880 17918 49880
 19596 49880 20036 49880
-45591 49880 47631 49880
+46340 49880 47631 49880
 47631 49880 47960 49880
 14740 49960 14918 49960
 16596 49960 16990 49960
 16990 49960 17590 49960
 17590 49960 17918 49960
 19596 49960 20116 49960
-45591 49960 47631 49960
+46398 49960 47631 49960
 47631 49960 47960 49960
 14740 50040 14918 50040
 16596 50040 16990 50040
@@ -10868,7 +10842,7 @@ $FILLSEGMENTS
 17590 50040 17918 50040
 19596 50040 20196 50040
 31298 50040 31326 50040
-45591 50040 47631 50040
+46427 50040 47631 50040
 47631 50040 47960 50040
 14740 50120 14918 50120
 16596 50120 16990 50120
@@ -10876,7 +10850,7 @@ $FILLSEGMENTS
 17590 50120 17918 50120
 19596 50120 20276 50120
 31218 50120 31326 50120
-45591 50120 47631 50120
+46440 50120 47631 50120
 47631 50120 47960 50120
 14740 50200 14918 50200
 16596 50200 16990 50200
@@ -10884,7 +10858,7 @@ $FILLSEGMENTS
 17590 50200 17918 50200
 19596 50200 20356 50200
 30947 50200 31294 50200
-45591 50200 47631 50200
+46440 50200 47631 50200
 47631 50200 47960 50200
 14740 50280 14918 50280
 16596 50280 16990 50280
@@ -10892,7 +10866,7 @@ $FILLSEGMENTS
 17590 50280 17918 50280
 19596 50280 20436 50280
 30867 50280 31214 50280
-45778 50280 47631 50280
+46440 50280 47631 50280
 47631 50280 47960 50280
 14740 50360 14929 50360
 16586 50360 16596 50360
@@ -10902,7 +10876,7 @@ $FILLSEGMENTS
 19586 50360 19596 50360
 19596 50360 20516 50360
 30787 50360 31151 50360
-45924 50360 47631 50360
+46440 50360 47631 50360
 47631 50360 47960 50360
 14740 50440 14969 50440
 16545 50440 16596 50440
@@ -10912,7 +10886,7 @@ $FILLSEGMENTS
 19545 50440 19596 50440
 19596 50440 20596 50440
 30707 50440 31109 50440
-46004 50440 47631 50440
+46440 50440 47631 50440
 47631 50440 47960 50440
 14740 50520 15082 50520
 16433 50520 16596 50520
@@ -10922,8 +10896,7 @@ $FILLSEGMENTS
 19433 50520 19596 50520
 19596 50520 20676 50520
 30627 50520 31007 50520
-40930 50520 40969 50520
-46041 50520 47631 50520
+46440 50520 47631 50520
 47631 50520 47960 50520
 14740 50600 15033 50600
 16480 50600 16596 50600
@@ -10933,8 +10906,7 @@ $FILLSEGMENTS
 19480 50600 19596 50600
 19596 50600 20756 50600
 30547 50600 30960 50600
-40930 50600 41049 50600
-46074 50600 47631 50600
+46440 50600 47631 50600
 47631 50600 47960 50600
 14740 50680 14953 50680
 16560 50680 16596 50680
@@ -10944,8 +10916,7 @@ $FILLSEGMENTS
 19560 50680 19596 50680
 19596 50680 20836 50680
 30467 50680 30946 50680
-40930 50680 41129 50680
-46077 50680 47631 50680
+46440 50680 47631 50680
 47631 50680 47960 50680
 14740 50760 14919 50760
 16593 50760 16596 50760
@@ -10955,8 +10926,7 @@ $FILLSEGMENTS
 19593 50760 19596 50760
 19596 50760 20916 50760
 30387 50760 30946 50760
-40930 50760 41209 50760
-46077 50760 47631 50760
+46440 50760 47631 50760
 47631 50760 47960 50760
 14740 50840 14918 50840
 16596 50840 16990 50840
@@ -10964,8 +10934,7 @@ $FILLSEGMENTS
 17590 50840 17918 50840
 19596 50840 20996 50840
 30307 50840 30946 50840
-40930 50840 41289 50840
-46050 50840 47631 50840
+46440 50840 47631 50840
 47631 50840 47960 50840
 14740 50920 14918 50920
 16596 50920 16990 50920
@@ -10973,8 +10942,7 @@ $FILLSEGMENTS
 17590 50920 17918 50920
 19596 50920 21076 50920
 30227 50920 30946 50920
-40918 50920 41369 50920
-46017 50920 46450 50920
+46440 50920 46449 50920
 47448 50920 47631 50920
 47631 50920 47960 50920
 14740 51000 14918 51000
@@ -10983,8 +10951,6 @@ $FILLSEGMENTS
 17590 51000 17918 51000
 19596 51000 21156 51000
 30147 51000 30954 51000
-40886 51000 41449 51000
-45943 51000 46326 51000
 47572 51000 47631 51000
 47631 51000 47960 51000
 14740 51080 14918 51080
@@ -10993,8 +10959,6 @@ $FILLSEGMENTS
 17590 51080 17918 51080
 19596 51080 21236 51080
 30067 51080 30989 51080
-40826 51080 41529 51080
-45820 51080 46280 51080
 47617 51080 47631 51080
 47631 51080 47960 51080
 14740 51160 14918 51160
@@ -11003,8 +10967,6 @@ $FILLSEGMENTS
 17590 51160 17918 51160
 19596 51160 21316 51160
 29987 51160 30976 51160
-40746 51160 41609 51160
-45805 51160 46267 51160
 47631 51160 47960 51160
 14740 51240 14918 51240
 16596 51240 16990 51240
@@ -11012,8 +10974,6 @@ $FILLSEGMENTS
 17590 51240 17918 51240
 19596 51240 21396 51240
 29907 51240 30945 51240
-40666 51240 41689 51240
-45805 51240 46267 51240
 47631 51240 47960 51240
 14740 51320 14918 51320
 16596 51320 16990 51320
@@ -11021,8 +10981,6 @@ $FILLSEGMENTS
 17590 51320 17918 51320
 19596 51320 21476 51320
 29827 51320 30968 51320
-40586 51320 41769 51320
-45805 51320 46267 51320
 47631 51320 47960 51320
 14740 51400 14945 51400
 16570 51400 16596 51400
@@ -11032,8 +10990,6 @@ $FILLSEGMENTS
 19570 51400 19596 51400
 19596 51400 21556 51400
 29747 51400 31470 51400
-40506 51400 41849 51400
-45805 51400 46267 51400
 47631 51400 47960 51400
 14740 51480 15009 51480
 16505 51480 16596 51480
@@ -11044,8 +11000,6 @@ $FILLSEGMENTS
 19596 51480 21636 51480
 29667 51480 30986 51480
 31370 51480 31470 51480
-40426 51480 41929 51480
-45805 51480 46267 51480
 47631 51480 47960 51480
 14740 51560 16596 51560
 16596 51560 16990 51560
@@ -11054,8 +11008,6 @@ $FILLSEGMENTS
 19596 51560 21747 51560
 29557 51560 30946 51560
 31370 51560 31470 51560
-40346 51560 42009 51560
-45805 51560 46267 51560
 47631 51560 47960 51560
 14740 51640 14989 51640
 16525 51640 16596 51640
@@ -11066,8 +11018,6 @@ $FILLSEGMENTS
 19596 51640 24701 51640
 26105 51640 30970 51640
 31370 51640 31470 51640
-40266 51640 42089 51640
-45805 51640 46267 51640
 47631 51640 47960 51640
 14740 51720 14936 51720
 16577 51720 16596 51720
@@ -11078,8 +11028,6 @@ $FILLSEGMENTS
 19596 51720 24738 51720
 26068 51720 31029 51720
 31370 51720 31470 51720
-40186 51720 42169 51720
-45805 51720 46267 51720
 47631 51720 47960 51720
 14740 51800 14918 51800
 16596 51800 16990 51800
@@ -11087,8 +11035,6 @@ $FILLSEGMENTS
 17590 51800 17918 51800
 19596 51800 31370 51800
 31370 51800 31720 51800
-40106 51800 42249 51800
-45805 51800 46267 51800
 47631 51800 47960 51800
 14740 51880 14918 51880
 16596 51880 16990 51880
@@ -11098,11 +11044,6 @@ $FILLSEGMENTS
 26080 51880 29953 51880
 30147 51880 31370 51880
 31370 51880 31720 51880
-40026 51880 40142 51880
-40510 51880 40515 51880
-40884 51880 40889 51880
-41258 51880 42329 51880
-45805 51880 46267 51880
 47631 51880 47960 51880
 14740 51960 14918 51960
 16596 51960 16990 51960
@@ -11112,9 +11053,6 @@ $FILLSEGMENTS
 26105 51960 29789 51960
 30311 51960 31370 51960
 31370 51960 31720 51960
-39946 51960 40018 51960
-41382 51960 42409 51960
-45805 51960 46267 51960
 47631 51960 47960 51960
 14740 52040 14918 52040
 16596 52040 16990 52040
@@ -11124,8 +11062,6 @@ $FILLSEGMENTS
 26201 52040 29709 52040
 30391 52040 31370 52040
 31370 52040 31720 52040
-41427 52040 42489 52040
-45805 52040 46267 52040
 47631 52040 47960 52040
 14740 52120 14918 52120
 16596 52120 16990 52120
@@ -11135,8 +11071,6 @@ $FILLSEGMENTS
 26291 52120 29664 52120
 30435 52120 31370 52120
 31370 52120 31720 52120
-41441 52120 42569 52120
-45805 52120 46267 52120
 47631 52120 47960 52120
 14740 52200 14918 52200
 16596 52200 16990 52200
@@ -11146,10 +11080,7 @@ $FILLSEGMENTS
 26371 52200 29631 52200
 30468 52200 31370 52200
 31370 52200 31720 52200
-41441 52200 42649 52200
-45805 52200 46270 52200
-47630 52200 47631 52200
-47631 52200 47960 52200
+47630 52200 47960 52200
 14740 52280 14918 52280
 16596 52280 16990 52280
 16990 52280 17590 52280
@@ -11158,10 +11089,7 @@ $FILLSEGMENTS
 26451 52280 29625 52280
 30475 52280 31370 52280
 31370 52280 31720 52280
-41482 52280 42729 52280
-45805 52280 46303 52280
-47596 52280 47631 52280
-47631 52280 47960 52280
+47596 52280 47960 52280
 14740 52360 14929 52360
 16586 52360 16596 52360
 16596 52360 16990 52360
@@ -11172,10 +11100,8 @@ $FILLSEGMENTS
 26531 52360 29597 52360
 30475 52360 31370 52360
 31370 52360 31720 52360
-41562 52360 42809 52360
-45791 52360 46383 52360
-47516 52360 47631 52360
-47631 52360 47960 52360
+46250 52360 46383 52360
+47516 52360 47960 52360
 14740 52440 14969 52440
 16545 52440 16596 52440
 16596 52440 16990 52440
@@ -11186,9 +11112,7 @@ $FILLSEGMENTS
 26611 52440 29561 52440
 30453 52440 31370 52440
 31370 52440 31720 52440
-41642 52440 42889 52440
-45757 52440 47631 52440
-47631 52440 47960 52440
+46170 52440 47960 52440
 14740 52520 15082 52520
 16433 52520 16596 52520
 16596 52520 16990 52520
@@ -11199,9 +11123,7 @@ $FILLSEGMENTS
 26691 52520 29547 52520
 30419 52520 31370 52520
 31370 52520 31720 52520
-41722 52520 42969 52520
-45696 52520 47631 52520
-47631 52520 47960 52520
+46090 52520 47960 52520
 14740 52600 16596 52600
 16596 52600 16990 52600
 16990 52600 17590 52600
@@ -11210,9 +11132,7 @@ $FILLSEGMENTS
 26771 52600 29547 52600
 30351 52600 31370 52600
 31370 52600 31720 52600
-41802 52600 43049 52600
-45616 52600 47631 52600
-47631 52600 47960 52600
+46010 52600 47960 52600
 14740 52680 16596 52680
 16596 52680 16990 52680
 16990 52680 17590 52680
@@ -11221,9 +11141,8 @@ $FILLSEGMENTS
 26851 52680 29547 52680
 30244 52680 31370 52680
 31370 52680 31720 52680
-41882 52680 43129 52680
-45536 52680 47631 52680
-47631 52680 47960 52680
+43009 52680 43064 52680
+45851 52680 47960 52680
 14740 52760 16596 52760
 16596 52760 16990 52760
 16990 52760 17590 52760
@@ -11232,9 +11151,9 @@ $FILLSEGMENTS
 26931 52760 29547 52760
 30127 52760 31370 52760
 31370 52760 31720 52760
-41962 52760 43209 52760
-45456 52760 47631 52760
-47631 52760 47960 52760
+41450 52760 41494 52760
+43009 52760 43144 52760
+44687 52760 47960 52760
 14740 52840 16596 52840
 16596 52840 16990 52840
 16990 52840 17590 52840
@@ -11243,9 +11162,9 @@ $FILLSEGMENTS
 27011 52840 29423 52840
 31077 52840 31370 52840
 31370 52840 31720 52840
-42042 52840 43289 52840
-45376 52840 47631 52840
-47631 52840 47960 52840
+41453 52840 41574 52840
+43009 52840 43224 52840
+44687 52840 47960 52840
 14740 52920 16596 52920
 16596 52920 16990 52920
 16990 52920 17590 52920
@@ -11253,48 +11172,47 @@ $FILLSEGMENTS
 19596 52920 26159 52920
 27091 52920 29370 52920
 31129 52920 31177 52920
-42122 52920 43376 52920
-45232 52920 47631 52920
-47631 52920 47960 52920
+41453 52920 41654 52920
+43009 52920 43304 52920
+44687 52920 47960 52920
 14740 53000 16596 53000
 16596 53000 16990 53000
 16990 53000 17590 53000
 17590 53000 19596 53000
 19596 53000 26239 53000
 27171 53000 29352 53000
-42202 53000 43376 53000
-44424 53000 47631 53000
-47631 53000 47960 53000
+41426 53000 41734 53000
+43009 53000 43384 53000
+44687 53000 47960 53000
 14740 53080 16596 53080
 16596 53080 16990 53080
 16990 53080 17590 53080
 17590 53080 19596 53080
 19596 53080 26319 53080
 27251 53080 29352 53080
-42282 53080 43376 53080
-44424 53080 47631 53080
-47631 53080 47960 53080
+41434 53080 41814 53080
+43009 53080 43464 53080
+44687 53080 47960 53080
 14740 53160 16596 53160
 16596 53160 16990 53160
 16990 53160 17590 53160
 17590 53160 19596 53160
 19596 53160 26399 53160
 27331 53160 29352 53160
-42362 53160 43376 53160
-44424 53160 46229 53160
-46971 53160 47631 53160
-47631 53160 47960 53160
+41441 53160 41894 53160
+43009 53160 43544 53160
+44687 53160 46229 53160
+46971 53160 47960 53160
 14740 53240 16596 53240
 16596 53240 16990 53240
 16990 53240 17590 53240
 17590 53240 19596 53240
 19596 53240 26479 53240
 27411 53240 29352 53240
-41441 53240 41510 53240
-42442 53240 43376 53240
-44424 53240 46108 53240
-47092 53240 47631 53240
-47631 53240 47960 53240
+41441 53240 41913 53240
+43009 53240 43591 53240
+44687 53240 46108 53240
+47092 53240 47960 53240
 14740 53320 16596 53320
 16596 53320 16990 53320
 16990 53320 17590 53320
@@ -11302,11 +11220,10 @@ $FILLSEGMENTS
 19596 53320 26559 53320
 27491 53320 29352 53320
 40693 53320 40707 53320
-41441 53320 41590 53320
-42522 53320 43385 53320
-44416 53320 46063 53320
-47136 53320 47631 53320
-47631 53320 47960 53320
+41441 53320 41913 53320
+43009 53320 43591 53320
+44687 53320 46063 53320
+47136 53320 47960 53320
 14740 53400 16596 53400
 16596 53400 16990 53400
 16990 53400 17590 53400
@@ -11315,11 +11232,10 @@ $FILLSEGMENTS
 27571 53400 28549 53400
 29051 53400 29352 53400
 40693 53400 40707 53400
-41441 53400 41670 53400
-42602 53400 43423 53400
-44377 53400 46051 53400
-47149 53400 47631 53400
-47631 53400 47960 53400
+41441 53400 41913 53400
+43009 53400 43591 53400
+44687 53400 45516 53400
+47149 53400 47960 53400
 14740 53480 16596 53480
 16596 53480 16990 53480
 16990 53480 17590 53480
@@ -11328,11 +11244,10 @@ $FILLSEGMENTS
 27651 53480 28469 53480
 29131 53480 29352 53480
 40693 53480 40707 53480
-41441 53480 41750 53480
-42929 53480 43531 53480
-44269 53480 45234 53480
-47149 53480 47631 53480
-47631 53480 47960 53480
+41441 53480 41913 53480
+43009 53480 43591 53480
+44687 53480 45403 53480
+47149 53480 47960 53480
 14740 53560 16596 53560
 16596 53560 16990 53560
 16990 53560 17590 53560
@@ -11341,11 +11256,10 @@ $FILLSEGMENTS
 27731 53560 28418 53560
 29181 53560 29363 53560
 40693 53560 40707 53560
-41441 53560 41830 53560
-43036 53560 43564 53560
-44326 53560 45146 53560
-47149 53560 47631 53560
-47631 53560 47960 53560
+41441 53560 41913 53560
+43009 53560 43591 53560
+44687 53560 45323 53560
+47149 53560 47960 53560
 14740 53640 16596 53640
 16596 53640 16990 53640
 16990 53640 17590 53640
@@ -11354,11 +11268,10 @@ $FILLSEGMENTS
 27811 53640 28385 53640
 29214 53640 29403 53640
 40688 53640 40713 53640
-41436 53640 41910 53640
-43074 53640 43525 53640
-44364 53640 45066 53640
-47149 53640 47631 53640
-47631 53640 47960 53640
+41436 53640 41929 53640
+42994 53640 43607 53640
+44672 53640 45243 53640
+47149 53640 47960 53640
 14740 53720 16596 53720
 16596 53720 16990 53720
 16990 53720 17590 53720
@@ -11370,11 +11283,10 @@ $FILLSEGMENTS
 30985 53720 31118 53720
 39300 53720 39998 53720
 40654 53720 40746 53720
-41402 53720 41990 53720
-43083 53720 43517 53720
-44373 53720 44986 53720
-47149 53720 47631 53720
-47631 53720 47960 53720
+41402 53720 41977 53720
+42945 53720 43655 53720
+44623 53720 45163 53720
+47149 53720 47960 53720
 14740 53800 16596 53800
 16596 53800 16990 53800
 16990 53800 17590 53800
@@ -11384,11 +11296,10 @@ $FILLSEGMENTS
 29260 53800 31107 53800
 39324 53800 40094 53800
 40616 53800 40784 53800
-41307 53800 42070 53800
-43083 53800 43517 53800
-44373 53800 44906 53800
-47149 53800 47631 53800
-47631 53800 47960 53800
+41307 53800 42108 53800
+42814 53800 43786 53800
+44492 53800 45083 53800
+47149 53800 47960 53800
 14740 53880 16596 53880
 16596 53880 16990 53880
 16990 53880 17590 53880
@@ -11397,81 +11308,72 @@ $FILLSEGMENTS
 28051 53880 28394 53880
 29340 53880 29433 53880
 30241 53880 30259 53880
-39324 53880 42150 53880
-43083 53880 43517 53880
-44373 53880 44826 53880
-47149 53880 47631 53880
-47631 53880 47960 53880
+39324 53880 42131 53880
+42791 53880 45003 53880
+47149 53880 47960 53880
 14740 53960 16596 53960
 16596 53960 16990 53960
 16990 53960 17590 53960
 17590 53960 19596 53960
 19596 53960 27199 53960
 28131 53960 28427 53960
-39303 53960 42227 53960
-43083 53960 43517 53960
-44373 53960 44746 53960
-47149 53960 47631 53960
-47631 53960 47960 53960
+39303 53960 42131 53960
+42791 53960 44923 53960
+47149 53960 47960 53960
 14740 54040 16596 54040
 16596 54040 16990 54040
 16990 54040 17590 54040
 17590 54040 19596 54040
 19596 54040 27279 54040
 28211 54040 28489 54040
-38953 54040 42227 54040
-43083 54040 43517 54040
-44373 54040 44666 54040
-45487 54040 46051 54040
-47149 54040 47631 54040
-47631 54040 47960 54040
+38953 54040 42131 54040
+42791 54040 44843 54040
+45776 54040 46051 54040
+47149 54040 47960 54040
 14740 54120 16596 54120
 16596 54120 16990 54120
 16990 54120 17590 54120
 17590 54120 19596 54120
 19596 54120 27359 54120
 28291 54120 28583 54120
-39283 54120 42227 54120
-43083 54120 43517 54120
-44373 54120 44586 54120
-45407 54120 46081 54120
-47120 54120 47631 54120
-47631 54120 47960 54120
+39283 54120 42131 54120
+42791 54120 44763 54120
+45696 54120 46081 54120
+47120 54120 47149 54120
+47149 54120 47960 54120
 14740 54200 16596 54200
 16596 54200 16990 54200
 16990 54200 17590 54200
 17590 54200 19596 54200
 19596 54200 27439 54200
 28371 54200 28840 54200
-39325 54200 42227 54200
-43083 54200 43517 54200
-44373 54200 44506 54200
-45327 54200 46148 54200
-47052 54200 47631 54200
-47631 54200 47960 54200
+39325 54200 42131 54200
+42791 54200 44683 54200
+45616 54200 46148 54200
+47052 54200 47149 54200
+47149 54200 47960 54200
 14740 54280 16596 54280
 16596 54280 16990 54280
 16990 54280 17590 54280
 17590 54280 19596 54280
 19596 54280 27519 54280
 28451 54280 28920 54280
-39324 54280 42244 54280
-43067 54280 43534 54280
-44357 54280 44426 54280
-45247 54280 46303 54280
-46895 54280 47631 54280
-47631 54280 47960 54280
+39324 54280 42035 54280
+42886 54280 43713 54280
+44564 54280 44603 54280
+45536 54280 46303 54280
+46895 54280 47149 54280
+47149 54280 47960 54280
 14740 54360 15081 54360
 16826 54360 16990 54360
 16990 54360 17590 54360
 17590 54360 18113 54360
 28968 54360 29000 54360
-39310 54360 42294 54360
-43016 54360 43584 54360
-44306 54360 44346 54360
-45167 54360 46331 54360
-46870 54360 47631 54360
-47631 54360 47960 54360
+39310 54360 41949 54360
+42972 54360 43627 54360
+45456 54360 46331 54360
+46870 54360 47149 54360
+47149 54360 47960 54360
 14740 54440 14969 54440
 16939 54440 16990 54440
 16990 54440 17590 54440
@@ -11480,13 +11382,13 @@ $FILLSEGMENTS
 39262 54440 40158 54440
 40400 54440 40500 54440
 40742 54440 40758 54440
-41342 54440 42294 54440
-43016 54440 43584 54440
-45087 54440 46120 54440
+41342 54440 41915 54440
+43005 54440 43593 54440
+45376 54440 46120 54440
 46269 54440 46411 54440
 46790 54440 46930 54440
-47080 54440 47631 54440
-47631 54440 47960 54440
+47080 54440 47149 54440
+47149 54440 47960 54440
 14740 54520 14928 54520
 16979 54520 16990 54520
 16990 54520 17590 54520
@@ -11494,70 +11396,72 @@ $FILLSEGMENTS
 28968 54520 29167 54520
 39296 54520 40098 54520
 40400 54520 40500 54520
-43066 54520 43533 54520
-45007 54520 46092 54520
+41400 54520 41913 54520
+43009 54520 43591 54520
+45296 54520 46092 54520
 46349 54520 46491 54520
 46710 54520 46850 54520
-47113 54520 47631 54520
-47631 54520 47960 54520
+47113 54520 47149 54520
+47149 54520 47960 54520
 14740 54600 14918 54600
 16990 54600 17590 54600
 17590 54600 18113 54600
 39322 54600 40076 54600
 40400 54600 40500 54600
-43083 54600 43517 54600
-44927 54600 46064 54600
+41424 54600 41913 54600
+43009 54600 43591 54600
+45216 54600 46064 54600
 46429 54600 46571 54600
 46630 54600 46770 54600
-47133 54600 47631 54600
-47631 54600 47960 54600
+47133 54600 47149 54600
+47149 54600 47960 54600
 14740 54680 14918 54680
 16990 54680 17590 54680
 17590 54680 18113 54680
 39322 54680 40075 54680
 40400 54680 40500 54680
-43083 54680 43517 54680
-44847 54680 46061 54680
+43009 54680 43591 54680
+45136 54680 46061 54680
 46509 54680 46690 54680
-47137 54680 47631 54680
-47631 54680 47960 54680
+47137 54680 47149 54680
+47149 54680 47960 54680
 14740 54760 14918 54760
 16990 54760 17590 54760
 17590 54760 18113 54760
 39308 54760 40097 54760
 40400 54760 40500 54760
-43083 54760 43517 54760
-44767 54760 46065 54760
+43009 54760 43591 54760
+45056 54760 46065 54760
 46470 54760 46529 54760
 46529 54760 46731 54760
-47142 54760 47631 54760
-47631 54760 47960 54760
+47142 54760 47149 54760
+47149 54760 47960 54760
 14740 54840 14918 54840
 16990 54840 17590 54840
 17590 54840 18113 54840
 38898 54840 40400 54840
 40400 54840 40500 54840
-43083 54840 43517 54840
-44687 54840 46071 54840
+43009 54840 43591 54840
+44976 54840 46071 54840
 46390 54840 46529 54840
 46529 54840 46530 54840
 46669 54840 46811 54840
 47122 54840 47143 54840
-47143 54840 47631 54840
-47631 54840 47960 54840
+47143 54840 47149 54840
+47149 54840 47960 54840
 14740 54920 14918 54920
 16990 54920 17590 54920
 17590 54920 18113 54920
 38898 54920 38998 54920
 39274 54920 40117 54920
 40400 54920 40500 54920
-43083 54920 43517 54920
-44607 54920 46104 54920
+43009 54920 43591 54920
+44896 54920 46104 54920
 46310 54920 46450 54920
 46749 54920 46891 54920
 47094 54920 47143 54920
-47143 54920 47631 54920
-47631 54920 47960 54920
+47143 54920 47149 54920
+47149 54920 47960 54920
 14740 55000 14918 55000
 16990 55000 17590 55000
 17590 55000 18113 55000
@@ -11565,13 +11469,13 @@ $FILLSEGMENTS
 39323 55000 39323 55000
 39323 55000 40076 55000
 40400 55000 40500 55000
-43083 55000 43517 55000
-44527 55000 46195 55000
+43009 55000 43591 55000
+44816 55000 46195 55000
 46230 55000 46370 55000
 46829 55000 46971 55000
 47006 55000 47143 55000
-47143 55000 47631 55000
-47631 55000 47960 55000
+47143 55000 47149 55000
+47149 55000 47960 55000
 14740 55080 14918 55080
 16990 55080 17590 55080
 17590 55080 18113 55080
@@ -11579,12 +11483,12 @@ $FILLSEGMENTS
 39322 55080 39323 55080
 39323 55080 40076 55080
 40400 55080 40500 55080
-43083 55080 43517 55080
-44435 55080 46293 55080
+43009 55080 43591 55080
+44736 55080 46293 55080
 46908 55080 46908 55080
 46908 55080 47143 55080
-47143 55080 47631 55080
-47631 55080 47960 55080
+47143 55080 47149 55080
+47149 55080 47960 55080
 14740 55160 14918 55160
 16990 55160 17590 55160
 17590 55160 18113 55160
@@ -11592,12 +11496,12 @@ $FILLSEGMENTS
 39311 55160 39323 55160
 39323 55160 40091 55160
 40400 55160 40500 55160
-43075 55160 43526 55160
-44365 55160 46316 55160
+43009 55160 43591 55160
+44687 55160 46316 55160
 46885 55160 46908 55160
 46908 55160 47143 55160
-47143 55160 47631 55160
-47631 55160 47960 55160
+47143 55160 47149 55160
+47149 55160 47960 55160
 14740 55240 14918 55240
 16990 55240 17590 55240
 17590 55240 18113 55240
@@ -11606,13 +11510,12 @@ $FILLSEGMENTS
 39267 55240 39323 55240
 39323 55240 40138 55240
 40400 55240 40500 55240
-41362 55240 42274 55240
-43036 55240 43564 55240
-44326 55240 46513 55240
+43009 55240 43591 55240
+44687 55240 46513 55240
 46580 55240 46908 55240
 46908 55240 47143 55240
-47143 55240 47631 55240
-47631 55240 47960 55240
+47143 55240 47149 55240
+47149 55240 47960 55240
 14740 55320 14922 55320
 16987 55320 16990 55320
 16990 55320 17590 55320
@@ -11625,50 +11528,58 @@ $FILLSEGMENTS
 40343 55320 40400 55320
 40400 55320 40557 55320
 40634 55320 40866 55320
-41234 55320 42381 55320
-42929 55320 43671 55320
-44219 55320 46908 55320
+41234 55320 41913 55320
+43009 55320 43591 55320
+44687 55320 46908 55320
 46908 55320 47143 55320
-47143 55320 47631 55320
-47631 55320 47960 55320
+47143 55320 47149 55320
+47149 55320 47960 55320
 14740 55400 14955 55400
 16954 55400 16990 55400
 16990 55400 17590 55400
 17590 55400 18113 55400
 28968 55400 39323 55400
 39323 55400 40400 55400
-40400 55400 46908 55400
+40400 55400 41913 55400
+43009 55400 43591 55400
+44687 55400 46908 55400
 46908 55400 47143 55400
-47143 55400 47631 55400
-47631 55400 47960 55400
+47143 55400 47149 55400
+47149 55400 47960 55400
 14740 55480 15043 55480
 16866 55480 16990 55480
 16990 55480 17590 55480
 17590 55480 18113 55480
 28968 55480 39323 55480
 39323 55480 40400 55480
-40400 55480 46908 55480
+40400 55480 41925 55480
+42998 55480 43603 55480
+44676 55480 46908 55480
 46908 55480 47143 55480
-47143 55480 47631 55480
-47631 55480 47960 55480
+47143 55480 47149 55480
+47149 55480 47960 55480
 14740 55560 16990 55560
 16990 55560 17590 55560
 17590 55560 18113 55560
 28968 55560 39323 55560
 39323 55560 40400 55560
-40400 55560 46908 55560
+40400 55560 41967 55560
+42955 55560 43645 55560
+44633 55560 46908 55560
 46908 55560 47143 55560
-47143 55560 47631 55560
-47631 55560 47960 55560
+47143 55560 47149 55560
+47149 55560 47960 55560
 14740 55640 16990 55640
 16990 55640 17590 55640
 17590 55640 18113 55640
 28968 55640 39323 55640
 39323 55640 40400 55640
-40400 55640 46908 55640
+40400 55640 42084 55640
+42839 55640 43762 55640
+44517 55640 46908 55640
 46908 55640 47143 55640
-47143 55640 47631 55640
-47631 55640 47960 55640
+47143 55640 47149 55640
+47149 55640 47960 55640
 14740 55720 16990 55720
 16990 55720 17590 55720
 17590 55720 18113 55720
@@ -11676,8 +11587,8 @@ $FILLSEGMENTS
 39323 55720 40400 55720
 40400 55720 46908 55720
 46908 55720 47143 55720
-47143 55720 47631 55720
-47631 55720 47960 55720
+47143 55720 47149 55720
+47149 55720 47960 55720
 14740 55800 16990 55800
 16990 55800 17590 55800
 17590 55800 18113 55800
@@ -11685,8 +11596,8 @@ $FILLSEGMENTS
 39323 55800 40400 55800
 40400 55800 46908 55800
 46908 55800 47143 55800
-47143 55800 47631 55800
-47631 55800 47960 55800
+47143 55800 47149 55800
+47149 55800 47960 55800
 14740 55880 16990 55880
 16990 55880 17590 55880
 17590 55880 18113 55880
@@ -11694,8 +11605,8 @@ $FILLSEGMENTS
 39323 55880 40400 55880
 40400 55880 46908 55880
 46908 55880 47143 55880
-47143 55880 47631 55880
-47631 55880 47960 55880
+47143 55880 47149 55880
+47149 55880 47960 55880
 14740 55960 16990 55960
 16990 55960 17590 55960
 17590 55960 18113 55960
@@ -11703,8 +11614,8 @@ $FILLSEGMENTS
 39323 55960 40400 55960
 40400 55960 46908 55960
 46908 55960 47143 55960
-47143 55960 47631 55960
-47631 55960 47960 55960
+47143 55960 47149 55960
+47149 55960 47960 55960
 $endFILLSEGMENTS
 $endCZONE_OUTLINE
 $CZONE_OUTLINE
diff --git a/hardware/kicad/SIMtrace.cmp b/hardware/kicad/SIMtrace.cmp
index 60e0abd..580c005 100644
--- a/hardware/kicad/SIMtrace.cmp
+++ b/hardware/kicad/SIMtrace.cmp
@@ -1,4 +1,4 @@
-Cmp-Mod V01 Created by CvPCB (2011-06-08)-testing date = Sa 02 Jul 2011 12:48:40 CEST
+Cmp-Mod V01 Created by CvPCB (2011-06-08)-testing date = Sa 02 Jul 2011 19:41:58 CEST
 
 BeginCmp
 TimeStamp = /4DC804A6;
@@ -171,15 +171,15 @@ EndCmp
 BeginCmp
 TimeStamp = /4DCB8C13;
 Reference = D2;
-ValeurCmp = 1N5819;
-IdModule  = SOD123;
+ValeurCmp = Schottky;
+IdModule  = SMB_STPS340U;
 EndCmp
 
 BeginCmp
 TimeStamp = /4DCB8C0D;
 Reference = D3;
-ValeurCmp = 1N5819;
-IdModule  = SOD123;
+ValeurCmp = Schottky;
+IdModule  = SMB_STPS340U;
 EndCmp
 
 BeginCmp
diff --git a/hardware/kicad/SIMtrace.net b/hardware/kicad/SIMtrace.net
index b8bd4bc..5590882 100644
--- a/hardware/kicad/SIMtrace.net
+++ b/hardware/kicad/SIMtrace.net
@@ -1,4 +1,4 @@
-# EESchema Netlist Version 1.1 created  Sa 02 Jul 2011 12:48:40 CEST
+# EESchema Netlist Version 1.1 created  Sa 02 Jul 2011 19:41:58 CEST
 (
  ( /4DC804A6 PIN_ARRAY_2X1 BT1 4.5-6V
   ( 1 N-000019 )
@@ -96,11 +96,11 @@
   ( 1 /UDP_PUP )
   ( 2 //RESET )
  )
- ( /4DCB8C13 SOD123 D2 1N5819
+ ( /4DCB8C13 SMB_STPS340U D2 Schottky
   ( 1 /USBVCC )
   ( 2 N-000063 )
  )
- ( /4DCB8C0D SOD123 D3 1N5819
+ ( /4DCB8C0D SMB_STPS340U D3 Schottky
   ( 1 N-000019 )
   ( 2 N-000063 )
  )
diff --git a/hardware/kicad/SIMtrace.sch b/hardware/kicad/SIMtrace.sch
index d8cebec..6fbcd25 100644
--- a/hardware/kicad/SIMtrace.sch
+++ b/hardware/kicad/SIMtrace.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Sa 02 Jul 2011 12:49:26 CEST
+EESchema Schematic File Version 2  date Sa 02 Jul 2011 19:42:14 CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -32,13 +32,14 @@ LIBS:valves
 LIBS:at91sam7sxxx-au
 LIBS:SIMtrace
 LIBS:smartcard
+LIBS:SIMtrace-cache
 EELAYER 25  0
 EELAYER END
 $Descr A4 11700 8267
 encoding utf-8
 Sheet 1 1
 Title "SIMtrace hardware"
-Date "23 jun 2011"
+Date "2 jul 2011"
 Rev "1.0_production"
 Comp "osmocom"
 Comment1 "CC-BY-SA"
@@ -858,8 +859,8 @@ L ZENER D2
 U 1 1 4DCB8C13
 P 1250 6500
 F 0 "D2" H 1250 6600 50  0000 C CNN
-F 1 "1N5819" H 1250 6400 40  0000 C CNN
-F 2 "SOD123" H 1250 6500 60  0001 C CNN
+F 1 "Schottky" H 1250 6400 40  0000 C CNN
+F 2 "SMB_STPS340U" H 1250 6500 60  0001 C CNN
 	1    1250 6500
 	1    0    0    -1  
 $EndComp
@@ -868,8 +869,8 @@ L ZENER D3
 U 1 1 4DCB8C0D
 P 1250 6800
 F 0 "D3" H 1250 6900 50  0000 C CNN
-F 1 "1N5819" H 1250 6700 40  0000 C CNN
-F 2 "SOD123" H 1250 6800 60  0001 C CNN
+F 1 "Schottky" H 1250 6700 40  0000 C CNN
+F 2 "SMB_STPS340U" H 1250 6800 60  0001 C CNN
 	1    1250 6800
 	1    0    0    -1  
 $EndComp
diff --git a/hardware/pcb/bom/BOM.ods b/hardware/pcb/bom/BOM.ods
index 0a4315d..3152f8c 100644
--- a/hardware/pcb/bom/BOM.ods
+++ b/hardware/pcb/bom/BOM.ods
diff --git a/hardware/pcb/bom/SIMtrace.csv b/hardware/pcb/bom/SIMtrace.csv
index 7e46b6a..80a3a30 100644
--- a/hardware/pcb/bom/SIMtrace.csv
+++ b/hardware/pcb/bom/SIMtrace.csv
@@ -1,6 +1,6 @@
 "Id";"Designator";"Package";"Quantity";"Designation";"Supplier and ref";
-1;"P3";"FFC_REBELSIM";1;"FFC";;;
-2;"J2";"JACK_2.5";1;"JACK_2.5";;;
+1;"P3";"FFC_REBELSIM";1;"FFC_SIM";;;
+2;"J2";"JACK_2.5";1;"SERIAL";;;
 3;"P1";"pin_array_10x2";1;"JTAG";;;
 4;"JP2";"PIN_ARRAY_2X1";1;"ERASE";;;
 5;"JP1";"PIN_ARRAY_2X1";1;"TEST";;;
@@ -20,19 +20,18 @@
 19;"C6";"SM0603";1;"10nF";;;
 20;"C5";"SM0603";1;"33pF";;;
 21;"FB2,FB1";"SM0805";2;"FILTER";;;
-22;"D3,D2";"SOD123";2;"1N5819";;;
-23;"IC3";"TQFP_64";1;"AT91SAM7S";;;
-24;"P2";"PIN_ARRAY-6X1";1;"DEBUG";;;
-25;"Q2,Q1";"SOT23_BC847";2;"BC847";;;
-26;"SW1";"PUSH_BUTTON";1;"RESET";;;
-27;"SW2";"PUSH_BUTTON";1;"BOOTLOADER";;;
-28;"J1";"USB-MINI-B_UX60";1;"USB";;;
-29;"P4";"SIM_AMPHENOL";1;"SIM";;;
-30;"IC4";"SSOP20_BDQ";1;"CB3Q3244";;;
-31;"R21,R20";"SM0603";2;"10k1%";;;
-32;"IC5";"SOT353";1;"FPF2005";;;
-33;"IC2";"SOT26";1;"AP7332";;;
-34;"D1";"SMB_STPS340U";1;"Schottky";;;
-35;"D4";"LED-0805";1;"RED";;;
-36;"D5";"LED-0805";1;"GREEN";;;
-37;"U1";"SOC008_WIDE";1;"FLASH";;;
+22;"IC3";"TQFP_64";1;"AT91SAM7S";;;
+23;"P2";"PIN_ARRAY-6X1";1;"DEBUG";;;
+24;"Q2,Q1";"SOT23_BC847";2;"BC847";;;
+25;"SW1";"PUSH_BUTTON";1;"RESET";;;
+26;"SW2";"PUSH_BUTTON";1;"BOOTLOADER";;;
+27;"J1";"USB-MINI-B_UX60";1;"USB";;;
+28;"P4";"SIM_AMPHENOL";1;"SIM";;;
+29;"IC4";"SSOP20_BDQ";1;"CB3Q3244";;;
+30;"R21,R20";"SM0603";2;"10k1%";;;
+31;"IC5";"SOT353";1;"FPF2005";;;
+32;"IC2";"SOT26";1;"AP7332";;;
+33;"D1,D2,D3";"SMB_STPS340U";3;"Schottky";;;
+34;"D4";"LED-0805";1;"RED";;;
+35;"D5";"LED-0805";1;"GREEN";;;
+36;"U1";"SOC008_WIDE";1;"FLASH";;;