Correct footprints for C16, C17 and D3

2022-03-30 11:12:57 +01:00
parent d79d5749cc
commit 8ca5620e5c
17 changed files with 14012 additions and 12871 deletions
--- a/gerber/step32-B_Cu.gbl
+++ b/gerber/step32-B_Cu.gbl
--- a/gerber/step32-B_Mask.gbs
+++ b/gerber/step32-B_Mask.gbs
@@ -1,12 +1,12 @@
 %TF.GenerationSoftware,KiCad,Pcbnew,6.0.4-6f826c9f35~116~ubuntu20.04.1*%
-%TF.CreationDate,2022-03-30T05:15:32+01:00*%
+%TF.CreationDate,2022-03-30T11:11:12+01:00*%
 %TF.ProjectId,step32,73746570-3332-42e6-9b69-6361645f7063,rev?*%
 %TF.SameCoordinates,Original*%
 %TF.FileFunction,Soldermask,Bot*%
 %TF.FilePolarity,Negative*%
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 6.0.4-6f826c9f35~116~ubuntu20.04.1) date 2022-03-30 05:15:32*
+G04 Created by KiCad (PCBNEW 6.0.4-6f826c9f35~116~ubuntu20.04.1) date 2022-03-30 11:11:12*
 %MOMM*%
 %LPD*%
 G01*
@@ -29,9 +29,9 @@ G04 Aperture macros list*
 20,1,$1+$1,$6,$7,$8,$9,0*
 20,1,$1+$1,$8,$9,$2,$3,0*%
 G04 Aperture macros list end*
-%ADD10C,3.200000*%
-%ADD11R,1.700000X1.700000*%
-%ADD12O,1.700000X1.700000*%
+%ADD10R,1.700000X1.700000*%
+%ADD11O,1.700000X1.700000*%
+%ADD12C,3.200000*%
 %ADD13O,1.550000X0.890000*%
 %ADD14O,0.950000X1.250000*%
 %ADD15R,3.500000X3.500000*%
@@ -39,37 +39,32 @@ G04 Aperture macros list end*
 %ADD17RoundRect,0.875000X0.875000X-0.875000X0.875000X0.875000X-0.875000X0.875000X-0.875000X-0.875000X0*%
 G04 APERTURE END LIST*
 D10*
-%TO.C,HOLE3*%
-X104000000Y-121000000D03*
-%TD*%
-%TO.C,HOLE4*%
-X151000000Y-121000000D03*
-%TD*%
-%TO.C,HOLE1*%
-X104000000Y-68000000D03*
-%TD*%
-%TO.C,HOLE2*%
-X151000000Y-68000000D03*
-%TD*%
-D11*
 %TO.C,J7*%
 X147701000Y-112014000D03*
-D12*
+D11*
 X147701000Y-109474000D03*
 X147701000Y-106934000D03*
 X147701000Y-104394000D03*
 %TD*%
-D11*
+D12*
+%TO.C,HOLE1*%
+X104000000Y-68000000D03*
+%TD*%
+D10*
 %TO.C,J3*%
 X147701000Y-76469000D03*
-D12*
+D11*
 X147701000Y-79009000D03*
 X147701000Y-81549000D03*
 %TD*%
-D11*
+D12*
+%TO.C,HOLE3*%
+X104000000Y-121000000D03*
+%TD*%
+D10*
 %TO.C,J2*%
 X142748000Y-73909000D03*
-D12*
+D11*
 X142748000Y-76449000D03*
 X142748000Y-78989000D03*
 X142748000Y-81529000D03*
@@ -82,25 +77,29 @@ X142748000Y-96769000D03*
 X142748000Y-99309000D03*
 X142748000Y-101849000D03*
 %TD*%
-D11*
+D10*
 %TO.C,J4*%
 X152273000Y-76469000D03*
-D12*
+D11*
 X152273000Y-79009000D03*
 X152273000Y-81549000D03*
 %TD*%
-D11*
+D12*
+%TO.C,HOLE4*%
+X151000000Y-121000000D03*
+%TD*%
+D10*
 %TO.C,J6*%
 X152273000Y-89154000D03*
-D12*
+D11*
 X152273000Y-91694000D03*
 X152273000Y-94234000D03*
 X152273000Y-96774000D03*
 %TD*%
-D11*
+D10*
 %TO.C,J8*%
 X152273000Y-112014000D03*
-D12*
+D11*
 X152273000Y-109474000D03*
 X152273000Y-106934000D03*
 X152273000Y-104394000D03*
@@ -122,10 +121,14 @@ X126804500Y-118910250D03*
 D17*
 X131504500Y-115910250D03*
 %TD*%
-D11*
+D12*
+%TO.C,HOLE2*%
+X151000000Y-68000000D03*
+%TD*%
+D10*
 %TO.C,J5*%
 X147701000Y-89154000D03*
-D12*
+D11*
 X147701000Y-91694000D03*
 X147701000Y-94234000D03*
 X147701000Y-96774000D03*
--- a/gerber/step32-B_Paste.gbp
+++ b/gerber/step32-B_Paste.gbp
@@ -1,12 +1,12 @@
 %TF.GenerationSoftware,KiCad,Pcbnew,6.0.4-6f826c9f35~116~ubuntu20.04.1*%
-%TF.CreationDate,2022-03-30T05:15:31+01:00*%
+%TF.CreationDate,2022-03-30T11:11:12+01:00*%
 %TF.ProjectId,step32,73746570-3332-42e6-9b69-6361645f7063,rev?*%
 %TF.SameCoordinates,Original*%
 %TF.FileFunction,Paste,Bot*%
 %TF.FilePolarity,Positive*%
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 6.0.4-6f826c9f35~116~ubuntu20.04.1) date 2022-03-30 05:15:31*
+G04 Created by KiCad (PCBNEW 6.0.4-6f826c9f35~116~ubuntu20.04.1) date 2022-03-30 11:11:12*
 %MOMM*%
 %LPD*%
 G01*
--- a/gerber/step32-B_Silkscreen.gbo
+++ b/gerber/step32-B_Silkscreen.gbo
@@ -1,12 +1,12 @@
 %TF.GenerationSoftware,KiCad,Pcbnew,6.0.4-6f826c9f35~116~ubuntu20.04.1*%
-%TF.CreationDate,2022-03-30T05:15:31+01:00*%
+%TF.CreationDate,2022-03-30T11:11:12+01:00*%
 %TF.ProjectId,step32,73746570-3332-42e6-9b69-6361645f7063,rev?*%
 %TF.SameCoordinates,Original*%
 %TF.FileFunction,Legend,Bot*%
 %TF.FilePolarity,Positive*%
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 6.0.4-6f826c9f35~116~ubuntu20.04.1) date 2022-03-30 05:15:31*
+G04 Created by KiCad (PCBNEW 6.0.4-6f826c9f35~116~ubuntu20.04.1) date 2022-03-30 11:11:12*
 %MOMM*%
 %LPD*%
 G01*
--- a/gerber/step32-Edge_Cuts.gm1
+++ b/gerber/step32-Edge_Cuts.gm1
@@ -1,11 +1,11 @@
 %TF.GenerationSoftware,KiCad,Pcbnew,6.0.4-6f826c9f35~116~ubuntu20.04.1*%
-%TF.CreationDate,2022-03-30T05:15:32+01:00*%
+%TF.CreationDate,2022-03-30T11:11:12+01:00*%
 %TF.ProjectId,step32,73746570-3332-42e6-9b69-6361645f7063,rev?*%
 %TF.SameCoordinates,Original*%
 %TF.FileFunction,Profile,NP*%
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 6.0.4-6f826c9f35~116~ubuntu20.04.1) date 2022-03-30 05:15:32*
+G04 Created by KiCad (PCBNEW 6.0.4-6f826c9f35~116~ubuntu20.04.1) date 2022-03-30 11:11:12*
 %MOMM*%
 %LPD*%
 G01*
--- a/gerber/step32-F_Cu.gtl
+++ b/gerber/step32-F_Cu.gtl
--- a/gerber/step32-F_Mask.gts
+++ b/gerber/step32-F_Mask.gts
@@ -1,12 +1,12 @@
 %TF.GenerationSoftware,KiCad,Pcbnew,6.0.4-6f826c9f35~116~ubuntu20.04.1*%
-%TF.CreationDate,2022-03-30T05:15:31+01:00*%
+%TF.CreationDate,2022-03-30T11:11:12+01:00*%
 %TF.ProjectId,step32,73746570-3332-42e6-9b69-6361645f7063,rev?*%
 %TF.SameCoordinates,Original*%
 %TF.FileFunction,Soldermask,Top*%
 %TF.FilePolarity,Negative*%
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 6.0.4-6f826c9f35~116~ubuntu20.04.1) date 2022-03-30 05:15:31*
+G04 Created by KiCad (PCBNEW 6.0.4-6f826c9f35~116~ubuntu20.04.1) date 2022-03-30 11:11:12*
 %MOMM*%
 %LPD*%
 G01*
