Starting assembly of V1.3: iBom generated

Update readme and photos
update readme: add git link
2023-07-19 12:59:17 +02:00 · 2023-05-25 01:56:31 +02:00 · 2023-05-25 01:14:44 +02:00 · 2023-01-17 00:22:10 +01:00 · 2023-01-17 00:09:38 +01:00 · 2022-11-21 17:00:12 +01:00
67 changed files with 671175 additions and 136694 deletions
--- a/CAD/Enclosure_base.SLDPRT
+++ b/CAD/Enclosure_base.SLDPRT
--- a/CAD/Enclosure_base.STL
+++ b/CAD/Enclosure_base.STL
--- a/CAD/Enclosure_huat.SLDPRT
+++ b/CAD/Enclosure_huat.SLDPRT
--- a/CAD/Enclosure_huat.STL
+++ b/CAD/Enclosure_huat.STL
--- a/CAD/NAS_V0.1.SLDASM
+++ b/CAD/NAS_V0.1.SLDASM
--- a/Kicad/MainBoard/3D/USB4140-GF-0170-C.stp
+++ b/Kicad/MainBoard/3D/USB4140-GF-0170-C.stp
--- a/Kicad/MainBoard/BOM/ibom.html
+++ b/Kicad/MainBoard/BOM/ibom.html
--- 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+NAS.pretty/GCT_USB4140-GF-0070-C_REV0.4.kicad_mod
+++ b/Kicad/MainBoard/CM4+NAS.pretty/GCT_USB4140-GF-0070-C_REV0.4.kicad_mod
@@ -0,0 +1,47 @@
+(footprint "GCT_USB4140-GF-0070-C_REV0.4" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 62EFA20C)
+  (attr through_hole)
+  (fp_text reference "REF**" (at -1.945 -3.635) (layer "F.SilkS")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 3723b8cb-6830-4176-80ca-e69499de6ffb)
+  )
+  (fp_text value "GCT_USB4140-GF-0070-C_REV0.4" (at 12.66 3.635) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 4643d211-aeaf-49ae-8bb3-9da5ba42c6e9)
+  )
+  (fp_line (start 4.47 -1.9) (end 4.47 -1.1) (layer "F.SilkS") (width 0.2) (tstamp 0c62fc33-3086-4f58-b488-8c41b975b0ac))
+  (fp_line (start -1.15 1.58) (end 1.15 1.58) (layer "F.SilkS") (width 0.2) (tstamp 3938f0d4-62be-4378-94bd-e070f126a8bf))
+  (fp_line (start -4.47 -1.1) (end -4.47 -1.9) (layer "F.SilkS") (width 0.2) (tstamp b34bc460-130b-4399-8a99-8d9dac72e927))
+  (fp_line (start 3.5 -1.9) (end 4.47 -1.9) (layer "F.SilkS") (width 0.2) (tstamp c63e1f50-3466-402f-b4f3-04e169a49b85))
+  (fp_line (start -4.47 -1.9) (end -3.5 -1.9) (layer "F.SilkS") (width 0.2) (tstamp c956e012-de03-415a-8747-9335ef9cf41b))
+  (fp_line (start 5.12 -2.45) (end -5.12 -2.45) (layer "F.CrtYd") (width 0.05) (tstamp 12811468-7564-4eed-b30b-e4f461b1b115))
+  (fp_line (start -5.12 2.65) (end 5.12 2.65) (layer "F.CrtYd") (width 0.05) (tstamp 24047b8b-8504-4ce6-ad2b-e7ab81ef34ef))
+  (fp_line (start -5.12 -2.45) (end -5.12 2.65) (layer "F.CrtYd") (width 0.05) (tstamp 771e03f3-9f97-442a-a238-18973b234c1f))
+  (fp_line (start 5.12 2.65) (end 5.12 -2.45) (layer "F.CrtYd") (width 0.05) (tstamp a5820357-aefc-4e54-afc1-d7fbdb61094c))
+  (fp_line (start -4.47 -1.9) (end 4.47 -1.9) (layer "F.Fab") (width 0.1) (tstamp 4fea8a52-577e-46c0-8234-4cc3465bf823))
+  (fp_line (start -2.9 2.4) (end -4.47 2.4) (layer "F.Fab") (width 0.1) (tstamp 5ac09499-36ac-4382-80a3-f9a46e2e4e9b))
+  (fp_line (start 4.47 2.4) (end 2.9 2.4) (layer "F.Fab") (width 0.1) (tstamp 82118478-c769-4e93-8016-54af5fe46508))
+  (fp_line (start 4.47 -1.9) (end 4.47 2.4) (layer "F.Fab") (width 0.1) (tstamp c5866ee1-780d-422f-bb8a-5781aa10fbfb))
+  (fp_line (start -2.9 1.58) (end -2.9 2.4) (layer "F.Fab") (width 0.1) (tstamp ca2fd8b7-e4d3-419a-a0cc-a8b1f32d3e05))
+  (fp_line (start 2.9 1.58) (end -2.9 1.58) (layer "F.Fab") (width 0.1) (tstamp ce7709e8-9d69-44d9-bda8-89cdcce30ae9))
+  (fp_line (start 2.9 2.4) (end 2.9 1.58) (layer "F.Fab") (width 0.1) (tstamp cfc07e4b-d234-462e-9250-a9a7d9d4386b))
+  (fp_line (start -4.47 2.4) (end -4.47 -1.9) (layer "F.Fab") (width 0.1) (tstamp e44fca24-e5df-46cc-84b7-d0dd9cc40492))
+  (pad "" np_thru_hole circle (at 3.875 1.8) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask) (tstamp 43238408-c14a-4969-969e-24a5cb13db84))
+  (pad "" np_thru_hole circle (at -3.875 1.8) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask) (tstamp bca423cd-4ef3-4c67-b9d0-fdb8b8bd943f))
+  (pad "A5" smd rect (at -0.5 -1.2) (size 0.7 2) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 60c7fec2-c4fb-4b6e-8f3b-028c31d0244e))
+  (pad "A9" smd rect (at 1.52 -1.2) (size 0.76 2) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp fd193676-763a-4583-9b22-39ebe24c7ac4))
+  (pad "A12" smd rect (at 2.75 -1.2) (size 0.8 2) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp c73edd70-bd8c-4d7b-bd21-e83476c26357))
+  (pad "B5" smd rect (at 0.5 -1.2) (size 0.7 2) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp e3097b36-c90e-4749-b994-b18ef735ea26))
+  (pad "B9" smd rect (at -1.52 -1.2) (size 0.76 2) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 59efe5d1-6114-40ac-bde3-66c6b78866aa))
+  (pad "B12" smd rect (at -2.75 -1.2) (size 0.8 2) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 45a0372d-9c1c-4fa9-aab9-e92cd25047dc))
+  (pad "S1" thru_hole oval (at -4.32 0) (size 1.1 1.6) (drill 0.6) (layers *.Cu *.Mask) (tstamp 56be091e-2dc4-4ed3-b011-c7f328219736))
+  (pad "S2" thru_hole oval (at 4.32 0) (size 1.1 1.6) (drill 0.6) (layers *.Cu *.Mask) (tstamp ba9013c3-bc87-4ab2-98c6-946d587d2f22))
+  (pad "S3" thru_hole oval (at -2.3 1.43) (size 1.6 1.1) (drill 0.6) (layers *.Cu *.Mask) (tstamp 7cfaea83-0d46-41bb-af1d-174623a78a7b))
+  (pad "S4" thru_hole oval (at 2.3 1.43) (size 1.6 1.1) (drill 0.6) (layers *.Cu *.Mask) (tstamp e368ec00-d1b6-4b85-bbb8-d7d1b586b34d))
+  (model "${KIPRJMOD}/3D/USB4140-GF-0170-C.stp"
+    (offset (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz -90 0 180))
+  )
+)
--- a/Kicad/MainBoard/CM4.kicad_sch
+++ b/Kicad/MainBoard/CM4.kicad_sch
--- a/Kicad/MainBoard/CM4_NAS.kicad_sym
+++ b/Kicad/MainBoard/CM4_NAS.kicad_sym
--- a/Kicad/MainBoard/Ethernet_USB.kicad_sch
+++ b/Kicad/MainBoard/Ethernet_USB.kicad_sch
--- 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.7)*%
+%TF.CreationDate,2022-11-21T16:52:03+01: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.7)) date 2022-11-21 16:52:03*
 %MOMM*%
 %LPD*%
 G01*
@@ -46,31 +46,33 @@ 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*%
+%ADD38RoundRect,0.147500X-0.172500X0.147500X-0.172500X-0.147500X0.172500X-0.147500X0.172500X0.147500X0*%
+%ADD39R,0.650000X0.400000*%
 %ADD40RoundRect,0.140000X-0.170000X0.140000X-0.170000X-0.140000X0.170000X-0.140000X0.170000X0.140000X0*%
 %ADD41R,2.350000X5.100000*%
-%ADD42R,3.400000X2.710000*%
-%ADD43RoundRect,0.150000X-0.150000X0.737500X-0.150000X-0.737500X0.150000X-0.737500X0.150000X0.737500X0*%
+%ADD42R,3.700000X0.600000*%
+%ADD43RoundRect,0.140000X0.170000X-0.140000X0.170000X0.140000X-0.170000X0.140000X-0.170000X-0.140000X0*%
+%ADD44R,3.400000X2.710000*%
+%ADD45RoundRect,0.150000X-0.150000X0.737500X-0.150000X-0.737500X0.150000X-0.737500X0.150000X0.737500X0*%
 G04 APERTURE END LIST*
 D10*
 %TO.C,J6*%
@@ -121,61 +123,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 +209,12 @@ D32*
 X46850000Y61080000D03*
 X46850000Y18380000D03*
 %TD*%
-D29*
+D28*
 %TO.C,C1*%
 X43700000Y11000000D03*
 X42740000Y11000000D03*
 %TD*%
-D24*
+D23*
 %TO.C,R6*%
 X44300000Y66010000D03*
 X44300000Y64990000D03*
@@ -227,7 +229,7 @@ D34*
 X1120000Y12600000D03*
 X3020000Y12600000D03*
 %TD*%
-D29*
+D28*
 %TO.C,C18*%
 X42650000Y30020000D03*
 X41690000Y30020000D03*
@@ -241,12 +243,12 @@ X12650000Y29100000D03*
 X11690000Y26200000D03*
 X12650000Y26200000D03*
 %TD*%
-D36*
+D29*
 %TO.C,R21*%
 X15300000Y9290000D03*
 X15300000Y10310000D03*
 %TD*%
-D29*
+D28*
 %TO.C,C56*%
 X27980000Y44900000D03*
 X27020000Y44900000D03*
@@ -256,27 +258,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 +296,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,21 +324,34 @@ D35*
 X37728000Y25218000D03*
 X38688000Y25218000D03*
 %TD*%
-D39*
+D38*
 %TO.C,FB5*%
-X26800000Y61387500D03*
-X26800000Y59812500D03*
+X26800000Y61085000D03*
+X26800000Y60115000D03*
+%TD*%
+D39*
+%TO.C,U9*%
+X33475000Y65775000D03*
+X33475000Y65125000D03*
+X33475000Y64475000D03*
+X31575000Y64475000D03*
+X31575000Y65775000D03*
 %TD*%
 D40*
 %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*
