Merge branch 'v1.5'

Change-Id: I19221ac1e88ee4ba6b74705f898c145fe76724a2

hardware/pcb/bom/SIMtrace.csv

@@ -1,37 +1,37 @@
-4.5-6V,1,"BT1",PIN_ARRAY_2X1,
-10pF,2,"C17 C18",SM0603,
-15pF,2,"C11 C13",SM0603,
-33pF,1,"C5",SM0603,
-1nF,1,"C10",SM0603,
-10nF,1,"C6",SM0603,
-100nF,10,"C3 C4 C7 C9 C15 C16 C19 C20 C23 C24",SM0603,
-1uF,2,"C21 C22",SM0603,
-2.2uF,2,"C1 C12",SM0603,
-4.7uF,1,"C14",SM0805,
-RED,1,"D4",LED-0805,
-GREEN,1,"D5",LED-0805,
-MBR0530,4,"D1 D2 D3 D6",SOD123,~
-FILTER,2,"FB1 FB2",SM0805,
-FPF2109,1,"IC1",SOT23-5,https://www.fairchildsemi.com/ds/FP/FPF2110.pdf
-AP7332,1,"IC2",SOT26,
-CB3Q3244,1,"IC4",SSOP20_BDQ,
-AT91SAM7S,1,"IC3",TQFP_64,
-JACK_2.5,1,"J2",JACK_2.5,
-USB-B_MINI,1,"J1",USB-MINI-B_UX60,
-TEST,1,"JP1",PIN_ARRAY_2X1,
-ERASE,1,"JP2",PIN_ARRAY_2X1,
-REBELSIM,1,"P3",FFC_REBELSIM,
-DEBUG,1,"P2",PIN_ARRAY-6X1,
-JTAG,1,"P1",PIN_ARRAY_10X2,
-SIM,1,"P4",SIM_AMPHENOL,
-BC847,2,"Q1 Q2",SOT23_BC847,
-27R,2,"R9 R10",SM0603,
-150R,2,"R13 R14",SM0603,
-1K5,2,"R3 R11",SM0603,
-10K,4,"R2 R16 R17 R18",SM0603,
-10k1%,2,"R20 R21",SM0603,
-100K,14,"R1 R4 R5 R6 R7 R8 R12 R15 R19 R22 R23 R24 R25 R26",SM0603,
-RESET,1,"SW1",PUSH_BUTTON,
-BOOTLOADER,1,"SW2",PUSH_BUTTON,
-FLASH,1,"U1",SOC008_WIDE,
-18.432MHz,1,"X1",Q_49U3HMS,
+4.5-6V,1,"BT1"
+10pF,2,"C17 C18"
+15pF,2,"C11 C13"
+33pF,1,"C5"
+1nF,1,"C10"
+10nF,1,"C6"
+100nF,10,"C3 C4 C7 C9 C15 C16 C19 C20 C23 C24"
+1uF,2,"C21 C22"
+2.2uF,2,"C1 C12"
+4.7uF,1,"C14"
+RED,1,"D4"
+GREEN,1,"D5"
+MBR0530,4,"D1 D2 D3 D6"
+FILTER,2,"FB1 FB2"
+FPF2109,1,"IC1"
+AP7332,1,"IC2"
+CB3Q3244,1,"IC4"
+ATSAM3S2B,1,"IC3"
+JACK_2.5,1,"J2"
+USB-B_MINI,1,"J1"
+TEST,1,"JP1"
+ERASE,1,"JP2"
+REBELSIM,1,"P3"
+DEBUG,1,"P2"
+JTAG,1,"P1"
+SIM,1,"P4"
+BC847,2,"Q1 Q2"
+27R,2,"R9 R10"
+150R,2,"R13 R14"
+1K5,2,"R3 R11"
+10K,4,"R2 R16 R17 R18"
+10k1%,2,"R20 R21"
+100K,14,"R1 R4 R5 R6 R7 R8 R12 R15 R19 R22 R23 R24 R25 R26"
+RESET,1,"SW1"
+BOOTLOADER,1,"SW2"
+FLASH,1,"U1"
+18.432MHz,1,"X1"

hardware/pcb/fabrication/SIMtrace-Back.pos

