Replace flash mem package, regen release

2022-08-12 00:18:28 +02:00 · 2022-08-12 00:18:28 +02:00 · 6c7fab313a
commit 6c7fab313a
parent 6eb980bdc1
24 changed files with 72168 additions and 66067 deletions
--- a/Kicad/MainBoard/CM4+NAS.pretty/C_POL_0402_1005Metric.kicad_mod
+++ b/Kicad/MainBoard/CM4+NAS.pretty/C_POL_0402_1005Metric.kicad_mod
@ -0,0 +1,37 @@
+(footprint "C_POL_0402_1005Metric" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5F68FEEE)
+  (descr "Capacitor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+  (tags "capacitor")
+  (attr smd)
+  (fp_text reference "REF**" (at 0 -1.905) (layer "F.SilkS")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 3f001d39-98c9-450a-a6f0-b7475527fbd7)
+  )
+  (fp_text value "C_POL_0402_1005Metric" (at 0 1.16) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 7ef18d46-39df-486f-9543-b00228cf866a)
+  )
+  (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab")
+    (effects (font (size 0.25 0.25) (thickness 0.04)))
+    (tstamp 5d9a85df-c718-4dd6-9c1c-7cf078103b70)
+  )
+  (fp_line (start -1.016 -0.36) (end -1.016 0.36) (layer "F.SilkS") (width 0.12) (tstamp 104468a8-4a3f-491b-bb8d-fe1d3a4c51a9))
+  (fp_line (start -1.016 0.36) (end 0 0.36) (layer "F.SilkS") (width 0.12) (tstamp 45c77330-acfb-4107-a599-c9df3e175000))
+  (fp_line (start -1.016 -0.36) (end 0 -0.36) (layer "F.SilkS") (width 0.12) (tstamp 5cd5b77f-bdc3-47d5-b253-f5c1244d375e))
+  (fp_line (start -0.91 0.46) (end -0.91 -0.46) (layer "F.CrtYd") (width 0.05) (tstamp 0f646a94-faea-4a50-8b80-909d26d6d7a0))
+  (fp_line (start 0.91 -0.46) (end 0.91 0.46) (layer "F.CrtYd") (width 0.05) (tstamp 40007d5f-c471-4d2b-87f0-dfa1629069fb))
+  (fp_line (start 0.91 0.46) (end -0.91 0.46) (layer "F.CrtYd") (width 0.05) (tstamp 6897dba4-f95f-426a-ae14-d4aed1cd887f))
+  (fp_line (start -0.91 -0.46) (end 0.91 -0.46) (layer "F.CrtYd") (width 0.05) (tstamp 6aa26098-9339-4279-9a36-893fdd4c6950))
+  (fp_line (start -0.5 -0.25) (end 0.5 -0.25) (layer "F.Fab") (width 0.1) (tstamp 3b194c04-55c2-4668-b84d-8f5aacd704a2))
+  (fp_line (start 0.5 -0.25) (end 0.5 0.25) (layer "F.Fab") (width 0.1) (tstamp 3c7e7f28-d67d-4e18-8c13-2a82b2c60f01))
+  (fp_line (start 0.5 0.25) (end -0.5 0.25) (layer "F.Fab") (width 0.1) (tstamp 8a7cad66-4840-4328-b7bf-cbbc635c7362))
+  (fp_line (start -0.5 0.25) (end -0.5 -0.25) (layer "F.Fab") (width 0.1) (tstamp fe53c845-ac3c-48e4-9f37-36da777bc994))
+  (pad "1" smd roundrect (at -0.48 0) (size 0.56 0.62) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp f0d6bdbe-8dea-4984-9c52-f76168ceed26))
+  (pad "2" smd roundrect (at 0.48 0) (size 0.56 0.62) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 07bccb1b-781c-4561-a379-63c349828818))
+  (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
+    (offset (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)
--- a/Kicad/MainBoard/CM4.kicad_sch
+++ b/Kicad/MainBoard/CM4.kicad_sch
@ -2169,7 +2169,7 @@
    (in_bom yes) (on_board yes)
    (uuid 02dddb1d-db56-4aea-8497-0fcad96a9877)
    (property "Reference" "R9" (id 0) (at 127 152.4 90))
-    (property "Value" "5.1k" (id 1) (at 127 149.86 90))
+    (property "Value" "1k" (id 1) (at 127 149.86 90))
    (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 127 151.638 90)
      (effects (font (size 1.27 1.27)) hide)
    )
@ -2179,7 +2179,7 @@
    (property "MFR" "Yageo" (id 4) (at 127 149.86 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "RC0402FR-135K1L" (id 5) (at 127 149.86 0)
+    (property "MPN" "AC0402FR-071KL" (id 5) (at 127 149.86 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 1a4d3676-660d-4393-9ded-784623c63b93))
@ -2222,7 +2222,7 @@
    (in_bom yes) (on_board yes)
    (uuid 31df3ba5-45c3-4a37-a752-40860eba9e22)
    (property "Reference" "R27" (id 0) (at 128.27 58.42 90))
-    (property "Value" "5.1k" (id 1) (at 128.27 55.88 90))
+    (property "Value" "1k" (id 1) (at 128.27 55.88 90))
    (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 128.27 57.658 90)
      (effects (font (size 1.27 1.27)) hide)
    )
@ -2232,7 +2232,7 @@
    (property "MFR" "Yageo" (id 4) (at 128.27 55.88 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "RC0402FR-135K1L" (id 5) (at 128.27 55.88 0)
+    (property "MPN" "AC0402FR-071KL" (id 5) (at 128.27 55.88 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid c73dbc36-8aa3-4e5c-82f4-660c39434f25))
--- a/Kicad/MainBoard/Ethernet_USB.kicad_sch
+++ b/Kicad/MainBoard/Ethernet_USB.kicad_sch
@ -2090,8 +2090,8 @@
    (pin "7" (uuid 12bde0ee-1ca6-43f0-a533-1821ed80e39e))
    (pin "8" (uuid 93e6e377-92c1-489b-91ec-7bf563c683df))
    (pin "9" (uuid da8b5087-9279-4791-8310-7bf7a806015a))
-    (pin "sh" (uuid 756d6b32-146c-4e72-8303-453ee4d5c92a))
-    (pin "sh" (uuid 756d6b32-146c-4e72-8303-453ee4d5c92a))
+    (pin "sh" (uuid 756d6b32-146c-4e72-8303-453ee4d5c92b))
+    (pin "sh" (uuid 756d6b32-146c-4e72-8303-453ee4d5c92b))
  )

  (symbol (lib_id "power:GND") (at 119.38 99.06 0) (unit 1)
--- a/Kicad/MainBoard/Gerber/MainBoard-B_Cu.gbr
+++ b/Kicad/MainBoard/Gerber/MainBoard-B_Cu.gbr
--- a/Kicad/MainBoard/Gerber/MainBoard-B_Mask.gbr
+++ b/Kicad/MainBoard/Gerber/MainBoard-B_Mask.gbr
@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,(5.99.0-8910-g624a231cc0)*%
-%TF.CreationDate,2021-03-02T10:35:16+01:00*%
+%TF.GenerationSoftware,KiCad,Pcbnew,(6.0.4)*%
+%TF.CreationDate,2022-08-11T23:06:16+02:00*%
 %TF.ProjectId,MainBoard,4d61696e-426f-4617-9264-2e6b69636164,rev?*%
 %TF.SameCoordinates,PXa344e00PY7102aa0*%
 %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 (5.99.0-8910-g624a231cc0)) date 2021-03-02 10:35:16*
+G04 Created by KiCad (PCBNEW (6.0.4)) date 2022-08-11 23:06:16*
 %MOMM*%
 %LPD*%
 G01*
@ -46,29 +46,29 @@ G04 Aperture macros list end*
 %ADD16C,1.800000*%
 %ADD17C,2.500000*%
 %ADD18C,6.100000*%
-%ADD19C,0.600000*%
-%ADD20O,0.850000X0.600000*%
-%ADD21O,1.700000X1.200000*%
-%ADD22O,1.350000X0.950000*%
-%ADD23R,6.000000X9.500000*%
-%ADD24RoundRect,0.135000X-0.185000X0.135000X-0.185000X-0.135000X0.185000X-0.135000X0.185000X0.135000X0*%
-%ADD25RoundRect,0.218750X0.256250X-0.218750X0.256250X0.218750X-0.256250X0.218750X-0.256250X-0.218750X0*%
-%ADD26RoundRect,0.218750X0.218750X0.256250X-0.218750X0.256250X-0.218750X-0.256250X0.218750X-0.256250X0*%
-%ADD27R,0.300000X0.550000*%
-%ADD28R,0.400000X0.550000*%
-%ADD29RoundRect,0.140000X0.140000X0.170000X-0.140000X0.170000X-0.140000X-0.170000X0.140000X-0.170000X0*%
+%ADD19C,0.650000*%
+%ADD20O,1.100000X1.600000*%
+%ADD21O,1.600000X1.100000*%
+%ADD22R,6.000000X9.500000*%
+%ADD23RoundRect,0.135000X-0.185000X0.135000X-0.185000X-0.135000X0.185000X-0.135000X0.185000X0.135000X0*%
+%ADD24RoundRect,0.147500X0.172500X-0.147500X0.172500X0.147500X-0.172500X0.147500X-0.172500X-0.147500X0*%
+%ADD25RoundRect,0.147500X0.147500X0.172500X-0.147500X0.172500X-0.147500X-0.172500X0.147500X-0.172500X0*%
+%ADD26R,0.300000X0.550000*%
+%ADD27R,0.400000X0.550000*%
+%ADD28RoundRect,0.140000X0.140000X0.170000X-0.140000X0.170000X-0.140000X-0.170000X0.140000X-0.170000X0*%
+%ADD29RoundRect,0.135000X0.185000X-0.135000X0.185000X0.135000X-0.185000X0.135000X-0.185000X-0.135000X0*%
 %ADD30C,2.100000*%
 %ADD31R,3.800000X0.600000*%
 %ADD32Outline4P,-1.050000X-1.100000X1.050000X-1.100000X1.050000X1.100000X-1.050000X1.100000X90.000000*%
 %ADD33RoundRect,0.250000X-0.475000X0.250000X-0.475000X-0.250000X0.475000X-0.250000X0.475000X0.250000X0*%
 %ADD34RoundRect,0.250000X-0.250000X-0.475000X0.250000X-0.475000X0.250000X0.475000X-0.250000X0.475000X0*%
 %ADD35RoundRect,0.140000X-0.140000X-0.170000X0.140000X-0.170000X0.140000X0.170000X-0.140000X0.170000X0*%
-%ADD36RoundRect,0.135000X0.185000X-0.135000X0.185000X0.135000X-0.185000X0.135000X-0.185000X-0.135000X0*%
+%ADD36RoundRect,0.218750X0.256250X-0.218750X0.256250X0.218750X-0.256250X0.218750X-0.256250X-0.218750X0*%
 %ADD37RoundRect,0.135000X0.135000X0.185000X-0.135000X0.185000X-0.135000X-0.185000X0.135000X-0.185000X0*%
-%ADD38RoundRect,0.140000X0.170000X-0.140000X0.170000X0.140000X-0.170000X0.140000X-0.170000X-0.140000X0*%
-%ADD39RoundRect,0.218750X-0.256250X0.218750X-0.256250X-0.218750X0.256250X-0.218750X0.256250X0.218750X0*%
-%ADD40RoundRect,0.140000X-0.170000X0.140000X-0.170000X-0.140000X0.170000X-0.140000X0.170000X0.140000X0*%
-%ADD41R,2.350000X5.100000*%
+%ADD38RoundRect,0.147500X-0.172500X0.147500X-0.172500X-0.147500X0.172500X-0.147500X0.172500X0.147500X0*%
+%ADD39RoundRect,0.140000X-0.170000X0.140000X-0.170000X-0.140000X0.170000X-0.140000X0.170000X0.140000X0*%
+%ADD40R,2.350000X5.100000*%
+%ADD41RoundRect,0.140000X0.170000X-0.140000X0.170000X0.140000X-0.170000X0.140000X-0.170000X-0.140000X0*%
 %ADD42R,3.400000X2.710000*%
 %ADD43RoundRect,0.150000X-0.150000X0.737500X-0.150000X-0.737500X0.150000X-0.737500X0.150000X0.737500X0*%
 G04 APERTURE END LIST*
@ -121,61 +121,61 @@ X3580000Y66490000D03*
 %TD*%
 D19*
 %TO.C,J1*%
-X5200000Y7150000D03*
+X12575000Y4000000D03*
+X4825000Y4000000D03*
 D20*
-X12200000Y7150000D03*
+X4380000Y5800000D03*
+X13020000Y5800000D03*
 D21*
-X12800000Y8870000D03*
-X4600000Y2730000D03*
-D22*
-X4925000Y5800000D03*
-D21*
-X4600000Y8870000D03*
-X12800000Y2730000D03*
-D22*
-X12475000Y5800000D03*
+X6400000Y4370000D03*
+X11000000Y4370000D03*
 %TD*%
-D23*
+D22*
 %TO.C,U4*%
 X28150000Y50660000D03*
 %TD*%
-D24*
+D23*
 %TO.C,R8*%
 X38300000Y66010000D03*
 X38300000Y64990000D03*
 %TD*%
-D25*
+D24*
 %TO.C,FB3*%
-X42800000Y47212500D03*
-X42800000Y48787500D03*
+X42800000Y47515000D03*
+X42800000Y48485000D03*
+%TD*%
+D25*
+%TO.C,FB2*%
+X41385000Y51400000D03*
+X40415000Y51400000D03*
 %TD*%
 D26*
-%TO.C,FB2*%
-X41687500Y51400000D03*
-X40112500Y51400000D03*
-%TD*%
-D27*
 %TO.C,U1*%
 X42670000Y18955000D03*
 X42170000Y18955000D03*
-D28*
-X41670000Y18955000D03*
 D27*
+X41670000Y18955000D03*
+D26*
 X41170000Y18955000D03*
 X40670000Y18955000D03*
 X40670000Y19725000D03*
 X41170000Y19725000D03*
-D28*
-X41670000Y19725000D03*
 D27*
+X41670000Y19725000D03*
+D26*
 X42170000Y19725000D03*
 X42670000Y19725000D03*
 %TD*%
-D29*
+D28*
 %TO.C,C41*%
 X26280000Y57600000D03*
 X25320000Y57600000D03*
 %TD*%
+D29*
+%TO.C,R27*%
+X30050000Y64940000D03*
+X30050000Y65960000D03*
+%TD*%
 D30*
 %TO.C,J2*%
 X46550000Y58130000D03*
@ -207,12 +207,12 @@ D32*
 X46850000Y61080000D03*
 X46850000Y18380000D03*
 %TD*%
-D29*
+D28*
 %TO.C,C1*%
 X43700000Y11000000D03*
 X42740000Y11000000D03*
 %TD*%
-D24*
+D23*
 %TO.C,R6*%
 X44300000Y66010000D03*
 X44300000Y64990000D03*
@ -227,7 +227,7 @@ D34*
 X1120000Y12600000D03*
 X3020000Y12600000D03*
 %TD*%
-D29*
+D28*
 %TO.C,C18*%
 X42650000Y30020000D03*
 X41690000Y30020000D03*
@ -241,12 +241,12 @@ X12650000Y29100000D03*
 X11690000Y26200000D03*
 X12650000Y26200000D03*
 %TD*%
-D36*
+D29*
 %TO.C,R21*%
 X15300000Y9290000D03*
 X15300000Y10310000D03*
 %TD*%
-D29*
+D28*
 %TO.C,C56*%
 X27980000Y44900000D03*
 X27020000Y44900000D03*
@ -256,27 +256,21 @@ D35*
 X24790000Y29100000D03*
 X25750000Y29100000D03*
 %TD*%
-D29*
-%TO.C,C80*%
-X17250000Y10280000D03*
-X16290000Y10280000D03*
-%TD*%
-D35*
 %TO.C,C20*%
 X24790000Y30080000D03*
 X25750000Y30080000D03*
 %TD*%
-D25*
+D24*
 %TO.C,FB6*%
-X28400000Y41112500D03*
-X28400000Y42687500D03*
+X28400000Y41415000D03*
+X28400000Y42385000D03*
 %TD*%
 D35*
 %TO.C,C8*%
 X37748000Y26234000D03*
 X38708000Y26234000D03*
 %TD*%
-D25*
+D36*
 %TO.C,D1*%
 X47300000Y67212500D03*
 X47300000Y68787500D03*
@ -300,30 +294,25 @@ X15312000Y8326000D03*
 %TD*%
 D37*
 %TO.C,R22*%
-X17280000Y9280000D03*
-X16260000Y9280000D03*
+X17285000Y10250000D03*
+X16265000Y10250000D03*
 %TD*%
 D35*
 %TO.C,C48*%
 X25120000Y42900000D03*
 X26080000Y42900000D03*
 %TD*%
-D24*
+D23*
 %TO.C,R5*%
 X47300000Y66010000D03*
 X47300000Y64990000D03*
 %TD*%
-D38*
-%TO.C,C74*%
-X14300000Y9320000D03*
-X14300000Y10280000D03*
-%TD*%
-D26*
+D25*
 %TO.C,FB7*%
-X26687500Y40600000D03*
-X25112500Y40600000D03*
+X26385000Y40600000D03*
+X25415000Y40600000D03*
 %TD*%
-D24*
+D23*
 %TO.C,R23*%
 X17440000Y12220000D03*
 X17440000Y11200000D03*
@ -333,27 +322,32 @@ D35*
 X37728000Y25218000D03*
 X38688000Y25218000D03*
 %TD*%
-D39*
+D38*
 %TO.C,FB5*%
-X26800000Y61387500D03*
-X26800000Y59812500D03*
+X26800000Y61085000D03*
+X26800000Y60115000D03*
 %TD*%
-D40*
+D39*
 %TO.C,C66*%
 X11000000Y15960000D03*
 X11000000Y15000000D03*
 %TD*%
-D24*
+D23*
 %TO.C,R20*%
 X11000000Y13990000D03*
 X11000000Y12970000D03*
 %TD*%
+D36*
+%TO.C,D11*%
+X27500000Y67212500D03*
+X27500000Y68787500D03*
+%TD*%
 D35*
 %TO.C,C59*%
 X25120000Y41900000D03*
 X26080000Y41900000D03*
 %TD*%
-D41*
+D40*
 %TO.C,L1*%
 X9175000Y13200000D03*
 X5025000Y13200000D03*
@ -363,7 +357,7 @@ D35*
 X11690000Y25200000D03*
 X12650000Y25200000D03*
 %TD*%
-D40*
+D39*
 %TO.C,C34*%
 X40300000Y48980000D03*
 X40300000Y48020000D03*
@ -376,7 +370,7 @@ X41300000Y48020000D03*
 X38900000Y50980000D03*
 X38900000Y50020000D03*
 %TD*%
-D25*
+D36*
 %TO.C,D3*%
 X41170000Y67212500D03*
 X41170000Y68787500D03*
@ -386,7 +380,7 @@ D34*
 X1120000Y14600000D03*
 X3020000Y14600000D03*
 %TD*%
-D25*
+D36*
 %TO.C,D4*%
 X38300000Y67212500D03*
 X38300000Y68787500D03*
@ -400,7 +394,7 @@ X25750000Y26180000D03*
 X25120000Y43900000D03*
 X26080000Y43900000D03*
 %TD*%
-D29*
+D28*
 %TO.C,C14*%
 X42650000Y29000000D03*
 X41690000Y29000000D03*
@ -436,20 +430,20 @@ D32*
 X33850000Y18370000D03*
 X33850000Y61070000D03*
 %TD*%
-D27*
+D26*
 %TO.C,U2*%
 X39620000Y18915000D03*
 X39120000Y18915000D03*
-D28*
-X38620000Y18915000D03*
 D27*
+X38620000Y18915000D03*
+D26*
 X38120000Y18915000D03*
 X37620000Y18915000D03*
 X37620000Y19685000D03*
 X38120000Y19685000D03*
-D28*
-X38620000Y19685000D03*
 D27*
+X38620000Y19685000D03*
+D26*
 X39120000Y19685000D03*
 X39620000Y19685000D03*
 %TD*%
@ -458,7 +452,7 @@ D35*
 X28920000Y44900000D03*
 X29880000Y44900000D03*
 %TD*%
-D38*
+D41*
 %TO.C,C19*%
 X37770000Y30920000D03*
 X37770000Y31880000D03*
@ -468,12 +462,12 @@ D35*
 X27220000Y58600000D03*
 X28180000Y58600000D03*
 %TD*%
-D40*
+D39*
 %TO.C,C29*%
 X38300000Y48980000D03*
 X38300000Y48020000D03*
 %TD*%
-D29*
+D28*
 %TO.C,C7*%
 X42650000Y26280000D03*
 X41690000Y26280000D03*
@ -482,6 +476,11 @@ X41690000Y26280000D03*
 X27980000Y43900000D03*
 X27020000Y43900000D03*
 %TD*%
+D36*
+%TO.C,D12*%
+X30050000Y67212500D03*
+X30050000Y68787500D03*
+%TD*%
 D42*
 %TO.C,U7*%
 X14250000Y14480000D03*
@ -495,7 +494,7 @@ X14885000Y11917500D03*
 X13615000Y11917500D03*
 X12345000Y11917500D03*
 %TD*%
-D38*
+D41*
 %TO.C,C28*%
 X37900000Y51920000D03*
 X37900000Y52880000D03*
@ -541,7 +540,7 @@ D32*
 X20850000Y61080000D03*
 X20850000Y18380000D03*
 %TD*%
-D38*
+D41*
 %TO.C,C15*%
 X38770000Y30920000D03*
 X38770000Y31880000D03*
@ -555,7 +554,7 @@ X28180000Y57600000D03*
 X28920000Y43900000D03*
 X29880000Y43900000D03*
 %TD*%
-D29*
+D28*
 %TO.C,C3*%
 X42650000Y25300000D03*
 X41690000Y25300000D03*
@ -565,22 +564,22 @@ D35*
 X25120000Y44900000D03*
 X26080000Y44900000D03*
 %TD*%
-D24*
+D23*
 %TO.C,R7*%
 X41170000Y66010000D03*
 X41170000Y64990000D03*
 %TD*%
-D38*
+D41*
 %TO.C,C69*%
 X17500000Y16250000D03*
 X17500000Y17210000D03*
 %TD*%
-D29*
+D28*
 %TO.C,C36*%
 X26280000Y58600000D03*
 X25320000Y58600000D03*
 %TD*%
-D40*
+D39*
 %TO.C,C33*%
 X37900000Y50980000D03*
 X37900000Y50020000D03*
@ -590,6 +589,11 @@ D34*
 X1120000Y10600000D03*
 X3020000Y10600000D03*
 %TD*%
+D29*
+%TO.C,R9*%
+X27500000Y65040000D03*
+X27500000Y66060000D03*
+%TD*%
 D30*
 %TO.C,J5*%
 X7540000Y21330000D03*
@ -621,12 +625,12 @@ D32*
 X7840000Y18380000D03*
 X7840000Y61080000D03*
 %TD*%
-D40*
+D39*
 %TO.C,C24*%
 X39300000Y48980000D03*
 X39300000Y48020000D03*
 %TD*%
-D38*
+D41*
 %TO.C,C23*%
 X38900000Y51920000D03*
 X38900000Y52880000D03*
--- a/Kicad/MainBoard/Gerber/MainBoard-B_Paste.gbr
+++ b/Kicad/MainBoard/Gerber/MainBoard-B_Paste.gbr
@ -0,0 +1,553 @@
+%TF.GenerationSoftware,KiCad,Pcbnew,(6.0.4)*%
+%TF.CreationDate,2022-08-11T23:06:16+02:00*%
+%TF.ProjectId,MainBoard,4d61696e-426f-4617-9264-2e6b69636164,rev?*%
+%TF.SameCoordinates,PXa344e00PY7102aa0*%
+%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)) date 2022-08-11 23:06:16*
+%MOMM*%
+%LPD*%
+G01*
+G04 APERTURE LIST*
+G04 Aperture macros list*
+%AMRoundRect*
+0 Rectangle with rounded corners*
+0 $1 Rounding radius*
+0 $2 $3 $4 $5 $6 $7 $8 $9 X,Y pos of 4 corners*
+0 Add a 4 corners polygon primitive as box body*
+4,1,4,$2,$3,$4,$5,$6,$7,$8,$9,$2,$3,0*
+0 Add four circle primitives for the rounded corners*
+1,1,$1+$1,$2,$3*
+1,1,$1+$1,$4,$5*
+1,1,$1+$1,$6,$7*
+1,1,$1+$1,$8,$9*
+0 Add four rect primitives between the rounded corners*
+20,1,$1+$1,$2,$3,$4,$5,0*
+20,1,$1+$1,$4,$5,$6,$7,0*
+20,1,$1+$1,$6,$7,$8,$9,0*
+20,1,$1+$1,$8,$9,$2,$3,0*%
+%AMOutline4P*
+0 Free polygon, 4 corners , with rotation*
+0 The origin of the aperture is its center*
+0 number of corners: always 4*
+0 $1 to $8 corner X, Y*
+0 $9 Rotation angle, in degrees counterclockwise*
+0 create outline with 4 corners*
+4,1,4,$1,$2,$3,$4,$5,$6,$7,$8,$1,$2,$9*%
+G04 Aperture macros list end*
+%ADD10RoundRect,0.135000X-0.185000X0.135000X-0.185000X-0.135000X0.185000X-0.135000X0.185000X0.135000X0*%
+%ADD11RoundRect,0.147500X0.172500X-0.147500X0.172500X0.147500X-0.172500X0.147500X-0.172500X-0.147500X0*%
+%ADD12RoundRect,0.147500X0.147500X0.172500X-0.147500X0.172500X-0.147500X-0.172500X0.147500X-0.172500X0*%
+%ADD13R,0.300000X0.550000*%
+%ADD14R,0.400000X0.550000*%
+%ADD15RoundRect,0.140000X0.140000X0.170000X-0.140000X0.170000X-0.140000X-0.170000X0.140000X-0.170000X0*%
+%ADD16RoundRect,0.135000X0.185000X-0.135000X0.185000X0.135000X-0.185000X0.135000X-0.185000X-0.135000X0*%
+%ADD17R,3.800000X0.600000*%
+%ADD18Outline4P,-1.050000X-1.100000X1.050000X-1.100000X1.050000X1.100000X-1.050000X1.100000X90.000000*%
+%ADD19RoundRect,0.250000X-0.475000X0.250000X-0.475000X-0.250000X0.475000X-0.250000X0.475000X0.250000X0*%
+%ADD20RoundRect,0.250000X-0.250000X-0.475000X0.250000X-0.475000X0.250000X0.475000X-0.250000X0.475000X0*%
+%ADD21RoundRect,0.140000X-0.140000X-0.170000X0.140000X-0.170000X0.140000X0.170000X-0.140000X0.170000X0*%
+%ADD22RoundRect,0.218750X0.256250X-0.218750X0.256250X0.218750X-0.256250X0.218750X-0.256250X-0.218750X0*%
+%ADD23RoundRect,0.135000X0.135000X0.185000X-0.135000X0.185000X-0.135000X-0.185000X0.135000X-0.185000X0*%
+%ADD24RoundRect,0.147500X-0.172500X0.147500X-0.172500X-0.147500X0.172500X-0.147500X0.172500X0.147500X0*%
+%ADD25RoundRect,0.140000X-0.170000X0.140000X-0.170000X-0.140000X0.170000X-0.140000X0.170000X0.140000X0*%
+%ADD26R,2.350000X5.100000*%
+%ADD27RoundRect,0.140000X0.170000X-0.140000X0.170000X0.140000X-0.170000X0.140000X-0.170000X-0.140000X0*%
+%ADD28RoundRect,0.250000X-0.460000X0.315000X-0.460000X-0.315000X0.460000X-0.315000X0.460000X0.315000X0*%
+%ADD29RoundRect,0.150000X-0.150000X0.737500X-0.150000X-0.737500X0.150000X-0.737500X0.150000X0.737500X0*%
+G04 APERTURE END LIST*
+D10*
+%TO.C,R8*%
+X38300000Y66010000D03*
+X38300000Y64990000D03*
+%TD*%
+D11*
+%TO.C,FB3*%
+X42800000Y47515000D03*
+X42800000Y48485000D03*
+%TD*%
+D12*
+%TO.C,FB2*%
+X41385000Y51400000D03*
+X40415000Y51400000D03*
+%TD*%
+D13*
+%TO.C,U1*%
+X42670000Y18955000D03*
+X42170000Y18955000D03*
+D14*
+X41670000Y18955000D03*
+D13*
+X41170000Y18955000D03*
+X40670000Y18955000D03*
+X40670000Y19725000D03*
+X41170000Y19725000D03*
+D14*
+X41670000Y19725000D03*
+D13*
+X42170000Y19725000D03*
+X42670000Y19725000D03*
+%TD*%
+D15*
+%TO.C,C41*%
+X26280000Y57600000D03*
+X25320000Y57600000D03*
+%TD*%
+D16*
+%TO.C,R27*%
+X30050000Y64940000D03*
+X30050000Y65960000D03*
+%TD*%
+D17*
+%TO.C,J2*%
+X47700000Y23855000D03*
+X47700000Y25125000D03*
+X47700000Y26395000D03*
+X47700000Y27665000D03*
+X47700000Y28935000D03*
+X47700000Y30205000D03*
+X47700000Y31475000D03*
+X47700000Y37825000D03*
+X47700000Y39095000D03*
+X47700000Y40365000D03*
+X47700000Y41635000D03*
+X47700000Y42905000D03*
+X47700000Y44175000D03*
+X47700000Y45445000D03*
+X47700000Y46715000D03*
+X47700000Y47985000D03*
+X47700000Y49255000D03*
+X47700000Y50525000D03*
+X47700000Y51795000D03*
+X47700000Y53065000D03*
+X47700000Y54335000D03*
+X47700000Y55605000D03*
+D18*
+X46850000Y61080000D03*
+X46850000Y18380000D03*
+%TD*%
+D15*
+%TO.C,C1*%
+X43700000Y11000000D03*
+X42740000Y11000000D03*
+%TD*%
+D10*
+%TO.C,R6*%
+X44300000Y66010000D03*
+X44300000Y64990000D03*
+%TD*%
+D19*
+%TO.C,C75*%
+X13870000Y21450000D03*
+X13870000Y19550000D03*
+%TD*%
+D20*
+%TO.C,C76*%
+X1120000Y12600000D03*
+X3020000Y12600000D03*
+%TD*%
+D15*
+%TO.C,C18*%
+X42650000Y30020000D03*
+X41690000Y30020000D03*
+%TD*%
+D21*
+%TO.C,C17*%
+X11690000Y29100000D03*
+X12650000Y29100000D03*
+%TD*%
+%TO.C,C10*%
+X11690000Y26200000D03*
+X12650000Y26200000D03*
+%TD*%
+D16*
+%TO.C,R21*%
+X15300000Y9290000D03*
+X15300000Y10310000D03*
+%TD*%
+D15*
+%TO.C,C56*%
+X27980000Y44900000D03*
+X27020000Y44900000D03*
+%TD*%
+D21*
+%TO.C,C16*%
+X24790000Y29100000D03*
+X25750000Y29100000D03*
+%TD*%
+%TO.C,C20*%
+X24790000Y30080000D03*
+X25750000Y30080000D03*
+%TD*%
+D11*
+%TO.C,FB6*%
+X28400000Y41415000D03*
+X28400000Y42385000D03*
+%TD*%
+D21*
+%TO.C,C8*%
+X37748000Y26234000D03*
+X38708000Y26234000D03*
+%TD*%
+D22*
+%TO.C,D1*%
+X47300000Y67212500D03*
+X47300000Y68787500D03*
+%TD*%
+%TO.C,D2*%
+X44300000Y67212500D03*
+X44300000Y68787500D03*
+%TD*%
+D21*
+%TO.C,C21*%
+X11690000Y30080000D03*
+X12650000Y30080000D03*
+%TD*%
+%TO.C,C5*%
+X24790000Y25200000D03*
+X25750000Y25200000D03*
+%TD*%
+%TO.C,C77*%
+X14352000Y8326000D03*
+X15312000Y8326000D03*
+%TD*%
+D23*
+%TO.C,R22*%
+X17285000Y10250000D03*
+X16265000Y10250000D03*
+%TD*%
+D21*
+%TO.C,C48*%
+X25120000Y42900000D03*
+X26080000Y42900000D03*
+%TD*%
+D10*
+%TO.C,R5*%
+X47300000Y66010000D03*
+X47300000Y64990000D03*
+%TD*%
+D12*
+%TO.C,FB7*%
+X26385000Y40600000D03*
+X25415000Y40600000D03*
+%TD*%
+D10*
+%TO.C,R23*%
+X17440000Y12220000D03*
+X17440000Y11200000D03*
+%TD*%
+D21*
+%TO.C,C4*%
+X37728000Y25218000D03*
+X38688000Y25218000D03*
+%TD*%
+D24*
+%TO.C,FB5*%
+X26800000Y61085000D03*
+X26800000Y60115000D03*
+%TD*%
+D25*
+%TO.C,C66*%
+X11000000Y15960000D03*
+X11000000Y15000000D03*
+%TD*%
+D10*
+%TO.C,R20*%
+X11000000Y13990000D03*
+X11000000Y12970000D03*
+%TD*%
+D22*
+%TO.C,D11*%
+X27500000Y67212500D03*
+X27500000Y68787500D03*
+%TD*%
+D21*
+%TO.C,C59*%
+X25120000Y41900000D03*
+X26080000Y41900000D03*
+%TD*%
+D26*
+%TO.C,L1*%
+X9175000Y13200000D03*
+X5025000Y13200000D03*
+%TD*%
+D21*
+%TO.C,C6*%
+X11690000Y25200000D03*
+X12650000Y25200000D03*
+%TD*%
+D25*
+%TO.C,C34*%
+X40300000Y48980000D03*
+X40300000Y48020000D03*
+%TD*%
+%TO.C,C39*%
+X41300000Y48980000D03*
+X41300000Y48020000D03*
+%TD*%
+%TO.C,C38*%
+X38900000Y50980000D03*
+X38900000Y50020000D03*
+%TD*%
+D22*
+%TO.C,D3*%
+X41170000Y67212500D03*
+X41170000Y68787500D03*
+%TD*%
+D20*
+%TO.C,C71*%
+X1120000Y14600000D03*
+X3020000Y14600000D03*
+%TD*%
+D22*
+%TO.C,D4*%
+X38300000Y67212500D03*
+X38300000Y68787500D03*
+%TD*%
+D21*
+%TO.C,C9*%
+X24790000Y26180000D03*
+X25750000Y26180000D03*
+%TD*%
+%TO.C,C57*%
+X25120000Y43900000D03*
+X26080000Y43900000D03*
+%TD*%
+D15*
+%TO.C,C14*%
+X42650000Y29000000D03*
+X41690000Y29000000D03*
+%TD*%
+D17*
+%TO.C,J3*%
+X34700000Y23845000D03*
+X34700000Y25115000D03*
+X34700000Y26385000D03*
+X34700000Y27655000D03*
+X34700000Y28925000D03*
+X34700000Y30195000D03*
+X34700000Y31465000D03*
+X34700000Y37815000D03*
+X34700000Y39085000D03*
+X34700000Y40355000D03*
+X34700000Y41625000D03*
+X34700000Y42895000D03*
+X34700000Y44165000D03*
+X34700000Y45435000D03*
+X34700000Y46705000D03*
+X34700000Y47975000D03*
+X34700000Y49245000D03*
+X34700000Y50515000D03*
+X34700000Y51785000D03*
+X34700000Y53055000D03*
+X34700000Y54325000D03*
+X34700000Y55595000D03*
+D18*
+X33850000Y18370000D03*
+X33850000Y61070000D03*
+%TD*%
+D13*
+%TO.C,U2*%
+X39620000Y18915000D03*
+X39120000Y18915000D03*
+D14*
+X38620000Y18915000D03*
+D13*
+X38120000Y18915000D03*
+X37620000Y18915000D03*
+X37620000Y19685000D03*
+X38120000Y19685000D03*
+D14*
+X38620000Y19685000D03*
+D13*
+X39120000Y19685000D03*
+X39620000Y19685000D03*
+%TD*%
+D21*
+%TO.C,C47*%
+X28920000Y44900000D03*
+X29880000Y44900000D03*
+%TD*%
+D27*
+%TO.C,C19*%
+X37770000Y30920000D03*
+X37770000Y31880000D03*
+%TD*%
+D21*
+%TO.C,C31*%
+X27220000Y58600000D03*
+X28180000Y58600000D03*
+%TD*%
+D25*
+%TO.C,C29*%
+X38300000Y48980000D03*
+X38300000Y48020000D03*
+%TD*%
+D15*
+%TO.C,C7*%
+X42650000Y26280000D03*
+X41690000Y26280000D03*
+%TD*%
+%TO.C,C58*%
+X27980000Y43900000D03*
+X27020000Y43900000D03*
+%TD*%
+D22*
+%TO.C,D12*%
+X30050000Y67212500D03*
+X30050000Y68787500D03*
+%TD*%
+D28*
+%TO.C,U7*%
+X15100000Y13800000D03*
+X13400000Y13800000D03*
+X15100000Y15160000D03*
+X13400000Y15160000D03*
+D29*
+X12345000Y17042500D03*
+X13615000Y17042500D03*
+X14885000Y17042500D03*
+X16155000Y17042500D03*
+X16155000Y11917500D03*
+X14885000Y11917500D03*
+X13615000Y11917500D03*
+X12345000Y11917500D03*
+%TD*%
+D27*
+%TO.C,C28*%
+X37900000Y51920000D03*
+X37900000Y52880000D03*
+%TD*%
+D19*
+%TO.C,C70*%
+X15900000Y21450000D03*
+X15900000Y19550000D03*
+%TD*%
+D20*
+%TO.C,C68*%
+X1120000Y16600000D03*
+X3020000Y16600000D03*
+%TD*%
+D17*
+%TO.C,J4*%
+X21700000Y23855000D03*
+X21700000Y25125000D03*
+X21700000Y26395000D03*
+X21700000Y27665000D03*
+X21700000Y28935000D03*
+X21700000Y30205000D03*
+X21700000Y31475000D03*
+X21700000Y37825000D03*
+X21700000Y39095000D03*
+X21700000Y40365000D03*
+X21700000Y41635000D03*
+X21700000Y42905000D03*
+X21700000Y44175000D03*
+X21700000Y45445000D03*
+X21700000Y46715000D03*
+X21700000Y47985000D03*
+X21700000Y49255000D03*
+X21700000Y50525000D03*
+X21700000Y51795000D03*
+X21700000Y53065000D03*
+X21700000Y54335000D03*
+X21700000Y55605000D03*
+D18*
+X20850000Y61080000D03*
+X20850000Y18380000D03*
+%TD*%
+D27*
+%TO.C,C15*%
+X38770000Y30920000D03*
+X38770000Y31880000D03*
+%TD*%
+D21*
+%TO.C,C26*%
+X27220000Y57600000D03*
+X28180000Y57600000D03*
+%TD*%
+%TO.C,C52*%
+X28920000Y43900000D03*
+X29880000Y43900000D03*
+%TD*%
+D15*
+%TO.C,C3*%
+X42650000Y25300000D03*
+X41690000Y25300000D03*
+%TD*%
+D21*
+%TO.C,C53*%
+X25120000Y44900000D03*
+X26080000Y44900000D03*
+%TD*%
+D10*
+%TO.C,R7*%
+X41170000Y66010000D03*
+X41170000Y64990000D03*
+%TD*%
+D27*
+%TO.C,C69*%
+X17500000Y16250000D03*
+X17500000Y17210000D03*
+%TD*%
+D15*
+%TO.C,C36*%
+X26280000Y58600000D03*
+X25320000Y58600000D03*
+%TD*%
+D25*
+%TO.C,C33*%
+X37900000Y50980000D03*
+X37900000Y50020000D03*
+%TD*%
+D20*
+%TO.C,C73*%
+X1120000Y10600000D03*
+X3020000Y10600000D03*
+%TD*%
+D16*
+%TO.C,R9*%
+X27500000Y65040000D03*
+X27500000Y66060000D03*
+%TD*%
+D17*
+%TO.C,J5*%
+X8690000Y23855000D03*
+X8690000Y25125000D03*
+X8690000Y26395000D03*
+X8690000Y27665000D03*
+X8690000Y28935000D03*
+X8690000Y30205000D03*
+X8690000Y31475000D03*
+X8690000Y37825000D03*
+X8690000Y39095000D03*
+X8690000Y40365000D03*
+X8690000Y41635000D03*
+X8690000Y42905000D03*
+X8690000Y44175000D03*
+X8690000Y45445000D03*
+X8690000Y46715000D03*
+X8690000Y47985000D03*
+X8690000Y49255000D03*
+X8690000Y50525000D03*
+X8690000Y51795000D03*
+X8690000Y53065000D03*
+X8690000Y54335000D03*
+X8690000Y55605000D03*
+D18*
+X7840000Y18380000D03*
+X7840000Y61080000D03*
+%TD*%
+D25*
+%TO.C,C24*%
+X39300000Y48980000D03*
+X39300000Y48020000D03*
+%TD*%
+D27*
+%TO.C,C23*%
+X38900000Y51920000D03*
+X38900000Y52880000D03*
+%TD*%
+M02*
--- a/Kicad/MainBoard/Gerber/MainBoard-B_Silkscreen.gbr
+++ b/Kicad/MainBoard/Gerber/MainBoard-B_Silkscreen.gbr
@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,(5.99.0-8910-g624a231cc0)*%
-%TF.CreationDate,2021-03-02T10:35:16+01:00*%
+%TF.GenerationSoftware,KiCad,Pcbnew,(6.0.4)*%
+%TF.CreationDate,2022-08-11T23:06:16+02:00*%
 %TF.ProjectId,MainBoard,4d61696e-426f-4617-9264-2e6b69636164,rev?*%
 %TF.SameCoordinates,PXa344e00PY7102aa0*%
 %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 (5.99.0-8910-g624a231cc0)) date 2021-03-02 10:35:16*
