Merge branch 'master' of git.osmocom.org:simtrace

8 files changed, 991 insertions, 227 deletions

diff --git a/hardware/kicad/simffc.brd b/hardware/kicad/simffc.brd
index 2d9cf7f..c26ef0b 100644
--- a/hardware/kicad/simffc.brd
+++ b/hardware/kicad/simffc.brd
@@ -1,6 +1,6 @@
-PCBNEW-BOARD Version 1 date Wed 07 Dec 2011 02:34:05 PM CET
+PCBNEW-BOARD Version 1 date Thu 15 Dec 2011 12:01:00 PM CET
 
-# Created by Pcbnew(2011-aug-04)-testing
+# Created by Pcbnew(2011-07-02 BZR 3034)-testing
 
 $GENERAL
 encoding utf-8
@@ -8,9 +8,9 @@ LayerCount 2
 Ly 1FFF8001
 EnabledLayers 1FFF8001
 Links 24
-NoConn 0
-Di 18339 8740 86332 53569
-Ndraw 43
+NoConn 12
+Di 17836 8740 86332 53569
+Ndraw 85
 Ntrack 364
 Nzone 0
 BoardThickness 630
@@ -21,7 +21,7 @@ $EndGENERAL
 $SHEETDESCR
 Sheet A4 11700 8267
 Title "SIMtrace"
-Date "7 dec 2011"
+Date "15 dec 2011"
 Rev "1.0.91"
 Comp "osmocom"
 Comment1 "CC-BY-SA"
@@ -42,7 +42,7 @@ TrackWidthList 276
 TrackClearence 100
 ZoneClearence 200
 TrackMinWidth 80
-DrawSegmWidth 150
+DrawSegmWidth 0
 EdgeSegmWidth 150
 ViaSize 350
 ViaDrill 250
@@ -62,7 +62,7 @@ PadSize 600 600
 PadDrill 320
 Pad2MaskClearance 100
 AuxiliaryAxisOrg 62750 26200
-PcbPlotParams (pcbplotparams (layerselection 276856832) (usegerberextensions true) (excludeedgelayer true) (linewidth 60) (plotframeref false) (viasonmask false) (mode 1) (useauxorigin false) (hpglpennumber 1) (hpglpenspeed 20) (hpglpendiameter 15) (hpglpenoverlay 0) (pscolor true) (psnegative false) (psa4output false) (plotreference true) (plotvalue true) (plotothertext true) (plotinvisibletext false) (padsonsilk false) (subtractmaskfromsilk false) (outputformat 1) (mirror false) (drillshape 1) (scaleselection 1) (outputdirectory ../pcb/gerber/))
+PcbPlotParams (pcbplotparams (layerselection 343965696) (usegerberextensions true) (excludeedgelayer true) (linewidth 60) (plotframeref false) (viasonmask false) (mode 1) (useauxorigin false) (hpglpennumber 1) (hpglpenspeed 20) (hpglpendiameter 15) (hpglpenoverlay 0) (pscolor true) (psnegative false) (psa4output false) (plotreference true) (plotvalue true) (plotothertext true) (plotinvisibletext false) (padsonsilk false) (subtractmaskfromsilk false) (outputformat 1) (mirror false) (drillshape 1) (scaleselection 1) (outputdirectory /tmp/))
 $EndSETUP
 
 $EQUIPOT
@@ -217,6 +217,7 @@ Dr 0 0 0
 At SMD N 00888000
 Ne 17 "/VCC1"
 Po 0 -984
+Le -1
 $EndPAD
 $PAD
 Sh "2" R 1181 315 0 0 1800
@@ -224,6 +225,7 @@ Dr 0 0 0
 At SMD N 00888000
 Ne 13 "/RST1"
 Po 0 -591
+Le 27545904
 $EndPAD
 $PAD
 Sh "3" R 1181 315 0 0 1800
@@ -231,6 +233,7 @@ Dr 0 0 0
 At SMD N 00888000
 Ne 1 "/CLK1"
 Po 0 -197
+Le 201216
 $EndPAD
 $PAD
 Sh "4" R 1181 315 0 0 1800
@@ -238,6 +241,7 @@ Dr 0 0 0
 At SMD N 00888000
 Ne 9 "/I-O1"
 Po 0 197
+Le 27546824
 $EndPAD
 $PAD
 Sh "5" R 1181 315 0 0 1800
@@ -245,6 +249,7 @@ Dr 0 0 0
 At SMD N 00888000
 Ne 21 "/VPP1"
 Po 0 591
+Le 27534024
 $EndPAD
 $PAD
 Sh "6" R 1181 315 0 0 1800
@@ -252,6 +257,7 @@ Dr 0 0 0
 At SMD N 00888000
 Ne 5 "/GND1"
 Po 0 984
+Le 27539128
 $EndPAD
 $EndMODULE  FFC
 $MODULE FFC
@@ -638,6 +644,178 @@ Po 4969 3417
 $EndPAD
 $EndMODULE  SIM_LIGHT
 $DRAWSEGMENT
+Po 0 20862 19705 19693 20874 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 29528 19705 20862 19705 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 19724 43331 19717 43331 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 19724 51988 19724 43331 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 20866 53130 19724 51988 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 25591 53130 20866 53130 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 25591 43323 25591 53130 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 19724 43323 25591 43323 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 19724 29528 19724 39370 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 24406 29528 19724 29528 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 25587 30709 24406 29528 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 25587 39366 25587 30709 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 19720 39366 25587 39366 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 19685 25571 19685 20866 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 29530 25570 19690 25570 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 29530 19710 29530 25570 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 81596 49593 81596 46853 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 78840 49608 81600 49608 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 78840 46860 78840 49600 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 81600 46852 78840 46852 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 81600 35830 81600 33070 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 78840 35830 81600 35830 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 78840 33070 78840 35830 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 81600 33070 78840 33070 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 85530 24120 85530 21360 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 82770 24120 85530 24120 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 82770 21360 82770 24120 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 85530 21360 82770 21360 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 85530 11520 85520 11520 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 85530 14270 85530 11520 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 82750 14270 85530 14270 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 82750 11520 82750 14270 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 85530 11520 82750 11520 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 19690 15730 19690 9860 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 28360 15730 19690 15730 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 29530 14560 28360 15730 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 29530 9860 29530 14560 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 19690 9860 29530 9860 39
+De 26 0 900 0 0
+$EndDRAWSEGMENT
+$TEXTPCB
+Te "sysmocom"
+Po 27400 10330 472 669 99 0
+De 15 1 0 Normal
+$EndTEXTPCB
+$TEXTPCB
+Te "sysmocom"
+Po 20330 22930 600 800 120 900
+De 15 1 0 Normal
+$EndTEXTPCB
+$TEXTPCB
+Te "sysmocom"
+Po 23170 52330 600 800 120 0
+De 15 1 0 Normal
+$EndTEXTPCB
+$TEXTPCB
+Te "sysmocom"
+Po 22470 30610 600 800 120 0
+De 15 1 0 Normal
+$EndTEXTPCB
+$DRAWSEGMENT
 Po 0 25591 53130 25591 50394 0
 De 28 0 900 0 0
 $EndDRAWSEGMENT
@@ -810,6 +988,50 @@ Po 0 85531 11516 85531 14272 0
 De 28 0 900 0 0
 $EndDRAWSEGMENT
 $TRACK