@@ -376,7 +380,7 @@ X41300000Y48020000D03*
 X38900000Y50980000D03*
 X38900000Y50020000D03*
 %TD*%
-D25*
+D36*
 %TO.C,D3*%
 X41170000Y67212500D03*
 X41170000Y68787500D03*
@@ -386,7 +390,7 @@ D34*
 X1120000Y14600000D03*
 X3020000Y14600000D03*
 %TD*%
-D25*
+D36*
 %TO.C,D4*%
 X38300000Y67212500D03*
 X38300000Y68787500D03*
@@ -400,7 +404,7 @@ X25750000Y26180000D03*
 X25120000Y43900000D03*
 X26080000Y43900000D03*
 %TD*%
-D29*
+D28*
 %TO.C,C14*%
 X42650000Y29000000D03*
 X41690000Y29000000D03*
@@ -415,7 +419,9 @@ X34700000Y25115000D03*
 X34700000Y26385000D03*
 X34700000Y27655000D03*
 X34700000Y28925000D03*
+D42*
 X34700000Y30195000D03*
+D31*
 X34700000Y31465000D03*
 X34700000Y37815000D03*
 X34700000Y39085000D03*
@@ -436,20 +442,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 +464,7 @@ D35*
 X28920000Y44900000D03*
 X29880000Y44900000D03*
 %TD*%
-D38*
+D43*
 %TO.C,C19*%
 X37770000Y30920000D03*
 X37770000Y31880000D03*
@@ -473,7 +479,7 @@ D40*
 X38300000Y48980000D03*
 X38300000Y48020000D03*
 %TD*%
-D29*
+D28*
 %TO.C,C7*%
 X42650000Y26280000D03*
 X41690000Y26280000D03*
@@ -482,24 +488,29 @@ X41690000Y26280000D03*
 X27980000Y43900000D03*
 X27020000Y43900000D03*
 %TD*%
-D42*
-%TO.C,U7*%
-X14250000Y14480000D03*
-D43*
-X12345000Y17042500D03*
-X13615000Y17042500D03*
-X14885000Y17042500D03*
-X16155000Y17042500D03*
-X16155000Y11917500D03*
-X14885000Y11917500D03*
-X13615000Y11917500D03*
-X12345000Y11917500D03*
+D36*
+%TO.C,D12*%
+X30050000Y67212500D03*
+X30050000Y68787500D03*
 %TD*%
-D38*
+D43*
 %TO.C,C28*%
 X37900000Y51920000D03*
 X37900000Y52880000D03*
 %TD*%
+D44*
+%TO.C,U7*%
+X14225000Y14480000D03*
+D45*
+X12320000Y17042500D03*
+X13590000Y17042500D03*
+X14860000Y17042500D03*
+X16130000Y17042500D03*
+X16130000Y11917500D03*
+X14860000Y11917500D03*
+X13590000Y11917500D03*
+X12320000Y11917500D03*
+%TD*%
 D33*
 %TO.C,C70*%
 X15900000Y21450000D03*
@@ -541,7 +552,7 @@ D32*
 X20850000Y61080000D03*
 X20850000Y18380000D03*
 %TD*%
-D38*
+D43*
 %TO.C,C15*%
 X38770000Y30920000D03*
 X38770000Y31880000D03*
@@ -555,7 +566,7 @@ X28180000Y57600000D03*
 X28920000Y43900000D03*
 X29880000Y43900000D03*
 %TD*%
-D29*
+D28*
 %TO.C,C3*%
 X42650000Y25300000D03*
 X41690000Y25300000D03*
@@ -565,17 +576,17 @@ D35*
 X25120000Y44900000D03*
 X26080000Y44900000D03*
 %TD*%
-D24*
+D23*
 %TO.C,R7*%
 X41170000Y66010000D03*
 X41170000Y64990000D03*
 %TD*%
-D38*
+D43*
 %TO.C,C69*%
 X17500000Y16250000D03*
 X17500000Y17210000D03*
 %TD*%
-D29*
+D28*
 %TO.C,C36*%
 X26280000Y58600000D03*
 X25320000Y58600000D03*
@@ -590,6 +601,11 @@ D34*
 X1120000Y10600000D03*
 X3020000Y10600000D03*
 %TD*%
+D29*
+%TO.C,R9*%
+X27500000Y65040000D03*
+X27500000Y66060000D03*
+%TD*%
 D30*
 %TO.C,J5*%
 X7540000Y21330000D03*
@@ -626,7 +642,7 @@ D40*
 X39300000Y48980000D03*
 X39300000Y48020000D03*
 %TD*%
-D38*
+D43*
 %TO.C,C23*%
 X38900000Y51920000D03*
 X38900000Y52880000D03*
--- a/Kicad/MainBoard/Gerber/MainBoard-B_Paste.gbr
+++ b/Kicad/MainBoard/Gerber/MainBoard-B_Paste.gbr
@@ -0,0 +1,565 @@
+%TF.GenerationSoftware,KiCad,Pcbnew,(6.0.7)*%
+%TF.CreationDate,2022-11-21T16:52:03+01: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.7)) date 2022-11-21 16:52:03*
+%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*%
+%ADD25R,0.650000X0.400000*%
+%ADD26RoundRect,0.140000X-0.170000X0.140000X-0.170000X-0.140000X0.170000X-0.140000X0.170000X0.140000X0*%
+%ADD27R,2.350000X5.100000*%
+%ADD28R,3.700000X0.600000*%
+%ADD29RoundRect,0.140000X0.170000X-0.140000X0.170000X0.140000X-0.170000X0.140000X-0.170000X-0.140000X0*%
+%ADD30RoundRect,0.250000X-0.460000X0.315000X-0.460000X-0.315000X0.460000X-0.315000X0.460000X0.315000X0*%
+%ADD31RoundRect,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,U9*%
+X33475000Y65775000D03*
+X33475000Y65125000D03*
+X33475000Y64475000D03*
+X31575000Y64475000D03*
+X31575000Y65775000D03*
+%TD*%
+D26*
+%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*%
+D27*
+%TO.C,L1*%
+X9175000Y13200000D03*
+X5025000Y13200000D03*
+%TD*%
+D21*
+%TO.C,C6*%
+X11690000Y25200000D03*
+X12650000Y25200000D03*
+%TD*%
+D26*
+%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*
+D28*
+X34700000Y30195000D03*
+D17*
+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*%
+D29*
+%TO.C,C19*%
+X37770000Y30920000D03*
+X37770000Y31880000D03*
+%TD*%
+D21*
+%TO.C,C31*%
+X27220000Y58600000D03*
+X28180000Y58600000D03*
+%TD*%
+D26*
+%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*%
+D29*
+%TO.C,C28*%
+X37900000Y51920000D03*
+X37900000Y52880000D03*
+%TD*%
+D30*
+%TO.C,U7*%
+X15075000Y15160000D03*
+X15075000Y13800000D03*
+X13375000Y15160000D03*
+X13375000Y13800000D03*
+D31*
+X12320000Y17042500D03*
+X13590000Y17042500D03*
+X14860000Y17042500D03*
+X16130000Y17042500D03*
+X16130000Y11917500D03*
+X14860000Y11917500D03*
+X13590000Y11917500D03*
+X12320000Y11917500D03*
+%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*%
+D29*
+%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*%
+D29*
+%TO.C,C69*%
+X17500000Y16250000D03*
+X17500000Y17210000D03*
+%TD*%
+D15*
+%TO.C,C36*%
+X26280000Y58600000D03*
+X25320000Y58600000D03*
+%TD*%
+D26*
+%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*%
+D26*
+%TO.C,C24*%
+X39300000Y48980000D03*
+X39300000Y48020000D03*
+%TD*%
+D29*
+%TO.C,C23*%
+X38900000Y51920000D03*
+X38900000Y52880000D03*
+%TD*%
+M02*
--- a/Kicad/MainBoard/Gerber/MainBoard-B_Silkscreen.gbr
+++ b/Kicad/MainBoard/Gerber/MainBoard-B_Silkscreen.gbr
--- 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.7)*%
+%TF.CreationDate,2022-11-21T16:52:03+01: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.7)) date 2022-11-21 16:52:03*
 %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.7)*%
+%TF.CreationDate,2022-11-21T16:52:03+01: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.7)) date 2022-11-21 16:52:03*
 %MOMM*%
 %LPD*%
 G01*
@@ -30,16 +30,16 @@ G04 Aperture macros list*
 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*%
+%ADD11RoundRect,0.135000X-0.185000X0.135000X-0.185000X-0.135000X0.185000X-0.135000X0.185000X0.135000X0*%
+%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.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*%
+%ADD20C,1.000000*%
 %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*%
@@ -53,36 +53,41 @@ G04 Aperture macros list end*
 %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*%
+%ADD34C,1.500000*%
+%ADD35RoundRect,0.147500X0.147500X0.172500X-0.147500X0.172500X-0.147500X-0.172500X0.147500X-0.172500X0*%
+%ADD36R,0.599999X1.000001*%
+%ADD37RoundRect,0.135000X-0.135000X-0.185000X0.135000X-0.185000X0.135000X0.185000X-0.135000X0.185000X0*%
+%ADD38R,1.100000X0.300000*%
+%ADD39R,3.100000X2.300000*%
+%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*%
+%ADD54RoundRect,0.150000X-0.825000X-0.150000X0.825000X-0.150000X0.825000X0.150000X-0.825000X0.150000X0*%
+%ADD55C,6.100000*%
+%ADD56R,0.200000X0.700000*%
+%ADD57C,0.650000*%
+%ADD58R,0.700000X2.000000*%
+%ADD59R,0.760000X2.000000*%
+%ADD60R,0.800000X2.000000*%
+%ADD61O,1.100000X1.600000*%
+%ADD62O,1.600000X1.100000*%
+%ADD63RoundRect,0.218750X-0.218750X-0.256250X0.218750X-0.256250X0.218750X0.256250X-0.218750X0.256250X0*%
+%ADD64RoundRect,0.050000X0.050000X-0.362500X0.050000X0.362500X-0.050000X0.362500X-0.050000X-0.362500X0*%
+%ADD65RoundRect,0.050000X0.362500X-0.050000X0.362500X0.050000X-0.362500X0.050000X-0.362500X-0.050000X0*%
+%ADD66R,3.800000X3.800000*%
+%ADD67R,0.450000X0.600000*%
+%ADD68C,2.100000*%
 G04 APERTURE END LIST*
 D10*
 %TO.C,C65*%
@@ -94,21 +99,26 @@ X29280000Y13900000D03*
 X28320000Y13900000D03*
 %TD*%
 D11*
+%TO.C,R28*%
+X10550000Y12760000D03*
+X10550000Y11740000D03*
+%TD*%
+D12*
 %TO.C,C62*%
 X6700000Y11720000D03*
 X6700000Y12680000D03*
 %TD*%
-D12*
+D13*
 %TO.C,C72*%
 X12170000Y22000000D03*
 X14070000Y22000000D03*
 %TD*%
-D13*
+D11*
 %TO.C,R25*%
 X24100000Y14110000D03*
 X24100000Y13090000D03*
 %TD*%
-D11*
+D12*
 %TO.C,C30*%
 X36770000Y55220000D03*
 X36770000Y56180000D03*
@@ -145,20 +155,15 @@ D19*
 X26615000Y19900000D03*
 X28985000Y19900000D03*
 %TD*%
