VCC_PHONE connected to GPIO

4 files changed, 1015 insertions, 946 deletions

diff --git a/hardware/kicad/SIMtrace.brd b/hardware/kicad/SIMtrace.brd
index 45df5cd..a2d5d6e 100644
--- a/hardware/kicad/SIMtrace.brd
+++ b/hardware/kicad/SIMtrace.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date So 19 Jun 2011 14:13:23 CEST
+PCBNEW-BOARD Version 1 date So 19 Jun 2011 15:09:42 CEST
 
 # Created by Pcbnew(2010-00-09 BZR 23xx)-stable
 
@@ -6,11 +6,11 @@ $GENERAL
 LayerCount 2
 Ly 1FFF8001
 EnabledLayers 1FFF8001
-Links 180
+Links 181
 NoConn 0
 Di 14401 34909 48510 56341
 Ndraw 12
-Ntrack 895
+Ntrack 928
 Nzone 0
 BoardThickness 630
 Nmodule 63
@@ -21,7 +21,7 @@ $SHEETDESCR
 Sheet A4 11700 8267
 Title "SIMtrace"
 Date "19 jun 2011"
-Rev "v0.9.7"
+Rev "v0.9.8"
 Comp "osmocom"
 Comment1 "CC-BY-SA"
 Comment2 ""
@@ -206,83 +206,83 @@ Na 35 "GND"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 36 "N-000009"
+Na 36 "N-000011"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 37 "N-000012"
+Na 37 "N-000014"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 38 "N-000013"
+Na 38 "N-000016"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 39 "N-000016"
+Na 39 "N-000017"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 40 "N-000017"
+Na 40 "N-000019"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 41 "N-000020"
+Na 41 "N-000021"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 42 "N-000021"
+Na 42 "N-000024"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 43 "N-000023"
+Na 43 "N-000028"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 44 "N-000024"
+Na 44 "N-000031"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 45 "N-000025"
+Na 45 "N-000033"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 46 "N-000031"
+Na 46 "N-000034"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 47 "N-000034"
+Na 47 "N-000036"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 48 "N-000042"
+Na 48 "N-000044"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 49 "N-000043"
+Na 49 "N-000045"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 50 "N-000048"
+Na 50 "N-000049"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 51 "N-000053"
+Na 51 "N-000055"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 52 "N-000055"
+Na 52 "N-000057"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 53 "N-000057"
+Na 53 "N-000062"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 54 "N-000059"
+Na 54 "N-000064"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 55 "N-000067"
+Na 55 "N-000065"
 St ~
 $EndEQUIPOT
 $NCLASS
@@ -330,26 +330,26 @@ AddNet "/VCC_SIM"
 AddNet "/WP"
 AddNet "3V3"
 AddNet "GND"
-AddNet "N-000009"
-AddNet "N-000012"
-AddNet "N-000013"
+AddNet "N-000011"
+AddNet "N-000014"
 AddNet "N-000016"
 AddNet "N-000017"
-AddNet "N-000020"
+AddNet "N-000019"
 AddNet "N-000021"
-AddNet "N-000023"
 AddNet "N-000024"
-AddNet "N-000025"
+AddNet "N-000028"
 AddNet "N-000031"
+AddNet "N-000033"
 AddNet "N-000034"
-AddNet "N-000042"
-AddNet "N-000043"
-AddNet "N-000048"
-AddNet "N-000053"
+AddNet "N-000036"
+AddNet "N-000044"
+AddNet "N-000045"
+AddNet "N-000049"
 AddNet "N-000055"
 AddNet "N-000057"
-AddNet "N-000059"
-AddNet "N-000067"
+AddNet "N-000062"
+AddNet "N-000064"
+AddNet "N-000065"
 $EndNCLASS
 $MODULE FFC_REBELSIM
 Po 16750 42050 2700 15 4DFB15F4 4DCD07C6 ~~
@@ -424,7 +424,7 @@ Po 1378 630
 $EndPAD
 $EndMODULE  FFC_REBELSIM
 $MODULE JACK_2.5
-Po 44900 40150 1800 15 4DFDBDD9 4DCD07C7 ~~
+Po 44900 40150 1800 15 4DFDF4FC 4DCD07C7 ~~
 Li JACK_2.5
 Sc 4DCD07C7
 AR /4DCBE233
@@ -511,7 +511,7 @@ $PAD
 Sh "1" R 314 314 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 51 "N-000053"
+Ne 51 "N-000055"
 Po -295 0
 $EndPAD
 $PAD
@@ -559,7 +559,7 @@ $PAD
 Sh "1" R 314 314 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 52 "N-000055"
+Ne 52 "N-000057"
 Po -295 0
 $EndPAD
 $PAD
@@ -602,7 +602,7 @@ $PAD
 Sh "3" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 49 "N-000043"
+Ne 49 "N-000045"
 Po -4500 500
 $EndPAD
 $PAD
@@ -756,7 +756,7 @@ $PAD
 Sh "2" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 46 "N-000031"
+Ne 46 "N-000034"
 Po 500 0
 $EndPAD
 $SHAPE3D
@@ -810,7 +810,7 @@ Sc 4DD21AFA
 AR /4DC804A6
 Op 0 0 0
 T0 0 750 300 300 2700 60 N V 21 N"BT1"
-T1 50 -900 300 300 2700 60 N V 21 N"BATTERY"
+T1 50 -900 300 300 2700 60 N V 21 N"4.5-6V"
 DS -1000 500 -1000 -500 60 21
 DS -1000 -500 1000 -500 60 21
 DS 1000 -500 1000 500 60 21
@@ -819,7 +819,7 @@ $PAD
 Sh "1" R 600 600 0 0 2700
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 40 "N-000017"
+Ne 40 "N-000019"
 Po -500 0
 $EndPAD
 $PAD
@@ -860,14 +860,14 @@ $PAD
 Sh "1" R 2165 787 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 47 "N-000034"
+Ne 50 "N-000049"
 Po -1850 0
 $EndPAD
 $PAD
 Sh "2" R 2165 787 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 50 "N-000048"
+Ne 47 "N-000036"
 Po 1850 0
 $EndPAD
 $EndMODULE  Q_49U3HMS
@@ -1054,7 +1054,7 @@ $PAD
 Sh "1" R 250 450 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 36 "N-000009"
+Ne 36 "N-000011"
 Po -300 0
 $EndPAD
 $PAD
@@ -1122,14 +1122,14 @@ $PAD
 Sh "1" R 250 450 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 42 "N-000021"
+Ne 41 "N-000021"
 Po -300 0
 $EndPAD
 $PAD
 Sh "2" R 250 450 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 41 "N-000020"
+Ne 43 "N-000028"
 Po 300 0
 $EndPAD
 $SHAPE3D
@@ -1163,7 +1163,7 @@ $PAD
 Sh "2" R 250 450 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 51 "N-000053"
+Ne 51 "N-000055"
 Po 300 0
 $EndPAD
 $SHAPE3D
@@ -1197,7 +1197,7 @@ $PAD
 Sh "2" R 250 450 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 52 "N-000055"
+Ne 52 "N-000057"
 Po 300 0
 $EndPAD
 $SHAPE3D
@@ -1258,14 +1258,14 @@ $PAD
 Sh "1" R 250 450 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 55 "N-000067"
+Ne 45 "N-000033"
 Po -300 0
 $EndPAD
 $PAD
 Sh "2" R 250 450 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 48 "N-000042"
+Ne 48 "N-000044"
 Po 300 0
 $EndPAD
 $SHAPE3D
@@ -1299,7 +1299,7 @@ $PAD
 Sh "2" R 250 450 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 38 "N-000013"
+Ne 38 "N-000016"
 Po 300 0
 $EndPAD
 $SHAPE3D
@@ -1333,7 +1333,7 @@ $PAD
 Sh "2" R 250 450 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 37 "N-000012"
+Ne 37 "N-000014"
 Po 300 0
 $EndPAD
 $SHAPE3D
@@ -1496,7 +1496,7 @@ $PAD
 Sh "1" R 250 450 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 49 "N-000043"
+Ne 49 "N-000045"
 Po -300 0
 $EndPAD
 $PAD
@@ -1530,14 +1530,14 @@ $PAD
 Sh "1" R 250 450 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 38 "N-000013"
+Ne 38 "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-000023"
+Ne 39 "N-000017"
 Po 300 0
 $EndPAD
 $SHAPE3D
@@ -1632,7 +1632,7 @@ $PAD
 Sh "1" R 250 450 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 53 "N-000057"
+Ne 55 "N-000065"
 Po -300 0
 $EndPAD
 $PAD
@@ -1700,7 +1700,7 @@ $PAD
 Sh "1" R 250 450 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 44 "N-000024"
+Ne 42 "N-000024"
 Po -300 0
 $EndPAD
 $PAD
@@ -1802,7 +1802,7 @@ $PAD
 Sh "1" R 250 450 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 50 "N-000048"
+Ne 47 "N-000036"
 Po -300 0
 $EndPAD
 $PAD
@@ -1836,7 +1836,7 @@ $PAD
 Sh "1" R 250 450 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 47 "N-000034"
+Ne 50 "N-000049"
 Po -300 0
 $EndPAD
 $PAD
@@ -1938,7 +1938,7 @@ $PAD
 Sh "1" R 250 450 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 45 "N-000025"
+Ne 54 "N-000064"
 Po -300 0
 $EndPAD
 $PAD
@@ -2081,7 +2081,7 @@ $PAD
 Sh "2" R 250 450 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 55 "N-000067"
+Ne 45 "N-000033"
 Po 300 0
 $EndPAD
 $SHAPE3D
@@ -2183,7 +2183,7 @@ $PAD
 Sh "2" R 250 450 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 48 "N-000042"
+Ne 48 "N-000044"
 Po 300 0
 $EndPAD
 $SHAPE3D
@@ -2210,14 +2210,14 @@ $PAD
 Sh "1" R 250 450 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 37 "N-000012"
+Ne 37 "N-000014"
 Po -300 0
 $EndPAD
 $PAD
 Sh "2" R 250 450 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 38 "N-000013"
+Ne 38 "N-000016"
 Po 300 0
 $EndPAD
 $SHAPE3D
@@ -2349,7 +2349,7 @@ $PAD
 Sh "1" R 350 550 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 53 "N-000057"
+Ne 55 "N-000065"
 Po -375 0
 $EndPAD
 $PAD
@@ -2386,7 +2386,7 @@ $PAD
 Sh "1" R 350 550 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 39 "N-000016"
+Ne 53 "N-000062"
 Po -375 0
 $EndPAD
 $PAD
@@ -2415,14 +2415,14 @@ $PAD
 Sh "2" R 358 480 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 45 "N-000025"
+Ne 54 "N-000064"
 Po 645 0
 $EndPAD
 $PAD
 Sh "1" R 358 480 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 40 "N-000017"
+Ne 40 "N-000019"
 Po -645 0
 $EndPAD
 $EndMODULE  SOD123
@@ -2438,7 +2438,7 @@ $PAD
 Sh "2" R 358 480 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 45 "N-000025"
+Ne 54 "N-000064"
 Po 645 0
 $EndPAD
 $PAD
@@ -2532,7 +2532,7 @@ $PAD
 Sh "7" R 236 472 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 36 "N-000009"
+Ne 36 "N-000011"
 Po -250 -1142
 $EndPAD
 $PAD
@@ -2580,21 +2580,21 @@ $PAD
 Sh "1" R 200 730 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 45 "N-000025"
+Ne 54 "N-000064"
 Po -1004 1142
 $EndPAD
 $PAD
 Sh "4" R 200 730 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 44 "N-000024"
+Ne 42 "N-000024"
 Po 502 1142
 $EndPAD
 $PAD
 Sh "5" R 200 730 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 45 "N-000025"
+Ne 54 "N-000064"
 Po 1004 1142
 $EndPAD
 $EndMODULE  SOT223-6
@@ -2774,7 +2774,7 @@ AR /4CE84486
 Op 0 0 0
 .LocalClearance 79
 T0 400 -500 433 433 2700 50 N V 21 N"IC3"
-T1 -2200 -3850 394 394 3600 60 N V 21 N"AT91SAM7S5"
+T1 -2200 -3850 394 394 3600 60 N V 21 N"AT91SAM7S"
 DC -1568 1568 -1568 1418 80 21
 DS 2032 -2032 -1968 -2032 80 21
 DS -1968 -2032 -1968 1718 80 21
@@ -2785,7 +2785,7 @@ $PAD
 Sh "1" R 98 600 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 53 "N-000057"
+Ne 55 "N-000065"
 Po -1476 2311
 $EndPAD
 $PAD
@@ -2911,7 +2911,7 @@ $PAD
 Sh "19" O 600 98 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 41 "N-000020"
+Ne 43 "N-000028"
 Po 2375 1082
 $EndPAD
 $PAD
@@ -2953,7 +2953,7 @@ $PAD
 Sh "25" O 600 98 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 0 ""
+Ne 31 "/VCC_PHONE"
 Po 2375 -99
 $EndPAD
 $PAD
@@ -3163,7 +3163,7 @@ $PAD
 Sh "55" O 600 98 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 46 "N-000031"
+Ne 46 "N-000034"
 Po -2311 -296
 $EndPAD
 $PAD
@@ -3205,21 +3205,21 @@ $PAD
 Sh "61" O 600 98 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 47 "N-000034"