+Po 0 25097 48031 25000 48031 276 -1
+De 15 0 0 0 0
+Po 0 25000 48031 24902 47933 276 -1
+De 15 0 0 0 0
+Po 0 25097 48031 24901 48031 118 -1
+De 15 0 0 0 0
+Po 0 24508 47146 22304 47146 118 -1
+De 15 0 0 0 0
+Po 0 24803 47441 24508 47146 118 -1
+De 15 0 0 0 0
+Po 0 24803 47933 24803 47441 118 -1
+De 15 0 0 0 0
+Po 0 24901 48031 24803 47933 118 -1
+De 15 0 0 0 0
+Po 0 22174 47276 22174 48276 118 -1
+De 15 0 0 0 0
+Po 0 22304 47146 22174 47276 118 -1
+De 15 0 0 0 0
+Po 0 24450 36122 24450 35885 197 -1
+De 15 0 0 0 0
+Po 0 24450 35885 24863 35472 197 -1
+De 15 0 0 0 0
+Po 0 25689 35040 25453 35040 276 -1
+De 15 0 0 0 0
+Po 0 25453 35040 24863 35630 276 -1
+De 15 0 0 0 0
+Po 0 24863 35630 24863 35472 276 -1
+De 15 0 0 0 0
+Po 0 25098 35040 25689 35040 276 -1
+De 15 0 0 0 0
+Po 0 24863 35472 24863 35275 276 -1
+De 15 0 0 0 0
+Po 0 24863 35275 25098 35040 276 -1
+De 15 0 0 0 0
+Po 0 22102 38302 22300 38500 197 -1
+De 15 0 0 0 0
+Po 0 22300 38500 23850 38500 197 -1
+De 15 0 0 0 0
+Po 0 23850 38500 24450 37900 197 -1
+De 15 0 0 0 0
+Po 0 24450 37900 24450 36122 197 -1
+De 15 0 0 0 0
+Po 0 22102 38302 22102 37401 197 -1
+De 15 0 0 0 0
 Po 0 30512 13091 29035 13091 276 -1
 De 15 0 1 0 0
 Po 0 31450 13091 84843 13091 197 -1
@@ -859,7 +1081,7 @@ De 15 0 3 0 400000
 Po 0 31496 34646 26575 34646 197 -1
 De 15 0 3 0 0
 Po 0 23549 37401 23102 37401 197 -1
-De 15 0 3 0 800000
+De 15 0 3 0 0
 Po 0 23900 37050 23549 37401 197 -1
 De 15 0 3 0 0
 Po 0 23900 35728 23900 37050 197 -1
@@ -897,7 +1119,7 @@ De 15 0 4 0 0
 Po 0 24750 49950 24350 50350 118 -1
 De 15 0 4 0 0
 Po 0 21074 45276 22174 45276 118 -1
-De 15 0 4 0 800000
+De 15 0 4 0 0
 Po 0 20850 45500 21074 45276 118 -1
 De 15 0 4 0 0
 Po 0 20850 50000 20850 45500 118 -1
@@ -985,7 +1207,7 @@ De 15 0 7 0 0
 Po 0 21700 32200 21102 32798 197 -1
 De 15 0 7 0 0
 Po 0 21102 32798 21102 34401 197 -1
-De 15 0 7 0 800000
+De 15 0 7 0 0
 Po 0 23917 32200 24523 32200 197 -1
 De 15 0 7 0 0
 Po 0 25788 33465 24523 32200 197 -1
@@ -1021,7 +1243,7 @@ De 15 0 8 0 0
 Po 0 24606 46500 21550 46500 118 -1
 De 15 0 8 0 0
 Po 0 24174 49376 24174 48276 118 -1
-De 15 0 8 0 800000
+De 15 0 8 0 0
 Po 0 21200 49550 21500 49850 118 -1
 De 15 0 8 0 0
 Po 0 21500 49850 23700 49850 118 -1
@@ -1081,25 +1303,11 @@ De 15 0 11 0 400000
 Po 0 23898 34252 23749 34401 197 -1
 De 15 0 11 0 0
 Po 0 23749 34401 23102 34401 197 -1
-De 15 0 11 0 800000
+De 15 0 11 0 0
 Po 0 31496 34252 26575 34252 197 -1
 De 15 0 11 0 0
 Po 0 24270 34252 23898 34252 197 -1
 De 15 0 11 0 0
-Po 0 25097 48031 25000 48031 276 -1
-De 15 0 12 0 0
-Po 0 25000 48031 24902 47933 276 -1
-De 15 0 12 0 0
-Po 0 25097 48031 24901 48031 118 -1
-De 15 0 12 0 0
-Po 0 24508 47146 22304 47146 118 -1
-De 15 0 12 0 0
-Po 0 24803 47441 24508 47146 118 -1
-De 15 0 12 0 0
-Po 0 24803 47933 24803 47441 118 -1
-De 15 0 12 0 0
-Po 0 24901 48031 24803 47933 118 -1
-De 15 0 12 0 0
 Po 0 26476 48031 25097 48031 276 -1
 De 15 0 12 0 0
 Po 0 25081 48047 25081 48031 276 -1
@@ -1110,10 +1318,6 @@ Po 0 80906 48031 31496 48031 197 -1
 De 15 0 12 0 400000
 Po 0 25081 48031 25081 48031 118 -1
 De 15 0 12 0 0
-Po 0 22174 47276 22174 48276 118 -1
-De 15 0 12 0 800000
-Po 0 22304 47146 22174 47276 118 -1
-De 15 0 12 0 0
 Po 0 31496 48031 26476 48031 197 -1
 De 15 0 12 0 0
 Po 0 30512 13485 29036 13485 276 -1
@@ -1168,22 +1372,6 @@ Po 0 30413 23327 30413 23327 197 -1
 De 15 0 14 0 0
 Po 0 30413 23327 31496 23327 197 -1
 De 15 0 14 0 0
-Po 0 24450 36122 24450 35885 197 -1
-De 15 0 15 0 0
-Po 0 24450 35885 24863 35472 197 -1
-De 15 0 15 0 0
-Po 0 25689 35040 25453 35040 276 -1
-De 15 0 15 0 0
-Po 0 25453 35040 24863 35630 276 -1
-De 15 0 15 0 0
-Po 0 24863 35630 24863 35472 276 -1
-De 15 0 15 0 0
-Po 0 25098 35040 25689 35040 276 -1
-De 15 0 15 0 0
-Po 0 24863 35472 24863 35275 276 -1
-De 15 0 15 0 0
-Po 0 24863 35275 25098 35040 276 -1
-De 15 0 15 0 0
 Po 0 25394 35040 25393 35040 276 -1
 De 15 0 15 0 0
 Po 0 25689 35040 25393 35040 276 -1
@@ -1194,16 +1382,6 @@ Po 0 25689 35040 25394 35040 276 -1
 De 15 0 15 0 0
 Po 0 80906 35040 31496 35040 197 -1
 De 15 0 15 0 400000
-Po 0 22102 38302 22300 38500 197 -1
-De 15 0 15 0 0
-Po 0 22300 38500 23850 38500 197 -1
-De 15 0 15 0 0
-Po 0 23850 38500 24450 37900 197 -1
-De 15 0 15 0 0
-Po 0 24450 37900 24450 36122 197 -1
-De 15 0 15 0 0
-Po 0 22102 38302 22102 37401 197 -1
-De 15 0 15 0 800000
 Po 0 25393 35040 26575 35040 197 -1
 De 15 0 15 0 0
 Po 0 26575 35040 31496 35040 197 -1
@@ -1259,9 +1437,9 @@ De 15 0 16 0 0
 Po 0 23950 50900 21050 50900 118 -1
 De 15 0 16 0 0
 Po 0 23174 44124 23174 45276 118 -1
-De 15 0 16 0 800000
+De 15 0 16 0 0
 Po 0 23174 45276 23174 44124 80 -1
-De 15 0 16 0 400000
+De 15 0 16 0 0
 Po 0 29134 14173 28527 14173 197 -1
 De 15 0 17 0 0
 Po 0 28527 14173 27350 15350 197 -1
@@ -1319,7 +1497,7 @@ De 15 0 19 0 0
 Po 0 24250 38900 25100 38050 197 -1
 De 15 0 19 0 0
 Po 0 21102 38502 21102 37401 197 -1
-De 15 0 19 0 800000
+De 15 0 19 0 0
 Po 0 21102 38502 21500 38900 197 -1
 De 15 0 19 0 0
 Po 0 21500 38900 24250 38900 197 -1
@@ -1373,7 +1551,7 @@ De 15 0 20 0 0
 Po 0 31488 49212 26475 49212 197 -1
 De 15 0 20 0 0
 Po 0 24174 45276 24174 44074 118 -1