-D11*
+D20*
+%TO.C,TP5*%
+X12100000Y13225000D03*
+%TD*%
+D12*
 %TO.C,C45*%
 X33770000Y53320000D03*
 X33770000Y54280000D03*
 %TD*%
-D20*
-%TO.C,U8*%
-X27250001Y16875001D03*
-X26300000Y16875001D03*
-X25350002Y16875001D03*
-X25350002Y14125001D03*
-X26300000Y14125001D03*
-X27250001Y14125001D03*
-%TD*%
 D21*
 %TO.C,C82*%
 X23000000Y15625000D03*
@@ -181,15 +186,15 @@ X21400000Y45620000D03*
 %TD*%
 D23*
 %TO.C,D5*%
-X15047700Y11325400D03*
-X13797700Y11325400D03*
+X15047700Y11216980D03*
+X13797700Y11216980D03*
 %TD*%
 D14*
 %TO.C,C11*%
 X35100000Y61680000D03*
 X35100000Y60720000D03*
 %TD*%
-D13*
+D11*
 %TO.C,R10*%
 X33975000Y47585000D03*
 X33975000Y46565000D03*
@@ -200,7 +205,7 @@ X52170000Y26075000D03*
 D25*
 X52170000Y23535000D03*
 %TD*%
-D13*
+D11*
 %TO.C,R2*%
 X40270000Y19810000D03*
 X40270000Y18790000D03*
@@ -209,7 +214,7 @@ X40270000Y18790000D03*
 X29700000Y60310000D03*
 X29700000Y59290000D03*
 %TD*%
-D11*
+D12*
 %TO.C,C27*%
 X34770000Y53320000D03*
 X34770000Y54280000D03*
@@ -219,27 +224,27 @@ D26*
 X2157500Y25300000D03*
 X8382500Y25300000D03*
 %TD*%
-D11*
+D12*
 %TO.C,C50*%
 X22400000Y50320000D03*
 X22400000Y51280000D03*
 %TD*%
 D27*
 %TO.C,C61*%
-X12475000Y12400000D03*
-X10925000Y12400000D03*
+X12500000Y10550000D03*
+X10950000Y10550000D03*
 %TD*%
-D13*
+D11*
 %TO.C,R1*%
 X39185000Y19800000D03*
 X39185000Y18780000D03*
 %TD*%
-D12*
+D13*
 %TO.C,C67*%
 X12170000Y19950000D03*
 X14070000Y19950000D03*
 %TD*%
-D13*
+D11*
 %TO.C,R4*%
 X22540000Y54570000D03*
 X22540000Y53550000D03*
@@ -317,22 +322,55 @@ X6737500Y14550000D03*
 D33*
 X8700000Y15800000D03*
 %TD*%
-D16*
-%TO.C,FB4*%
-X39587500Y55500000D03*
-X38012500Y55500000D03*
-%TD*%
 D34*
-%TO.C,R12*%
-X11790000Y14100000D03*
-X12810000Y14100000D03*
+%TO.C,TP2*%
+X14475000Y56375000D03*
 %TD*%
 D35*
+%TO.C,FB4*%
+X39285000Y55500000D03*
+X38315000Y55500000D03*
+%TD*%
+D36*
+%TO.C,U8*%
+X27250001Y16875001D03*
+X26300000Y16875001D03*
+X25350002Y16875001D03*
+X25350002Y14125001D03*
+X26300000Y14125001D03*
+X27250001Y14125001D03*
+%TD*%
+D37*
+%TO.C,R12*%
+X11565000Y12275000D03*
+X12585000Y12275000D03*
+%TD*%
+D38*
+%TO.C,J8*%
+X9025000Y54175000D03*
+X9025000Y53675000D03*
+X9025000Y53175000D03*
+X9025000Y52675000D03*
+X9025000Y52175000D03*
+X9025000Y51675000D03*
+X9025000Y51175000D03*
+X9025000Y50675000D03*
+X9025000Y50175000D03*
+X9025000Y49675000D03*
+D39*
+X7325000Y55845000D03*
+X7325000Y48005000D03*
+%TD*%
+D20*
+%TO.C,TP4*%
+X12000000Y14500000D03*
+%TD*%
+D40*
 %TO.C,C60*%
 X15500000Y5175000D03*
 X15500000Y3625000D03*
 %TD*%
-D36*
+D41*
 %TO.C,Q1*%
 X13762500Y17750000D03*
 X13762500Y17100000D03*
@@ -340,12 +378,12 @@ X13762500Y16450000D03*
 X15637500Y16450000D03*
 X15637500Y17100000D03*
 X15637500Y17750000D03*
-D37*
+D42*
 X14700000Y17425000D03*
-D38*
+D43*
 X14700000Y16450000D03*
 %TD*%
-D11*
+D12*
 %TO.C,C25*%
 X35770000Y55220000D03*
 X35770000Y56180000D03*
@@ -360,12 +398,12 @@ D10*
 X29750000Y57300000D03*
 X28790000Y57300000D03*
 %TD*%
-D12*
+D13*
 %TO.C,C85*%
 X28650000Y16600000D03*
 X30550000Y16600000D03*
 %TD*%
-D34*
+D37*
 %TO.C,R13*%
 X4590000Y18100000D03*
 X5610000Y18100000D03*
@@ -375,18 +413,7 @@ D22*
 X11800000Y16190000D03*
 X11800000Y17210000D03*
 %TD*%
-D39*
-%TO.C,U5*%
-X30837500Y41500000D03*
-X30837500Y40850000D03*
-X30837500Y40200000D03*
-X30837500Y39550000D03*
-X36562500Y39550000D03*
-X36562500Y40200000D03*
-X36562500Y40850000D03*
-X36562500Y41500000D03*
-%TD*%
-D11*
+D12*
 %TO.C,C83*%
 X24200000Y15920000D03*
 X24200000Y16880000D03*
@@ -400,33 +427,37 @@ X22400000Y45620000D03*
 X30875000Y43930000D03*
 X30875000Y42970000D03*
 %TD*%
-D40*
+D34*
+%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*
@@ -439,16 +470,16 @@ D29*
 X17540000Y22000000D03*
 X15640000Y22000000D03*
 %TD*%
-D34*
+D37*
 %TO.C,R14*%
 X11790000Y15200000D03*
 X12810000Y15200000D03*
 %TD*%
-D46*
+D50*
 %TO.C,U3*%
 X49250000Y6300000D03*
 X37820000Y6300000D03*
-D47*
+D51*
 X37820000Y15190000D03*
 X39090000Y12650000D03*
 X40360000Y15190000D03*
@@ -459,12 +490,12 @@ X45440000Y15190000D03*
 X46710000Y12650000D03*
 X47980000Y15190000D03*
 X49250000Y12650000D03*
-D48*
+D52*
 X37210000Y2190000D03*
 X39750000Y2190000D03*
 X47320000Y2190000D03*
 X49860000Y2190000D03*
-D49*
+D53*
 X35610000Y10190000D03*
 X51460000Y10190000D03*
 %TD*%
@@ -478,13 +509,24 @@ D17*
 X4620000Y14200000D03*
 X5580000Y14200000D03*
 %TD*%
-D50*
+D54*
+%TO.C,U5*%
+X31025000Y41405000D03*
+X31025000Y40135000D03*
+X31025000Y38865000D03*
+X31025000Y37595000D03*
+X35975000Y37595000D03*
+X35975000Y38865000D03*
+X35975000Y40135000D03*
+X35975000Y41405000D03*
+%TD*%
+D55*
 %TO.C,Module1*%
 X51580000Y33490000D03*
 X51580000Y66490000D03*
 X3580000Y33490000D03*
 X3580000Y66490000D03*
-D51*
+D56*
 X20280000Y31490000D03*
 X20280000Y34570000D03*
 X20680000Y31490000D03*
@@ -686,68 +728,54 @@ X39480000Y68490000D03*
 X39880000Y65410000D03*
 X39880000Y68490000D03*
 %TD*%
-D11*
+D57*
+%TO.C,J1*%
+X12575000Y4000000D03*
+X4825000Y4000000D03*
+D58*
+X8200000Y7000000D03*
+D59*
+X10220000Y7000000D03*
+D60*
+X11450000Y7000000D03*
+D58*
+X9200000Y7000000D03*
+D59*
+X7180000Y7000000D03*
+D60*
+X5950000Y7000000D03*
+D61*
+X4380000Y5800000D03*
+X13020000Y5800000D03*
+D62*
+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*
+D34*
+%TO.C,TP1*%
+X16050000Y44500000D03*
 %TD*%
-D57*
+D44*
 %TO.C,FB1*%
-X16837500Y46600000D03*
-X18962500Y46600000D03*
+X17415000Y46600000D03*
+X18385000Y46600000D03*
 %TD*%
 D18*
 %TO.C,R26*%
 X26110000Y12800000D03*
 X25090000Y12800000D03*
 %TD*%
-D58*
+D63*
 %TO.C,D9*%
 X3512500Y19600000D03*
 X5087500Y19600000D03*
 %TD*%
-D11*
+D12*
 %TO.C,C55*%
 X21400000Y50320000D03*
 X21400000Y51280000D03*
@@ -760,7 +788,7 @@ X29700000Y62280000D03*
 X33770000Y55220000D03*
 X33770000Y56180000D03*
 %TD*%
-D59*
+D64*
 %TO.C,U4*%
 X24550000Y46222500D03*
 X24950000Y46222500D03*
@@ -781,7 +809,7 @@ X30550000Y46222500D03*
 X30950000Y46222500D03*
 X31350000Y46222500D03*
 X31750000Y46222500D03*
-D60*
+D65*
 X32587500Y47060000D03*
 X32587500Y47460000D03*
 X32587500Y47860000D03*
@@ -801,7 +829,7 @@ X32587500Y53060000D03*
 X32587500Y53460000D03*
 X32587500Y53860000D03*
 X32587500Y54260000D03*
-D59*
+D64*
 X31750000Y55097500D03*
 X31350000Y55097500D03*
 X30950000Y55097500D03*
@@ -821,7 +849,7 @@ X25750000Y55097500D03*
 X25350000Y55097500D03*
 X24950000Y55097500D03*
 X24550000Y55097500D03*
-D60*
+D65*
 X23712500Y54260000D03*
 X23712500Y53860000D03*
 X23712500Y53460000D03*
@@ -841,10 +869,10 @@ X23712500Y48260000D03*
 X23712500Y47860000D03*
 X23712500Y47460000D03*
 X23712500Y47060000D03*
-D61*
+D66*
 X28150000Y50660000D03*
 %TD*%
-D62*
+D67*
 %TO.C,D8*%
 X5100000Y10900000D03*
 X5100000Y13000000D03*
@@ -854,7 +882,7 @@ D18*
 X5610000Y17000000D03*
 X4590000Y17000000D03*
 %TD*%
-D63*
+D68*
 %TO.C,J2*%
 X46550000Y58130000D03*
 X46550000Y21330000D03*