@@ -1,4 +1,4 @@
-### Module positions - created on So 22 Jun 2014 23:24:39 PDT ###
+### Module positions - created on So 17 Mai 2015 14:58:54 CEST ###
 ### Printed by Pcbnew version pcbnew (2013-may-18)-stable
 ## Unit = mm, Angle = deg.
 ## Side : Front

hardware/pcb/fabrication/SIMtrace-Front.pos

@@ -1,4 +1,4 @@
-### Module positions - created on So 22 Jun 2014 23:24:39 PDT ###
+### Module positions - created on So 17 Mai 2015 14:58:54 CEST ###
 ### Printed by Pcbnew version pcbnew (2013-may-18)-stable
 ## Unit = mm, Angle = deg.
 ## Side : Front
@@ -25,12 +25,22 @@ C21      1uF              SM0603             61.3410     6.3500      90.0    Fro
 C22      1uF              SM0603             61.3410     9.9060     270.0    Front
 C23      100nF            SM0603             32.5145    31.8440     180.0    Front
 C24      100nF            SM0603             58.2970    16.5020     270.0    Front
+D1       MBR0530          SOD123             74.2970    34.5020     270.0    Front
+D2       MBR0530          SOD123             73.2790     8.1280       0.0    Front
+D3       MBR0530          SOD123             73.2790     3.4290       0.0    Front
 D4       RED              LED-0805           40.1320     5.0800     180.0    Front
 D5       GREEN            LED-0805           40.1320     7.7470     180.0    Front
+D6       MBR0530          SOD123             61.7970     3.0020       0.0    Front
 FB1      FILTER           SM0805             73.7870    12.8270     270.0    Front
 FB2      FILTER           SM0805             28.0543    31.8694     180.0    Front
 IC1      FPF2109          SOT23-5            61.2970    16.0020       0.0    Front
+IC2      AP7332           SOT26              64.3890     9.3980       0.0    Front
+IC3      MCU              TQFP_64            46.9900    24.1300     270.0    Front
 IC4      CB3Q3244         SSOP20_BDQ         18.4150    35.4330     180.0    Front
+P3       FFC              FFC_REBELSIM        5.8420    36.1950     270.0    Front
+P4       SIM              SIM_AMPHENOL       26.6700    13.3350     180.0    Front
+Q1       BC847            SOT23_BC847        78.6130    25.7810      90.0    Front
+Q2       BC847            SOT23_BC847        70.4850    30.9880       0.0    Front
 R1       100K             SM0603             80.0100    29.3370     180.0    Front
 R2       10K              SM0603             73.6600    21.3360      90.0    Front
 R3       1K5              SM0603             71.8820    21.3360      90.0    Front
@@ -57,4 +67,8 @@ R23      100K             SM0603             14.2240    42.1640     270.0    Fro
 R24      100K             SM0603             65.7970     3.0020       0.0    Front
 R25      100K             SM0603             32.1310    14.4780      90.0    Front
 R26      100K             SM0603             30.2260    15.2400      90.0    Front
+SW1      RESET            PUSH_BUTTON         7.2390    49.4030     180.0    Front
+SW2      BOOTLOADER       PUSH_BUTTON        20.7010    49.4030     180.0    Front
+U1       FLASH            SOC008_WIDE        53.4670     7.2390     270.0    Front
+X1       18.432MHz        Q_49U3HMS          42.0370    39.6240     180.0    Front
 ## End

hardware/pcb/fabrication/SIMtrace.drl

@@ -1,5 +1,5 @@
 M48
-;DRILL file {Pcbnew (2013-may-18)-stable} date So 22 Jun 2014 23:53:21 PDT
+;DRILL file {Pcbnew (2013-may-18)-stable} date So 17 Mai 2015 15:00:01 CEST
 ;FORMAT={-:-/ absolute / metric / decimal}
 FMAT,2
 METRIC,TZ

hardware/pcb/gerber/SIMtrace-B_Mask.pho

@@ -1,4 +1,4 @@
-G04 (created by PCBNEW (2013-may-18)-stable) date So 22 Jun 2014 23:58:54 PDT*
+G04 (created by PCBNEW (2013-may-18)-stable) date So 17 Mai 2015 15:01:41 CEST*
 %MOIN*%
 G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*
 %FSLAX34Y34*%

hardware/pcb/gerber/SIMtrace-B_Paste.pho