-De 15 0 20 0 400000
+De 15 0 20 0 0
 Po 0 20850 51550 25150 51550 118 -1
 De 15 0 20 0 0
 Po 0 20150 50850 20850 51550 118 -1
@@ -1471,7 +1649,7 @@ De 15 0 23 0 0
 Po 0 22102 33198 22450 32850 197 -1
 De 15 0 23 0 0
 Po 0 22102 34401 22102 33198 197 -1
-De 15 0 23 0 400000
+De 15 0 23 0 0
 Po 0 26575 33858 25394 33858 276 -1
 De 15 0 23 0 0
 Po 0 25394 33858 25393 33858 276 -1
@@ -1519,7 +1697,7 @@ De 15 0 24 0 0
 Po 0 25492 47637 25257 47637 197 -1
 De 15 0 24 0 0
 Po 0 23174 49026 23174 48276 118 -1
-De 15 0 24 0 800000
+De 15 0 24 0 0
 Po 0 25257 47637 25050 47430 118 -1
 De 15 0 24 0 0
 Po 0 25050 47430 25050 47200 118 -1
diff --git a/hardware/pcb/gerber/simffc-Eco1.gbr b/hardware/pcb/gerber/simffc-Eco1.gbr
new file mode 100644
index 0000000..76dd09d
--- /dev/null
+++ b/hardware/pcb/gerber/simffc-Eco1.gbr
@@ -0,0 +1,90 @@
+G04 (created by PCBNEW-RS274X (2011-07-02 BZR 3034)-testing) date Thu 15 Dec 2011 12:00:24 PM CET*
+G01*
+G70*
+G90*
+%MOIN*%
+G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*
+%FSLAX34Y34*%
+G04 APERTURE LIST*
+%ADD10C,0.006000*%
+%ADD11C,0.003900*%
+G04 APERTURE END LIST*
+G54D10*
+G54D11*
+X20862Y-19705D02*
+X19693Y-20874D01*
+X29528Y-19705D02*
+X20862Y-19705D01*
+X19724Y-43331D02*
+X19717Y-43331D01*
+X19724Y-51988D02*
+X19724Y-43331D01*
+X20866Y-53130D02*
+X19724Y-51988D01*
+X25591Y-53130D02*
+X20866Y-53130D01*
+X25591Y-43323D02*
+X25591Y-53130D01*
+X19724Y-43323D02*
+X25591Y-43323D01*
+X19724Y-29528D02*
+X19724Y-39370D01*
+X24406Y-29528D02*
+X19724Y-29528D01*
+X25587Y-30709D02*
+X24406Y-29528D01*
+X25587Y-39366D02*
+X25587Y-30709D01*
+X19720Y-39366D02*
+X25587Y-39366D01*
+X19685Y-25571D02*
+X19685Y-20866D01*
+X29530Y-25570D02*
+X19690Y-25570D01*
+X29530Y-19710D02*
+X29530Y-25570D01*
+X81596Y-49593D02*
+X81596Y-46853D01*
+X78840Y-49608D02*
+X81600Y-49608D01*
+X78840Y-46860D02*
+X78840Y-49600D01*
+X81600Y-46852D02*
+X78840Y-46852D01*
+X81600Y-35830D02*
+X81600Y-33070D01*
+X78840Y-35830D02*
+X81600Y-35830D01*
+X78840Y-33070D02*
+X78840Y-35830D01*
+X81600Y-33070D02*
+X78840Y-33070D01*
+X85530Y-24120D02*
+X85530Y-21360D01*
+X82770Y-24120D02*
+X85530Y-24120D01*
+X82770Y-21360D02*
+X82770Y-24120D01*
+X85530Y-21360D02*
+X82770Y-21360D01*
+X85530Y-11520D02*
+X85520Y-11520D01*
+X85530Y-14270D02*
+X85530Y-11520D01*
+X82750Y-14270D02*
+X85530Y-14270D01*
+X82750Y-11520D02*
+X82750Y-14270D01*
+X85530Y-11520D02*
+X82750Y-11520D01*
+X19690Y-15730D02*
+X19690Y-09860D01*
+X28360Y-15730D02*
+X19690Y-15730D01*
+X29530Y-14560D02*
+X28360Y-15730D01*
+X29530Y-09860D02*
+X29530Y-14560D01*
+X19690Y-09860D02*
+X29530Y-09860D01*
+M02*
diff --git a/hardware/pcb/gerber/simffc-Front.gtl b/hardware/pcb/gerber/simffc-Front.gtl
index de979de..39e2da2 100644
--- a/hardware/pcb/gerber/simffc-Front.gtl
+++ b/hardware/pcb/gerber/simffc-Front.gtl
@@ -1,4 +1,4 @@
-G04 (created by PCBNEW-RS274X (2011-aug-04)-testing) date Wed 07 Dec 2011 02:34:08 PM CET*
+G04 (created by PCBNEW-RS274X (2011-07-02 BZR 3034)-testing) date Thu 15 Dec 2011 12:00:24 PM CET*
 G01*
 G70*
 G90*
@@ -7,16 +7,488 @@ G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*
 %FSLAX34Y34*%
 G04 APERTURE LIST*
 %ADD10C,0.006000*%
-%ADD11R,0.118100X0.031500*%
-%ADD12R,0.157500X0.078700*%
-%ADD13R,0.078700X0.157500*%
-%ADD14C,0.027600*%
-%ADD15C,0.019700*%
-%ADD16C,0.011800*%
-%ADD17C,0.008000*%
+%ADD11C,0.009900*%
+%ADD12C,0.012000*%
+%ADD13R,0.118100X0.031500*%
+%ADD14R,0.157500X0.078700*%
+%ADD15R,0.078700X0.157500*%
+%ADD16C,0.027600*%
+%ADD17C,0.011800*%
+%ADD18C,0.019700*%
+%ADD19C,0.008000*%
 G04 APERTURE END LIST*
 G54D10*
 G54D11*