@@ -29,79 +29,67 @@ G04 Aperture macros list*
 20,1,$1+$1,$6,$7,$8,$9,0*
 20,1,$1+$1,$8,$9,$2,$3,0*%
 G04 Aperture macros list end*
-%ADD10RoundRect,0.140000X-0.140000X-0.170000X0.140000X-0.170000X0.140000X0.170000X-0.140000X0.170000X0*%
-%ADD11C,3.200000*%
-%ADD12RoundRect,0.250000X-0.712500X-2.475000X0.712500X-2.475000X0.712500X2.475000X-0.712500X2.475000X0*%
-%ADD13RoundRect,0.135000X-0.135000X-0.185000X0.135000X-0.185000X0.135000X0.185000X-0.135000X0.185000X0*%
-%ADD14R,1.700000X1.000000*%
-%ADD15RoundRect,0.062500X-0.062500X0.337500X-0.062500X-0.337500X0.062500X-0.337500X0.062500X0.337500X0*%
-%ADD16RoundRect,0.062500X-0.337500X0.062500X-0.337500X-0.062500X0.337500X-0.062500X0.337500X0.062500X0*%
-%ADD17R,3.350000X3.350000*%
-%ADD18RoundRect,0.250000X-0.312500X-0.625000X0.312500X-0.625000X0.312500X0.625000X-0.312500X0.625000X0*%
-%ADD19RoundRect,0.140000X0.170000X-0.140000X0.170000X0.140000X-0.170000X0.140000X-0.170000X-0.140000X0*%
-%ADD20R,1.700000X1.700000*%
-%ADD21O,1.700000X1.700000*%
-%ADD22RoundRect,0.135000X0.135000X0.185000X-0.135000X0.185000X-0.135000X-0.185000X0.135000X-0.185000X0*%
-%ADD23RoundRect,0.150000X-0.150000X0.587500X-0.150000X-0.587500X0.150000X-0.587500X0.150000X0.587500X0*%
-%ADD24RoundRect,0.140000X0.140000X0.170000X-0.140000X0.170000X-0.140000X-0.170000X0.140000X-0.170000X0*%
+%ADD10R,2.500000X1.800000*%
+%ADD11RoundRect,0.250000X0.787500X1.025000X-0.787500X1.025000X-0.787500X-1.025000X0.787500X-1.025000X0*%
+%ADD12RoundRect,0.135000X-0.135000X-0.185000X0.135000X-0.185000X0.135000X0.185000X-0.135000X0.185000X0*%
+%ADD13R,1.700000X1.000000*%
+%ADD14RoundRect,0.062500X-0.062500X0.337500X-0.062500X-0.337500X0.062500X-0.337500X0.062500X0.337500X0*%
+%ADD15RoundRect,0.062500X-0.337500X0.062500X-0.337500X-0.062500X0.337500X-0.062500X0.337500X0.062500X0*%
+%ADD16R,3.350000X3.350000*%
+%ADD17RoundRect,0.250000X-0.312500X-0.625000X0.312500X-0.625000X0.312500X0.625000X-0.312500X0.625000X0*%
+%ADD18RoundRect,0.140000X0.170000X-0.140000X0.170000X0.140000X-0.170000X0.140000X-0.170000X-0.140000X0*%
+%ADD19R,1.700000X1.700000*%
+%ADD20O,1.700000X1.700000*%
+%ADD21RoundRect,0.135000X0.135000X0.185000X-0.135000X0.185000X-0.135000X-0.185000X0.135000X-0.185000X0*%
+%ADD22RoundRect,0.150000X-0.150000X0.587500X-0.150000X-0.587500X0.150000X-0.587500X0.150000X0.587500X0*%
+%ADD23RoundRect,0.140000X0.140000X0.170000X-0.140000X0.170000X-0.140000X-0.170000X0.140000X-0.170000X0*%
+%ADD24C,3.200000*%
 %ADD25R,0.700000X1.000000*%
 %ADD26R,0.700000X0.600000*%
 %ADD27RoundRect,0.150000X0.150000X-0.587500X0.150000X0.587500X-0.150000X0.587500X-0.150000X-0.587500X0*%
-%ADD28RoundRect,0.250000X0.475000X-0.250000X0.475000X0.250000X-0.475000X0.250000X-0.475000X-0.250000X0*%
-%ADD29RoundRect,0.135000X-0.185000X0.135000X-0.185000X-0.135000X0.185000X-0.135000X0.185000X0.135000X0*%
-%ADD30R,2.500000X3.300000*%
-%ADD31RoundRect,0.140000X-0.170000X0.140000X-0.170000X-0.140000X0.170000X-0.140000X0.170000X0.140000X0*%
-%ADD32R,1.350000X0.400000*%
-%ADD33O,1.550000X0.890000*%
-%ADD34O,0.950000X1.250000*%
-%ADD35R,1.550000X1.200000*%
-%ADD36R,1.550000X1.500000*%
-%ADD37RoundRect,0.250000X0.412500X0.925000X-0.412500X0.925000X-0.412500X-0.925000X0.412500X-0.925000X0*%
-%ADD38R,2.000000X5.700000*%
-%ADD39R,3.500000X3.500000*%
-%ADD40RoundRect,0.750000X1.000000X-0.750000X1.000000X0.750000X-1.000000X0.750000X-1.000000X-0.750000X0*%
-%ADD41RoundRect,0.875000X0.875000X-0.875000X0.875000X0.875000X-0.875000X0.875000X-0.875000X-0.875000X0*%
-%ADD42RoundRect,0.250000X-0.250000X-0.475000X0.250000X-0.475000X0.250000X0.475000X-0.250000X0.475000X0*%
-%ADD43RoundRect,0.150000X0.150000X-0.512500X0.150000X0.512500X-0.150000X0.512500X-0.150000X-0.512500X0*%
-%ADD44R,3.200000X1.600000*%
-%ADD45RoundRect,0.250000X-1.500000X-1.000000X1.500000X-1.000000X1.500000X1.000000X-1.500000X1.000000X0*%
-%ADD46R,2.000000X0.900000*%
-%ADD47R,0.900000X2.000000*%
-%ADD48R,5.000000X5.000000*%
-%ADD49RoundRect,0.218750X0.218750X0.256250X-0.218750X0.256250X-0.218750X-0.256250X0.218750X-0.256250X0*%
-%ADD50R,1.550000X0.600000*%
-%ADD51R,2.600000X3.100000*%
-%ADD52RoundRect,0.062500X0.062500X-0.337500X0.062500X0.337500X-0.062500X0.337500X-0.062500X-0.337500X0*%
-%ADD53RoundRect,0.062500X0.337500X-0.062500X0.337500X0.062500X-0.337500X0.062500X-0.337500X-0.062500X0*%
+%ADD28RoundRect,0.140000X-0.140000X-0.170000X0.140000X-0.170000X0.140000X0.170000X-0.140000X0.170000X0*%
+%ADD29RoundRect,0.250000X0.475000X-0.250000X0.475000X0.250000X-0.475000X0.250000X-0.475000X-0.250000X0*%
+%ADD30RoundRect,0.135000X-0.185000X0.135000X-0.185000X-0.135000X0.185000X-0.135000X0.185000X0.135000X0*%
+%ADD31RoundRect,0.135000X0.185000X-0.135000X0.185000X0.135000X-0.185000X0.135000X-0.185000X-0.135000X0*%
+%ADD32RoundRect,0.140000X-0.170000X0.140000X-0.170000X-0.140000X0.170000X-0.140000X0.170000X0.140000X0*%
+%ADD33RoundRect,0.250000X-0.712500X-2.475000X0.712500X-2.475000X0.712500X2.475000X-0.712500X2.475000X0*%
+%ADD34R,1.350000X0.400000*%
+%ADD35O,1.550000X0.890000*%
+%ADD36O,0.950000X1.250000*%
+%ADD37R,1.550000X1.200000*%
+%ADD38R,1.550000X1.500000*%
+%ADD39R,2.000000X5.700000*%
+%ADD40R,3.500000X3.500000*%
+%ADD41RoundRect,0.750000X1.000000X-0.750000X1.000000X0.750000X-1.000000X0.750000X-1.000000X-0.750000X0*%
+%ADD42RoundRect,0.875000X0.875000X-0.875000X0.875000X0.875000X-0.875000X0.875000X-0.875000X-0.875000X0*%
+%ADD43RoundRect,0.250000X-0.250000X-0.475000X0.250000X-0.475000X0.250000X0.475000X-0.250000X0.475000X0*%
+%ADD44RoundRect,0.150000X0.150000X-0.512500X0.150000X0.512500X-0.150000X0.512500X-0.150000X-0.512500X0*%
+%ADD45R,3.200000X1.600000*%
+%ADD46RoundRect,0.250000X-1.500000X-1.000000X1.500000X-1.000000X1.500000X1.000000X-1.500000X1.000000X0*%
+%ADD47R,2.000000X0.900000*%
+%ADD48R,0.900000X2.000000*%
+%ADD49R,5.000000X5.000000*%
+%ADD50RoundRect,0.218750X0.218750X0.256250X-0.218750X0.256250X-0.218750X-0.256250X0.218750X-0.256250X0*%
+%ADD51R,1.550000X0.600000*%
+%ADD52R,2.600000X3.100000*%
+%ADD53RoundRect,0.062500X0.062500X-0.337500X0.062500X0.337500X-0.062500X0.337500X-0.062500X-0.337500X0*%
+%ADD54RoundRect,0.062500X0.337500X-0.062500X0.337500X0.062500X-0.337500X0.062500X-0.337500X-0.062500X0*%
 G04 APERTURE END LIST*
 D10*