@@ -1,4 +1,4 @@
-G04 (created by PCBNEW (2013-may-18)-stable) date So 22 Jun 2014 23:58:54 PDT*
+G04 (created by PCBNEW (2013-may-18)-stable) date So 17 Mai 2015 15:01:41 CEST*
 %MOIN*%
 G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*
 %FSLAX34Y34*%

hardware/pcb/gerber/SIMtrace-B_SilkS.pho

@@ -1,4 +1,4 @@
-G04 (created by PCBNEW (2013-may-18)-stable) date So 22 Jun 2014 23:58:54 PDT*
+G04 (created by PCBNEW (2013-may-18)-stable) date So 17 Mai 2015 15:01:41 CEST*
 %MOIN*%
 G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*
 %FSLAX34Y34*%

hardware/pcb/gerber/SIMtrace-Edge_Cuts.pho

@@ -1,4 +1,4 @@
-G04 (created by PCBNEW (2013-may-18)-stable) date So 22 Jun 2014 23:58:54 PDT*
+G04 (created by PCBNEW (2013-may-18)-stable) date So 17 Mai 2015 15:01:41 CEST*
 %MOIN*%
 G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*
 %FSLAX34Y34*%

hardware/pcb/gerber/SIMtrace-F_Mask.pho

@@ -1,4 +1,4 @@
-G04 (created by PCBNEW (2013-may-18)-stable) date So 22 Jun 2014 23:58:54 PDT*
+G04 (created by PCBNEW (2013-may-18)-stable) date So 17 Mai 2015 15:01:41 CEST*
 %MOIN*%
 G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*
 %FSLAX34Y34*%

hardware/pcb/gerber/SIMtrace-F_Paste.pho

@@ -1,4 +1,4 @@
-G04 (created by PCBNEW (2013-may-18)-stable) date So 22 Jun 2014 23:58:54 PDT*
+G04 (created by PCBNEW (2013-may-18)-stable) date So 17 Mai 2015 15:01:41 CEST*
 %MOIN*%
 G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*
 %FSLAX34Y34*%

hardware/pcb/gerber/SIMtrace-F_SilkS.pho

@@ -1,4 +1,4 @@
-G04 (created by PCBNEW (2013-may-18)-stable) date So 22 Jun 2014 23:58:54 PDT*
+G04 (created by PCBNEW (2013-may-18)-stable) date So 17 Mai 2015 15:01:41 CEST*
 %MOIN*%
 G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*
 %FSLAX34Y34*%
@@ -22,37 +22,38 @@ G04 APERTURE LIST*
 %ADD23C,0.0045*%
 %ADD24C,0.00492126*%
 %ADD25C,0.00738189*%
-%ADD26R,0.045X0.065*%
-%ADD27R,0.065X0.045*%
-%ADD28R,0.055X0.075*%
-%ADD29R,0.075X0.055*%
-%ADD30R,0.066X0.0158*%
-%ADD31O,0.066X0.0158*%
-%ADD32O,0.0158X0.066*%
-%ADD33R,0.08X0.08*%
-%ADD34C,0.08*%
-%ADD35R,0.0515X0.0554*%
-%ADD36R,0.0554X0.0515*%
-%ADD37R,0.146X0.0594*%
-%ADD38C,0.0554*%
-%ADD39R,0.0987X0.0397*%
-%ADD40R,0.1066X0.1184*%
-%ADD41R,0.1106X0.0594*%
-%ADD42R,0.1106X0.0397*%
-%ADD43R,0.1775X0.0869*%
-%ADD44R,0.036X0.0948*%
-%ADD45R,0.0436X0.0633*%
-%ADD46R,0.0579X0.0397*%
-%ADD47R,0.0672X0.0672*%
-%ADD48R,0.1145X0.1361*%
-%ADD49R,0.1145X0.1243*%
-%ADD50C,0.0594*%
-%ADD51R,0.2365X0.0987*%
-%ADD52R,0.0987X0.0436*%
-%ADD53R,0.1854X0.0476*%
-%ADD54R,0.0558X0.068*%
-%ADD55R,0.068X0.0558*%
-%ADD56R,0.04X0.05*%
+%ADD26C,0.00606299*%
+%ADD27R,0.045X0.065*%
+%ADD28R,0.065X0.045*%
+%ADD29R,0.055X0.075*%
+%ADD30R,0.075X0.055*%
+%ADD31R,0.066X0.0158*%
+%ADD32O,0.066X0.0158*%
+%ADD33O,0.0158X0.066*%
+%ADD34R,0.08X0.08*%
+%ADD35C,0.08*%
+%ADD36R,0.0515X0.0554*%
+%ADD37R,0.0554X0.0515*%
+%ADD38R,0.146X0.0594*%
+%ADD39C,0.0554*%
+%ADD40R,0.0987X0.0397*%
+%ADD41R,0.1066X0.1184*%
+%ADD42R,0.1106X0.0594*%
+%ADD43R,0.1106X0.0397*%
+%ADD44R,0.1775X0.0869*%
+%ADD45R,0.036X0.0948*%
+%ADD46R,0.0436X0.0633*%
+%ADD47R,0.0579X0.0397*%
+%ADD48R,0.0672X0.0672*%
+%ADD49R,0.1145X0.1361*%
+%ADD50R,0.1145X0.1243*%
+%ADD51C,0.0594*%
+%ADD52R,0.2365X0.0987*%
+%ADD53R,0.0987X0.0436*%
+%ADD54R,0.1854X0.0476*%
+%ADD55R,0.0558X0.068*%
+%ADD56R,0.068X0.0558*%
+%ADD57R,0.04X0.05*%
 G04 APERTURE END LIST*
 G54D10*
 G54D11*