--- a/Kicad/MainBoard/Gerber/MainBoard-F_Paste.gbr
+++ b/Kicad/MainBoard/Gerber/MainBoard-F_Paste.gbr
@@ -0,0 +1,856 @@
+%TF.GenerationSoftware,KiCad,Pcbnew,(6.0.7)*%
+%TF.CreationDate,2022-11-21T16:52:03+01: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.7)) date 2022-11-21 16:52:03*
+%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,15,0.405432,0.261726,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,15,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.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.140000X0.140000X0.170000X-0.140000X0.170000X-0.140000X-0.170000X0.140000X-0.170000X0*%
+%ADD11RoundRect,0.135000X-0.185000X0.135000X-0.185000X-0.135000X0.185000X-0.135000X0.185000X0.135000X0*%
+%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.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*%
+%ADD20RoundRect,0.225000X0.250000X-0.225000X0.250000X0.225000X-0.250000X0.225000X-0.250000X-0.225000X0*%
+%ADD21RoundRect,0.135000X0.185000X-0.135000X0.185000X0.135000X-0.185000X0.135000X-0.185000X-0.135000X0*%
+%ADD22R,0.550000X0.800000*%
+%ADD23RoundRect,0.250000X-0.787500X-1.025000X0.787500X-1.025000X0.787500X1.025000X-0.787500X1.025000X0*%
+%ADD24RoundRect,0.225000X0.225000X0.250000X-0.225000X0.250000X-0.225000X-0.250000X0.225000X-0.250000X0*%
+%ADD25R,0.450000X0.700000*%
+%ADD26RoundRect,0.250000X0.250000X0.475000X-0.250000X0.475000X-0.250000X-0.475000X0.250000X-0.475000X0*%
+%ADD27RoundRect,0.200000X-0.200000X-0.275000X0.200000X-0.275000X0.200000X0.275000X-0.200000X0.275000X0*%
+%ADD28RoundRect,0.250000X0.295000X-0.295000X0.295000X0.295000X-0.295000X0.295000X-0.295000X-0.295000X0*%
+%ADD29RoundRect,0.062500X0.062500X-0.350000X0.062500X0.350000X-0.062500X0.350000X-0.062500X-0.350000X0*%
+%ADD30RoundRect,0.062500X0.350000X-0.062500X0.350000X0.062500X-0.350000X0.062500X-0.350000X-0.062500X0*%
+%ADD31RoundRect,0.147500X0.147500X0.172500X-0.147500X0.172500X-0.147500X-0.172500X0.147500X-0.172500X0*%
+%ADD32R,0.599999X1.000001*%
+%ADD33RoundRect,0.135000X-0.135000X-0.185000X0.135000X-0.185000X0.135000X0.185000X-0.135000X0.185000X0*%
+%ADD34R,1.100000X0.300000*%
+%ADD35R,3.100000X2.300000*%
+%ADD36RoundRect,0.225000X-0.250000X0.225000X-0.250000X-0.225000X0.250000X-0.225000X0.250000X0.225000X0*%
+%ADD37R,0.425000X0.400000*%
+%ADD38R,1.150000X0.950000*%
+%ADD39R,0.750000X0.300000*%
+%ADD40RoundRect,0.147500X-0.147500X-0.172500X0.147500X-0.172500X0.147500X0.172500X-0.147500X0.172500X0*%
+%ADD41R,0.400000X1.350000*%
+%ADD42R,1.500000X1.900000*%
+%ADD43RoundRect,0.150000X-0.825000X-0.150000X0.825000X-0.150000X0.825000X0.150000X-0.825000X0.150000X0*%
+%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,C65*%
+X12780000Y18200000D03*
+X11820000Y18200000D03*
+%TD*%
+%TO.C,C84*%
+X29280000Y13900000D03*
+X28320000Y13900000D03*
+%TD*%
+D11*
+%TO.C,R28*%
+X10550000Y12760000D03*
+X10550000Y11740000D03*
+%TD*%
+D12*
+%TO.C,C62*%
+X6700000Y11720000D03*
+X6700000Y12680000D03*
+%TD*%
+D13*
+%TO.C,C72*%
+X12170000Y22000000D03*
+X14070000Y22000000D03*
+%TD*%
+D11*
+%TO.C,R25*%
+X24100000Y14110000D03*
+X24100000Y13090000D03*
+%TD*%
+D12*
+%TO.C,C30*%
+X36770000Y55220000D03*
+X36770000Y56180000D03*
+%TD*%
+D14*
+%TO.C,C37*%
+X35275000Y47880000D03*
+X35275000Y46920000D03*
+%TD*%
+D15*
+%TO.C,Y1*%
+X31300000Y60250000D03*
+X33500000Y60250000D03*
+X33500000Y61950000D03*
+X31300000Y61950000D03*
+%TD*%
+D16*
+%TO.C,D10*%
+X8887500Y19200000D03*
+X7312500Y19200000D03*
+%TD*%
+D17*
+%TO.C,C64*%
+X4290000Y15900000D03*
+X5250000Y15900000D03*
+%TD*%
+D18*
+%TO.C,R16*%
+X14810000Y15200000D03*
+X13790000Y15200000D03*
+%TD*%
+D19*
+%TO.C,L2*%
+X26615000Y19900000D03*
+X28985000Y19900000D03*
+%TD*%
+D12*
+%TO.C,C45*%
+X33770000Y53320000D03*
+X33770000Y54280000D03*
+%TD*%
+D20*
+%TO.C,C82*%
+X23000000Y15625000D03*
+X23000000Y17175000D03*
+%TD*%
+D21*
+%TO.C,R19*%
+X12800000Y16190000D03*
+X12800000Y17210000D03*
+%TD*%
+D10*
+%TO.C,C49*%
+X29750000Y56300000D03*
+X28790000Y56300000D03*
+%TD*%
+D14*
+%TO.C,C54*%
+X21400000Y46580000D03*
+X21400000Y45620000D03*
+%TD*%
+D22*
+%TO.C,D5*%
+X15047700Y11216980D03*
+X13797700Y11216980D03*
+%TD*%
+D14*
+%TO.C,C11*%
+X35100000Y61680000D03*
+X35100000Y60720000D03*
+%TD*%
+D11*
+%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*%
+D23*
+%TO.C,C79*%
+X2157500Y25300000D03*
+X8382500Y25300000D03*
+%TD*%
+D12*
+%TO.C,C50*%
+X22400000Y50320000D03*
+X22400000Y51280000D03*
+%TD*%
+D24*
+%TO.C,C61*%
+X12500000Y10550000D03*
+X10950000Y10550000D03*
+%TD*%
+D11*
+%TO.C,R1*%
+X39185000Y19800000D03*
+X39185000Y18780000D03*
+%TD*%
+D13*
+%TO.C,C67*%
+X12170000Y19950000D03*
+X14070000Y19950000D03*
+%TD*%
+D11*
+%TO.C,R4*%
+X22540000Y54570000D03*
+X22540000Y53550000D03*
+%TD*%
+D14*
+%TO.C,C12*%
+X26250000Y58380000D03*
+X26250000Y57420000D03*
+%TD*%
+D10*
+%TO.C,C32*%
+X22480000Y52300000D03*
+X21520000Y52300000D03*
+%TD*%
+D25*
+%TO.C,D6*%
+X9350000Y12400000D03*
+X8050000Y12400000D03*
+X8700000Y10400000D03*
+%TD*%
+D26*
+%TO.C,C81*%
+X17520000Y19950000D03*
+X15620000Y19950000D03*
+%TD*%
+D17*
+%TO.C,C42*%
+X33690000Y45150000D03*
+X34650000Y45150000D03*
+%TD*%
+D27*
+%TO.C,R24*%
+X27575000Y12600000D03*
+X29225000Y12600000D03*
+%TD*%
+D14*
+%TO.C,C44*%
+X31875000Y43930000D03*
+X31875000Y42970000D03*
+%TD*%
+D10*
+%TO.C,C43*%
+X22450000Y48500000D03*
+X21490000Y48500000D03*
+%TD*%
+D28*
+%TO.C,U6*%
+X9375000Y16475000D03*
+X8025000Y15125000D03*
+X9375000Y15125000D03*
+X8025000Y16475000D03*
+D29*
+X7450000Y13837500D03*
+X7950000Y13837500D03*
+X8450000Y13837500D03*
+X8950000Y13837500D03*
+X9450000Y13837500D03*
+X9950000Y13837500D03*
+D30*
+X10662500Y14550000D03*
+X10662500Y15050000D03*
+X10662500Y15550000D03*
+X10662500Y16050000D03*
+X10662500Y16550000D03*
+X10662500Y17050000D03*
+D29*
+X9950000Y17762500D03*
+X9450000Y17762500D03*
+X8950000Y17762500D03*
+X8450000Y17762500D03*
+X7950000Y17762500D03*
+X7450000Y17762500D03*
+D30*
+X6737500Y17050000D03*
+X6737500Y16550000D03*
+X6737500Y16050000D03*
+X6737500Y15550000D03*
+X6737500Y15050000D03*
+X6737500Y14550000D03*
+%TD*%
+D31*
+%TO.C,FB4*%
+X39285000Y55500000D03*
+X38315000Y55500000D03*
+%TD*%
+D32*
+%TO.C,U8*%
+X27250001Y16875001D03*
+X26300000Y16875001D03*
+X25350002Y16875001D03*
+X25350002Y14125001D03*
+X26300000Y14125001D03*
+X27250001Y14125001D03*
+%TD*%
+D33*
+%TO.C,R12*%
+X11565000Y12275000D03*
+X12585000Y12275000D03*
+%TD*%
+D34*
+%TO.C,J8*%
+X9025000Y54175000D03*
+X9025000Y53675000D03*
+X9025000Y53175000D03*
+X9025000Y52675000D03*
+X9025000Y52175000D03*
+X9025000Y51675000D03*
+X9025000Y51175000D03*
+X9025000Y50675000D03*
+X9025000Y50175000D03*
+X9025000Y49675000D03*
+D35*
+X7325000Y55845000D03*
+X7325000Y48005000D03*
+%TD*%
+D36*
+%TO.C,C60*%
+X15500000Y5175000D03*
+X15500000Y3625000D03*
+%TD*%
+D37*
+%TO.C,Q1*%
+X13762500Y17750000D03*
+X13762500Y17100000D03*
+X13762500Y16450000D03*
+X15637500Y16450000D03*
+X15637500Y17100000D03*
+X15637500Y17750000D03*
+D38*
+X14700000Y17425000D03*
+D39*
+X14700000Y16450000D03*
+%TD*%
+D12*
+%TO.C,C25*%
+X35770000Y55220000D03*
+X35770000Y56180000D03*
+%TD*%
+D14*
+%TO.C,C13*%
+X27200000Y58380000D03*
+X27200000Y57420000D03*
+%TD*%
+D10*
+%TO.C,C22*%
+X29750000Y57300000D03*
+X28790000Y57300000D03*
+%TD*%
+D13*
+%TO.C,C85*%
+X28650000Y16600000D03*
+X30550000Y16600000D03*
+%TD*%
+D33*
+%TO.C,R13*%
+X4590000Y18100000D03*
+X5610000Y18100000D03*
+%TD*%
+D21*
+%TO.C,R18*%
+X11800000Y16190000D03*
+X11800000Y17210000D03*
+%TD*%
+D12*
+%TO.C,C83*%
+X24200000Y15920000D03*
+X24200000Y16880000D03*
+%TD*%
+D14*
+%TO.C,C51*%
+X22400000Y46580000D03*
+X22400000Y45620000D03*
+%TD*%
+%TO.C,C46*%
+X30875000Y43930000D03*
+X30875000Y42970000D03*
+%TD*%
+D40*
+%TO.C,D7*%
+X13915000Y13600000D03*
+X14885000Y13600000D03*
+%TD*%
+D41*
+%TO.C,J7*%
+X13070000Y65847500D03*
+X12420000Y65847500D03*
+X11770000Y65847500D03*
+X11120000Y65847500D03*
+X10470000Y65847500D03*
+D42*
+X12770000Y68547500D03*
+X10770000Y68547500D03*
+%TD*%
+D18*
+%TO.C,R11*%
+X14910000Y12600000D03*
+X13890000Y12600000D03*
+%TD*%
+D26*
+%TO.C,C78*%
+X17540000Y22000000D03*
+X15640000Y22000000D03*
+%TD*%
+D33*
+%TO.C,R14*%
+X11790000Y15200000D03*
+X12810000Y15200000D03*
+%TD*%
+D21*
+%TO.C,R17*%
+X10100000Y18890000D03*
+X10100000Y19910000D03*
+%TD*%
+D17*
+%TO.C,C63*%
+X4620000Y14200000D03*
+X5580000Y14200000D03*
+%TD*%
+D43*
+%TO.C,U5*%
+X31025000Y41405000D03*
+X31025000Y40135000D03*
+X31025000Y38865000D03*
+X31025000Y37595000D03*
+X35975000Y37595000D03*
+X35975000Y38865000D03*
+X35975000Y40135000D03*
+X35975000Y41405000D03*
+%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*%
+D40*
+%TO.C,FB1*%
+X17415000Y46600000D03*
+X18385000Y46600000D03*
+%TD*%
+D18*
+%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*%
+D18*
+%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.7)*%
+%TF.CreationDate,2022-11-21T16:52:03+01: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.7)) date 2022-11-21 16:52:03*
 %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*