-%TO.C,C21*%
-X140744000Y-104775000D03*
-X141704000Y-104775000D03*
-%TD*%
-%TO.C,C20*%
-X141704000Y-111633000D03*
-X140744000Y-111633000D03*
+%TO.C,D3*%
+X118269000Y-98933000D03*
+X122269000Y-98933000D03*
 %TD*%
 D11*
-%TO.C,HOLE3*%
-X104000000Y-121000000D03*
+%TO.C,C17*%
+X130747500Y-89027000D03*
+X124522500Y-89027000D03*
 %TD*%
-%TO.C,HOLE4*%
-X151000000Y-121000000D03*
-%TD*%
-%TO.C,HOLE1*%
-X104000000Y-68000000D03*
-%TD*%
-%TO.C,HOLE2*%
-X151000000Y-68000000D03*
+%TO.C,C16*%
+X130747500Y-84201000D03*
+X124522500Y-84201000D03*
 %TD*%
 D12*
-%TO.C,F1*%
-X119929500Y-106680000D03*
-X126704500Y-106680000D03*
-%TD*%
-D13*
 %TO.C,R9*%
 X134392000Y-115062000D03*
 X135412000Y-115062000D03*
@@ -110,14 +98,14 @@ X135412000Y-115062000D03*
 X112520000Y-85725000D03*
 X113540000Y-85725000D03*
 %TD*%
-D14*
+D13*
 %TO.C,SW2*%
 X104292000Y-81920000D03*
 X110592000Y-81920000D03*
 X110592000Y-85720000D03*
 X104292000Y-85720000D03*
 %TD*%
-D15*
+D14*
 %TO.C,U3*%
 X138660000Y-105881000D03*
 X138160000Y-105881000D03*
@@ -126,7 +114,7 @@ X137160000Y-105881000D03*
 X136660000Y-105881000D03*
 X136160000Y-105881000D03*
 X135660000Y-105881000D03*
-D16*
+D15*
 X134710000Y-106831000D03*
 X134710000Y-107331000D03*
 X134710000Y-107831000D03*
@@ -134,7 +122,7 @@ X134710000Y-108331000D03*
 X134710000Y-108831000D03*
 X134710000Y-109331000D03*
 X134710000Y-109831000D03*
-D15*
+D14*
 X135660000Y-110781000D03*
 X136160000Y-110781000D03*
 X136660000Y-110781000D03*
@@ -142,7 +130,7 @@ X137160000Y-110781000D03*
 X137660000Y-110781000D03*
 X138160000Y-110781000D03*
 X138660000Y-110781000D03*
-D16*
+D15*
 X139610000Y-109831000D03*
 X139610000Y-109331000D03*
 X139610000Y-108831000D03*
@@ -150,47 +138,51 @@ X139610000Y-108331000D03*
 X139610000Y-107831000D03*
 X139610000Y-107331000D03*
 X139610000Y-106831000D03*
-D17*
+D16*
 X137160000Y-108331000D03*
 %TD*%
-D18*
+D17*
 %TO.C,R15*%
 X141920500Y-106426000D03*
 X144845500Y-106426000D03*
 %TD*%
-D19*
+D18*
 %TO.C,C4*%
-X117094000Y-62766000D03*
 X117094000Y-63726000D03*
+X117094000Y-62766000D03*
 %TD*%
-D20*
+D19*
 %TO.C,J7*%
 X147701000Y-112014000D03*
-D21*
+D20*
 X147701000Y-109474000D03*
 X147701000Y-106934000D03*
 X147701000Y-104394000D03*
 %TD*%
-D22*
+D21*
 %TO.C,R13*%
 X133098000Y-109601000D03*
 X132078000Y-109601000D03*
 %TD*%
-D23*
+D22*
 %TO.C,Q1*%
-X113538000Y-82090500D03*
-X112588000Y-80215500D03*
 X114488000Y-80215500D03*
+X112588000Y-80215500D03*
+X113538000Y-82090500D03*
 %TD*%
-D24*
+D23*
 %TO.C,C7*%
 X133322000Y-106553000D03*
 X132362000Y-106553000D03*
 %TD*%
-D20*
+D24*
+%TO.C,HOLE1*%
+X104000000Y-68000000D03*
+%TD*%
+D19*
 %TO.C,J3*%
 X147701000Y-76469000D03*
-D21*
+D20*
 X147701000Y-79009000D03*
 X147701000Y-81549000D03*
 %TD*%
@@ -208,10 +200,19 @@ X112588000Y-77264500D03*
 X114488000Y-77264500D03*
 X113538000Y-75389500D03*
 %TD*%
-D20*
+D28*
+%TO.C,C21*%
+X140744000Y-104775000D03*
+X141704000Y-104775000D03*
+%TD*%
+D24*
+%TO.C,HOLE3*%
+X104000000Y-121000000D03*
+%TD*%
+D19*
 %TO.C,J2*%
 X142748000Y-73909000D03*
-D21*
+D20*
 X142748000Y-76449000D03*
 X142748000Y-78989000D03*
 X142748000Y-81529000D03*
@@ -224,34 +225,38 @@ X142748000Y-96769000D03*
 X142748000Y-99309000D03*
 X142748000Y-101849000D03*
 %TD*%
-D20*
+D19*
 %TO.C,J4*%
 X152273000Y-76469000D03*
-D21*
+D20*
 X152273000Y-79009000D03*
 X152273000Y-81549000D03*
 %TD*%
-D20*
+D24*
+%TO.C,HOLE4*%
+X151000000Y-121000000D03*
+%TD*%
+D19*
 %TO.C,J6*%
 X152273000Y-89154000D03*
-D21*
+D20*
 X152273000Y-91694000D03*
 X152273000Y-94234000D03*
 X152273000Y-96774000D03*
 %TD*%
-D14*
+D13*
 %TO.C,SW1*%
 X110592000Y-73030000D03*
 X104292000Y-73030000D03*
 X110592000Y-76830000D03*
 X104292000Y-76830000D03*
 %TD*%
-D28*
-%TO.C,C3*%
-X115570000Y-62550000D03*
-X115570000Y-64450000D03*
-%TD*%
 D29*
+%TO.C,C3*%
+X115570000Y-64450000D03*
+X115570000Y-62550000D03*
+%TD*%
+D30*
 %TO.C,R5*%
 X145288000Y-93206000D03*
 X145288000Y-94226000D03*
@@ -260,112 +265,111 @@ X145288000Y-94226000D03*
 X133223000Y-82294000D03*
 X133223000Y-83314000D03*
 %TD*%
-D30*
-%TO.C,D3*%
-X117504000Y-98933000D03*
-X124304000Y-98933000D03*
-%TD*%
-D22*
-%TO.C,R16*%
-X126748000Y-89408000D03*
-X125728000Y-89408000D03*
-%TD*%
 D31*
-%TO.C,C13*%
-X126619000Y-96040000D03*
-X126619000Y-97000000D03*
+%TO.C,R16*%
+X122682000Y-91061000D03*
+X122682000Y-90041000D03*
 %TD*%
-D22*
+D32*
+%TO.C,C13*%
+X124460000Y-97691000D03*
+X124460000Y-98651000D03*
+%TD*%
+D21*
 %TO.C,R12*%
 X113540000Y-84709000D03*
 X112520000Y-84709000D03*
 %TD*%
-D20*
+D19*
 %TO.C,J8*%
 X152273000Y-112014000D03*
-D21*
+D20*
 X152273000Y-109474000D03*
 X152273000Y-106934000D03*
 X152273000Y-104394000D03*
 %TD*%