@@ -2805,7 +2806,7 @@ X45941Y-47914D01*
 X45922Y-47942D01*
 X45903Y-47961D01*
 X45884Y-47970D01*
-G54D23*
+G54D26*
 X42934Y-49824D02*
 X42934Y-50063D01*
 X42948Y-50091D01*
@@ -3541,55 +3542,136 @@ X47365Y-41502D01*
 X47253Y-41615D01*
 X47375Y-41615D01*
 G54D12*
-X44218Y-38755D02*
-X44260Y-38769D01*
-X44330Y-38769D01*
-X44358Y-38755D01*
-X44372Y-38741D01*
-X44386Y-38713D01*
-X44386Y-38685D01*
-X44372Y-38657D01*
-X44358Y-38642D01*
-X44330Y-38628D01*
-X44274Y-38614D01*
-X44246Y-38600D01*
-X44232Y-38586D01*
-X44218Y-38558D01*
-X44218Y-38530D01*
-X44232Y-38502D01*
-X44246Y-38488D01*
-X44274Y-38474D01*
-X44344Y-38474D01*
-X44386Y-38488D01*
-X44513Y-38614D02*
-X44611Y-38614D01*
-X44653Y-38769D02*
-X44513Y-38769D01*
-X44513Y-38474D01*
-X44653Y-38474D01*
-X44949Y-38769D02*
-X44850Y-38628D01*
-X44780Y-38769D02*
-X44780Y-38474D01*
-X44892Y-38474D01*
-X44921Y-38488D01*
-X44935Y-38502D01*
-X44949Y-38530D01*
-X44949Y-38572D01*
-X44935Y-38600D01*
+X43810Y-38769D02*
+X43782Y-38755D01*
+X43768Y-38741D01*
+X43754Y-38713D01*
+X43754Y-38628D01*
+X43768Y-38600D01*
+X43782Y-38586D01*
+X43810Y-38572D01*
+X43852Y-38572D01*
+X43880Y-38586D01*
+X43894Y-38600D01*
+X43908Y-38628D01*
+X43908Y-38713D01*
+X43894Y-38741D01*
+X43880Y-38755D01*
+X43852Y-38769D01*
+X43810Y-38769D01*
+X44021Y-38755D02*
+X44049Y-38769D01*
+X44105Y-38769D01*
+X44133Y-38755D01*
+X44147Y-38727D01*
+X44147Y-38713D01*
+X44133Y-38685D01*
+X44105Y-38671D01*
+X44063Y-38671D01*
+X44035Y-38657D01*
+X44021Y-38628D01*
+X44021Y-38614D01*
+X44035Y-38586D01*
+X44063Y-38572D01*
+X44105Y-38572D01*
+X44133Y-38586D01*
+X44274Y-38769D02*
+X44274Y-38572D01*
+X44274Y-38600D02*
+X44288Y-38586D01*
+X44316Y-38572D01*
+X44358Y-38572D01*
+X44386Y-38586D01*
+X44400Y-38614D01*
+X44400Y-38769D01*
+X44400Y-38614D02*
+X44414Y-38586D01*
+X44443Y-38572D01*
+X44485Y-38572D01*
+X44513Y-38586D01*
+X44527Y-38614D01*
+X44527Y-38769D01*
+X44710Y-38769D02*
+X44682Y-38755D01*
+X44667Y-38741D01*
+X44653Y-38713D01*
+X44653Y-38628D01*
+X44667Y-38600D01*
+X44682Y-38586D01*
+X44710Y-38572D01*
+X44752Y-38572D01*
+X44780Y-38586D01*
+X44794Y-38600D01*
+X44808Y-38628D01*
+X44808Y-38713D01*
+X44794Y-38741D01*
+X44780Y-38755D01*
+X44752Y-38769D01*
+X44710Y-38769D01*
+X44921Y-38755D02*
+X44949Y-38769D01*
+X45005Y-38769D01*
+X45033Y-38755D01*
+X45047Y-38727D01*
+X45047Y-38713D01*
+X45033Y-38685D01*
+X45005Y-38671D01*
+X44963Y-38671D01*
+X44935Y-38657D01*
+X44921Y-38628D01*
 X44921Y-38614D01*