+G04 Created by KiCad (PCBNEW (6.0.4)) date 2022-08-11 23:06:16*
 %MOMM*%
 %LPD*%
 G01*
@ -120,17 +120,38 @@ X2657142Y44804762D01*
 X2752380Y44852381D01*
 X2800000Y44900000D01*
 X2847619Y44995239D01*
-X2752380Y45709524D02*
-X2800000Y45757143D01*
-X2847619Y45852381D01*
+X2419047Y45900000D02*
+X2466666Y45804762D01*
+X2514285Y45757143D01*
+X2609523Y45709524D01*
+X2657142Y45709524D01*
+X2752380Y45757143D01*
+X2800000Y45804762D01*
+X2847619Y45900000D01*
 X2847619Y46090477D01*
 X2800000Y46185715D01*
 X2752380Y46233334D01*
 X2657142Y46280953D01*
-X2561904Y46280953D01*
-X2419047Y46233334D01*
-X1847619Y45661905D01*
-X1847619Y46280953D01*
+X2609523Y46280953D01*
+X2514285Y46233334D01*
+X2466666Y46185715D01*
+X2419047Y46090477D01*
+X2419047Y45900000D01*
+X2371428Y45804762D01*
+X2323809Y45757143D01*
+X2228571Y45709524D01*
+X2038095Y45709524D01*
+X1942857Y45757143D01*
+X1895238Y45804762D01*
+X1847619Y45900000D01*
+X1847619Y46090477D01*
+X1895238Y46185715D01*
+X1942857Y46233334D01*
+X2038095Y46280953D01*
+X2228571Y46280953D01*
+X2323809Y46233334D01*
+X2371428Y46185715D01*
+X2419047Y46090477D01*
 X1942857Y46709524D02*
 X1895238Y46757143D01*
 X1847619Y46709524D01*
@ -180,13 +201,193 @@ X2561904Y49614286D01*
 X2419047Y49566667D01*
 X1847619Y48995239D01*
 X1847619Y49614286D01*
-X1847619Y50566667D02*
-X1847619Y49995239D01*
-X1847619Y50280953D02*
-X2847619Y50280953D01*
-X2704761Y50185715D01*
-X2609523Y50090477D01*
-X2561904Y49995239D01*
+X2752380Y49995239D02*
+X2800000Y50042858D01*
+X2847619Y50138096D01*
+X2847619Y50376191D01*
+X2800000Y50471429D01*
+X2752380Y50519048D01*
+X2657142Y50566667D01*
+X2561904Y50566667D01*
+X2419047Y50519048D01*
+X1847619Y49947620D01*
+X1847619Y50566667D01*
+X25438095Y66533334D02*
+X26238095Y66533334D01*
+X26238095Y66838096D01*
+X26200000Y66914286D01*
+X26161904Y66952381D01*
+X26085714Y66990477D01*
+X25971428Y66990477D01*
+X25895238Y66952381D01*
+X25857142Y66914286D01*
+X25819047Y66838096D01*
+X25819047Y66533334D01*
+X26238095Y67257143D02*
+X25438095Y67447620D01*
+X26009523Y67600000D01*
+X25438095Y67752381D01*
+X26238095Y67942858D01*
+X25438095Y68704762D02*
+X25819047Y68438096D01*
+X25438095Y68247620D02*
+X26238095Y68247620D01*
+X26238095Y68552381D01*
+X26200000Y68628572D01*
+X26161904Y68666667D01*
+X26085714Y68704762D01*
+X25971428Y68704762D01*
+X25895238Y68666667D01*
+X25857142Y68628572D01*
+X25819047Y68552381D01*
+X25819047Y68247620D01*
+X36488095Y66590477D02*
+X37288095Y66590477D01*
+X36907142Y66590477D02*
+X36907142Y67047620D01*
+X36488095Y67047620D02*
+X37288095Y67047620D01*
+X36488095Y67428572D02*
+X37288095Y67428572D01*
+X37288095Y67619048D01*
+X37250000Y67733334D01*
+X37173809Y67809524D01*
+X37097619Y67847620D01*
+X36945238Y67885715D01*
+X36830952Y67885715D01*
+X36678571Y67847620D01*
+X36602380Y67809524D01*
+X36526190Y67733334D01*
+X36488095Y67619048D01*
+X36488095Y67428572D01*
+X36488095Y68228572D02*
+X37288095Y68228572D01*
+X37288095Y68419048D01*
+X37250000Y68533334D01*
+X37173809Y68609524D01*
+X37097619Y68647620D01*
+X36945238Y68685715D01*
+X36830952Y68685715D01*
+X36678571Y68647620D01*
+X36602380Y68609524D01*
+X36526190Y68533334D01*
+X36488095Y68419048D01*
+X36488095Y68228572D01*
+X37021428Y69371429D02*
+X36488095Y69371429D01*
+X37326190Y69180953D02*
+X36754761Y68990477D01*
+X36754761Y69485715D01*
+X45488095Y66540477D02*
+X46288095Y66540477D01*
+X45907142Y66540477D02*
+X45907142Y66997620D01*
+X45488095Y66997620D02*
+X46288095Y66997620D01*
+X45488095Y67378572D02*
+X46288095Y67378572D01*
+X46288095Y67569048D01*
+X46250000Y67683334D01*
+X46173809Y67759524D01*
+X46097619Y67797620D01*
+X45945238Y67835715D01*
+X45830952Y67835715D01*
+X45678571Y67797620D01*
+X45602380Y67759524D01*
+X45526190Y67683334D01*
+X45488095Y67569048D01*
+X45488095Y67378572D01*
+X45488095Y68178572D02*
+X46288095Y68178572D01*
+X46288095Y68369048D01*
+X46250000Y68483334D01*
+X46173809Y68559524D01*
+X46097619Y68597620D01*
+X45945238Y68635715D01*
+X45830952Y68635715D01*
+X45678571Y68597620D01*
+X45602380Y68559524D01*
+X45526190Y68483334D01*
+X45488095Y68369048D01*
+X45488095Y68178572D01*
+X45488095Y69397620D02*
+X45488095Y68940477D01*
+X45488095Y69169048D02*
+X46288095Y69169048D01*
+X46173809Y69092858D01*
+X46097619Y69016667D01*
+X46059523Y68940477D01*
+X31616666Y66804762D02*
+X31616666Y67185715D01*
+X31388095Y66728572D02*
+X32188095Y66995239D01*
+X31388095Y67261905D01*
+X31464285Y67985715D02*
+X31426190Y67947620D01*
+X31388095Y67833334D01*
+X31388095Y67757143D01*
+X31426190Y67642858D01*
+X31502380Y67566667D01*
+X31578571Y67528572D01*
+X31730952Y67490477D01*
+X31845238Y67490477D01*
+X31997619Y67528572D01*
+X32073809Y67566667D01*
+X32150000Y67642858D01*
+X32188095Y67757143D01*
+X32188095Y67833334D01*
+X32150000Y67947620D01*
+X32111904Y67985715D01*
+X32188095Y68214286D02*
+X32188095Y68671429D01*
+X31388095Y68442858D02*
+X32188095Y68442858D01*
+X39388095Y66540477D02*
+X40188095Y66540477D01*
+X39807142Y66540477D02*
+X39807142Y66997620D01*
+X39388095Y66997620D02*
+X40188095Y66997620D01*
+X39388095Y67378572D02*
+X40188095Y67378572D01*
+X40188095Y67569048D01*
+X40150000Y67683334D01*
+X40073809Y67759524D01*
+X39997619Y67797620D01*
+X39845238Y67835715D01*
+X39730952Y67835715D01*
+X39578571Y67797620D01*
+X39502380Y67759524D01*
+X39426190Y67683334D01*
+X39388095Y67569048D01*
+X39388095Y67378572D01*
+X39388095Y68178572D02*
+X40188095Y68178572D01*
+X40188095Y68369048D01*
+X40150000Y68483334D01*
+X40073809Y68559524D01*
+X39997619Y68597620D01*
+X39845238Y68635715D01*
+X39730952Y68635715D01*
+X39578571Y68597620D01*
+X39502380Y68559524D01*
+X39426190Y68483334D01*
+X39388095Y68369048D01*
+X39388095Y68178572D01*
+X40188095Y68902381D02*
+X40188095Y69397620D01*
+X39883333Y69130953D01*
+X39883333Y69245239D01*
+X39845238Y69321429D01*
+X39807142Y69359524D01*
+X39730952Y69397620D01*
+X39540476Y69397620D01*
+X39464285Y69359524D01*
+X39426190Y69321429D01*
+X39388095Y69245239D01*
+X39388095Y69016667D01*
+X39426190Y68940477D01*
+X39464285Y68902381D01*
 D11*
 X51821428Y40842858D02*
 X53321428Y40842858D01*
@ -281,43 +482,67 @@ X51821428Y56128572D01*
 X51892857Y56057143D01*
 X51964285Y56128572D01*
 X51821428Y56128572D01*
-X53321428Y57128572D02*
-X53321428Y57271429D01*
-X53250000Y57414286D01*
-X53178571Y57485715D01*
-X53035714Y57557143D01*
-X52750000Y57628572D01*
-X52392857Y57628572D01*
-X52107142Y57557143D01*
-X51964285Y57485715D01*
-X51892857Y57414286D01*
-X51821428Y57271429D01*
-X51821428Y57128572D01*
-X51892857Y56985715D01*
-X51964285Y56914286D01*
-X52107142Y56842858D01*
-X52392857Y56771429D01*
-X52750000Y56771429D01*
-X53035714Y56842858D01*
-X53178571Y56914286D01*
-X53250000Y56985715D01*
-X53321428Y57128572D01*
+X53178571Y56771429D02*
+X53250000Y56842858D01*
+X53321428Y56985715D01*
+X53321428Y57342858D01*
+X53250000Y57485715D01*
+X53178571Y57557143D01*
+X53035714Y57628572D01*
+X52892857Y57628572D01*
+X52678571Y57557143D01*
+X51821428Y56700000D01*
+X51821428Y57628572D01*
+D10*
+X42438095Y66540477D02*
+X43238095Y66540477D01*
+X42857142Y66540477D02*
+X42857142Y66997620D01*
+X42438095Y66997620D02*
+X43238095Y66997620D01*
+X42438095Y67378572D02*
+X43238095Y67378572D01*
+X43238095Y67569048D01*
+X43200000Y67683334D01*
+X43123809Y67759524D01*
+X43047619Y67797620D01*
+X42895238Y67835715D01*
+X42780952Y67835715D01*
+X42628571Y67797620D01*
+X42552380Y67759524D01*
+X42476190Y67683334D01*
+X42438095Y67569048D01*
+X42438095Y67378572D01*
+X42438095Y68178572D02*
+X43238095Y68178572D01*
+X43238095Y68369048D01*
+X43200000Y68483334D01*
+X43123809Y68559524D01*
+X43047619Y68597620D01*
+X42895238Y68635715D01*
+X42780952Y68635715D01*
+X42628571Y68597620D01*
+X42552380Y68559524D01*
+X42476190Y68483334D01*
+X42438095Y68369048D01*
+X42438095Y68178572D01*
+X43161904Y68940477D02*
+X43200000Y68978572D01*
+X43238095Y69054762D01*
+X43238095Y69245239D01*
+X43200000Y69321429D01*
+X43161904Y69359524D01*
+X43085714Y69397620D01*
+X43009523Y69397620D01*
+X42895238Y69359524D01*
+X42438095Y68902381D01*
+X42438095Y69397620D01*
 D12*
 %TO.C,R8*%
 X37920000Y65653641D02*
 X37920000Y65346359D01*
 X38680000Y65653641D02*
 X38680000Y65346359D01*