-D22*
+D33*
+%TO.C,F1*%
+X119929500Y-106680000D03*
+X126704500Y-106680000D03*
+%TD*%
+D21*
 %TO.C,R10*%
 X135412000Y-114046000D03*
 X134392000Y-114046000D03*
 %TD*%
-D32*
+D34*
 %TO.C,J1*%
 X104143000Y-108428000D03*
 X104143000Y-109078000D03*
 X104143000Y-109728000D03*
 X104143000Y-110378000D03*
 X104143000Y-111028000D03*
-D33*
+D35*
 X101443000Y-113228000D03*
-D34*
+D36*
 X104143000Y-112228000D03*
-D35*
+D37*
 X101443000Y-112628000D03*
-D36*
+D38*
 X101443000Y-108728000D03*
-D35*
+D37*
 X101443000Y-106828000D03*
-D36*
+D38*
 X101443000Y-110728000D03*
-D34*
+D36*
 X104143000Y-107228000D03*
-D33*
+D35*
 X101443000Y-106228000D03*
 %TD*%
-D37*
-%TO.C,C16*%
-X128129500Y-84582000D03*
-X131204500Y-84582000D03*
-%TD*%
-D13*
+D31*
 %TO.C,R17*%
-X125728000Y-88392000D03*
-X126748000Y-88392000D03*
+X122682000Y-89156000D03*
+X122682000Y-88136000D03*
 %TD*%
-D38*
+D39*
 %TO.C,C15*%
 X114808000Y-111982750D03*
 X114808000Y-121682750D03*
 %TD*%
-D22*
+D21*
 %TO.C,R1*%
 X103507000Y-92202000D03*
 X102487000Y-92202000D03*
 %TD*%
-D39*
+D40*
 %TO.C,J9*%
 X126804500Y-112910250D03*
-D40*
-X126804500Y-118910250D03*
 D41*
+X126804500Y-118910250D03*
+D42*
 X131504500Y-115910250D03*
 %TD*%
-D22*
+D21*
 %TO.C,R8*%
-X112393000Y-73787000D03*
 X113413000Y-73787000D03*
+X112393000Y-73787000D03*
 %TD*%
-D42*
+D43*
 %TO.C,C18*%
 X102047000Y-97155000D03*
 X103947000Y-97155000D03*
 %TD*%
-D10*
+D28*
 %TO.C,C2*%
 X109629000Y-95250000D03*
 X110589000Y-95250000D03*
 %TD*%
-D31*
+D32*
 %TO.C,C5*%
 X108712000Y-95151000D03*
 X108712000Y-96111000D03*
 %TD*%
-D43*
+D24*
+%TO.C,HOLE2*%
+X151000000Y-68000000D03*
+%TD*%
+D44*
 %TO.C,U5*%
 X102047000Y-101340500D03*
 X102997000Y-101340500D03*
@@ -373,35 +377,30 @@ X103947000Y-101340500D03*
 X103947000Y-99065500D03*
 X102047000Y-99065500D03*
 %TD*%
-D37*
-%TO.C,C17*%
-X131204500Y-88011000D03*
-X128129500Y-88011000D03*
-%TD*%
-D20*
+D19*
 %TO.C,J5*%
 X147701000Y-89154000D03*
-D21*
+D20*
 X147701000Y-91694000D03*
 X147701000Y-94234000D03*
 X147701000Y-96774000D03*
 %TD*%
-D24*
+D23*
 %TO.C,C11*%
 X137005000Y-103632000D03*
 X136045000Y-103632000D03*
 %TD*%
-D44*
+D45*
 %TO.C,L1*%
-X132842000Y-90927000D03*
-X132842000Y-99827000D03*
+X130683000Y-101478000D03*
+X130683000Y-92578000D03*
 %TD*%
-D13*
+D12*
 %TO.C,R7*%
 X112393000Y-72771000D03*
 X113413000Y-72771000D03*
 %TD*%
-D42*
+D43*
 %TO.C,C12*%
 X101920000Y-103378000D03*
 X103820000Y-103378000D03*
@@ -410,27 +409,27 @@ X103820000Y-103378000D03*
 X110048000Y-96774000D03*
 X111948000Y-96774000D03*
 %TD*%
-D24*
+D23*
 %TO.C,C8*%
 X135382000Y-112014000D03*
 X134422000Y-112014000D03*
 %TD*%
-D45*
+D46*
 %TO.C,C10*%
 X138863000Y-118364000D03*
 X145363000Y-118364000D03*
 %TD*%
-D22*
+D21*
 %TO.C,R3*%
 X115064000Y-78740000D03*
 X114044000Y-78740000D03*
 %TD*%
-D18*
+D17*
 %TO.C,R14*%
 X141920500Y-109982000D03*
 X144845500Y-109982000D03*
 %TD*%
-D46*
+D47*
 %TO.C,U2*%
 X119008000Y-62654000D03*
 X119008000Y-63924000D03*
@@ -446,7 +445,7 @@ X119008000Y-75354000D03*
 X119008000Y-76624000D03*
 X119008000Y-77894000D03*
 X119008000Y-79164000D03*
-D47*
+D48*
 X121793000Y-80164000D03*
 X123063000Y-80164000D03*
 X124333000Y-80164000D03*
@@ -457,7 +456,7 @@ X129413000Y-80164000D03*
 X130683000Y-80164000D03*
 X131953000Y-80164000D03*
 X133223000Y-80164000D03*
-D46*
+D47*
 X136008000Y-79164000D03*
 X136008000Y-77894000D03*
 X136008000Y-76624000D03*
@@ -472,58 +471,63 @@ X136008000Y-66464000D03*
 X136008000Y-65194000D03*
 X136008000Y-63924000D03*
 X136008000Y-62654000D03*
-D48*
+D49*
 X126508000Y-70154000D03*
 %TD*%
-D49*
+D50*
 %TO.C,D2*%
 X136169500Y-82677000D03*
 X134594500Y-82677000D03*
 %TD*%
-D10*
+D28*
 %TO.C,C6*%
 X113566000Y-83693000D03*
 X114526000Y-83693000D03*
 %TD*%
-D29*
+D30*
 %TO.C,R6*%
 X145288000Y-95746000D03*
 X145288000Y-96766000D03*
 %TD*%
-D13*
+D28*
+%TO.C,C20*%
+X140744000Y-111633000D03*
+X141704000Y-111633000D03*
+%TD*%
+D12*
 %TO.C,R4*%
 X112139000Y-78740000D03*
 X113159000Y-78740000D03*
 %TD*%
-D50*
-%TO.C,U4*%
-X126144000Y-94615000D03*
-X126144000Y-93345000D03*
-X126144000Y-92075000D03*
-X126144000Y-90805000D03*
-X120744000Y-90805000D03*
-X120744000Y-92075000D03*
-X120744000Y-93345000D03*
-X120744000Y-94615000D03*
 D51*
-X123444000Y-92710000D03*
+%TO.C,U4*%
+X123985000Y-96266000D03*
+X123985000Y-94996000D03*
+X123985000Y-93726000D03*
+X123985000Y-92456000D03*
+X118585000Y-92456000D03*
+X118585000Y-93726000D03*
+X118585000Y-94996000D03*
+X118585000Y-96266000D03*
+D52*
+X121285000Y-94361000D03*
 %TD*%
-D19*
+D18*
 %TO.C,C14*%
 X135001000Y-104620000D03*
 X135001000Y-103660000D03*
 %TD*%
-D28*
+D29*
 %TO.C,C9*%
-X118618000Y-93152000D03*
-X118618000Y-91252000D03*
+X116459000Y-94803000D03*
+X116459000Y-92903000D03*
 %TD*%
-D24*
+D23*
 %TO.C,C19*%
 X135382000Y-113030000D03*
 X134422000Y-113030000D03*
 %TD*%
-D52*
+D53*
 %TO.C,U1*%
 X105815000Y-94017000D03*
 X106315000Y-94017000D03*
@@ -532,7 +536,7 @@ X107315000Y-94017000D03*
 X107815000Y-94017000D03*
 X108315000Y-94017000D03*
 X108815000Y-94017000D03*
-D53*
+D54*
 X109765000Y-93067000D03*
 X109765000Y-92567000D03*
 X109765000Y-92067000D03*
@@ -540,7 +544,7 @@ X109765000Y-91567000D03*
 X109765000Y-91067000D03*
 X109765000Y-90567000D03*
 X109765000Y-90067000D03*
-D52*
+D53*
 X108815000Y-89117000D03*
 X108315000Y-89117000D03*
 X107815000Y-89117000D03*
@@ -548,7 +552,7 @@ X107315000Y-89117000D03*
 X106815000Y-89117000D03*
 X106315000Y-89117000D03*
 X105815000Y-89117000D03*