+Ne 50 "N-000049"
 Po -2311 883
 $EndPAD
 $PAD
 Sh "62" O 600 98 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 50 "N-000048"
+Ne 47 "N-000036"
 Po -2311 1080
 $EndPAD
 $PAD
 Sh "63" O 600 98 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
-Ne 55 "N-000067"
+Ne 45 "N-000033"
 Po -2311 1276
 $EndPAD
 $PAD
@@ -3237,7 +3237,7 @@ Ro 0.000000 0.000000 0.000000
 $EndSHAPE3D
 $EndMODULE  TQFP_64
 $MODULE USB_MINI-B
-Po 48150 50000 900 15 4DFDBDFA 4DD21AF7 ~~
+Po 48150 50000 900 15 4DFDF500 4DD21AF7 ~~
 Li USB_MINI-B
 Sc 4DD21AF7
 AR /4CFAC6EA
@@ -3266,21 +3266,21 @@ $PAD
 Sh "1" R 197 551 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 39 "N-000016"
+Ne 53 "N-000062"
 Po -630 -2402
 $EndPAD
 $PAD
 Sh "2" R 197 551 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 37 "N-000012"
+Ne 37 "N-000014"
 Po -315 -2402
 $EndPAD
 $PAD
 Sh "3" R 197 551 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 38 "N-000013"
+Ne 38 "N-000016"
 Po 0 -2402
 $EndPAD
 $PAD
@@ -3324,7 +3324,7 @@ $PAD
 Sh "2" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 54 "N-000059"
+Ne 44 "N-000031"
 Po -1500 0
 $EndPAD
 $PAD
@@ -3352,7 +3352,7 @@ $PAD
 Sh "6" C 600 600 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 54 "N-000059"
+Ne 44 "N-000031"
 Po 2500 0
 $EndPAD
 $SHAPE3D
@@ -3378,7 +3378,7 @@ $PAD
 Sh "1" R 315 354 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 42 "N-000021"
+Ne 41 "N-000021"
 Po -394 433
 $EndPAD
 $PAD
@@ -3419,7 +3419,7 @@ $PAD
 Sh "2" R 315 354 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 43 "N-000023"
+Ne 39 "N-000017"
 Po 394 433
 $EndPAD
 $PAD
@@ -3570,10 +3570,32 @@ Po 23600 55350 600 800 120 0
 De 15 1 0 Normal
 $EndTEXTPCB
 $TRACK
-Po 3 32095 46916 32095 46916 350 -1
+Po 0 31800 46702 31848 46702 80 -1
+De 15 0 1 0 0
+Po 0 32300 46250 33502 46250 80 -1
+De 15 0 1 0 0
+Po 0 31848 46702 32300 46250 80 -1
+De 15 0 1 0 0
+Po 0 32000 47050 31652 46702 80 -1
+De 15 0 1 0 0
+Po 0 31550 46700 31550 46702 80 -1
+De 15 0 1 0 0
+Po 0 31552 46702 31550 46700 80 -1
+De 15 0 1 0 0
+Po 0 31652 46702 31552 46702 80 -1
+De 15 0 1 0 0
+Po 0 32852 49175 32852 48548 80 -1
+De 15 0 1 0 800
+Po 0 32852 48548 32900 48500 80 -1
+De 15 0 1 0 0
+Po 0 32900 48500 32900 47950 80 -1
+De 0 0 1 0 0
+Po 3 32900 48500 32900 48500 350 -1
 De 15 1 1 0 0
-Po 3 32988 48587 32988 48587 350 -1
+Po 3 32000 47050 32000 47050 350 -1
 De 15 1 1 0 0
+Po 0 32900 47950 32000 47050 80 -1
+De 0 0 1 0 0
 Po 0 30196 47537 30196 47489 80 -1
 De 15 0 1 0 0
 Po 0 29735 47998 30196 47537 80 -1
@@ -3628,28 +3650,14 @@ Po 0 32852 50530 32852 49175 80 -1
 De 15 0 1 0 400
 Po 0 32850 50532 32852 50530 80 -1
 De 15 0 1 0 0
-Po 0 32852 49175 32852 48732 80 -1
-De 15 0 1 0 800
-Po 0 32095 46702 32095 46916 80 -1
-De 15 0 1 0 0
-Po 0 33050 46702 32095 46702 80 -1
-De 15 0 1 0 0
-Po 0 34640 45112 33050 46702 80 -1
+Po 0 34640 45112 33502 46250 80 -1
 De 15 0 1 0 0
 Po 0 34640 43504 34640 45112 80 -1
 De 15 0 1 0 0
-Po 0 32095 46702 30639 46702 80 -1
-De 15 0 1 0 400
-Po 0 32988 47960 32988 48587 80 -1
-De 0 0 1 0 0
-Po 0 32095 47067 32988 47960 80 -1
-De 0 0 1 0 0
-Po 0 32095 46916 32095 47067 80 -1
-De 0 0 1 0 0
-Po 0 32852 48723 32988 48587 80 -1
-De 15 0 1 0 0
-Po 0 32852 48732 32852 48723 80 -1
+Po 0 31800 46702 31550 46702 80 -1
 De 15 0 1 0 0
+Po 0 31550 46702 30639 46702 80 -1
+De 15 0 1 0 400
 Po 3 34736 46825 34736 46825 350 -1
 De 15 1 2 0 0
 Po 0 35325 47096 34882 47096 80 -1
@@ -3738,18 +3746,50 @@ Po 0 33836 45179 33439 45576 80 -1
 De 15 0 4 0 0
 Po 0 33836 44489 33836 45179 80 -1
 De 15 0 4 0 800
-Po 3 34526 47293 34526 47293 350 -1
-De 15 1 5 0 0
+Po 0 32950 46600 32950 47100 80 -1
+De 0 0 5 0 0
+Po 0 34319 47500 34526 47293 80 -1
+De 0 0 5 0 0
+Po 0 33350 47500 34319 47500 80 -1
+De 0 0 5 0 0
+Po 0 32950 47100 33350 47500 80 -1
+De 0 0 5 0 0
+Po 0 32450 47446 32604 47446 80 -1
+De 15 0 5 0 0
+Po 0 32700 46850 32950 46600 80 -1
+De 15 0 5 0 0
+Po 0 32700 47350 32700 46850 80 -1
+De 15 0 5 0 0
+Po 0 32604 47446 32700 47350 80 -1
+De 15 0 5 0 0
+Po 0 32950 46600 32600 46600 80 -1
+De 0 0 5 0 0
+Po 0 30800 45308 28087 45308 80 -1
+De 0 0 5 0 0
+Po 0 28087 45308 24517 41738 80 -1
+De 0 0 5 0 0
+Po 0 24517 41738 21713 41738 80 -1
+De 0 0 5 0 0
+Po 0 21713 41738 21606 41845 80 -1
+De 0 0 5 0 0
+Po 0 21570 41300 21570 41809 80 -1
+De 15 0 5 0 800
+Po 0 21570 41809 21606 41845 80 -1
+De 15 0 5 0 0
 Po 3 21606 41845 21606 41845 350 -1
 De 15 1 5 0 0
-Po 3 32714 47211 32714 47211 350 -1
+Po 0 32600 46600 31300 45300 80 -1
+De 0 0 5 0 0
+Po 0 31300 45300 30800 45300 80 -1
+De 0 0 5 0 0
+Po 0 30800 45300 30800 45308 80 -1
+De 0 0 5 0 0
+Po 3 34526 47293 34526 47293 350 -1
 De 15 1 5 0 0
 Po 0 35325 47293 34526 47293 80 -1
 De 15 0 5 0 800
-Po 0 21570 41809 21606 41845 80 -1
-De 15 0 5 0 0
-Po 0 21570 41300 21570 41809 80 -1
-De 15 0 5 0 800
+Po 3 32950 46600 32950 46600 350 -1
+De 15 1 5 0 0
 Po 0 19082 41853 16947 41853 80 -1
 De 15 0 5 0 400
 Po 0 20028 40907 19082 41853 80 -1
@@ -3758,24 +3798,6 @@ Po 0 21570 40907 20028 40907 80 -1
 De 15 0 5 0 0
 Po 0 21570 41300 21570 40907 80 -1
 De 15 0 5 0 800
-Po 0 34356 47463 34526 47293 80 -1
-De 0 0 5 0 0
-Po 0 32966 47463 34356 47463 80 -1
-De 0 0 5 0 0
-Po 0 32714 47211 32966 47463 80 -1
-De 0 0 5 0 0
-Po 0 21713 41738 21606 41845 80 -1
-De 0 0 5 0 0
-Po 0 24517 41738 21713 41738 80 -1
-De 0 0 5 0 0
-Po 0 28087 45308 24517 41738 80 -1
-De 0 0 5 0 0
-Po 0 30938 45308 28087 45308 80 -1
-De 0 0 5 0 0
-Po 0 32714 47084 30938 45308 80 -1
-De 0 0 5 0 0
-Po 0 32714 47211 32714 47084 80 -1
-De 0 0 5 0 0
 Po 0 31224 48080 30639 48080 80 -1
 De 15 0 5 0 400
 Po 0 31433 47871 31224 48080 80 -1
@@ -3784,10 +3806,20 @@ Po 0 31433 47632 31433 47871 80 -1
 De 15 0 5 0 0
 Po 0 31619 47446 31433 47632 80 -1
 De 15 0 5 0 0
-Po 0 32479 47446 31619 47446 80 -1
-De 15 0 5 0 0
-Po 0 32714 47211 32479 47446 80 -1
+Po 0 32450 47446 31619 47446 80 -1
 De 15 0 5 0 0
+Po 0 34209 48192 34196 48192 80 -1
+De 15 0 6 0 0
+Po 0 32038 47946 31899 48085 80 -1
+De 15 0 6 0 0
+Po 0 33950 47946 32038 47946 80 -1
+De 15 0 6 0 0
+Po 0 34196 48192 33950 47946 80 -1
+De 15 0 6 0 0
+Po 0 31899 48085 31899 48086 80 -1
+De 15 0 6 0 0
+Po 0 31899 48086 31899 48085 80 -1
+De 15 0 6 0 0
 Po 0 35325 46112 34882 46112 80 -1
 De 15 0 6 0 800
 Po 0 21310 44508 21310 43400 80 -1
@@ -3802,6 +3834,16 @@ Po 0 25403 50294 21121 50294 80 -1
 De 15 0 6 0 800
 Po 0 25403 50294 25999 50294 80 -1
 De 15 0 6 0 800
+Po 0 31687 48085 31899 48085 80 -1
+De 15 0 6 0 0
+Po 0 31047 48725 31687 48085 80 -1
+De 15 0 6 0 0
+Po 0 31047 49626 31047 48725 80 -1
+De 15 0 6 0 0
+Po 0 30379 50294 31047 49626 80 -1
+De 15 0 6 0 0
+Po 0 25999 50294 30379 50294 80 -1
+De 15 0 6 0 0
 Po 0 34148 46846 34882 46112 80 -1
 De 15 0 6 0 0
 Po 0 34148 47365 34148 46846 80 -1
@@ -3824,21 +3866,7 @@ Po 0 35887 49027 36146 48768 80 -1
 De 15 0 6 0 0
 Po 0 35044 49027 35887 49027 80 -1
 De 15 0 6 0 0
-Po 0 34184 48167 35044 49027 80 -1
-De 15 0 6 0 0
-Po 0 34123 48167 34184 48167 80 -1
-De 15 0 6 0 0
-Po 0 34041 48085 34123 48167 80 -1
-De 15 0 6 0 0
-Po 0 31687 48085 34041 48085 80 -1
-De 15 0 6 0 0
-Po 0 31047 48725 31687 48085 80 -1
-De 15 0 6 0 0
-Po 0 31047 49626 31047 48725 80 -1
-De 15 0 6 0 0
-Po 0 30379 50294 31047 49626 80 -1
-De 15 0 6 0 0
-Po 0 25999 50294 30379 50294 80 -1
+Po 0 34209 48192 35044 49027 80 -1
 De 15 0 6 0 0
 Po 0 33639 49728 33639 49175 80 -1
 De 15 0 7 0 400
@@ -3900,30 +3928,32 @@ Po 0 38500 42450 39700 42450 80 -1
 De 15 0 9 0 800
 Po 0 38500 42450 38500 42182 80 -1
 De 15 0 9 0 800
-Po 3 33669 48591 33669 48591 350 -1
+Po 0 34033 48750 34000 48750 80 -1
+De 15 0 10 0 0
+Po 0 34000 48750 33800 48550 80 -1
+De 15 0 10 0 0
+Po 0 33800 48550 35052 48550 80 -1
+De 0 0 10 0 0
+Po 0 36796 44604 36796 46806 80 -1
+De 0 0 10 0 0
+Po 0 45200 36200 36796 44604 80 -1
+De 0 0 10 0 800
+Po 0 36796 46806 35053 48549 80 -1
+De 0 0 10 0 0
+Po 3 33800 48550 33800 48550 350 -1
 De 15 1 10 0 0
+Po 0 35052 48550 35053 48551 80 -1
+De 0 0 10 0 0
+Po 0 35053 48551 35053 48549 80 -1
+De 0 0 10 0 0
 Po 0 42774 38802 42774 38138 80 -1
 De 15 0 10 0 800
 Po 0 43262 38138 42774 38138 80 -1
 De 15 0 10 0 0
 Po 0 45200 36200 43262 38138 80 -1
 De 15 0 10 0 800