-%TO.C,FB3*%
-X42290000Y47837221D02*
-X42290000Y48162779D01*
-X43310000Y47837221D02*
-X43310000Y48162779D01*
-%TO.C,FB2*%
-X41062779Y50890000D02*
-X40737221Y50890000D01*
-X41062779Y51910000D02*
-X40737221Y51910000D01*
 %TO.C,U1*%
 X43070000Y19840000D02*
 X43070000Y18540000D01*
@ -328,6 +553,11 @@ X25907836Y57960000D02*
 X25692164Y57960000D01*
 X25907836Y57240000D02*
 X25692164Y57240000D01*
+%TO.C,R27*%
+X30430000Y65296359D02*
+X30430000Y65603641D01*
+X29670000Y65296359D02*
+X29670000Y65603641D01*
 %TO.C,J2*%
 X43255000Y16235000D02*
 X50240000Y16235000D01*
@ -387,21 +617,11 @@ X25162164Y28740000D02*
 X25377836Y28740000D01*
 X25162164Y29460000D02*
 X25377836Y29460000D01*
-%TO.C,C80*%
-X16877836Y10640000D02*
-X16662164Y10640000D01*
-X16877836Y9920000D02*
-X16662164Y9920000D01*
 %TO.C,C20*%
 X25162164Y29720000D02*
 X25377836Y29720000D01*
 X25162164Y30440000D02*
 X25377836Y30440000D01*
-%TO.C,FB6*%
-X28910000Y41737221D02*
-X28910000Y42062779D01*
-X27890000Y41737221D02*
-X27890000Y42062779D01*
 %TO.C,C8*%
 X38120164Y26594000D02*
 X38335836Y26594000D01*
@ -437,30 +657,22 @@ X14939836Y7966000D01*
 X14724164Y8686000D02*
 X14939836Y8686000D01*
 %TO.C,R22*%
-X16923641Y9660000D02*
-X16616359Y9660000D01*
-X16923641Y8900000D02*
-X16616359Y8900000D01*
+X16928641Y10630000D02*
+X16621359Y10630000D01*
+X16928641Y9870000D02*
+X16621359Y9870000D01*
 %TO.C,C48*%
-X25492164Y43260000D02*
-X25707836Y43260000D01*
-X25492164Y42540000D02*
-X25707836Y42540000D01*
+X24584000Y42540000D02*
+X24584000Y43260000D01*
+X24584000Y42540000D02*
+X25600000Y42540000D01*
+X24584000Y43260000D02*
+X25600000Y43260000D01*
 %TO.C,R5*%
 X47680000Y65653641D02*
 X47680000Y65346359D01*
 X46920000Y65653641D02*
 X46920000Y65346359D01*
-%TO.C,C74*%
-X14660000Y9692164D02*
-X14660000Y9907836D01*
-X13940000Y9692164D02*
-X13940000Y9907836D01*
-%TO.C,FB7*%
-X26062779Y41110000D02*
-X25737221Y41110000D01*
-X26062779Y40090000D02*
-X25737221Y40090000D01*
 %TO.C,R23*%
 X17060000Y11863641D02*
 X17060000Y11556359D01*
@ -471,11 +683,6 @@ X38100164Y24858000D02*
 X38315836Y24858000D01*
 X38100164Y25578000D02*
 X38315836Y25578000D01*
-%TO.C,FB5*%
-X26290000Y60762779D02*
-X26290000Y60437221D01*
-X27310000Y60762779D02*
-X27310000Y60437221D01*
 %TO.C,C66*%
 X10640000Y15587836D02*
 X10640000Y15372164D01*
@ -486,6 +693,13 @@ X10620000Y13633641D02*
 X10620000Y13326359D01*
 X11380000Y13633641D02*
 X11380000Y13326359D01*
+%TO.C,D11*%
+X28235000Y68800000D02*
+X28235000Y66515000D01*
+X26765000Y66515000D02*
+X26765000Y68800000D01*
+X28235000Y66515000D02*
+X26765000Y66515000D01*
 %TO.C,C59*%
 X25492164Y41540000D02*
 X25707836Y41540000D01*
@ -573,10 +787,12 @@ X37220000Y18800000D01*
 X40020000Y19800000D02*
 X40020000Y18500000D01*
 %TO.C,C47*%
-X29292164Y45260000D02*
-X29507836Y45260000D01*
-X29292164Y44540000D02*
-X29507836Y44540000D01*
+X28384000Y44540000D02*
+X29400000Y44540000D01*
+X28384000Y44540000D02*
+X28384000Y45260000D01*
+X28384000Y45260000D02*
+X29400000Y45260000D01*
 %TO.C,C19*%
 X37410000Y31292164D02*
 X37410000Y31507836D01*
@ -602,6 +818,13 @@ X27607836Y44260000D02*
 X27392164Y44260000D01*
 X27607836Y43540000D02*
 X27392164Y43540000D01*
+%TO.C,D12*%
+X30785000Y66515000D02*
+X29315000Y66515000D01*
+X30785000Y68800000D02*
+X30785000Y66515000D01*
+X29315000Y66515000D02*
+X29315000Y68800000D01*
 %TO.C,U7*%
 X11690000Y16190584D02*
 X11690000Y17930000D01*
@ -641,10 +864,12 @@ X39130000Y31507836D01*
 X38410000Y31292164D02*
 X38410000Y31507836D01*
 %TO.C,C26*%
-X27592164Y57960000D02*
-X27807836Y57960000D01*
-X27592164Y57240000D02*
-X27807836Y57240000D01*
+X26684000Y57240000D02*
+X27700000Y57240000D01*
+X26684000Y57240000D02*
+X26684000Y57960000D01*
+X26684000Y57960000D02*
+X27700000Y57960000D01*
 %TO.C,C52*%
 X29292164Y43540000D02*
 X29507836Y43540000D01*
@ -685,6 +910,11 @@ X1808748Y11335000D02*
 X2331252Y11335000D01*
 X1808748Y9865000D02*
 X2331252Y9865000D01*
+%TO.C,R9*%
+X27880000Y65396359D02*
+X27880000Y65703641D01*
+X27120000Y65396359D02*
+X27120000Y65703641D01*
 %TO.C,J5*%
 X4245000Y16235000D02*
 X11230000Y16235000D01*
@ -695,14 +925,18 @@ X4245000Y16235000D01*
 X11230000Y63225000D02*
 X4245000Y63225000D01*
 %TO.C,C24*%
-X38940000Y48607836D02*
-X38940000Y48392164D01*
-X39660000Y48607836D02*
-X39660000Y48392164D01*
+X39660000Y49516000D02*
+X39660000Y48500000D01*
+X38940000Y49516000D02*
+X39660000Y49516000D01*
+X38940000Y49516000D02*
+X38940000Y48500000D01*
 %TO.C,C23*%
-X38540000Y52292164D02*
-X38540000Y52507836D01*
-X39260000Y52292164D02*
-X39260000Y52507836D01*
+X39260000Y51384000D02*
+X39260000Y52400000D01*
+X39260000Y51384000D02*
+X38540000Y51384000D01*
+X38540000Y51384000D02*
+X38540000Y52400000D01*
 %TD*%
 M02*
--- a/Kicad/MainBoard/Gerber/MainBoard-Edge_Cuts.gbr
+++ b/Kicad/MainBoard/Gerber/MainBoard-Edge_Cuts.gbr
@ -1,11 +1,11 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,(5.99.0-8910-g624a231cc0)*%
-%TF.CreationDate,2021-03-02T10:35:16+01:00*%
+%TF.GenerationSoftware,KiCad,Pcbnew,(6.0.4)*%
+%TF.CreationDate,2022-08-11T23:06:16+02:00*%
 %TF.ProjectId,MainBoard,4d61696e-426f-4617-9264-2e6b69636164,rev?*%
 %TF.SameCoordinates,PXa344e00PY7102aa0*%
 %TF.FileFunction,Profile,NP*%
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (5.99.0-8910-g624a231cc0)) date 2021-03-02 10:35:16*
+G04 Created by KiCad (PCBNEW (6.0.4)) date 2022-08-11 23:06:16*
 %MOMM*%
 %LPD*%
 G01*
@ -15,32 +15,32 @@ G04 APERTURE LIST*
 %TD*%
 G04 APERTURE END LIST*
 D10*
-X55099999Y3000000D02*
+X52100000Y1D02*
 G75*
-G02*
-X52100000Y1I-2999999J0D01*
+G03*
+X55099999Y3000000I0J2999999D01*
 G01*
 X100000Y67000000D02*
 X100000Y3000000D01*
-X3100000Y0D02*
+X100000Y3000000D02*
 G75*
-G02*
-X100000Y3000000I0J3000000D01*
+G03*
+X3100000Y0I3000000J0D01*
 G01*
 X52100000Y70000000D02*
 X3100000Y70000000D01*
-X100001Y67000000D02*
+X3100000Y69999999D02*
 G75*
-G02*
-X3100000Y69999999I2999999J0D01*
+G03*
+X100001Y67000000I0J-2999999D01*
 G01*
 X3100000Y0D02*
 X52100000Y0D01*
 X55100000Y3000000D02*
 X55100000Y67000000D01*
-X52100000Y70000000D02*
+X55100000Y67000000D02*
 G75*
-G02*
-X55100000Y67000000I0J-3000000D01*
+G03*
+X52100000Y70000000I-3000000J0D01*
 G01*
 M02*
--- a/Kicad/MainBoard/Gerber/MainBoard-F_Cu.gbr
+++ b/Kicad/MainBoard/Gerber/MainBoard-F_Cu.gbr
--- a/Kicad/MainBoard/Gerber/MainBoard-F_Mask.gbr
+++ b/Kicad/MainBoard/Gerber/MainBoard-F_Mask.gbr
@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,(5.99.0-8910-g624a231cc0)*%
-%TF.CreationDate,2021-03-02T10:35:16+01:00*%
+%TF.GenerationSoftware,KiCad,Pcbnew,(6.0.4)*%
+%TF.CreationDate,2022-08-11T23:06:16+02:00*%
 %TF.ProjectId,MainBoard,4d61696e-426f-4617-9264-2e6b69636164,rev?*%
 %TF.SameCoordinates,PXa344e00PY7102aa0*%
 %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 (5.99.0-8910-g624a231cc0)) date 2021-03-02 10:35:16*
+G04 Created by KiCad (PCBNEW (6.0.4)) date 2022-08-11 23:06:16*
 %MOMM*%
 %LPD*%
 G01*
@ -29,62 +29,77 @@ 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.140000X0.140000X0.170000X-0.140000X0.170000X-0.140000X-0.170000X0.140000X-0.170000X0*%
-%ADD11RoundRect,0.140000X0.170000X-0.140000X0.170000X0.140000X-0.170000X0.140000X-0.170000X-0.140000X0*%
-%ADD12RoundRect,0.250000X-0.250000X-0.475000X0.250000X-0.475000X0.250000X0.475000X-0.250000X0.475000X0*%
-%ADD13RoundRect,0.135000X-0.185000X0.135000X-0.185000X-0.135000X0.185000X-0.135000X0.185000X0.135000X0*%
-%ADD14RoundRect,0.140000X-0.170000X0.140000X-0.170000X-0.140000X0.170000X-0.140000X0.170000X0.140000X0*%
-%ADD15R,1.400000X1.200000*%
-%ADD16RoundRect,0.218750X0.218750X0.256250X-0.218750X0.256250X-0.218750X-0.256250X0.218750X-0.256250X0*%
-%ADD17RoundRect,0.140000X-0.140000X-0.170000X0.140000X-0.170000X0.140000X0.170000X-0.140000X0.170000X0*%
-%ADD18RoundRect,0.135000X0.135000X0.185000X-0.135000X0.185000X-0.135000X-0.185000X0.135000X-0.185000X0*%
-%ADD19R,0.980000X3.400000*%
-%ADD20R,0.599999X1.000001*%
-%ADD21RoundRect,0.225000X0.250000X-0.225000X0.250000X0.225000X-0.250000X0.225000X-0.250000X-0.225000X0*%
-%ADD22RoundRect,0.135000X0.185000X-0.135000X0.185000X0.135000X-0.185000X0.135000X-0.185000X-0.135000X0*%
-%ADD23R,0.550000X0.800000*%
-%ADD24R,1.700000X1.700000*%
-%ADD25O,1.700000X1.700000*%
-%ADD26RoundRect,0.250000X-0.787500X-1.025000X0.787500X-1.025000X0.787500X1.025000X-0.787500X1.025000X0*%
-%ADD27RoundRect,0.225000X0.225000X0.250000X-0.225000X0.250000X-0.225000X-0.250000X0.225000X-0.250000X0*%
-%ADD28R,0.450000X0.700000*%
-%ADD29RoundRect,0.250000X0.250000X0.475000X-0.250000X0.475000X-0.250000X-0.475000X0.250000X-0.475000X0*%
-%ADD30RoundRect,0.200000X-0.200000X-0.275000X0.200000X-0.275000X0.200000X0.275000X-0.200000X0.275000X0*%
-%ADD31RoundRect,0.062500X0.062500X-0.350000X0.062500X0.350000X-0.062500X0.350000X-0.062500X-0.350000X0*%
-%ADD32RoundRect,0.062500X0.350000X-0.062500X0.350000X0.062500X-0.350000X0.062500X-0.350000X-0.062500X0*%
-%ADD33R,2.700000X2.700000*%
-%ADD34RoundRect,0.135000X-0.135000X-0.185000X0.135000X-0.185000X0.135000X0.185000X-0.135000X0.185000X0*%
-%ADD35RoundRect,0.225000X-0.250000X0.225000X-0.250000X-0.225000X0.250000X-0.225000X0.250000X0.225000X0*%
-%ADD36R,0.425000X0.400000*%
-%ADD37R,1.150000X0.950000*%
-%ADD38R,0.750000X0.300000*%
-%ADD39RoundRect,0.100000X-0.637500X-0.100000X0.637500X-0.100000X0.637500X0.100000X-0.637500X0.100000X0*%
-%ADD40RoundRect,0.147500X-0.147500X-0.172500X0.147500X-0.172500X0.147500X0.172500X-0.147500X0.172500X0*%
-%ADD41R,0.400000X1.350000*%
-%ADD42R,1.200000X1.900000*%
-%ADD43O,1.200000X1.900000*%
-%ADD44C,1.450000*%
-%ADD45R,1.500000X1.900000*%
-%ADD46C,3.400000*%
-%ADD47C,1.524000*%
-%ADD48C,1.800000*%
-%ADD49C,2.500000*%
-%ADD50C,6.100000*%
-%ADD51R,0.200000X0.700000*%
-%ADD52C,0.600000*%
-%ADD53O,0.850000X0.600000*%
-%ADD54R,0.270000X1.400000*%
-%ADD55O,1.700000X1.200000*%
-%ADD56O,1.350000X0.950000*%
-%ADD57RoundRect,0.218750X-0.218750X-0.381250X0.218750X-0.381250X0.218750X0.381250X-0.218750X0.381250X0*%
-%ADD58RoundRect,0.218750X-0.218750X-0.256250X0.218750X-0.256250X0.218750X0.256250X-0.218750X0.256250X0*%
-%ADD59RoundRect,0.050000X0.050000X-0.362500X0.050000X0.362500X-0.050000X0.362500X-0.050000X-0.362500X0*%
-%ADD60RoundRect,0.050000X0.362500X-0.050000X0.362500X0.050000X-0.362500X0.050000X-0.362500X-0.050000X0*%
-%ADD61R,3.800000X3.800000*%
-%ADD62R,0.450000X0.600000*%
-%ADD63C,2.100000*%
+%ADD10RoundRect,0.150000X-0.825000X-0.150000X0.825000X-0.150000X0.825000X0.150000X-0.825000X0.150000X0*%
+%ADD11RoundRect,0.140000X0.140000X0.170000X-0.140000X0.170000X-0.140000X-0.170000X0.140000X-0.170000X0*%
+%ADD12RoundRect,0.140000X0.170000X-0.140000X0.170000X0.140000X-0.170000X0.140000X-0.170000X-0.140000X0*%
+%ADD13RoundRect,0.250000X-0.250000X-0.475000X0.250000X-0.475000X0.250000X0.475000X-0.250000X0.475000X0*%
+%ADD14RoundRect,0.135000X-0.185000X0.135000X-0.185000X-0.135000X0.185000X-0.135000X0.185000X0.135000X0*%
+%ADD15RoundRect,0.140000X-0.170000X0.140000X-0.170000X-0.140000X0.170000X-0.140000X0.170000X0.140000X0*%
+%ADD16R,1.400000X1.200000*%
+%ADD17RoundRect,0.218750X0.218750X0.256250X-0.218750X0.256250X-0.218750X-0.256250X0.218750X-0.256250X0*%
+%ADD18RoundRect,0.140000X-0.140000X-0.170000X0.140000X-0.170000X0.140000X0.170000X-0.140000X0.170000X0*%
+%ADD19RoundRect,0.135000X0.135000X0.185000X-0.135000X0.185000X-0.135000X-0.185000X0.135000X-0.185000X0*%
+%ADD20R,0.980000X3.400000*%
+%ADD21R,0.599999X1.000001*%
+%ADD22RoundRect,0.225000X0.250000X-0.225000X0.250000X0.225000X-0.250000X0.225000X-0.250000X-0.225000X0*%
+%ADD23RoundRect,0.135000X0.185000X-0.135000X0.185000X0.135000X-0.185000X0.135000X-0.185000X-0.135000X0*%
+%ADD24R,0.550000X0.800000*%
+%ADD25R,1.700000X1.700000*%
+%ADD26O,1.700000X1.700000*%
+%ADD27RoundRect,0.250000X-0.787500X-1.025000X0.787500X-1.025000X0.787500X1.025000X-0.787500X1.025000X0*%
+%ADD28R,1.100000X0.300000*%
+%ADD29R,3.100000X2.300000*%
+%ADD30RoundRect,0.225000X0.225000X0.250000X-0.225000X0.250000X-0.225000X-0.250000X0.225000X-0.250000X0*%
+%ADD31R,0.450000X0.700000*%
+%ADD32RoundRect,0.250000X0.250000X0.475000X-0.250000X0.475000X-0.250000X-0.475000X0.250000X-0.475000X0*%
+%ADD33RoundRect,0.200000X-0.200000X-0.275000X0.200000X-0.275000X0.200000X0.275000X-0.200000X0.275000X0*%
+%ADD34RoundRect,0.062500X0.062500X-0.350000X0.062500X0.350000X-0.062500X0.350000X-0.062500X-0.350000X0*%
+%ADD35RoundRect,0.062500X0.350000X-0.062500X0.350000X0.062500X-0.350000X0.062500X-0.350000X-0.062500X0*%
+%ADD36R,2.700000X2.700000*%
+%ADD37C,1.500000*%
+%ADD38RoundRect,0.147500X0.147500X0.172500X-0.147500X0.172500X-0.147500X-0.172500X0.147500X-0.172500X0*%
+%ADD39RoundRect,0.135000X-0.135000X-0.185000X0.135000X-0.185000X0.135000X0.185000X-0.135000X0.185000X0*%
+%ADD40RoundRect,0.225000X-0.250000X0.225000X-0.250000X-0.225000X0.250000X-0.225000X0.250000X0.225000X0*%
+%ADD41R,0.425000X0.400000*%
+%ADD42R,1.150000X0.950000*%
+%ADD43R,0.750000X0.300000*%
+%ADD44RoundRect,0.147500X-0.147500X-0.172500X0.147500X-0.172500X0.147500X0.172500X-0.147500X0.172500X0*%
+%ADD45R,0.400000X1.350000*%
+%ADD46R,1.200000X1.900000*%
+%ADD47O,1.200000X1.900000*%
+%ADD48C,1.450000*%
+%ADD49R,1.500000X1.900000*%
+%ADD50C,3.400000*%
+%ADD51C,1.524000*%
+%ADD52C,1.800000*%
+%ADD53C,2.500000*%
+%ADD54C,6.100000*%
+%ADD55R,0.200000X0.700000*%
+%ADD56C,0.650000*%
+%ADD57R,0.700000X2.000000*%
+%ADD58R,0.760000X2.000000*%
+%ADD59R,0.800000X2.000000*%
+%ADD60O,1.100000X1.600000*%
+%ADD61O,1.600000X1.100000*%
+%ADD62RoundRect,0.218750X-0.218750X-0.256250X0.218750X-0.256250X0.218750X0.256250X-0.218750X0.256250X0*%
+%ADD63RoundRect,0.050000X0.050000X-0.362500X0.050000X0.362500X-0.050000X0.362500X-0.050000X-0.362500X0*%
+%ADD64RoundRect,0.050000X0.362500X-0.050000X0.362500X0.050000X-0.362500X0.050000X-0.362500X-0.050000X0*%
+%ADD65R,3.800000X3.800000*%
+%ADD66R,0.450000X0.600000*%
+%ADD67C,2.100000*%
 G04 APERTURE END LIST*
 D10*
+%TO.C,U5*%
+X31025000Y41405000D03*
+X31025000Y40135000D03*
+X31025000Y38865000D03*
+X31025000Y37595000D03*
+X35975000Y37595000D03*
+X35975000Y38865000D03*
+X35975000Y40135000D03*
+X35975000Y41405000D03*
+%TD*%
+D11*
 %TO.C,C65*%
 X12780000Y18200000D03*
 X11820000Y18200000D03*
@ -93,64 +108,64 @@ X11820000Y18200000D03*
 X29280000Y13900000D03*
 X28320000Y13900000D03*
 %TD*%
-D11*
+D12*
 %TO.C,C62*%
 X6700000Y11720000D03*
 X6700000Y12680000D03*
 %TD*%
-D12*
+D13*
 %TO.C,C72*%
 X12170000Y22000000D03*
 X14070000Y22000000D03*
 %TD*%
-D13*
+D14*
 %TO.C,R25*%
 X24100000Y14110000D03*
 X24100000Y13090000D03*
 %TD*%
-D11*
+D12*
 %TO.C,C30*%
 X36770000Y55220000D03*
 X36770000Y56180000D03*
 %TD*%
-D14*
+D15*
 %TO.C,C37*%
 X35275000Y47880000D03*
 X35275000Y46920000D03*
 %TD*%
-D15*
+D16*
 %TO.C,Y1*%
 X31300000Y60250000D03*
 X33500000Y60250000D03*
 X33500000Y61950000D03*
 X31300000Y61950000D03*
 %TD*%
-D16*
+D17*
 %TO.C,D10*%
 X8887500Y19200000D03*
 X7312500Y19200000D03*
 %TD*%
-D17*
+D18*
 %TO.C,C64*%
 X4290000Y15900000D03*
 X5250000Y15900000D03*
 %TD*%
-D18*
+D19*
 %TO.C,R16*%
 X14810000Y15200000D03*
 X13790000Y15200000D03*
 %TD*%
-D19*
+D20*
 %TO.C,L2*%
 X26615000Y19900000D03*
 X28985000Y19900000D03*
 %TD*%
-D11*
+D12*
 %TO.C,C45*%
 X33770000Y53320000D03*
 X33770000Y54280000D03*
 %TD*%
-D20*
+D21*
 %TO.C,U8*%
 X27250001Y16875001D03*
 X26300000Y16875001D03*
@ -159,48 +174,48 @@ X25350002Y14125001D03*
 X26300000Y14125001D03*
 X27250001Y14125001D03*
 %TD*%
-D21*
+D22*
 %TO.C,C82*%
 X23000000Y15625000D03*
 X23000000Y17175000D03*
 %TD*%
-D22*
+D23*
 %TO.C,R19*%
 X12800000Y16190000D03*
 X12800000Y17210000D03*
 %TD*%
-D10*
+D11*
 %TO.C,C49*%
 X29750000Y56300000D03*
 X28790000Y56300000D03*
 %TD*%
-D14*
+D15*
 %TO.C,C54*%
 X21400000Y46580000D03*
 X21400000Y45620000D03*
 %TD*%
-D23*
+D24*
 %TO.C,D5*%
 X15047700Y11325400D03*
 X13797700Y11325400D03*
 %TD*%
-D14*
+D15*
 %TO.C,C11*%
 X35100000Y61680000D03*
 X35100000Y60720000D03*
 %TD*%
-D13*
+D14*
 %TO.C,R10*%
 X33975000Y47585000D03*
 X33975000Y46565000D03*
 %TD*%
-D24*
+D25*
 %TO.C,J6*%
 X52170000Y26075000D03*
-D25*
+D26*
 X52170000Y23535000D03*
 %TD*%
-D13*
+D14*
 %TO.C,R2*%
 X40270000Y19810000D03*
 X40270000Y18790000D03*
@ -209,83 +224,99 @@ X40270000Y18790000D03*
 X29700000Y60310000D03*
 X29700000Y59290000D03*
 %TD*%
-D11*
+D12*
 %TO.C,C27*%
 X34770000Y53320000D03*
 X34770000Y54280000D03*
 %TD*%
-D26*
+D27*
 %TO.C,C79*%
 X2157500Y25300000D03*
 X8382500Y25300000D03*
 %TD*%
-D11*
+D28*
+%TO.C,J8*%
+X9650000Y53675000D03*
+X9650000Y53175000D03*
+X9650000Y52675000D03*
+X9650000Y52175000D03*
+X9650000Y51675000D03*
+X9650000Y51175000D03*
+X9650000Y50675000D03*
+X9650000Y50175000D03*
+X9650000Y49675000D03*
+X9650000Y49175000D03*
+D29*
+X7950000Y47505000D03*
+X7950000Y55345000D03*
+%TD*%
+D12*
 %TO.C,C50*%
 X22400000Y50320000D03*
 X22400000Y51280000D03*
 %TD*%
-D27*
+D30*
 %TO.C,C61*%
 X12475000Y12400000D03*
 X10925000Y12400000D03*
 %TD*%
-D13*
+D14*
 %TO.C,R1*%
 X39185000Y19800000D03*
 X39185000Y18780000D03*
 %TD*%
-D12*
+D13*
 %TO.C,C67*%
 X12170000Y19950000D03*
 X14070000Y19950000D03*
 %TD*%
-D13*
+D14*
 %TO.C,R4*%
 X22540000Y54570000D03*
 X22540000Y53550000D03*
 %TD*%
-D14*
+D15*
 %TO.C,C12*%
 X26250000Y58380000D03*
 X26250000Y57420000D03*
 %TD*%
-D10*
+D11*
 %TO.C,C32*%
 X22480000Y52300000D03*
 X21520000Y52300000D03*
 %TD*%