-D53*
+D54*
 X104865000Y-90067000D03*
 X104865000Y-90567000D03*
 X104865000Y-91067000D03*
@@ -556,7 +560,7 @@ X104865000Y-91567000D03*
 X104865000Y-92067000D03*
 X104865000Y-92567000D03*
 X104865000Y-93067000D03*
-D17*
+D16*
 X107315000Y-91567000D03*
 %TD*%
 M02*
--- a/gerber/step32-F_Paste.gtp
+++ b/gerber/step32-F_Paste.gtp
@@ -1,12 +1,12 @@
 %TF.GenerationSoftware,KiCad,Pcbnew,6.0.4-6f826c9f35~116~ubuntu20.04.1*%
-%TF.CreationDate,2022-03-30T05:15:31+01:00*%
+%TF.CreationDate,2022-03-30T11:11:12+01:00*%
 %TF.ProjectId,step32,73746570-3332-42e6-9b69-6361645f7063,rev?*%
 %TF.SameCoordinates,Original*%
 %TF.FileFunction,Paste,Top*%
 %TF.FilePolarity,Positive*%
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 6.0.4-6f826c9f35~116~ubuntu20.04.1) date 2022-03-30 05:15:31*
+G04 Created by KiCad (PCBNEW 6.0.4-6f826c9f35~116~ubuntu20.04.1) date 2022-03-30 11:11:12*
 %MOMM*%
 %LPD*%
 G01*
@@ -61,8 +61,8 @@ G04 Aperture macros list*
 0.186855,-0.403112,-0.116234,-0.403112,-0.121446,-0.402193,-0.123663,-0.402787,-0.127060,-0.401203,-0.145390,-0.397971,-0.159647,-0.386008,-0.176512,-0.378144,-0.247133,-0.307524,-0.250168,-0.303189,-0.252157,-0.302041,-0.253439,-0.298518,-0.264114,-0.283273,-0.265736,-0.264734,-0.272101,-0.247246,-0.272101,0.247246,-0.271182,0.252459,-0.271776,0.254676,-0.270192,0.258073,-0.266960,0.276402,
 -0.254997,0.290658,-0.247133,0.307524,-0.176512,0.378144,-0.172177,0.381179,-0.171029,0.383168,-0.167505,0.384451,-0.152260,0.395125,-0.133722,0.396747,-0.116234,0.403112,0.186855,0.403112,0.197929,0.401159,0.197929,0.401159,$1*%
 G04 Aperture macros list end*
-%ADD10RoundRect,0.140000X-0.140000X-0.170000X0.140000X-0.170000X0.140000X0.170000X-0.140000X0.170000X0*%
-%ADD11RoundRect,0.250000X-0.712500X-2.475000X0.712500X-2.475000X0.712500X2.475000X-0.712500X2.475000X0*%
+%ADD10R,2.500000X1.800000*%
+%ADD11RoundRect,0.250000X0.787500X1.025000X-0.787500X1.025000X-0.787500X-1.025000X0.787500X-1.025000X0*%
 %ADD12RoundRect,0.135000X-0.135000X-0.185000X0.135000X-0.185000X0.135000X0.185000X-0.135000X0.185000X0*%
 %ADD13R,1.700000X1.000000*%
 %ADD14FreePoly0,270.000000*%
@@ -84,44 +84,45 @@ G04 Aperture macros list end*
 %ADD30R,0.700000X1.000000*%
 %ADD31R,0.700000X0.600000*%
 %ADD32RoundRect,0.150000X0.150000X-0.587500X0.150000X0.587500X-0.150000X0.587500X-0.150000X-0.587500X0*%
-%ADD33RoundRect,0.250000X0.475000X-0.250000X0.475000X0.250000X-0.475000X0.250000X-0.475000X-0.250000X0*%
-%ADD34RoundRect,0.135000X-0.185000X0.135000X-0.185000X-0.135000X0.185000X-0.135000X0.185000X0.135000X0*%
-%ADD35R,2.500000X3.300000*%
-%ADD36RoundRect,0.140000X-0.170000X0.140000X-0.170000X-0.140000X0.170000X-0.140000X0.170000X0.140000X0*%
-%ADD37O,1.550000X0.890000*%
-%ADD38O,0.950000X1.250000*%
-%ADD39R,1.350000X0.400000*%
-%ADD40R,1.550000X1.200000*%
-%ADD41R,1.550000X1.500000*%
-%ADD42RoundRect,0.250000X0.412500X0.925000X-0.412500X0.925000X-0.412500X-0.925000X0.412500X-0.925000X0*%
-%ADD43R,2.000000X5.700000*%
-%ADD44RoundRect,0.250000X-0.250000X-0.475000X0.250000X-0.475000X0.250000X0.475000X-0.250000X0.475000X0*%
-%ADD45RoundRect,0.150000X0.150000X-0.512500X0.150000X0.512500X-0.150000X0.512500X-0.150000X-0.512500X0*%
-%ADD46R,3.200000X1.600000*%
-%ADD47RoundRect,0.250000X-1.500000X-1.000000X1.500000X-1.000000X1.500000X1.000000X-1.500000X1.000000X0*%
-%ADD48R,2.000000X0.900000*%
-%ADD49R,0.900000X2.000000*%
-%ADD50R,5.000000X5.000000*%
-%ADD51RoundRect,0.218750X0.218750X0.256250X-0.218750X0.256250X-0.218750X-0.256250X0.218750X-0.256250X0*%
-%ADD52R,1.550000X0.600000*%
-%ADD53R,2.600000X3.100000*%
-%ADD54RoundRect,0.225000X0.225000X-0.225000X0.225000X0.225000X-0.225000X0.225000X-0.225000X-0.225000X0*%
-%ADD55RoundRect,0.062500X0.062500X-0.337500X0.062500X0.337500X-0.062500X0.337500X-0.062500X-0.337500X0*%
-%ADD56RoundRect,0.062500X0.337500X-0.062500X0.337500X0.062500X-0.337500X0.062500X-0.337500X-0.062500X0*%
+%ADD33RoundRect,0.140000X-0.140000X-0.170000X0.140000X-0.170000X0.140000X0.170000X-0.140000X0.170000X0*%
+%ADD34RoundRect,0.250000X0.475000X-0.250000X0.475000X0.250000X-0.475000X0.250000X-0.475000X-0.250000X0*%
+%ADD35RoundRect,0.135000X-0.185000X0.135000X-0.185000X-0.135000X0.185000X-0.135000X0.185000X0.135000X0*%
+%ADD36RoundRect,0.135000X0.185000X-0.135000X0.185000X0.135000X-0.185000X0.135000X-0.185000X-0.135000X0*%
+%ADD37RoundRect,0.140000X-0.170000X0.140000X-0.170000X-0.140000X0.170000X-0.140000X0.170000X0.140000X0*%
+%ADD38RoundRect,0.250000X-0.712500X-2.475000X0.712500X-2.475000X0.712500X2.475000X-0.712500X2.475000X0*%
+%ADD39O,1.550000X0.890000*%
+%ADD40O,0.950000X1.250000*%
+%ADD41R,1.350000X0.400000*%
+%ADD42R,1.550000X1.200000*%
+%ADD43R,1.550000X1.500000*%
+%ADD44R,2.000000X5.700000*%
+%ADD45RoundRect,0.250000X-0.250000X-0.475000X0.250000X-0.475000X0.250000X0.475000X-0.250000X0.475000X0*%
+%ADD46RoundRect,0.150000X0.150000X-0.512500X0.150000X0.512500X-0.150000X0.512500X-0.150000X-0.512500X0*%
+%ADD47R,3.200000X1.600000*%
+%ADD48RoundRect,0.250000X-1.500000X-1.000000X1.500000X-1.000000X1.500000X1.000000X-1.500000X1.000000X0*%
+%ADD49R,2.000000X0.900000*%
+%ADD50R,0.900000X2.000000*%
+%ADD51R,5.000000X5.000000*%
+%ADD52RoundRect,0.218750X0.218750X0.256250X-0.218750X0.256250X-0.218750X-0.256250X0.218750X-0.256250X0*%
+%ADD53R,1.550000X0.600000*%
+%ADD54R,2.600000X3.100000*%
+%ADD55RoundRect,0.225000X0.225000X-0.225000X0.225000X0.225000X-0.225000X0.225000X-0.225000X-0.225000X0*%
+%ADD56RoundRect,0.062500X0.062500X-0.337500X0.062500X0.337500X-0.062500X0.337500X-0.062500X-0.337500X0*%
+%ADD57RoundRect,0.062500X0.337500X-0.062500X0.337500X0.062500X-0.337500X0.062500X-0.337500X-0.062500X0*%
 G04 APERTURE END LIST*
 D10*
