Change USB C connector

Kicad/MainBoard/CM4+NAS.pretty/GCT_USB4140-GF-0070-C_REV0.4.kicad_mod

@@ -0,0 +1,77 @@
+(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 3.975 2.125) (end 3.775 2.125) (layer "Edge.Cuts") (width 0.01) (tstamp 11635367-a1fb-48fc-b338-25f0a99b9ea4))
+  (fp_line (start 2.55 1.73) (end 2.05 1.73) (layer "Edge.Cuts") (width 0.01) (tstamp 136266f2-a71e-4a9b-ac1e-bb1da15a76c1))
+  (fp_line (start 4.62 -0.2) (end 4.62 0.2) (layer "Edge.Cuts") (width 0.01) (tstamp 2d4724e8-f1bf-4f5e-9603-01854c5030ab))
+  (fp_line (start -2.05 1.73) (end -2.55 1.73) (layer "Edge.Cuts") (width 0.01) (tstamp 30730dba-9b69-4c19-a8a4-200e483b97cd))
+  (fp_line (start 3.775 1.475) (end 3.975 1.475) (layer "Edge.Cuts") (width 0.01) (tstamp 35b098d5-8aaa-4161-88c0-7b1568869a3c))
+  (fp_line (start -4.62 0.2) (end -4.62 -0.2) (layer "Edge.Cuts") (width 0.01) (tstamp ad73c87b-bd66-49d2-a9a7-314217b783ca))
+  (fp_line (start -2.55 1.13) (end -2.05 1.13) (layer "Edge.Cuts") (width 0.01) (tstamp adecd9e3-c550-441e-bf65-511656ed1a9a))
+  (fp_line (start -4.02 -0.2) (end -4.02 0.2) (layer "Edge.Cuts") (width 0.01) (tstamp cc2c69c0-9f17-4276-8146-58b6c95e3b1e))
+  (fp_line (start 4.02 0.2) (end 4.02 -0.2) (layer "Edge.Cuts") (width 0.01) (tstamp d62d2efd-6221-46a6-8bed-1de5291d9393))
+  (fp_line (start 2.05 1.13) (end 2.55 1.13) (layer "Edge.Cuts") (width 0.01) (tstamp fc308780-3fa4-4c9a-b9f1-adacd41c3bd2))
+  (fp_arc (start -4.32 0.5) (mid -4.532132 0.412132) (end -4.62 0.2) (layer "Edge.Cuts") (width 0.01) (tstamp 02c4dfc1-0446-4488-85cf-4d3c263354db))
+  (fp_arc (start 4.3 1.8) (mid 4.20481 2.02981) (end 3.975 2.125) (layer "Edge.Cuts") (width 0.01) (tstamp 0373a596-d75a-414f-91ed-ccec05e177fa))
+  (fp_arc (start 4.32 -0.5) (mid 4.532132 -0.412132) (end 4.62 -0.2) (layer "Edge.Cuts") (width 0.01) (tstamp 0e528908-42ca-4e1d-9496-7f63fde2c438))
+  (fp_arc (start -2.05 1.13) (mid -1.837868 1.217868) (end -1.75 1.43) (layer "Edge.Cuts") (width 0.01) (tstamp 1e70ee2f-9486-41b8-9a01-dbaaa10cffc6))
+  (fp_arc (start -4.32 -0.5) (mid -4.107868 -0.412132) (end -4.02 -0.2) (layer "Edge.Cuts") (width 0.01) (tstamp 1ec2ebfd-c346-44a3-b536-04ef468d62f8))
+  (fp_arc (start -2.55 1.73) (mid -2.762132 1.642132) (end -2.85 1.43) (layer "Edge.Cuts") (width 0.01) (tstamp 352bcebc-141f-4980-89ba-bfb1b24112d5))
+  (fp_arc (start 4.32 0.5) (mid 4.107868 0.412132) (end 4.02 0.2) (layer "Edge.Cuts") (width 0.01) (tstamp 39ad2964-41fa-47cd-a718-f14aeaa0957e))
+  (fp_arc (start 1.75 1.43) (mid 1.837868 1.217868) (end 2.05 1.13) (layer "Edge.Cuts") (width 0.01) (tstamp 43c97656-1824-4023-8db9-015af3ab289e))
+  (fp_arc (start -2.85 1.43) (mid -2.762132 1.217868) (end -2.55 1.13) (layer "Edge.Cuts") (width 0.01) (tstamp 64790f26-fc0b-439d-9176-8f0913e4d878))
+  (fp_arc (start -1.75 1.43) (mid -1.837868 1.642132) (end -2.05 1.73) (layer "Edge.Cuts") (width 0.01) (tstamp 6ff7724f-4ae6-439f-824b-17dc8125df4b))
+  (fp_arc (start 3.45 1.8) (mid 3.54519 1.57019) (end 3.775 1.475) (layer "Edge.Cuts") (width 0.01) (tstamp 79eaf5d4-2eba-478a-9468-86f4c0bdbf2e))
+  (fp_arc (start 2.85 1.43) (mid 2.762132 1.642132) (end 2.55 1.73) (layer "Edge.Cuts") (width 0.01) (tstamp 7a80b9b8-3e0d-409d-9475-3f3f1301f326))
+  (fp_arc (start 2.05 1.73) (mid 1.837868 1.642132) (end 1.75 1.43) (layer "Edge.Cuts") (width 0.01) (tstamp 85957922-2310-4905-aa68-592606b00227))
+  (fp_arc (start -4.62 -0.2) (mid -4.532132 -0.412132) (end -4.32 -0.5) (layer "Edge.Cuts") (width 0.01) (tstamp 97ba9790-75a0-43a3-8b1d-2201d26bba9e))
+  (fp_arc (start 4.62 0.2) (mid 4.532132 0.412132) (end 4.32 0.5) (layer "Edge.Cuts") (width 0.01) (tstamp c34e819b-5aaa-4489-a0dd-beb5b9d22cfd))
+  (fp_arc (start -4.02 0.2) (mid -4.107868 0.412132) (end -4.32 0.5) (layer "Edge.Cuts") (width 0.01) (tstamp d2e9bb83-246f-498f-9a85-ec08a2ecca4f))
+  (fp_arc (start 4.02 -0.2) (mid 4.107868 -0.412132) (end 4.32 -0.5) (layer "Edge.Cuts") (width 0.01) (tstamp dc7deade-a415-46e9-8e3b-ca6a22283a67))
+  (fp_arc (start 3.975 1.475) (mid 4.20481 1.57019) (end 4.3 1.8) (layer "Edge.Cuts") (width 0.01) (tstamp de5b4e9c-80f8-4ea3-8cd9-c0331e32786f))
+  (fp_arc (start 3.775 2.125) (mid 3.54519 2.02981) (end 3.45 1.8) (layer "Edge.Cuts") (width 0.01) (tstamp e02d64bd-a4e1-40bf-a7c0-e910a89f0d32))
+  (fp_arc (start 2.55 1.13) (mid 2.762132 1.217868) (end 2.85 1.43) (layer "Edge.Cuts") (width 0.01) (tstamp e5d6a604-82c6-49f7-94a3-62bdbcf81a68))
+  (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))
+  )
+)