-D28*
+D31*
 %TO.C,D6*%
 X9350000Y12400000D03*
 X8050000Y12400000D03*
 X8700000Y10400000D03*
 %TD*%
-D29*
+D32*
 %TO.C,C81*%
 X17520000Y19950000D03*
 X15620000Y19950000D03*
 %TD*%
-D17*
+D18*
 %TO.C,C42*%
 X33690000Y45150000D03*
 X34650000Y45150000D03*
 %TD*%
-D30*
+D33*
 %TO.C,R24*%
 X27575000Y12600000D03*
 X29225000Y12600000D03*
 %TD*%
-D14*
+D15*
 %TO.C,C44*%
 X31875000Y43930000D03*
 X31875000Y42970000D03*
 %TD*%
-D10*
+D11*
 %TO.C,C43*%
 X22450000Y48500000D03*
 X21490000Y48500000D03*
 %TD*%
-D31*
+D34*
 %TO.C,U6*%
 X7450000Y13837500D03*
 X7950000Y13837500D03*
@ -293,46 +324,50 @@ X8450000Y13837500D03*
 X8950000Y13837500D03*
 X9450000Y13837500D03*
 X9950000Y13837500D03*
-D32*
+D35*
 X10662500Y14550000D03*
 X10662500Y15050000D03*
 X10662500Y15550000D03*
 X10662500Y16050000D03*
 X10662500Y16550000D03*
 X10662500Y17050000D03*
-D31*
+D34*
 X9950000Y17762500D03*
 X9450000Y17762500D03*
 X8950000Y17762500D03*
 X8450000Y17762500D03*
 X7950000Y17762500D03*
 X7450000Y17762500D03*
-D32*
+D35*
 X6737500Y17050000D03*
 X6737500Y16550000D03*
 X6737500Y16050000D03*
 X6737500Y15550000D03*
 X6737500Y15050000D03*
 X6737500Y14550000D03*
-D33*
+D36*
 X8700000Y15800000D03*
 %TD*%
-D16*
-%TO.C,FB4*%
-X39587500Y55500000D03*
-X38012500Y55500000D03*
+D37*
+%TO.C,TP2*%
+X14475000Y56375000D03*
 %TD*%
-D34*
+D38*
+%TO.C,FB4*%
+X39285000Y55500000D03*
+X38315000Y55500000D03*
+%TD*%
+D39*
 %TO.C,R12*%
 X11790000Y14100000D03*
 X12810000Y14100000D03*
 %TD*%
-D35*
+D40*
 %TO.C,C60*%
 X15500000Y5175000D03*
 X15500000Y3625000D03*
 %TD*%
-D36*
+D41*
 %TO.C,Q1*%
 X13762500Y17750000D03*
 X13762500Y17100000D03*
@ -340,58 +375,47 @@ X13762500Y16450000D03*
 X15637500Y16450000D03*
 X15637500Y17100000D03*
 X15637500Y17750000D03*
-D37*
+D42*
 X14700000Y17425000D03*
-D38*
+D43*
 X14700000Y16450000D03*
 %TD*%
-D11*
+D12*
 %TO.C,C25*%
 X35770000Y55220000D03*
 X35770000Y56180000D03*
 %TD*%
-D14*
+D15*
 %TO.C,C13*%
 X27200000Y58380000D03*
 X27200000Y57420000D03*
 %TD*%
-D10*
+D11*
 %TO.C,C22*%
 X29750000Y57300000D03*
 X28790000Y57300000D03*
 %TD*%
-D12*
+D13*
 %TO.C,C85*%
 X28650000Y16600000D03*
 X30550000Y16600000D03*
 %TD*%
-D34*
+D39*
 %TO.C,R13*%
 X4590000Y18100000D03*
 X5610000Y18100000D03*
 %TD*%
-D22*
+D23*
 %TO.C,R18*%
 X11800000Y16190000D03*
 X11800000Y17210000D03*
 %TD*%
-D39*
-%TO.C,U5*%
-X30837500Y41500000D03*
-X30837500Y40850000D03*
-X30837500Y40200000D03*
-X30837500Y39550000D03*
-X36562500Y39550000D03*
-X36562500Y40200000D03*
-X36562500Y40850000D03*
-X36562500Y41500000D03*
-%TD*%
-D11*
+D12*
 %TO.C,C83*%
 X24200000Y15920000D03*
 X24200000Y16880000D03*
 %TD*%
-D14*
+D15*
 %TO.C,C51*%
 X22400000Y46580000D03*
 X22400000Y45620000D03*
@ -400,55 +424,59 @@ X22400000Y45620000D03*
 X30875000Y43930000D03*
 X30875000Y42970000D03*
 %TD*%
-D40*
+D37*
+%TO.C,TP3*%
+X2550000Y46975000D03*
+%TD*%
+D44*
 %TO.C,D7*%
 X13915000Y13600000D03*
 X14885000Y13600000D03*
 %TD*%
-D41*
+D45*
 %TO.C,J7*%
 X13070000Y65847500D03*
 X12420000Y65847500D03*
 X11770000Y65847500D03*
 X11120000Y65847500D03*
 X10470000Y65847500D03*
-D42*
+D46*
 X14670000Y68547500D03*
-D43*
+D47*
 X15270000Y68547500D03*
-D44*
+D48*
 X9270000Y65847500D03*
-D43*
+D47*
 X8270000Y68547500D03*
-D45*
+D49*
 X12770000Y68547500D03*
-D42*
+D46*
 X8870000Y68547500D03*
-D44*
+D48*
 X14270000Y65847500D03*
-D45*
+D49*
 X10770000Y68547500D03*
 %TD*%
-D18*
+D19*
 %TO.C,R11*%
 X14910000Y12600000D03*
 X13890000Y12600000D03*
 %TD*%
-D29*
+D32*
 %TO.C,C78*%
 X17540000Y22000000D03*
 X15640000Y22000000D03*
 %TD*%
-D34*
+D39*
 %TO.C,R14*%
 X11790000Y15200000D03*
 X12810000Y15200000D03*
 %TD*%
-D46*
+D50*
 %TO.C,U3*%
 X49250000Y6300000D03*
 X37820000Y6300000D03*
-D47*
+D51*
 X37820000Y15190000D03*
 X39090000Y12650000D03*
 X40360000Y15190000D03*
@ -459,32 +487,32 @@ X45440000Y15190000D03*
 X46710000Y12650000D03*
 X47980000Y15190000D03*
 X49250000Y12650000D03*
-D48*
+D52*
 X37210000Y2190000D03*
 X39750000Y2190000D03*
 X47320000Y2190000D03*
 X49860000Y2190000D03*
-D49*
+D53*
 X35610000Y10190000D03*
 X51460000Y10190000D03*
 %TD*%
-D22*
+D23*
 %TO.C,R17*%
 X10100000Y18890000D03*
 X10100000Y19910000D03*
 %TD*%
-D17*
+D18*
 %TO.C,C63*%
 X4620000Y14200000D03*
 X5580000Y14200000D03*
 %TD*%
-D50*
+D54*
 %TO.C,Module1*%
 X51580000Y33490000D03*
 X51580000Y66490000D03*
 X3580000Y33490000D03*
 X3580000Y66490000D03*
-D51*
+D55*
 X20280000Y31490000D03*
 X20280000Y34570000D03*
 X20680000Y31490000D03*
@ -686,68 +714,54 @@ X39480000Y68490000D03*
 X39880000Y65410000D03*
 X39880000Y68490000D03*
 %TD*%
-D11*
+D56*
+%TO.C,J1*%
+X12575000Y4000000D03*
+X4825000Y4000000D03*
+D57*
+X8200000Y7000000D03*
+D58*
+X10220000Y7000000D03*
+D59*
+X11450000Y7000000D03*
+D57*
+X9200000Y7000000D03*
+D58*
+X7180000Y7000000D03*
+D59*
+X5950000Y7000000D03*
+D60*
+X4380000Y5800000D03*
+X13020000Y5800000D03*
+D61*
+X6400000Y4370000D03*
+X11000000Y4370000D03*
+%TD*%
+D12*
 %TO.C,C40*%
 X34770000Y55220000D03*
 X34770000Y56180000D03*
 %TD*%
-D52*
-%TO.C,J1*%
-X5200000Y7150000D03*
-D53*
-X12200000Y7150000D03*
-D54*
-X5950000Y8100000D03*
-X6450000Y8100000D03*
-X6950000Y8100000D03*
-X7450000Y8100000D03*
-X7950000Y8100000D03*
-X8450000Y8100000D03*
-X8950000Y8100000D03*
-X9450000Y8100000D03*
-X9950000Y8100000D03*
-X10450000Y8100000D03*
-X10950000Y8100000D03*
-X11450000Y8100000D03*
-X11450000Y3500000D03*
-X10950000Y3500000D03*
-X10450000Y3500000D03*
-X9950000Y3500000D03*
-X9450000Y3500000D03*
-X8950000Y3500000D03*
-X8450000Y3500000D03*
-X7950000Y3500000D03*
-X7450000Y3500000D03*
-X6950000Y3500000D03*
-X6450000Y3500000D03*
-X5950000Y3500000D03*
-D55*
-X12800000Y8870000D03*
-X4600000Y2730000D03*
-D56*
-X4925000Y5800000D03*
-D55*
-X4600000Y8870000D03*
-X12800000Y2730000D03*
-D56*
-X12475000Y5800000D03*
+D37*
+%TO.C,TP1*%
+X16050000Y44500000D03*
 %TD*%
-D57*
+D44*
 %TO.C,FB1*%
-X16837500Y46600000D03*
-X18962500Y46600000D03*
+X17415000Y46600000D03*
+X18385000Y46600000D03*
 %TD*%
-D18*
+D19*
 %TO.C,R26*%
 X26110000Y12800000D03*
 X25090000Y12800000D03*
 %TD*%
-D58*
+D62*
 %TO.C,D9*%
 X3512500Y19600000D03*
 X5087500Y19600000D03*
 %TD*%
-D11*
+D12*
 %TO.C,C55*%
 X21400000Y50320000D03*
 X21400000Y51280000D03*
@ -760,7 +774,7 @@ X29700000Y62280000D03*
 X33770000Y55220000D03*
 X33770000Y56180000D03*
 %TD*%
-D59*
+D63*
 %TO.C,U4*%
 X24550000Y46222500D03*
 X24950000Y46222500D03*
@ -781,7 +795,7 @@ X30550000Y46222500D03*
 X30950000Y46222500D03*
 X31350000Y46222500D03*
 X31750000Y46222500D03*
-D60*
+D64*
 X32587500Y47060000D03*
 X32587500Y47460000D03*
 X32587500Y47860000D03*
@ -801,7 +815,7 @@ X32587500Y53060000D03*
 X32587500Y53460000D03*
 X32587500Y53860000D03*
 X32587500Y54260000D03*
-D59*
+D63*
 X31750000Y55097500D03*
 X31350000Y55097500D03*
 X30950000Y55097500D03*
@ -821,7 +835,7 @@ X25750000Y55097500D03*
 X25350000Y55097500D03*
 X24950000Y55097500D03*
 X24550000Y55097500D03*
-D60*
+D64*
 X23712500Y54260000D03*
 X23712500Y53860000D03*
 X23712500Y53460000D03*
@ -841,20 +855,20 @@ X23712500Y48260000D03*
 X23712500Y47860000D03*
 X23712500Y47460000D03*
 X23712500Y47060000D03*
-D61*
+D65*
 X28150000Y50660000D03*
 %TD*%
-D62*
+D66*
 %TO.C,D8*%
 X5100000Y10900000D03*
 X5100000Y13000000D03*
 %TD*%
-D18*
+D19*
 %TO.C,R15*%
 X5610000Y17000000D03*
 X4590000Y17000000D03*
 %TD*%
-D63*
+D67*
 %TO.C,J2*%
 X46550000Y58130000D03*
 X46550000Y21330000D03*