-%TO.C,C21*%
-X140744000Y-104775000D03*
-X141704000Y-104775000D03*
-%TD*%
-%TO.C,C20*%
-X141704000Y-111633000D03*
-X140744000Y-111633000D03*
+%TO.C,D3*%
+X118269000Y-98933000D03*
+X122269000Y-98933000D03*
 %TD*%
 D11*
-%TO.C,F1*%
-X119929500Y-106680000D03*
-X126704500Y-106680000D03*
+%TO.C,C17*%
+X130747500Y-89027000D03*
+X124522500Y-89027000D03*
+%TD*%
+%TO.C,C16*%
+X130747500Y-84201000D03*
+X124522500Y-84201000D03*
 %TD*%
 D12*
 %TO.C,R9*%
@@ -211,8 +212,8 @@ X144845500Y-106426000D03*
 %TD*%
 D26*
 %TO.C,C4*%
-X117094000Y-62766000D03*
 X117094000Y-63726000D03*
+X117094000Y-62766000D03*
 %TD*%
 D27*
 %TO.C,R13*%
@@ -221,9 +222,9 @@ X132078000Y-109601000D03*
 %TD*%
 D28*
 %TO.C,Q1*%
-X113538000Y-82090500D03*
-X112588000Y-80215500D03*
 X114488000Y-80215500D03*
+X112588000Y-80215500D03*
+X113538000Y-82090500D03*
 %TD*%
 D29*
 %TO.C,C7*%
@@ -244,6 +245,11 @@ X112588000Y-77264500D03*
 X114488000Y-77264500D03*
 X113538000Y-75389500D03*
 %TD*%
+D33*
+%TO.C,C21*%
+X140744000Y-104775000D03*
+X141704000Y-104775000D03*
+%TD*%
 D13*
 %TO.C,SW1*%
 X110592000Y-73030000D03*
@@ -251,12 +257,12 @@ X104292000Y-73030000D03*
 X110592000Y-76830000D03*
 X104292000Y-76830000D03*
 %TD*%
-D33*
-%TO.C,C3*%
-X115570000Y-62550000D03*
-X115570000Y-64450000D03*
-%TD*%
 D34*
+%TO.C,C3*%
+X115570000Y-64450000D03*
+X115570000Y-62550000D03*
+%TD*%
+D35*
 %TO.C,R5*%
 X145288000Y-93206000D03*
 X145288000Y-94226000D03*
@@ -265,63 +271,59 @@ X145288000Y-94226000D03*
 X133223000Y-82294000D03*
 X133223000Y-83314000D03*
 %TD*%
-D35*
-%TO.C,D3*%
-X117504000Y-98933000D03*
-X124304000Y-98933000D03*
-%TD*%
-D27*
-%TO.C,R16*%
-X126748000Y-89408000D03*
-X125728000Y-89408000D03*
-%TD*%
 D36*
+%TO.C,R16*%
+X122682000Y-91061000D03*
+X122682000Y-90041000D03*
+%TD*%
+D37*
 %TO.C,C13*%
-X126619000Y-96040000D03*
-X126619000Y-97000000D03*
+X124460000Y-97691000D03*
+X124460000Y-98651000D03*
 %TD*%
 D27*
 %TO.C,R12*%
 X113540000Y-84709000D03*
 X112520000Y-84709000D03*
 %TD*%
+D38*
+%TO.C,F1*%
+X119929500Y-106680000D03*
+X126704500Y-106680000D03*
+%TD*%
+D27*
 %TO.C,R10*%
 X135412000Y-114046000D03*
 X134392000Y-114046000D03*
 %TD*%
-D37*
+D39*
 %TO.C,J1*%
 X101443000Y-106228000D03*
 X101443000Y-113228000D03*
-D38*
+D40*
 X104143000Y-107228000D03*
 X104143000Y-112228000D03*
-D39*
+D41*
 X104143000Y-108428000D03*
 X104143000Y-109078000D03*
 X104143000Y-109728000D03*
 X104143000Y-110378000D03*
 X104143000Y-111028000D03*
-D40*
+D42*
 X101443000Y-112628000D03*
-D41*
+D43*
 X101443000Y-108728000D03*
-D40*
+D42*
 X101443000Y-106828000D03*
-D41*
+D43*
 X101443000Y-110728000D03*
 %TD*%
-D42*
-%TO.C,C16*%
-X128129500Y-84582000D03*
-X131204500Y-84582000D03*
-%TD*%
-D12*
+D36*
 %TO.C,R17*%
-X125728000Y-88392000D03*
-X126748000Y-88392000D03*
+X122682000Y-89156000D03*
+X122682000Y-88136000D03*
 %TD*%
-D43*
+D44*
 %TO.C,C15*%
 X114808000Y-111982750D03*
 X114808000Y-121682750D03*
@@ -332,25 +334,25 @@ X103507000Y-92202000D03*
 X102487000Y-92202000D03*
 %TD*%
 %TO.C,R8*%
-X112393000Y-73787000D03*
 X113413000Y-73787000D03*
+X112393000Y-73787000D03*
 %TD*%
-D44*
+D45*
 %TO.C,C18*%
 X102047000Y-97155000D03*
 X103947000Y-97155000D03*
 %TD*%
-D10*
+D33*
 %TO.C,C2*%
 X109629000Y-95250000D03*
 X110589000Y-95250000D03*
 %TD*%
-D36*
+D37*
 %TO.C,C5*%
 X108712000Y-95151000D03*
 X108712000Y-96111000D03*
 %TD*%
-D45*
+D46*
 %TO.C,U5*%
 X102047000Y-101340500D03*
 X102997000Y-101340500D03*
@@ -358,27 +360,22 @@ X103947000Y-101340500D03*
 X103947000Y-99065500D03*
 X102047000Y-99065500D03*
 %TD*%
-D42*
-%TO.C,C17*%
-X131204500Y-88011000D03*
-X128129500Y-88011000D03*
-%TD*%
 D29*
 %TO.C,C11*%
 X137005000Y-103632000D03*
 X136045000Y-103632000D03*
 %TD*%
-D46*
+D47*
 %TO.C,L1*%
-X132842000Y-90927000D03*
-X132842000Y-99827000D03*
+X130683000Y-101478000D03*
+X130683000Y-92578000D03*
 %TD*%
 D12*
 %TO.C,R7*%
 X112393000Y-72771000D03*
 X113413000Y-72771000D03*
 %TD*%
-D44*
+D45*
 %TO.C,C12*%
 X101920000Y-103378000D03*
 X103820000Y-103378000D03*
@@ -392,7 +389,7 @@ D29*
 X135382000Y-112014000D03*
 X134422000Y-112014000D03*
 %TD*%
-D47*
+D48*
 %TO.C,C10*%
 X138863000Y-118364000D03*
 X145363000Y-118364000D03*
@@ -407,7 +404,7 @@ D25*
 X141920500Y-109982000D03*
 X144845500Y-109982000D03*
 %TD*%
-D48*
+D49*
 %TO.C,U2*%
 X119008000Y-62654000D03*
 X119008000Y-63924000D03*
@@ -423,7 +420,7 @@ X119008000Y-75354000D03*
 X119008000Y-76624000D03*
 X119008000Y-77894000D03*
 X119008000Y-79164000D03*
-D49*
+D50*
 X121793000Y-80164000D03*
 X123063000Y-80164000D03*
 X124333000Y-80164000D03*
@@ -434,7 +431,7 @@ X129413000Y-80164000D03*
 X130683000Y-80164000D03*
 X131953000Y-80164000D03*
 X133223000Y-80164000D03*
-D48*
+D49*
 X136008000Y-79164000D03*
 X136008000Y-77894000D03*
 X136008000Y-76624000D03*
@@ -449,58 +446,63 @@ X136008000Y-66464000D03*
 X136008000Y-65194000D03*
 X136008000Y-63924000D03*
 X136008000Y-62654000D03*
-D50*
+D51*
 X126508000Y-70154000D03*
 %TD*%
-D51*
+D52*
 %TO.C,D2*%
 X136169500Y-82677000D03*
 X134594500Y-82677000D03*
 %TD*%
-D10*
+D33*
 %TO.C,C6*%
 X113566000Y-83693000D03*
 X114526000Y-83693000D03*
 %TD*%
-D34*
+D35*
 %TO.C,R6*%
 X145288000Y-95746000D03*
 X145288000Y-96766000D03*
 %TD*%
+D33*
+%TO.C,C20*%
+X140744000Y-111633000D03*
+X141704000Y-111633000D03*
+%TD*%
 D12*
 %TO.C,R4*%
 X112139000Y-78740000D03*
 X113159000Y-78740000D03*
 %TD*%