-Po 0 34033 49175 34033 48732 80 -1
+Po 0 34033 49175 34033 48750 80 -1
 De 15 0 10 0 800
-Po 0 33669 48590 33669 48591 80 -1
-De 0 0 10 0 0
-Po 0 35012 48590 33669 48590 80 -1
-De 0 0 10 0 0
-Po 0 36796 46806 35012 48590 80 -1
-De 0 0 10 0 0
-Po 0 36796 44604 36796 46806 80 -1
-De 0 0 10 0 0
-Po 0 45200 36200 36796 44604 80 -1
-De 0 0 10 0 800
-Po 0 33810 48732 33669 48591 80 -1
-De 15 0 10 0 0
-Po 0 34033 48732 33810 48732 80 -1
-De 15 0 10 0 0
 Po 0 37170 48071 37170 44730 80 -1
 De 0 0 11 0 0
 Po 0 45450 36950 46200 36200 80 -1
@@ -4142,7 +4172,17 @@ Po 0 34199 52712 33592 52712 80 -1
 De 15 0 18 0 800
 Po 0 32458 49175 32458 49618 80 -1
 De 15 0 18 0 800
-Po 3 32491 48587 32491 48587 350 -1
+Po 0 32294 47856 32400 47962 80 -1
+De 0 0 19 0 0
+Po 0 32400 48500 32400 47962 80 -1
+De 0 0 19 0 0
+Po 0 32655 48732 32510 48587 80 -1
+De 15 0 19 0 0
+Po 0 32510 48587 32400 48500 80 -1
+De 15 0 19 0 0
+Po 0 32655 49175 32655 48732 80 -1
+De 15 0 19 0 800
+Po 3 32400 48500 32400 48500 350 -1
 De 15 1 19 0 0
 Po 3 23204 42057 23204 42057 350 -1
 De 15 1 19 0 0
@@ -4150,14 +4190,8 @@ Po 0 22444 42057 23204 42057 80 -1
 De 15 0 19 0 0
 Po 0 22080 41693 22444 42057 80 -1
 De 15 0 19 0 0
-Po 0 32655 49175 32655 48732 80 -1
-De 15 0 19 0 800
 Po 0 22080 41300 22080 41693 80 -1
 De 15 0 19 0 800
-Po 0 32510 48587 32491 48587 80 -1
-De 15 0 19 0 0
-Po 0 32655 48732 32510 48587 80 -1
-De 15 0 19 0 0
 Po 0 22080 41300 22080 40907 80 -1
 De 15 0 19 0 800
 Po 0 23232 42029 23204 42057 80 -1
@@ -4168,9 +4202,7 @@ Po 0 27727 45491 24265 42029 80 -1
 De 0 0 19 0 0
 Po 0 29929 45491 27727 45491 80 -1
 De 0 0 19 0 0
-Po 0 32491 48053 29929 45491 80 -1
-De 0 0 19 0 0
-Po 0 32491 48587 32491 48053 80 -1
+Po 0 32294 47856 29929 45491 80 -1
 De 0 0 19 0 0
 Po 0 21897 40724 22080 40907 80 -1
 De 15 0 19 0 0
@@ -4180,8 +4212,26 @@ Po 0 18182 41459 18917 40724 80 -1
 De 15 0 19 0 0
 Po 0 16947 41459 18182 41459 80 -1
 De 15 0 19 0 800
+Po 0 34107 48350 34090 48350 80 -1
+De 15 0 20 0 0
+Po 0 32100 48150 31982 48268 80 -1
+De 15 0 20 0 0
+Po 0 33890 48150 32100 48150 80 -1
+De 15 0 20 0 0
+Po 0 34090 48350 33890 48150 80 -1
+De 15 0 20 0 0
 Po 0 25403 51294 25999 51294 80 -1
 De 15 0 20 0 800
+Po 0 31764 48268 31982 48268 80 -1
+De 15 0 20 0 0
+Po 0 31230 48802 31764 48268 80 -1
+De 15 0 20 0 0
+Po 0 31230 49703 31230 48802 80 -1
+De 15 0 20 0 0
+Po 0 29639 51294 31230 49703 80 -1
+De 15 0 20 0 0
+Po 0 25999 51294 29639 51294 80 -1
+De 15 0 20 0 0
 Po 0 20216 43007 21830 43007 80 -1
 De 15 0 20 0 0
 Po 0 20151 43072 20216 43007 80 -1
@@ -4198,20 +4248,6 @@ Po 0 34427 48670 34427 49175 80 -1
 De 15 0 20 0 400
 Po 0 34107 48350 34427 48670 80 -1
 De 15 0 20 0 0
-Po 0 33893 48350 34107 48350 80 -1
-De 15 0 20 0 0
-Po 0 33811 48268 33893 48350 80 -1
-De 15 0 20 0 0
-Po 0 31764 48268 33811 48268 80 -1
-De 15 0 20 0 0
-Po 0 31230 48802 31764 48268 80 -1
-De 15 0 20 0 0
-Po 0 31230 49703 31230 48802 80 -1
-De 15 0 20 0 0
-Po 0 29639 51294 31230 49703 80 -1
-De 15 0 20 0 0
-Po 0 25999 51294 29639 51294 80 -1
-De 15 0 20 0 0
 Po 0 34199 53212 33820 53212 80 -1
 De 15 0 21 0 800
 Po 0 32262 51654 32262 49175 80 -1
@@ -4286,16 +4322,22 @@ Po 0 33639 45071 33453 45257 80 -1
 De 15 0 24 0 0
 Po 0 33639 44489 33639 45071 80 -1
 De 15 0 24 0 800
+Po 0 33435 47133 33435 46385 80 -1
+De 0 0 25 0 0
+Po 0 33300 46250 32552 46250 80 -1
+De 0 0 25 0 0
+Po 0 33435 46385 33300 46250 80 -1
+De 0 0 25 0 0
 Po 3 33435 47133 33435 47133 350 -1
 De 15 1 25 0 0
 Po 0 28700 37200 28700 38350 80 -1
 De 15 0 25 0 C00
-Po 0 31364 45062 33435 47133 80 -1
-De 0 0 25 0 0
-Po 0 31364 39864 31364 45062 80 -1
+Po 0 31364 45062 32552 46250 80 -1
 De 0 0 25 0 0
 Po 0 28700 37200 31364 39864 80 -1
 De 0 0 25 0 800
+Po 0 31364 39864 31364 45062 80 -1
+De 0 0 25 0 0
 Po 0 33435 47173 33435 47133 80 -1
 De 15 0 25 0 0
 Po 0 34246 47984 33435 47173 80 -1
@@ -4384,6 +4426,28 @@ Po 0 43900 53522 43900 53075 80 -1
 De 15 0 30 0 400
 Po 0 43945 53567 43900 53522 80 -1
 De 15 0 30 0 0
+Po 0 33049 49175 33049 48801 80 -1
+De 15 0 31 0 800
+Po 0 31500 46050 31082 46050 80 -1
+De 15 0 31 0 0
+Po 3 31500 46050 31500 46050 350 -1
+De 15 1 31 0 0
+Po 0 32650 47200 31500 46050 80 -1
+De 0 0 31 0 0
+Po 0 32650 47300 32650 47200 80 -1
+De 0 0 31 0 0
+Po 0 33350 48000 32650 47300 80 -1
+De 0 0 31 0 0
+Po 0 33350 48500 33350 48000 80 -1
+De 0 0 31 0 0
+Po 3 33350 48500 33350 48500 350 -1
+De 15 1 31 0 0
+Po 0 33049 48801 33350 48500 80 -1
+De 15 0 31 0 0
+Po 0 31082 46050 31100 46050 80 -1
+De 15 0 31 0 0
+Po 0 31100 46050 31082 46050 80 -1
+De 15 0 31 0 0
 Po 0 25402 40907 22600 40907 80 -1
 De 15 0 31 0 0
 Po 0 27982 43487 25402 40907 80 -1
@@ -4392,7 +4456,9 @@ Po 0 29353 43487 27982 43487 80 -1
 De 15 0 31 0 0
 Po 0 31082 45216 29353 43487 80 -1
 De 15 0 31 0 0
-Po 0 31082 46308 31082 45216 80 -1
+Po 0 31082 46308 31082 46050 80 -1
+De 15 0 31 0 0
+Po 0 31082 46050 31082 45216 80 -1
 De 15 0 31 0 0
 Po 0 30639 46308 31082 46308 80 -1
 De 15 0 31 0 800
@@ -5160,13 +5226,11 @@ Po 0 41650 46550 42650 47550 80 -1
 De 15 0 38 0 400
 Po 0 40750 46550 41650 46550 80 -1
 De 15 0 38 0 800
-Po 0 43952 52007 45329 50630 80 -1
-De 15 0 39 0 0
-Po 0 43900 52007 43952 52007 80 -1
+Po 0 43750 46550 43750 47600 80 -1
+De 15 0 39 0 400
+Po 0 44544 45756 43750 46550 80 -1
 De 15 0 39 0 0
-Po 0 43900 52325 43900 52007 80 -1
-De 15 0 39 0 800
-Po 0 45748 50630 45329 50630 80 -1
+Po 0 45833 45756 44544 45756 80 -1
 De 15 0 39 0 800
 Po 0 45007 54850 46157 53700 80 -1
 De 15 0 40 0 0
@@ -5174,76 +5238,74 @@ Po 0 43945 54850 45007 54850 80 -1
 De 15 0 40 0 800
 Po 0 46600 53700 46157 53700 80 -1
 De 15 0 40 0 800
+Po 0 41795 45537 41795 45169 80 -1
+De 15 0 41 0 800
+Po 0 41806 45158 41795 45169 80 -1
+De 15 0 41 0 0
+Po 0 41806 44533 41806 45158 80 -1
+De 15 0 41 0 800
+Po 0 40452 53666 40452 52492 80 -1
+De 15 0 42 0 400
+Po 0 39218 54900 40452 53666 80 -1
+De 15 0 42 0 0
+Po 0 38950 54900 39218 54900 80 -1
+De 15 0 42 0 800
 Po 3 40785 45537 40785 45537 350 -1
-De 15 1 41 0 0
+De 15 1 43 0 0
 Po 3 31892 48592 31892 48592 350 -1
-De 15 1 41 0 0
+De 15 1 43 0 0
 Po 0 40927 45537 40785 45537 80 -1
-De 15 0 41 0 0
+De 15 0 43 0 0
 Po 0 41195 45537 40927 45537 80 -1
-De 15 0 41 0 800
+De 15 0 43 0 800
 Po 0 31868 48616 31892 48592 80 -1
-De 15 0 41 0 0
+De 15 0 43 0 0
 Po 0 31868 49175 31868 48616 80 -1
-De 15 0 41 0 800
+De 15 0 43 0 800
 Po 0 32209 48909 31892 48592 80 -1
-De 0 0 41 0 0
+De 0 0 43 0 0
 Po 0 34953 48909 32209 48909 80 -1
-De 0 0 41 0 0
+De 0 0 43 0 0
 Po 0 35471 48391 34953 48909 80 -1
-De 0 0 41 0 0
+De 0 0 43 0 0
 Po 0 37931 48391 35471 48391 80 -1
-De 0 0 41 0 0
+De 0 0 43 0 0
 Po 0 40785 45537 37931 48391 80 -1
-De 0 0 41 0 0
-Po 0 41795 45537 41795 45169 80 -1
-De 15 0 42 0 800
-Po 0 41806 45158 41795 45169 80 -1
-De 15 0 42 0 0
-Po 0 41806 44533 41806 45158 80 -1
-De 15 0 42 0 800
-Po 0 43750 46550 43750 47600 80 -1
-De 15 0 43 0 400
-Po 0 44544 45756 43750 46550 80 -1
-De 15 0 43 0 0
-Po 0 45833 45756 44544 45756 80 -1
-De 15 0 43 0 800
-Po 0 40452 53666 40452 52492 80 -1
-De 15 0 44 0 400
-Po 0 39218 54900 40452 53666 80 -1
-De 15 0 44 0 0
-Po 0 38950 54900 39218 54900 80 -1
-De 15 0 44 0 800
-Po 0 42494 54850 42333 54850 80 -1
+De 0 0 43 0 0
+Po 0 43741 35659 43200 36200 80 -1
+De 0 0 44 0 400
+Po 0 46659 35659 43741 35659 80 -1
+De 0 0 44 0 0
+Po 0 47200 36200 46659 35659 80 -1
+De 0 0 44 0 800
+Po 3 30984 44046 30984 44046 350 -1
+De 15 1 45 0 0
+Po 3 28300 44989 28300 44989 350 -1
+De 15 1 45 0 0
+Po 0 28220 45069 28300 44989 80 -1
 De 15 0 45 0 0
-Po 0 42655 54850 42494 54850 80 -1
-De 15 0 45 0 800
-Po 0 42494 53950 42333 53950 80 -1
+Po 0 25419 45069 28220 45069 80 -1
 De 15 0 45 0 0
-Po 0 42655 53950 42494 53950 80 -1
-De 15 0 45 0 800
-Po 0 42494 53950 42494 54850 80 -1
+Po 0 25318 44968 25419 45069 80 -1
 De 15 0 45 0 0