+X25670Y-10568D02*
+X25715Y-10600D01*
+X25805Y-10600D01*
+X25850Y-10568D01*
+X25872Y-10505D01*
+X25872Y-10473D01*
+X25850Y-10409D01*
+X25805Y-10377D01*
+X25737Y-10377D01*
+X25692Y-10345D01*
+X25670Y-10282D01*
+X25670Y-10250D01*
+X25692Y-10186D01*
+X25737Y-10154D01*
+X25805Y-10154D01*
+X25850Y-10186D01*
+X26029Y-10154D02*
+X26142Y-10600D01*
+X26254Y-10154D02*
+X26142Y-10600D01*
+X26097Y-10760D01*
+X26074Y-10791D01*
+X26029Y-10823D01*
+X26412Y-10568D02*
+X26457Y-10600D01*
+X26547Y-10600D01*
+X26592Y-10568D01*
+X26614Y-10505D01*
+X26614Y-10473D01*
+X26592Y-10409D01*
+X26547Y-10377D01*
+X26479Y-10377D01*
+X26434Y-10345D01*
+X26412Y-10282D01*
+X26412Y-10250D01*
+X26434Y-10186D01*
+X26479Y-10154D01*
+X26547Y-10154D01*
+X26592Y-10186D01*
+X26816Y-10600D02*
+X26816Y-10154D01*
+X26816Y-10218D02*
+X26839Y-10186D01*
+X26884Y-10154D01*
+X26951Y-10154D01*
+X26996Y-10186D01*
+X27019Y-10250D01*
+X27019Y-10600D01*
+X27019Y-10250D02*
+X27041Y-10186D01*
+X27086Y-10154D01*
+X27154Y-10154D01*
+X27198Y-10186D01*
+X27221Y-10250D01*
+X27221Y-10600D01*
+X27513Y-10600D02*
+X27468Y-10568D01*
+X27445Y-10537D01*
+X27423Y-10473D01*
+X27423Y-10282D01*
+X27445Y-10218D01*
+X27468Y-10186D01*
+X27513Y-10154D01*
+X27580Y-10154D01*
+X27625Y-10186D01*
+X27648Y-10218D01*
+X27670Y-10282D01*
+X27670Y-10473D01*
+X27648Y-10537D01*
+X27625Y-10568D01*
+X27580Y-10600D01*
+X27513Y-10600D01*
+X28075Y-10568D02*
+X28030Y-10600D01*
+X27940Y-10600D01*
+X27895Y-10568D01*
+X27872Y-10537D01*
+X27850Y-10473D01*
+X27850Y-10282D01*
+X27872Y-10218D01*
+X27895Y-10186D01*
+X27940Y-10154D01*
+X28030Y-10154D01*
+X28075Y-10186D01*
+X28345Y-10600D02*
+X28300Y-10568D01*
+X28277Y-10537D01*
+X28255Y-10473D01*
+X28255Y-10282D01*
+X28277Y-10218D01*
+X28300Y-10186D01*
+X28345Y-10154D01*
+X28412Y-10154D01*
+X28457Y-10186D01*
+X28480Y-10218D01*
+X28502Y-10282D01*
+X28502Y-10473D01*
+X28480Y-10537D01*
+X28457Y-10568D01*
+X28412Y-10600D01*
+X28345Y-10600D01*
+X28704Y-10600D02*
+X28704Y-10154D01*
+X28704Y-10218D02*
+X28727Y-10186D01*
+X28772Y-10154D01*
+X28839Y-10154D01*
+X28884Y-10186D01*
+X28907Y-10250D01*
+X28907Y-10600D01*
+X28907Y-10250D02*
+X28929Y-10186D01*
+X28974Y-10154D01*
+X29042Y-10154D01*
+X29086Y-10186D01*
+X29109Y-10250D01*
+X29109Y-10600D01*
+G54D12*
+X20616Y-25130D02*
+X20654Y-25073D01*
+X20654Y-24958D01*
+X20616Y-24901D01*
+X20540Y-24873D01*
+X20501Y-24873D01*
+X20425Y-24901D01*
+X20387Y-24958D01*
+X20387Y-25044D01*
+X20349Y-25101D01*
+X20273Y-25130D01*
+X20235Y-25130D01*
+X20159Y-25101D01*
+X20120Y-25044D01*
+X20120Y-24958D01*
+X20159Y-24901D01*
+X20120Y-24672D02*
+X20654Y-24529D01*
+X20120Y-24387D02*
+X20654Y-24529D01*
+X20844Y-24587D01*
+X20882Y-24615D01*
+X20920Y-24672D01*
+X20616Y-24187D02*
+X20654Y-24130D01*
+X20654Y-24015D01*
+X20616Y-23958D01*
+X20540Y-23930D01*
+X20501Y-23930D01*
+X20425Y-23958D01*
+X20387Y-24015D01*
+X20387Y-24101D01*
+X20349Y-24158D01*
+X20273Y-24187D01*
+X20235Y-24187D01*
+X20159Y-24158D01*
+X20120Y-24101D01*
+X20120Y-24015D01*
+X20159Y-23958D01*
+X20654Y-23672D02*
+X20120Y-23672D01*
+X20197Y-23672D02*
+X20159Y-23644D01*
+X20120Y-23586D01*
+X20120Y-23501D01*
+X20159Y-23444D01*
+X20235Y-23415D01*
+X20654Y-23415D01*
+X20235Y-23415D02*
+X20159Y-23386D01*
+X20120Y-23329D01*
+X20120Y-23244D01*
+X20159Y-23186D01*
+X20235Y-23158D01*
+X20654Y-23158D01*
+X20654Y-22786D02*
+X20616Y-22844D01*
+X20578Y-22872D01*
+X20501Y-22901D01*
+X20273Y-22901D01*
+X20197Y-22872D01*
+X20159Y-22844D01*
+X20120Y-22786D01*
+X20120Y-22701D01*
+X20159Y-22644D01*
+X20197Y-22615D01*
+X20273Y-22586D01*
+X20501Y-22586D01*
+X20578Y-22615D01*
+X20616Y-22644D01*
+X20654Y-22701D01*
+X20654Y-22786D01*
+X20616Y-22072D02*
+X20654Y-22129D01*
+X20654Y-22243D01*
+X20616Y-22301D01*
+X20578Y-22329D01*
+X20501Y-22358D01*
+X20273Y-22358D01*
+X20197Y-22329D01*
+X20159Y-22301D01*
+X20120Y-22243D01*
+X20120Y-22129D01*
+X20159Y-22072D01*
+X20654Y-21729D02*
+X20616Y-21787D01*
+X20578Y-21815D01*
+X20501Y-21844D01*
+X20273Y-21844D01*
+X20197Y-21815D01*
+X20159Y-21787D01*
+X20120Y-21729D01*
+X20120Y-21644D01*
+X20159Y-21587D01*
+X20197Y-21558D01*
+X20273Y-21529D01*
+X20501Y-21529D01*
+X20578Y-21558D01*
+X20616Y-21587D01*
+X20654Y-21644D01*
+X20654Y-21729D01*
+X20654Y-21272D02*
+X20120Y-21272D01*
+X20197Y-21272D02*
+X20159Y-21244D01*
+X20120Y-21186D01*
+X20120Y-21101D01*
+X20159Y-21044D01*
+X20235Y-21015D01*
+X20654Y-21015D01*
+X20235Y-21015D02*
+X20159Y-20986D01*
+X20120Y-20929D01*
+X20120Y-20844D01*
+X20159Y-20786D01*
+X20235Y-20758D01*
+X20654Y-20758D01*
+X20970Y-52616D02*
+X21027Y-52654D01*
+X21142Y-52654D01*
+X21199Y-52616D01*
+X21227Y-52540D01*
+X21227Y-52501D01*
+X21199Y-52425D01*
+X21142Y-52387D01*
+X21056Y-52387D01*
+X20999Y-52349D01*
+X20970Y-52273D01*
+X20970Y-52235D01*
+X20999Y-52159D01*
+X21056Y-52120D01*
+X21142Y-52120D01*
+X21199Y-52159D01*
+X21428Y-52120D02*
+X21571Y-52654D01*
+X21713Y-52120D02*
+X21571Y-52654D01*
+X21513Y-52844D01*
+X21485Y-52882D01*
+X21428Y-52920D01*
+X21913Y-52616D02*
+X21970Y-52654D01*
+X22085Y-52654D01*
+X22142Y-52616D01*
+X22170Y-52540D01*
+X22170Y-52501D01*
+X22142Y-52425D01*
+X22085Y-52387D01*
+X21999Y-52387D01*
+X21942Y-52349D01*
+X21913Y-52273D01*
+X21913Y-52235D01*
+X21942Y-52159D01*
+X21999Y-52120D01*
+X22085Y-52120D01*
+X22142Y-52159D01*
+X22428Y-52654D02*
+X22428Y-52120D01*
+X22428Y-52197D02*
+X22456Y-52159D01*
+X22514Y-52120D01*
+X22599Y-52120D01*
+X22656Y-52159D01*
+X22685Y-52235D01*
+X22685Y-52654D01*
+X22685Y-52235D02*
+X22714Y-52159D01*
+X22771Y-52120D01*
+X22856Y-52120D01*
+X22914Y-52159D01*
+X22942Y-52235D01*
+X22942Y-52654D01*
+X23314Y-52654D02*
+X23256Y-52616D01*
+X23228Y-52578D01*
+X23199Y-52501D01*
+X23199Y-52273D01*
+X23228Y-52197D01*
+X23256Y-52159D01*
+X23314Y-52120D01*
+X23399Y-52120D01*
+X23456Y-52159D01*
+X23485Y-52197D01*
+X23514Y-52273D01*
+X23514Y-52501D01*
+X23485Y-52578D01*
+X23456Y-52616D01*
+X23399Y-52654D01*
+X23314Y-52654D01*
+X24028Y-52616D02*
+X23971Y-52654D01*
+X23857Y-52654D01*
+X23799Y-52616D01*
+X23771Y-52578D01*
+X23742Y-52501D01*
+X23742Y-52273D01*
+X23771Y-52197D01*
+X23799Y-52159D01*
+X23857Y-52120D01*
+X23971Y-52120D01*
+X24028Y-52159D01*
+X24371Y-52654D02*
+X24313Y-52616D01*
+X24285Y-52578D01*
+X24256Y-52501D01*
+X24256Y-52273D01*
+X24285Y-52197D01*
+X24313Y-52159D01*
+X24371Y-52120D01*
+X24456Y-52120D01*
+X24513Y-52159D01*
+X24542Y-52197D01*
+X24571Y-52273D01*
+X24571Y-52501D01*
+X24542Y-52578D01*
+X24513Y-52616D01*
+X24456Y-52654D01*
+X24371Y-52654D01*
+X24828Y-52654D02*
+X24828Y-52120D01*
+X24828Y-52197D02*
+X24856Y-52159D01*
+X24914Y-52120D01*
+X24999Y-52120D01*
+X25056Y-52159D01*
+X25085Y-52235D01*
+X25085Y-52654D01*
+X25085Y-52235D02*
+X25114Y-52159D01*
+X25171Y-52120D01*
+X25256Y-52120D01*
+X25314Y-52159D01*
+X25342Y-52235D01*
+X25342Y-52654D01*
+X20270Y-30896D02*
+X20327Y-30934D01*
+X20442Y-30934D01*
+X20499Y-30896D01*
+X20527Y-30820D01*
+X20527Y-30781D01*
+X20499Y-30705D01*
+X20442Y-30667D01*
+X20356Y-30667D01*
+X20299Y-30629D01*
+X20270Y-30553D01*
+X20270Y-30515D01*
+X20299Y-30439D01*
+X20356Y-30400D01*
+X20442Y-30400D01*
+X20499Y-30439D01*
+X20728Y-30400D02*
+X20871Y-30934D01*
+X21013Y-30400D02*
+X20871Y-30934D01*
+X20813Y-31124D01*
+X20785Y-31162D01*
+X20728Y-31200D01*
+X21213Y-30896D02*
+X21270Y-30934D01*
+X21385Y-30934D01*
+X21442Y-30896D01*
+X21470Y-30820D01*
+X21470Y-30781D01*
+X21442Y-30705D01*
+X21385Y-30667D01*
+X21299Y-30667D01*
+X21242Y-30629D01*
+X21213Y-30553D01*
+X21213Y-30515D01*
+X21242Y-30439D01*
+X21299Y-30400D01*
+X21385Y-30400D01*
+X21442Y-30439D01*
+X21728Y-30934D02*
+X21728Y-30400D01*
+X21728Y-30477D02*
+X21756Y-30439D01*
+X21814Y-30400D01*
+X21899Y-30400D01*
+X21956Y-30439D01*
+X21985Y-30515D01*
+X21985Y-30934D01*
+X21985Y-30515D02*
+X22014Y-30439D01*
+X22071Y-30400D01*
+X22156Y-30400D01*
+X22214Y-30439D01*
+X22242Y-30515D01*
+X22242Y-30934D01*
+X22614Y-30934D02*
+X22556Y-30896D01*
+X22528Y-30858D01*
+X22499Y-30781D01*
+X22499Y-30553D01*
+X22528Y-30477D01*
+X22556Y-30439D01*
+X22614Y-30400D01*
+X22699Y-30400D01*
+X22756Y-30439D01*
+X22785Y-30477D01*
+X22814Y-30553D01*
+X22814Y-30781D01*
+X22785Y-30858D01*
+X22756Y-30896D01*
+X22699Y-30934D01*
+X22614Y-30934D01*
+X23328Y-30896D02*
+X23271Y-30934D01*
+X23157Y-30934D01*
+X23099Y-30896D01*
+X23071Y-30858D01*
+X23042Y-30781D01*
+X23042Y-30553D01*
+X23071Y-30477D01*
+X23099Y-30439D01*
+X23157Y-30400D01*
+X23271Y-30400D01*
+X23328Y-30439D01*
+X23671Y-30934D02*
+X23613Y-30896D01*
+X23585Y-30858D01*
+X23556Y-30781D01*
+X23556Y-30553D01*
+X23585Y-30477D01*
+X23613Y-30439D01*
+X23671Y-30400D01*
+X23756Y-30400D01*
+X23813Y-30439D01*
+X23842Y-30477D01*
+X23871Y-30553D01*
+X23871Y-30781D01*
+X23842Y-30858D01*
+X23813Y-30896D01*
+X23756Y-30934D01*
+X23671Y-30934D01*
+X24128Y-30934D02*
+X24128Y-30400D01*
+X24128Y-30477D02*
+X24156Y-30439D01*
+X24214Y-30400D01*
+X24299Y-30400D01*
+X24356Y-30439D01*
+X24385Y-30515D01*
+X24385Y-30934D01*
+X24385Y-30515D02*
+X24414Y-30439D01*
+X24471Y-30400D01*
+X24556Y-30400D01*
+X24614Y-30439D01*
+X24642Y-30515D01*
+X24642Y-30934D01*
+G54D13*
 X84843Y-13878D03*
 X84843Y-13485D03*
 X84843Y-13091D03*