-D52*
-%TO.C,U4*%
-X126144000Y-94615000D03*
-X126144000Y-93345000D03*
-X126144000Y-92075000D03*
-X126144000Y-90805000D03*
-X120744000Y-90805000D03*
-X120744000Y-92075000D03*
-X120744000Y-93345000D03*
-X120744000Y-94615000D03*
 D53*
-X123444000Y-92710000D03*
+%TO.C,U4*%
+X123985000Y-96266000D03*
+X123985000Y-94996000D03*
+X123985000Y-93726000D03*
+X123985000Y-92456000D03*
+X118585000Y-92456000D03*
+X118585000Y-93726000D03*
+X118585000Y-94996000D03*
+X118585000Y-96266000D03*
+D54*
+X121285000Y-94361000D03*
 %TD*%
 D26*
 %TO.C,C14*%
 X135001000Y-104620000D03*
 X135001000Y-103660000D03*
 %TD*%
-D33*
+D34*
 %TO.C,C9*%
-X118618000Y-93152000D03*
-X118618000Y-91252000D03*
+X116459000Y-94803000D03*
+X116459000Y-92903000D03*
 %TD*%
 D29*
 %TO.C,C19*%
 X135382000Y-113030000D03*
 X134422000Y-113030000D03*
 %TD*%
-D54*
+D55*
 %TO.C,U1*%
 X106195000Y-92687000D03*
 X108435000Y-92687000D03*
@@ -511,7 +513,7 @@ X106195000Y-90447000D03*
 X107315000Y-91567000D03*
 X106195000Y-91567000D03*
 X108435000Y-90447000D03*
-D55*
+D56*
 X105815000Y-94017000D03*
 X106315000Y-94017000D03*
 X106815000Y-94017000D03*
@@ -519,7 +521,7 @@ X107315000Y-94017000D03*
 X107815000Y-94017000D03*
 X108315000Y-94017000D03*
 X108815000Y-94017000D03*
-D56*
+D57*
 X109765000Y-93067000D03*
 X109765000Y-92567000D03*
 X109765000Y-92067000D03*
@@ -527,7 +529,7 @@ X109765000Y-91567000D03*
 X109765000Y-91067000D03*
 X109765000Y-90567000D03*
 X109765000Y-90067000D03*
-D55*
+D56*
 X108815000Y-89117000D03*
 X108315000Y-89117000D03*
 X107815000Y-89117000D03*
@@ -535,7 +537,7 @@ X107315000Y-89117000D03*
 X106815000Y-89117000D03*
 X106315000Y-89117000D03*
 X105815000Y-89117000D03*
-D56*
+D57*
 X104865000Y-90067000D03*
 X104865000Y-90567000D03*
 X104865000Y-91067000D03*
--- a/gerber/step32-F_Silkscreen.gto
+++ b/gerber/step32-F_Silkscreen.gto
--- a/gerber/step32-In1_Cu.g2
+++ b/gerber/step32-In1_Cu.g2
--- a/gerber/step32-In2_Cu.g3
+++ b/gerber/step32-In2_Cu.g3
--- a/gerber/step32-NPTH-drl_map.gbr
+++ b/gerber/step32-NPTH-drl_map.gbr
@@ -1,6 +1,6 @@
 %FSLAX45Y45*%
 G04 Gerber Fmt 4.5, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 6.0.4-6f826c9f35~116~ubuntu20.04.1) date 2022-03-30 05:15:38*
+G04 Created by KiCad (PCBNEW 6.0.4-6f826c9f35~116~ubuntu20.04.1) date 2022-03-30 11:11:19*
 %MOMM*%
 %LPD*%
 G01*
--- a/gerber/step32-PTH-drl_map.gbr
+++ b/gerber/step32-PTH-drl_map.gbr
@@ -1,6 +1,6 @@
 %FSLAX45Y45*%
 G04 Gerber Fmt 4.5, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 6.0.4-6f826c9f35~116~ubuntu20.04.1) date 2022-03-30 05:15:38*
+G04 Created by KiCad (PCBNEW 6.0.4-6f826c9f35~116~ubuntu20.04.1) date 2022-03-30 11:11:19*
 %MOMM*%
 %LPD*%
 G01*
@@ -64,45 +64,45 @@ X13826000Y-10943100D01*
 X13826000Y-10923100D02*
 X13806000Y-10943100D01*
 D13*
-X12299400Y-9091000D02*
+X12083500Y-9256100D02*
 G75*
 G03*
-X12299400Y-9091000I-15000J0D01*
+X12083500Y-9256100I-15000J0D01*
 G01*
-X12299400Y-9201000D02*
+X12083500Y-9366100D02*
 G75*
 G03*
-X12299400Y-9201000I-15000J0D01*
+X12083500Y-9366100I-15000J0D01*
 G01*
-X12299400Y-9331000D02*
+X12083500Y-9496100D02*
 G75*
 G03*
-X12299400Y-9331000I-15000J0D01*
+X12083500Y-9496100I-15000J0D01*
 G01*
-X12299400Y-9451000D02*
+X12083500Y-9616100D02*
 G75*
 G03*
-X12299400Y-9451000I-15000J0D01*
+X12083500Y-9616100I-15000J0D01*
 G01*
-X12419400Y-9091000D02*
+X12203500Y-9256100D02*
 G75*
 G03*
-X12419400Y-9091000I-15000J0D01*
+X12203500Y-9256100I-15000J0D01*
 G01*
-X12419400Y-9201000D02*
+X12203500Y-9366100D02*
 G75*
 G03*
-X12419400Y-9201000I-15000J0D01*
+X12203500Y-9366100I-15000J0D01*
 G01*
-X12419400Y-9331000D02*
+X12203500Y-9496100D02*
 G75*
 G03*
-X12419400Y-9331000I-15000J0D01*
+X12203500Y-9496100I-15000J0D01*
 G01*
-X12419400Y-9451000D02*
+X12203500Y-9616100D02*
 G75*
 G03*
-X12419400Y-9451000I-15000J0D01*
+X12203500Y-9616100I-15000J0D01*
 G01*
 D14*
 X10147300Y-9568500D02*
@@ -169,10 +169,10 @@ X11099800Y-8463600D02*
 X11099800Y-8503600D01*
 X11079800Y-8483600D02*
 X11119800Y-8483600D01*
-X11201400Y-9517700D02*
-X11201400Y-9557700D01*
-X11181400Y-9537700D02*
-X11221400Y-9537700D01*
+X11192450Y-9512210D02*
+X11192450Y-9552210D01*
+X11172450Y-9532210D02*
+X11212450Y-9532210D01*
 X11239500Y-7193600D02*
 X11239500Y-7233600D01*
 X11219500Y-7213600D02*
@@ -201,6 +201,14 @@ X11455400Y-8260400D02*
 X11455400Y-8300400D01*
 X11435400Y-8280400D02*
 X11475400Y-8280400D01*
+X11493500Y-9162100D02*
+X11493500Y-9202100D01*
+X11473500Y-9182100D02*
+X11513500Y-9182100D01*
+X11493500Y-9276400D02*
+X11493500Y-9316400D01*
+X11473500Y-9296400D02*
+X11513500Y-9296400D01*
 X11497250Y-8788241D02*
 X11497250Y-8828241D01*
 X11477250Y-8808241D02*
@@ -213,6 +221,10 @@ X11544300Y-6520500D02*
 X11544300Y-6560500D01*
 X11524300Y-6540500D02*
 X11564300Y-6540500D01*
+X11569700Y-9085900D02*
+X11569700Y-9125900D01*
+X11549700Y-9105900D02*
+X11589700Y-9105900D01*
 X11595100Y-6164900D02*
 X11595100Y-6204900D01*
 X11575100Y-6184900D02*
@@ -229,18 +241,6 @@ X11645900Y-12146600D02*
 X11645900Y-12186600D01*
 X11625900Y-12166600D02*
 X11665900Y-12166600D01*
-X11709400Y-8997000D02*
-X11709400Y-9037000D01*
-X11689400Y-9017000D02*
-X11729400Y-9017000D01*
-X11709400Y-9111300D02*
-X11709400Y-9151300D01*
-X11689400Y-9131300D02*
-X11729400Y-9131300D01*
-X11785600Y-8920800D02*
-X11785600Y-8960800D01*
-X11765600Y-8940800D02*
-X11805600Y-8940800D01*
 X12045850Y-6901500D02*
 X12045850Y-6941500D01*
 X12025850Y-6921500D02*
@@ -257,10 +257,10 @@ X12090400Y-7663500D02*
 X12090400Y-7703500D01*
 X12070400Y-7683500D02*
 X12110400Y-7683500D01*