-X44892Y-38628D01*
-X44780Y-38628D01*
-X45075Y-38769D02*
-X45075Y-38474D01*
-X45202Y-38685D02*
-X45342Y-38685D01*
-X45174Y-38769D02*
-X45272Y-38474D01*
-X45371Y-38769D01*
+X44935Y-38586D01*
+X44963Y-38572D01*
+X45005Y-38572D01*
+X45033Y-38586D01*
+X45286Y-38755D02*
+X45258Y-38769D01*
+X45202Y-38769D01*
+X45174Y-38755D01*
+X45160Y-38727D01*
+X45160Y-38614D01*
+X45174Y-38586D01*
+X45202Y-38572D01*
+X45258Y-38572D01*
+X45286Y-38586D01*
+X45300Y-38614D01*
+X45300Y-38642D01*
+X45160Y-38671D01*
+X45427Y-38769D02*
+X45427Y-38572D01*
+X45427Y-38628D02*
+X45441Y-38600D01*
+X45455Y-38586D01*
+X45483Y-38572D01*
+X45511Y-38572D01*
 X45610Y-38769D02*
-X45469Y-38769D01*
-X45469Y-38474D01*
+X45610Y-38572D01*
+X45610Y-38474D02*
+X45596Y-38488D01*
+X45610Y-38502D01*
+X45624Y-38488D01*
+X45610Y-38474D01*
+X45610Y-38502D01*
+X45877Y-38769D02*
+X45877Y-38614D01*
+X45863Y-38586D01*
+X45835Y-38572D01*
+X45778Y-38572D01*
+X45750Y-38586D01*
+X45877Y-38755D02*
+X45849Y-38769D01*
+X45778Y-38769D01*
+X45750Y-38755D01*
+X45736Y-38727D01*
+X45736Y-38699D01*
+X45750Y-38671D01*
+X45778Y-38657D01*
+X45849Y-38657D01*
+X45877Y-38642D01*
+X46060Y-38769D02*
+X46031Y-38755D01*
+X46017Y-38727D01*
+X46017Y-38474D01*
 G54D24*
 X30549Y-42008D02*
 X30680Y-42205D01*
@@ -4063,7 +4145,7 @@ X27216Y-51458D01*
 X27199Y-51449D01*
 X27191Y-51439D01*
 %LPC*%
-G54D26*
+G54D27*
 X33687Y-51400D03*
 X34287Y-51400D03*
 X41795Y-45537D03*
@@ -4080,7 +4162,7 @@ X40150Y-46550D03*
 X40750Y-46550D03*
 X40150Y-47300D03*
 X40750Y-47300D03*
-G54D27*
+G54D28*
 X32700Y-38350D03*
 X32700Y-38950D03*
 X30700Y-38350D03*
@@ -4095,22 +4177,22 @@ X42750Y-48200D03*
 X42750Y-47600D03*
 X43450Y-48200D03*
 X43450Y-47600D03*
-G54D26*
+G54D27*
 X46250Y-44750D03*
 X45650Y-44750D03*
 X27551Y-43763D03*
 X26951Y-43763D03*
-G54D27*
+G54D28*
 X38600Y-52100D03*
 X38600Y-52700D03*
 X38600Y-54100D03*
 X38600Y-53500D03*