@@ -37,6 +631,11 @@ X28907836Y14260000D02*
 X28692164Y14260000D01*
 X28907836Y13540000D02*
 X28692164Y13540000D01*
+%TO.C,R28*%
+X10930000Y12403641D02*
+X10930000Y12096359D01*
+X10170000Y12403641D02*
+X10170000Y12096359D01*
 %TO.C,C62*%
 X6340000Y12092164D02*
 X6340000Y12307836D01*
@@ -89,18 +688,17 @@ X29954000Y17746000D02*
 X25646000Y17746000D01*
 X25646000Y22054000D02*
 X29954000Y22054000D01*
+%TO.C,TP5*%
+X12800000Y13225000D02*
+G75*
+G03*
+X12800000Y13225000I-700000J0D01*
+G01*
 %TO.C,C45*%
 X33410000Y53692164D02*
 X33410000Y53907836D01*
 X34130000Y53692164D02*
 X34130000Y53907836D01*
-D12*
-%TO.C,U8*%
-X24776000Y16200001D02*
-X24776000Y14799999D01*
-X27825001Y17249999D02*
-X27825001Y14950001D01*
-D11*
 %TO.C,C82*%
 X23510000Y16259420D02*
 X23510000Y16540580D01*
@@ -123,12 +721,12 @@ X21760000Y46207836D02*
 X21760000Y45992164D01*
 D10*
 %TO.C,D5*%
-X15460000Y11863880D02*
-X14630000Y11863880D01*
-X15460000Y10790000D02*
-X15460000Y11865620D01*
-X15460000Y10784380D02*
-X14660000Y10784380D01*
+X15460000Y11755460D02*
+X14630000Y11755460D01*
+X15460000Y10681580D02*
+X15460000Y11757200D01*
+X15460000Y10675960D02*
+X14660000Y10675960D01*
 D11*
 %TO.C,C11*%
 X35460000Y61307836D02*
@@ -181,10 +779,10 @@ X22760000Y50907836D01*
 X22040000Y50692164D02*
 X22040000Y50907836D01*
 %TO.C,C61*%
-X11840580Y12910000D02*
-X11559420Y12910000D01*
-X11840580Y11890000D02*
-X11559420Y11890000D01*
+X11865580Y11060000D02*
+X11584420Y11060000D01*
+X11865580Y10040000D02*
+X11584420Y10040000D01*
 %TO.C,R1*%
 X39565000Y19443641D02*
 X39565000Y19136359D01*
@@ -259,16 +857,45 @@ X6590000Y14165000D02*
 X6590000Y13690000D01*
 X10810000Y17435000D02*
 X10810000Y17910000D01*
-%TO.C,FB4*%
-X38962779Y54990000D02*
-X38637221Y54990000D01*
-X38962779Y56010000D02*
-X38637221Y56010000D01*
+%TO.C,TP2*%
+X15425000Y56375000D02*
+G75*
+G03*
+X15425000Y56375000I-950000J0D01*
+G01*
+D12*
+%TO.C,U8*%
+X27825001Y17249999D02*
+X27825001Y14950001D01*
+X24776000Y16200001D02*
+X24776000Y14799999D01*
+D11*
 %TO.C,R12*%
-X12146359Y14480000D02*
-X12453641Y14480000D01*
-X12146359Y13720000D02*
-X12453641Y13720000D01*
+X11921359Y12655000D02*
+X12228641Y12655000D01*
+X11921359Y11895000D02*
+X12228641Y11895000D01*
+%TO.C,J8*%
+X8225000Y53975000D02*
+X8225000Y54375000D01*
+X7825000Y54175000D02*
+X8225000Y53975000D01*
+X5635000Y57250000D02*
+X5035000Y57250000D01*
+X5635000Y46710000D02*
+X5635000Y46600000D01*
+X8225000Y54375000D02*
+X7825000Y54175000D01*
+X5635000Y57140000D02*
+X5635000Y57250000D01*
+X5635000Y46600000D02*
+X5035000Y46600000D01*
+%TO.C,TP4*%
+X12700000Y14500000D02*
+G75*
+G03*
+X12700000Y14500000I-700000J0D01*
+G01*
 %TO.C,C60*%
 X14990000Y4540580D02*
 X14990000Y4259420D01*
@@ -283,20 +910,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 +943,6 @@ X12180000Y16546359D02*
 X12180000Y16853641D01*
 X11420000Y16546359D02*
 X11420000Y16853641D01*
-%TO.C,U5*%
-X33700000Y42135000D02*
-X30100000Y42135000D01*
-X33700000Y42135000D02*
-X35900000Y42135000D01*
-X33700000Y38915000D02*
-X35900000Y38915000D01*
-X33700000Y38915000D02*
-X31500000Y38915000D01*
 %TO.C,C83*%
 X23840000Y16292164D02*
 X23840000Y16507836D01*
@@ -336,6 +958,12 @@ X30515000Y43557836D02*
 X30515000Y43342164D01*
 X31235000Y43557836D02*
 X31235000Y43342164D01*
+%TO.C,TP3*%
+X3500000Y46975000D02*
+G75*
+G03*
+X3500000Y46975000I-950000J0D01*
+G01*
 D13*
 %TO.C,D7*%
 X13360000Y13600000D02*
@@ -395,6 +1023,15 @@ X4992164Y13840000D02*
 X5207836Y13840000D01*
 X4992164Y14560000D02*
 X5207836Y14560000D01*
+%TO.C,U5*%
+X33500000Y42060000D02*
+X35450000Y42060000D01*
+X33500000Y36940000D02*
+X35450000Y36940000D01*
+X33500000Y42060000D02*
+X30050000Y42060000D01*
+X33500000Y36940000D02*
+X31550000Y36940000D01*
 %TO.C,Module1*%
 X41480000Y65060000D02*
 X40480000Y65060000D01*
@@ -424,54 +1061,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.7)} date Mon Nov 21 16:52:04 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-11-21T16:52:04+01:00
+; #@! TF.GenerationSoftware,Kicad,Pcbnew,(6.0.7)
 ; #@! 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.7)} date Mon Nov 21 16:52:04 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-11-21T16:52:04+01:00
+; #@! TF.GenerationSoftware,Kicad,Pcbnew,(6.0.7)
 ; #@! 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,43 @@ X1.1555Y2.0417
 X1.1555Y1.9945
 X1.1555Y1.9472
 T2
+X0.2136Y1.9478
+X0.2185Y2.0541
+X0.2195Y2.0945
+X0.2195Y2.0128
+X0.2382Y1.9853
+X0.2411Y2.0327
+X0.2431Y2.0744
 X0.4073Y1.2717
+X0.5011Y1.4027
+X0.5039Y1.2579
+X0.5039Y1.065
 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 +82,21 @@ X0.9797Y2.6476
 X1.0049Y1.4213
 X1.0157Y2.2283
 X1.0368Y1.4213
+X1.0693Y1.3105
+X1.0837Y1.2894
+X1.1091Y1.3115
+X1.1112Y1.2864
 X1.1201Y1.7028
+X1.1339Y1.3069
 X1.1457Y1.4213
 X1.1811Y1.4213
+X1.1821Y2.5394
+X1.1909Y1.2805
+X1.376Y2.502
 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 +106,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 +124,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 +146,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.3453Y0.339
 X0.3543Y1.3583
-X0.3728Y0.0866
 X0.374Y0.6535
 X0.3827Y0.8602
-X0.3846Y1.4449
 X0.3886Y1.3307
 X0.3898Y1.3819
+X0.4296Y0.3903
 X0.4417Y0.8248
-X0.4476Y0.3927
+X0.4793Y0.4002
+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 +201,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 +223,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,15 +239,22 @@ X1.2087Y2.063
 X1.2087Y2.0118
 X1.2087Y1.9488
 X1.2087Y1.9016
-X1.2311Y2.6358
+X1.2205Y1.2933
+X1.2205Y0.374
 X1.2323Y1.6791
-X1.2402Y1.5374
+X1.2402Y0.9055
 X1.2402Y0.6496
-X1.2567Y1.2992
+X1.2402Y0.4724
+X1.2441Y1.439
+X1.2461Y2.6437
 X1.2702Y1.8111
+X1.2992Y1.2933
+X1.3031Y1.626
 X1.3295Y2.6358
-X1.3689Y1.563
-X1.378Y1.4055
+X1.3386Y0.6299
+X1.3386Y0.4724
+X1.3661Y1.563
+X1.3711Y1.4045
 X1.3827Y1.3031
 X1.4055Y2.2559
 X1.424Y1.3031
@@ -216,14 +263,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 +276,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 +291,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 +310,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 +331,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/Gerber/PicoNas_V1.3.zip
+++ b/Kicad/MainBoard/Gerber/PicoNas_V1.3.zip
--- a/Kicad/MainBoard/MainBoard-B_Silkscreen.dxf
+++ b/Kicad/MainBoard/MainBoard-B_Silkscreen.dxf
--- a/Kicad/MainBoard/MainBoard-Edge_Cuts.dxf
+++ b/Kicad/MainBoard/MainBoard-Edge_Cuts.dxf
--- a/Kicad/MainBoard/MainBoard-F_Silkscreen.dxf
+++ b/Kicad/MainBoard/MainBoard-F_Silkscreen.dxf
--- a/Kicad/MainBoard/MainBoard.kicad_pcb
+++ b/Kicad/MainBoard/MainBoard.kicad_pcb
--- a/Kicad/MainBoard/MainBoard.kicad_pro
+++ b/Kicad/MainBoard/MainBoard.kicad_pro
@@ -34,8 +34,8 @@
        "other_text_upright": false,
        "pads": {
          "drill": 0.0,
-          "height": 6.0,
-          "width": 9.5
+          "height": 3.7,
+          "width": 0.6
        },
        "silk_line_width": 0.15,
        "silk_text_italic": false,