@@ -41,7 +513,7 @@ X80906Y-48425D03*
 X80906Y-48031D03*
 X80906Y-47637D03*
 X80906Y-47244D03*
-G54D12*
+G54D14*
 X21654Y-11260D03*
 X21654Y-12260D03*
 X21654Y-13260D03*
@@ -54,7 +526,7 @@ X27559Y-22174D03*
 X24559Y-24174D03*
 X24559Y-23174D03*
 X24559Y-22174D03*
-G54D13*
+G54D15*
 X21122Y-37401D03*
 X22122Y-37401D03*
 X23122Y-37401D03*
@@ -67,10 +539,59 @@ X22193Y-45276D03*
 X24193Y-48276D03*
 X23193Y-48276D03*
 X22193Y-48276D03*
-G54D14*
+G54D16*
+X25097Y-48031D02*
+X25000Y-48031D01*
+X25000Y-48031D02*
+X24902Y-47933D01*
+G54D17*
+X25097Y-48031D02*
+X24901Y-48031D01*
+X24508Y-47146D02*
+X22304Y-47146D01*
+X24803Y-47441D02*
+X24508Y-47146D01*
+X24803Y-47933D02*
+X24803Y-47441D01*
+X24901Y-48031D02*
+X24803Y-47933D01*
+X22174Y-47276D02*
+X22174Y-48276D01*
+X22304Y-47146D02*
+X22174Y-47276D01*
+G54D18*
+X24450Y-36122D02*
+X24450Y-35885D01*
+X24450Y-35885D02*
+X24863Y-35472D01*
+G54D16*
+X25689Y-35040D02*
+X25453Y-35040D01*
+X25453Y-35040D02*
+X24863Y-35630D01*
+X24863Y-35630D02*
+X24863Y-35472D01*
+X25098Y-35040D02*
+X25689Y-35040D01*
+X24863Y-35472D02*
+X24863Y-35275D01*
+X24863Y-35275D02*
+X25098Y-35040D01*
+G54D18*
+X22102Y-38302D02*
+X22300Y-38500D01*
+X22300Y-38500D02*
+X23850Y-38500D01*
+X23850Y-38500D02*
+X24450Y-37900D01*
+X24450Y-37900D02*
+X24450Y-36122D01*
+X22102Y-38302D02*
+X22102Y-37401D01*
+G54D16*
 X30512Y-13091D02*
 X29035Y-13091D01*
-G54D15*
+G54D18*
 X31450Y-13091D02*
 X84843Y-13091D01*
 X21654Y-13260D02*
@@ -89,10 +610,10 @@ X30512Y-13091D02*
 X31450Y-13091D01*
 X31450Y-13091D02*
 X31496Y-13091D01*
-G54D14*
+G54D16*
 X30397Y-22933D02*
 X29035Y-22933D01*
-G54D15*
+G54D18*
 X28374Y-22174D02*
 X28543Y-22343D01*
 X28543Y-22343D02*