Kicad/MainBoard/Ethernet_USB.kicad_sch

@@ -2090,8 +2090,8 @@
     (pin "7" (uuid 12bde0ee-1ca6-43f0-a533-1821ed80e39e))
     (pin "8" (uuid 93e6e377-92c1-489b-91ec-7bf563c683df))
     (pin "9" (uuid da8b5087-9279-4791-8310-7bf7a806015a))
-    (pin "sh" (uuid 756d6b32-146c-4e72-8303-453ee4d5c928))
+    (pin "sh" (uuid 756d6b32-146c-4e72-8303-453ee4d5c929))
-    (pin "sh" (uuid 756d6b32-146c-4e72-8303-453ee4d5c928))
+    (pin "sh" (uuid 756d6b32-146c-4e72-8303-453ee4d5c929))
   )
 
   (symbol (lib_id "power:GND") (at 119.38 99.06 0) (unit 1)

Kicad/MainBoard/MainBoard.kicad_sch

@@ -1271,8 +1271,8 @@
     (path "/2c979e14-b388-4161-9e61-0df9b5317aa8/0a0997b4-a865-4947-8b73-c5cf98481808"
       (reference "FB7") (unit 1) (value "80ohm_700ma") (footprint "Inductor_SMD:L_0402_1005Metric")
     )
-    (path "/cc4e2399-44cd-43eb-b026-ebe39d7ae688/687fd08e-4583-4abe-b583-b7d465bf30ed"
+    (path "/cc4e2399-44cd-43eb-b026-ebe39d7ae688/508cea98-dfd0-4b99-b4a6-e28ec7f34722"
-      (reference "J1") (unit 1) (value "USB_C_Receptacle") (footprint "Connector_USB:USB_C_Receptacle_JAE_DX07S024WJ1R350")
+      (reference "J1") (unit 1) (value "USB_C_Receptacle_Charge") (footprint "CM4+NAS:GCT_USB4140-GF-0070-C_REV0.4")
     )
     (path "/2c979e14-b388-4161-9e61-0df9b5317aa8/c0182baa-d32c-423a-8e40-abd6cc5eefa9"
       (reference "J2") (unit 1) (value "SATA") (footprint "CM4+NAS:sata_1735284-2")

Kicad/MainBoard/Power.kicad_sch

@@ -500,104 +500,48 @@
         )
       )
     )