@@ -57,7 +57,7 @@
      ],
      "drc_exclusions": [],
      "meta": {
-        "version": 1
+        "version": 2
      },
      "rule_severities": {
        "annular_width": "error",
@@ -69,6 +69,7 @@
        "drill_out_of_range": "error",
        "duplicate_footprints": "warning",
        "extra_footprint": "warning",
+        "footprint_type_mismatch": "error",
        "hole_clearance": "error",
        "hole_near_hole": "error",
        "invalid_outline": "error",
@@ -87,6 +88,7 @@
        "silk_over_copper": "ignore",
        "silk_overlap": "ignore",
        "skew_out_of_range": "error",
+        "through_hole_pad_without_hole": "error",
        "too_many_vias": "error",
        "track_dangling": "warning",
        "track_width": "warning",
@@ -112,13 +114,11 @@
        "min_track_width": 0.13,
        "min_via_annular_width": 0.049999999999999996,
        "min_via_diameter": 0.39999999999999997,
-        "solder_mask_clearance": 0.0,
-        "solder_mask_min_width": 0.0,
-        "solder_paste_clearance": 0.0,
-        "solder_paste_margin_ratio": -0.0
+        "use_height_for_length_calcs": true
      },
      "track_widths": [
        0.0,
+        0.15,
        0.2
      ],
      "via_dimensions": [
--- a/Kicad/MainBoard/MainBoard.kicad_sch
+++ b/Kicad/MainBoard/MainBoard.kicad_sch
--- a/Kicad/MainBoard/MainBoard.xlsx
+++ b/Kicad/MainBoard/MainBoard.xlsx
--- a/Kicad/MainBoard/PCIe_sata.kicad_sch
+++ b/Kicad/MainBoard/PCIe_sata.kicad_sch
--- a/Kicad/MainBoard/Power.kicad_sch
+++ b/Kicad/MainBoard/Power.kicad_sch
--- a/Kicad/MainBoard/archive_3d_models.log
+++ b/Kicad/MainBoard/archive_3d_models.log
@@ -0,0 +1,7 @@
+11-17 14:29:34 com_github_MitjaNemec_Archive3DModels.action_archive_3d_models 220:Plugin executed on: 'win32'
+11-17 14:29:34 com_github_MitjaNemec_Archive3DModels.action_archive_3d_models 221:Plugin executed with python version: '3.9.10 (main, Jul 19 2022, 05:36:50) [MSC v.1932 64 bit (AMD64)]'
+11-17 14:29:34 com_github_MitjaNemec_Archive3DModels.action_archive_3d_models 222:KiCad build version: (6.0.7)
+11-17 14:29:34 com_github_MitjaNemec_Archive3DModels.action_archive_3d_models 223:Plugin version: 1.0.4
+
+11-17 14:29:34 com_github_MitjaNemec_Archive3DModels.action_archive_3d_models 228:Screen sizes: [wx.Size(1920, 1200)]
+11-17 14:29:35 com_github_MitjaNemec_Archive3DModels.action_archive_3d_models 235:Dialog size: wx.Size(213, 81)
--- a/Kicad/MainBoard/production/bom.csv
+++ b/Kicad/MainBoard/production/bom.csv
@@ -0,0 +1,60 @@
+Designator,Footprint,Quantity,Value,LCSC Part #
+"C1, C12, C13, C27, C44, C46, C50, C55, C65, C66, C69, C83",C_0402_1005Metric,12,100n,GCM155R71C104KA55D
+"C10, C14, C15, C16, C17, C18, C19, C20, C21, C3, C32, C33, C34, C35, C36, C37, C4, C42, C43, C45, C49, C5, C51, C56, C57, C6, C7, C8, C9",C_0402_1005Metric,29,10n,F981A225MUA 
+"C11, C2",C_0402_1005Metric,2,14p,GJM1555C1H140GB01D
+"C22, C23, C24, C25, C26, C47, C48",C_POL_0402_1005Metric,7,2.2u,C1005X5R1C225K050BC
+"C28, C29, C30, C31, C52, C53, C54, C62, C63, C64",C_0402_1005Metric,10,1u,CGB2A1X5R1C105K033BC
+"C38, C39, C40, C41, C58, C59",C_0402_1005Metric,6,1n,C0402C102J4RACTU
+"C60, C61",C_0603_1608Metric,2,4.7u,CL10A475KO8NNNC
+"C67, C68, C70, C71, C72, C73, C75, C76, C78, C81",C_0805_2012Metric,10,10u 35v,C2012X5R1V106M085AC
+C77,C_0402_1005Metric,1,1.2n,0402YC122MAT2A
+C79,CP_EIA-7343-31_Kemet-D,1,100uF,T591D107M010ATE080
+C82,C_0603_1608Metric,1,10u 35v,C2012X5R1V106M085AC
+C84,C_0402_1005Metric,1,100n 64mOhm,CGA2B3X7R1H104K050BB 
+C85,C_0805_2012Metric,1,22u,CL21A226MQQNNNG
+"D1, D2, D3, D4",LED_0603_1608Metric,4,LED_Blue,APHD1608LVBC/D
+"D10, D12",LED_0603_1608Metric,2,LED_green,APTD1608LCGCK
+"D11, D9",LED_0603_1608Metric,2,LED_red,APHD1608LSURCK
+D5,1610,1,ESDA25P35,ESDA25P35-1U1M
+D6,SOT-323_SC-70,1,ESDA25W,ESDA25W
+D7,D_0402_1005Metric,1,30V,CDBQR0130L-HF
+D8,D_SOD-323,1,BAT60A,BAT\ 60A\ E6327
+FB1,L_0402_1005Metric,1,80ohm_1.5A,BLM15PD800SZ1D
+"FB2, FB3, FB4, FB5, FB6, FB7",L_0402_1005Metric,6,80ohm_700ma,MFBM1V1005-800-R
+J1,GCT_USB4140-GF-0070-C_REV0.4,1,USB_C_Receptacle_Charge,USB4140-GF-0070-C 
+"J2, J3, J4, J5",sata_1735284-2,4,SATA,1735284-2 
+J6,PinHeader_1x02_P2.54mm_Vertical,1,eeprom_en,G800W306018EU
+J7,USB_Micro-B_Molex-105017-0001,1,USB_OTG,105017-0001
+J8,TE_1-1734839-0_1x10-1MP_P0.5mm_Horizontal,1,Front_pannel,1-1734839-0
+L1,L_Bourns_SRN6045TA,1,3.3uH 4.5A,SRN6045TA-3R3Y
+L2,L_Coilcraft_XxL4020,1,3.3uH 34.8mOhm,XFL4020-332MEC
+Module1,Raspberry-Pi-4-Compute-Module,1,ComputeModule4-CM4,DEV-17392
+Q1,UDFN6B,1,SSM6J507NU,"SSM6J507NU\,LF"
+"R1, R11, R2",R_0402_1005Metric,3,470,RC0402FR-13470RL
+"R10, R26, R28",R_0402_1005Metric,3,10k,RC0402FR-0710KP
+"R12, R14, R23",R_0402_1005Metric,3,2.2k,RC0402FR-132K2L
+"R13, R27, R5, R6, R7, R8, R9",R_0402_1005Metric,7,1k,AC0402FR-071KL
+"R15, R17",R_0402_1005Metric,2,5.1k,RC0402FR-135K1L
+R16,R_0402_1005Metric,1,100k,CR0402-FX-1003GLF
+R18,R_0402_1005Metric,1,18k,AC0402FR-0718KL
+"R19, R4",R_0402_1005Metric,2,100,RC0402FR-10100RL
+R20,R_0402_1005Metric,1,10,
+R21,R_0402_1005Metric,1,20k,RC0402FR-7D20KL
+R22,R_0402_1005Metric,1,12k,RC0402FR-1312KL
+R24,R_0603_1608Metric,1,30,RC0402FR-0730RL
+R25,R_0402_1005Metric,1,2.49k,RC0402FR-072K49L
+R3,R_0402_1005Metric,1,6.04k-1%,RC0402FR-136K04L
+TP1,TestPoint_Pad_D1.5mm,1,TP_1V,
+TP2,TestPoint_Pad_D1.5mm,1,TP_12V,
+TP3,TestPoint_Pad_D1.5mm,1,TP_5V,
+TP4,TestPoint_Pad_D1.0mm,1,SDA,
+TP5,TestPoint_Pad_D1.0mm,1,SCL,
+"U1, U2",USON-10_2.5x1.0mm_P0.5mm,2,TPD4EUSB30,TPD4EUSB30DQAR 
+U3,RJ45-TE-2301995-4,1,MagJack-A70-112-331N126,5-2301995-4
+U4,QFN-76-1EP_9x9mm_P0.4mm_EP3.8x3.8mm_ThermalVias,1,88SE9215A1_fct,88SE9215A1
+U5,SOIC-8_3.9x4.9mm_P1.27mm,1,AT25SF081-XMHD-X,AT25XV041B-XMHV-T
+U6,QFN-24-1EP_4x4mm_P0.5mm_EP2.7x2.7mm,1,STUSB4500QTR,STUSB4500QTR 
+U7,SOIC-8-1EP_3.9x4.9mm_P1.27mm_EP2.95x4.9mm_Mask2.71x3.4mm_ThermalVias,1,AP64501,AP64501SP-13
+U8,TPS56339DDCR,1,TPS563201DDC,TPS563201DDC
+U9,SOT-353_SC-70-5,1,74LVC1G125QSE-7,74LVC1G125QSE-7
+Y1,Crystal_SMD_Abracon_ABM8G-4Pin_3.2x2.5mm,1,25MHz,ABM8G-25.000MHZ-D4Y-T
--- a/Kicad/MainBoard/production/designators.csv
+++ b/Kicad/MainBoard/production/designators.csv
@@ -0,0 +1,157 @@
+C1:1
+C10:1
+C11:1
+C12:1
+C13:1
+C14:1
+C15:1
+C16:1
+C17:1
+C18:1
+C19:1
+C2:1
+C20:1
+C21:1
+C22:1
+C23:1
+C24:1
+C25:1
+C26:1
+C27:1
+C28:1
+C29:1
+C3:1
+C30:1
+C31:1
+C32:1
+C33:1
+C34:1
+C35:1
+C36:1
+C37:1
+C38:1
+C39:1
+C4:1
+C40:1
+C41:1
+C42:1
+C43:1
+C44:1
+C45:1
+C46:1
+C47:1
+C48:1
+C49:1
+C5:1
+C50:1
+C51:1
+C52:1
+C53:1
+C54:1
+C55:1
+C56:1
+C57:1
+C58:1
+C59:1
+C6:1
+C60:1
+C61:1
+C62:1
+C63:1
+C64:1
+C65:1
+C66:1
+C67:1
+C68:1
+C69:1
+C7:1
+C70:1
+C71:1
+C72:1
+C73:1
+C75:1
+C76:1
+C77:1
+C78:1
+C79:1
+C8:1
+C81:1
+C82:1
+C83:1
+C84:1
+C85:1
+C9:1
+D1:1
+D10:1
+D11:1
+D12:1
+D2:1
+D3:1
+D4:1
+D5:1
+D6:1
+D7:1
+D8:1
+D9:1
+FB1:1
+FB2:1
+FB3:1
+FB4:1
+FB5:1
+FB6:1
+FB7:1
+J1:1
+J2:1
+J3:1
+J4:1
+J5:1
+J6:1
+J7:1
+J8:1
+L1:1
+L2:1
+Module1:1
+Q1:1
+R1:1
+R10:1
+R11:1
+R12:1
+R13:1
+R14:1
+R15:1
+R16:1
+R17:1
+R18:1
+R19:1
+R2:1
+R20:1
+R21:1
+R22:1
+R23:1
+R24:1
+R25:1
+R26:1
+R27:1
+R28:1
+R3:1
+R4:1
+R5:1
+R6:1
+R7:1
+R8:1
+R9:1
+TP1:1
+TP2:1
+TP3:1
+TP4:1
+TP5:1
+U1:1
+U2:1
+U3:1
+U4:1
+U5:1
+U6:1
+U7:1
+U8:1
+U9:1
+Y1:1
--- a/Kicad/MainBoard/production/gerber.zip
+++ b/Kicad/MainBoard/production/gerber.zip
--- a/Kicad/MainBoard/production/netlist.ipc
+++ b/Kicad/MainBoard/production/netlist.ipc
--- a/Kicad/MainBoard/production/positions.csv
+++ b/Kicad/MainBoard/production/positions.csv
@@ -0,0 +1,153 @@
+Designator,Mid X,Mid Y,Rotation,Layer
+C1,43.22,11.0,180.0,bottom
+C10,12.17,26.2,0.0,bottom
+C11,35.1,61.2,-90.0,top
+C12,26.25,57.9,-90.0,top
+C13,27.2,57.9,-90.0,top
+C14,42.17,29.0,180.0,bottom
+C15,38.77,31.4,90.0,bottom
+C16,25.27,29.1,0.0,bottom
+C17,12.17,29.1,0.0,bottom
+C18,42.17,30.02,180.0,bottom
+C19,37.77,31.4,90.0,bottom
+C2,29.7,61.8,90.0,top
+C20,25.27,30.08,0.0,bottom
+C21,12.17,30.08,0.0,bottom
+C22,29.27,57.3,180.0,top
+C23,38.9,52.4,90.0,bottom
+C24,39.3,48.5,-90.0,bottom
+C25,35.77,55.7,90.0,top
+C26,27.7,57.6,0.0,bottom
+C27,34.77,53.8,90.0,top
+C28,37.9,52.4,90.0,bottom
+C29,38.3,48.5,-90.0,bottom
+C3,42.17,25.3,180.0,bottom
+C30,36.77,55.7,90.0,top
+C31,27.7,58.6,0.0,bottom
+C32,22.0,52.3,180.0,top
+C33,37.9,50.5,-90.0,bottom
+C34,40.3,48.5,-90.0,bottom
+C35,33.77,55.7,90.0,top
+C36,25.8,58.6,180.0,bottom
+C37,35.275,47.4,-90.0,top
+C38,38.9,50.5,-90.0,bottom
+C39,41.3,48.5,-90.0,bottom
+C4,38.208,25.218,0.0,bottom
+C40,34.77,55.7,90.0,top
+C41,25.8,57.6,180.0,bottom
+C42,34.17,45.15,0.0,top
+C43,21.97,48.5,180.0,top
+C44,31.875,43.45,-90.0,top
+C45,33.77,53.8,90.0,top
+C46,30.875,43.45,-90.0,top
+C47,29.4,44.9,0.0,bottom
+C48,25.6,42.9,0.0,bottom
+C49,29.27,56.3,180.0,top
+C5,25.27,25.2,0.0,bottom
+C50,22.4,50.8,90.0,top
+C51,22.4,46.1,-90.0,top
+C52,29.4,43.9,0.0,bottom
+C53,25.6,44.9,0.0,bottom
+C54,21.4,46.1,-90.0,top
+C55,21.4,50.8,90.0,top
+C56,27.5,44.9,180.0,bottom
+C57,25.6,43.9,0.0,bottom
+C58,27.5,43.9,180.0,bottom
+C59,25.6,41.9,0.0,bottom
+C6,12.17,25.2,0.0,bottom
+C60,15.5,4.4,-90.0,top
+C61,11.725,10.55,180.0,top
+C62,6.7,12.2,90.0,top
+C63,5.1,14.2,0.0,top
+C64,4.77,15.9,0.0,top
+C65,12.3,18.2,180.0,top
+C66,11.0,15.48,-90.0,bottom
+C67,13.12,19.95,0.0,top
+C68,2.07,16.6,0.0,bottom
+C69,17.5,16.73,90.0,bottom
+C7,42.17,26.28,180.0,bottom
+C70,15.9,20.5,-90.0,bottom
+C71,2.07,14.6,0.0,bottom
+C72,13.12,22.0,0.0,top
+C73,2.07,10.6,0.0,bottom
+C75,13.87,20.5,-90.0,bottom
+C76,2.07,12.6,0.0,bottom
+C77,14.832,8.326,0.0,bottom
+C78,16.59,22.0,180.0,top
+C79,5.27,25.3,0.0,top
+C8,38.228,26.234,0.0,bottom
+C81,16.57,19.95,180.0,top
+C82,23.0,16.4,90.0,top
+C83,24.2,16.4,90.0,top
+C84,28.8,13.9,180.0,top
+C85,29.6,16.6,0.0,top
+C9,25.27,26.18,0.0,bottom
+D1,47.3,68.0,90.0,bottom
+D10,8.1,19.2,180.0,top
+D11,27.5,68.0,90.0,bottom
+D12,30.05,68.0,90.0,bottom
+D2,44.3,68.0,90.0,bottom
+D3,41.17,68.0,90.0,bottom
+D4,38.3,68.0,90.0,bottom
+D5,14.4,11.19158,180.0,top
+D6,8.7,11.4,-90.0,top
+D7,14.4,13.6,0.0,top
+D8,5.1,11.95,90.0,top
+D9,4.3,19.6,0.0,top
+FB1,17.9,46.6,0.0,top
+FB2,40.9,51.4,180.0,bottom
+FB3,42.8,48.0,90.0,bottom
+FB4,38.8,55.5,180.0,top
+FB5,26.8,60.6,-90.0,bottom
+FB6,28.4,41.9,90.0,bottom
+FB7,25.9,40.6,180.0,bottom
+J1,8.7,5.8,0.0,top
+J2,47.7,23.855,90.0,bottom
+J3,34.7,23.845,90.0,bottom
+J4,21.7,23.855,90.0,bottom
+J5,8.69,23.855,90.0,bottom
+J6,52.17,26.075,0.0,top
+J7,11.77,67.31,180.0,top
+J8,7.675,51.925,-90.0,top
+L1,7.1,13.2,180.0,bottom
+L2,27.8,19.9,0.0,top
+Module1,51.58,33.49,90.0,top
+Q1,14.7,17.1,0.0,top
+R1,39.185,19.29,-90.0,top
+R10,33.975,47.075,-90.0,top
+R11,14.4,12.6,180.0,top
+R12,12.075,12.275,0.0,top
+R13,5.1,18.1,0.0,top
+R14,12.3,15.2,0.0,top
+R15,5.1,17.0,180.0,top
+R16,14.3,15.2,180.0,top
+R17,10.1,19.4,90.0,top
+R18,11.8,16.7,90.0,top
+R19,12.8,16.7,90.0,top
+R2,40.27,19.3,-90.0,top
+R20,11.0,13.48,-90.0,bottom
+R21,15.3,9.8,90.0,bottom
+R22,16.775,10.25,180.0,bottom
+R23,17.44,11.71,-90.0,bottom
+R24,28.4,12.6,0.0,top
+R25,24.1,13.6,-90.0,top
+R26,25.6,12.8,180.0,top
+R27,30.05,65.45,90.0,bottom
+R28,10.55,12.25,-90.0,top
+R3,29.7,59.8,-90.0,top
+R4,22.54,54.06,-90.0,top
+R5,47.3,65.5,-90.0,bottom
+R6,44.3,65.5,-90.0,bottom
+R7,41.17,65.5,-90.0,bottom
+R8,38.3,65.5,-90.0,bottom
+R9,27.5,65.55,90.0,bottom
+U1,41.67,19.34,90.0,bottom
+U2,38.62,19.3,90.0,bottom
+U3,37.82,6.3,0.0,top
+U4,28.15,50.66,90.0,top
+U5,33.5,39.5,0.0,top
+U6,8.7,15.8,90.0,top
+U7,14.225,14.48,-90.0,bottom
+U8,26.3,15.5,-90.0,top
+U9,32.525,65.125,180.0,bottom
+Y1,32.4,61.1,0.0,top
--- a/Pictures/20220818_123401_CDD08D3A.jpg
+++ b/Pictures/20220818_123401_CDD08D3A.jpg
--- a/Pictures/20220818_123426_A978F98A.jpg
+++ b/Pictures/20220818_123426_A978F98A.jpg
--- a/Pictures/20220819_155955_F72F1DF7.jpg
+++ b/Pictures/20220819_155955_F72F1DF7.jpg
--- a/Pictures/20220824_162648_9D67A65C.jpg
+++ b/Pictures/20220824_162648_9D67A65C.jpg
--- a/Pictures/20220824_162654_1181EFDB.jpg
+++ b/Pictures/20220824_162654_1181EFDB.jpg
--- a/Pictures/20220824_162701_C18DB772.jpg
+++ b/Pictures/20220824_162701_C18DB772.jpg
--- a/Pictures/20220824_162709_F015C88F.jpg
+++ b/Pictures/20220824_162709_F015C88F.jpg
--- a/Pictures/20220824_184010_5BFF8EB6.jpg
+++ b/Pictures/20220824_184010_5BFF8EB6.jpg
--- a/Pictures/20220824_184045_6DABEA76.jpg
+++ b/Pictures/20220824_184045_6DABEA76.jpg
--- a/Pictures/20220824_184050_E4642ACC.jpg
+++ b/Pictures/20220824_184050_E4642ACC.jpg
--- a/Pictures/20220824_184058_602F2AB2.jpg
+++ b/Pictures/20220824_184058_602F2AB2.jpg
--- a/Pictures/20220828_173316_6AA5BCF7.jpg
+++ b/Pictures/20220828_173316_6AA5BCF7.jpg
--- a/Pictures/20220922_094937_BFF73996.jpg
+++ b/Pictures/20220922_094937_BFF73996.jpg
--- a/Pictures/20220922_094939_CDA3B069.jpg
+++ b/Pictures/20220922_094939_CDA3B069.jpg
--- a/Pictures/picoLed.gif
+++ b/Pictures/picoLed.gif
--- a/voltage/.gitignore
+++ b/voltage/.gitignore
@@ -0,0 +1,5 @@
+.pio
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/ipch
--- a/voltage/.vscode/extensions.json
+++ b/voltage/.vscode/extensions.json
@@ -0,0 +1,10 @@
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}
--- a/voltage/include/README
+++ b/voltage/include/README
@@ -0,0 +1,39 @@
+
+This directory is intended for project header files.
+
+A header file is a file containing C declarations and macro definitions
+to be shared between several project source files. You request the use of a
+header file in your project source file (C, C++, etc) located in `src` folder
+by including it, with the C preprocessing directive `#include'.
+
+```src/main.c
+
+#include "header.h"
+
+int main (void)
+{
+ ...
+}
+```
+
+Including a header file produces the same results as copying the header file
+into each source file that needs it. Such copying would be time-consuming
+and error-prone. With a header file, the related declarations appear
+in only one place. If they need to be changed, they can be changed in one
+place, and programs that include the header file will automatically use the
+new version when next recompiled. The header file eliminates the labor of
+finding and changing all the copies as well as the risk that a failure to
+find one copy will result in inconsistencies within a program.
+
+In C, the usual convention is to give header files names that end with `.h'.
+It is most portable to use only letters, digits, dashes, and underscores in
+header file names, and at most one dot.
+
+Read more about using header files in official GCC documentation:
+
+* Include Syntax
+* Include Operation
+* Once-Only Headers
+* Computed Includes
+
+https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html
--- a/voltage/lib/README
+++ b/voltage/lib/README
@@ -0,0 +1,46 @@
+
+This directory is intended for project specific (private) libraries.
+PlatformIO will compile them to static libraries and link into executable file.
+
+The source code of each library should be placed in a an own separate directory
+("lib/your_library_name/[here are source files]").
+
+For example, see a structure of the following two libraries `Foo` and `Bar`:
+
+|--lib
+|  |
+|  |--Bar
+|  |  |--docs
+|  |  |--examples
+|  |  |--src
+|  |     |- Bar.c
+|  |     |- Bar.h
+|  |  |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
+|  |
+|  |--Foo
+|  |  |- Foo.c
+|  |  |- Foo.h
+|  |
+|  |- README --> THIS FILE
+|
+|- platformio.ini
+|--src
+   |- main.c
+
+and a contents of `src/main.c`:
+```
+#include <Foo.h>
+#include <Bar.h>
+
+int main (void)
+{
+  ...
+}
+
+```
+
+PlatformIO Library Dependency Finder will find automatically dependent
+libraries scanning project source files.
+
+More information about PlatformIO Library Dependency Finder
+- https://docs.platformio.org/page/librarymanager/ldf.html
--- a/voltage/platformio.ini
+++ b/voltage/platformio.ini
@@ -0,0 +1,20 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; https://docs.platformio.org/page/projectconf.html
+
+[env:nucleo_f411re]
+platform = ststm32
+board = nucleo_f411re
+lib_archive = false
+framework = arduino
+lib_deps = 
+    sparkfun/SparkFun STUSB4500@^1.1.5
+    wire
+monitor_port = COM5
+monitor_speed = 115200
--- a/voltage/src/main.cpp
+++ b/voltage/src/main.cpp
@@ -0,0 +1,116 @@
+#include <Arduino.h>
+
+#include <Wire.h>
+#include <SparkFun_STUSB4500.h>
+
+STUSB4500 usb;
+
+void setup() 
+{
+  Serial.begin(115200);  
+  Wire.begin(); //Join I2C bus
+  
+  delay(500);
+  
+  /* The Power Delivery board uses the default settings with address 0x28 using Wire.
+  
+     Opionally, if the address jumpers are modified, or using a different I2C bus,
+     these parameters can be changed here. E.g. usb.begin(0x29,Wire1)
+  
+     It will return true on success or false on failure to communicate. */
+  if(!usb.begin())
+  {
+    Serial.println("Cannot connect to STUSB4500.");
+    Serial.println("Is the board connected? Is the device ID correct?");
+    while(1);
+  }
+  
+  Serial.println("Connected to STUSB4500!");
+  delay(100);
+
+  /* Read the Power Data Objects (PDO) highest priority (1-3) */
+  Serial.print("PDO Number: ");
+  Serial.println(usb.getPdoNumber());
+
+  /* Read settings for PDO1
+     - Voltage fixed at 5V
+     - Current value for PDO1 0-5A, if 0 used, FLEX_I value is used
+     - Under Voltage Lock Out fixed at 3.3V (but will always return 0)
+     - Over Voltage Lock Out 5-20%
+  */
+  Serial.println();
+  Serial.print("Voltage1 (V): ");
+  Serial.println(usb.getVoltage(1));
+  Serial.print("Current1 (A): ");
+  Serial.println(usb.getCurrent(1));
+  Serial.print("Lower Voltage Tolerance1 (%): ");
+  Serial.println(usb.getLowerVoltageLimit(1));
+  Serial.print("Upper Voltage Tolerance1 (%): ");
+  Serial.println(usb.getUpperVoltageLimit(1));
+  Serial.println();
+
+  /* Read settings for PDO2
+    - Voltage 5-20V
+    - Current value for PDO2 0-5A, if 0 used, FLEX_I value is used
+    - Under Voltage Lock Out 5-20%
+    - Over Voltage Lock Out 5-20%
+  */
+  Serial.print("Voltage2 (V): ");
+  Serial.println(usb.getVoltage(2));
+  Serial.print("Current2 (A): ");
+  Serial.println(usb.getCurrent(2));
+  Serial.print("Lower Voltage Tolerance2 (%): ");
+  Serial.println(usb.getLowerVoltageLimit(2));
+  Serial.print("Upper Voltage Tolerance2 (%): ");
+  Serial.println(usb.getUpperVoltageLimit(2));
+  Serial.println();
+
+  /* Read settings for PDO3
+     - Voltage 5-20V
+     - Current value for PDO3 0-5A, if 0 used, FLEX_I value is used
+     - Under Voltage Lock Out 5-20%
+     - Over Voltage Lock Out 5-20%
+  */
+  Serial.print("Voltage3 (V): ");
+  Serial.println(usb.getVoltage(3));
+  Serial.print("Current3 (A): ");
+  Serial.println(usb.getCurrent(3));
+  Serial.print("Lower Voltage Tolerance3 (%): ");
+  Serial.println(usb.getLowerVoltageLimit(3));
+  Serial.print("Upper Voltage Tolerance3 (%): ");
+  Serial.println(usb.getUpperVoltageLimit(3));
+  Serial.println();
+
+  /* Read the flex current value (FLEX_I) */
+  Serial.print("Flex Current: ");
+  Serial.println(usb.getFlexCurrent());
+
+  /* Read the External Power capable bit */
+  Serial.print("External Power: ");
+  Serial.println(usb.getExternalPower());
+
+  /* Read the USB Communication capable bit */
+  Serial.print("USB Communication Capable: ");
+  Serial.println(usb.getUsbCommCapable());
+
+  /* Read the POWER_OK pins configuration */
+  Serial.print("Configuration OK GPIO: ");
+  Serial.println(usb.getConfigOkGpio());
+
+  /* Read the GPIO pin configuration */
+  Serial.print("GPIO Control: ");
+  Serial.println(usb.getGpioCtrl());
+
+  /* Read the bit that enables VBUS_EN_SNK pin only when power is greater than 5V */
+  Serial.print("Enable Power Only Above 5V: ");
+  Serial.println(usb.getPowerAbove5vOnly());
+  
+  /* Read bit that controls if the Source or Sink device's 
+     operating current is used in the RDO message */
+  Serial.print("Request Source Current: ");
+  Serial.println(usb.getReqSrcCurrent());
+}
+
+void loop()
+{
+}
--- a/voltage/test/README
+++ b/voltage/test/README
@@ -0,0 +1,11 @@
+
+This directory is intended for PlatformIO Test Runner and project tests.
+
+Unit Testing is a software testing method by which individual units of
+source code, sets of one or more MCU program modules together with associated
+control data, usage procedures, and operating procedures, are tested to
+determine whether they are fit for use. Unit testing finds problems early
+in the development cycle.
+
+More information about PlatformIO Unit Testing:
+- https://docs.platformio.org/en/latest/advanced/unit-testing/index.html
--- a/readme.md
+++ b/readme.md
@@ -1,13 +1,13 @@
+[<img src="https://git.lurenaud.com/assets/img/logo.svg">](https://git.lurenaud.com/lurenaud/PicoNas)
+
 # Piconas

-Test update :)
-
-Extra small personal ARM NAS server. This is a RaspberryPi Compute Module 4 carrier board based on a Marvell ship to connect 4x2.5" SATA Drives. 
+Extra small personal ARM NAS server. This is a RaspberryPi Compute Module 4 carrier board based on a Marvell ship to connect 4x2.5" SATA Drives from the PCIe bus. 

 - Gigabit Ethernet port
 - USB-C power supply