-G54D26*
+G54D27*
 X34550Y-43450D03*
 X35150Y-43450D03*
 X32725Y-50400D03*
 X32125Y-50400D03*
-G54D27*
+G54D28*
 X29150Y-42200D03*
 X29150Y-42800D03*
 X31800Y-42800D03*
@@ -4125,10 +4207,10 @@ X29300Y-46700D03*
 X29300Y-46100D03*
 X37550Y-42450D03*
 X37550Y-41850D03*
-G54D26*
+G54D27*
 X25650Y-45500D03*
 X25050Y-45500D03*
-G54D27*
+G54D28*
 X33350Y-42800D03*
 X33350Y-42200D03*
 X36050Y-46025D03*
@@ -4137,23 +4219,23 @@ X26600Y-45400D03*
 X26600Y-44800D03*
 X41800Y-48150D03*
 X41800Y-47550D03*
-G54D26*
+G54D27*
 X31550Y-50275D03*
 X30950Y-50275D03*
-G54D27*
+G54D28*
 X32647Y-42804D03*
 X32647Y-42204D03*
 X29950Y-46400D03*
 X29950Y-45800D03*
-G54D28*
+G54D29*
 X25870Y-43753D03*
 X25120Y-43753D03*
-G54D29*
+G54D30*
 X43500Y-50875D03*
 X43500Y-51625D03*
-G54D30*
-X30639Y-45324D03*
 G54D31*
+X30639Y-45324D03*
+G54D32*
 X30639Y-45521D03*
 X30639Y-45718D03*
 X30639Y-45915D03*
@@ -4169,7 +4251,7 @@ X30639Y-47686D03*
 X30639Y-47883D03*
 X30639Y-48080D03*
 X30639Y-48277D03*
-G54D32*
+G54D33*
 X31474Y-49175D03*
 X31671Y-49175D03*
 X31868Y-49175D03*
@@ -4186,7 +4268,7 @@ X33836Y-49175D03*
 X34033Y-49175D03*
 X34230Y-49175D03*
 X34427Y-49175D03*
-G54D31*
+G54D32*
 X35325Y-48277D03*
 X35325Y-48080D03*
 X35325Y-47883D03*
@@ -4203,7 +4285,7 @@ X35325Y-45915D03*
 X35325Y-45718D03*
 X35325Y-45521D03*
 X35325Y-45324D03*
-G54D32*
+G54D33*
 X34427Y-44489D03*
 X34230Y-44489D03*
 X33836Y-44489D03*
@@ -4220,23 +4302,23 @@ X32067Y-44489D03*
 X31870Y-44489D03*
 X31674Y-44489D03*
 X31477Y-44489D03*
-G54D33*
-X42200Y-36200D03*
 G54D34*
+X42200Y-36200D03*
+G54D35*
 X43200Y-36200D03*
 X44200Y-36200D03*
 X45200Y-36200D03*
 X46200Y-36200D03*
 X47200Y-36200D03*
-G54D35*
+G54D36*
 X41806Y-44533D03*
 X42594Y-44533D03*
 X42200Y-43667D03*
-G54D36*
+G54D37*
 X45833Y-46544D03*
 X45833Y-45756D03*
 X44967Y-46150D03*
-G54D37*
+G54D38*
 X18639Y-36063D03*
 X18639Y-37637D03*
 X15961Y-37637D03*
@@ -4245,21 +4327,21 @@ X23939Y-36063D03*
 X23939Y-37637D03*
 X21261Y-37637D03*
 X21261Y-36063D03*
-G54D38*
+G54D39*
 X45650Y-50689D03*
 X45650Y-49311D03*
-G54D39*
+G54D40*
 X44764Y-50315D03*
 X44764Y-50000D03*
 X44764Y-49685D03*
 X44764Y-49370D03*
 X44764Y-50630D03*
-G54D40*
+G54D41*
 X44863Y-51654D03*
 X44863Y-48346D03*
 X46949Y-51654D03*
 X46949Y-48346D03*
-G54D41*
+G54D42*
 X25403Y-52294D03*
 X25403Y-51794D03*
 X25403Y-50794D03*
@@ -4268,13 +4350,13 @@ X25403Y-50294D03*
 X25403Y-49794D03*
 X25403Y-49294D03*
 X25403Y-48794D03*