@@ -113,10 +634,10 @@ X23900Y-35728D02*
 X23900Y-35549D01*
 X23900Y-35549D02*
 X24803Y-34646D01*
-G54D14*
+G54D16*
 X26575Y-34646D02*
 X24803Y-34646D01*
-G54D15*
+G54D18*
 X80906Y-34646D02*
 X31496Y-34646D01*
 X31496Y-34646D02*
@@ -127,10 +648,10 @@ X23900Y-37050D02*
 X23549Y-37401D01*
 X23900Y-35728D02*
 X23900Y-37050D01*
-G54D14*
+G54D16*
 X26476Y-48425D02*
 X25002Y-48425D01*
-G54D15*
+G54D18*
 X25197Y-48524D02*
 X25000Y-48524D01*
 X25000Y-48524D02*
@@ -149,19 +670,19 @@ X24804Y-48623D02*
 X25002Y-48425D01*
 X25002Y-48425D02*
 X25394Y-48425D01*
-G54D16*
+G54D17*
 X24750Y-48917D02*
 X24804Y-48917D01*
 X24804Y-48917D02*
 X25296Y-48425D01*
-G54D15*
+G54D18*
 X80906Y-48425D02*
 X31496Y-48425D01*
 X31496Y-48425D02*
 X26476Y-48425D01*
 X26476Y-48425D02*
 X25394Y-48425D01*
-G54D16*
+G54D17*
 X24750Y-49950D02*
 X24350Y-50350D01*
 X21074Y-45276D02*
@@ -176,12 +697,12 @@ X24350Y-50350D02*
 X21200Y-50350D01*
 X24750Y-48917D02*
 X24750Y-49950D01*
-G54D15*
+G54D18*
 X27910Y-11260D02*
 X29134Y-11260D01*
 X29134Y-11260D02*
 X29134Y-11319D01*
-G54D14*
+G54D16*
 X30512Y-11910D02*
 X29824Y-11910D01*
 X29824Y-11910D02*
@@ -194,14 +715,14 @@ X29134Y-11319D02*
 X29134Y-11516D01*
 X29134Y-11516D02*
 X29528Y-11910D01*
-G54D15*
+G54D18*
 X84843Y-11910D02*
 X31496Y-11910D01*
 X30512Y-11910D02*
 X31496Y-11910D01*
 X27910Y-11260D02*
 X24654Y-11260D01*
-G54D14*
+G54D16*
 X29150Y-20966D02*
 X29150Y-20981D01*
 X29921Y-21752D02*
@@ -218,13 +739,13 @@ X29150Y-20966D02*
 X29150Y-21276D01*
 X30413Y-21752D02*
 X29626Y-21752D01*
-G54D15*
+G54D18*
 X31450Y-21752D02*
 X30413Y-21752D01*
-G54D14*
+G54D16*
 X29626Y-21752D02*
 X29150Y-21276D01*
-G54D15*
+G54D18*
 X28150Y-20100D02*
 X22200Y-20100D01*
 X22200Y-20100D02*
@@ -243,7 +764,7 @@ X31450Y-21752D02*
 X84843Y-21752D01*
 X31496Y-21752D02*
 X31450Y-21752D01*
-G54D14*
+G54D16*
 X26575Y-33465D02*
 X25984Y-33465D01*
 X25984Y-33465D02*
@@ -254,7 +775,7 @@ X25098Y-32972D02*
 X25591Y-33465D01*
 X25591Y-33465D02*
 X25984Y-33465D01*
-G54D15*
+G54D18*
 X25984Y-33465D02*
 X25788Y-33465D01*
 X23917Y-32200D02*
@@ -275,7 +796,7 @@ X24606Y-46500D02*
 X25240Y-46500D01*
 X25240Y-46500D02*
 X25197Y-46457D01*
-G54D14*
+G54D16*
 X26476Y-47244D02*
 X25984Y-47244D01*
 X25984Y-47244D02*
@@ -286,12 +807,12 @@ X25689Y-47244D02*
 X25984Y-47244D01*
 X24902Y-46457D02*
 X25689Y-47244D01*
-G54D15*
+G54D18*
 X31400Y-47244D02*
 X80906Y-47244D01*
 X31400Y-47244D02*
 X26476Y-47244D01*
-G54D16*
+G54D17*
 X21550Y-46500D02*
 X21400Y-46500D01*
 X21200Y-46700D02*
@@ -308,10 +829,10 @@ X21500Y-49850D02*
 X23700Y-49850D01*
 X23700Y-49850D02*
 X24174Y-49376D01*
-G54D14*
+G54D16*
 X30512Y-12697D02*
 X29035Y-12697D01*
-G54D15*
+G54D18*
 X84843Y-12697D02*
 X31496Y-12697D01*
 X26540Y-13260D02*
@@ -334,12 +855,12 @@ X28839Y-22146D02*
 X28839Y-22047D01*
 X29035Y-22342D02*
 X28839Y-22146D01*
-G54D14*
+G54D16*
 X30413Y-22539D02*
 X29232Y-22539D01*
 X29035Y-22539D02*
 X29232Y-22539D01*
-G54D15*
+G54D18*
 X28550Y-21758D02*
 X28550Y-21752D01*
 X28839Y-22047D02*
@@ -354,14 +875,14 @@ X24559Y-21441D02*
 X24559Y-22174D01*
 X31496Y-22539D02*
 X30413Y-22539D01*
-G54D14*
+G54D16*
 X26575Y-34252D02*
 X24270Y-34252D01*
 X24270Y-34252D02*
 X24270Y-34268D01*
 X24270Y-34268D02*
 X24270Y-34252D01*
-G54D15*
+G54D18*
 X80906Y-34252D02*
 X31496Y-34252D01*
 X23898Y-34252D02*
@@ -372,46 +893,26 @@ X31496Y-34252D02*
 X26575Y-34252D01*
 X24270Y-34252D02*
 X23898Y-34252D01*
-G54D14*
-X25097Y-48031D02*
-X25000Y-48031D01*
-X25000Y-48031D02*
-X24902Y-47933D01*
 G54D16*
-X25097Y-48031D02*
-X24901Y-48031D01*
-X24508Y-47146D02*
-X22304Y-47146D01*
-X24803Y-47441D02*
-X24508Y-47146D01*
-X24803Y-47933D02*
-X24803Y-47441D01*
-X24901Y-48031D02*
-X24803Y-47933D01*
-G54D14*
 X26476Y-48031D02*
 X25097Y-48031D01*
 X25081Y-48047D02*
 X25081Y-48031D01*
 X25097Y-48031D02*
 X25081Y-48047D01*
-G54D15*
+G54D18*
 X80906Y-48031D02*
 X31496Y-48031D01*
-G54D16*
+G54D17*
 X25081Y-48031D02*
 X25081Y-48031D01*
-X22174Y-47276D02*
-X22174Y-48276D01*
-X22304Y-47146D02*
-X22174Y-47276D01*
-G54D15*
+G54D18*
 X31496Y-48031D02*
 X26476Y-48031D01*
-G54D14*
+G54D16*
 X30512Y-13485D02*
 X29036Y-13485D01*
-G54D15*
+G54D18*
 X84843Y-13485D02*
 X31496Y-13485D01*
 X20840Y-12260D02*
@@ -436,7 +937,7 @@ X29134Y-23327D02*
 X27712Y-23327D01*
 X27712Y-23327D02*
 X27559Y-23174D01*
-G54D14*
+G54D16*
 X30413Y-23327D02*
 X29134Y-23327D01*
 X29134Y-23327D02*
@@ -457,30 +958,14 @@ X29035Y-23720D02*
 X29035Y-23327D01*
 X29428Y-23327D02*
 X29035Y-23720D01*
-G54D15*
+G54D18*
 X84843Y-23327D02*
 X31496Y-23327D01*
 X30413Y-23327D02*
 X30413Y-23327D01*
 X30413Y-23327D02*
 X31496Y-23327D01*