--- a/Kicad/MainBoard/Gerber/MainBoard-F_Paste.gbr
+++ b/Kicad/MainBoard/Gerber/MainBoard-F_Paste.gbr
@ -0,0 +1,851 @@
+%TF.GenerationSoftware,KiCad,Pcbnew,(6.0.4)*%
+%TF.CreationDate,2022-08-11T23:06:16+02:00*%
+%TF.ProjectId,MainBoard,4d61696e-426f-4617-9264-2e6b69636164,rev?*%
+%TF.SameCoordinates,PXa344e00PY7102aa0*%
+%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)) date 2022-08-11 23:06:16*
+%MOMM*%
+%LPD*%
+G01*
+G04 APERTURE LIST*
+G04 Aperture macros list*
+%AMRoundRect*
+0 Rectangle with rounded corners*
+0 $1 Rounding radius*
+0 $2 $3 $4 $5 $6 $7 $8 $9 X,Y pos of 4 corners*
+0 Add a 4 corners polygon primitive as box body*
+4,1,4,$2,$3,$4,$5,$6,$7,$8,$9,$2,$3,0*
+0 Add four circle primitives for the rounded corners*
+1,1,$1+$1,$2,$3*
+1,1,$1+$1,$4,$5*
+1,1,$1+$1,$6,$7*
+1,1,$1+$1,$8,$9*
+0 Add four rect primitives between the rounded corners*
+20,1,$1+$1,$2,$3,$4,$5,0*
+20,1,$1+$1,$4,$5,$6,$7,0*
+20,1,$1+$1,$6,$7,$8,$9,0*
+20,1,$1+$1,$8,$9,$2,$3,0*%
+%AMFreePoly0*
+4,1,16,0.405432,0.261726,0.405432,0.261725,0.463283,0.203876,0.483736,0.154497,0.483736,-0.212347,0.463283,-0.261726,0.413904,-0.282179,-0.413904,-0.282179,-0.463283,-0.261726,-0.483736,-0.212347,-0.483736,0.154497,-0.463281,0.203877,-0.405432,0.261726,-0.356053,0.282179,0.356053,0.282179,0.405432,0.261726,0.405432,0.261726,$1*%
+%AMFreePoly1*
+4,1,15,0.463283,0.261726,0.483736,0.212347,0.483736,-0.154497,0.463281,-0.203877,0.405432,-0.261726,0.356053,-0.282179,-0.356053,-0.282179,-0.405433,-0.261724,-0.463283,-0.203876,-0.483736,-0.154497,-0.483736,0.212347,-0.463283,0.261726,-0.413904,0.282179,0.413904,0.282179,0.463283,0.261726,0.463283,0.261726,$1*%
+%AMFreePoly2*
+4,1,16,0.261726,0.463283,0.282179,0.413904,0.282179,-0.413904,0.261726,-0.463283,0.212347,-0.483736,-0.154498,-0.483736,-0.168960,-0.477745,-0.203877,-0.463281,-0.261726,-0.405432,-0.282179,-0.356053,-0.282179,0.356053,-0.261724,0.405433,-0.203876,0.463283,-0.154498,0.483736,0.212347,0.483736,0.261726,0.463283,0.261726,0.463283,$1*%
+%AMFreePoly3*
+4,1,48,0.193769,0.277084,0.210256,0.277084,0.223594,0.267393,0.239272,0.262299,0.248962,0.248962,0.262299,0.239272,0.267393,0.223594,0.277084,0.210256,0.277084,0.193769,0.282178,0.178092,0.282178,-0.178092,0.277084,-0.193769,0.277084,-0.210256,0.267393,-0.223594,0.262299,-0.239272,0.248962,-0.248962,0.239272,-0.262299,0.223594,-0.267393,0.210256,-0.277084,0.193769,-0.277084,
+0.178092,-0.282178,-0.091864,-0.282178,-0.099852,-0.279582,-0.108146,-0.280896,-0.129862,-0.269831,-0.153044,-0.262299,-0.157980,-0.255505,-0.165464,-0.251692,-0.251692,-0.165464,-0.255505,-0.157980,-0.262299,-0.153044,-0.269831,-0.129864,-0.280896,-0.108147,-0.279582,-0.099852,-0.282178,-0.091864,-0.282178,0.178092,-0.277084,0.193769,-0.277084,0.210256,-0.267393,0.223594,-0.262299,0.239272,
+-0.248962,0.248962,-0.239272,0.262299,-0.223594,0.267393,-0.210256,0.277084,-0.193769,0.277084,-0.178092,0.282178,0.178092,0.282178,0.193769,0.277084,0.193769,0.277084,$1*%
+%AMFreePoly4*
+4,1,16,0.168960,0.477745,0.203876,0.463282,0.261726,0.405432,0.282179,0.356053,0.282179,-0.356053,0.261724,-0.405433,0.203876,-0.463283,0.154498,-0.483736,-0.212347,-0.483736,-0.261726,-0.463283,-0.282179,-0.413904,-0.282179,0.413904,-0.261726,0.463283,-0.212347,0.483736,0.154498,0.483736,0.168960,0.477745,0.168960,0.477745,$1*%
+%AMFreePoly5*
+4,1,48,0.099852,0.279582,0.108147,0.280896,0.129864,0.269831,0.153044,0.262299,0.157980,0.255505,0.165464,0.251692,0.251692,0.165464,0.255505,0.157980,0.262299,0.153044,0.269831,0.129862,0.280896,0.108146,0.279582,0.099852,0.282178,0.091864,0.282178,-0.178092,0.277084,-0.193769,0.277084,-0.210256,0.267393,-0.223594,0.262299,-0.239272,0.248962,-0.248962,0.239272,-0.262299,
+0.223594,-0.267393,0.210256,-0.277084,0.193769,-0.277084,0.178092,-0.282178,-0.178092,-0.282178,-0.193769,-0.277084,-0.210256,-0.277084,-0.223594,-0.267393,-0.239272,-0.262299,-0.248962,-0.248962,-0.262299,-0.239272,-0.267393,-0.223594,-0.277084,-0.210256,-0.277084,-0.193769,-0.282178,-0.178092,-0.282178,0.178092,-0.277084,0.193769,-0.277084,0.210256,-0.267393,0.223594,-0.262299,0.239272,
+-0.248962,0.248962,-0.239272,0.262299,-0.223594,0.267393,-0.210256,0.277084,-0.193769,0.277084,-0.178092,0.282178,0.091864,0.282178,0.099852,0.279582,0.099852,0.279582,$1*%
+%AMFreePoly6*
+4,1,48,0.193769,0.277084,0.210256,0.277084,0.223594,0.267393,0.239272,0.262299,0.248962,0.248962,0.262299,0.239272,0.267393,0.223594,0.277084,0.210256,0.277084,0.193769,0.282178,0.178092,0.282178,-0.091864,0.279582,-0.099852,0.280896,-0.108146,0.269831,-0.129862,0.262299,-0.153044,0.255505,-0.157980,0.251692,-0.165464,0.165464,-0.251692,0.157980,-0.255505,0.153044,-0.262299,
+0.129864,-0.269831,0.108147,-0.280896,0.099852,-0.279582,0.091864,-0.282178,-0.178092,-0.282178,-0.193769,-0.277084,-0.210256,-0.277084,-0.223594,-0.267393,-0.239272,-0.262299,-0.248962,-0.248962,-0.262299,-0.239272,-0.267393,-0.223594,-0.277084,-0.210256,-0.277084,-0.193769,-0.282178,-0.178092,-0.282178,0.178092,-0.277084,0.193769,-0.277084,0.210256,-0.267393,0.223594,-0.262299,0.239272,
+-0.248962,0.248962,-0.239272,0.262299,-0.223594,0.267393,-0.210256,0.277084,-0.193769,0.277084,-0.178092,0.282178,0.178092,0.282178,0.193769,0.277084,0.193769,0.277084,$1*%
+%AMFreePoly7*
+4,1,48,0.193769,0.277084,0.210256,0.277084,0.223594,0.267393,0.239272,0.262299,0.248962,0.248962,0.262299,0.239272,0.267393,0.223594,0.277084,0.210256,0.277084,0.193769,0.282178,0.178092,0.282178,-0.178092,0.277084,-0.193769,0.277084,-0.210256,0.267393,-0.223594,0.262299,-0.239272,0.248962,-0.248962,0.239272,-0.262299,0.223594,-0.267393,0.210256,-0.277084,0.193769,-0.277084,
+0.178092,-0.282178,-0.178092,-0.282178,-0.193769,-0.277084,-0.210256,-0.277084,-0.223594,-0.267393,-0.239272,-0.262299,-0.248962,-0.248962,-0.262299,-0.239272,-0.267393,-0.223594,-0.277084,-0.210256,-0.277084,-0.193769,-0.282178,-0.178092,-0.282178,0.091864,-0.279582,0.099852,-0.280896,0.108147,-0.269831,0.129864,-0.262299,0.153044,-0.255505,0.157980,-0.251692,0.165464,-0.165464,0.251692,
+-0.157980,0.255505,-0.153044,0.262299,-0.129862,0.269831,-0.108146,0.280896,-0.099852,0.279582,-0.091864,0.282178,0.178092,0.282178,0.193769,0.277084,0.193769,0.277084,$1*%
+G04 Aperture macros list end*
+%ADD10RoundRect,0.150000X-0.825000X-0.150000X0.825000X-0.150000X0.825000X0.150000X-0.825000X0.150000X0*%
+%ADD11RoundRect,0.140000X0.140000X0.170000X-0.140000X0.170000X-0.140000X-0.170000X0.140000X-0.170000X0*%
+%ADD12RoundRect,0.140000X0.170000X-0.140000X0.170000X0.140000X-0.170000X0.140000X-0.170000X-0.140000X0*%
+%ADD13RoundRect,0.250000X-0.250000X-0.475000X0.250000X-0.475000X0.250000X0.475000X-0.250000X0.475000X0*%
+%ADD14RoundRect,0.135000X-0.185000X0.135000X-0.185000X-0.135000X0.185000X-0.135000X0.185000X0.135000X0*%
+%ADD15RoundRect,0.140000X-0.170000X0.140000X-0.170000X-0.140000X0.170000X-0.140000X0.170000X0.140000X0*%
+%ADD16R,1.400000X1.200000*%
+%ADD17RoundRect,0.218750X0.218750X0.256250X-0.218750X0.256250X-0.218750X-0.256250X0.218750X-0.256250X0*%
+%ADD18RoundRect,0.140000X-0.140000X-0.170000X0.140000X-0.170000X0.140000X0.170000X-0.140000X0.170000X0*%
+%ADD19RoundRect,0.135000X0.135000X0.185000X-0.135000X0.185000X-0.135000X-0.185000X0.135000X-0.185000X0*%
+%ADD20R,0.980000X3.400000*%
+%ADD21R,0.599999X1.000001*%
+%ADD22RoundRect,0.225000X0.250000X-0.225000X0.250000X0.225000X-0.250000X0.225000X-0.250000X-0.225000X0*%
+%ADD23RoundRect,0.135000X0.185000X-0.135000X0.185000X0.135000X-0.185000X0.135000X-0.185000X-0.135000X0*%
+%ADD24R,0.550000X0.800000*%
+%ADD25RoundRect,0.250000X-0.787500X-1.025000X0.787500X-1.025000X0.787500X1.025000X-0.787500X1.025000X0*%
+%ADD26R,1.100000X0.300000*%
+%ADD27R,3.100000X2.300000*%
+%ADD28RoundRect,0.225000X0.225000X0.250000X-0.225000X0.250000X-0.225000X-0.250000X0.225000X-0.250000X0*%
+%ADD29R,0.450000X0.700000*%
+%ADD30RoundRect,0.250000X0.250000X0.475000X-0.250000X0.475000X-0.250000X-0.475000X0.250000X-0.475000X0*%
+%ADD31RoundRect,0.200000X-0.200000X-0.275000X0.200000X-0.275000X0.200000X0.275000X-0.200000X0.275000X0*%
+%ADD32RoundRect,0.250000X0.295000X-0.295000X0.295000X0.295000X-0.295000X0.295000X-0.295000X-0.295000X0*%
+%ADD33RoundRect,0.062500X0.062500X-0.350000X0.062500X0.350000X-0.062500X0.350000X-0.062500X-0.350000X0*%
+%ADD34RoundRect,0.062500X0.350000X-0.062500X0.350000X0.062500X-0.350000X0.062500X-0.350000X-0.062500X0*%
+%ADD35RoundRect,0.147500X0.147500X0.172500X-0.147500X0.172500X-0.147500X-0.172500X0.147500X-0.172500X0*%
+%ADD36RoundRect,0.135000X-0.135000X-0.185000X0.135000X-0.185000X0.135000X0.185000X-0.135000X0.185000X0*%
+%ADD37RoundRect,0.225000X-0.250000X0.225000X-0.250000X-0.225000X0.250000X-0.225000X0.250000X0.225000X0*%
+%ADD38R,0.425000X0.400000*%
+%ADD39R,1.150000X0.950000*%
+%ADD40R,0.750000X0.300000*%
+%ADD41RoundRect,0.147500X-0.147500X-0.172500X0.147500X-0.172500X0.147500X0.172500X-0.147500X0.172500X0*%
+%ADD42R,0.400000X1.350000*%
+%ADD43R,1.500000X1.900000*%
+%ADD44R,0.200000X0.700000*%
+%ADD45R,0.700000X2.000000*%
+%ADD46R,0.760000X2.000000*%
+%ADD47R,0.800000X2.000000*%
+%ADD48RoundRect,0.218750X-0.218750X-0.256250X0.218750X-0.256250X0.218750X0.256250X-0.218750X0.256250X0*%
+%ADD49FreePoly0,90.000000*%
+%ADD50FreePoly1,90.000000*%
+%ADD51RoundRect,0.241868X0.241867X-0.241867X0.241867X0.241867X-0.241867X0.241867X-0.241867X-0.241867X0*%
+%ADD52FreePoly2,90.000000*%
+%ADD53FreePoly3,90.000000*%
+%ADD54FreePoly4,90.000000*%
+%ADD55FreePoly5,90.000000*%
+%ADD56FreePoly6,90.000000*%
+%ADD57FreePoly7,90.000000*%
+%ADD58RoundRect,0.050000X0.050000X-0.362500X0.050000X0.362500X-0.050000X0.362500X-0.050000X-0.362500X0*%
+%ADD59RoundRect,0.050000X0.362500X-0.050000X0.362500X0.050000X-0.362500X0.050000X-0.362500X-0.050000X0*%
+%ADD60R,0.450000X0.600000*%
+G04 APERTURE END LIST*
+D10*
+%TO.C,U5*%
+X31025000Y41405000D03*
+X31025000Y40135000D03*
+X31025000Y38865000D03*
+X31025000Y37595000D03*
+X35975000Y37595000D03*
+X35975000Y38865000D03*
+X35975000Y40135000D03*
+X35975000Y41405000D03*
+%TD*%
+D11*
+%TO.C,C65*%
+X12780000Y18200000D03*
+X11820000Y18200000D03*
+%TD*%
+%TO.C,C84*%
+X29280000Y13900000D03*
+X28320000Y13900000D03*
+%TD*%
+D12*
+%TO.C,C62*%
+X6700000Y11720000D03*
+X6700000Y12680000D03*
+%TD*%
+D13*
+%TO.C,C72*%
+X12170000Y22000000D03*
+X14070000Y22000000D03*
+%TD*%
+D14*
+%TO.C,R25*%
+X24100000Y14110000D03*
+X24100000Y13090000D03*
+%TD*%
+D12*
+%TO.C,C30*%
+X36770000Y55220000D03*
+X36770000Y56180000D03*
+%TD*%
+D15*
+%TO.C,C37*%
+X35275000Y47880000D03*
+X35275000Y46920000D03*
+%TD*%
+D16*
+%TO.C,Y1*%
+X31300000Y60250000D03*
+X33500000Y60250000D03*
+X33500000Y61950000D03*
+X31300000Y61950000D03*
+%TD*%
+D17*
+%TO.C,D10*%
+X8887500Y19200000D03*
+X7312500Y19200000D03*
+%TD*%
+D18*
+%TO.C,C64*%
+X4290000Y15900000D03*
+X5250000Y15900000D03*
+%TD*%
+D19*
+%TO.C,R16*%
+X14810000Y15200000D03*
+X13790000Y15200000D03*
+%TD*%
+D20*
+%TO.C,L2*%
+X26615000Y19900000D03*
+X28985000Y19900000D03*
+%TD*%
+D12*
+%TO.C,C45*%
+X33770000Y53320000D03*
+X33770000Y54280000D03*
+%TD*%
+D21*
+%TO.C,U8*%
+X27250001Y16875001D03*
+X26300000Y16875001D03*
+X25350002Y16875001D03*
+X25350002Y14125001D03*
+X26300000Y14125001D03*
+X27250001Y14125001D03*
+%TD*%
+D22*
+%TO.C,C82*%
+X23000000Y15625000D03*
+X23000000Y17175000D03*
+%TD*%
+D23*
+%TO.C,R19*%
+X12800000Y16190000D03*
+X12800000Y17210000D03*
+%TD*%
+D11*
+%TO.C,C49*%
+X29750000Y56300000D03*
+X28790000Y56300000D03*
+%TD*%
+D15*
+%TO.C,C54*%
+X21400000Y46580000D03*
+X21400000Y45620000D03*
+%TD*%
+D24*
+%TO.C,D5*%
+X15047700Y11325400D03*
+X13797700Y11325400D03*
+%TD*%
+D15*
+%TO.C,C11*%
+X35100000Y61680000D03*
+X35100000Y60720000D03*
+%TD*%
+D14*
+%TO.C,R10*%
+X33975000Y47585000D03*
+X33975000Y46565000D03*
+%TD*%
+%TO.C,R2*%
+X40270000Y19810000D03*
+X40270000Y18790000D03*
+%TD*%
+%TO.C,R3*%
+X29700000Y60310000D03*
+X29700000Y59290000D03*
+%TD*%
+D12*
+%TO.C,C27*%
+X34770000Y53320000D03*
+X34770000Y54280000D03*
+%TD*%
+D25*
+%TO.C,C79*%
+X2157500Y25300000D03*
+X8382500Y25300000D03*
+%TD*%
+D26*
+%TO.C,J8*%
+X9650000Y53675000D03*
+X9650000Y53175000D03*
+X9650000Y52675000D03*
+X9650000Y52175000D03*
+X9650000Y51675000D03*
+X9650000Y51175000D03*
+X9650000Y50675000D03*
+X9650000Y50175000D03*
+X9650000Y49675000D03*
+X9650000Y49175000D03*
+D27*
+X7950000Y47505000D03*
+X7950000Y55345000D03*
+%TD*%
+D12*
+%TO.C,C50*%
+X22400000Y50320000D03*
+X22400000Y51280000D03*
+%TD*%
+D28*
+%TO.C,C61*%
+X12475000Y12400000D03*
+X10925000Y12400000D03*
+%TD*%
+D14*
+%TO.C,R1*%
+X39185000Y19800000D03*
+X39185000Y18780000D03*
+%TD*%
+D13*
+%TO.C,C67*%
+X12170000Y19950000D03*
+X14070000Y19950000D03*
+%TD*%
+D14*
+%TO.C,R4*%
+X22540000Y54570000D03*
+X22540000Y53550000D03*
+%TD*%
+D15*
+%TO.C,C12*%
+X26250000Y58380000D03*
+X26250000Y57420000D03*
+%TD*%
+D11*
+%TO.C,C32*%
+X22480000Y52300000D03*
+X21520000Y52300000D03*
+%TD*%
+D29*
+%TO.C,D6*%
+X9350000Y12400000D03*
+X8050000Y12400000D03*
+X8700000Y10400000D03*
+%TD*%
+D30*
+%TO.C,C81*%
+X17520000Y19950000D03*
+X15620000Y19950000D03*
+%TD*%
+D18*
+%TO.C,C42*%
+X33690000Y45150000D03*
+X34650000Y45150000D03*
+%TD*%
+D31*
+%TO.C,R24*%
+X27575000Y12600000D03*
+X29225000Y12600000D03*
+%TD*%
+D15*
+%TO.C,C44*%
+X31875000Y43930000D03*
+X31875000Y42970000D03*
+%TD*%
+D11*
+%TO.C,C43*%
+X22450000Y48500000D03*
+X21490000Y48500000D03*
+%TD*%
+D32*
+%TO.C,U6*%
+X9375000Y16475000D03*
+X8025000Y15125000D03*
+X9375000Y15125000D03*
+X8025000Y16475000D03*
+D33*
+X7450000Y13837500D03*
+X7950000Y13837500D03*
+X8450000Y13837500D03*
+X8950000Y13837500D03*
+X9450000Y13837500D03*
+X9950000Y13837500D03*
+D34*
+X10662500Y14550000D03*
+X10662500Y15050000D03*
+X10662500Y15550000D03*
+X10662500Y16050000D03*
+X10662500Y16550000D03*
+X10662500Y17050000D03*
+D33*
+X9950000Y17762500D03*
+X9450000Y17762500D03*
+X8950000Y17762500D03*
+X8450000Y17762500D03*
+X7950000Y17762500D03*
+X7450000Y17762500D03*
+D34*
+X6737500Y17050000D03*
+X6737500Y16550000D03*
+X6737500Y16050000D03*
+X6737500Y15550000D03*
+X6737500Y15050000D03*
+X6737500Y14550000D03*
+%TD*%
+D35*
+%TO.C,FB4*%
+X39285000Y55500000D03*
+X38315000Y55500000D03*
+%TD*%
+D36*
+%TO.C,R12*%
+X11790000Y14100000D03*
+X12810000Y14100000D03*
+%TD*%
+D37*
+%TO.C,C60*%
+X15500000Y5175000D03*
+X15500000Y3625000D03*
+%TD*%
+D38*
+%TO.C,Q1*%
+X13762500Y17750000D03*
+X13762500Y17100000D03*
+X13762500Y16450000D03*
+X15637500Y16450000D03*
+X15637500Y17100000D03*
+X15637500Y17750000D03*
+D39*
+X14700000Y17425000D03*
+D40*
+X14700000Y16450000D03*
+%TD*%
+D12*
+%TO.C,C25*%
+X35770000Y55220000D03*
+X35770000Y56180000D03*
+%TD*%
+D15*
+%TO.C,C13*%
+X27200000Y58380000D03*
+X27200000Y57420000D03*
+%TD*%
+D11*
+%TO.C,C22*%
+X29750000Y57300000D03*
+X28790000Y57300000D03*
+%TD*%
+D13*
+%TO.C,C85*%
+X28650000Y16600000D03*
+X30550000Y16600000D03*
+%TD*%
+D36*
+%TO.C,R13*%
+X4590000Y18100000D03*
+X5610000Y18100000D03*
+%TD*%
+D23*
+%TO.C,R18*%
+X11800000Y16190000D03*
+X11800000Y17210000D03*
+%TD*%
+D12*
+%TO.C,C83*%
+X24200000Y15920000D03*
+X24200000Y16880000D03*
+%TD*%
+D15*
+%TO.C,C51*%
+X22400000Y46580000D03*
+X22400000Y45620000D03*
+%TD*%
+%TO.C,C46*%
+X30875000Y43930000D03*
+X30875000Y42970000D03*
+%TD*%
+D41*
+%TO.C,D7*%
+X13915000Y13600000D03*
+X14885000Y13600000D03*
+%TD*%
+D42*
+%TO.C,J7*%
+X13070000Y65847500D03*
+X12420000Y65847500D03*
+X11770000Y65847500D03*
+X11120000Y65847500D03*
+X10470000Y65847500D03*
+D43*
+X12770000Y68547500D03*
+X10770000Y68547500D03*
+%TD*%
+D19*
+%TO.C,R11*%
+X14910000Y12600000D03*
+X13890000Y12600000D03*
+%TD*%
+D30*
+%TO.C,C78*%
+X17540000Y22000000D03*
+X15640000Y22000000D03*
+%TD*%
+D36*
+%TO.C,R14*%
+X11790000Y15200000D03*
+X12810000Y15200000D03*
+%TD*%
+D23*
+%TO.C,R17*%
+X10100000Y18890000D03*
+X10100000Y19910000D03*
+%TD*%
+D18*
+%TO.C,C63*%
+X4620000Y14200000D03*
+X5580000Y14200000D03*
+%TD*%
+D44*
+%TO.C,Module1*%
+X20280000Y31490000D03*
+X20280000Y34570000D03*
+X20680000Y31490000D03*
+X20680000Y34570000D03*
+X21080000Y31490000D03*
+X21080000Y34570000D03*
+X21480000Y31490000D03*
+X21480000Y34570000D03*
+X21880000Y31490000D03*
+X21880000Y34570000D03*
+X22280000Y31490000D03*
+X22280000Y34570000D03*
+X22680000Y31490000D03*
+X22680000Y34570000D03*
+X23080000Y31490000D03*
+X23080000Y34570000D03*
+X23480000Y31490000D03*
+X23480000Y34570000D03*
+X23880000Y31490000D03*
+X23880000Y34570000D03*
+X24280000Y31490000D03*
+X24280000Y34570000D03*
+X24680000Y31490000D03*
+X24680000Y34570000D03*
+X25080000Y31490000D03*
+X25080000Y34570000D03*
+X25480000Y31490000D03*
+X25480000Y34570000D03*
+X25880000Y31490000D03*
+X25880000Y34570000D03*
+X26280000Y31490000D03*
+X26280000Y34570000D03*
+X26680000Y31490000D03*
+X26680000Y34570000D03*
+X27080000Y31490000D03*
+X27080000Y34570000D03*
+X27480000Y31490000D03*
+X27480000Y34570000D03*
+X27880000Y31490000D03*
+X27880000Y34570000D03*
+X28280000Y31490000D03*
+X28280000Y34570000D03*
+X28680000Y31490000D03*
+X28680000Y34570000D03*
+X29080000Y31490000D03*
+X29080000Y34570000D03*
+X29480000Y31490000D03*
+X29480000Y34570000D03*
+X29880000Y31490000D03*
+X29880000Y34570000D03*
+X30280000Y31490000D03*
+X30280000Y34570000D03*
+X30680000Y31490000D03*
+X30680000Y34570000D03*
+X31080000Y31490000D03*
+X31080000Y34570000D03*
+X31480000Y31490000D03*
+X31480000Y34570000D03*
+X31880000Y31490000D03*
+X31880000Y34570000D03*
+X32280000Y31490000D03*
+X32280000Y34570000D03*
+X32680000Y31490000D03*
+X32680000Y34570000D03*
+X33080000Y31490000D03*
+X33080000Y34570000D03*
+X33480000Y31490000D03*
+X33480000Y34570000D03*
+X33880000Y31490000D03*
+X33880000Y34570000D03*
+X34280000Y31490000D03*
+X34280000Y34570000D03*
+X34680000Y31490000D03*
+X34680000Y34570000D03*
+X35080000Y31490000D03*
+X35080000Y34570000D03*
+X35480000Y31490000D03*
+X35480000Y34570000D03*
+X35880000Y31490000D03*
+X35880000Y34570000D03*
+X36280000Y31490000D03*
+X36280000Y34570000D03*
+X36680000Y31490000D03*
+X36680000Y34570000D03*
+X37080000Y31490000D03*
+X37080000Y34570000D03*
+X37480000Y31490000D03*
+X37480000Y34570000D03*
+X37880000Y31490000D03*
+X37880000Y34570000D03*
+X38280000Y31490000D03*
+X38280000Y34570000D03*
+X38680000Y31490000D03*
+X38680000Y34570000D03*
+X39080000Y31490000D03*
+X39080000Y34570000D03*
+X39480000Y31490000D03*
+X39480000Y34570000D03*
+X39880000Y31490000D03*
+X39880000Y34570000D03*
+X20280000Y65410000D03*
+X20280000Y68490000D03*
+X20680000Y65410000D03*
+X20680000Y68490000D03*
+X21080000Y65410000D03*
+X21080000Y68490000D03*
+X21480000Y65410000D03*
+X21480000Y68490000D03*
+X21880000Y65410000D03*
+X21880000Y68490000D03*
+X22280000Y65410000D03*
+X22280000Y68490000D03*
+X22680000Y65410000D03*
+X22680000Y68490000D03*
+X23080000Y65410000D03*
+X23080000Y68490000D03*
+X23480000Y65410000D03*
+X23480000Y68490000D03*
+X23880000Y65410000D03*
+X23880000Y68490000D03*
+X24280000Y65410000D03*
+X24280000Y68490000D03*
+X24680000Y65410000D03*
+X24680000Y68490000D03*
+X25080000Y65410000D03*
+X25080000Y68490000D03*
+X25480000Y65410000D03*
+X25480000Y68490000D03*
+X25880000Y65410000D03*
+X25880000Y68490000D03*
+X26280000Y65410000D03*
+X26280000Y68490000D03*
+X26680000Y65410000D03*
+X26680000Y68490000D03*
+X27080000Y65410000D03*
+X27080000Y68490000D03*
+X27480000Y65410000D03*
+X27480000Y68490000D03*
+X27880000Y65410000D03*
+X27880000Y68490000D03*
+X28280000Y65410000D03*
+X28280000Y68490000D03*
+X28680000Y65410000D03*
+X28680000Y68490000D03*
+X29080000Y65410000D03*
+X29080000Y68490000D03*
+X29480000Y65410000D03*
+X29480000Y68490000D03*
+X29880000Y65410000D03*
+X29880000Y68490000D03*
+X30280000Y65410000D03*
+X30280000Y68490000D03*
+X30680000Y65410000D03*
+X30680000Y68490000D03*
+X31080000Y65410000D03*
+X31080000Y68490000D03*
+X31480000Y65410000D03*
+X31480000Y68490000D03*
+X31880000Y65410000D03*
+X31880000Y68490000D03*
+X32280000Y65410000D03*
+X32280000Y68490000D03*
+X32680000Y65410000D03*
+X32680000Y68490000D03*
+X33080000Y65410000D03*
+X33080000Y68490000D03*
+X33480000Y65410000D03*
+X33480000Y68490000D03*
+X33880000Y65410000D03*
+X33880000Y68490000D03*
+X34280000Y65410000D03*
+X34280000Y68490000D03*
+X34680000Y65410000D03*
+X34680000Y68490000D03*
+X35080000Y65410000D03*
+X35080000Y68490000D03*
+X35480000Y65410000D03*
+X35480000Y68490000D03*
+X35880000Y65410000D03*
+X35880000Y68490000D03*
+X36280000Y65410000D03*
+X36280000Y68490000D03*
+X36680000Y65410000D03*
+X36680000Y68490000D03*
+X37080000Y65410000D03*
+X37080000Y68490000D03*
+X37480000Y65410000D03*
+X37480000Y68490000D03*
+X37880000Y65410000D03*
+X37880000Y68490000D03*
+X38280000Y65410000D03*
+X38280000Y68490000D03*
+X38680000Y65410000D03*
+X38680000Y68490000D03*
+X39080000Y65410000D03*
+X39080000Y68490000D03*
+X39480000Y65410000D03*
+X39480000Y68490000D03*
+X39880000Y65410000D03*
+X39880000Y68490000D03*
+%TD*%
+D45*
+%TO.C,J1*%
+X8200000Y7000000D03*
+D46*
+X10220000Y7000000D03*
+D47*
+X11450000Y7000000D03*
+D45*
+X9200000Y7000000D03*
+D46*
+X7180000Y7000000D03*
+D47*
+X5950000Y7000000D03*
+%TD*%
+D12*
+%TO.C,C40*%
+X34770000Y55220000D03*
+X34770000Y56180000D03*
+%TD*%
+D41*
+%TO.C,FB1*%
+X17415000Y46600000D03*
+X18385000Y46600000D03*
+%TD*%
+D19*
+%TO.C,R26*%
+X26110000Y12800000D03*
+X25090000Y12800000D03*
+%TD*%
+D48*
+%TO.C,D9*%
+X3512500Y19600000D03*
+X5087500Y19600000D03*
+%TD*%
+D12*
+%TO.C,C55*%
+X21400000Y50320000D03*
+X21400000Y51280000D03*
+%TD*%
+%TO.C,C2*%
+X29700000Y61320000D03*
+X29700000Y62280000D03*
+%TD*%
+%TO.C,C35*%
+X33770000Y55220000D03*
+X33770000Y56180000D03*
+%TD*%
+D49*
+%TO.C,U4*%
+X29700000Y50060000D03*
+D50*
+X26600000Y51260000D03*
+D51*
+X28750000Y50060000D03*
+D50*
+X26600000Y50060000D03*
+D52*
+X28750000Y52210000D03*
+D51*
+X27550000Y51260000D03*
+D49*
+X29700000Y51260000D03*
+D53*
+X26600000Y52210000D03*
+D52*
+X27550000Y52210000D03*
+D54*
+X27550000Y49110000D03*
+D55*
+X29700000Y49110000D03*
+D51*
+X28750000Y51260000D03*
+D54*
+X28750000Y49110000D03*
+D56*
+X26600000Y49110000D03*
+D51*
+X27550000Y50060000D03*
+D57*
+X29700000Y52210000D03*
+D58*
+X24550000Y46222500D03*
+X24950000Y46222500D03*
+X25350000Y46222500D03*
+X25750000Y46222500D03*
+X26150000Y46222500D03*
+X26550000Y46222500D03*
+X26950000Y46222500D03*
+X27350000Y46222500D03*
+X27750000Y46222500D03*
+X28150000Y46222500D03*
+X28550000Y46222500D03*
+X28950000Y46222500D03*
+X29350000Y46222500D03*
+X29750000Y46222500D03*
+X30150000Y46222500D03*
+X30550000Y46222500D03*
+X30950000Y46222500D03*
+X31350000Y46222500D03*
+X31750000Y46222500D03*
+D59*
+X32587500Y47060000D03*
+X32587500Y47460000D03*
+X32587500Y47860000D03*
+X32587500Y48260000D03*
+X32587500Y48660000D03*
+X32587500Y49060000D03*
+X32587500Y49460000D03*
+X32587500Y49860000D03*
+X32587500Y50260000D03*
+X32587500Y50660000D03*
+X32587500Y51060000D03*
+X32587500Y51460000D03*
+X32587500Y51860000D03*
+X32587500Y52260000D03*
+X32587500Y52660000D03*
+X32587500Y53060000D03*
+X32587500Y53460000D03*
+X32587500Y53860000D03*
+X32587500Y54260000D03*
+D58*
+X31750000Y55097500D03*
+X31350000Y55097500D03*
+X30950000Y55097500D03*
+X30550000Y55097500D03*
+X30150000Y55097500D03*
+X29750000Y55097500D03*
+X29350000Y55097500D03*
+X28950000Y55097500D03*
+X28550000Y55097500D03*
+X28150000Y55097500D03*
+X27750000Y55097500D03*
+X27350000Y55097500D03*
+X26950000Y55097500D03*
+X26550000Y55097500D03*
+X26150000Y55097500D03*
+X25750000Y55097500D03*
+X25350000Y55097500D03*
+X24950000Y55097500D03*
+X24550000Y55097500D03*
+D59*
+X23712500Y54260000D03*
+X23712500Y53860000D03*
+X23712500Y53460000D03*
+X23712500Y53060000D03*
+X23712500Y52660000D03*
+X23712500Y52260000D03*
+X23712500Y51860000D03*
+X23712500Y51460000D03*
+X23712500Y51060000D03*
+X23712500Y50660000D03*
+X23712500Y50260000D03*
+X23712500Y49860000D03*
+X23712500Y49460000D03*
+X23712500Y49060000D03*
+X23712500Y48660000D03*
+X23712500Y48260000D03*
+X23712500Y47860000D03*
+X23712500Y47460000D03*
+X23712500Y47060000D03*
+%TD*%
+D60*
+%TO.C,D8*%
+X5100000Y10900000D03*
+X5100000Y13000000D03*
+%TD*%
+D19*
+%TO.C,R15*%
+X5610000Y17000000D03*
+X4590000Y17000000D03*
+%TD*%
+M02*
--- a/Kicad/MainBoard/Gerber/MainBoard-F_Silkscreen.gbr
+++ b/Kicad/MainBoard/Gerber/MainBoard-F_Silkscreen.gbr
@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,(5.99.0-8910-g624a231cc0)*%
-%TF.CreationDate,2021-03-02T10:35:16+01:00*%
+%TF.GenerationSoftware,KiCad,Pcbnew,(6.0.4)*%
+%TF.CreationDate,2022-08-11T23:06:16+02:00*%
 %TF.ProjectId,MainBoard,4d61696e-426f-4617-9264-2e6b69636164,rev?*%
 %TF.SameCoordinates,PXa344e00PY7102aa0*%
 %TF.FileFunction,Legend,Top*%
 %TF.FilePolarity,Positive*%
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW (5.99.0-8910-g624a231cc0)) date 2021-03-02 10:35:16*
+G04 Created by KiCad (PCBNEW (6.0.4)) date 2022-08-11 23:06:16*
 %MOMM*%
 %LPD*%
 G01*
@ -15,8 +15,602 @@ G04 APERTURE LIST*
 %ADD11C,0.120000*%
 %ADD12C,0.152400*%
 %ADD13C,0.100000*%
+%ADD14C,0.200000*%
 G04 APERTURE END LIST*
 D10*