- Front pannel Oled screen
- 4x2.5" Sata drive
+- Front panel OLED screen
+- 4x2.5" Sata Drive
 - Soft RAID

 <img src="https://git.lurenaud.com/lurenaud/PicoNas/raw/branch/master/Rendus/ISO.png" height=400>
@@ -16,3 +16,7 @@ Extra small personal ARM NAS server. This is a RaspberryPi Compute Module 4 carr
 ## Carrier board:

 <img src="https://git.lurenaud.com/lurenaud/PicoNas/raw/branch/master/Rendus/PCB_iso.png" height = 400> <img src="https://git.lurenaud.com/lurenaud/PicoNas/raw/branch/master/Rendus/PCB_iso2.png" height = 400>
+
+## Photos
+<img src="https://git.lurenaud.com/lurenaud/PicoNas/raw/branch/master/Pictures/20220824_184050_E4642ACC.jpg" height = 400>
+<img src="https://git.lurenaud.com/lurenaud/PicoNas/raw/branch/master/Pictures/picoLed.gif" height = 400>
Author	SHA1	Message	Date
Lucien RENAUD	ea6a8f200d	Starting assembly of V1.3: iBom generated	2023-07-19 12:59:17 +02:00
Lucien RENAUD	7abd3392db	Update readme and photos	2023-05-25 01:56:31 +02:00
Lucien RENAUD	f95dbc6609	update readme: add git link	2023-05-25 01:14:44 +02:00
Lucien RENAUD	84c28b1f73	Add pictures	2023-01-17 00:22:10 +01:00
Lucien RENAUD	1290816bad	readme: add PCIe	2023-01-17 00:09:38 +01:00
Lucien RENAUD	c050c8506a	Sent to production (PCB&Mouser): V1.3	2022-11-21 17:00:12 +01:00
Lucien RENAUD	8dc1ee8f81	Release V1.3	2022-11-16 16:47:07 +01:00
Lucien RENAUD	a075650e8a	Kicad: change out of stock components	2022-11-15 20:53:11 +01:00
Lucien RENAUD	0f02606700	Merge branch 'master' of ssh://lurenaud.com:2222/lurenaud/PicoNas	2022-11-15 14:30:09 +01:00
Lucien RENAUD	3961728b2f	Various stuff save	2022-11-15 14:07:56 +01:00
Lucien RENAUD	f980889b36	Add Arduino Code to programm PD chip	2022-11-15 14:07:36 +01:00
Lucien RENAUD	19c54b7f0f	Changes Kicad: fix stuff from V1.2	2022-11-15 14:06:37 +01:00
Lucien RENAUD	5be526cd54	Add hinge and vent	2022-09-21 18:53:05 +02:00
Lucien Renaud	6c7fab313a	Replace flash mem package, regen release	2022-08-12 00:18:28 +02:00
Lucien Renaud	6eb980bdc1	Add SPI and LED	2022-08-11 15:28:10 +02:00
Lucien Renaud	0e4ab040fe	Change USB C connector	2022-08-07 14:11:02 +02:00
Lucien Renaud	822d3fd6d4	Generate ibom	2022-05-27 19:55:34 +02:00
Lucien Renaud	b1db83e50e	Update readme: typo	2022-05-27 19:54:54 +02:00
Lucien Renaud	7d67c8d562	Merge branch 'master' of ssh://lurenaud.com:2222/lurenaud/PicoNas	2022-05-27 19:54:21 +02:00
Lucien Renaud	c738ff6cce	Update readme: typo	2022-05-27 19:54:01 +02:00