-X24450Y-36122D02*
-X24450Y-35885D01*
-X24450Y-35885D02*
-X24863Y-35472D01*
-G54D14*
-X25689Y-35040D02*
-X25453Y-35040D01*
-X25453Y-35040D02*
-X24863Y-35630D01*
-X24863Y-35630D02*
-X24863Y-35472D01*
-X25098Y-35040D02*
-X25689Y-35040D01*
-X24863Y-35472D02*
-X24863Y-35275D01*
-X24863Y-35275D02*
-X25098Y-35040D01*
+G54D16*
 X25394Y-35040D02*
 X25393Y-35040D01*
 X25689Y-35040D02*
@@ -489,24 +974,14 @@ X26575Y-35040D02*
 X25689Y-35040D01*
 X25689Y-35040D02*
 X25394Y-35040D01*
-G54D15*
+G54D18*
 X80906Y-35040D02*
 X31496Y-35040D01*
-X22102Y-38302D02*
-X22300Y-38500D01*
-X22300Y-38500D02*
-X23850Y-38500D01*
-X23850Y-38500D02*
-X24450Y-37900D01*
-X24450Y-37900D02*
-X24450Y-36122D01*
-X22102Y-38302D02*
-X22102Y-37401D01*
 X25393Y-35040D02*
 X26575Y-35040D01*
 X26575Y-35040D02*
 X31496Y-35040D01*
-G54D14*
+G54D16*
 X25788Y-48819D02*
 X25492Y-48819D01*
 X25178Y-49133D02*
@@ -523,27 +998,27 @@ X25788Y-48819D02*
 X25749Y-48819D01*
 X25178Y-49390D02*
 X25178Y-49429D01*
-G54D16*
+G54D17*
 X25001Y-49606D02*
 X25178Y-49429D01*
 X25000Y-49606D02*
 X25000Y-50600D01*
 X25000Y-49606D02*
 X25001Y-49606D01*
-G54D14*
+G54D16*
 X25749Y-48819D02*
 X25178Y-49390D01*
-G54D16*
+G54D17*
 X25788Y-48819D02*
 X25788Y-48819D01*
-G54D15*
+G54D18*
 X31450Y-48819D02*
 X80906Y-48819D01*
 X31496Y-48819D02*
 X31450Y-48819D01*
 X31450Y-48819D02*
 X26476Y-48819D01*
-G54D16*
+G54D17*
 X23950Y-50900D02*
 X24700Y-50900D01*
 X24700Y-50900D02*
@@ -564,15 +1039,15 @@ X23950Y-50900D02*
 X21050Y-50900D01*
 X23174Y-44124D02*
 X23174Y-45276D01*
-G54D17*
+G54D19*
 X23174Y-45276D02*
 X23174Y-44124D01*
-G54D15*
+G54D18*
 X29134Y-14173D02*
 X28527Y-14173D01*
 X28527Y-14173D02*
 X27350Y-15350D01*
-G54D14*
+G54D16*
 X30413Y-13878D02*
 X29626Y-13878D01*
 X29626Y-13878D02*
@@ -585,7 +1060,7 @@ X29134Y-14075D02*
 X29331Y-13878D01*
 X29331Y-13878D02*
 X29626Y-13878D01*
-G54D15*
+G54D18*
 X84843Y-13878D02*
 X31496Y-13878D01*
 X20790Y-11260D02*
@@ -606,7 +1081,7 @@ X29134Y-24213D02*
 X27598Y-24213D01*
 X27598Y-24213D02*
 X27559Y-24174D01*
-G54D14*
+G54D16*
 X30413Y-23720D02*
 X29922Y-23720D01*
 X29922Y-23720D02*
@@ -617,7 +1092,7 @@ X29134Y-24508D02*
 X29134Y-24213D01*
 X29134Y-24213D02*
 X29627Y-23720D01*
-G54D15*
+G54D18*
 X84843Y-23720D02*
 X30413Y-23720D01*
 X30413Y-23720D02*
@@ -636,7 +1111,7 @@ X21500Y-38900D02*
 X24250Y-38900D01*
 X25100Y-38050D02*
 X25100Y-36417D01*
-G54D14*
+G54D16*
 X26575Y-35433D02*
 X25886Y-35433D01*
 X25886Y-35433D02*
@@ -647,14 +1122,14 @@ X25594Y-35433D02*
 X25886Y-35433D01*
 X25100Y-35927D02*
 X25594Y-35433D01*
-G54D15*
+G54D18*
 X80906Y-35433D02*
 X31496Y-35433D01*
 X25886Y-35433D02*
 X26575Y-35433D01*
 X26575Y-35433D02*
 X31496Y-35433D01*
-G54D14*
+G54D16*
 X26083Y-49213D02*
 X25889Y-49213D01*
 X25299Y-49803D02*
@@ -679,14 +1154,14 @@ X26083Y-49212D02*
 X26083Y-49213D01*
 X26083Y-49213D02*
 X26083Y-49212D01*
-G54D15*
+G54D18*
 X80906Y-49212D02*
 X31488Y-49212D01*
 X31496Y-49212D02*
 X31488Y-49212D01*
 X31488Y-49212D02*
 X26475Y-49212D01*
-G54D16*
+G54D17*
 X24174Y-45276D02*
 X24174Y-44074D01*
 X20850Y-51550D02*
@@ -705,17 +1180,17 @@ X25150Y-51550D02*
 X25300Y-51400D01*
 X25300Y-50000D02*
 X25300Y-51400D01*
-G54D17*
+G54D19*
 X25300Y-51400D02*
 X25150Y-51550D01*
-G54D15*
+G54D18*
 X28740Y-12260D02*
 X28992Y-12260D01*
 X28992Y-12260D02*
 X29035Y-12303D01*
 X27910Y-12260D02*
 X28740Y-12260D01*
-G54D14*
+G54D16*
 X30512Y-12303D02*
 X29330Y-12303D01*
 X29330Y-12303D02*
@@ -724,7 +1199,7 @@ X29035Y-12303D02*
 X30512Y-12303D01*
 X29035Y-12008D02*
 X29035Y-12303D01*
-G54D15*
+G54D18*
 X84843Y-12303D02*
 X31496Y-12303D01*
 X30512Y-12303D02*
@@ -739,12 +1214,12 @@ X28850Y-21457D02*
 X28850Y-21600D01*
 X28850Y-21600D02*
 X29167Y-21917D01*
-G54D14*
+G54D16*
 X29167Y-21917D02*
 X29395Y-22145D01*
 X29395Y-22145D02*
 X30412Y-22145D01*
-G54D16*
+G54D17*
 X28850Y-21600D02*
 X29167Y-21917D01*
 X28850Y-21600D02*
@@ -755,7 +1230,7 @@ X30019Y-22145D02*
 X30020Y-22146D01*
 X30020Y-22146D02*
 X30020Y-22145D01*
-G54D15*
+G54D18*
 X84843Y-22145D02*
 X31355Y-22145D01*
 X29395Y-22145D02*
@@ -776,41 +1251,41 @@ X22050Y-22800D02*
 X22050Y-21150D01*
 X22424Y-23174D02*
 X22050Y-22800D01*
-G54D14*
+G54D16*
 X25394Y-33858D02*
 X25099Y-33858D01*
 X24902Y-33661D02*
 X24902Y-33367D01*
 X25099Y-33858D02*
 X24902Y-33661D01*
-G54D15*
+G54D18*
 X24902Y-33465D02*
 X24115Y-33465D01*
 X24115Y-33465D02*
 X23500Y-32850D01*
-G54D14*
+G54D16*
 X24902Y-33367D02*
 X24902Y-33465D01*
-G54D15*
+G54D18*
 X22450Y-32850D02*
 X23500Y-32850D01*
 X22102Y-33198D02*
 X22450Y-32850D01*
 X22102Y-34401D02*
 X22102Y-33198D01*
-G54D14*
+G54D16*
 X26575Y-33858D02*
 X25394Y-33858D01*
 X25394Y-33858D02*
 X25393Y-33858D01*
 X25393Y-33858D02*
 X24902Y-33367D01*
-G54D15*
+G54D18*
 X80906Y-33858D02*
 X31496Y-33858D01*
 X26575Y-33858D02*
 X31496Y-33858D01*