+X992857Y45338096D02*
+X1450000Y45338096D01*
+X1221428Y44538096D02*
+X1221428Y45338096D01*
+X1716666Y44538096D02*
+X1716666Y45338096D01*
+X2021428Y45338096D01*
+X2097619Y45300000D01*
+X2135714Y45261905D01*
+X2173809Y45185715D01*
+X2173809Y45071429D01*
+X2135714Y44995239D01*
+X2097619Y44957143D01*
+X2021428Y44919048D01*
+X1716666Y44919048D01*
+X3507142Y45338096D02*
+X3126190Y45338096D01*
+X3088095Y44957143D01*
+X3126190Y44995239D01*
+X3202380Y45033334D01*
+X3392857Y45033334D01*
+X3469047Y44995239D01*
+X3507142Y44957143D01*
+X3545238Y44880953D01*
+X3545238Y44690477D01*
+X3507142Y44614286D01*
+X3469047Y44576191D01*
+X3392857Y44538096D01*
+X3202380Y44538096D01*
+X3126190Y44576191D01*
+X3088095Y44614286D01*
+X3773809Y45338096D02*
+X4040476Y44538096D01*
+X4307142Y45338096D01*
+X3217857Y48759524D02*
+X3217857Y48492858D01*
+X3636904Y48492858D02*
+X2836904Y48492858D01*
+X2836904Y48873810D01*
+X3636904Y49178572D02*
+X3103571Y49178572D01*
+X3255952Y49178572D02*
+X3179761Y49216667D01*
+X3141666Y49254762D01*
+X3103571Y49330953D01*
+X3103571Y49407143D01*
+X3636904Y49788096D02*
+X3598809Y49711905D01*
+X3560714Y49673810D01*
+X3484523Y49635715D01*
+X3255952Y49635715D01*
+X3179761Y49673810D01*
+X3141666Y49711905D01*
+X3103571Y49788096D01*
+X3103571Y49902381D01*
+X3141666Y49978572D01*
+X3179761Y50016667D01*
+X3255952Y50054762D01*
+X3484523Y50054762D01*
+X3560714Y50016667D01*
+X3598809Y49978572D01*
+X3636904Y49902381D01*
+X3636904Y49788096D01*
+X3103571Y50397620D02*
+X3636904Y50397620D01*
+X3179761Y50397620D02*
+X3141666Y50435715D01*
+X3103571Y50511905D01*
+X3103571Y50626191D01*
+X3141666Y50702381D01*
+X3217857Y50740477D01*
+X3636904Y50740477D01*
+X3103571Y51007143D02*
+X3103571Y51311905D01*
+X2836904Y51121429D02*
+X3522619Y51121429D01*
+X3598809Y51159524D01*
+X3636904Y51235715D01*
+X3636904Y51311905D01*
+X3713095Y51388096D02*
+X3713095Y51997620D01*
+X3103571Y52188096D02*
+X3903571Y52188096D01*
+X3141666Y52188096D02*
+X3103571Y52264286D01*
+X3103571Y52416667D01*
+X3141666Y52492858D01*
+X3179761Y52530953D01*
+X3255952Y52569048D01*
+X3484523Y52569048D01*
+X3560714Y52530953D01*
+X3598809Y52492858D01*
+X3636904Y52416667D01*
+X3636904Y52264286D01*
+X3598809Y52188096D01*
+X3636904Y53254762D02*
+X3217857Y53254762D01*
+X3141666Y53216667D01*
+X3103571Y53140477D01*
+X3103571Y52988096D01*
+X3141666Y52911905D01*
+X3598809Y53254762D02*
+X3636904Y53178572D01*
+X3636904Y52988096D01*
+X3598809Y52911905D01*
+X3522619Y52873810D01*
+X3446428Y52873810D01*
+X3370238Y52911905D01*
+X3332142Y52988096D01*
+X3332142Y53178572D01*
+X3294047Y53254762D01*
+X3103571Y53635715D02*
+X3636904Y53635715D01*
+X3179761Y53635715D02*
+X3141666Y53673810D01*
+X3103571Y53750000D01*
+X3103571Y53864286D01*
+X3141666Y53940477D01*
+X3217857Y53978572D01*
+X3636904Y53978572D01*
+X3103571Y54359524D02*
+X3636904Y54359524D01*
+X3179761Y54359524D02*
+X3141666Y54397620D01*
+X3103571Y54473810D01*
+X3103571Y54588096D01*
+X3141666Y54664286D01*
+X3217857Y54702381D01*
+X3636904Y54702381D01*
+X3598809Y55388096D02*
+X3636904Y55311905D01*
+X3636904Y55159524D01*
+X3598809Y55083334D01*
+X3522619Y55045239D01*
+X3217857Y55045239D01*
+X3141666Y55083334D01*
+X3103571Y55159524D01*
+X3103571Y55311905D01*
+X3141666Y55388096D01*
+X3217857Y55426191D01*
+X3294047Y55426191D01*
+X3370238Y55045239D01*
+X3636904Y55883334D02*
+X3598809Y55807143D01*
+X3522619Y55769048D01*
+X2836904Y55769048D01*
+X48317904Y21404762D02*
+X48965523Y21404762D01*
+X49041714Y21442858D01*
+X49079809Y21480953D01*
+X49117904Y21557143D01*
+X49117904Y21709524D01*
+X49079809Y21785715D01*
+X49041714Y21823810D01*
+X48965523Y21861905D01*
+X48317904Y21861905D01*
+X49079809Y22204762D02*
+X49117904Y22319048D01*
+X49117904Y22509524D01*
+X49079809Y22585715D01*
+X49041714Y22623810D01*
+X48965523Y22661905D01*
+X48889333Y22661905D01*
+X48813142Y22623810D01*
+X48775047Y22585715D01*
+X48736952Y22509524D01*
+X48698857Y22357143D01*
+X48660761Y22280953D01*
+X48622666Y22242858D01*
+X48546476Y22204762D01*
+X48470285Y22204762D01*
+X48394095Y22242858D01*
+X48356000Y22280953D01*
+X48317904Y22357143D01*
+X48317904Y22547620D01*
+X48356000Y22661905D01*
+X48698857Y23271429D02*
+X48736952Y23385715D01*
+X48775047Y23423810D01*
+X48851238Y23461905D01*
+X48965523Y23461905D01*
+X49041714Y23423810D01*
+X49079809Y23385715D01*
+X49117904Y23309524D01*
+X49117904Y23004762D01*
+X48317904Y23004762D01*
+X48317904Y23271429D01*
+X48356000Y23347620D01*
+X48394095Y23385715D01*
+X48470285Y23423810D01*
+X48546476Y23423810D01*
+X48622666Y23385715D01*
+X48660761Y23347620D01*
+X48698857Y23271429D01*
+X48698857Y23004762D01*
+X48698857Y24414286D02*
+X48698857Y24680953D01*
+X49117904Y24795239D02*
+X49117904Y24414286D01*
+X48317904Y24414286D01*
+X48317904Y24795239D01*
+X49117904Y25138096D02*
+X48317904Y25138096D01*
+X48889333Y25404762D01*
+X48317904Y25671429D01*
+X49117904Y25671429D01*
+X49117904Y26052381D02*
+X48317904Y26052381D01*
+X48889333Y26319048D01*
+X48317904Y26585715D01*
+X49117904Y26585715D01*
+X49041714Y27423810D02*
+X49079809Y27385715D01*
+X49117904Y27271429D01*
+X49117904Y27195239D01*
+X49079809Y27080953D01*
+X49003619Y27004762D01*
+X48927428Y26966667D01*
+X48775047Y26928572D01*
+X48660761Y26928572D01*
+X48508380Y26966667D01*
+X48432190Y27004762D01*
+X48356000Y27080953D01*
+X48317904Y27195239D01*
+X48317904Y27271429D01*
+X48356000Y27385715D01*
+X48394095Y27423810D01*
+X50367809Y20661905D02*
+X50405904Y20776191D01*
+X50405904Y20966667D01*
+X50367809Y21042858D01*
+X50329714Y21080953D01*
+X50253523Y21119048D01*
+X50177333Y21119048D01*
+X50101142Y21080953D01*
+X50063047Y21042858D01*
+X50024952Y20966667D01*
+X49986857Y20814286D01*
+X49948761Y20738096D01*
+X49910666Y20700000D01*
+X49834476Y20661905D01*
+X49758285Y20661905D01*
+X49682095Y20700000D01*
+X49644000Y20738096D01*
+X49605904Y20814286D01*
+X49605904Y21004762D01*
+X49644000Y21119048D01*
+X50405904Y21576191D02*
+X50367809Y21500000D01*
+X50291619Y21461905D01*
+X49605904Y21461905D01*
+X50405904Y22223810D02*
+X49986857Y22223810D01*
+X49910666Y22185715D01*
+X49872571Y22109524D01*
+X49872571Y21957143D01*
+X49910666Y21880953D01*
+X50367809Y22223810D02*
+X50405904Y22147620D01*
+X50405904Y21957143D01*
+X50367809Y21880953D01*
+X50291619Y21842858D01*
+X50215428Y21842858D01*
+X50139238Y21880953D01*
+X50101142Y21957143D01*
+X50101142Y22147620D01*
+X50063047Y22223810D01*
+X49872571Y22528572D02*
+X50405904Y22719048D01*
+X49872571Y22909524D01*
+X50367809Y23519048D02*
+X50405904Y23442858D01*
+X50405904Y23290477D01*
+X50367809Y23214286D01*
+X50291619Y23176191D01*
+X49986857Y23176191D01*
+X49910666Y23214286D01*
+X49872571Y23290477D01*
+X49872571Y23442858D01*
+X49910666Y23519048D01*
+X49986857Y23557143D01*
+X50063047Y23557143D01*
+X50139238Y23176191D01*
+X50367809Y24471429D02*
+X50405904Y24585715D01*
+X50405904Y24776191D01*
+X50367809Y24852381D01*
+X50329714Y24890477D01*
+X50253523Y24928572D01*
+X50177333Y24928572D01*
+X50101142Y24890477D01*
+X50063047Y24852381D01*
+X50024952Y24776191D01*
+X49986857Y24623810D01*
+X49948761Y24547620D01*
+X49910666Y24509524D01*
+X49834476Y24471429D01*
+X49758285Y24471429D01*
+X49682095Y24509524D01*
+X49644000Y24547620D01*
+X49605904Y24623810D01*
+X49605904Y24814286D01*
+X49644000Y24928572D01*
+X49872571Y25157143D02*
+X49872571Y25461905D01*
+X49605904Y25271429D02*
+X50291619Y25271429D01*
+X50367809Y25309524D01*
+X50405904Y25385715D01*
+X50405904Y25461905D01*
+X50405904Y25842858D02*
+X50367809Y25766667D01*
+X50329714Y25728572D01*
+X50253523Y25690477D01*
+X50024952Y25690477D01*
+X49948761Y25728572D01*
+X49910666Y25766667D01*
+X49872571Y25842858D01*
+X49872571Y25957143D01*
+X49910666Y26033334D01*
+X49948761Y26071429D01*
+X50024952Y26109524D01*
+X50253523Y26109524D01*
+X50329714Y26071429D01*
+X50367809Y26033334D01*
+X50405904Y25957143D01*
+X50405904Y25842858D01*
+X50405904Y26452381D02*
+X49872571Y26452381D01*
+X50024952Y26452381D02*
+X49948761Y26490477D01*
+X49910666Y26528572D01*
+X49872571Y26604762D01*
+X49872571Y26680953D01*
+X50405904Y27290477D02*
+X49986857Y27290477D01*
+X49910666Y27252381D01*
+X49872571Y27176191D01*
+X49872571Y27023810D01*
+X49910666Y26947620D01*
+X50367809Y27290477D02*
+X50405904Y27214286D01*
+X50405904Y27023810D01*
+X50367809Y26947620D01*
+X50291619Y26909524D01*
+X50215428Y26909524D01*
+X50139238Y26947620D01*
+X50101142Y27023810D01*
+X50101142Y27214286D01*
+X50063047Y27290477D01*
+X49872571Y28014286D02*
+X50520190Y28014286D01*
+X50596380Y27976191D01*
+X50634476Y27938096D01*
+X50672571Y27861905D01*
+X50672571Y27747620D01*
+X50634476Y27671429D01*
+X50367809Y28014286D02*
+X50405904Y27938096D01*
+X50405904Y27785715D01*
+X50367809Y27709524D01*
+X50329714Y27671429D01*
+X50253523Y27633334D01*
+X50024952Y27633334D01*
+X49948761Y27671429D01*
+X49910666Y27709524D01*
+X49872571Y27785715D01*
+X49872571Y27938096D01*
+X49910666Y28014286D01*
+X50367809Y28700000D02*
+X50405904Y28623810D01*
+X50405904Y28471429D01*
+X50367809Y28395239D01*
+X50291619Y28357143D01*
+X49986857Y28357143D01*
+X49910666Y28395239D01*
+X49872571Y28471429D01*
+X49872571Y28623810D01*
+X49910666Y28700000D01*
+X49986857Y28738096D01*
+X50063047Y28738096D01*
+X50139238Y28357143D01*
+X14392857Y43163096D02*
+X14850000Y43163096D01*
+X14621428Y42363096D02*
+X14621428Y43163096D01*
+X15116666Y42363096D02*
+X15116666Y43163096D01*
+X15421428Y43163096D01*
+X15497619Y43125000D01*
+X15535714Y43086905D01*
+X15573809Y43010715D01*
+X15573809Y42896429D01*
+X15535714Y42820239D01*
+X15497619Y42782143D01*
+X15421428Y42744048D01*
+X15116666Y42744048D01*
+X16945238Y42363096D02*
+X16488095Y42363096D01*
+X16716666Y42363096D02*
+X16716666Y43163096D01*
+X16640476Y43048810D01*
+X16564285Y42972620D01*
+X16488095Y42934524D01*
+X17173809Y43163096D02*
+X17440476Y42363096D01*
+X17707142Y43163096D01*
+X12611904Y58388096D02*
+X13069047Y58388096D01*
+X12840476Y57588096D02*
+X12840476Y58388096D01*
+X13335714Y57588096D02*
+X13335714Y58388096D01*
+X13640476Y58388096D01*
+X13716666Y58350000D01*
+X13754761Y58311905D01*
+X13792857Y58235715D01*
+X13792857Y58121429D01*
+X13754761Y58045239D01*
+X13716666Y58007143D01*
+X13640476Y57969048D01*
+X13335714Y57969048D01*
+X15164285Y57588096D02*
+X14707142Y57588096D01*
+X14935714Y57588096D02*
+X14935714Y58388096D01*
+X14859523Y58273810D01*
+X14783333Y58197620D01*
+X14707142Y58159524D01*
+X15469047Y58311905D02*
+X15507142Y58350000D01*
+X15583333Y58388096D01*
+X15773809Y58388096D01*
+X15850000Y58350000D01*
+X15888095Y58311905D01*
+X15926190Y58235715D01*
+X15926190Y58159524D01*
+X15888095Y58045239D01*
+X15430952Y57588096D01*
+X15926190Y57588096D01*
+X16154761Y58388096D02*
+X16421428Y57588096D01*
+X16688095Y58388096D01*
+X8150000Y64788096D02*
+X8150000Y64140477D01*
+X8188095Y64064286D01*
+X8226190Y64026191D01*
+X8302380Y63988096D01*
+X8454761Y63988096D01*
+X8530952Y64026191D01*
+X8569047Y64064286D01*
+X8607142Y64140477D01*
+X8607142Y64788096D01*
+X8950000Y64026191D02*
+X9064285Y63988096D01*
+X9254761Y63988096D01*
+X9330952Y64026191D01*
+X9369047Y64064286D01*
+X9407142Y64140477D01*
+X9407142Y64216667D01*
+X9369047Y64292858D01*
+X9330952Y64330953D01*
+X9254761Y64369048D01*
+X9102380Y64407143D01*
+X9026190Y64445239D01*
+X8988095Y64483334D01*
+X8950000Y64559524D01*
+X8950000Y64635715D01*
+X8988095Y64711905D01*
+X9026190Y64750000D01*
+X9102380Y64788096D01*
+X9292857Y64788096D01*
+X9407142Y64750000D01*
+X10016666Y64407143D02*
+X10130952Y64369048D01*
+X10169047Y64330953D01*
+X10207142Y64254762D01*
+X10207142Y64140477D01*
+X10169047Y64064286D01*
+X10130952Y64026191D01*
+X10054761Y63988096D01*
+X9750000Y63988096D01*
+X9750000Y64788096D01*
+X10016666Y64788096D01*
+X10092857Y64750000D01*
+X10130952Y64711905D01*
+X10169047Y64635715D01*
+X10169047Y64559524D01*
+X10130952Y64483334D01*
+X10092857Y64445239D01*
+X10016666Y64407143D01*
+X9750000Y64407143D01*
+X10359523Y63911905D02*
+X10969047Y63911905D01*
+X11121428Y64026191D02*
+X11235714Y63988096D01*
+X11426190Y63988096D01*
+X11502380Y64026191D01*
+X11540476Y64064286D01*
+X11578571Y64140477D01*
+X11578571Y64216667D01*
+X11540476Y64292858D01*
+X11502380Y64330953D01*
+X11426190Y64369048D01*
+X11273809Y64407143D01*
+X11197619Y64445239D01*
+X11159523Y64483334D01*
+X11121428Y64559524D01*
+X11121428Y64635715D01*
+X11159523Y64711905D01*
+X11197619Y64750000D01*
+X11273809Y64788096D01*
+X11464285Y64788096D01*
+X11578571Y64750000D01*
+X11807142Y64521429D02*
+X12111904Y64521429D01*
+X11921428Y64788096D02*
+X11921428Y64102381D01*
+X11959523Y64026191D01*
+X12035714Y63988096D01*
+X12111904Y63988096D01*
+X12492857Y63988096D02*
+X12416666Y64026191D01*
+X12378571Y64064286D01*
+X12340476Y64140477D01*
+X12340476Y64369048D01*
+X12378571Y64445239D01*
+X12416666Y64483334D01*
+X12492857Y64521429D01*
+X12607142Y64521429D01*
+X12683333Y64483334D01*
+X12721428Y64445239D01*
+X12759523Y64369048D01*
+X12759523Y64140477D01*
+X12721428Y64064286D01*
+X12683333Y64026191D01*
+X12607142Y63988096D01*
+X12492857Y63988096D01*
+X13102380Y63988096D02*
+X13102380Y64521429D01*
+X13102380Y64369048D02*
+X13140476Y64445239D01*
+X13178571Y64483334D01*
+X13254761Y64521429D01*
+X13330952Y64521429D01*
+X13940476Y63988096D02*
+X13940476Y64407143D01*
+X13902380Y64483334D01*
+X13826190Y64521429D01*
+X13673809Y64521429D01*
+X13597619Y64483334D01*
+X13940476Y64026191D02*
+X13864285Y63988096D01*
+X13673809Y63988096D01*
+X13597619Y64026191D01*
+X13559523Y64102381D01*
+X13559523Y64178572D01*
+X13597619Y64254762D01*
+X13673809Y64292858D01*
+X13864285Y64292858D01*
+X13940476Y64330953D01*
+X14664285Y64521429D02*
+X14664285Y63873810D01*
+X14626190Y63797620D01*
+X14588095Y63759524D01*
+X14511904Y63721429D01*
+X14397619Y63721429D01*
+X14321428Y63759524D01*
+X14664285Y64026191D02*
+X14588095Y63988096D01*
+X14435714Y63988096D01*
+X14359523Y64026191D01*
+X14321428Y64064286D01*
+X14283333Y64140477D01*
+X14283333Y64369048D01*
+X14321428Y64445239D01*
+X14359523Y64483334D01*
+X14435714Y64521429D01*
+X14588095Y64521429D01*
+X14664285Y64483334D01*
+X15350000Y64026191D02*
+X15273809Y63988096D01*
+X15121428Y63988096D01*
+X15045238Y64026191D01*
+X15007142Y64102381D01*
+X15007142Y64407143D01*
+X15045238Y64483334D01*
+X15121428Y64521429D01*
+X15273809Y64521429D01*
+X15350000Y64483334D01*
+X15388095Y64407143D01*
+X15388095Y64330953D01*
+X15007142Y64254762D01*
 %TO.C,U8*%
 X25752380Y15500000D02*
 X25990476Y15500000D01*
@ -27,6 +621,15 @@ X26180952Y15357143D02*
 X25990476Y15500000D01*
 X26180952Y15642858D01*
 D11*
+%TO.C,U5*%
+X33500000Y42060000D02*
+X35450000Y42060000D01*
+X33500000Y36940000D02*
+X35450000Y36940000D01*
+X33500000Y42060000D02*
+X30050000Y42060000D01*
+X33500000Y36940000D02*
+X31550000Y36940000D01*
 %TO.C,C65*%
 X12407836Y18560000D02*
 X12192164Y18560000D01*
@ -175,6 +778,21 @@ X8920000Y27560000D02*
 X860000Y27560000D01*
 X860000Y23040000D02*
 X8920000Y23040000D01*
+%TO.C,J8*%
+X6260000Y56750000D02*
+X5660000Y56750000D01*
+X6260000Y46100000D02*
+X5660000Y46100000D01*
+X8850000Y53475000D02*
+X8850000Y53875000D01*
+X8850000Y53875000D02*
+X8450000Y53675000D01*
+X6260000Y56640000D02*
+X6260000Y56750000D01*
+X8450000Y53675000D02*
+X8850000Y53475000D01*
+X6260000Y46210000D02*
+X6260000Y46100000D01*
 %TO.C,C50*%
 X22760000Y50692164D02*
 X22760000Y50907836D01*
@ -259,11 +877,12 @@ X6590000Y14165000D02*
 X6590000Y13690000D01*
 X10810000Y17435000D02*
 X10810000Y17910000D01*
-%TO.C,FB4*%
-X38962779Y54990000D02*
-X38637221Y54990000D01*
-X38962779Y56010000D02*
-X38637221Y56010000D01*
+%TO.C,TP2*%
+X15425000Y56375000D02*
+G75*
+G03*
+X15425000Y56375000I-950000J0D01*
+G01*
 %TO.C,R12*%
 X12146359Y14480000D02*
 X12453641Y14480000D01*
@ -283,20 +902,24 @@ X13712111Y18170000I-72111J0D01*
 G01*
 D11*
 %TO.C,C25*%
-X36130000Y55592164D02*
-X36130000Y55807836D01*
-X35410000Y55592164D02*
-X35410000Y55807836D01*
+X35410000Y54684000D02*
+X36130000Y54684000D01*
+X36130000Y54684000D02*
+X36130000Y55700000D01*
+X35410000Y54684000D02*
+X35410000Y55700000D01*
 %TO.C,C13*%
 X26840000Y58007836D02*
 X26840000Y57792164D01*
 X27560000Y58007836D02*
 X27560000Y57792164D01*
 %TO.C,C22*%
-X29377836Y57660000D02*
-X29162164Y57660000D01*
-X29377836Y56940000D02*
-X29162164Y56940000D01*
+X30286000Y57660000D02*
+X29270000Y57660000D01*
+X30286000Y56940000D02*
+X30286000Y57660000D01*
+X30286000Y56940000D02*
+X29270000Y56940000D01*
 %TO.C,C85*%
 X29338748Y17335000D02*
 X29861252Y17335000D01*
@ -312,15 +935,6 @@ X12180000Y16546359D02*
 X12180000Y16853641D01*
 X11420000Y16546359D02*
 X11420000Y16853641D01*
-%TO.C,U5*%
-X33700000Y42135000D02*
-X30100000Y42135000D01*
-X33700000Y42135000D02*
-X35900000Y42135000D01*
-X33700000Y38915000D02*
-X35900000Y38915000D01*
-X33700000Y38915000D02*
-X31500000Y38915000D01*
 %TO.C,C83*%
 X23840000Y16292164D02*
 X23840000Y16507836D01*
@ -336,6 +950,12 @@ X30515000Y43557836D02*
 X30515000Y43342164D01*
 X31235000Y43557836D02*
 X31235000Y43342164D01*
+%TO.C,TP3*%
+X3500000Y46975000D02*
+G75*
+G03*
+X3500000Y46975000I-950000J0D01*
+G01*
 D13*
 %TO.C,D7*%
 X13360000Y13600000D02*
@ -424,54 +1044,50 @@ X41480000Y31140000D02*
 X40480000Y31140000D01*
 X41480000Y34920000D02*
 X40480000Y34920000D01*
-X55080000Y33490000D02*
+X51580000Y29990000D02*
 G75*
-G02*
-X51580000Y29990000I-3500000J0D01*
+G03*
+X55080000Y33490000I1J3499999D01*
 G01*
-X3580000Y29990000D02*
+X80000Y33490000D02*
 G75*
-G02*
-X80000Y33490000I0J3500000D01*
+G03*
+X3580000Y29990000I3499999J-1D01*
 G01*
-X51580000Y69990000D02*
+X55080000Y66490000D02*
 G75*
-G02*
-X55080000Y66490000I0J-3500000D01*
+G03*
+X51580000Y69990000I-3500000J0D01*
 G01*
-X80000Y66490000D02*
+X3580000Y69990000D02*
 G75*
-G02*
-X3580000Y69990000I3500000J0D01*
+G03*
+X80000Y66490000I0J-3500000D01*
 G01*
+D14*
+%TO.C,J1*%
+X12200000Y7700000D02*
+X13170000Y7700000D01*
+X7550000Y4220000D02*
+X9850000Y4220000D01*
+X4230000Y7700000D02*
+X5200000Y7700000D01*
+X4230000Y6900000D02*
+X4230000Y7700000D01*
+X13170000Y7700000D02*
+X13170000Y6900000D01*
+D11*
 %TO.C,C40*%
 X34410000Y55592164D02*
 X34410000Y55807836D01*
 X35130000Y55592164D02*
 X35130000Y55807836D01*
-%TO.C,J1*%
-X3000000Y9500000D02*
-X3000000Y2100000D01*
-X14400000Y9500000D02*
-X14400000Y2100000D01*
-X3000000Y2100000D02*
-X3900000Y2100000D01*
-X13500000Y9500000D02*
-X14400000Y9500000D01*
-X13500000Y2100000D02*
-X14400000Y2100000D01*
-X3000000Y9500000D02*
-X3900000Y9500000D01*
-X6061803Y9450000D02*
+%TO.C,TP1*%
+X17000000Y44500000D02*
 G75*
 G03*
-X6061803Y9450000I-111803J0D01*
+X17000000Y44500000I-950000J0D01*
 G01*
-%TO.C,FB1*%
-X17500378Y46040000D02*
-X18299622Y46040000D01*
-X17500378Y47160000D02*
-X18299622Y47160000D01*
 %TO.C,R26*%
 X25753641Y13180000D02*
 X25446359Y13180000D01*
--- a/Kicad/MainBoard/Gerber/MainBoard-In1_Cu.gbr
+++ b/Kicad/MainBoard/Gerber/MainBoard-In1_Cu.gbr
--- a/Kicad/MainBoard/Gerber/MainBoard-In2_Cu.gbr
+++ b/Kicad/MainBoard/Gerber/MainBoard-In2_Cu.gbr
--- a/Kicad/MainBoard/Gerber/MainBoard-NPTH.drl
+++ b/Kicad/MainBoard/Gerber/MainBoard-NPTH.drl
@ -1,20 +1,25 @@
 M48
-; DRILL file {KiCad (5.99.0-8910-g624a231cc0)} date 03/02/21 10:35:18
+; DRILL file {KiCad (6.0.4)} date Thu Aug 11 23:06:19 2022
 ; FORMAT={-:-/ absolute / inch / decimal}
-; #@! TF.CreationDate,2021-03-02T10:35:18+01:00
-; #@! TF.GenerationSoftware,Kicad,Pcbnew,(5.99.0-8910-g624a231cc0)
+; #@! TF.CreationDate,2022-08-11T23:06:19+02:00
+; #@! TF.GenerationSoftware,Kicad,Pcbnew,(6.0.4)
 ; #@! TF.FileFunction,NonPlated,1,4,NPTH
 FMAT,2
 INCH
-T1C0.0236
+; #@! TA.AperFunction,NonPlated,NPTH,ComponentDrill
+T1C0.0256
+; #@! TA.AperFunction,NonPlated,NPTH,ComponentDrill
 T2C0.0827
+; #@! TA.AperFunction,NonPlated,NPTH,ComponentDrill
 T3C0.1063
+; #@! TA.AperFunction,NonPlated,NPTH,ComponentDrill
 T4C0.1260
 %
 G90
 G05
 T1
-X0.2047Y0.2815
+X0.19Y0.1575
+X0.4951Y0.1575
 T2
 X0.2969Y2.2886
 X0.2969Y0.8398
@ -32,11 +37,5 @@ X2.0307Y1.3185
 T4
 X1.489Y0.248
 X1.939Y0.248
-T1
-G00X0.4754Y0.2815
-M15
-G01X0.4852Y0.2815
-M16
-G05
 T0
 M30
--- a/Kicad/MainBoard/Gerber/MainBoard-PTH.drl
+++ b/Kicad/MainBoard/Gerber/MainBoard-PTH.drl
@ -1,22 +1,29 @@
 M48
-; DRILL file {KiCad (5.99.0-8910-g624a231cc0)} date 03/02/21 10:35:18
+; DRILL file {KiCad (6.0.4)} date Thu Aug 11 23:06:19 2022
 ; FORMAT={-:-/ absolute / inch / decimal}
-; #@! TF.CreationDate,2021-03-02T10:35:18+01:00
-; #@! TF.GenerationSoftware,Kicad,Pcbnew,(5.99.0-8910-g624a231cc0)
+; #@! TF.CreationDate,2022-08-11T23:06:19+02:00
+; #@! TF.GenerationSoftware,Kicad,Pcbnew,(6.0.4)
 ; #@! TF.FileFunction,Plated,1,4,PTH
 FMAT,2
 INCH
+; #@! TA.AperFunction,Plated,PTH,ComponentDrill
 T1C0.0079
+; #@! TA.AperFunction,Plated,PTH,ViaDrill
 T2C0.0098
+; #@! TA.AperFunction,Plated,PTH,ViaDrill
 T3C0.0118
+; #@! TA.AperFunction,Plated,PTH,ViaDrill
 T4C0.0157
-T5C0.0217
-T6C0.0236
-T7C0.0315
-T8C0.0335
-T9C0.0350
-T10C0.0394
-T11C0.0618
+; #@! TA.AperFunction,Plated,PTH,ComponentDrill
+T5C0.0236
+; #@! TA.AperFunction,Plated,PTH,ComponentDrill
+T6C0.0335
+; #@! TA.AperFunction,Plated,PTH,ComponentDrill
+T7C0.0350
+; #@! TA.AperFunction,Plated,PTH,ComponentDrill
+T8C0.0394
+; #@! TA.AperFunction,Plated,PTH,ComponentDrill
+T9C0.0618
 %
 G90
 G05
@ -31,26 +38,42 @@ X1.1555Y2.0417
 X1.1555Y1.9945
 X1.1555Y1.9472
 T2