-Po 0 40954 52492 40954 53000 80 -1
+Po 0 30041 44989 28300 44989 80 -1
+De 0 0 45 0 0
+Po 0 30984 44046 30041 44989 80 -1
+De 0 0 45 0 0
+Po 0 25050 44700 25318 44700 80 -1
 De 15 0 45 0 800
-Po 0 41383 53000 42333 53950 80 -1
-De 15 0 45 0 0
-Po 0 40954 53000 41383 53000 80 -1
-De 15 0 45 0 0
-Po 0 40954 52238 40954 52492 80 -1
-De 15 0 45 0 400
-Po 0 40954 52238 40954 51984 80 -1
+Po 0 31674 44489 31674 44046 80 -1
+De 15 0 45 0 800
+Po 0 31674 44046 30984 44046 80 -1
 De 15 0 45 0 0
-Po 0 41368 54850 41318 54900 80 -1
+Po 0 25050 45500 25050 45132 80 -1
+De 15 0 45 0 800
+Po 0 25154 45132 25318 44968 80 -1
 De 15 0 45 0 0
-Po 0 42333 54850 41368 54850 80 -1
+Po 0 25050 45132 25154 45132 80 -1
 De 15 0 45 0 0
-Po 0 41050 54900 41318 54900 80 -1
-De 15 0 45 0 800
-Po 0 38946 51984 40954 51984 80 -1
+Po 0 25318 44968 25318 44700 80 -1
 De 15 0 45 0 0
-Po 0 38946 52492 38946 51984 80 -1
-De 15 0 45 0 800
 Po 3 35523 42508 35523 42508 350 -1
 De 15 1 46 0 0
 Po 0 34720 42508 35523 42508 80 -1
@@ -5256,22 +5318,20 @@ Po 0 35523 38877 35523 42508 80 -1
 De 0 0 46 0 0
 Po 0 38200 36200 35523 38877 80 -1
 De 0 0 46 0 800
-Po 0 31800 42800 31826 42800 80 -1
-De 15 0 47 0 800
-Po 0 32250 42376 32250 41837 80 -1
+Po 0 29850 42518 29818 42518 80 -1
 De 15 0 47 0 0
-Po 0 31826 42800 32250 42376 80 -1
+Po 0 29500 42200 29150 42200 80 -1
+De 15 0 47 0 400
+Po 0 29818 42518 29500 42200 80 -1
 De 15 0 47 0 0
-Po 0 32850 40700 32850 41237 80 -1
-De 15 0 47 0 800
-Po 0 32250 41837 32850 41237 80 -1
+Po 0 29850 42518 30965 42518 80 -1
 De 15 0 47 0 0
-Po 0 32067 43335 31800 43068 80 -1
+Po 0 30965 42518 31870 43423 80 -1
 De 15 0 47 0 0
-Po 0 32067 44489 32067 43335 80 -1
-De 15 0 47 0 800
-Po 0 31800 42800 31800 43068 80 -1
-De 15 0 47 0 800
+Po 0 31870 43423 31870 44489 80 -1
+De 15 0 47 0 400
+Po 0 29150 42200 29150 40700 80 -1
+De 15 0 47 0 C00
 Po 0 26132 44700 25650 44700 80 -1
 De 15 0 48 0 400
 Po 0 26232 44800 26132 44700 80 -1
@@ -5280,20 +5340,22 @@ Po 0 26600 44800 26232 44800 80 -1
 De 15 0 48 0 800
 Po 0 27700 38350 27700 37200 80 -1
 De 15 0 49 0 C00
-Po 0 29850 42518 29818 42518 80 -1
+Po 0 31800 42800 31826 42800 80 -1
+De 15 0 50 0 800
+Po 0 32250 42376 32250 41837 80 -1
 De 15 0 50 0 0
-Po 0 29500 42200 29150 42200 80 -1
-De 15 0 50 0 400
-Po 0 29818 42518 29500 42200 80 -1
+Po 0 31826 42800 32250 42376 80 -1
 De 15 0 50 0 0
-Po 0 29850 42518 30965 42518 80 -1
+Po 0 32850 40700 32850 41237 80 -1
+De 15 0 50 0 800
+Po 0 32250 41837 32850 41237 80 -1
 De 15 0 50 0 0
-Po 0 30965 42518 31870 43423 80 -1
+Po 0 32067 43335 31800 43068 80 -1
 De 15 0 50 0 0
-Po 0 31870 43423 31870 44489 80 -1
-De 15 0 50 0 400
-Po 0 29150 42200 29150 40700 80 -1
-De 15 0 50 0 C00
+Po 0 32067 44489 32067 43335 80 -1
+De 15 0 50 0 800
+Po 0 31800 42800 31800 43068 80 -1
+De 15 0 50 0 800
 Po 0 30521 53337 30821 53337 80 -1
 De 15 0 51 0 800
 Po 0 30847 53363 30821 53337 80 -1
@@ -5306,59 +5368,63 @@ Po 0 31450 54181 30914 54181 80 -1
 De 15 0 52 0 800
 Po 0 30548 54115 30848 54115 80 -1
 De 15 0 52 0 800
-Po 0 27551 43763 27283 43763 80 -1
+Po 0 43952 52007 45329 50630 80 -1
+De 15 0 53 0 0
+Po 0 43900 52007 43952 52007 80 -1
+De 15 0 53 0 0
+Po 0 43900 52325 43900 52007 80 -1
 De 15 0 53 0 800
-Po 0 30639 45324 30196 45324 80 -1
+Po 0 45748 50630 45329 50630 80 -1
 De 15 0 53 0 800
+Po 0 42494 54850 42333 54850 80 -1
+De 15 0 54 0 0
+Po 0 42655 54850 42494 54850 80 -1
+De 15 0 54 0 800
+Po 0 42494 53950 42333 53950 80 -1
+De 15 0 54 0 0
+Po 0 42655 53950 42494 53950 80 -1
+De 15 0 54 0 800
+Po 0 42494 53950 42494 54850 80 -1
+De 15 0 54 0 0
+Po 0 40954 52492 40954 53000 80 -1
+De 15 0 54 0 800
+Po 0 41383 53000 42333 53950 80 -1
+De 15 0 54 0 0
+Po 0 40954 53000 41383 53000 80 -1
+De 15 0 54 0 0
+Po 0 40954 52238 40954 52492 80 -1
+De 15 0 54 0 400
+Po 0 40954 52238 40954 51984 80 -1
+De 15 0 54 0 0
+Po 0 41368 54850 41318 54900 80 -1
+De 15 0 54 0 0
+Po 0 42333 54850 41368 54850 80 -1
+De 15 0 54 0 0
+Po 0 41050 54900 41318 54900 80 -1
+De 15 0 54 0 800
+Po 0 38946 51984 40954 51984 80 -1
+De 15 0 54 0 0
+Po 0 38946 52492 38946 51984 80 -1
+De 15 0 54 0 800
+Po 0 27551 43763 27283 43763 80 -1
+De 15 0 55 0 800
+Po 0 30639 45324 30196 45324 80 -1
+De 15 0 55 0 800
 Po 0 27551 43763 27819 43763 80 -1
-De 15 0 53 0 800
+De 15 0 55 0 800
 Po 0 27283 43495 27283 43763 80 -1
-De 15 0 53 0 0
-Po 0 27182 43394 27283 43495 80 -1
-De 15 0 53 0 0
-Po 0 26547 43394 27182 43394 80 -1
-De 15 0 53 0 0
-Po 0 26188 43753 26547 43394 80 -1
-De 15 0 53 0 0
-Po 0 25870 43753 26188 43753 80 -1
-De 15 0 53 0 800
-Po 0 28635 43763 30196 45324 80 -1
-De 15 0 53 0 0
-Po 0 27819 43763 28635 43763 80 -1
-De 15 0 53 0 0
-Po 0 43741 35659 43200 36200 80 -1
-De 0 0 54 0 400
-Po 0 46659 35659 43741 35659 80 -1
-De 0 0 54 0 0
-Po 0 47200 36200 46659 35659 80 -1
-De 0 0 54 0 800
-Po 3 30984 44046 30984 44046 350 -1
-De 15 1 55 0 0
-Po 3 28300 44989 28300 44989 350 -1
-De 15 1 55 0 0
-Po 0 28220 45069 28300 44989 80 -1
 De 15 0 55 0 0
-Po 0 25419 45069 28220 45069 80 -1
+Po 0 27182 43394 27283 43495 80 -1
 De 15 0 55 0 0
-Po 0 25318 44968 25419 45069 80 -1
+Po 0 26547 43394 27182 43394 80 -1
 De 15 0 55 0 0
-Po 0 30041 44989 28300 44989 80 -1
-De 0 0 55 0 0
-Po 0 30984 44046 30041 44989 80 -1
-De 0 0 55 0 0
-Po 0 25050 44700 25318 44700 80 -1
-De 15 0 55 0 800
-Po 0 31674 44489 31674 44046 80 -1
-De 15 0 55 0 800
-Po 0 31674 44046 30984 44046 80 -1
+Po 0 26188 43753 26547 43394 80 -1
 De 15 0 55 0 0
-Po 0 25050 45500 25050 45132 80 -1
+Po 0 25870 43753 26188 43753 80 -1
 De 15 0 55 0 800
-Po 0 25154 45132 25318 44968 80 -1
-De 15 0 55 0 0
-Po 0 25050 45132 25154 45132 80 -1
+Po 0 28635 43763 30196 45324 80 -1
 De 15 0 55 0 0
-Po 0 25318 44968 25318 44700 80 -1
+Po 0 27819 43763 28635 43763 80 -1
 De 15 0 55 0 0
 $EndTRACK
 $ZONE