-G54D14*
+G54D16*
 X26476Y-47637D02*
 X25257Y-47637D01*
 X25257Y-47637D02*
@@ -825,7 +1300,7 @@ X25102Y-47252D02*
 X25487Y-47637D01*
 X25102Y-47482D02*
 X25102Y-47252D01*
-G54D15*
+G54D18*
 X30600Y-47637D02*
 X33087Y-47637D01*
 X31250Y-47637D02*
@@ -848,7 +1323,7 @@ X26476Y-47637D02*
 X25492Y-47637D01*
 X25492Y-47637D02*
 X25257Y-47637D01*
-G54D16*
+G54D17*
 X23174Y-49026D02*
 X23174Y-48276D01*
 X25257Y-47637D02*
diff --git a/hardware/pcb/gerber/simffc-Mask_Front.gts b/hardware/pcb/gerber/simffc-Mask_Front.gts
index af78fbd..831bbe5 100644
--- a/hardware/pcb/gerber/simffc-Mask_Front.gts
+++ b/hardware/pcb/gerber/simffc-Mask_Front.gts
@@ -1,4 +1,4 @@
-G04 (created by PCBNEW-RS274X (2011-aug-04)-testing) date Wed 07 Dec 2011 02:34:08 PM CET*
+G04 (created by PCBNEW-RS274X (2011-07-02 BZR 3034)-testing) date Thu 15 Dec 2011 12:00:24 PM CET*
 G01*
 G70*
 G90*
diff --git a/hardware/pcb/gerber/simffc-PCB_Edges.gbr b/hardware/pcb/gerber/simffc-PCB_Edges.gbr
index 3b0913b..633553b 100644
--- a/hardware/pcb/gerber/simffc-PCB_Edges.gbr
+++ b/hardware/pcb/gerber/simffc-PCB_Edges.gbr
@@ -1,4 +1,4 @@
-G04 (created by PCBNEW-RS274X (2011-aug-04)-testing) date Wed 07 Dec 2011 02:34:08 PM CET*
+G04 (created by PCBNEW-RS274X (2011-07-02 BZR 3034)-testing) date Thu 15 Dec 2011 12:00:24 PM CET*
 G01*
 G70*
 G90*
diff --git a/hardware/pcb/schema/simtrace_v10p_schematic.pdf b/hardware/pcb/schema/simtrace_v10p_schematic.pdf
new file mode 100644
index 0000000..41aa54e
--- /dev/null
+++ b/hardware/pcb/schema/simtrace_v10p_schematic.pdf
diff --git a/hardware/pcb/schema/simtrace_v11p_schematic.pdf b/hardware/pcb/schema/simtrace_v11p_schematic.pdf
new file mode 100644
index 0000000..e58e741
--- /dev/null
+++ b/hardware/pcb/schema/simtrace_v11p_schematic.pdf
diff --git a/host/main.c b/host/main.c
index 4fbac8d..21d82ba 100644
--- a/host/main.c
+++ b/host/main.c
@@ -42,7 +42,6 @@
 #include <osmocom/core/gsmtap_util.h>
 #include <osmocom/core/utils.h>
 
-static struct libusb_device_handle *devh;
 static struct apdu_split *as;
 static struct gsmtap_inst *g_gti;
 
@@ -124,6 +123,7 @@ static void print_help(void)
 	printf( "\t-i\t--gsmtap-ip\tA.B.C.D\n"
 		"\t-a\t--skip-atr\n"
 		"\t-h\t--help\n"
+		"\t-k\t--keep-running\n"
 		"\n"
 		);
 }
@@ -132,24 +132,50 @@ static const struct option opts[] = {
 	{ "gsmtap-ip", 1, 0, 'i' },
 	{ "skip-atr", 0, 0, 'a' },
 	{ "help", 0, 0, 'h' },
+	{ "keep-running", 0, 0, 'k' },
 	{ NULL, 0, 0, 0 }
 };
 
-int main(int argc, char **argv)
+static void run_mainloop(struct libusb_device_handle *devh)
 {
+	unsigned int msg_count, byte_count = 0;
 	char buf[16*265];
+	int xfer_len;
+	int rc;
+
+	printf("Entering main loop\n");
+	apdu_split_reset(as);
+
+	while (1) {
+		rc = libusb_bulk_transfer(devh, SIMTRACE_IN_EP, buf, sizeof(buf), &xfer_len, 100000);
+		if (rc < 0 && rc != LIBUSB_ERROR_TIMEOUT) {
+			fprintf(stderr, "BULK IN transfer error; rc=%d\n", rc);
+			return;
+		}
+		if (xfer_len > 0) {
+			//printf("URB: %s\n", osmo_hexdump(buf, rc));
+			process_usb_msg(buf, xfer_len);
+			msg_count++;
+			byte_count += xfer_len;
+		}
+	}
+}
+
+int main(int argc, char **argv)
+{
 	char *gsmtap_host = "127.0.0.1";
-	int rc, c, ret = 1;
+	int rc;
+	int c, ret = 1;
 	int skip_atr = 0;
-	int xfer_len;
-	unsigned int msg_count, byte_count = 0;
+	int keep_running = 0;
+	struct libusb_device_handle *devh;
 
 	print_welcome();
 
 	while (1) {
 		int option_index = 0;
 
-		c = getopt_long(argc, argv, "i:ah", opts, &option_index);
+		c = getopt_long(argc, argv, "i:ahk", opts, &option_index);
 		if (c == -1)
 			break;
 		switch (c) {
@@ -163,6 +189,9 @@ int main(int argc, char **argv)
 		case 'a':
 			skip_atr = 1;
 			break;
+		case 'k':
+			keep_running = 1;
+			break;
 		}
 	}
 
@@ -179,43 +208,35 @@ int main(int argc, char **argv)
 	}
 	gsmtap_source_add_sink(g_gti);
 
-	devh = libusb_open_device_with_vid_pid(NULL, SIMTRACE_USB_VENDOR, SIMTRACE_USB_PRODUCT);
-	if (!devh) {
-		fprintf(stderr, "can't open USB device\n");
-		goto close_exit;
-	}
-
-	rc = libusb_claim_interface(devh, 0);
-	if (rc < 0) {
-		fprintf(stderr, "can't claim interface; rc=%d\n", rc);
-		goto close_exit;
-	}
-
 	as = apdu_split_init(&apdu_out_cb, NULL);
 	if (!as)
 		goto release_exit;
 
-	printf("Entering main loop\n");
-	while (1) {
-		rc = libusb_bulk_transfer(devh, SIMTRACE_IN_EP, buf, sizeof(buf), &xfer_len, 100000);
-		if (rc < 0 && rc != LIBUSB_ERROR_TIMEOUT) {
-			fprintf(stderr, "BULK IN transfer error; rc=%d\n", rc);
-			goto release_exit;
+	do {
+		devh = libusb_open_device_with_vid_pid(NULL, SIMTRACE_USB_VENDOR, SIMTRACE_USB_PRODUCT);
+		if (!devh) {
+			fprintf(stderr, "can't open USB device\n");
+			goto close_exit;
 		}
-		if (xfer_len > 0) {
-			//printf("URB: %s\n", osmo_hexdump(buf, rc));
-			process_usb_msg(buf, xfer_len);
-			msg_count++;
-			byte_count += xfer_len;
+
+		rc = libusb_claim_interface(devh, 0);
+		if (rc < 0) {
+			fprintf(stderr, "can't claim interface; rc=%d\n", rc);
+			goto close_exit;
 		}
-	}
-	ret = 0;
 
-release_exit:
-	libusb_release_interface(devh, 0);
+		run_mainloop(devh);
+		ret = 0;
+
+		libusb_release_interface(devh, 0);
 close_exit:
-	if (devh)
-		libusb_close(devh);
+		if (devh)
+			libusb_close(devh);
+		if (keep_running)
+			sleep(1);
+	} while (keep_running);
+
+release_exit:
 	libusb_exit(NULL);
 	return ret;
 }