+X0.2185Y2.0541
+X0.2195Y2.0945
+X0.2195Y2.0128
+X0.2205Y1.9695
+X0.2411Y2.0327
+X0.2431Y2.0744
 X0.4073Y1.2717
+X0.5039Y1.2579
+X0.5039Y1.065
+X0.5098Y1.4114
 X0.5217Y1.185
 X0.5274Y1.0312
 X0.5492Y1.1831
 X0.5505Y1.008
+X0.563Y1.2598
 X0.5933Y2.5089
 X0.5933Y2.4754
-X0.5984Y1.9213
-X0.622Y1.9409
+X0.6102Y1.9626
+X0.624Y1.0354
+X0.6349Y1.9803
 X0.6445Y2.5197
+X0.6575Y1.0335
+X0.6654Y1.4685
+X0.752Y1.6909
 X0.7783Y2.5512
 X0.7835Y1.377
 X0.8074Y2.5358
 X0.8311Y2.5122
-X0.8386Y1.4193
+X0.8404Y1.414
 X0.861Y2.5354
+X0.9272Y1.7146
 X0.9409Y2.2579
 X0.9478Y2.6476
+X0.9488Y1.6142
 X0.9528Y1.7874
-X0.9567Y1.5669
+X0.9528Y1.2756
 X0.9606Y2.2244
 X0.9669Y2.0945
 X0.9724Y1.7244
@ -58,13 +81,20 @@ X0.9797Y2.6476
 X1.0049Y1.4213
 X1.0157Y2.2283
 X1.0368Y1.4213
+X1.0478Y1.3081
+X1.0734Y1.3065
+X1.0805Y1.2661
+X1.1122Y2.5197
+X1.1142Y1.2717
+X1.1161Y1.308
 X1.1201Y1.7028
 X1.1457Y1.4213
 X1.1811Y1.4213
+X1.1831Y2.5335
 X1.4535Y0.8821
+X1.4587Y1.6821
 X1.4606Y1.9764
 X1.466Y0.9349
-X1.4665Y1.6821
 X1.4675Y1.7746
 X1.4685Y1.9104
 X1.476Y0.9047
@ -74,10 +104,12 @@ X1.5079Y2.3287
 X1.5118Y2.0276
 X1.5197Y0.8071
 X1.5356Y1.4744
+X1.5591Y1.2736
 X1.5889Y1.1652
 X1.5951Y0.8491
 X1.6029Y1.2613
 X1.612Y1.1421
+X1.6201Y1.687
 X1.6211Y2.3287
 X1.6254Y1.2387
 X1.627Y0.8491
@ -90,7 +122,7 @@ X1.7063Y1.0803
 X1.7343Y2.3622
 X1.8071Y2.6772
 T3
-X0.6496Y1.9646
+X0.6594Y2.0059
 X1.8701Y1.4409
 T4
 X0.0303Y2.4488
@ -112,35 +144,39 @@ X0.1228Y0.9094
 X0.1693Y1.8701
 X0.1693Y1.815
 X0.1748Y0.7343
+X0.1772Y0.3051
 X0.178Y0.8543
 X0.2075Y1.0157
 X0.2114Y0.9409
+X0.2343Y1.7638
+X0.2382Y0.9803
 X0.239Y0.0472
 X0.2528Y1.0984
 X0.2677Y0.3976
 X0.311Y0.6535
+X0.3445Y0.3642
 X0.3543Y1.3583
-X0.3728Y0.0866
 X0.374Y0.6535
 X0.3827Y0.8602
-X0.3846Y1.4449
 X0.3886Y1.3307
 X0.3898Y1.3819
+X0.4331Y0.4429
 X0.4417Y0.8248
-X0.4476Y0.3927
+X0.4528Y0.4035
+X0.4823Y0.2756
 X0.4843Y0.0551
-X0.5118Y0.4134
 X0.5219Y2.1392
 X0.5276Y1.8346
 X0.5305Y1.9843
+X0.5315Y1.685
 X0.5394Y0.7323
 X0.5472Y1.8661
+X0.5502Y2.4065
 X0.5677Y2.1398
 X0.5709Y1.8346
 X0.5709Y0.7323
-X0.5827Y1.6929
 X0.6024Y0.7323
-X0.6102Y0.9882
+X0.6122Y0.9547
 X0.6144Y2.1392
 X0.6339Y0.7323
 X0.6693Y0.0669
@ -163,13 +199,16 @@ X0.7559Y1.8701
 X0.8177Y0.3228
 X0.8177Y0.0472
 X0.8858Y2.3307
+X0.8858Y0.374
 X0.9055Y0.7126
+X0.9173Y1.4075
 X0.9252Y0.811
 X0.9488Y0.7126
 X0.9488Y0.4921
 X0.9528Y0.5945
-X0.9831Y1.2992
+X0.987Y1.2992
 X0.9882Y0.7126
+X1.0039Y0.9055
 X1.0079Y2.0669
 X1.0079Y1.9016
 X1.0079Y0.7913
@ -182,9 +221,8 @@ X1.0551Y2.4843
 X1.0709Y1.6339
 X1.0933Y2.1142
 X1.0945Y2.2205
-X1.1051Y1.2972
 X1.1083Y1.8839
-X1.126Y1.5591
+X1.122Y1.5728
 X1.126Y0.5945
 X1.1327Y2.6358
 X1.1524Y0.0472
@ -199,14 +237,21 @@ X1.2087Y2.063
 X1.2087Y2.0118
 X1.2087Y1.9488
 X1.2087Y1.9016
+X1.2205Y1.2933
+X1.2205Y0.374
 X1.2311Y2.6358
 X1.2323Y1.6791
-X1.2402Y1.5374
+X1.2402Y0.9055
 X1.2402Y0.6496
-X1.2567Y1.2992
+X1.2402Y0.4724
+X1.2441Y1.439
 X1.2702Y1.8111
+X1.2992Y1.2933
+X1.3031Y1.626
 X1.3295Y2.6358
-X1.3689Y1.563
+X1.3386Y0.6299
+X1.3386Y0.4724
+X1.3661Y1.563
 X1.378Y1.4055
 X1.3827Y1.3031
 X1.4055Y2.2559
@ -216,14 +261,12 @@ X1.4378Y2.6358
 X1.4646Y2.1142
 X1.4654Y1.3031
 X1.4685Y1.7283
-X1.4803Y1.6201
 X1.4843Y1.4055
 X1.5315Y2.1299
 X1.564Y1.8632
-X1.5717Y1.3071
+X1.5769Y1.3207
 X1.6063Y1.8228
 X1.6142Y2.122
-X1.628Y1.6437
 X1.6406Y2.2697
 X1.689Y0.5354
 X1.7008Y2.0394
@ -231,11 +274,13 @@ X1.7035Y0.0472
 X1.7087Y2.1299
 X1.752Y0.8524
 X1.7559Y2.0118
+X1.8012Y2.5709
 X1.9201Y2.7244
 X1.9882Y2.1654
 X1.9882Y2.1102
 X1.9882Y1.8701
 X1.9882Y1.8071
+X2.0394Y2.0256
 X2.1169Y0.0866
 X2.1366Y2.4488
 X2.1366Y2.1732
@ -244,10 +289,15 @@ X2.1366Y1.6614
 X2.1366Y1.4449
 X2.1366Y0.7953
 X2.1366Y0.4213
-T8
+T5
+X0.1724Y0.2283
+X0.252Y0.172
+X0.4331Y0.172
+X0.5126Y0.2283
+T6
 X0.365Y2.5924
 X0.5618Y2.5924
-T9
+T7
 X1.489Y0.598
 X1.539Y0.498
 X1.589Y0.598
@ -258,28 +308,17 @@ X1.789Y0.598
 X1.839Y0.498
 X1.889Y0.598
 X1.939Y0.498
-T10
+T8
 X1.465Y0.0862
 X1.565Y0.0862
 X1.863Y0.0862
 X1.963Y0.0862
 X2.0539Y1.0266
 X2.0539Y0.9266
-T11
+T9
 X1.402Y0.4012
 X2.026Y0.4012
 T5
-G00X0.186Y0.2283
-M15
-G01X0.2018Y0.2283
-M16
-G05
-G00X0.4833Y0.2283
-M15
-G01X0.499Y0.2283
-M16
-G05
-T6
 G00X0.3256Y2.6849
 M15
 G01X0.3256Y2.7125
@ -290,26 +329,5 @@ M15
 G01X0.6012Y2.6849
 M16
 G05
-T7
-G00X0.1713Y0.3492
-M15
-G01X0.1909Y0.3492
-M16
-G05
-G00X0.1713Y0.1075
-M15
-G01X0.1909Y0.1075
-M16
-G05
-G00X0.4941Y0.3492
-M15
-G01X0.5138Y0.3492
-M16
-G05
-G00X0.4941Y0.1075
-M15
-G01X0.5138Y0.1075
-M16
-G05
 T0
 M30
--- a/Kicad/MainBoard/Gerber/MainBoard-job.gbrjob
+++ b/Kicad/MainBoard/Gerber/MainBoard-job.gbrjob
@ -1,162 +0,0 @@
-{
-  "Header": {
-    "GenerationSoftware": {
-      "Vendor": "KiCad",
-      "Application": "Pcbnew",
-      "Version": "(5.99.0-8910-g624a231cc0)"
-    },
-    "CreationDate": "2021-03-02T10:35:16+01:00"
-  },
-  "GeneralSpecs": {
-    "ProjectId": {
-      "Name": "MainBoard",
-      "GUID": "4d61696e-426f-4617-9264-2e6b69636164",
-      "Revision": "rev?"
-    },
-    "Size": {
-      "X": 55.75,
-      "Y": 70.75
-    },
-    "LayerNumber": 4,
-    "BoardThickness": 1.0,
-    "Finish": "None"
-  },
-  "DesignRules": [
-    {
-      "Layers": "Outer",
-      "PadToPad": 0.1,
-      "PadToTrack": 0.1,
-      "TrackToTrack": 0.13,
-      "MinLineWidth": 0.13,
-      "TrackToRegion": 0.2,
-      "RegionToRegion": 0.2
-    },
-    {
-      "Layers": "Inner",
-      "PadToPad": 0.0,
-      "PadToTrack": 0.0,
-      "TrackToTrack": 0.13,
-      "MinLineWidth": 0.2,
-      "TrackToRegion": 0.2,
-      "RegionToRegion": 0.2
-    }
-  ],
-  "FilesAttributes": [
-    {
-      "Path": "MainBoard-F_Cu.gbr",
-      "FileFunction": "Copper,L1,Top",
-      "FilePolarity": "Positive"
-    },
-    {
-      "Path": "MainBoard-In1_Cu.gbr",
-      "FileFunction": "Copper,L2,Inr",
-      "FilePolarity": "Positive"
-    },
-    {
-      "Path": "MainBoard-In2_Cu.gbr",
-      "FileFunction": "Copper,L3,Inr",
-      "FilePolarity": "Positive"
-    },
-    {
-      "Path": "MainBoard-B_Cu.gbr",
-      "FileFunction": "Copper,L4,Bot",
-      "FilePolarity": "Positive"
-    },
-    {
-      "Path": "MainBoard-F_Silkscreen.gbr",
-      "FileFunction": "Legend,Top",
-      "FilePolarity": "Positive"
-    },
-    {
-      "Path": "MainBoard-B_Silkscreen.gbr",
-      "FileFunction": "Legend,Bot",
-      "FilePolarity": "Positive"
-    },
-    {
-      "Path": "MainBoard-F_Mask.gbr",
-      "FileFunction": "SolderMask,Top",
-      "FilePolarity": "Negative"
-    },
-    {
-      "Path": "MainBoard-B_Mask.gbr",
-      "FileFunction": "SolderMask,Bot",
-      "FilePolarity": "Negative"
-    },
-    {
-      "Path": "MainBoard-Edge_Cuts.gbr",
-      "FileFunction": "Profile",
-      "FilePolarity": "Positive"
-    }
-  ],
-  "MaterialStackup": [
-    {
-      "Type": "Legend",
-      "Name": "Top Silk Screen"
-    },
-    {
-      "Type": "SolderPaste",
-      "Name": "Top Solder Paste"
-    },
-    {
-      "Type": "SolderMask",
-      "Color": "Green",
-      "Thickness": 0.01,
-      "Name": "Top Solder Mask"
-    },
-    {
-      "Type": "Copper",
-      "Thickness": 0.035,
-      "Name": "F.Cu"
-    },
-    {
-      "Type": "Dielectric",
-      "Thickness": 0.1,
-      "Material": "FR4",
-      "Name": "F.Cu/In1.Cu",
-      "Notes": "Type: dielectric layer 1 (from F.Cu to In1.Cu)"
-    },
-    {
-      "Type": "Copper",
-      "Thickness": 0.0175,
-      "Name": "In1.Cu"
-    },
-    {
-      "Type": "Dielectric",
-      "Thickness": 0.665,
-      "Material": "FR4",
-      "Name": "In1.Cu/In2.Cu",
-      "Notes": "Type: dielectric layer 2 (from In1.Cu to In2.Cu)"
-    },
-    {
-      "Type": "Copper",
-      "Thickness": 0.0175,
-      "Name": "In2.Cu"
-    },
-    {
-      "Type": "Dielectric",
-      "Thickness": 0.1,
-      "Material": "FR4",
-      "Name": "In2.Cu/B.Cu",
-      "Notes": "Type: dielectric layer 3 (from In2.Cu to B.Cu)"
-    },
-    {
-      "Type": "Copper",
-      "Thickness": 0.035,
-      "Name": "B.Cu"
-    },
-    {
-      "Type": "SolderMask",
-      "Color": "Green",
-      "Thickness": 0.01,
-      "Name": "Bottom Solder Mask"
-    },
-    {
-      "Type": "SolderPaste",
-      "Name": "Bottom Solder Paste"
-    },
-    {
-      "Type": "Legend",
-      "Name": "Bottom Silk Screen"
-    }
-  ]
-}
--- a/Kicad/MainBoard/Gerber/Pico_NAS_V1.1.zip
+++ b/Kicad/MainBoard/Gerber/Pico_NAS_V1.1.zip
--- a/Kicad/MainBoard/Gerber/PicoNas_V1.2.zip
+++ b/Kicad/MainBoard/Gerber/PicoNas_V1.2.zip
--- a/Kicad/MainBoard/MainBoard.kicad_pcb
+++ b/Kicad/MainBoard/MainBoard.kicad_pcb
--- a/Kicad/MainBoard/MainBoard.kicad_sch
+++ b/Kicad/MainBoard/MainBoard.kicad_sch
@ -201,12 +201,12 @@
        )
      )
    )
-    (symbol "Connector_Generic:Conn_01x10" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at 0 12.7 0)
+    (symbol "Connector_Generic_Shielded:Conn_01x10_Shielded" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "J" (id 0) (at 0.254 12.446 0)
        (effects (font (size 1.27 1.27)))
      )
-      (property "Value" "Conn_01x10" (id 1) (at 0 -15.24 0)
-        (effects (font (size 1.27 1.27)))
+      (property "Value" "Conn_01x10_Shielded" (id 1) (at 1.016 -14.986 0)
+        (effects (font (size 1.27 1.27)) (justify left))
      )
      (property "Footprint" "" (id 2) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
@ -217,97 +217,105 @@
      (property "ki_keywords" "connector" (id 4) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
-      (property "ki_description" "Generic connector, single row, 01x10, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
+      (property "ki_description" "Generic shielded connector, single row, 01x10, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
-      (property "ki_fp_filters" "Connector*:*_1x??_*" (id 6) (at 0 0 0)
+      (property "ki_fp_filters" "Connector*:*_1x??-1SH*" (id 6) (at 0 0 0)
        (effects (font (size 1.27 1.27)) hide)
      )
-      (symbol "Conn_01x10_1_1"
-        (rectangle (start -1.27 -12.573) (end 0 -12.827)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 -10.033) (end 0 -10.287)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 -7.493) (end 0 -7.747)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 -4.953) (end 0 -5.207)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 -2.413) (end 0 -2.667)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 0.127) (end 0 -0.127)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 2.667) (end 0 2.413)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 5.207) (end 0 4.953)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 7.747) (end 0 7.493)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start -1.27 10.287) (end 0 10.033)
-          (stroke (width 0.1524) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
+      (symbol "Conn_01x10_Shielded_1_1"
        (rectangle (start -1.27 11.43) (end 1.27 -13.97)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.016 -12.573) (end 0.254 -12.827)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.016 -10.033) (end 0.254 -10.287)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.016 -7.493) (end 0.254 -7.747)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.016 -4.953) (end 0.254 -5.207)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.016 -2.413) (end 0.254 -2.667)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.016 0.127) (end 0.254 -0.127)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.016 2.667) (end 0.254 2.413)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.016 5.207) (end 0.254 4.953)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.016 7.747) (end 0.254 7.493)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.016 10.287) (end 0.254 10.033)
+          (stroke (width 0.1524) (type default) (color 0 0 0 0))
+          (fill (type none))
+        )
+        (rectangle (start -1.016 11.176) (end 1.016 -13.716)
          (stroke (width 0.254) (type default) (color 0 0 0 0))
          (fill (type background))
        )