-    (symbol "Connector:USB_C_Receptacle" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
+    (symbol "CM4_NAS:USB_C_Receptacle_Charge" (pin_names (offset 1.016)) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at -10.16 29.21 0)
+      (property "Reference" "J?" (id 0) (at -0.3175 13.97 0)
-        (effects (font (size 1.27 1.27)) (justify left))
+        (effects (font (size 1.27 1.27)))
       )
-      (property "Value" "USB_C_Receptacle" (id 1) (at 10.16 29.21 0)
+      (property "Value" "USB_C_Receptacle_Charge" (id 1) (at -0.3175 11.43 0)
-        (effects (font (size 1.27 1.27)) (justify right))
+        (effects (font (size 1.27 1.27)))
       )
-      (property "Footprint" "" (id 2) (at 3.81 0 0)
+      (property "Footprint" "CM4+NAS:GCT_USB4140-GF-0070-C_REV0.4" (id 2) (at -0.635 19.685 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "Datasheet" "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" (id 3) (at 3.81 0 0)
+      (property "Datasheet" "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" (id 3) (at 1.905 15.875 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_keywords" "usb universal serial bus type-C full-featured" (id 4) (at 0 0 0)
+      (property "ki_keywords" "usb universal serial bus type-C USB2.0" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "USB Full-Featured Type-C Receptacle connector" (id 5) (at 0 0 0)
+      (property "ki_description" "USB 2.0-only Type-C Receptacle connector" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (property "ki_fp_filters" "USB*C*Receptacle*" (id 6) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "USB_C_Receptacle_0_0"
+      (symbol "USB_C_Receptacle_Charge_0_0"
-        (rectangle (start -0.254 -35.56) (end 0.254 -34.544)
+        (rectangle (start 3.81 -10.16) (end 4.318 -9.144)
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-        (rectangle (start 10.16 -32.766) (end 9.144 -33.274)
+        (rectangle (start 8.89 -1.016) (end 7.874 -1.524)
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-        (rectangle (start 10.16 -30.226) (end 9.144 -30.734)
+        (rectangle (start 8.89 1.524) (end 7.874 1.016)
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-        (rectangle (start 10.16 -25.146) (end 9.144 -25.654)
+        (rectangle (start 8.89 6.604) (end 7.874 6.096)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start 10.16 -22.606) (end 9.144 -23.114)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start 10.16 -17.526) (end 9.144 -18.034)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start 10.16 -14.986) (end 9.144 -15.494)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start 10.16 -9.906) (end 9.144 -10.414)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start 10.16 -7.366) (end 9.144 -7.874)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start 10.16 -2.286) (end 9.144 -2.794)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start 10.16 0.254) (end 9.144 -0.254)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start 10.16 5.334) (end 9.144 4.826)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start 10.16 7.874) (end 9.144 7.366)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start 10.16 10.414) (end 9.144 9.906)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start 10.16 12.954) (end 9.144 12.446)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start 10.16 18.034) (end 9.144 17.526)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start 10.16 20.574) (end 9.144 20.066)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type none))
-        )
-        (rectangle (start 10.16 25.654) (end 9.144 25.146)
           (stroke (width 0) (type default) (color 0 0 0 0))
           (fill (type none))
         )
       )
-      (symbol "USB_C_Receptacle_0_1"
+      (symbol "USB_C_Receptacle_Charge_0_1"
-        (rectangle (start -10.16 27.94) (end 10.16 -35.56)
+        (rectangle (start -10.16 8.89) (end 8.89 -10.16)
           (stroke (width 0.254) (type default) (color 0 0 0 0))
           (fill (type background))
         )
@@ -629,6 +573,14 @@
           (stroke (width 0.508) (type default) (color 0 0 0 0))
           (fill (type none))
         )
+        (circle (center -2.54 1.143) (radius 0.635)
+          (stroke (width 0.254) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
+        (circle (center 0 -5.842) (radius 1.27)
+          (stroke (width 0) (type default) (color 0 0 0 0))
+          (fill (type outline))
+        )
         (polyline
           (pts
             (xy -8.89 -3.81)
@@ -645,16 +597,6 @@
           (stroke (width 0.508) (type default) (color 0 0 0 0))
           (fill (type none))
         )
-      )
-      (symbol "USB_C_Receptacle_1_1"
-        (circle (center -2.54 1.143) (radius 0.635)
-          (stroke (width 0.254) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
-        (circle (center 0 -5.842) (radius 1.27)
-          (stroke (width 0) (type default) (color 0 0 0 0))
-          (fill (type outline))
-        )
         (polyline
           (pts
             (xy 0 -5.842)
@@ -695,106 +637,48 @@
           (stroke (width 0.254) (type default) (color 0 0 0 0))
           (fill (type outline))
         )
-        (pin passive line (at 0 -40.64 90) (length 5.08)
-          (name "GND" (effects (font (size 1.27 1.27))))
-          (number "A1" (effects (font (size 1.27 1.27))))
       )
-        (pin bidirectional line (at 15.24 -15.24 180) (length 5.08)
+      (symbol "USB_C_Receptacle_Charge_1_1"
-          (name "RX2-" (effects (font (size 1.27 1.27))))
+        (pin passive line (at 3.81 -15.24 90) (length 5.08) hide
-          (number "A10" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at 15.24 -17.78 180) (length 5.08)
-          (name "RX2+" (effects (font (size 1.27 1.27))))
-          (number "A11" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 -40.64 90) (length 5.08) hide
           (name "GND" (effects (font (size 1.27 1.27))))
           (number "A12" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 15.24 -10.16 180) (length 5.08)
+        (pin bidirectional line (at 13.97 1.27 180) (length 5.08)
-          (name "TX1+" (effects (font (size 1.27 1.27))))
-          (number "A2" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at 15.24 -7.62 180) (length 5.08)
-          (name "TX1-" (effects (font (size 1.27 1.27))))
-          (number "A3" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 15.24 25.4 180) (length 5.08)
-          (name "VBUS" (effects (font (size 1.27 1.27))))
-          (number "A4" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at 15.24 20.32 180) (length 5.08)
           (name "CC1" (effects (font (size 1.27 1.27))))
           (number "A5" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 15.24 7.62 180) (length 5.08)
+        (pin passive line (at 13.97 6.35 180) (length 5.08)
-          (name "D+" (effects (font (size 1.27 1.27))))
-          (number "A6" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at 15.24 12.7 180) (length 5.08)
-          (name "D-" (effects (font (size 1.27 1.27))))
-          (number "A7" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at 15.24 -30.48 180) (length 5.08)
-          (name "SBU1" (effects (font (size 1.27 1.27))))
-          (number "A8" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 15.24 25.4 180) (length 5.08) hide
           (name "VBUS" (effects (font (size 1.27 1.27))))
           (number "A9" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at 0 -40.64 90) (length 5.08) hide
+        (pin passive line (at 3.81 -15.24 90) (length 5.08)
-          (name "GND" (effects (font (size 1.27 1.27))))
-          (number "B1" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at 15.24 0 180) (length 5.08)
-          (name "RX1-" (effects (font (size 1.27 1.27))))
-          (number "B10" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at 15.24 -2.54 180) (length 5.08)
-          (name "RX1+" (effects (font (size 1.27 1.27))))
-          (number "B11" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 0 -40.64 90) (length 5.08) hide
           (name "GND" (effects (font (size 1.27 1.27))))
           (number "B12" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 15.24 -25.4 180) (length 5.08)
+        (pin bidirectional line (at 13.97 -1.27 180) (length 5.08)
-          (name "TX2+" (effects (font (size 1.27 1.27))))
-          (number "B2" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at 15.24 -22.86 180) (length 5.08)
-          (name "TX2-" (effects (font (size 1.27 1.27))))
-          (number "B3" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 15.24 25.4 180) (length 5.08) hide
-          (name "VBUS" (effects (font (size 1.27 1.27))))
-          (number "B4" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at 15.24 17.78 180) (length 5.08)
           (name "CC2" (effects (font (size 1.27 1.27))))
           (number "B5" (effects (font (size 1.27 1.27))))
         )
-        (pin bidirectional line (at 15.24 5.08 180) (length 5.08)
+        (pin passive line (at 13.97 6.35 180) (length 5.08) hide
-          (name "D+" (effects (font (size 1.27 1.27))))
-          (number "B6" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at 15.24 10.16 180) (length 5.08)
-          (name "D-" (effects (font (size 1.27 1.27))))
-          (number "B7" (effects (font (size 1.27 1.27))))
-        )
-        (pin bidirectional line (at 15.24 -33.02 180) (length 5.08)
-          (name "SBU2" (effects (font (size 1.27 1.27))))
-          (number "B8" (effects (font (size 1.27 1.27))))
-        )
-        (pin passive line (at 15.24 25.4 180) (length 5.08) hide
           (name "VBUS" (effects (font (size 1.27 1.27))))
           (number "B9" (effects (font (size 1.27 1.27))))
         )
-        (pin passive line (at -7.62 -40.64 90) (length 5.08)
+        (pin passive line (at -3.81 -15.24 90) (length 5.08)
           (name "SHIELD" (effects (font (size 1.27 1.27))))
           (number "S1" (effects (font (size 1.27 1.27))))
         )
+        (pin passive line (at -3.81 -15.24 90) (length 5.08) hide
+          (name "SHIELD" (effects (font (size 1.27 1.27))))
+          (number "S2" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -3.81 -15.24 90) (length 5.08) hide
+          (name "SHIELD" (effects (font (size 1.27 1.27))))
+          (number "S3" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at -3.81 -15.24 90) (length 5.08) hide
+          (name "SHIELD" (effects (font (size 1.27 1.27))))
+          (number "S4" (effects (font (size 1.27 1.27))))
+        )
       )
     )
     (symbol "Device:C" (pin_numbers hide) (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
@@ -1636,7 +1520,7 @@
   (junction (at 240.03 95.25) (diameter 0.9144) (color 0 0 0 0)
     (uuid 3c19fda9-55de-469e-9693-2d8993bca106)
   )
-  (junction (at 25.4 147.32) (diameter 0.9144) (color 0 0 0 0)
+  (junction (at 30.48 102.87) (diameter 0.9144) (color 0 0 0 0)
     (uuid 3d8571f7-688f-49ac-8d91-22508c277f45)
   )
   (junction (at 53.34 21.59) (diameter 0.9144) (color 0 0 0 0)
@@ -1763,25 +1647,11 @@
     (uuid fc052ac4-77ec-4901-baf8-c95f94903836)
   )
 
-  (no_connect (at 44.45 93.98) (uuid 023f934d-9a2e-4157-836a-532216e2c622))
   (no_connect (at 90.17 74.93) (uuid 0504a62e-121f-4aa2-bfef-6ad97c2bd9ec))
-  (no_connect (at 44.45 121.92) (uuid 0626e9b8-3c4c-4100-b1b7-d87571cdaf9c))
-  (no_connect (at 44.45 129.54) (uuid 0c0aaa42-e6cf-40c0-9dbb-ded0d110dc40))
-  (no_connect (at 44.45 111.76) (uuid 1ac7a722-c672-4edb-ac95-15f43b437194))
-  (no_connect (at 44.45 137.16) (uuid 459f12a9-a082-45c1-9d0e-e94b6a253eec))
-  (no_connect (at 44.45 96.52) (uuid 48d3c631-163a-4553-bbea-5f7c2f65d36e))
   (no_connect (at 120.65 102.87) (uuid 6ed6c740-c938-49da-9b42-336fec094392))
-  (no_connect (at 44.45 91.44) (uuid 834df193-1f20-4009-8b8a-5417ec7e8e44))
-  (no_connect (at 44.45 127) (uuid c19c8747-31be-429c-acd0-c5f512f304a2))
   (no_connect (at 120.65 105.41) (uuid cc93def9-1082-4e08-b7fc-37421bc0b751))
-  (no_connect (at 44.45 114.3) (uuid d10ec000-c98b-4c83-a320-f88f760e3063))
-  (no_connect (at 44.45 134.62) (uuid d4368f16-7382-44e0-8082-139752fdacc4))
-  (no_connect (at 44.45 99.06) (uuid d6038529-7fef-4221-94d9-ea66aaa97471))
   (no_connect (at 120.65 107.95) (uuid db9e8a8f-6f41-406c-9224-db0c8243882e))
-  (no_connect (at 44.45 119.38) (uuid eac46315-1507-4985-aee2-3170a83cf05e))
-  (no_connect (at 44.45 104.14) (uuid eae071d9-1d10-4844-a9e0-1be933908a74))
   (no_connect (at 90.17 105.41) (uuid ebcd84a3-36ad-46fc-bd70-cbc969a2a55c))
-  (no_connect (at 44.45 106.68) (uuid f03385a0-f7a9-42a7-97e3-dc762ec89b1e))
 
   (wire (pts (xy 142.24 173.99) (xy 142.24 175.26))
     (stroke (width 0) (type solid) (color 0 0 0 0))
@@ -1823,7 +1693,7 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 089940c5-58e3-4311-ae4b-bc9a7332659f)
   )
-  (wire (pts (xy 21.59 147.32) (xy 25.4 147.32))
+  (wire (pts (xy 26.67 102.87) (xy 30.48 102.87))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 099e4c64-ef71-4fa4-bb35-f82b99096174)
   )
@@ -2030,7 +1900,7 @@
     (uuid 361cd40c-e651-4ea1-aab1-a8c674709d8a)
   )
 
-  (wire (pts (xy 25.4 147.32) (xy 29.21 147.32))
+  (wire (pts (xy 30.48 102.87) (xy 34.29 102.87))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 383e4086-072d-414f-816c-f46d4495efcc)
   )
@@ -2050,7 +1920,7 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 3bdd8230-14ee-4512-99cb-856156b47b13)
   )
-  (wire (pts (xy 29.21 147.32) (xy 29.21 144.78))
+  (wire (pts (xy 34.29 102.87) (xy 34.29 100.33))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 3c9b103a-1ce8-4459-ba40-fa8951c37c8c)
   )
@@ -2552,7 +2422,7 @@
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid ea819b02-a0f6-45c1-8911-b214f1b27cf4)
   )
-  (wire (pts (xy 21.59 144.78) (xy 21.59 147.32))
+  (wire (pts (xy 26.67 100.33) (xy 26.67 102.87))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid ec6e50fe-757f-4018-b492-f0dc2e438325)
   )
@@ -2769,17 +2639,17 @@
     (pin "9" (uuid b27456ca-813c-45df-b69b-6bbf06492ca3))
   )
 
-  (symbol (lib_id "power:GND") (at 25.4 147.32 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 30.48 102.87 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 0cf1857a-68de-443d-85b6-25529b1194df)
-    (property "Reference" "#PWR0149" (id 0) (at 25.4 153.67 0)
+    (property "Reference" "#PWR0149" (id 0) (at 30.48 109.22 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 26.67 152.4 0))
+    (property "Value" "GND" (id 1) (at 31.75 107.95 0))
-    (property "Footprint" "" (id 2) (at 25.4 147.32 0)
+    (property "Footprint" "" (id 2) (at 30.48 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 25.4 147.32 0)
+    (property "Datasheet" "" (id 3) (at 30.48 102.87 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9f1b422c-8fc1-4bbf-8eee-593feb47ccca))
@@ -3206,6 +3076,29 @@
     (pin "2" (uuid 889923ae-9e1d-4787-ac94-7b13c519d09b))
   )
 
+  (symbol (lib_id "CM4_NAS:USB_C_Receptacle_Charge") (at 30.48 85.09 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 508cea98-dfd0-4b99-b4a6-e28ec7f34722)
+    (property "Reference" "J1" (id 0) (at 29.845 71.12 0))
+    (property "Value" "USB_C_Receptacle_Charge" (id 1) (at 29.845 73.66 0))
+    (property "Footprint" "CM4+NAS:GCT_USB4140-GF-0070-C_REV0.4" (id 2) (at 34.29 85.09 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" (id 3) (at 32.385 69.215 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "A12" (uuid a6b0c3e4-0579-450a-9127-c31fb00c6692))
+    (pin "A5" (uuid e738289c-fa10-4988-9f1d-372cde655314))
+    (pin "A9" (uuid 950dd34d-7b05-45d2-bad9-0790ba3528c9))
+    (pin "B12" (uuid ad4a735d-f005-45c8-87b7-6f2e57316b3f))
+    (pin "B5" (uuid 6cec9cae-b17d-4665-82d2-93c143b973b8))
+    (pin "B9" (uuid eb369b7b-c0ee-4c66-852e-eaa3a9471a35))
+    (pin "S1" (uuid 94ada412-f9ef-4e7b-9d13-6a30dad42a65))
+    (pin "S2" (uuid b110e513-596d-4592-8165-125c207d6b82))
+    (pin "S3" (uuid 704e3825-82a2-45a8-97a2-ea458f69903f))
+    (pin "S4" (uuid d8de8c34-6f76-42ac-8695-96d249c51128))
+  )
+
   (symbol (lib_id "power:GND") (at 266.7 138.43 0) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 50a46df8-db58-4f9b-a0be-e70229532d30)
@@ -3322,54 +3215,6 @@
     (pin "2" (uuid 23082ab9-e38c-46d4-8d8a-c4154aa0c4cc))
   )
 
-  (symbol (lib_id "Connector:USB_C_Receptacle") (at 29.21 104.14 0) (unit 1)
-    (in_bom yes) (on_board yes)
-    (uuid 687fd08e-4583-4abe-b583-b7d465bf30ed)
-    (property "Reference" "J1" (id 0) (at 33.02 74.93 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "USB_C_Receptacle" (id 1) (at 30.48 74.93 90)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "Connector_USB:USB_C_Receptacle_JAE_DX07S024WJ1R350" (id 2) (at 33.02 104.14 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" (id 3) (at 33.02 104.14 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MFR" "Molex" (id 4) (at 29.21 104.14 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "MPN" "204711-0001" (id 5) (at 29.21 104.14 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "A1" (uuid 7c9c6b79-0e60-4793-aac1-1dd2d03d0d9b))
-    (pin "A10" (uuid 0abb850c-6011-48e9-8c20-d3d28852eda2))
-    (pin "A11" (uuid 68951453-3998-4993-8f8d-b90182025202))
-    (pin "A12" (uuid 06c219a1-dbfe-400b-953c-4be6c55fc615))
-    (pin "A2" (uuid 44a16bdb-8346-446d-858f-90e1df91d09a))
-    (pin "A3" (uuid 9bcd6d05-785a-4e25-96a8-f18cb7dc51db))
-    (pin "A4" (uuid 91585963-8c14-4dc7-987f-6160ea9afe27))
-    (pin "A5" (uuid 56db59d8-bc4f-466b-9db5-948ee1184dff))
-    (pin "A6" (uuid 6f98c9eb-0685-43ac-b44d-8ddef018ffc7))
-    (pin "A7" (uuid 5ab6a38c-7107-401c-8385-c2b72e619295))
-    (pin "A8" (uuid 4c13e30a-3bb6-4168-8a3e-64e2ccfd419a))
-    (pin "A9" (uuid 5ab80abd-8f17-49e3-905d-4a748c1c7aac))
-    (pin "B1" (uuid c85c7c97-2471-4f84-83e5-095b601e57cb))
-    (pin "B10" (uuid c88ffe37-c097-4dd3-b758-15f27c19ae75))
-    (pin "B11" (uuid 01b2ff3d-0b82-433a-b5f2-b8e94c35345c))
-    (pin "B12" (uuid 9fe0426b-ca41-4453-bfdb-71d4eaf6e96f))
-    (pin "B2" (uuid de5d3e5b-ccc5-4a12-a6a9-9d42714b8852))
-    (pin "B3" (uuid 1a4e9cfc-16a3-4ef2-a4d9-49ee7c25a69d))
-    (pin "B4" (uuid c353a42b-c474-4abf-a632-abe177df085f))
-    (pin "B5" (uuid 098a9599-2b38-48d1-b5b5-e51cb94d3f84))
-    (pin "B6" (uuid bc387134-92b5-41dd-a56e-f19530f7faa0))
-    (pin "B7" (uuid 926641f7-28fb-47fe-a846-f79516b25030))
-    (pin "B8" (uuid 9981a631-dd04-4817-b623-15f68912fad0))
-    (pin "B9" (uuid f0868bfa-625a-48ea-945b-cddf123c418d))
-    (pin "S1" (uuid 471ac3b8-7d9f-4ab5-9454-2fe09ce49c92))
-  )
-
   (symbol (lib_id "Device:C") (at 273.05 99.06 180) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 6a6bb860-b48f-4bb8-8253-0b90583d2dbc)