diff --git a/hardware/kicad/SIMtrace.net b/hardware/kicad/SIMtrace.net
index 36ba333..0992b04 100644
--- a/hardware/kicad/SIMtrace.net
+++ b/hardware/kicad/SIMtrace.net
@@ -1,4 +1,4 @@
-# EESchema Netlist Version 1.1 created  So 19 Jun 2011 11:09:59 CEST
+# EESchema Netlist Version 1.1 created  So 19 Jun 2011 14:33:55 CEST
 (
  ( /4DCBE233 JACK_2.5  J2 JACK_2.5 {Lib=JACK_2.5}
   (    1 GND )
@@ -7,11 +7,11 @@
  )
  ( /4DCB8C13 SOD123  D2 1N5819 {Lib=ZENER}
   (    1 /USBVCC )
-  (    2 N-000025 )
+  (    2 N-000064 )
  )
  ( /4DCB8C0D SOD123  D3 1N5819 {Lib=ZENER}
-  (    1 N-000017 )
-  (    2 N-000025 )
+  (    1 N-000019 )
+  (    2 N-000064 )
  )
  ( /4DC8FA06 SIM_AMPHENOL  P4 SIM {Lib=ISO7816_NO}
   (   C1 /VCC_SIM )
@@ -33,13 +33,13 @@
   (    1 3V3 )
   (    2 GND )
  )
- ( /4DC804A6 PIN_ARRAY_2X1  BT1 BATTERY {Lib=BATTERY}
-  (    1 N-000017 )
+ ( /4DC804A6 PIN_ARRAY_2X1  BT1 4.5-6V {Lib=BATTERY}
+  (    1 N-000019 )
   (    2 GND )
  )
  ( /4DC7A441 SM0603  R16 10K {Lib=R}
   (    1 N-000021 )
-  (    2 N-000020 )
+  (    2 N-000028 )
  )
  ( /4DC7A43A SOT23_BC847  Q2 BC847 {Lib=BC847}
   (    1 N-000021 )
@@ -52,12 +52,12 @@
  )
  ( /4DC7A1CA SOT23_BC847  Q1 BC847 {Lib=BC847}
   (    1 /UDP_PUP )
-  (    2 N-000023 )
+  (    2 N-000017 )
   (    3 3V3 )
  )
  ( /4DC79EDF SM0603  C5 33pF {Lib=C}
-  (    1 N-000012 )
-  (    2 N-000013 )
+  (    1 N-000014 )
+  (    2 N-000016 )
  )
  ( /4DC79EDC SM0603  C13 15pF {Lib=C}
   (    1 /DDP )
@@ -72,30 +72,30 @@
   (    2 /UDP_PUP )
  )
  ( /4DC79ECE SM0603  R3 1K5 {Lib=R}
-  (    1 N-000013 )
-  (    2 N-000023 )
+  (    1 N-000016 )
+  (    2 N-000017 )
  )
  ( /4DC79EAD SM0603  R9 27R {Lib=R}
   (    1 /DDM )
-  (    2 N-000012 )
+  (    2 N-000014 )
  )
  ( /4DC79EA7 SM0603  R10 27R {Lib=R}
   (    1 /DDP )
-  (    2 N-000013 )
+  (    2 N-000016 )
  )
  ( /4DC79E9A SM0603  R2 10K {Lib=R}
   (    1 /A-B-DETECT )
   (    2 3V3 )
  )
  ( /4CFAC6EA USB_MINI-B  J1 USB-B_MINI {Lib=USB-B_MINI}
-  (    1 N-000016 )
-  (    2 N-000012 )
-  (    3 N-000013 )
+  (    1 N-000062 )
+  (    2 N-000014 )
+  (    3 N-000016 )
   (    4 /A-B-DETECT )
   (    5 GND )
  )
  ( /4DC79E48 SM0805  FB1 FILTER {Lib=FILTER}
-  (    1 N-000016 )
+  (    1 N-000062 )
   (    2 /USBVCC )
  )
  ( /4DC799F2 SM0603  R17 10k {Lib=R}
@@ -103,7 +103,7 @@
   (    2 GND )
  )
  ( /4DC6A5DE SM0603  C14 1uF {Lib=C}
-  (    1 N-000025 )
+  (    1 N-000064 )
   (    2 GND )
  )
  ( /4DC6A5D9 SM0603  C22 1uF {Lib=C}
@@ -115,11 +115,11 @@
   (    2 GND )
  )
  ( /4DC6A52E SOT223-6  IC2 TPS73633 {Lib=TPS736XX}
-  (    1 N-000025 )
+  (    1 N-000064 )
   (    2 3V3 )
   (    3 GND )
   (    4 N-000024 )
-  (    5 N-000025 )
+  (    5 N-000064 )
   (    6 GND )
  )
  ( /4DC6A187 SSOP20  IC4 QS3244 {Lib=QS3244}
@@ -137,11 +137,11 @@
   (   20 3V3 )
  )
  ( /4DC68E45 SM0603  C23 100nF {Lib=C}
-  (    1 N-000057 )
+  (    1 N-000065 )
   (    2 GND )
  )
  ( /4DC68E1D SM0805  FB2 FILTER {Lib=FILTER}
-  (    1 N-000057 )
+  (    1 N-000065 )
   (    2 3V3 )
  )
  ( /4DC6852C PUSH_BUTTON  SW2 BOOTLOADER {Lib=SW_PUSH}
@@ -150,7 +150,7 @@
  )
  ( /4DC683ED PIN_ARRAY_2X1  JP2 ERASE {Lib=JUMPER}
   (    1 3V3 )
-  (    2 N-000031 )
+  (    2 N-000034 )
  )
  ( /4DC68259 PIN_ARRAY_2X1  JP1 TEST {Lib=JUMPER}
   (    1 /TEST )
@@ -169,26 +169,26 @@
   (    2 GND )
  )
  ( /4DC5A30D SM0603  R18 10k {Lib=R}
-  (    1 N-000009 )
+  (    1 N-000011 )
   (    2 3V3 )
  )
- ( /4DC5A250 SOIC8  U1 FLASH_SPI {Lib=FLASH_SPI}
+ ( /4DC5A250 SOIC8  U1 FLASH {Lib=FLASH_SPI}
   (    1 /CS )
   (    2 /MISO )
   (    3 /WP )
   (    4 GND )
   (    5 /MOSI )
   (    6 /SCK )
-  (    7 N-000009 )
+  (    7 N-000011 )
   (    8 3V3 )
  )
  ( /4DC555D0 SM0603  R14 150R {Lib=R}
   (    1 3V3 )
-  (    2 N-000053 )
+  (    2 N-000055 )
  )
  ( /4CF7BAEE SM0603  R13 150R {Lib=R}
   (    1 3V3 )
-  (    2 N-000055 )
+  (    2 N-000057 )
  )
  ( /4DC51F05 FFC_REBELSIM  P3 REBELSIM {Lib=REBELSIM}
   (    1 /VCC_PHONE )
@@ -212,15 +212,15 @@
  )
  ( /4D020DD3 SM0603  C6 10nF {Lib=C}
   (    1 GND )
-  (    2 N-000042 )
+  (    2 N-000044 )
  )
  ( /4D020DCD SM0603  C10 1nF {Lib=C}
   (    1 GND )
-  (    2 N-000067 )
+  (    2 N-000033 )
  )
  ( /4D020DC6 SM0603  R11 1k5 {Lib=R}
-  (    1 N-000067 )
-  (    2 N-000042 )
+  (    1 N-000033 )
+  (    2 N-000044 )
  )
  ( /4D020BEB SM0603  C9 100nF {Lib=C}
   (    1 3V3 )
@@ -241,7 +241,7 @@
  ( /4CFCD6C9 pin_array_10x2  P1 JTAG {Lib=JTAG}
   (    1 3V3 )
   (    2 3V3 )
-  (    3 N-000043 )
+  (    3 N-000045 )
   (    4 GND )
   (    5 /TDI )
   (    6 GND )
@@ -261,15 +261,15 @@
   (   20 GND )
  )
  ( /4CF5471F LED-0603  D5 GREEN {Lib=LED}
-  (    1 N-000053 )
+  (    1 N-000055 )
   (    2 /LED_G )
  )
  ( /4CF54717 LED-0603  D4 RED {Lib=LED}
-  (    1 N-000055 )
+  (    1 N-000057 )
   (    2 /LED_R )
  )
- ( /4CE84486 TQFP_64  IC3 AT91SAM7S512/256/128/64/321-AU {Lib=AT91SAM7S512/256/128/64/321-AU}
-  (    1 N-000057 )
+ ( /4CE84486 TQFP_64  IC3 AT91SAM7S {Lib=AT91SAM7S512/256/128/64/321-AU}
+  (    1 N-000065 )
   (    2 GND )
   (    3 GND )
   (    4 GND )
@@ -287,13 +287,13 @@
   (   16 /SC_SW )
   (   17 GND )
   (   18 3V3 )
-  (   19 N-000020 )
+  (   19 N-000028 )
   (   20 /WP )
   (   21 /SCK )
   (   22 /MOSI )
   (   23 /RST_PHONE )
   (   24 +1.8V )
-  (   25 ? )
+  (   25 /VCC_PHONE )
   (   26 ? )
   (   27 /MISO )
   (   28 /CS )
@@ -323,24 +323,24 @@
   (   52 /BOOTLOADER )
   (   53 /TCK )
   (   54 +1.8V )
-  (   55 N-000031 )
+  (   55 N-000034 )
   (   56 /DDM )
   (   57 /DDP )
   (   58 3V3 )
   (   59 3V3 )
   (   60 GND )
-  (   61 N-000034 )
-  (   62 N-000048 )
-  (   63 N-000067 )
+  (   61 N-000049 )
+  (   62 N-000036 )
+  (   63 N-000033 )
   (   64 +1.8V )
  )
  ( /4CE9ADCF PIN_ARRAY-6X1  P2 DEBUG {Lib=DEBUG}
   (    1 GND )
-  (    2 N-000059 )
+  (    2 N-000031 )
   (    3 3V3 )
   (    4 /DRXD )
   (    5 /DTXD )
-  (    6 N-000059 )
+  (    6 N-000031 )
  )
  ( /4CE9A6AE SM0603  R8 100K {Lib=R}
   (    1 /TDO )
@@ -359,20 +359,20 @@
   (    2 3V3 )
  )
  ( /4CE9A68C SM0603  R4 100K {Lib=R}
-  (    1 N-000043 )
+  (    1 N-000045 )
   (    2 3V3 )
  )
  ( /4CE91633 SM0603  C18 10pF {Lib=C}
-  (    1 N-000048 )
+  (    1 N-000036 )
   (    2 GND )
  )
  ( /4CE9162F SM0603  C17 10pF {Lib=C}
-  (    1 N-000034 )
+  (    1 N-000049 )
   (    2 GND )
  )
  ( /4CE915DE Q_49U3HMS  X1 18.432MHz {Lib=CRYSTAL}
-  (    1 N-000034 )
-  (    2 N-000048 )
+  (    1 N-000049 )
+  (    2 N-000036 )
  )
 )
 *
@@ -620,297 +620,298 @@ $endlist
 $endfootprintlist
 }
 { Pin List by Nets
-Net 1 "GND" "GND"
- P1 4
- C16 2
- IC3 3
- IC3 2
+Net 1 "+1.8V" "+1.8V"
+ C12 1
+ IC3 24
+ IC3 54
+ IC3 64
+ IC3 12
+ C16 1
+ IC3 8
+ C20 1
+ C15 1
+ C19 1
+Net 2 "/TEST" "TEST"
+ JP1 1
+ IC3 40
+Net 3 "GND" "GND"
  IC3 5
+ IC3 2
+ IC3 4
  IC3 60
+ IC3 3
  P1 6
+ P2 1
+ C17 2
+ C18 2
+ IC3 17
+ IC3 46
+ P1 18
  SW1 2
  C7 2
  C9 2
  C10 1
- P1 16
- P2 1
  C6 1
- R17 2
- J1 5
+ P1 4
+ P1 16
  P1 14
  P1 12
  P1 20
  P1 10
  P1 8
- P1 18
- C17 2
- C18 2
- IC3 17
- IC3 46
- C12 2
- C1 2
  J2 1
- P4 SW2
+ C1 2
+ C12 2
  P4 C5
- IC3 4
- C20 2
+ P4 SW2
+ IC2 6
+ C19 2
  C15 2
- U1 4
- C3 2
- C13 2
- C11 2
+ C16 2
+ C20 2
+ J1 5
  BT1 2
- Q2 2
- C23 2
- C19 2
+ C3 2
  C4 2
- IC4 10
+ Q2 2
  SW2 2
+ IC4 10
+ C11 2
+ U1 4
+ C23 2
+ C14 2
+ R17 2
  P3 6
- IC2 6
- C21 2
  IC2 3
+ C13 2
  C22 2
- C14 2
-Net 4 "3V3" "3V3"
- R2 2
- C9 1
- C7 1
- IC3 18
- R12 1
- P1 1
- R6 2
- R5 2
- R4 2
- C1 1
- FB2 2
- R1 1
- R14 1
- R13 1
- C3 1
- IC2 2
- Q1 3
- IC3 7
- C22 1
- P1 2
- JP2 1
- R18 2
- U1 8
- IC3 45
- C4 1
- IC3 59
- R8 2
- IC3 58
- R7 2
- JP1 2
- P2 3
- IC4 20
-Net 5 "/CS" "CS"
+ C21 2
+Net 5 "/SC_SW" "SC_SW"
+ IC4 1
+ IC4 1
+ IC4 1
+ IC3 16
+Net 7 "/CS" "CS"
  U1 1
  IC3 28
-Net 6 "/MISO" "MISO"
- U1 2
+Net 8 "/MISO" "MISO"
  IC3 27
-Net 7 "/MOSI" "MOSI"
- IC3 22
+ U1 2
+Net 9 "/MOSI" "MOSI"
  U1 5
-Net 8 "/SCK" "SCK"
- IC3 21
+ IC3 22
+Net 10 "/SCK" "SCK"
  U1 6
-Net 9 "" ""
- R18 1
+ IC3 21
+Net 11 "" ""
  U1 7
-Net 10 "/RST_SIM" "RST_SIM"
+ R18 1
+Net 12 "/RST_SIM" "RST_SIM"
  IC4 16
- IC3 32
  P4 C2
-Net 11 "/VCC_SIM" "VCC_SIM"
+ IC3 32
+Net 13 "/VCC_SIM" "VCC_SIM"
  P4 C1
- IC4 18
  IC3 35
-Net 12 "" ""
+ IC4 18
+Net 14 "" ""
  C5 1
  J1 2
  R9 2
-Net 13 "" ""
+Net 15 "/DDP" "DDP"
+ C13 1
+ IC3 57
+ R10 1
+Net 16 "" ""
+ R10 2
+ C5 2
  R3 1
  J1 3
- C5 2
- R10 2
-Net 14 "/DDM" "DDM"
- R9 1
- C11 1
- IC3 56
-Net 15 "/A-B-DETECT" "A-B-DETECT"
- R2 1
+Net 17 "" ""
+ R3 2
+ Q1 2
+Net 18 "/A-B-DETECT" "A-B-DETECT"
  IC3 41
  J1 4
-Net 16 "" ""
- FB1 1
- J1 1
-Net 17 "" ""
- BT1 1
+ R2 1
+Net 19 "" ""
  D3 1
-Net 19 "/UDP_PUP" "UDP_PUP"
- Q2 3
- Q1 1
- D1 1
- R1 2
-Net 20 "" ""
- IC3 19
- R16 2
+ BT1 1
 Net 21 "" ""
  Q2 1
  R16 1
-Net 22 "//RESET" "/RESET"
+Net 22 "/UDP_PUP" "UDP_PUP"
+ Q1 1
+ Q2 3
+ D1 1
+ R1 2
+Net 23 "//RESET" "/RESET"
  IC3 39
- D1 2
  P1 15
+ D1 2
  R12 2
  SW1 1
-Net 23 "" ""
- Q1 2
- R3 2
 Net 24 "" ""
  C21 1
  IC2 4
-Net 25 "" ""
- D3 2
- C14 1
- IC2 5
- IC2 1
- D2 2
-Net 26 "/I/O_SIM" "I/O_SIM"
- IC3 34
+Net 25 "/I/O_SIM" "I/O_SIM"
  IC3 47
- P4 C7
  IC4 9
-Net 27 "/CLK_SIM" "CLK_SIM"
- IC3 36
- P4 C3
+ IC3 34
+ P4 C7
+Net 26 "/CLK_SIM" "CLK_SIM"
  IC3 44
+ IC3 36
  IC4 14
-Net 28 "/SC_SW" "SC_SW"
- IC4 1
- IC4 1
- IC4 1
- IC3 16
+ P4 C3
+Net 27 "/USBVCC" "USBVCC"
+ D2 1
+ FB1 2
+Net 28 "" ""
+ R16 2
+ IC3 19
+Net 30 "/DTXD" "DTXD"
+ P2 5
+ IC3 29
+ J2 3
 Net 31 "" ""
- IC3 55
- JP2 2
+ P2 6
+ P2 2
+Net 33 "" ""
+ R11 1
+ C10 2
+ IC3 63
 Net 34 "" ""
- C17 1
- X1 1
- IC3 61
-Net 35 "/TCK" "TCK"
- P1 9
- R7 1
- IC3 53
- P1 11
-Net 39 "/I/O_PHONE" "I/O_PHONE"
+ JP2 2
+ IC3 55
+Net 36 "" ""
+ C18 1
+ IC3 62
+ X1 2
+Net 38 "/I/O_SW" "I/O_SW"
+ IC3 13
+ IC4 19
+Net 41 "/I/O_PHONE" "I/O_PHONE"
  P3 4
- IC3 11
- IC3 14
  IC4 11
-Net 40 "/RST_PHONE" "RST_PHONE"
- IC4 4
- IC3 23
+ IC3 14
+ IC3 11
+Net 42 "/RST_PHONE" "RST_PHONE"
  P3 2
-Net 41 "/CLK_PHONE" "CLK_PHONE"
+ IC3 23
+ IC4 4
+Net 43 "/CLK_PHONE" "CLK_PHONE"
+ P3 3
  IC4 6
  IC3 15
- P3 3
  IC3 38
-Net 42 "" ""
+Net 44 "" ""
  R11 2
  C6 2
-Net 43 "" ""
+Net 45 "" ""
  R4 1
  P1 3
-Net 44 "/VCC_PHONE" "VCC_PHONE"
- IC3 6
- P3 1
+Net 46 "/VCC_PHONE" "VCC_PHONE"
  IC4 2
-Net 45 "/WP" "WP"
- IC3 20
+ IC3 25
+ P3 1
+ IC3 6
+Net 47 "/WP" "WP"
  R17 1
  U1 3
-Net 46 "/TEST" "TEST"
- JP1 1
- IC3 40
-Net 48 "" ""
- C18 1
- X1 2
- IC3 62
-Net 49 "/I/O_SW" "I/O_SW"
- IC4 19
- IC3 13
-Net 50 "/SW_SIM" "SW_SIM"
+ IC3 20
+Net 48 "/TMS" "TMS"
+ IC3 51
+ P1 7
+ R6 1
+Net 49 "" ""
+ C17 1
+ X1 1
+ IC3 61
+Net 51 "/BOOTLOADER" "BOOTLOADER"
+ IC3 52
+ SW2 1
+Net 52 "/SW_SIM" "SW_SIM"
  IC3 31
  P4 SW1
-Net 53 "" ""
+Net 55 "" ""
  R14 2
  D5 1
-Net 54 "/LED_G" "LED_G"
- D5 2
+Net 56 "/LED_G" "LED_G"
  IC3 10
-Net 55 "" ""
+ D5 2
+Net 57 "" ""
  D4 1
  R13 2
-Net 56 "/LED_R" "LED_R"
+Net 58 "/LED_R" "LED_R"
  IC3 9
  D4 2
-Net 57 "" ""
- IC3 1
- C23 1
- FB2 1
-Net 58 "/TDO" "TDO"
- IC3 49
- R8 1
- P1 13
-Net 59 "" ""
- P2 6
- P2 2
-Net 60 "/TMS" "TMS"
- P1 7
- R6 1
- IC3 51
-Net 61 "/TDI" "TDI"
- IC3 33
+Net 59 "/TDI" "TDI"
  P1 5
  R5 1
-Net 62 "/DDP" "DDP"
- R10 1
- IC3 57
- C13 1
-Net 63 "/BOOTLOADER" "BOOTLOADER"
- SW2 1
- IC3 52
-Net 64 "/DRXD" "DRXD"
- IC3 30
+ IC3 33
+Net 60 "/TCK" "TCK"
+ P1 11
+ P1 9
+ R7 1
+ IC3 53
+Net 61 "/TDO" "TDO"
+ P1 13
+ R8 1
+ IC3 49
+Net 62 "" ""
+ J1 1
+ FB1 1
+Net 63 "/DDM" "DDM"
+ R9 1
+ C11 1
+ IC3 56
+Net 64 "" ""
+ D2 2
+ C14 1
+ IC2 1
+ D3 2
+ IC2 5
+Net 65 "" ""
+ C23 1
+ IC3 1
+ FB2 1
+Net 66 "/DRXD" "DRXD"
  P2 4
+ IC3 30
  J2 2
-Net 65 "/DTXD" "DTXD"
- P2 5
- J2 3
- IC3 29
-Net 66 "/USBVCC" "USBVCC"
- FB1 2
- D2 1
-Net 67 "" ""
- C10 2
- R11 1
- IC3 63
-Net 68 "+1.8V" "+1.8V"
- IC3 12
- C12 1
- IC3 8
- C15 1
- C16 1
- IC3 64
- IC3 54
- C20 1
- IC3 24
- C19 1
+Net 67 "3V3" "3V3"
+ FB2 2
+ R1 1
+ JP1 2
+ P2 3
+ IC3 58
+ IC3 18
+ IC3 59
+ C4 1
+ IC3 45
+ JP2 1
+ U1 8
+ IC2 2
+ C22 1
+ C1 1
+ C7 1
+ P1 2
+ P1 1
+ R18 2
+ R12 1
+ C3 1
+ C9 1
+ R8 2
+ IC3 7
+ R7 2
+ Q1 3
+ R4 2
+ IC4 20
+ R5 2
+ R6 2
+ R13 1
+ R2 2
+ R14 1
 }
 #End
diff --git a/hardware/kicad/SIMtrace.pro b/hardware/kicad/SIMtrace.pro
index c192057..c4b3c83 100644
--- a/hardware/kicad/SIMtrace.pro
+++ b/hardware/kicad/SIMtrace.pro
@@ -1,4 +1,4 @@
-update=So 19 Jun 2011 14:13:50 CEST
+update=So 19 Jun 2011 15:09:52 CEST
 last_client=pcbnew
 [general]
 version=1
diff --git a/hardware/kicad/SIMtrace.sch b/hardware/kicad/SIMtrace.sch
index ce10488..7a178a4 100644
--- a/hardware/kicad/SIMtrace.sch
+++ b/hardware/kicad/SIMtrace.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date So 19 Jun 2011 11:09:54 CEST
+EESchema Schematic File Version 2  date So 19 Jun 2011 14:34:17 CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -39,644 +39,648 @@ $Descr A4 11700 8267
 Sheet 1 1
 Title "SIMtrace hardware"
 Date "19 jun 2011"
-Rev "0.9.4"
+Rev "0.9.7"
 Comp "osmocom"
 Comment1 "CC-BY-SA"
 Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-$Comp
-L GND #PWR01
-U 1 1 4DFDBB3F
-P 10750 4550
-F 0 "#PWR01" H 10750 4550 30  0001 C CNN
-F 1 "GND" H 10750 4480 30  0001 C CNN
-	1    10750 4550
-	0    -1   -1   0   
-$EndComp
+Text Label 7600 2300 0    60   ~ 0
+VCC_PHONE
 Wire Wire Line
-	7650 1350 7650 1700
+	7450 2300 8350 2300
 Wire Wire Line
-	2950 6800 3100 6800
+	2950 6650 3550 6650
 Wire Wire Line
-	2050 6800 1950 6800
-Connection ~ 2500 7150
+	1600 6650 2050 6650
 Wire Wire Line
-	2550 7050 2550 7150
+	2500 7150 2500 7250
 Wire Wire Line
-	2550 7150 2450 7150
+	2450 7050 2450 7150
 Wire Wire Line
-	8550 2200 8550 3200
+	5050 1000 5050 950 
 Wire Wire Line
-	8550 3200 7450 3200
+	9100 4000 9100 3150
 Wire Wire Line
-	5050 1700 5050 1600
+	9800 3900 9200 3900
 Wire Wire Line
-	9600 3150 9100 3150
+	7450 3800 9200 3800
 Wire Wire Line
-	9600 3250 9200 3250
+	1850 6800 1850 6500
 Wire Wire Line
-	9200 3250 9200 3900
+	1050 6800 900  6800
 Wire Wire Line
-	9100 3900 7450 3900
-Connection ~ 9100 3900
+	900  6800 900  6900
 Wire Wire Line
-	9800 4000 9100 4000
-Connection ~ 1600 6650
+	500  2200 800  2200
 Wire Wire Line
-	1600 6800 1600 6500
+	10300 4550 10750 4550
+Connection ~ 1150 3550
 Wire Wire Line
-	1600 6800 1450 6800
+	1150 3550 900  3550
 Wire Wire Line
-	1600 6500 1450 6500
+	900  3550 900  3700
 Wire Wire Line
-	1050 6500 650  6500
+	8750 1100 9100 1100
 Wire Wire Line
-	9250 4850 8800 4850
+	7450 1700 7650 1700
 Wire Wire Line
-	1500 2200 1700 2200
+	1300 1400 1300 1100
 Wire Wire Line
-	1150 3650 1150 3000
+	800  1250 800  1600
 Wire Wire Line
-	8100 1100 8350 1100
+	2100 1950 1850 1950
 Wire Wire Line
-	8550 1700 8550 1400
+	2100 1950 2100 2150
+Connection ~ 2100 2700
 Wire Wire Line
-	7450 1900 8300 1900
+	2100 2550 2100 2700
 Wire Wire Line
-	1150 650  1600 650 
-Connection ~ 650  900 
+	1150 2800 2450 2800
 Wire Wire Line
-	750  650  650  650 
+	2950 2700 4800 2700
 Wire Wire Line
-	650  650  650  1600
-Connection ~ 800  1600
+	1700 2600 1700 2200
 Wire Wire Line
-	1400 900  650  900 
+	1700 2600 1150 2600
 Wire Wire Line
-	650  1600 1000 1600
-Connection ~ 1300 1250
+	1550 3600 1550 2900
 Wire Wire Line
-	1300 1800 1300 1950
+	2450 2800 2450 2900
+Connection ~ 3050 2700
 Wire Wire Line
-	1300 1950 1350 1950
-Connection ~ 1850 2800
+	3050 3050 3050 2700
 Wire Wire Line
-	1850 2800 1850 1950
+	4800 2700 4800 2900
 Wire Wire Line
-	2450 2700 1150 2700
+	8950 2550 8950 2650
+Connection ~ 7550 5200
 Wire Wire Line
-	2950 2900 4700 2900
+	7650 5200 7450 5200
 Wire Wire Line
-	1350 3550 1350 3400
-Connection ~ 1350 2900
+	7550 5200 7550 5400
 Wire Wire Line
-	1150 2900 1550 2900
-Connection ~ 3050 3450
+	7550 5400 7450 5400
+Connection ~ 1850 6650
+Connection ~ 3400 6650
 Wire Wire Line
-	3300 3450 2850 3450
-Connection ~ 3300 2900
+	3400 6800 3400 6650
+Connection ~ 1950 6650
 Wire Wire Line
-	3300 3050 3300 2900
-Connection ~ 8950 1950
+	1950 6650 1950 6800
 Wire Wire Line
-	8950 2050 8950 1950
-Connection ~ 7550 5300
+	8450 6050 8450 5600
 Wire Wire Line
-	7450 5300 7550 5300
-Connection ~ 9200 3800
+	9650 5600 9650 5750
 Wire Wire Line
-	9800 3800 9650 3800
+	8850 5950 8850 5600
+Connection ~ 7700 5600
 Wire Wire Line
-	4700 2900 4700 3000
+	7700 5800 7700 5450
 Wire Wire Line
-	1850 7200 1850 7250
+	7450 5600 7700 5600
 Wire Wire Line
-	3400 7250 3400 7200
+	8250 5450 8100 5450
 Wire Wire Line
-	3100 7250 3100 7200
+	7450 5100 7900 5100
 Wire Wire Line
-	10200 5600 8850 5600
+	10550 6450 9100 6450
 Wire Wire Line
-	9250 5850 9250 5600
+	9900 6250 10550 6250
 Wire Wire Line
-	7700 6650 7700 6500
-Connection ~ 9650 5600
+	7450 3300 7900 3300
+Connection ~ 10700 1350
 Wire Wire Line
-	10550 6550 8700 6550
+	10950 1350 10700 1350
 Wire Wire Line
-	10550 6350 9500 6350
+	6200 1350 6400 1350
 Wire Wire Line
-	7450 2900 8350 2900
+	3200 5400 3200 5500
+Connection ~ 3500 5900
 Wire Wire Line
-	9350 1950 8750 1950
+	3500 5900 3850 5900
 Wire Wire Line
-	7650 1350 7000 1350
+	3850 5900 3850 5800
 Wire Wire Line
-	4750 1000 4750 700 
-Connection ~ 3500 5750
+	3500 5600 3500 6100
 Wire Wire Line
-	3500 5750 3350 5750
-Connection ~ 3500 6000
+	3500 6100 4500 6100
 Wire Wire Line
-	3500 6000 4100 6000
+	4500 6100 4500 6000
 Wire Wire Line
-	4100 6000 4100 5900
+	4100 5500 4100 5400
 Wire Wire Line
-	4500 5600 4500 5500
+	4100 5400 5050 5400
 Wire Wire Line
-	4500 5500 5050 5500
+	3500 5200 3500 5100
 Wire Wire Line
-	3850 5400 3850 5300
+	3500 5100 5050 5100
 Wire Wire Line
-	3850 5300 5050 5300
+	3500 5000 4900 5000
+Connection ~ 2000 5200
 Wire Wire Line
-	4900 5500 4900 5000
-Connection ~ 3200 4900
+	2000 5200 2400 5200
 Wire Wire Line
-	3200 4850 3200 5000
+	2400 5200 2400 5100
+Connection ~ 4900 4700
 Wire Wire Line
-	5050 4900 3200 4900
-Connection ~ 2000 5100
+	2800 4800 2800 4700
 Wire Wire Line
-	1900 5100 2000 5100
+	2800 4700 5050 4700
 Wire Wire Line
-	2000 5000 2000 5300
+	2000 4600 2000 4500
 Wire Wire Line
-	2000 5300 2800 5300
+	2000 4500 5050 4500
 Wire Wire Line
-	2800 5300 2800 5200
+	4900 4700 4900 4400
 Wire Wire Line
-	2400 4700 2400 4600
+	4900 4400 2050 4400
+Connection ~ 1550 4300
 Wire Wire Line
-	2400 4600 5050 4600
+	1550 4300 1550 4400
 Wire Wire Line
-	1550 4800 1550 4900
+	950  4600 950  4700
 Wire Wire Line
-	5050 4300 1300 4300
-Connection ~ 950  4100
+	5050 4100 750  4100
 Wire Wire Line
-	950  4200 950  4100
+	10550 2050 10950 2050
 Wire Wire Line
-	10550 1950 10950 1950
+	9350 1750 8750 1750
 Wire Wire Line
-	9350 1850 8750 1850
+	7450 3700 7900 3700
 Wire Wire Line
-	7450 3600 7900 3600
+	7450 3500 7900 3500
 Wire Wire Line
-	7450 3400 7900 3400
+	9250 2150 9250 2050
 Wire Wire Line
-	10950 1850 10550 1850
+	9250 2050 9350 2050
 Wire Wire Line
-	10550 1750 10700 1750
+	8200 6550 8200 5750
 Wire Wire Line
-	10700 1750 10700 1200
+	9000 6350 9000 5750
+Connection ~ 9250 5600
 Wire Wire Line
-	8600 6450 8600 5750
+	9400 6250 9400 5750
 Wire Wire Line
-	8950 6750 8800 6750
-Connection ~ 7150 6600
+	9600 6750 9450 6750
 Wire Wire Line
-	7000 6700 7150 6700
+	7000 6500 7150 6500
 Wire Wire Line
-	7150 6700 7150 6500
+	6300 6700 6500 6700
+Connection ~ 4900 4600
+Connection ~ 4900 5300
 Wire Wire Line
-	7300 6600 7150 6600
+	5050 1900 4150 1900
 Wire Wire Line
-	6300 6500 6500 6500
+	2050 3950 1850 3950
+Connection ~ 3300 3950
 Wire Wire Line
-	10100 6750 10550 6750
+	3050 3700 3300 3700
 Wire Wire Line
-	10800 5050 10350 5050
+	3300 3700 3300 3950
 Wire Wire Line
-	8800 5050 9250 5050
+	2600 3950 2450 3950
+Connection ~ 4450 700 
 Wire Wire Line
-	8800 4950 9250 4950
-Connection ~ 4900 4500
-Connection ~ 4900 4300
-Connection ~ 4900 5400
-Connection ~ 4900 5100
-Connection ~ 4900 5500
+	4150 700  4750 700 
 Wire Wire Line
-	5050 1800 4750 1800
-Connection ~ 1950 3950
+	4450 1000 4450 850 
 Wire Wire Line
-	1950 3950 1950 3700
+	4750 1600 4750 1800
 Wire Wire Line
-	1950 3700 2650 3700
+	4200 3700 4700 3700
 Wire Wire Line
-	3100 3950 4800 3950
+	3700 3100 3700 3700
 Wire Wire Line
-	4800 3950 4800 3800
+	5300 6700 5900 6700
 Wire Wire Line
-	4800 3800 5050 3800
+	2250 1600 2900 1600
 Wire Wire Line
-	4150 1050 4150 700 
+	9300 4550 8800 4550
 Wire Wire Line
-	4450 650  4450 700 
+	7450 4300 8350 4300
+Connection ~ 8250 4400
 Wire Wire Line
-	4150 1550 4150 1900
+	8250 4400 8250 4600
 Wire Wire Line
-	4450 1600 4450 2100
+	8250 4600 7450 4600
 Wire Wire Line
-	4200 3100 4700 3100
-Connection ~ 3700 3400
+	7450 4100 8350 4100
 Wire Wire Line
-	3600 3400 3700 3400
+	7450 2800 8350 2800
 Wire Wire Line
-	5300 6500 5900 6500
+	8350 2600 7450 2600
 Wire Wire Line
-	2400 1600 2400 2500
+	7450 2400 8350 2400
 Wire Wire Line
-	2900 1700 2800 1700
+	8350 4000 7450 4000
+Connection ~ 8200 2600
 Wire Wire Line
-	9450 2950 9450 3350
+	7450 2700 8200 2700
 Wire Wire Line
-	7450 4700 8200 4700
-Connection ~ 8200 4200
+	8200 2700 8200 2600
 Wire Wire Line
-	8200 4700 8200 4200
+	8200 2500 8200 2000
+Connection ~ 8200 2500
 Wire Wire Line
-	7450 3000 7900 3000
+	8200 2000 7450 2000
 Wire Wire Line
-	7900 3100 7450 3100
+	9300 2800 9300 3050
 Wire Wire Line
-	8350 2500 7450 2500
+	9300 3050 9600 3050
 Wire Wire Line
-	10350 4850 10800 4850
+	9600 3350 9450 3350
 Wire Wire Line
-	9450 2950 9600 2950
+	9600 2850 9450 2850
 Wire Wire Line
-	9450 2700 9450 2850
-Connection ~ 3900 1900
+	8350 4400 7450 4400
+Connection ~ 3900 1800
 Wire Wire Line
-	3800 1900 3900 1900
-Connection ~ 3900 1700
+	3900 1800 3800 1800
+Connection ~ 3900 1600
 Wire Wire Line
-	3900 1700 3800 1700
-Connection ~ 3900 1500
+	3900 1600 3800 1600
+Connection ~ 3900 1400
 Wire Wire Line
-	3900 1500 3800 1500
-Connection ~ 3900 1300
+	3900 1400 3800 1400
+Connection ~ 3900 1200
 Wire Wire Line
-	3900 1300 3800 1300
+	3800 1200 3900 1200
+Connection ~ 2800 1000
 Wire Wire Line
-	3900 2000 3900 1100
+	2800 1000 2800 850 
 Wire Wire Line
-	3900 1100 3800 1100
-Connection ~ 1600 1400
+	2800 850  3900 850 
 Wire Wire Line
-	1600 950  1600 1600
+	3900 850  3900 1000
 Wire Wire Line
-	1600 1600 1750 1600
-Connection ~ 1600 1200
+	3900 1000 3800 1000
+Connection ~ 1600 1300
 Wire Wire Line
-	1600 1300 1750 1300
-Connection ~ 1600 1000
+	1750 1400 1600 1400
+Connection ~ 1600 1100
 Wire Wire Line
-	1600 1000 2900 1000
+	1600 1200 1750 1200
+Connection ~ 2400 1600
+Connection ~ 2600 1300
 Wire Wire Line
-	1600 1100 1750 1100
-Connection ~ 2500 1400
+	2900 1300 2250 1300
 Wire Wire Line
-	2900 1400 2250 1400
-Connection ~ 2700 1200
+	2900 1100 2250 1100
 Wire Wire Line
-	2900 1200 2250 1200
-Connection ~ 4450 1900
+	5050 2500 2400 2500
 Wire Wire Line
-	2800 1700 2800 2100
+	2500 1400 2500 2400
 Wire Wire Line
-	2800 2100 4450 2100
-Connection ~ 2500 1500
+	2500 2400 5050 2400
 Wire Wire Line
-	2900 1500 2500 1500
+	2700 1200 2700 2200
 Wire Wire Line
-	2600 1300 2600 2300
+	5050 3000 4700 3000
 Wire Wire Line
-	2600 2300 5050 2300
+	7450 4200 8350 4200
 Wire Wire Line
-	5050 2200 2700 2200
+	3700 3100 3800 3100
 Wire Wire Line
-	5050 2900 4800 2900
+	4700 3700 4700 3500
 Wire Wire Line
-	3800 3700 3700 3700
-Connection ~ 4450 3700
+	4700 3500 5050 3500
 Wire Wire Line
-	5050 3300 4700 3300
-Connection ~ 4450 3100
-Connection ~ 4750 5900
+	4700 3300 4700 3100
+Connection ~ 4750 6000
 Wire Wire Line
-	4750 5900 5050 5900
+	4750 6000 5050 6000
+Connection ~ 4750 5800
+Wire Wire Line
+	5050 5800 4750 5800
 Wire Wire Line
-	4750 6150 4750 5700
+	5050 5700 4750 5700
 Wire Wire Line
-	4750 5700 5050 5700
+	4750 5700 4750 6150
 Wire Wire Line
-	5050 5800 4750 5800
-Connection ~ 4750 5800
+	4750 5900 5050 5900
+Connection ~ 4750 5900
+Connection ~ 4450 3100
 Wire Wire Line
-	4750 6000 5050 6000
-Connection ~ 4750 6000
+	4700 3300 5050 3300
+Connection ~ 4450 3700
 Wire Wire Line
-	4700 3300 4700 3100
+	3700 3700 3800 3700
 Wire Wire Line
-	5050 3500 4700 3500
+	4800 2900 5050 2900
 Wire Wire Line
-	4700 3500 4700 3700
+	2700 2200 5050 2200
 Wire Wire Line
-	3800 3100 3700 3100
+	5050 2300 2600 2300
 Wire Wire Line
-	7450 4200 8350 4200
+	2600 2300 2600 1300
 Wire Wire Line
-	4700 3000 5050 3000
+	2900 1500 2500 1500
+Connection ~ 2500 1500
 Wire Wire Line
-	2700 2200 2700 1200
+	2800 2100 4450 2100
 Wire Wire Line
-	5050 2400 2500 2400
+	2800 2100 2800 1700
+Connection ~ 4450 1900
 Wire Wire Line
-	2500 2400 2500 1400
+	2900 1200 2250 1200
+Connection ~ 2700 1200
 Wire Wire Line
-	2400 2500 5050 2500
+	2900 1400 2250 1400
+Connection ~ 2500 1400
 Wire Wire Line
-	2900 1100 2250 1100
+	1600 1100 1750 1100
 Wire Wire Line
-	2900 1300 2250 1300
-Connection ~ 2600 1300
-Connection ~ 2400 1600
+	1600 1000 2900 1000
+Connection ~ 1600 1000
 Wire Wire Line
-	1600 1200 1750 1200
-Connection ~ 1600 1100
+	1600 1300 1750 1300
+Connection ~ 1600 1200
 Wire Wire Line
-	1750 1400 1600 1400
-Connection ~ 1600 1300
+	1750 1600 1600 1600
 Wire Wire Line
-	3800 1000 3900 1000
+	1600 1600 1600 950 
+Connection ~ 1600 1400
 Wire Wire Line
-	3900 1000 3900 850 
+	3800 1100 3900 1100
 Wire Wire Line
-	3900 850  2800 850 
+	3900 1100 3900 2000
 Wire Wire Line
-	2800 850  2800 1000
-Connection ~ 2800 1000
+	3900 1300 3800 1300
+Connection ~ 3900 1300
 Wire Wire Line
-	3800 1200 3900 1200
-Connection ~ 3900 1200
+	3900 1500 3800 1500
+Connection ~ 3900 1500
 Wire Wire Line
-	3900 1400 3800 1400
-Connection ~ 3900 1400
+	3900 1700 3800 1700
+Connection ~ 3900 1700
 Wire Wire Line
-	3900 1600 3800 1600
-Connection ~ 3900 1600
+	3800 1900 3900 1900
+Connection ~ 3900 1900
 Wire Wire Line
-	3900 1800 3800 1800
-Connection ~ 3900 1800
+	9450 2850 9450 2700
 Wire Wire Line
-	8350 4400 7450 4400
+	9600 2950 9450 2950
 Wire Wire Line
-	9450 2850 9600 2850
+	10350 4850 10800 4850
 Wire Wire Line
-	9450 3350 9600 3350
+	8350 2500 7450 2500
 Wire Wire Line
-	9600 3050 9300 3050
+	7900 3100 7450 3100
 Wire Wire Line
-	9300 3050 9300 2800
+	7450 3000 7900 3000
 Wire Wire Line
-	7450 2000 8200 2000
-Connection ~ 8200 2500
+	8200 4200 8200 4700
+Connection ~ 8200 4200
 Wire Wire Line
-	8200 2000 8200 2500
+	8200 4700 7450 4700
 Wire Wire Line
-	8200 2600 8200 2700
+	9450 2950 9450 3350
 Wire Wire Line
-	8200 2700 7450 2700
-Connection ~ 8200 2600
+	2800 1700 2900 1700
 Wire Wire Line
-	8350 4000 7450 4000
+	2400 2500 2400 1600
 Wire Wire Line
-	7450 2400 8350 2400
+	5300 6500 5900 6500
 Wire Wire Line
-	8350 2600 7450 2600
+	3600 3400 3700 3400
+Connection ~ 3700 3400
 Wire Wire Line
-	7450 2800 8350 2800
+	4700 3100 4200 3100
 Wire Wire Line
-	7450 4100 8350 4100
+	4450 2100 4450 1600
 Wire Wire Line
-	7450 4600 8250 4600
+	4150 1900 4150 1550
 Wire Wire Line
-	8250 4600 8250 4400
-Connection ~ 8250 4400
+	4450 650  4450 700 
 Wire Wire Line
-	7450 4300 8350 4300
+	4150 700  4150 1050
 Wire Wire Line
-	9300 4550 8800 4550
+	5050 3800 4800 3800
 Wire Wire Line
-	2250 1600 2900 1600
+	4800 3800 4800 3950
 Wire Wire Line
-	5300 6700 5900 6700
+	4800 3950 3100 3950
 Wire Wire Line
-	3700 3100 3700 3700
+	2650 3700 1950 3700
 Wire Wire Line
-	4700 3700 4200 3700
+	1950 3700 1950 3950
+Connection ~ 1950 3950
 Wire Wire Line
-	4750 1800 4750 1600
+	4750 1800 5050 1800
+Connection ~ 4900 5500
+Connection ~ 4900 5100
+Connection ~ 4900 5400
+Connection ~ 4900 4300
+Connection ~ 4900 4500
 Wire Wire Line
-	4450 1000 4450 850 
+	8800 4950 9250 4950
 Wire Wire Line
-	4150 700  4750 700 
-Connection ~ 4450 700 
+	8800 5050 9250 5050
 Wire Wire Line
-	2600 3950 2450 3950
+	10800 5050 10350 5050
 Wire Wire Line
-	3300 3950 3300 3700
+	10100 6750 10550 6750
 Wire Wire Line
-	3300 3700 3050 3700
-Connection ~ 3300 3950
+	6300 6500 6500 6500
 Wire Wire Line
-	2050 3950 1850 3950
+	7300 6600 7150 6600
 Wire Wire Line
-	4150 1900 5050 1900
-Connection ~ 4900 5300
-Connection ~ 4900 4600
+	7150 6500 7150 6700
 Wire Wire Line
-	6300 6700 6500 6700
+	7150 6700 7000 6700
+Connection ~ 7150 6600
 Wire Wire Line
-	7150 6500 7000 6500
+	8950 6750 8800 6750
 Wire Wire Line
-	9600 6750 9450 6750
+	8600 6450 8600 5750
 Wire Wire Line
-	9400 6250 9400 5750
-Connection ~ 9250 5600
+	10700 1200 10700 1750
 Wire Wire Line
-	9000 6350 9000 5750
+	10700 1750 10550 1750
 Wire Wire Line
-	8200 6550 8200 5750
+	10950 1850 10550 1850
 Wire Wire Line
-	9350 2050 9250 2050
+	7450 3400 7900 3400
 Wire Wire Line
-	9250 2050 9250 2150
+	7450 3600 7900 3600
 Wire Wire Line
-	7450 3500 7900 3500
+	9350 1850 8750 1850
 Wire Wire Line
-	7450 3700 7900 3700
+	10550 1950 10950 1950
 Wire Wire Line
-	9350 1750 8750 1750
+	950  4200 950  4100
+Connection ~ 950  4100
 Wire Wire Line
-	10550 2050 10950 2050
+	5050 4300 1300 4300
 Wire Wire Line
-	5050 4100 750  4100
+	1550 4800 1550 4900
 Wire Wire Line
-	950  4600 950  4700
+	5050 4600 2400 4600
 Wire Wire Line
-	1550 4300 1550 4400
-Connection ~ 1550 4300
+	2400 4600 2400 4700
 Wire Wire Line
-	2050 4400 4900 4400
+	2800 5200 2800 5300
 Wire Wire Line
-	4900 4400 4900 4700
+	2800 5300 2000 5300
 Wire Wire Line
-	5050 4500 2000 4500
+	2000 5300 2000 5000
 Wire Wire Line
-	2000 4500 2000 4600
+	1900 5100 2000 5100
+Connection ~ 2000 5100
 Wire Wire Line
-	5050 4700 2800 4700
+	5050 4900 3200 4900
 Wire Wire Line
-	2800 4700 2800 4800
-Connection ~ 4900 4700
+	3200 4850 3200 5000
+Connection ~ 3200 4900
 Wire Wire Line
-	2400 5100 2400 5200
+	4900 5000 4900 5500
 Wire Wire Line
-	2400 5200 2000 5200
-Connection ~ 2000 5200
+	5050 5300 3850 5300
 Wire Wire Line
-	4900 5000 3500 5000
+	3850 5300 3850 5400
 Wire Wire Line
-	5050 5100 3500 5100
+	5050 5500 4500 5500
 Wire Wire Line
-	3500 5100 3500 5200
+	4500 5500 4500 5600
 Wire Wire Line
-	5050 5400 4100 5400
+	4100 5900 4100 6000
 Wire Wire Line
-	4100 5400 4100 5500
+	4100 6000 3500 6000
+Connection ~ 3500 6000
 Wire Wire Line
-	4500 6000 4500 6100
+	3500 5750 3350 5750
+Connection ~ 3500 5750
 Wire Wire Line
-	4500 6100 3500 6100
+	4750 700  4750 1000
 Wire Wire Line
-	3500 6100 3500 5600
+	7000 1350 7650 1350
 Wire Wire Line
-	3850 5800 3850 5900
+	9350 1950 8750 1950
 Wire Wire Line
-	3850 5900 3500 5900
-Connection ~ 3500 5900
+	7450 2900 8350 2900
 Wire Wire Line
-	3200 5400 3200 5500
+	10550 6350 9500 6350
 Wire Wire Line
-	6200 1350 6400 1350
+	10550 6550 8700 6550
+Connection ~ 9650 5600
 Wire Wire Line
-	10950 1350 10700 1350
-Connection ~ 10700 1350
+	7700 6650 7700 6500
 Wire Wire Line
-	7450 3300 7900 3300
+	9250 5850 9250 5600
 Wire Wire Line
-	9900 6250 10550 6250
+	8850 5600 10200 5600
 Wire Wire Line
-	10550 6450 9100 6450
+	3100 7250 3100 7200
 Wire Wire Line
-	7450 5100 7900 5100
+	3400 7250 3400 7200
 Wire Wire Line
-	8250 5450 8100 5450
+	1850 7200 1850 7250
 Wire Wire Line
-	7450 5600 7700 5600
+	4700 3000 4700 2900
 Wire Wire Line
-	7700 5800 7700 5450
-Connection ~ 7700 5600
+	9800 3800 9650 3800
+Connection ~ 9200 3800
 Wire Wire Line
-	8850 5600 8850 5950
+	7450 5300 7550 5300
+Connection ~ 7550 5300
 Wire Wire Line
-	9650 5600 9650 5750
+	8950 2050 8950 1950
+Connection ~ 8950 1950
 Wire Wire Line
-	8450 6050 8450 5600
+	3300 3050 3300 2900
+Connection ~ 3300 2900
 Wire Wire Line
-	1950 6800 1950 6650
-Connection ~ 1950 6650
+	3300 3450 2850 3450
+Connection ~ 3050 3450
 Wire Wire Line
-	3400 6800 3400 6650
-Connection ~ 3400 6650
-Connection ~ 1850 6650
+	1550 2900 1150 2900
+Connection ~ 1350 2900
 Wire Wire Line
-	7450 5400 7550 5400
+	1350 3550 1350 3400
 Wire Wire Line
-	7550 5400 7550 5200
+	4700 2900 2950 2900
 Wire Wire Line
-	7650 5200 7450 5200
-Connection ~ 7550 5200
+	2450 2700 1150 2700
 Wire Wire Line
-	8950 2550 8950 2650
+	1850 1950 1850 2800
+Connection ~ 1850 2800
 Wire Wire Line
-	4800 2900 4800 2700
+	1350 1950 1300 1950
 Wire Wire Line
-	3050 3050 3050 2700
-Connection ~ 3050 2700
+	1300 1950 1300 1800
+Connection ~ 1300 1250
 Wire Wire Line
-	2450 2900 2450 2800
+	1000 1600 650  1600
 Wire Wire Line
-	1550 2900 1550 3600
+	1400 900  650  900 
+Connection ~ 800  1600
 Wire Wire Line
-	1150 2600 1700 2600
+	650  1600 650  650 
 Wire Wire Line
-	1700 2600 1700 2200
+	650  650  750  650 
+Connection ~ 650  900 
 Wire Wire Line
-	4800 2700 2950 2700
+	1150 650  1600 650 
 Wire Wire Line
-	2450 2800 1150 2800
+	7450 1900 8300 1900
 Wire Wire Line
-	2100 2550 2100 2700
-Connection ~ 2100 2700
+	8550 1700 8550 1400
 Wire Wire Line
-	2100 2150 2100 1950
+	8100 1100 8350 1100
 Wire Wire Line
-	2100 1950 1850 1950
+	1150 3650 1150 3000
 Wire Wire Line
-	800  1250 800  1600
+	1700 2200 1500 2200
 Wire Wire Line
-	1300 1400 1300 1100
+	9250 4850 8800 4850
 Wire Wire Line
-	7650 1700 7450 1700
+	1050 6500 650  6500
 Wire Wire Line
-	8750 1100 9100 1100
+	1450 6500 1600 6500
 Wire Wire Line
-	900  3700 900  3550
+	1450 6800 1600 6800
 Wire Wire Line
-	900  3550 1150 3550
-Connection ~ 1150 3550
+	1600 6800 1600 6500
+Connection ~ 1600 6650
 Wire Wire Line
-	10300 4550 10750 4550
+	9100 4000 9800 4000
+Connection ~ 9100 3900
 Wire Wire Line
-	500  2200 800  2200
+	9100 3900 7450 3900
 Wire Wire Line
-	900  6900 900  6800
+	9200 3900 9200 3250
 Wire Wire Line
-	900  6800 1050 6800
+	9200 3250 9600 3250
 Wire Wire Line
-	1850 6800 1850 6500
+	9100 3150 9600 3150
 Wire Wire Line
-	7450 3800 9200 3800
+	5050 1700 5050 1600
 Wire Wire Line
-	9200 3900 9800 3900
+	7450 3200 8550 3200
 Wire Wire Line
-	9100 4000 9100 3150
+	8550 3200 8550 2200
 Wire Wire Line
-	5050 1000 5050 950 
+	2450 7150 2550 7150
 Wire Wire Line
-	2450 7150 2450 7050
+	2550 7150 2550 7050
+Connection ~ 2500 7150
 Wire Wire Line
-	2500 7150 2500 7250
+	1950 6800 2050 6800
 Wire Wire Line
-	1600 6650 2050 6650
+	2950 6800 3100 6800
 Wire Wire Line
-	2950 6650 3550 6650
+	7650 1350 7650 1700
+$Comp
+L GND #PWR01
+U 1 1 4DFDBB3F
+P 10750 4550
+F 0 "#PWR01" H 10750 4550 30  0001 C CNN
+F 1 "GND" H 10750 4480 30  0001 C CNN
+	1    10750 4550
+	0    -1   -1   0   
+$EndComp
 NoConn ~ 7450 1800
 $Comp
 L JACK_2.5 J2
@@ -811,9 +815,8 @@ L BATTERY BT1
 U 1 1 4DC804A6
 P 900 7200
 F 0 "BT1" H 900 7400 50  0000 C CNN
-F 1 "BATTERY" H 900 6900 50  0000 C CNN
+F 1 "4.5-6V" H 900 7000 50  0000 C CNN
 F 2 "PIN_ARRAY_2X1" H 900 7200 60  0001 C CNN
-F 4 "4.5-6V" H 900 7000 50  0000 C CNN "Field1"
 	1    900  7200
 	0    1    1    0   
 $EndComp
@@ -1423,7 +1426,7 @@ L FLASH_SPI U1
 U 1 1 4DC5A250
 P 9950 1900
 F 0 "U1" H 9950 2200 60  0000 C CNN
-F 1 "FLASH_SPI" H 9950 1600 60  0000 C CNN
+F 1 "FLASH" H 9950 1600 60  0000 C CNN
 F 2 "SOIC8" H 9950 1900 60  0001 C CNN
 	1    9950 1900
 	1    0    0    -1  
@@ -1739,7 +1742,7 @@ L AT91SAM7S512/256/128/64/321-AU IC3
 U 1 1 4CE84486
 P 6250 3800
 F 0 "IC3" H 5250 6100 50  0000 L BNN
-F 1 "AT91SAM7S512/256/128/64/321-AU" H 5250 1400 50  0000 L BNN
+F 1 "AT91SAM7S" H 5250 1400 50  0000 L BNN
 F 2 "TQFP_64" H 6250 3950 50  0001 C CNN
 	1    6250 3800
 	1    0    0    -1  
@@ -1865,7 +1868,6 @@ F 1 "1V8" H 3200 4960 30  0000 C CNN
 	1    0    0    -1  
 $EndComp
 NoConn ~ 7450 4500
-NoConn ~ 7450 2300
 NoConn ~ 7450 2200
 NoConn ~ 7450 2100
 Text Label 7600 4700 0    60   ~ 0