-        (pin passive line (at -5.08 10.16 0) (length 3.81)
+        (pin passive line (at -5.08 10.16 0) (length 4.064)
          (name "Pin_1" (effects (font (size 1.27 1.27))))
          (number "1" (effects (font (size 1.27 1.27))))
        )
-        (pin passive line (at -5.08 -12.7 0) (length 3.81)
+        (pin passive line (at -5.08 -12.7 0) (length 4.064)
          (name "Pin_10" (effects (font (size 1.27 1.27))))
          (number "10" (effects (font (size 1.27 1.27))))
        )
-        (pin passive line (at -5.08 7.62 0) (length 3.81)
+        (pin passive line (at -5.08 7.62 0) (length 4.064)
          (name "Pin_2" (effects (font (size 1.27 1.27))))
          (number "2" (effects (font (size 1.27 1.27))))
        )
-        (pin passive line (at -5.08 5.08 0) (length 3.81)
+        (pin passive line (at -5.08 5.08 0) (length 4.064)
          (name "Pin_3" (effects (font (size 1.27 1.27))))
          (number "3" (effects (font (size 1.27 1.27))))
        )
-        (pin passive line (at -5.08 2.54 0) (length 3.81)
+        (pin passive line (at -5.08 2.54 0) (length 4.064)
          (name "Pin_4" (effects (font (size 1.27 1.27))))
          (number "4" (effects (font (size 1.27 1.27))))
        )
-        (pin passive line (at -5.08 0 0) (length 3.81)
+        (pin passive line (at -5.08 0 0) (length 4.064)
          (name "Pin_5" (effects (font (size 1.27 1.27))))
          (number "5" (effects (font (size 1.27 1.27))))
        )
-        (pin passive line (at -5.08 -2.54 0) (length 3.81)
+        (pin passive line (at -5.08 -2.54 0) (length 4.064)
          (name "Pin_6" (effects (font (size 1.27 1.27))))
          (number "6" (effects (font (size 1.27 1.27))))
        )
-        (pin passive line (at -5.08 -5.08 0) (length 3.81)
+        (pin passive line (at -5.08 -5.08 0) (length 4.064)
          (name "Pin_7" (effects (font (size 1.27 1.27))))
          (number "7" (effects (font (size 1.27 1.27))))
        )
-        (pin passive line (at -5.08 -7.62 0) (length 3.81)
+        (pin passive line (at -5.08 -7.62 0) (length 4.064)
          (name "Pin_8" (effects (font (size 1.27 1.27))))
          (number "8" (effects (font (size 1.27 1.27))))
        )
-        (pin passive line (at -5.08 -10.16 0) (length 3.81)
+        (pin passive line (at -5.08 -10.16 0) (length 4.064)
          (name "Pin_9" (effects (font (size 1.27 1.27))))
          (number "9" (effects (font (size 1.27 1.27))))
        )
+        (pin passive line (at 0 -17.78 90) (length 3.81)
+          (name "Shield" (effects (font (size 1.27 1.27))))
+          (number "SH" (effects (font (size 1.27 1.27))))
+        )
      )
    )
    (symbol "power:+12V" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
@ -666,31 +674,20 @@
    (pin "1" (uuid 43e685a6-13a2-4c6d-9cdb-60df1f8a3aec))
  )

-  (symbol (lib_id "Connector_Generic:Conn_01x10") (at 143.51 77.47 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 5d2aca67-b732-42b7-ae2c-c39eca9bbac1)
-    (property "Reference" "J8" (id 0) (at 146.05 77.4699 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "" (id 1) (at 146.05 80.0099 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (id 2) (at 143.51 77.47 0)
+  (symbol (lib_id "power:GND") (at 143.51 95.25 0) (unit 1)
+    (in_bom yes) (on_board yes)
+    (uuid 434dd5a3-6cc5-44aa-947e-28f318590be3)
+    (property "Reference" "#PWR0184" (id 0) (at 143.51 101.6 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "Datasheet" "~" (id 3) (at 143.51 77.47 0)
+    (property "Value" "GND" (id 1) (at 140.97 97.79 0))
+    (property "Footprint" "" (id 2) (at 143.51 95.25 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (pin "1" (uuid d5e16245-e212-4e43-80e9-9ab5fadc16e4))
-    (pin "10" (uuid 99ba7d39-9b38-43af-adb2-f108fe1ab92a))
-    (pin "2" (uuid 4c03ec33-7930-49b5-8e98-2560236a6633))
-    (pin "3" (uuid 50ccf39c-130a-4319-b9f1-cf7f1ce0e2dd))
-    (pin "4" (uuid b1779e01-a968-49d4-be53-eca6e14f1815))
-    (pin "5" (uuid 927f8cae-0a45-42f3-9984-56ccef8bfe5c))
-    (pin "6" (uuid 0078a4d3-cf7d-4d27-bfd9-28d5bc8390a9))
-    (pin "7" (uuid 4800429e-5481-4a21-b856-2daa05343a13))
-    (pin "8" (uuid 31b63194-b64d-465d-a00a-2feba42ddbaa))
-    (pin "9" (uuid ab13f4d1-33e2-4bb8-8825-b4de949fec5b))
+    (property "Datasheet" "" (id 3) (at 143.51 95.25 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 0614bab6-ac49-4374-872b-9212f65964ca))
  )

  (symbol (lib_id "power:GND") (at 26.67 49.53 0) (unit 1)
@ -741,6 +738,40 @@
    (pin "1" (uuid 7bf6f908-560c-4c26-9422-783705572113))
  )

+  (symbol (lib_id "Connector_Generic_Shielded:Conn_01x10_Shielded") (at 143.51 77.47 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 9050ed91-2d02-46b0-9b33-f8043e1d0421)
+    (property "Reference" "J8" (id 0) (at 146.05 77.4699 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Value" "Front_pannel_screen" (id 1) (at 146.05 80.0099 0)
+      (effects (font (size 1.27 1.27)) (justify left))
+    )
+    (property "Footprint" "Connector_FFC-FPC:TE_1-1734839-0_1x10-1MP_P0.5mm_Horizontal" (id 2) (at 143.51 77.47 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 143.51 77.47 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MFR" "TE" (id 4) (at 143.51 77.47 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "1-1734839-0" (id 5) (at 143.51 77.47 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid facdb474-d266-4c84-9bcf-f4bedd3330a5))
+    (pin "10" (uuid b844db36-9701-47f1-9677-075a8410b78a))
+    (pin "2" (uuid 37fdba1f-5910-4bf3-b261-6842d4948071))
+    (pin "3" (uuid 22c56aaf-5998-496f-a3b7-95cd50231b1c))
+    (pin "4" (uuid 4bfd4fc8-bbe2-4d74-b9a3-521652413e6a))
+    (pin "5" (uuid 3d65b2f0-3fd6-4e30-b833-f7b21ed44dee))
+    (pin "6" (uuid cee06e6b-3a9f-47b1-bf6b-0c42e6f70337))
+    (pin "7" (uuid 3252df26-49b9-4e45-8d6c-2517074d8c99))
+    (pin "8" (uuid 060c59b1-c5a7-449c-9ac7-ba93b9c8a83f))
+    (pin "9" (uuid bf418d27-7e3e-4053-a7b1-e6671a31c77e))
+    (pin "SH" (uuid a3140ab5-bfff-4f46-b252-d12556c83cbe))
+  )
+
  (symbol (lib_id "Connector:USB_OTG") (at 29.21 36.83 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid d2b05f74-4004-48a8-bebd-cef780176404)
@ -1297,6 +1328,9 @@
    (path "/1044dfb8-d7d4-4d93-8668-ab271d88d7a4/42902f14-35bd-4d41-9fd9-6b2b59cdea51"
      (reference "#PWR0183") (unit 1) (value "+3V3") (footprint "")
    )
+    (path "/434dd5a3-6cc5-44aa-947e-28f318590be3"
+      (reference "#PWR0184") (unit 1) (value "GND") (footprint "")
+    )
    (path "/41ea58f6-1eae-4678-a863-41eb5f7e9526/9deff1fa-4ae7-4646-99db-a513dce29581"
      (reference "C1") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0402_1005Metric")
    )
@ -1361,19 +1395,19 @@
      (reference "C21") (unit 1) (value "10n") (footprint "Capacitor_SMD:C_0402_1005Metric")
    )
    (path "/2c979e14-b388-4161-9e61-0df9b5317aa8/2b07f911-8da7-4b28-be80-d1c194dc25b0"
-      (reference "C22") (unit 1) (value "2.2u") (footprint "Capacitor_SMD:C_0402_1005Metric")
+      (reference "C22") (unit 1) (value "2.2u") (footprint "CM4+NAS:C_POL_0402_1005Metric")
    )
    (path "/2c979e14-b388-4161-9e61-0df9b5317aa8/d6599ada-ff95-4c7f-a113-1c495f08992e"
-      (reference "C23") (unit 1) (value "2.2u") (footprint "Capacitor_SMD:C_0402_1005Metric")
+      (reference "C23") (unit 1) (value "2.2u") (footprint "CM4+NAS:C_POL_0402_1005Metric")
    )
    (path "/2c979e14-b388-4161-9e61-0df9b5317aa8/71f09d09-6fc5-4302-a2ff-1f49c644df14"
-      (reference "C24") (unit 1) (value "2.2u") (footprint "Capacitor_SMD:C_0402_1005Metric")
+      (reference "C24") (unit 1) (value "2.2u") (footprint "CM4+NAS:C_POL_0402_1005Metric")
    )
    (path "/2c979e14-b388-4161-9e61-0df9b5317aa8/324685dd-5fa6-49ec-82af-56a2194cee6b"
-      (reference "C25") (unit 1) (value "2.2u") (footprint "Capacitor_SMD:C_0402_1005Metric")
+      (reference "C25") (unit 1) (value "2.2u") (footprint "CM4+NAS:C_POL_0402_1005Metric")
    )
    (path "/2c979e14-b388-4161-9e61-0df9b5317aa8/8223259d-2e6c-43ce-98fc-643e8c28f058"
-      (reference "C26") (unit 1) (value "2.2u") (footprint "Capacitor_SMD:C_0402_1005Metric")
+      (reference "C26") (unit 1) (value "2.2u") (footprint "CM4+NAS:C_POL_0402_1005Metric")
    )
    (path "/2c979e14-b388-4161-9e61-0df9b5317aa8/91045b0d-c9b4-482f-91da-bb8332c729af"
      (reference "C27") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0402_1005Metric")
@ -1436,10 +1470,10 @@
      (reference "C46") (unit 1) (value "100n") (footprint "Capacitor_SMD:C_0402_1005Metric")
    )
    (path "/2c979e14-b388-4161-9e61-0df9b5317aa8/ea6551c3-ebe2-41cd-be26-3802efd32ec6"
-      (reference "C47") (unit 1) (value "2.2u") (footprint "Capacitor_SMD:C_0402_1005Metric")
+      (reference "C47") (unit 1) (value "2.2u") (footprint "CM4+NAS:C_POL_0402_1005Metric")
    )
    (path "/2c979e14-b388-4161-9e61-0df9b5317aa8/5a03621c-2818-4ba8-9887-0bf5ea4c97be"
-      (reference "C48") (unit 1) (value "2.2u") (footprint "Capacitor_SMD:C_0402_1005Metric")
+      (reference "C48") (unit 1) (value "2.2u") (footprint "CM4+NAS:C_POL_0402_1005Metric")
    )
    (path "/2c979e14-b388-4161-9e61-0df9b5317aa8/855e0e63-9698-4cd6-abf2-41ddce88ed6c"
      (reference "C49") (unit 1) (value "10n") (footprint "Capacitor_SMD:C_0402_1005Metric")
@ -1624,8 +1658,8 @@
    (path "/d2b05f74-4004-48a8-bebd-cef780176404"
      (reference "J7") (unit 1) (value "USB_OTG") (footprint "Connector_USB:USB_Micro-B_Molex-105017-0001")
    )
-    (path "/5d2aca67-b732-42b7-ae2c-c39eca9bbac1"
-      (reference "J8") (unit 1) (value "Front_pannel_screen") (footprint "Connector_FFC-FPC:TE_0-1734839-9_1x09-1MP_P0.5mm_Horizontal")
+    (path "/9050ed91-2d02-46b0-9b33-f8043e1d0421"
+      (reference "J8") (unit 1) (value "Front_pannel_screen") (footprint "Connector_FFC-FPC:TE_1-1734839-0_1x10-1MP_P0.5mm_Horizontal")
    )
    (path "/cc4e2399-44cd-43eb-b026-ebe39d7ae688/1f5d218b-ef35-43d8-b295-e6659ada7468"
      (reference "L1") (unit 1) (value "SRN6045TA-3R3Y") (footprint "Inductor_SMD:L_Bourns_SRN6045TA")
@ -1667,7 +1701,7 @@
      (reference "R8") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0402_1005Metric")
    )
    (path "/1044dfb8-d7d4-4d93-8668-ab271d88d7a4/02dddb1d-db56-4aea-8497-0fcad96a9877"
-      (reference "R9") (unit 1) (value "5.1k") (footprint "Resistor_SMD:R_0402_1005Metric")
+      (reference "R9") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0402_1005Metric")
    )
    (path "/2c979e14-b388-4161-9e61-0df9b5317aa8/b695415e-75b3-4bff-87ae-c2eb7a8bd2c1"
      (reference "R10") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0402_1005Metric")
@ -1721,16 +1755,16 @@
      (reference "R26") (unit 1) (value "10k") (footprint "Resistor_SMD:R_0402_1005Metric")
    )
    (path "/1044dfb8-d7d4-4d93-8668-ab271d88d7a4/31df3ba5-45c3-4a37-a752-40860eba9e22"
-      (reference "R27") (unit 1) (value "5.1k") (footprint "Resistor_SMD:R_0402_1005Metric")
-    )
-    (path "/cc4e2399-44cd-43eb-b026-ebe39d7ae688/45e72df8-ff93-407f-82b4-5543da130b53"
-      (reference "TP?") (unit 1) (value "TP_5V") (footprint "")
+      (reference "R27") (unit 1) (value "1k") (footprint "Resistor_SMD:R_0402_1005Metric")
    )
    (path "/cc4e2399-44cd-43eb-b026-ebe39d7ae688/aef1b612-3986-4a3c-8ea7-29a170592955"
-      (reference "TP?") (unit 1) (value "TP_1V") (footprint "")
+      (reference "TP1") (unit 1) (value "TP_1V") (footprint "TestPoint:TestPoint_Pad_D1.5mm")
    )
    (path "/cc4e2399-44cd-43eb-b026-ebe39d7ae688/d12270f8-141b-422c-945c-3bd28e333fa1"
-      (reference "TP?") (unit 1) (value "TP_12V") (footprint "")
+      (reference "TP2") (unit 1) (value "TP_12V") (footprint "TestPoint:TestPoint_Pad_D1.5mm")
+    )
+    (path "/cc4e2399-44cd-43eb-b026-ebe39d7ae688/45e72df8-ff93-407f-82b4-5543da130b53"
+      (reference "TP3") (unit 1) (value "TP_5V") (footprint "TestPoint:TestPoint_Pad_D1.5mm")
    )
    (path "/41ea58f6-1eae-4678-a863-41eb5f7e9526/02f2c748-6aaa-4f98-815a-180c1bdf89f0"
      (reference "U1") (unit 1) (value "TPD4EUSB30") (footprint "Package_SON:USON-10_2.5x1.0mm_P0.5mm")
@ -1763,7 +1797,7 @@
      (reference "U4") (unit 7) (value "88SE9215A1_fct") (footprint "Package_DFN_QFN:QFN-76-1EP_9x9mm_P0.4mm_EP3.8x3.8mm_ThermalVias")
    )
    (path "/2c979e14-b388-4161-9e61-0df9b5317aa8/397c9cbe-9f12-4958-bd39-6c8847d5c72e"
-      (reference "U5") (unit 1) (value "AT25SF081-XMHD-X") (footprint "Package_SO:TSSOP-8_4.4x3mm_P0.65mm")
+      (reference "U5") (unit 1) (value "AT25SF081-XMHD-X") (footprint "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm")
    )
    (path "/cc4e2399-44cd-43eb-b026-ebe39d7ae688/0afff963-2563-4fbb-a337-d345b660a7f9"
      (reference "U6") (unit 1) (value "STUSB4500QTR") (footprint "Package_DFN_QFN:QFN-24-1EP_4x4mm_P0.5mm_EP2.7x2.7mm")
--- a/Kicad/MainBoard/MainBoard.xlsx
+++ b/Kicad/MainBoard/MainBoard.xlsx
--- a/Kicad/MainBoard/PCIe_sata.kicad_sch
+++ b/Kicad/MainBoard/PCIe_sata.kicad_sch
@ -4768,7 +4768,7 @@
    (property "MFR" "Kemet" (id 4) (at 208.28 102.87 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 208.28 102.87 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 208.28 102.87 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 2f40d22b-7aaf-4a08-ab85-a38e8c9d92a3))
@ -4793,7 +4793,7 @@
    (property "MFR" "Kemet" (id 4) (at 240.03 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 240.03 81.28 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 240.03 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 376d0f65-964c-4f7d-ae8b-27093a4fbc42))
@ -4940,6 +4940,12 @@
    (property "Datasheet" "" (id 3) (at 107.95 -12.7 0)
      (effects (font (size 1.27 1.27)) hide)
    )
+    (property "MFR" "Marvell" (id 4) (at 132.08 29.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "88SE9215A1" (id 5) (at 132.08 29.21 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
    (pin "51" (uuid 0e5c956a-0664-4fcf-9bb1-1eae993c2225))
    (pin "52" (uuid ad673409-a6b5-412f-bb14-962debd6ec67))
    (pin "54" (uuid 9f680a18-1241-4418-aadb-0c206c9b1e25))
@ -5048,6 +5054,12 @@
    (property "Datasheet" "" (id 3) (at 198.12 7.62 0)
      (effects (font (size 1.27 1.27)) hide)
    )
+    (property "MFR" "Marvell" (id 4) (at 222.25 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "88SE9215A1" (id 5) (at 222.25 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
    (pin "51" (uuid 149f0dc4-9b74-4a1a-a37b-7eb355956a7a))
    (pin "52" (uuid 81590f65-289d-4cbd-9a21-bee45953732b))
    (pin "54" (uuid b46e4178-12e8-455c-a14d-979ddc1da965))
@ -5138,6 +5150,12 @@
    (property "Datasheet" "" (id 3) (at 34.29 -13.97 0)
      (effects (font (size 1.27 1.27)) hide)
    )
+    (property "MFR" "Marvell" (id 4) (at 58.42 27.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "88SE9215A1" (id 5) (at 58.42 27.94 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
    (pin "51" (uuid 2101f025-ec49-40fd-b6ca-3b2ab233317d))
    (pin "52" (uuid 2d67f001-8a00-4e23-8fcc-c834766c2b0b))
    (pin "54" (uuid 9946e965-8f1d-4023-a90a-47a4a8226617))
@ -5331,7 +5349,7 @@
    (property "MFR" "Kemet" (id 4) (at 266.7 156.21 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 266.7 156.21 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 266.7 156.21 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 6f50293d-8346-47f9-b525-20748958c2fd))
@ -5356,7 +5374,7 @@
    (property "MFR" "Kemet" (id 4) (at 102.87 73.66 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 102.87 73.66 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 102.87 73.66 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 0ca409dc-25e4-4372-bd9c-555b35146fa1))
@ -5374,6 +5392,12 @@
    (property "Datasheet" "" (id 3) (at 96.52 120.65 0)
      (effects (font (size 1.27 1.27)) hide)
    )
+    (property "MFR" "Marvell" (id 4) (at 120.65 162.56 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "88SE9215A1" (id 5) (at 120.65 162.56 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
    (pin "51" (uuid 5d28ac6a-038b-41fa-a41c-77399bf887bc))
    (pin "52" (uuid e8276d7a-599d-4ddf-b976-d27fd2070882))
    (pin "54" (uuid 2c8d589a-b9f4-4b08-9a5c-2a4974fdd278))
@ -5459,13 +5483,13 @@
    (property "Value" "2.2u" (id 1) (at 189.23 82.55 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Footprint" "Capacitor_SMD:C_0402_1005Metric" (id 2) (at 186.69 81.28 0)
+    (property "Footprint" "CM4+NAS:C_POL_0402_1005Metric" (id 2) (at 186.69 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 186.69 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MFR" "TDK" (id 4) (at 186.69 81.28 0)
+    (property "MFR" "AVX" (id 4) (at 186.69 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "MPN" "C1005X5R1C225K050BC" (id 5) (at 186.69 81.28 0)
@ -5493,7 +5517,7 @@
    (property "MFR" "Kemet" (id 4) (at 44.45 68.58 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 44.45 68.58 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 44.45 68.58 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid e2580016-17fa-4002-9341-e434f969b70e))
@ -5559,13 +5583,13 @@
    (property "Value" "2.2u" (id 1) (at 191.77 139.7 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Footprint" "Capacitor_SMD:C_0402_1005Metric" (id 2) (at 189.23 138.43 0)
+    (property "Footprint" "CM4+NAS:C_POL_0402_1005Metric" (id 2) (at 189.23 138.43 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 189.23 138.43 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MFR" "TDK" (id 4) (at 189.23 138.43 0)
+    (property "MFR" "AVX" (id 4) (at 189.23 138.43 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "MPN" "C1005X5R1C225K050BC" (id 5) (at 189.23 138.43 0)
@ -5593,7 +5617,7 @@
    (property "MFR" "Kemet" (id 4) (at 102.87 63.5 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 102.87 63.5 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 102.87 63.5 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid cc2b5983-92aa-4358-b3ce-3ca9e9a59714))
@ -5674,10 +5698,10 @@
    (property "Reference" "U5" (id 0) (at 158.75 179.07 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Value" "AT25SF081-XMHD-X" (id 1) (at 140.97 181.61 0)
+    (property "Value" "" (id 1) (at 140.97 181.61 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Footprint" "Package_SO:TSSOP-8_4.4x3mm_P0.65mm" (id 2) (at 142.24 195.58 0)
+    (property "Footprint" "" (id 2) (at 142.24 195.58 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "https://www.adestotech.com/wp-content/uploads/DS-AT25SF081_045.pdf" (id 3) (at 142.24 180.34 0)
@ -5717,7 +5741,7 @@
    (property "MFR" "Kemet" (id 4) (at 266.7 138.43 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 266.7 138.43 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 266.7 138.43 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid bfc6b4dc-538c-463e-b1e9-11a42086ad0c))
@ -5779,7 +5803,7 @@
    (property "MFR" "Kemet" (id 4) (at 35.56 71.12 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 35.56 71.12 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 35.56 71.12 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 51a75e4b-ffc0-41ed-9c96-47c99ea7e0b7))
@ -5804,7 +5828,7 @@
    (property "MFR" "Kemet" (id 4) (at 222.25 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 222.25 81.28 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 222.25 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 869a1ce2-14ab-4e6c-abe9-6b3fc363f598))
@ -5829,7 +5853,7 @@
    (property "MFR" "Kemet" (id 4) (at 111.76 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 111.76 81.28 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 111.76 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid ab17f4f6-dc32-4406-9487-4a44f2ac87f4))
@ -5891,7 +5915,7 @@
    (property "MFR" "Kemet" (id 4) (at 208.28 120.65 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 208.28 120.65 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 208.28 120.65 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid e85fbadd-c34b-452b-9d48-b9973b5ac143))
@ -5916,7 +5940,7 @@
    (property "MFR" "Kemet" (id 4) (at 111.76 66.04 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 111.76 66.04 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 111.76 66.04 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid b73d7cfa-b54a-44ab-99c6-57adb5a80705))
@ -6002,7 +6026,7 @@
    (property "MFR" "Kemet" (id 4) (at 35.56 76.2 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 35.56 76.2 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 35.56 76.2 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 380b1c87-1327-4e33-a793-11abc704c090))
@ -6055,13 +6079,13 @@
    (property "Value" "2.2u" (id 1) (at 250.19 157.48 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Footprint" "Capacitor_SMD:C_0402_1005Metric" (id 2) (at 247.65 156.21 0)
+    (property "Footprint" "CM4+NAS:C_POL_0402_1005Metric" (id 2) (at 247.65 156.21 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 247.65 156.21 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MFR" "TDK" (id 4) (at 247.65 156.21 0)
+    (property "MFR" "AVX" (id 4) (at 247.65 156.21 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "MPN" "C1005X5R1C225K050BC" (id 5) (at 247.65 156.21 0)
@ -6262,7 +6286,7 @@
    (property "MFR" "Kemet" (id 4) (at 102.87 78.74 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 102.87 78.74 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 102.87 78.74 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 1268646b-d7cb-410a-bedf-da3405971fea))
@ -6422,7 +6446,7 @@
    (property "MFR" "Kemet" (id 4) (at 35.56 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 35.56 81.28 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 35.56 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid eef5a20a-c495-4d59-92e2-f45b77bfbabc))
@ -6483,13 +6507,13 @@
    (property "Value" "2.2u" (id 1) (at 191.77 121.92 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Footprint" "Capacitor_SMD:C_0402_1005Metric" (id 2) (at 189.23 120.65 0)
+    (property "Footprint" "CM4+NAS:C_POL_0402_1005Metric" (id 2) (at 189.23 120.65 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 189.23 120.65 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MFR" "TDK" (id 4) (at 189.23 120.65 0)
+    (property "MFR" "AVX" (id 4) (at 189.23 120.65 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "MPN" "C1005X5R1C225K050BC" (id 5) (at 189.23 120.65 0)
@ -6533,7 +6557,7 @@
    (property "MFR" "Kemet" (id 4) (at 205.74 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 205.74 81.28 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 205.74 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid daed4a3a-6b5e-4cc0-8d84-d10102cb9239))
@ -6599,7 +6623,7 @@
    (property "MFR" "Kemet" (id 4) (at 208.28 138.43 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 208.28 138.43 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 208.28 138.43 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 663f215a-7474-464f-a7c1-8b658f9ea86a))
@ -6637,6 +6661,12 @@
    (property "Datasheet" "" (id 3) (at 50.8 21.59 0)
      (effects (font (size 1.27 1.27)) hide)
    )
+    (property "MFR" "Marvell" (id 4) (at 74.93 63.5 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "88SE9215A1" (id 5) (at 74.93 63.5 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
    (pin "51" (uuid e8f1b820-faa5-4505-aec2-16ae742413fe))
    (pin "52" (uuid 716d3e07-623e-497f-945c-16daf2a02cec))
    (pin "54" (uuid 32b13f48-766e-4a55-8288-076cc8c02164))
@ -6706,13 +6736,13 @@
    (property "Value" "2.2u" (id 1) (at 191.77 156.21 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Footprint" "Capacitor_SMD:C_0402_1005Metric" (id 2) (at 189.23 154.94 0)
+    (property "Footprint" "CM4+NAS:C_POL_0402_1005Metric" (id 2) (at 189.23 154.94 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 189.23 154.94 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MFR" "TDK" (id 4) (at 189.23 154.94 0)
+    (property "MFR" "AVX" (id 4) (at 189.23 154.94 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "MPN" "C1005X5R1C225K050BC" (id 5) (at 189.23 154.94 0)
@ -6765,7 +6795,7 @@
    (property "MFR" "Kemet" (id 4) (at 248.92 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 248.92 81.28 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 248.92 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 3aebe0dd-459a-465d-b41f-c9a30c6586cd))
@ -6790,7 +6820,7 @@
    (property "MFR" "Kemet" (id 4) (at 102.87 68.58 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 102.87 68.58 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 102.87 68.58 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 8f7df668-4b98-4454-8425-8cd966243dd8))
@ -7074,7 +7104,7 @@
    (property "MFR" "Kemet" (id 4) (at 229.87 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 229.87 81.28 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 229.87 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 96bd104b-8d9c-4f53-b788-d399e2b55caa))
@ -7131,7 +7161,7 @@
    (property "MFR" "Kemet" (id 4) (at 208.28 154.94 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 208.28 154.94 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 208.28 154.94 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 9c40ec94-7ef4-44ab-89a7-351781fae0b2))
@ -7193,7 +7223,7 @@
    (property "MFR" "Kemet" (id 4) (at 111.76 71.12 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 111.76 71.12 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 111.76 71.12 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 71a2a23e-37b6-482c-997f-0acb80813330))
@ -7350,7 +7380,7 @@
    (property "MFR" "Kemet" (id 4) (at 44.45 73.66 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 44.45 73.66 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 44.45 73.66 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 20c49358-91b9-4d70-b032-54574a33921e))
@ -7396,7 +7426,7 @@
    (property "MFR" "Kemet" (id 4) (at 35.56 66.04 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 35.56 66.04 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 35.56 66.04 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid f30e9c60-cefa-45a1-a9bf-dfff80137071))
@ -7414,6 +7444,12 @@
    (property "Datasheet" "" (id 3) (at 50.8 128.27 0)
      (effects (font (size 1.27 1.27)) hide)
    )
+    (property "MFR" "Marvell" (id 4) (at 74.93 170.18 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "88SE9215A1" (id 5) (at 74.93 170.18 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
    (pin "51" (uuid 4c2296af-32ad-43f5-a2a0-7acff7a8cb73))
    (pin "52" (uuid 764e9b26-4057-4449-8217-56505e0f3401))
    (pin "54" (uuid 11e5ad7c-b3cd-4d0a-b629-21b4d9115b6f))
@ -7492,7 +7528,7 @@
    (property "MFR" "Kemet" (id 4) (at 214.63 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 214.63 81.28 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 214.63 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 1d999b8f-a8ce-4cde-af12-dc81c3f6d32a))
@ -7524,13 +7560,13 @@
    (property "Value" "2.2u" (id 1) (at 191.77 104.14 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Footprint" "Capacitor_SMD:C_0402_1005Metric" (id 2) (at 189.23 102.87 0)
+    (property "Footprint" "CM4+NAS:C_POL_0402_1005Metric" (id 2) (at 189.23 102.87 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 189.23 102.87 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MFR" "TDK" (id 4) (at 189.23 102.87 0)
+    (property "MFR" "AVX" (id 4) (at 189.23 102.87 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "MPN" "C1005X5R1C225K050BC" (id 5) (at 189.23 102.87 0)
@ -7558,7 +7594,7 @@
    (property "MFR" "Kemet" (id 4) (at 44.45 63.5 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 44.45 63.5 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 44.45 63.5 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid 5a5353a4-b657-4b10-ba44-1d3ff472a19e))
@ -7695,13 +7731,13 @@
    (property "Value" "2.2u" (id 1) (at 250.19 139.7 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Footprint" "Capacitor_SMD:C_0402_1005Metric" (id 2) (at 247.65 138.43 0)
+    (property "Footprint" "CM4+NAS:C_POL_0402_1005Metric" (id 2) (at 247.65 138.43 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 247.65 138.43 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MFR" "TDK" (id 4) (at 247.65 138.43 0)
+    (property "MFR" "AVX" (id 4) (at 247.65 138.43 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "MPN" "C1005X5R1C225K050BC" (id 5) (at 247.65 138.43 0)
@ -7729,7 +7765,7 @@
    (property "MFR" "Kemet" (id 4) (at 44.45 78.74 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 44.45 78.74 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 44.45 78.74 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid b1cc581e-780e-4a76-a8ff-841f01f8c861))
@ -7754,7 +7790,7 @@
    (property "MFR" "Kemet" (id 4) (at 257.81 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 257.81 81.28 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 257.81 81.28 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid e1c40a78-717a-4894-ab45-30b0d243cc76))
@ -7793,6 +7829,12 @@
    (property "Datasheet" "" (id 3) (at 26.67 73.66 0)
      (effects (font (size 1.27 1.27)) hide)
    )
+    (property "MFR" "Marvell" (id 4) (at 50.8 115.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "88SE9215A1" (id 5) (at 50.8 115.57 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
    (pin "51" (uuid 0311fc11-2032-440f-a4be-df1fd105e702))
    (pin "52" (uuid 9e08eaf7-a538-49e1-acb3-91e047bc3fd7))
    (pin "54" (uuid 5ecc883d-1aa9-4578-8b5c-1384fffb9705))
@ -7924,7 +7966,7 @@
    (property "MFR" "Kemet" (id 4) (at 111.76 76.2 0)
      (effects (font (size 1.27 1.27)) hide)
    )
-    (property "MPN" "C0402C103K4RAC7411" (id 5) (at 111.76 76.2 0)
+    (property "MPN" "F981A225MUA " (id 5) (at 111.76 76.2 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (pin "1" (uuid ee01bfe6-2206-4659-8e51-2e105454f4f5))
--- a/Kicad/MainBoard/Power.kicad_sch
+++ b/Kicad/MainBoard/Power.kicad_sch
@ -3114,18 +3114,21 @@
  (symbol (lib_id "Connector:TestPoint") (at 265.43 38.1 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid 45e72df8-ff93-407f-82b4-5543da130b53)
-    (property "Reference" "TP?" (id 0) (at 264.16 30.48 0)
+    (property "Reference" "TP3" (id 0) (at 264.16 30.48 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Value" "" (id 1) (at 261.62 33.02 0)
+    (property "Value" "TP_5V" (id 1) (at 261.62 33.02 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Footprint" "" (id 2) (at 270.51 38.1 0)
+    (property "Footprint" "TestPoint:TestPoint_Pad_D1.5mm" (id 2) (at 270.51 38.1 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 270.51 38.1 0)
      (effects (font (size 1.27 1.27)) hide)
    )
+    (property "DNP" "DNP" (id 4) (at 265.43 38.1 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
    (pin "1" (uuid 8fea26c6-4c43-41a9-b9df-1939201871e0))
  )

@ -3161,6 +3164,12 @@
    (property "Datasheet" "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" (id 3) (at 32.385 69.215 0)
      (effects (font (size 1.27 1.27)) hide)
    )
+    (property "MFR" "GCT" (id 4) (at 30.48 85.09 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "MPN" "USB4140-GF-0070-C " (id 5) (at 30.48 85.09 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
    (pin "A12" (uuid a6b0c3e4-0579-450a-9127-c31fb00c6692))
    (pin "A5" (uuid e738289c-fa10-4988-9f1d-372cde655314))
    (pin "A9" (uuid 950dd34d-7b05-45d2-bad9-0790ba3528c9))
@ -3653,18 +3662,21 @@
  (symbol (lib_id "Connector:TestPoint") (at 149.86 165.1 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid aef1b612-3986-4a3c-8ea7-29a170592955)
-    (property "Reference" "TP?" (id 0) (at 148.59 157.48 0)
+    (property "Reference" "TP1" (id 0) (at 148.59 157.48 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Value" "" (id 1) (at 146.05 160.02 0)
+    (property "Value" "TP_1V" (id 1) (at 146.05 160.02 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Footprint" "" (id 2) (at 154.94 165.1 0)
+    (property "Footprint" "TestPoint:TestPoint_Pad_D1.5mm" (id 2) (at 154.94 165.1 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 154.94 165.1 0)
      (effects (font (size 1.27 1.27)) hide)
    )
+    (property "DNP" "DNP" (id 4) (at 149.86 165.1 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
    (pin "1" (uuid ca61d19e-d87a-4730-ba7d-f26ee76882d7))
  )

@ -3894,18 +3906,21 @@
  (symbol (lib_id "Connector:TestPoint") (at 160.02 59.69 0) (unit 1)
    (in_bom yes) (on_board yes)
    (uuid d12270f8-141b-422c-945c-3bd28e333fa1)
-    (property "Reference" "TP?" (id 0) (at 158.75 52.07 0)
+    (property "Reference" "TP2" (id 0) (at 158.75 52.07 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Value" "" (id 1) (at 156.21 54.61 0)
+    (property "Value" "TP_12V" (id 1) (at 156.21 54.61 0)
      (effects (font (size 1.27 1.27)) (justify left))
    )
-    (property "Footprint" "" (id 2) (at 165.1 59.69 0)
+    (property "Footprint" "TestPoint:TestPoint_Pad_D1.5mm" (id 2) (at 165.1 59.69 0)
      (effects (font (size 1.27 1.27)) hide)
    )
    (property "Datasheet" "~" (id 3) (at 165.1 59.69 0)
      (effects (font (size 1.27 1.27)) hide)
    )
+    (property "DNP" "DNP" (id 4) (at 160.02 59.69 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
    (pin "1" (uuid b5603d9f-40a5-4417-93b5-f8ddbc5e4763))
  )