-G54D42*
+G54D43*
 X25403Y-48400D03*
 X25403Y-47889D03*
-G54D43*
+G54D44*
 X15954Y-47172D03*
 X15954Y-54928D03*
-G54D44*
+G54D45*
 X22850Y-41300D03*
 X22600Y-41300D03*
 X22340Y-41300D03*
@@ -4295,10 +4377,10 @@ X22080Y-43400D03*
 X22340Y-43400D03*
 X22600Y-43400D03*
 X22850Y-43400D03*
-G54D26*
+G54D27*
 X40050Y-49500D03*
 X39450Y-49500D03*
-G54D27*
+G54D28*
 X24000Y-39100D03*
 X24000Y-39700D03*
 X22900Y-39700D03*
@@ -4307,18 +4389,18 @@ X21800Y-39100D03*
 X21800Y-39700D03*
 X37401Y-49503D03*
 X37401Y-50103D03*
-G54D45*
+G54D46*
 X39426Y-53112D03*
 X39800Y-53112D03*
 X40174Y-53112D03*
 X39426Y-52088D03*
 X39800Y-52088D03*
 X40174Y-52088D03*
-G54D33*
-X46600Y-53700D03*
 G54D34*
+X46600Y-53700D03*
+G54D35*
 X46600Y-54700D03*
-G54D46*
+G54D47*
 X36955Y-52700D03*
 X36955Y-54200D03*
 X36955Y-53700D03*
@@ -4327,14 +4409,14 @@ X34045Y-54200D03*
 X34045Y-53700D03*
 X34046Y-53200D03*
 X34045Y-52700D03*
-G54D47*
+G54D48*
 X30663Y-53250D03*
 X29837Y-53250D03*
 X30663Y-54300D03*
 X29837Y-54300D03*
-G54D33*
-X26700Y-37200D03*
 G54D34*
+X26700Y-37200D03*
+G54D35*
 X26700Y-36200D03*
 X27700Y-37200D03*
 X27700Y-36200D03*
@@ -4354,68 +4436,68 @@ X34700Y-37200D03*
 X34700Y-36200D03*
 X35700Y-37200D03*
 X35700Y-36200D03*
-G54D33*
+G54D34*
 X37750Y-38950D03*
-G54D34*
+G54D35*
 X38750Y-38950D03*
-G54D33*
-X39750Y-38950D03*
 G54D34*
+X39750Y-38950D03*
+G54D35*
 X40750Y-38950D03*
-G54D48*
+G54D49*
 X46843Y-38811D03*
 X45780Y-41281D03*
-G54D49*
-X43024Y-38752D03*
 G54D50*
+X43024Y-38752D03*
+G54D51*
 X46331Y-40100D03*
 X43969Y-40100D03*
-G54D51*
+G54D52*
 X32850Y-40700D03*
 X29150Y-40700D03*
-G54D27*
+G54D28*
 X33178Y-53736D03*
 X33178Y-54336D03*
-G54D52*
+G54D53*
 X16947Y-41066D03*
 X16947Y-41459D03*
 X16947Y-41853D03*
 X16947Y-42247D03*
 X16947Y-42641D03*
 X16947Y-43034D03*
-G54D53*
+G54D54*
 X16120Y-40672D03*
 X16120Y-43428D03*
-G54D29*
+G54D30*
 X40850Y-52075D03*
 X40850Y-52825D03*
-G54D27*
+G54D28*
 X20050Y-39400D03*
 X20050Y-40000D03*
-G54D54*
+G54D55*
 X39424Y-55118D03*
 X38134Y-55118D03*
-G54D26*
+G54D27*
 X40054Y-55118D03*
 X40654Y-55118D03*
-G54D27*
+G54D28*
 X36614Y-50093D03*
 X36614Y-50693D03*
-G54D55*
+G54D56*
 X43700Y-43361D03*
 X43700Y-42071D03*
-G54D54*
+G54D55*
 X43945Y-53100D03*
 X42655Y-53100D03*
 X43945Y-54950D03*
 X42655Y-54950D03*
-G54D56*
+G54D57*
 X38207Y-50500D03*
 X38957Y-50500D03*
 X38207Y-49500D03*
 X38582Y-50500D03*
 X38957Y-49500D03*
-G54D27*
+G54D28*
 X26350Y-50600D03*
 X26350Y-50000D03*
 X27100Y-50900D03*