-X12179300Y-8171500D02*
-X12179300Y-8211500D01*
-X12159300Y-8191500D02*
-X12199300Y-8191500D01*
+X12170995Y-8154245D02*
+X12170995Y-8194245D01*
+X12150995Y-8174245D02*
+X12190995Y-8174245D01*
 X12230100Y-7727000D02*
 X12230100Y-7767000D01*
 X12210100Y-7747000D02*
@@ -269,6 +269,22 @@ X12236350Y-7615042D02*
 X12236350Y-7655042D01*
 X12216350Y-7635042D02*
 X12256350Y-7635042D01*
+X12280900Y-8489000D02*
+X12280900Y-8529000D01*
+X12260900Y-8509000D02*
+X12300900Y-8509000D01*
+X12293600Y-8374700D02*
+X12293600Y-8414700D01*
+X12273600Y-8394700D02*
+X12313600Y-8394700D01*
+X12309425Y-8619125D02*
+X12309425Y-8659125D01*
+X12289425Y-8639125D02*
+X12329425Y-8639125D01*
+X12344400Y-9111300D02*
+X12344400Y-9151300D01*
+X12324400Y-9131300D02*
+X12364400Y-9131300D01*
 X12446000Y-7765100D02*
 X12446000Y-7805100D01*
 X12426000Y-7785100D02*
@@ -277,22 +293,6 @@ X12479088Y-7633088D02*
 X12479088Y-7673088D01*
 X12459088Y-7653088D02*
 X12499088Y-7653088D01*
-X12686948Y-8654452D02*
-X12686948Y-8694452D01*
-X12666948Y-8674452D02*
-X12706948Y-8674452D01*
-X12687300Y-8438200D02*
-X12687300Y-8478200D01*
-X12667300Y-8458200D02*
-X12707300Y-8458200D01*
-X12692975Y-8558175D02*
-X12692975Y-8598175D01*
-X12672975Y-8578175D02*
-X12712975Y-8578175D01*
-X12712700Y-10292400D02*
-X12712700Y-10332400D01*
-X12692700Y-10312400D02*
-X12732700Y-10312400D01*
 X12768076Y-7744636D02*
 X12768076Y-7784636D01*
 X12748076Y-7764636D02*
@@ -305,34 +305,38 @@ X12842908Y-7819468D02*
 X12842908Y-7859468D01*
 X12822908Y-7839468D02*
 X12862908Y-7839468D01*
+X12852400Y-10470200D02*
+X12852400Y-10510200D01*
+X12832400Y-10490200D02*
+X12872400Y-10490200D01*
 X12853835Y-10848546D02*
 X12853835Y-10888546D01*
 X12833835Y-10868546D02*
 X12873835Y-10868546D01*
+X12858320Y-8254480D02*
+X12858320Y-8294480D01*
+X12838320Y-8274480D02*
+X12878320Y-8274480D01*
 X12861332Y-10963993D02*
 X12861332Y-11003993D01*
 X12841332Y-10983993D02*
 X12881332Y-10983993D01*
-X12966700Y-8209600D02*
-X12966700Y-8249600D01*
-X12946700Y-8229600D02*
-X12986700Y-8229600D01*
+X12865100Y-8362000D02*
+X12865100Y-8402000D01*
+X12845100Y-8382000D02*
+X12885100Y-8382000D01*
+X12865100Y-8476300D02*
+X12865100Y-8516300D01*
+X12845100Y-8496300D02*
+X12885100Y-8496300D01*
 X13001050Y-11295700D02*
 X13001050Y-11335700D01*
 X12981050Y-11315700D02*
 X13021050Y-11315700D01*
-X13068300Y-8209600D02*
-X13068300Y-8249600D01*
-X13048300Y-8229600D02*
-X13088300Y-8229600D01*
 X13075694Y-10345913D02*
 X13075694Y-10385913D01*
 X13055694Y-10365913D02*
 X13095694Y-10365913D01*
-X13169900Y-8209600D02*
-X13169900Y-8249600D01*
-X13149900Y-8229600D02*
-X13189900Y-8229600D01*
 X13220700Y-11003600D02*
 X13220700Y-11043600D01*
 X13200700Y-11023600D02*
@@ -1909,17 +1913,20 @@ X13709762Y-13687286D01*
 X13728809Y-13677762D01*
 X13738333Y-13668238D01*
 X13747857Y-13649190D01*
-X13824048Y-13582524D02*
-X13833571Y-13573000D01*
-X13852619Y-13563476D01*
-X13900238Y-13563476D01*
-X13919286Y-13573000D01*
-X13928809Y-13582524D01*
-X13938333Y-13601571D01*
-X13938333Y-13620619D01*
-X13928809Y-13649190D01*
-X13814524Y-13763476D01*
-X13938333Y-13763476D01*
+X13814524Y-13563476D02*
+X13938333Y-13563476D01*
+X13871667Y-13639667D01*
+X13900238Y-13639667D01*
+X13919286Y-13649190D01*
+X13928809Y-13658714D01*
+X13938333Y-13677762D01*
+X13938333Y-13725381D01*
+X13928809Y-13744428D01*
+X13919286Y-13753952D01*
+X13900238Y-13763476D01*
+X13843095Y-13763476D01*
+X13824048Y-13753952D01*
+X13814524Y-13744428D01*
 X14176428Y-13763476D02*
 X14176428Y-13563476D01*
 X14262143Y-13763476D02*
--- a/gerber/step32-PTH.drl
+++ b/gerber/step32-PTH.drl
@@ -20,14 +20,14 @@ X138.16Y-107.331
 X138.16Y-108.331
 X138.16Y-109.331
 T2
-X122.844Y-90.91
-X122.844Y-92.01
-X122.844Y-93.31
-X122.844Y-94.51
-X124.044Y-90.91
-X124.044Y-92.01
-X124.044Y-93.31
-X124.044Y-94.51
+X120.685Y-92.561
+X120.685Y-93.661
+X120.685Y-94.961
+X120.685Y-96.161
+X121.885Y-92.561
+X121.885Y-93.661
+X121.885Y-94.961
+X121.885Y-96.161
 T3
 X101.473Y-95.885
 X102.235Y-95.885
@@ -45,7 +45,7 @@ X110.109Y-98.171
 X110.871Y-75.946
 X110.871Y-94.361
 X110.998Y-84.836
-X112.014Y-95.377
+X111.924Y-95.322
 X112.395Y-72.136
 X112.522Y-86.614
 X113.03Y-121.666
@@ -53,39 +53,40 @@ X113.356Y-89.141
 X114.3Y-75.311
 X114.305Y-88.826
 X114.554Y-82.804
+X114.935Y-91.821
+X114.935Y-92.964
 X114.972Y-88.082
 X115.189Y-61.849
 X115.443Y-65.405
+X115.697Y-91.059
 X115.951Y-61.849
 X116.205Y-65.405
 X116.332Y-87.376
 X116.459Y-121.666
-X117.094Y-90.17
-X117.094Y-91.313
-X117.856Y-89.408
 X120.459Y-69.215
 X120.459Y-70.231
 X120.56Y-75.819
 X120.904Y-76.835
-X121.793Y-81.915
+X121.71Y-81.742
 X122.301Y-77.47
 X122.363Y-76.35
+X122.809Y-85.09
+X122.936Y-83.947
+X123.094Y-86.391
+X123.444Y-91.313
 X124.46Y-77.851
 X124.791Y-76.531
-X126.869Y-86.745
-X126.873Y-84.582
-X126.93Y-85.782
-X127.127Y-103.124
 X127.681Y-77.646
 X128.397Y-107.696
 X128.429Y-78.395
+X128.524Y-104.902
 X128.538Y-108.685
+X128.583Y-82.745
 X128.613Y-109.84
-X129.667Y-82.296
+X128.651Y-83.82
+X128.651Y-84.963
 X130.011Y-113.157
-X130.683Y-82.296
 X130.757Y-103.659
-X131.699Y-82.296
 X132.207Y-110.236
 X132.533Y-76.042
 X132.588Y-105.918
--- a/gerber/step32-job.gbrjob
+++ b/gerber/step32-job.gbrjob
@@ -5,7 +5,7 @@
      "Application": "Pcbnew",
      "Version": "6.0.4-6f826c9f35~116~ubuntu20.04.1"
    },
-    "CreationDate": "2022-03-30T05:15:32+01:00"
+    "CreationDate": "2022-03-30T11:11:12+01:00"
  },
  "GeneralSpecs": {
    "ProjectId": {
@@ -25,8 +25,8 @@
  "DesignRules": [
    {
      "Layers": "Outer",
-      "PadToPad": 0.2,
-      "PadToTrack": 0.2,
+      "PadToPad": 0.1,
+      "PadToTrack": 0.1,
      "TrackToTrack": 0.2,
      "MinLineWidth": 0.2,
      "TrackToRegion": 0.508,