From d423deb2adc46bfb2b68e8a91641857acd1a5ee1 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 11 Sep 2023 08:53:07 -0600
Subject: [PATCH] Connect I2C busses on EC page

---
 pcb-rpl-uph/ec.kicad_sch            |  332 +--
 pcb-rpl-uph/virgo-rpl-uph.kicad_pcb | 3554 +++++++++++++--------------
 2 files changed, 1967 insertions(+), 1919 deletions(-)

diff --git a/pcb-rpl-uph/ec.kicad_sch b/pcb-rpl-uph/ec.kicad_sch
index f1105e6..e11cb33 100644
--- a/pcb-rpl-uph/ec.kicad_sch
+++ b/pcb-rpl-uph/ec.kicad_sch
@@ -946,9 +946,18 @@
     )
   )
 
-  (junction (at 76.2 88.9) (diameter 0) (color 0 0 0 0)
+  (junction (at 294.64 71.12) (diameter 0) (color 0 0 0 0)
+    (uuid 02017eb6-b9e3-4290-ba30-6585a7f723a9)
+  )
+  (junction (at 289.56 62.23) (diameter 0) (color 0 0 0 0)
     (uuid 166cbc3a-b11b-47ac-a3ba-59097d0ff4aa)
   )
+  (junction (at 294.64 78.74) (diameter 0) (color 0 0 0 0)
+    (uuid 3db6ec1e-548d-45e0-a5da-c14329ab2ba5)
+  )
+  (junction (at 289.56 73.66) (diameter 0) (color 0 0 0 0)
+    (uuid 3fade562-0905-4846-b40f-df7c644eeb06)
+  )
   (junction (at 259.715 195.58) (diameter 0) (color 0 0 0 0)
     (uuid 49c14b06-eb64-4b82-8f8e-eeb44ed77f7e)
   )
@@ -958,16 +967,31 @@
   (junction (at 259.715 198.12) (diameter 0) (color 0 0 0 0)
     (uuid 5c6d0d6b-e6d1-4eeb-a9b0-3aea5a1f60d4)
   )
-  (junction (at 76.2 69.85) (diameter 0) (color 0 0 0 0)
+  (junction (at 289.56 87.63) (diameter 0) (color 0 0 0 0)
     (uuid 61702fde-5e8d-4a12-8f36-ae97cc794940)
   )
   (junction (at 298.45 40.64) (diameter 0) (color 0 0 0 0)
     (uuid 6f647403-f54e-47a9-aec9-15755a6d7da9)
   )
-  (junction (at 76.2 106.68) (diameter 0) (color 0 0 0 0)
+  (junction (at 289.56 104.14) (diameter 0) (color 0 0 0 0)
+    (uuid 720e7868-b082-4ebd-bdc3-7b7d0bd9a1ba)
+  )
+  (junction (at 289.56 76.2) (diameter 0) (color 0 0 0 0)
+    (uuid 7c1c4539-84f5-429b-bfa3-a9faaaa42a6b)
+  )
+  (junction (at 294.64 106.68) (diameter 0) (color 0 0 0 0)
+    (uuid 95e27261-e07d-44e8-820b-62a1d2124af5)
+  )
+  (junction (at 289.56 115.57) (diameter 0) (color 0 0 0 0)
     (uuid a001c849-a3d2-42a1-8bd3-b4617e1f34a0)
   )
-  (junction (at 76.2 132.08) (diameter 0) (color 0 0 0 0)
+  (junction (at 119.38 71.12) (diameter 0) (color 0 0 0 0)
+    (uuid cde3ab6a-d7e8-4cd3-9884-a0a1b823ad41)
+  )
+  (junction (at 124.46 73.66) (diameter 0) (color 0 0 0 0)
+    (uuid daede4d2-cebc-4f2a-a4b5-b113704999d6)
+  )
+  (junction (at 124.46 62.23) (diameter 0) (color 0 0 0 0)
     (uuid dce70325-24a5-42e9-929e-8c19e63bed72)
   )
 
@@ -1008,10 +1032,22 @@
     (stroke (width 0) (type default))
     (uuid 075fc94a-9aea-4913-a867-eda751d682d7)
   )
+  (wire (pts (xy 257.81 73.66) (xy 289.56 73.66))
+    (stroke (width 0) (type default))
+    (uuid 0ae14036-cf39-49b0-94bf-5b7a07a031fa)
+  )
+  (wire (pts (xy 124.46 73.66) (xy 156.21 73.66))
+    (stroke (width 0) (type default))
+    (uuid 0d9f5d2b-f448-40a2-a0c6-4526f5ba2a54)
+  )
   (wire (pts (xy 298.45 40.64) (xy 311.15 40.64))
     (stroke (width 0) (type default))
     (uuid 0fcd04f7-52b9-4620-b93f-dac0921d0999)
   )
+  (wire (pts (xy 257.81 106.68) (xy 294.64 106.68))
+    (stroke (width 0) (type default))
+    (uuid 16d125bd-3319-4d4a-8180-1df8106f2d4e)
+  )
   (wire (pts (xy 156.21 162.56) (xy 134.62 162.56))
     (stroke (width 0) (type default))
     (uuid 1cd6b988-aad5-4711-90e1-acc7a37383ac)
@@ -1028,7 +1064,7 @@
     (stroke (width 0) (type default))
     (uuid 24f6e042-5596-4cad-a097-168f5d56942d)
   )
-  (wire (pts (xy 68.58 81.28) (xy 76.2 81.28))
+  (wire (pts (xy 289.56 76.2) (xy 297.18 76.2))
     (stroke (width 0) (type default))
     (uuid 253f281f-3458-4bfa-9228-2e618e4e68ee)
   )
@@ -1037,11 +1073,11 @@
     (uuid 2580ee2f-8beb-42ba-b79b-daf0380c7bf0)
   )
 
-  (wire (pts (xy 71.12 114.3) (xy 71.12 115.57))
+  (wire (pts (xy 294.64 107.95) (xy 294.64 106.68))
     (stroke (width 0) (type default))
     (uuid 281039c7-dff8-415b-a26e-5634a0854510)
   )
-  (wire (pts (xy 76.2 118.11) (xy 76.2 114.3))
+  (wire (pts (xy 289.56 104.14) (xy 289.56 107.95))
     (stroke (width 0) (type default))
     (uuid 299adcd7-8c2e-425c-bc58-0dddaf452e6e)
   )
@@ -1054,7 +1090,7 @@
     (uuid 47d5017c-1266-43b6-8c0e-2383e260b846)
   )
 
-  (wire (pts (xy 71.12 77.47) (xy 71.12 78.74))
+  (wire (pts (xy 294.64 80.01) (xy 294.64 78.74))
     (stroke (width 0) (type default))
     (uuid 48af88fa-154b-4b0b-a849-b67ea6637b02)
   )
@@ -1063,31 +1099,35 @@
     (uuid 4c597c3f-b967-434e-bd24-6648b50002ba)
   )
 
-  (wire (pts (xy 76.2 143.51) (xy 76.2 139.7))
+  (wire (pts (xy 119.38 71.12) (xy 156.21 71.12))
+    (stroke (width 0) (type default))
+    (uuid 5a378e5b-a954-44e0-b685-6eba28c77c47)
+  )
+  (wire (pts (xy 124.46 73.66) (xy 124.46 69.85))
     (stroke (width 0) (type default))
     (uuid 5e91bfd9-fcfb-4cc9-a9f7-ab51fc94fffe)
   )
-  (wire (pts (xy 71.12 97.79) (xy 68.58 97.79))
+  (wire (pts (xy 294.64 71.12) (xy 297.18 71.12))
     (stroke (width 0) (type default))
     (uuid 610081bd-9c04-457b-8dae-bc43b25194e1)
   )
-  (wire (pts (xy 76.2 81.28) (xy 76.2 77.47))
+  (wire (pts (xy 289.56 76.2) (xy 289.56 80.01))
     (stroke (width 0) (type default))
     (uuid 618cd3ec-95ee-4150-9be1-428a8adb5136)
   )
-  (wire (pts (xy 71.12 78.74) (xy 68.58 78.74))
+  (wire (pts (xy 294.64 78.74) (xy 297.18 78.74))
     (stroke (width 0) (type default))
     (uuid 61b58906-79e1-4004-8389-b5bf5e6eef59)
   )
-  (wire (pts (xy 76.2 132.08) (xy 71.12 132.08))
+  (wire (pts (xy 124.46 62.23) (xy 119.38 62.23))
     (stroke (width 0) (type default))
     (uuid 62326f58-8ef2-4eba-938c-a6583ae0361d)
   )
-  (wire (pts (xy 68.58 143.51) (xy 76.2 143.51))
+  (wire (pts (xy 116.84 73.66) (xy 124.46 73.66))
     (stroke (width 0) (type default))
     (uuid 68a0d997-b36f-435d-819b-c2c9149c9c8b)
   )
-  (wire (pts (xy 68.58 118.11) (xy 76.2 118.11))
+  (wire (pts (xy 289.56 104.14) (xy 297.18 104.14))
     (stroke (width 0) (type default))
     (uuid 6b2f1552-05d9-4913-9d5a-e3f68f786a19)
   )
@@ -1112,7 +1152,7 @@
     (stroke (width 0) (type default))
     (uuid 78e530b6-676c-4e27-bed6-488202c56a6c)
   )
-  (wire (pts (xy 82.55 163.83) (xy 82.55 162.56))
+  (wire (pts (xy 80.01 100.33) (xy 80.01 99.06))
     (stroke (width 0) (type default))
     (uuid 79bb94bf-c2a1-45ff-a0c9-7350ee19e550)
   )
@@ -1129,15 +1169,19 @@
     (stroke (width 0) (type default))
     (uuid 83c8fc59-aee3-4501-aada-fb59d99da6da)
   )
-  (wire (pts (xy 71.12 96.52) (xy 71.12 97.79))
+  (wire (pts (xy 294.64 69.85) (xy 294.64 71.12))
     (stroke (width 0) (type default))
     (uuid 85aa950d-8db3-4e73-ab3e-9c78c39078af)
   )
+  (wire (pts (xy 257.81 76.2) (xy 289.56 76.2))
+    (stroke (width 0) (type default))
+    (uuid 87a49460-a33a-4537-a760-748eeecaf4e6)
+  )
   (wire (pts (xy 284.48 57.15) (xy 284.48 55.88))
     (stroke (width 0) (type default))
     (uuid 8dbf9c97-841d-439f-b219-8f6744d50526)
   )
-  (wire (pts (xy 76.2 88.9) (xy 71.12 88.9))
+  (wire (pts (xy 289.56 62.23) (xy 294.64 62.23))
     (stroke (width 0) (type default))
     (uuid 8e1d9ac7-f41b-4b59-b10a-8f79a5c65a5f)
   )
@@ -1145,7 +1189,7 @@
     (stroke (width 0) (type default))
     (uuid 8e511135-80b2-4b61-b53d-16d95a99d7bc)
   )
-  (wire (pts (xy 76.2 69.85) (xy 71.12 69.85))
+  (wire (pts (xy 289.56 87.63) (xy 294.64 87.63))
     (stroke (width 0) (type default))
     (uuid 8e7ae250-93a3-4fc9-82bd-ee16ea7290d5)
   )
@@ -1158,6 +1202,10 @@
     (stroke (width 0) (type default))
     (uuid a2c683e1-ce52-49c4-a617-d6c64ff65854)
   )
+  (wire (pts (xy 257.81 104.14) (xy 289.56 104.14))
+    (stroke (width 0) (type default))
+    (uuid aa6cb7a3-3d9e-49b9-90e4-801b9a5df61d)
+  )
   (wire (pts (xy 156.21 175.26) (xy 134.62 175.26))
     (stroke (width 0) (type default))
     (uuid ac10f16d-f08f-47dc-ab4d-3d3265f861ac)
@@ -1183,15 +1231,19 @@
     (stroke (width 0) (type default))
     (uuid c865556c-3f35-49aa-9e25-ddbcb854602f)
   )
-  (wire (pts (xy 80.01 163.83) (xy 82.55 163.83))
+  (wire (pts (xy 257.81 71.12) (xy 294.64 71.12))
+    (stroke (width 0) (type default))
+    (uuid c8738985-0f6e-42d9-b77f-259dfd53ba4d)
+  )
+  (wire (pts (xy 77.47 100.33) (xy 80.01 100.33))
     (stroke (width 0) (type default))
     (uuid ca728a22-aa52-4de3-a1ea-79f6b952fb9c)
   )
-  (wire (pts (xy 71.12 115.57) (xy 68.58 115.57))
+  (wire (pts (xy 294.64 106.68) (xy 297.18 106.68))
     (stroke (width 0) (type default))
     (uuid cd90b5a9-8ec3-4b98-b280-8a4036170a1f)
   )
-  (wire (pts (xy 76.2 100.33) (xy 76.2 96.52))
+  (wire (pts (xy 289.56 73.66) (xy 289.56 69.85))
     (stroke (width 0) (type default))
     (uuid cfbae629-3287-4ea1-986f-5d25cf778c7b)
   )
@@ -1203,11 +1255,15 @@
     (stroke (width 0) (type default))
     (uuid d60db7f7-9f7a-43b5-95c9-c908bd699f38)
   )
-  (wire (pts (xy 71.12 139.7) (xy 71.12 140.97))
+  (wire (pts (xy 257.81 78.74) (xy 294.64 78.74))
+    (stroke (width 0) (type default))
+    (uuid d6d1717e-6947-461a-80b7-8d92694524f6)
+  )
+  (wire (pts (xy 119.38 69.85) (xy 119.38 71.12))
     (stroke (width 0) (type default))
     (uuid d89f7158-94be-478c-b6cf-af2b320d7dff)
   )
-  (wire (pts (xy 71.12 140.97) (xy 68.58 140.97))
+  (wire (pts (xy 119.38 71.12) (xy 116.84 71.12))
     (stroke (width 0) (type default))
     (uuid def007ff-1b09-48c2-b78c-2804987ec3a4)
   )
@@ -1220,11 +1276,11 @@
     (uuid e9531648-3304-40ee-8fcd-758612c12255)
   )
 
-  (wire (pts (xy 68.58 100.33) (xy 76.2 100.33))
+  (wire (pts (xy 289.56 73.66) (xy 297.18 73.66))
     (stroke (width 0) (type default))
     (uuid f0f52bd2-7ae0-4465-b4f5-7e7d7ad631de)
   )
-  (wire (pts (xy 76.2 106.68) (xy 71.12 106.68))
+  (wire (pts (xy 289.56 115.57) (xy 294.64 115.57))
     (stroke (width 0) (type default))
     (uuid f2d2fc50-e95e-4368-96ae-7f947ee6479e)
   )
@@ -1234,25 +1290,25 @@
   )
 
   (text "I2C for\nleft/right C ports\nneed pull up (5.1 k)\nPTN5110 is OK for 3.3 V,\nretimer probably needs 1.8 V."
-    (at 81.28 88.9 0)
+    (at 312.42 80.01 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 426cc2c3-652c-4981-bd29-28901815d09b)
   )
-  (text "I2C for\ncharger\nrequires 3.3 V logic" (at 78.74 138.43 0)
+  (text "I2C for\ncharger\nrequires 3.3 V logic" (at 127 68.58 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 4f3a8b5e-8593-425c-bab1-d8e8155b7ab6)
   )
-  (text "requires 3.3 V logic" (at 71.12 149.86 0)
+  (text "requires 3.3 V logic" (at 68.58 86.36 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 828bd65c-594d-42f5-ae01-b8867b8dfd01)
   )
   (text "Interrupts from\nleft/right C ports\nneed pull up (100 k)\nPTN5110 is OK for 3.3 V,\nretimer probably needs 1.8 V.\nprobably needs a different power\nsymbol"
-    (at 78.74 118.11 0)
+    (at 312.42 116.84 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 9ae6b2af-fc14-4f4d-ae37-733b358b12aa)
   )
   (text "open drain, can connect PU resistor\nto 1.8 V or 3.3 V"
-    (at 85.09 163.83 0)
+    (at 82.55 100.33 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid ba2ba54c-b579-4889-a654-4dd52049e8f9)
   )
@@ -1307,35 +1363,35 @@
     (uuid f47e2b1a-9217-47d6-8bf2-e83d83f164b3)
   )
 
-  (hierarchical_label "C_LEFT_SCL" (shape bidirectional) (at 68.58 81.28 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
+  (hierarchical_label "C_LEFT_SCL" (shape bidirectional) (at 297.18 78.74 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left))
     (uuid 10c538a1-b4d5-471c-b200-259f0c277325)
   )
-  (hierarchical_label "CHRG_SDA" (shape bidirectional) (at 68.58 140.97 180) (fields_autoplaced)
+  (hierarchical_label "CHRG_SDA" (shape bidirectional) (at 116.84 71.12 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 304d36bb-5c02-40d9-84f8-21ece99e7745)
   )
-  (hierarchical_label "~{C_LEFT_INT}" (shape input) (at 68.58 115.57 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
+  (hierarchical_label "~{C_LEFT_INT}" (shape input) (at 297.18 104.14 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left))
     (uuid 341de0dd-27a1-4844-b7cb-c65fcaaccbb4)
   )
   (hierarchical_label "PECI" (shape input) (at 154.305 119.38 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 4ad05e54-c40d-4129-a70a-11f5e30ce475)
   )
-  (hierarchical_label "C_LEFT_SDA" (shape bidirectional) (at 68.58 78.74 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
+  (hierarchical_label "C_LEFT_SDA" (shape bidirectional) (at 297.18 76.2 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left))
     (uuid 55086c37-c822-4d35-82f7-4769b6e90bbe)
   )
-  (hierarchical_label "CHRG_OTG_VAP" (shape output) (at 68.58 148.59 180) (fields_autoplaced)
+  (hierarchical_label "CHRG_OTG_VAP" (shape output) (at 66.04 85.09 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 59a0c3f4-0a81-4d97-bb44-e3c84b78c7b3)
   )
-  (hierarchical_label "C_RIGHT_SDA" (shape bidirectional) (at 68.58 97.79 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
+  (hierarchical_label "C_RIGHT_SDA" (shape bidirectional) (at 297.18 71.12 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left))
     (uuid 609be042-b65b-434e-9e49-60f73cc08e20)
   )
-  (hierarchical_label "CHRG_SCL" (shape bidirectional) (at 68.58 143.51 180) (fields_autoplaced)
+  (hierarchical_label "CHRG_SCL" (shape bidirectional) (at 116.84 73.66 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid 9059743e-7f52-4934-b6db-07b06e979384)
   )
@@ -1343,11 +1399,11 @@
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid bbd80fdb-f9d1-4160-8b32-fde858bab82d)
   )
-  (hierarchical_label "C_RIGHT_SCL" (shape bidirectional) (at 68.58 100.33 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
+  (hierarchical_label "C_RIGHT_SCL" (shape bidirectional) (at 297.18 73.66 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left))
     (uuid bf4e90e8-e1a4-415b-ae48-bf8384b8b04a)
   )
-  (hierarchical_label "CHRG_OK" (shape input) (at 80.01 163.83 180) (fields_autoplaced)
+  (hierarchical_label "CHRG_OK" (shape input) (at 77.47 100.33 180) (fields_autoplaced)
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid de204ba2-1556-4fde-a4ce-b5208606f9b0)
   )
@@ -1355,8 +1411,8 @@
     (effects (font (size 1.27 1.27)) (justify right))
     (uuid e89bedac-50e3-4354-9be3-36f828aed37b)
   )
-  (hierarchical_label "~{C_RIGHT_INT}" (shape input) (at 68.58 118.11 180) (fields_autoplaced)
-    (effects (font (size 1.27 1.27)) (justify right))
+  (hierarchical_label "~{C_RIGHT_INT}" (shape input) (at 297.18 106.68 0) (fields_autoplaced)
+    (effects (font (size 1.27 1.27)) (justify left))
     (uuid f8849305-920d-4cd7-a70e-7726931997d4)
   )
 
@@ -1412,22 +1468,22 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 76.2 135.89 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 124.46 66.04 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 12c73103-263c-413e-869c-18df5a12565a)
-    (property "Reference" "R118" (at 73.66 135.89 90)
+    (property "Reference" "R118" (at 121.92 66.04 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "5.1 k" (at 76.2 135.89 90)
+    (property "Value" "5.1 k" (at 124.46 66.04 90)
       (effects (font (size 1.016 1.016)))
     )
-    (property "Footprint" "local:R_0201_0603Metric" (at 74.422 135.89 90)
+    (property "Footprint" "local:R_0201_0603Metric" (at 122.682 66.04 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 76.2 135.89 0)
+    (property "Datasheet" "~" (at 124.46 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Generic 1% resistor" (at 76.2 135.89 0)
+    (property "Manufacturer" "Generic 1% resistor" (at 124.46 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid af3a4c31-c978-46b4-9e1b-7a36d0fda108))
@@ -1637,22 +1693,22 @@
     )
   )
 
-  (symbol (lib_id "power:+1V8") (at 76.2 106.68 0) (unit 1)
+  (symbol (lib_id "power:+1V8") (at 289.56 115.57 180) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 45a5ab21-149f-4d87-a7c8-fb5a6bcd638d)
-    (property "Reference" "#PWR0217" (at 76.2 110.49 0)
+    (property "Reference" "#PWR0217" (at 289.56 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+1V8" (at 76.2 101.6 0)
+    (property "Value" "+1V8" (at 289.56 120.65 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "" (at 76.2 106.68 0)
+    (property "Footprint" "" (at 289.56 115.57 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 76.2 106.68 0)
+    (property "Datasheet" "" (at 289.56 115.57 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid a86dd43e-60db-4214-9422-e48f1fd94d0c))
+    (pin "1" (uuid 96bba92c-e016-433b-8abf-fcecccd064d5))
     (instances
       (project "virgo-rpl-uph"
         (path "/16b1e6ca-a3e2-42a7-b57e-a744c26a548a/51f8fb37-6338-4c1e-9d20-0671144c1d70"
@@ -1662,22 +1718,22 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 82.55 158.75 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 80.01 95.25 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 6cd3ecd4-5a79-4c00-b764-1b70684c0b58)
-    (property "Reference" "R118" (at 80.01 158.75 90)
+    (property "Reference" "R118" (at 77.47 95.25 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "100 k" (at 82.55 158.75 90)
+    (property "Value" "100 k" (at 80.01 95.25 90)
       (effects (font (size 1.016 1.016)))
     )
-    (property "Footprint" "local:R_0201_0603Metric" (at 80.772 158.75 90)
+    (property "Footprint" "local:R_0201_0603Metric" (at 78.232 95.25 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 82.55 158.75 0)
+    (property "Datasheet" "~" (at 80.01 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Generic 1% resistor" (at 82.55 158.75 0)
+    (property "Manufacturer" "Generic 1% resistor" (at 80.01 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid cc7b02fc-4180-41f6-b96e-255111fbedb2))
@@ -1708,26 +1764,26 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 76.2 73.66 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 289.56 83.82 180) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 6f9b67a3-6b41-4686-bc99-193bfe0bbcba)
-    (property "Reference" "R118" (at 73.66 73.66 90)
+    (property "Reference" "R118" (at 292.1 83.82 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "5.1 k" (at 76.2 73.66 90)
+    (property "Value" "5.1 k" (at 289.56 83.82 90)
       (effects (font (size 1.016 1.016)))
     )
-    (property "Footprint" "local:R_0201_0603Metric" (at 74.422 73.66 90)
+    (property "Footprint" "local:R_0201_0603Metric" (at 291.338 83.82 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 76.2 73.66 0)
+    (property "Datasheet" "~" (at 289.56 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Generic 1% resistor" (at 76.2 73.66 0)
+    (property "Manufacturer" "Generic 1% resistor" (at 289.56 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid e8a05c9b-ec12-421e-93c4-b275e574da18))
-    (pin "2" (uuid 74946c5b-55fe-4066-8314-d1ffb5c74f77))
+    (pin "1" (uuid f24a4178-b1c2-4fa7-9170-3e67bc63e6be))
+    (pin "2" (uuid 2250128b-46a6-44b9-b52e-1f953ea6c5d6))
     (instances
       (project "virgo-rpl-uph"
         (path "/16b1e6ca-a3e2-42a7-b57e-a744c26a548a/1400926a-7f97-442c-b836-84e565e940b7"
@@ -1754,22 +1810,22 @@
     )
   )
 
-  (symbol (lib_id "power:+1V8") (at 76.2 69.85 0) (unit 1)
+  (symbol (lib_id "power:+1V8") (at 289.56 87.63 180) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 74a4fa05-8607-4119-a77e-0c670f4ca79a)
-    (property "Reference" "#PWR0218" (at 76.2 73.66 0)
+    (property "Reference" "#PWR0218" (at 289.56 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+1V8" (at 76.2 64.77 0)
+    (property "Value" "+1V8" (at 289.56 92.71 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "" (at 76.2 69.85 0)
+    (property "Footprint" "" (at 289.56 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 76.2 69.85 0)
+    (property "Datasheet" "" (at 289.56 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 8329a9a0-6f70-4125-be2a-4cf6222c3504))
+    (pin "1" (uuid 5b3e95b2-fba0-4d84-a675-ad4c95746673))
     (instances
       (project "virgo-rpl-uph"
         (path "/16b1e6ca-a3e2-42a7-b57e-a744c26a548a/51f8fb37-6338-4c1e-9d20-0671144c1d70"
@@ -1779,22 +1835,22 @@
     )
   )
 
-  (symbol (lib_id "power:+3.3V") (at 76.2 132.08 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
+  (symbol (lib_id "power:+3.3V") (at 124.46 62.23 0) (unit 1)
+    (in_bom yes) (on_board yes) (dnp no)
     (uuid 74e24ed8-9df3-4142-82f8-3a59ded7fe65)
-    (property "Reference" "#PWR0220" (at 76.2 135.89 0)
+    (property "Reference" "#PWR0220" (at 124.46 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+3.3V" (at 76.2 127 0)
+    (property "Value" "+3.3V" (at 124.46 57.15 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "" (at 76.2 132.08 0)
+    (property "Footprint" "" (at 124.46 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 76.2 132.08 0)
+    (property "Datasheet" "" (at 124.46 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 62883380-7072-4e94-9d00-71475947e818))
+    (pin "1" (uuid 4406408f-3c48-4a4b-b94d-3d87e01d259c))
     (instances
       (project "virgo-rpl-uph"
         (path "/16b1e6ca-a3e2-42a7-b57e-a744c26a548a/51f8fb37-6338-4c1e-9d20-0671144c1d70"
@@ -1804,26 +1860,26 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 76.2 110.49 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 289.56 111.76 180) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 810b0e4f-24a3-476b-be9a-9b2abdc4535e)
-    (property "Reference" "R118" (at 73.66 110.49 90)
+    (property "Reference" "R118" (at 292.1 111.76 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "100 k" (at 76.2 110.49 90)
+    (property "Value" "100 k" (at 289.56 111.76 90)
       (effects (font (size 1.016 1.016)))
     )
-    (property "Footprint" "local:R_0201_0603Metric" (at 74.422 110.49 90)
+    (property "Footprint" "local:R_0201_0603Metric" (at 291.338 111.76 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 76.2 110.49 0)
+    (property "Datasheet" "~" (at 289.56 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Generic 1% resistor" (at 76.2 110.49 0)
+    (property "Manufacturer" "Generic 1% resistor" (at 289.56 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid c82b8d5e-b005-485f-bf34-12e5e6fab3f4))
-    (pin "2" (uuid ddd6b7b8-ac69-4965-94e5-7816bdb8e6f9))
+    (pin "1" (uuid 63a51f2b-617c-4890-a946-781e5cdc26db))
+    (pin "2" (uuid 50900494-443c-41fa-b54a-2a8a9b976428))
     (instances
       (project "virgo-rpl-uph"
         (path "/16b1e6ca-a3e2-42a7-b57e-a744c26a548a/1400926a-7f97-442c-b836-84e565e940b7"
@@ -1850,26 +1906,26 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 71.12 110.49 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 294.64 111.76 180) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 83f7d4f4-b75e-4f2a-99c2-717091d9fc9a)
-    (property "Reference" "R118" (at 68.58 110.49 90)
+    (property "Reference" "R118" (at 297.18 111.76 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "100 k" (at 71.12 110.49 90)
+    (property "Value" "100 k" (at 294.64 111.76 90)
       (effects (font (size 1.016 1.016)))
     )
-    (property "Footprint" "local:R_0201_0603Metric" (at 69.342 110.49 90)
+    (property "Footprint" "local:R_0201_0603Metric" (at 296.418 111.76 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 71.12 110.49 0)
+    (property "Datasheet" "~" (at 294.64 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Generic 1% resistor" (at 71.12 110.49 0)
+    (property "Manufacturer" "Generic 1% resistor" (at 294.64 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 0294ec6f-ea16-4e28-8372-f7704a85c85e))
-    (pin "2" (uuid 330f5924-6c53-4762-a593-74815c858db1))
+    (pin "1" (uuid 004addb6-a017-4c6f-a64c-26c85d9c4c72))
+    (pin "2" (uuid cee65c6b-9558-4621-86b4-75fc28fbc3f1))
     (instances
       (project "virgo-rpl-uph"
         (path "/16b1e6ca-a3e2-42a7-b57e-a744c26a548a/1400926a-7f97-442c-b836-84e565e940b7"
@@ -1921,26 +1977,26 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 76.2 92.71 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 289.56 66.04 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid ac595985-f6ff-4851-a56e-053c90723ece)
-    (property "Reference" "R118" (at 73.66 92.71 90)
+    (property "Reference" "R118" (at 292.1 66.04 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "5.1 k" (at 76.2 92.71 90)
+    (property "Value" "5.1 k" (at 289.56 66.04 90)
       (effects (font (size 1.016 1.016)))
     )
-    (property "Footprint" "local:R_0201_0603Metric" (at 74.422 92.71 90)
+    (property "Footprint" "local:R_0201_0603Metric" (at 291.338 66.04 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 76.2 92.71 0)
+    (property "Datasheet" "~" (at 289.56 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Generic 1% resistor" (at 76.2 92.71 0)
+    (property "Manufacturer" "Generic 1% resistor" (at 289.56 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid ad94f292-0386-42b5-b2e9-b2b871c86f75))
-    (pin "2" (uuid ed2b29cb-59f4-4184-a489-f927c1d678ab))
+    (pin "1" (uuid c6b5c8e9-66d7-4f3d-a52b-5c833db6b0ee))
+    (pin "2" (uuid 15995d09-d53d-4539-8536-65ec3e393e49))
     (instances
       (project "virgo-rpl-uph"
         (path "/16b1e6ca-a3e2-42a7-b57e-a744c26a548a/1400926a-7f97-442c-b836-84e565e940b7"
@@ -2063,22 +2119,22 @@
     )
   )
 
-  (symbol (lib_id "power:+1V8") (at 76.2 88.9 0) (unit 1)
+  (symbol (lib_id "power:+1V8") (at 289.56 62.23 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid ca930fc9-1df9-4eb7-b324-4263ceb0c543)
-    (property "Reference" "#PWR0219" (at 76.2 92.71 0)
+    (property "Reference" "#PWR0219" (at 289.56 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "+1V8" (at 76.2 83.82 0)
+    (property "Value" "+1V8" (at 289.56 57.15 0)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "" (at 76.2 88.9 0)
+    (property "Footprint" "" (at 289.56 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (at 76.2 88.9 0)
+    (property "Datasheet" "" (at 289.56 62.23 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 51cd2db7-37f9-4d69-bf31-7112208d6a4d))
+    (pin "1" (uuid d45267bc-29c5-4ab3-baa2-467dc5ca9147))
     (instances
       (project "virgo-rpl-uph"
         (path "/16b1e6ca-a3e2-42a7-b57e-a744c26a548a/51f8fb37-6338-4c1e-9d20-0671144c1d70"
@@ -2088,26 +2144,26 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 71.12 73.66 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 294.64 83.82 180) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid d533e39b-64ec-4143-a970-cf0cf606ebce)
-    (property "Reference" "R118" (at 68.58 73.66 90)
+    (property "Reference" "R118" (at 297.18 83.82 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "5.1 k" (at 71.12 73.66 90)
+    (property "Value" "5.1 k" (at 294.64 83.82 90)
       (effects (font (size 1.016 1.016)))
     )
-    (property "Footprint" "local:R_0201_0603Metric" (at 69.342 73.66 90)
+    (property "Footprint" "local:R_0201_0603Metric" (at 296.418 83.82 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 71.12 73.66 0)
+    (property "Datasheet" "~" (at 294.64 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Generic 1% resistor" (at 71.12 73.66 0)
+    (property "Manufacturer" "Generic 1% resistor" (at 294.64 83.82 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid c35433eb-fbfc-4c8f-a051-883935c0ab70))
-    (pin "2" (uuid 6393927d-f3bb-4871-8e15-f6b64a0e3aa0))
+    (pin "1" (uuid 1fbc7909-a3f7-433a-8b87-36786dda9afa))
+    (pin "2" (uuid 4ba593bd-f916-4d27-8354-64020e182286))
     (instances
       (project "virgo-rpl-uph"
         (path "/16b1e6ca-a3e2-42a7-b57e-a744c26a548a/1400926a-7f97-442c-b836-84e565e940b7"
@@ -2134,22 +2190,22 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 71.12 135.89 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 119.38 66.04 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid dc990162-d831-4ff8-8555-2fed1ee3abf4)
-    (property "Reference" "R118" (at 68.58 135.89 90)
+    (property "Reference" "R118" (at 116.84 66.04 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "5.1 k" (at 71.12 135.89 90)
+    (property "Value" "5.1 k" (at 119.38 66.04 90)
       (effects (font (size 1.016 1.016)))
     )
-    (property "Footprint" "local:R_0201_0603Metric" (at 69.342 135.89 90)
+    (property "Footprint" "local:R_0201_0603Metric" (at 117.602 66.04 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 71.12 135.89 0)
+    (property "Datasheet" "~" (at 119.38 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Generic 1% resistor" (at 71.12 135.89 0)
+    (property "Manufacturer" "Generic 1% resistor" (at 119.38 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3bb703e7-78dc-4ff9-8716-0390974ea464))
@@ -2180,26 +2236,26 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 71.12 92.71 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 294.64 66.04 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid f7f70eaf-b62c-4a20-bb5e-944d13a5357e)
-    (property "Reference" "R118" (at 68.58 92.71 90)
+    (property "Reference" "R118" (at 297.18 66.04 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "5.1 k" (at 71.12 92.71 90)
+    (property "Value" "5.1 k" (at 294.64 66.04 90)
       (effects (font (size 1.016 1.016)))
     )
-    (property "Footprint" "local:R_0201_0603Metric" (at 69.342 92.71 90)
+    (property "Footprint" "local:R_0201_0603Metric" (at 296.418 66.04 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 71.12 92.71 0)
+    (property "Datasheet" "~" (at 294.64 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Manufacturer" "Generic 1% resistor" (at 71.12 92.71 0)
+    (property "Manufacturer" "Generic 1% resistor" (at 294.64 66.04 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 29f10705-688a-4ce6-ab2c-e5bac3f5fb3f))
-    (pin "2" (uuid f569f9e9-18c3-4e9a-8964-e9c7c67ceb95))
+    (pin "1" (uuid abe68b45-165c-4214-954e-630de469f4e3))
+    (pin "2" (uuid 3514220f-d4cb-4636-8e55-e2bd0d5cb084))
     (instances
       (project "virgo-rpl-uph"
         (path "/16b1e6ca-a3e2-42a7-b57e-a744c26a548a/1400926a-7f97-442c-b836-84e565e940b7"
diff --git a/pcb-rpl-uph/virgo-rpl-uph.kicad_pcb b/pcb-rpl-uph/virgo-rpl-uph.kicad_pcb
index c906fff..034bb0a 100644
--- a/pcb-rpl-uph/virgo-rpl-uph.kicad_pcb
+++ b/pcb-rpl-uph/virgo-rpl-uph.kicad_pcb
@@ -1199,409 +1199,401 @@
   (net 1082 "/DDR_EN")
   (net 1083 "unconnected-(U6-SYSPWR_PRES&VCI_IN3#{slash}GPIO000{slash}I2C11_SDA-PadD4)")
   (net 1084 "unconnected-(U6-GPIO002{slash}PWM5{slash}SHD_CS1#-PadN8)")
-  (net 1085 "unconnected-(U6-GPIO003{slash}I2C00_SDA{slash}UART2_RI#-PadD6)")
-  (net 1086 "unconnected-(U6-GPIO004{slash}I2C00_SCL{slash}UART2_DCD#-PadA3)")
-  (net 1087 "unconnected-(U6-GPIO007{slash}I2C03_SDA{slash}PS2_CLK0B-PadA11)")
-  (net 1088 "unconnected-(U6-GPIO010{slash}I2C03_SCL{slash}PS2_DAT0B-PadB13)")
-  (net 1089 "unconnected-(U6-GPIO011{slash}nSMI_ALT{slash}PWM4{slash}ICT7-PadK6)")
-  (net 1090 "unconnected-(U6-GPIO012{slash}I2C07_SDA{slash}SLV_SPI_IO2-PadK7)")
-  (net 1091 "unconnected-(U6-GPIO013{slash}I2C07_SCL{slash}SLV_SPI_IO3-PadK8)")
-  (net 1092 "unconnected-(U6-GPIO014{slash}PWM6{slash}SLV_SPI_IO2{slash}GPTP_IN2-PadM8)")
-  (net 1093 "unconnected-(U6-GPIO016{slash}GPTP_IN1{slash}SHD_IO3{slash}ICT3(DSW_PWROK)-PadN6)")
-  (net 1094 "unconnected-(U6-GPIO017{slash}KSI0{slash}UART0_DCD#-PadN11)")
-  (net 1095 "unconnected-(U6-GPIO020{slash}KSI1-PadN10)")
-  (net 1096 "unconnected-(U6-GPIO021{slash}KSI2-PadM10)")
-  (net 1097 "unconnected-(U6-GPIO026{slash}KSI3{slash}UART0_DTR#{slash}I2C12_SDA-PadN13)")
-  (net 1098 "unconnected-(U6-GPIO027{slash}KSI4{slash}UART0_DSR#{slash}I2C12_SCL-PadL13)")
-  (net 1099 "unconnected-(U6-GPIO030{slash}KSI5{slash}I2C10_SDA-PadL12)")
-  (net 1100 "unconnected-(U6-GPIO031{slash}KSI6{slash}GPTP_OUT1-PadM13)")
-  (net 1101 "unconnected-(U6-GPIO032{slash}KSI7{slash}GPTP_OUT0{slash}UART0_RI#-PadN12)")
-  (net 1102 "unconnected-(U6-GPIO033{slash}TACH3-PadB2)")
-  (net 1103 "unconnected-(U6-GPIO040{slash}GPTP_OUT2{slash}KSO00{slash}UART1_CTS#-PadM12)")
-  (net 1104 "/EC/PECI")
-  (net 1105 "unconnected-(U6-GPIO043{slash}SB-TSI_CLK-PadF13)")
-  (net 1106 "unconnected-(U6-GPIO044{slash}VREF_VTT-PadJ10)")
-  (net 1107 "unconnected-(U6-GPIO045{slash}KSO01{slash}PWM2_ALT{slash}ICT14[CR_STRAP]-PadE8)")
-  (net 1108 "unconnected-(U6-GPIO046{slash}KSO02{slash}ICT11-PadF9)")
-  (net 1109 "unconnected-(U6-GPIO047{slash}KSO03{slash}PWM3_ALT{slash}ICT13-PadF10)")
-  (net 1110 "unconnected-(U6-GPIO050{slash}ICT0_TACH0-PadA9)")
-  (net 1111 "unconnected-(U6-GPIO051{slash}ICT1_TACH1-PadB9)")
-  (net 1112 "unconnected-(U6-GPIO052{slash}ICT2_TACH2-PadK10)")
-  (net 1113 "unconnected-(U6-GPIO053{slash}PWM0{slash}SLV_SPI_MSTR_INT-PadN9)")
-  (net 1114 "unconnected-(U6-GPIO054{slash}PWM1{slash}SLV_SPI_SCLK-PadM9)")
-  (net 1115 "unconnected-(U6-GPIO055(RSMRST#){slash}PWM2{slash}SHD_CS0#[BSS_STRAP]-PadM6)")
-  (net 1116 "unconnected-(U6-GPIO056{slash}PWM3{slash}SHD_CLK-PadM7)")
-  (net 1117 "unconnected-(U6-GPIO057{slash}VCC_PWRGD{slash}GPSPI_CLK_ALT-PadB1)")
-  (net 1118 "unconnected-(U6-GPIO060{slash}KBRST{slash}TST_CLK_OUT{slash}UART1_DCD#-PadA10)")
-  (net 1119 "/EC/ESPI.~{RESET}")
-  (net 1120 "unconnected-(U6-GPIO062(RESETO#){slash}I2C11_SCL-PadF4)")
-  (net 1121 "/EC/ESPI.~{ALERT}")
-  (net 1122 "unconnected-(U6-GPIO064{slash}PCI_RESET#-PadK5)")
-  (net 1123 "/EC/ESPI.CLK")
-  (net 1124 "/EC/ESPI.~{CS}")
-  (net 1125 "/EC/ESPI.IO0")
-  (net 1126 "/EC/ESPI.IO1")
-  (net 1127 "/EC/ESPI.IO2")
-  (net 1128 "/EC/ESPI.IO3")
-  (net 1129 "unconnected-(U6-GPIO104{slash}UART0_TX{slash}TFDP_CLK[VTR2_STRAP]-PadG12)")
-  (net 1130 "unconnected-(U6-GPIO105{slash}UART0_RX{slash}TFDP_DATA{slash}TRACECLK-PadF12)")
-  (net 1131 "unconnected-(U6-GPIO106{slash}PWROK-PadD2)")
-  (net 1132 "unconnected-(U6-GPIO107{slash}nSMI{slash}KSO04{slash}I2C10_SCL-PadK12)")
-  (net 1133 "unconnected-(U6-GPIO112{slash}KSO05-PadH13)")
-  (net 1134 "unconnected-(U6-GPIO113{slash}KSO06{slash}ICT9-PadJ13)")
-  (net 1135 "unconnected-(U6-GPIO114{slash}PS2_CLK0A{slash}nEC_SCI-PadJ12)")
-  (net 1136 "unconnected-(U6-GPIO115{slash}PS2_DAT0A-PadH12)")
-  (net 1137 "unconnected-(U6-GPIO120{slash}KSO07{slash}UART1_DTR#-PadK13)")
-  (net 1138 "unconnected-(U6-GPIO121{slash}PVT_IO0{slash}KSO08-PadC13)")
-  (net 1139 "unconnected-(U6-GPIO122{slash}PVT_IO1{slash}KSO09-PadE12)")
-  (net 1140 "unconnected-(U6-GPIO123{slash}PVT_IO2{slash}KSO10-PadD12)")
-  (net 1141 "unconnected-(U6-GPIO124{slash}PVT_CS#{slash}KSO11{slash}ICT12-PadH1)")
-  (net 1142 "unconnected-(U6-GPIO125{slash}PVT_CLK{slash}KSO12-PadC12)")
-  (net 1143 "unconnected-(U6-GPIO126{slash}PVT_IO3{slash}KSO13-PadD13)")
-  (net 1144 "unconnected-(U6-GPIO127{slash}A20M{slash}UART1_RTS#-PadA12)")
-  (net 1145 "unconnected-(U6-GPIO130{slash}I2C01_SDA{slash}SLV_SPI_IO0-PadK9)")
-  (net 1146 "unconnected-(U6-GPIO131{slash}I2C01_SCL{slash}SLV_SPI_CS#-PadH10)")
-  (net 1147 "unconnected-(U6-GPIO132{slash}I2C06_SDA{slash}KSO16-PadD10)")
-  (net 1148 "unconnected-(U6-GPIO140{slash}I2C06_SCL{slash}ICT5{slash}KSO17-PadB10)")
-  (net 1149 "unconnected-(U6-GPIO141{slash}I2C05_SDA{slash}UART2_RTS#-PadA6)")
-  (net 1150 "unconnected-(U6-GPIO142{slash}I2C05_SCL{slash}UART2_CTS#-PadD7)")
-  (net 1151 "unconnected-(U6-GPIO143{slash}I2C04_SDA{slash}UART0_CTS#-PadA5)")
-  (net 1152 "unconnected-(U6-GPIO144{slash}I2C04_SCL{slash}UART0_RTS#-PadB5)")
-  (net 1153 "unconnected-(U6-GPIO145{slash}I2C09_SDA{slash}JTAG_TDI{slash}UART2_RX-PadB8)")
-  (net 1154 "unconnected-(U6-GPIO146{slash}I2C09_SCL{slash}JTAG_TDO{slash}UART2_TX-PadB7)")
-  (net 1155 "unconnected-(U6-GPIO147{slash}I2C15_SDA{slash}JTAG_CLK{slash}UART2_DSR#-PadA7)")
-  (net 1156 "unconnected-(U6-GPIO150{slash}I2C15_SCL{slash}JTAG_TMS{slash}UART2_DTR#-PadB6)")
-  (net 1157 "unconnected-(U6-GPIO151{slash}ICT4{slash}KSO15-PadM11)")
-  (net 1158 "unconnected-(U6-GPIO152{slash}KSO14{slash}I2C07_SDA_ALT-PadG4)")
-  (net 1159 "unconnected-(U6-GPIO153{slash}LED2-PadE9)")
-  (net 1160 "unconnected-(U6-GPIO154{slash}I2C02_SDA{slash}PS2_CLK1B-PadB11)")
-  (net 1161 "unconnected-(U6-GPIO155{slash}I2C02_SCL{slash}PS2_DAT1B-PadB12)")
-  (net 1162 "unconnected-(U6-GPIO156{slash}LED0-PadA13)")
-  (net 1163 "unconnected-(U6-GPIO157{slash}LED1-PadD9)")
-  (net 1164 "unconnected-(U6-VCI_IN1#{slash}GPIO162-PadB3)")
-  (net 1165 "unconnected-(U6-VCI_IN0#{slash}GPIO163-PadE4)")
-  (net 1166 "unconnected-(U6-GPIO165{slash}32KHZ_IN{slash}CTOUT0-PadA8)")
-  (net 1167 "unconnected-(U6-GPIO170{slash}UART1_TX{slash}CEC_OUT[JTAG_STRAP]-PadG10)")
-  (net 1168 "unconnected-(U6-VCI_OVRD_IN{slash}GPIO172-PadB4)")
-  (net 1169 "unconnected-(U6-GPIO175{slash}CMP_VOUT1{slash}PWM8_ALT-PadE10)")
-  (net 1170 "unconnected-(U6-GPIO200{slash}ADC00{slash}TRACEDAT0-PadJ1)")
-  (net 1171 "unconnected-(U6-GPIO201{slash}ADC01{slash}TRACEDAT1-PadJ2)")
-  (net 1172 "unconnected-(U6-GPIO202{slash}ADC02{slash}TRACEDAT2-PadK1)")
-  (net 1173 "unconnected-(U6-GPIO203{slash}ADC03{slash}TRACEDAT3-PadK2)")
-  (net 1174 "unconnected-(U6-GPIO204{slash}ADC04-PadJ4)")
-  (net 1175 "unconnected-(U6-GPIO205{slash}ADC05-PadL1)")
-  (net 1176 "unconnected-(U6-GPIO206{slash}ADC06-PadL2)")
-  (net 1177 "unconnected-(U6-GPIO207{slash}ADC07[CMP_STRAP]-PadK4)")
-  (net 1178 "unconnected-(U6-GPIO221{slash}32KHz_OUT{slash}SYS_SHDN#-PadA1)")
-  (net 1179 "unconnected-(U6-GPIO223{slash}SHD_IO0-PadN7)")
-  (net 1180 "unconnected-(U6-GPIO224{slash}GPTP_IN0{slash}SHD_IO1-PadN5)")
-  (net 1181 "unconnected-(U6-GPIO226-PadC1)")
-  (net 1182 "unconnected-(U6-GPIO227{slash}SHD_IO2[PWRGD_STRAP]-PadM5)")
-  (net 1183 "unconnected-(U6-GPIO241{slash}PWM0_ALT{slash}CMP_VOUT0-PadD8)")
-  (net 1184 "unconnected-(U6-GPIO242{slash}CMP_VIN0-PadF2)")
-  (net 1185 "unconnected-(U6-GPIO244{slash}UART_CLK_ALT{slash}nEMI_INT_ALT{slash}CMP_VIN1-PadG2)")
-  (net 1186 "unconnected-(U6-GPIO246{slash}CTOUT1_ALT{slash}CMP_VREF0-PadE2)")
-  (net 1187 "unconnected-(U6-VCI_OUT{slash}GPIO250-PadF5)")
-  (net 1188 "unconnected-(U6-BGPO0{slash}GPIO253-PadD5)")
-  (net 1189 "unconnected-(U6-GPIO254{slash}PWM1_ALT{slash}CMP_VREF1-PadF1)")
-  (net 1190 "unconnected-(U6-GPIO255{slash}UART1_RX_ALT{slash}UART1_DSR#-PadD1)")
-  (net 1191 "unconnected-(U6-JTAG_RST#-PadE13)")
-  (net 1192 "unconnected-(U6-nRESET_IN-PadC2)")
-  (net 1193 "unconnected-(U6-VR_CAP-PadG1)")
-  (net 1194 "unconnected-(U6-VREF_ADC-PadH4)")
-  (net 1195 "unconnected-(U6-VTR_ANALOG-PadJ7)")
-  (net 1196 "unconnected-(U6-VTR_PLL-PadE1)")
-  (net 1197 "unconnected-(U6-VTR_REG-PadH2)")
-  (net 1198 "unconnected-(U6-VTR1-PadG5)")
-  (net 1199 "unconnected-(U6-VTR1-PadH5)")
-  (net 1200 "unconnected-(U6-VTR1-PadJ9)")
-  (net 1201 "unconnected-(U6-VTR2-PadJ8)")
-  (net 1202 "unconnected-(U6-VTR3-PadJ5)")
-  (net 1203 "unconnected-(U6-XTAL1-PadA2)")
-  (net 1204 "unconnected-(U6-XTAL2-PadA4)")
-  (net 1205 "/CPU_POWER/B18")
-  (net 1206 "Net-(C46-Pad1)")
-  (net 1207 "/CPU_POWER/MODE18")
-  (net 1208 "/CPU_POWER/FB18")
-  (net 1209 "+1V8")
-  (net 1210 "/CPU_POWER/PG18")
-  (net 1211 "unconnected-(U7-SS-Pad11)")
-  (net 1212 "/CPU_POWER/EN18")
-  (net 1213 "/CPU_POWER/SW18")
-  (net 1214 "/CPU_POWER/SW11")
-  (net 1215 "/CPU_POWER/B11")
-  (net 1216 "Net-(C52-Pad1)")
-  (net 1217 "/CPU_POWER/FB11")
-  (net 1218 "+1V1")
-  (net 1219 "unconnected-(U8-SS-Pad11)")
-  (net 1220 "/CPU_POWER/VCC18")
-  (net 1221 "/CPU_POWER/VCC11")
-  (net 1222 "/CPU_POWER/MODE11")
-  (net 1223 "/CPU_POWER/EN11")
-  (net 1224 "/CPU_POWER/PG11")
-  (net 1225 "unconnected-(U9-CMPOUT-Pad15)")
-  (net 1226 "/CHARGER/SW2")
-  (net 1227 "/CHARGER/BST2")
-  (net 1228 "/CHARGER/SW1")
-  (net 1229 "/CHARGER/BST1")
-  (net 1230 "/CHARGER/LODRV1")
-  (net 1231 "/CHARGER/LODRV2")
-  (net 1232 "/CHARGER/HIDRV1")
-  (net 1233 "/CHARGER/HIDRV2")
-  (net 1234 "/CHARGER/VSYS")
-  (net 1235 "Net-(C58-Pad1)")
-  (net 1236 "/CHARGER/COMP2")
-  (net 1237 "Net-(C66-Pad1)")
-  (net 1238 "/CHARGER/COMP1")
-  (net 1239 "/CHARGER/~{PROCHOT}")
-  (net 1240 "/CHARGER/BATR1")
-  (net 1241 "/CHARGER/ACP")
-  (net 1242 "/CHARGER/ACN")
-  (net 1243 "Net-(Q1-D)")
-  (net 1244 "/CHARGER/~{BATDRV}")
-  (net 1245 "/CHARGER/VIN")
-  (net 1246 "+3.3V")
-  (net 1247 "/CHRG_SDA")
-  (net 1248 "/CHRG_SCL")
-  (net 1249 "unconnected-(R158-Pad1)")
-  (net 1250 "/CHARGER/REGN")
-  (net 1251 "/CHARGER/IADPT")
-  (net 1252 "/CHARGER/IBAT")
-  (net 1253 "/CHARGER/VDDA")
-  (net 1254 "/CHARGER/ILIM_HIZ")
-  (net 1255 "Net-(U9-CELL_BATPRESZ)")
-  (net 1256 "/CHARGER/PSYS")
-  (net 1257 "/CHARGER/SRN1")
-  (net 1258 "/CHARGER/SRP")
-  (net 1259 "/CHARGER/SRN")
-  (net 1260 "/CPU_POWER/VCC1P05_OUT")
-  (net 1261 "/CPU_POWER/VCC1P05_PROC_OUT")
-  (net 1262 "/USBC2/CC2")
-  (net 1263 "/USBC3/VBUS")
-  (net 1264 "/USBC3/CC1")
-  (net 1265 "/USBC3/CC2")
-  (net 1266 "/USBC0/VLDO")
-  (net 1267 "/USBC1/VLDO")
-  (net 1268 "/USBC2/VLDO")
-  (net 1269 "/USBC3/VLDO")
-  (net 1270 "/USBC0/RXJ1-")
-  (net 1271 "/USBC0/RXC1-")
-  (net 1272 "/USBC1/RXJ1-")
-  (net 1273 "/USBC1/RXC1-")
-  (net 1274 "/USBC2/RXJ1-")
-  (net 1275 "/USBC2/RXC1-")
-  (net 1276 "/USBC3/RXJ1-")
-  (net 1277 "/USBC3/RXC1-")
-  (net 1278 "/USBC0/RXJ1+")
-  (net 1279 "/USBC0/RXC1+")
-  (net 1280 "/USBC1/RXJ1+")
-  (net 1281 "/USBC1/RXC1+")
-  (net 1282 "/USBC2/RXJ1+")
-  (net 1283 "/USBC2/RXC1+")
-  (net 1284 "/USBC3/RXJ1+")
-  (net 1285 "/USBC3/RXC1+")
-  (net 1286 "/USBC0/RXJ2-")
-  (net 1287 "/USBC0/RXC2-")
-  (net 1288 "/USBC0/RXJ2+")
-  (net 1289 "/USBC0/RXC2+")
-  (net 1290 "/USBC1/RXJ2-")
-  (net 1291 "/USBC1/RXC2-")
-  (net 1292 "/USBC1/RXJ2+")
-  (net 1293 "/USBC1/RXC2+")
-  (net 1294 "/USBC2/RXJ2-")
-  (net 1295 "/USBC2/RXC2-")
-  (net 1296 "/USBC2/RXJ2+")
-  (net 1297 "/USBC2/RXC2+")
-  (net 1298 "/USBC3/RXJ2-")
-  (net 1299 "/USBC3/RXC2-")
-  (net 1300 "/USBC3/RXJ2+")
-  (net 1301 "/USBC3/RXC2+")
-  (net 1302 "/USBC0/TXJ1-")
-  (net 1303 "/USBC0/TXC1-")
-  (net 1304 "/USBC0/TXJ1+")
-  (net 1305 "/USBC0/TXC1+")
-  (net 1306 "/USBC1/TXJ1-")
-  (net 1307 "/USBC1/TXC1-")
-  (net 1308 "/USBC1/TXJ1+")
-  (net 1309 "/USBC1/TXC1+")
-  (net 1310 "/USBC2/TXJ1-")
-  (net 1311 "/USBC2/TXC1-")
-  (net 1312 "/USBC2/TXJ1+")
-  (net 1313 "/USBC2/TXC1+")
-  (net 1314 "/USBC3/TXJ1-")
-  (net 1315 "/USBC3/TXC1-")
-  (net 1316 "/USBC3/TXJ1+")
-  (net 1317 "/USBC3/TXC1+")
-  (net 1318 "/USBC0/TXJ2-")
-  (net 1319 "/USBC0/TXC2-")
-  (net 1320 "/USBC0/TXJ2+")
-  (net 1321 "/USBC0/TXC2+")
-  (net 1322 "/USBC1/TXJ2-")
-  (net 1323 "/USBC1/TXC2-")
-  (net 1324 "/USBC1/TXJ2+")
-  (net 1325 "/USBC1/TXC2+")
-  (net 1326 "/USBC2/TXJ2-")
-  (net 1327 "/USBC2/TXC2-")
-  (net 1328 "/USBC2/TXJ2+")
-  (net 1329 "/USBC2/TXC2+")
-  (net 1330 "/USBC3/TXJ2-")
-  (net 1331 "/USBC3/TXC2-")
-  (net 1332 "/USBC3/TXJ2+")
-  (net 1333 "/USBC3/TXC2+")
-  (net 1334 "/USBC0/~{PROT_FLT}")
-  (net 1335 "/USBC0/PPHV")
-  (net 1336 "/USBC0/PHYADDR")
-  (net 1337 "/USBC0/EN_CHARGE")
-  (net 1338 "/C_LEFT_SCL")
-  (net 1339 "/C_RIGHT_SCL")
-  (net 1340 "/USBC0/~{DEBUG}")
-  (net 1341 "/~{C_LEFT_INT}")
-  (net 1342 "/USBC1/~{PROT_FLT}")
-  (net 1343 "/USBC1/PPHV")
-  (net 1344 "/C_RIGHT_SDA")
-  (net 1345 "/USBC1/EN_CHARGE")
-  (net 1346 "/USBC1/~{DEBUG}")
-  (net 1347 "/~{C_RIGHT_INT}")
-  (net 1348 "/USBC2/~{PROT_FLT}")
-  (net 1349 "/USBC2/PPHV")
-  (net 1350 "/USBC2/PHYADDR")
-  (net 1351 "/USBC2/EN_CHARGE")
-  (net 1352 "/USBC2/~{DEBUG}")
-  (net 1353 "/C_LEFT_SDA")
-  (net 1354 "/USBC3/~{PROT_FLT}")
-  (net 1355 "/USBC3/PPHV")
-  (net 1356 "/USBC3/EN_CHARGE")
-  (net 1357 "/USBC3/~{DEBUG}")
-  (net 1358 "/USBC0/VB_ESD")
-  (net 1359 "/USBC1/VB_ESD")
-  (net 1360 "/USBC2/VB_ESD")
-  (net 1361 "/USBC3/VB_ESD")
-  (net 1362 "/USBC0/C_CC1")
-  (net 1363 "/USBC0/C_SBU1")
-  (net 1364 "/USBC0/C_CC2")
-  (net 1365 "/USBC0/C_SBU2")
-  (net 1366 "/USBC1/C_CC1")
-  (net 1367 "/USBC1/C_SBU1")
-  (net 1368 "/USBC1/C_CC2")
-  (net 1369 "/USBC1/C_SBU2")
-  (net 1370 "/USBC2/C_CC1")
-  (net 1371 "/USBC2/C_SBU1")
-  (net 1372 "/USBC2/C_CC2")
-  (net 1373 "/USBC2/C_SBU2")
-  (net 1374 "/USBC3/C_CC1")
-  (net 1375 "/USBC3/C_SBU1")
-  (net 1376 "/USBC3/C_CC2")
-  (net 1377 "/USBC3/C_SBU2")
-  (net 1378 "/USBC0/RIREF")
-  (net 1379 "/USBC1/RIREF")
-  (net 1380 "/USBC2/RIREF")
-  (net 1381 "/USBC3/RIREF")
-  (net 1382 "/USBC0/~{FAULT}")
-  (net 1383 "/USBC1/~{FAULT}")
-  (net 1384 "/USBC2/~{FAULT}")
-  (net 1385 "/USBC3/~{FAULT}")
-  (net 1386 "Net-(Q6-G)")
-  (net 1387 "Net-(Q7-G)")
-  (net 1388 "Net-(Q8-G)")
-  (net 1389 "Net-(Q9-G)")
-  (net 1390 "Net-(Q10-D)")
-  (net 1391 "Net-(Q11-D)")
-  (net 1392 "Net-(Q12-D)")
-  (net 1393 "Net-(Q13-D)")
-  (net 1394 "/USBC0/SOURCE")
-  (net 1395 "/USBC1/SOURCE")
-  (net 1396 "/USBC2/SOURCE")
-  (net 1397 "/USBC3/SOURCE")
-  (net 1398 "/USBC0/OVP")
-  (net 1399 "/USBC1/OVP")
-  (net 1400 "/USBC2/OVP")
-  (net 1401 "/USBC3/OVP")
-  (net 1402 "/USBC0/SINK")
-  (net 1403 "/USBC1/SINK")
-  (net 1404 "/USBC2/SINK")
-  (net 1405 "/USBC3/SINK")
-  (net 1406 "/CHRG_OK")
-  (net 1407 "/CHRG_OTG_VAP")
-  (net 1408 "Net-(D36-Pad1)")
-  (net 1409 "/EC/VBAT")
-  (net 1410 "/EC/BATTERY")
-  (net 1411 "Net-(U26-BST)")
-  (net 1412 "Net-(U26-SW)")
-  (net 1413 "Net-(U26-DRVH)")
-  (net 1414 "Net-(Q14-BG)")
-  (net 1415 "Net-(L4-Pad1)")
-  (net 1416 "VCCINAUX")
-  (net 1417 "VCCGT")
-  (net 1418 "VCCCORE")
-  (net 1419 "/VCCINAUX/VREF")
-  (net 1420 "/VCCINAUX/SLEW")
-  (net 1421 "/VCCINAUX/VCCIN_AUX_FLTR")
-  (net 1422 "/VCCINAUX/V3")
-  (net 1423 "/VCCINAUX/V2")
-  (net 1424 "/VCCINAUX/V1")
-  (net 1425 "unconnected-(R164-Pad1)")
-  (net 1426 "/VCCINAUX/PGOOD")
-  (net 1427 "/VCCINAUX/TRIP")
-  (net 1428 "/VCCINAUX/VCCINAUX_SENSE")
-  (net 1429 "/VCCINAUX/VSSINAUX_SENSE")
-  (net 1430 "/VCCINAUX/VID0")
-  (net 1431 "/VCCINAUX/VID1")
-  (net 1432 "/VCCINAUX/EN")
-  (net 1433 "unconnected-(U27-ISEN3P-Pad1)")
-  (net 1434 "unconnected-(U27-ISEN3N-Pad2)")
-  (net 1435 "unconnected-(U27-ISEN4N-Pad3)")
-  (net 1436 "unconnected-(U27-ISEN4P-Pad4)")
-  (net 1437 "unconnected-(U27-ISEN2P-Pad5)")
-  (net 1438 "unconnected-(U27-ISEN2N-Pad6)")
-  (net 1439 "unconnected-(U27-ISEN1N-Pad7)")
-  (net 1440 "unconnected-(U27-ISEN1P-Pad8)")
-  (net 1441 "unconnected-(U27-FB-Pad9)")
-  (net 1442 "unconnected-(U27-COMP-Pad10)")
-  (net 1443 "unconnected-(U27-VREF_SPS-Pad13)")
-  (net 1444 "unconnected-(U27-VR_READY-Pad14)")
-  (net 1445 "unconnected-(U27-VCLK-Pad15)")
-  (net 1446 "unconnected-(U27-VDIO-Pad16)")
-  (net 1447 "unconnected-(U27-~{ALERT}-Pad17)")
-  (net 1448 "unconnected-(U27-~{VR_HOT}-Pad18)")
-  (net 1449 "unconnected-(U27-IMON-Pad19)")
-  (net 1450 "unconnected-(U27-VREF-Pad20)")
-  (net 1451 "unconnected-(U27-IMONA-Pad21)")
-  (net 1452 "unconnected-(U27-TSEN-Pad22)")
-  (net 1453 "unconnected-(U27-TSENA-Pad23)")
-  (net 1454 "unconnected-(U27-SET1-Pad24)")
-  (net 1455 "unconnected-(U27-SET2-Pad25)")
-  (net 1456 "unconnected-(U27-SET3-Pad26)")
-  (net 1457 "unconnected-(U27-SET4-Pad27)")
-  (net 1458 "unconnected-(U27-IMON_AUX-Pad28)")
-  (net 1459 "unconnected-(U27-PSYS-Pad29)")
-  (net 1460 "unconnected-(U27-COMPA-Pad32)")
-  (net 1461 "unconnected-(U27-FBA-Pad33)")
-  (net 1462 "unconnected-(U27-ISENA2N-Pad34)")
-  (net 1463 "unconnected-(U27-ISENA2P-Pad35)")
-  (net 1464 "unconnected-(U27-ISENA1P-Pad36)")
-  (net 1465 "unconnected-(U27-ISENA1N-Pad37)")
-  (net 1466 "unconnected-(U27-ISENP_AUX-Pad38)")
-  (net 1467 "unconnected-(U27-ISENN_AUX-Pad39)")
-  (net 1468 "unconnected-(U27-DBLR_PS-Pad40)")
-  (net 1469 "unconnected-(U27-DRVEN_F-Pad42)")
-  (net 1470 "unconnected-(U27-PWMA2-Pad43)")
-  (net 1471 "unconnected-(U27-PWMA1-Pad44)")
-  (net 1472 "unconnected-(U27-PWM2-Pad46)")
-  (net 1473 "unconnected-(U27-PWM4-Pad47)")
-  (net 1474 "unconnected-(U27-PWM3-Pad48)")
-  (net 1475 "unconnected-(U27-ANS_EN-Pad49)")
-  (net 1476 "unconnected-(U27-VRON-Pad51)")
-  (net 1477 "unconnected-(U27-VIN{slash}VSYS-Pad52)")
-  (net 1478 "Net-(U27-RGND)")
-  (net 1479 "Net-(U27-VSEN)")
-  (net 1480 "Net-(U27-VSENA)")
-  (net 1481 "Net-(U27-RGNDA)")
-  (net 1482 "/VCC_CORE_GT/DRVEN")
-  (net 1483 "Net-(U27-PWM1)")
-  (net 1484 "unconnected-(U28-PHASE-Pad2)")
-  (net 1485 "unconnected-(U28-UGATE-Pad3)")
-  (net 1486 "unconnected-(U28-BOOT-Pad4)")
-  (net 1487 "unconnected-(U28-LGATE-Pad7)")
+  (net 1085 "unconnected-(U6-GPIO007{slash}I2C03_SDA{slash}PS2_CLK0B-PadA11)")
+  (net 1086 "unconnected-(U6-GPIO010{slash}I2C03_SCL{slash}PS2_DAT0B-PadB13)")
+  (net 1087 "unconnected-(U6-GPIO011{slash}nSMI_ALT{slash}PWM4{slash}ICT7-PadK6)")
+  (net 1088 "unconnected-(U6-GPIO012{slash}I2C07_SDA{slash}SLV_SPI_IO2-PadK7)")
+  (net 1089 "unconnected-(U6-GPIO013{slash}I2C07_SCL{slash}SLV_SPI_IO3-PadK8)")
+  (net 1090 "unconnected-(U6-GPIO014{slash}PWM6{slash}SLV_SPI_IO2{slash}GPTP_IN2-PadM8)")
+  (net 1091 "unconnected-(U6-GPIO016{slash}GPTP_IN1{slash}SHD_IO3{slash}ICT3(DSW_PWROK)-PadN6)")
+  (net 1092 "unconnected-(U6-GPIO017{slash}KSI0{slash}UART0_DCD#-PadN11)")
+  (net 1093 "unconnected-(U6-GPIO020{slash}KSI1-PadN10)")
+  (net 1094 "unconnected-(U6-GPIO021{slash}KSI2-PadM10)")
+  (net 1095 "unconnected-(U6-GPIO026{slash}KSI3{slash}UART0_DTR#{slash}I2C12_SDA-PadN13)")
+  (net 1096 "unconnected-(U6-GPIO027{slash}KSI4{slash}UART0_DSR#{slash}I2C12_SCL-PadL13)")
+  (net 1097 "unconnected-(U6-GPIO030{slash}KSI5{slash}I2C10_SDA-PadL12)")
+  (net 1098 "unconnected-(U6-GPIO031{slash}KSI6{slash}GPTP_OUT1-PadM13)")
+  (net 1099 "unconnected-(U6-GPIO032{slash}KSI7{slash}GPTP_OUT0{slash}UART0_RI#-PadN12)")
+  (net 1100 "unconnected-(U6-GPIO033{slash}TACH3-PadB2)")
+  (net 1101 "unconnected-(U6-GPIO040{slash}GPTP_OUT2{slash}KSO00{slash}UART1_CTS#-PadM12)")
+  (net 1102 "/EC/PECI")
+  (net 1103 "unconnected-(U6-GPIO043{slash}SB-TSI_CLK-PadF13)")
+  (net 1104 "unconnected-(U6-GPIO044{slash}VREF_VTT-PadJ10)")
+  (net 1105 "unconnected-(U6-GPIO045{slash}KSO01{slash}PWM2_ALT{slash}ICT14[CR_STRAP]-PadE8)")
+  (net 1106 "unconnected-(U6-GPIO046{slash}KSO02{slash}ICT11-PadF9)")
+  (net 1107 "unconnected-(U6-GPIO047{slash}KSO03{slash}PWM3_ALT{slash}ICT13-PadF10)")
+  (net 1108 "unconnected-(U6-GPIO050{slash}ICT0_TACH0-PadA9)")
+  (net 1109 "unconnected-(U6-GPIO051{slash}ICT1_TACH1-PadB9)")
+  (net 1110 "unconnected-(U6-GPIO052{slash}ICT2_TACH2-PadK10)")
+  (net 1111 "unconnected-(U6-GPIO053{slash}PWM0{slash}SLV_SPI_MSTR_INT-PadN9)")
+  (net 1112 "unconnected-(U6-GPIO054{slash}PWM1{slash}SLV_SPI_SCLK-PadM9)")
+  (net 1113 "unconnected-(U6-GPIO055(RSMRST#){slash}PWM2{slash}SHD_CS0#[BSS_STRAP]-PadM6)")
+  (net 1114 "unconnected-(U6-GPIO056{slash}PWM3{slash}SHD_CLK-PadM7)")
+  (net 1115 "unconnected-(U6-GPIO057{slash}VCC_PWRGD{slash}GPSPI_CLK_ALT-PadB1)")
+  (net 1116 "unconnected-(U6-GPIO060{slash}KBRST{slash}TST_CLK_OUT{slash}UART1_DCD#-PadA10)")
+  (net 1117 "/EC/ESPI.~{RESET}")
+  (net 1118 "unconnected-(U6-GPIO062(RESETO#){slash}I2C11_SCL-PadF4)")
+  (net 1119 "/EC/ESPI.~{ALERT}")
+  (net 1120 "unconnected-(U6-GPIO064{slash}PCI_RESET#-PadK5)")
+  (net 1121 "/EC/ESPI.CLK")
+  (net 1122 "/EC/ESPI.~{CS}")
+  (net 1123 "/EC/ESPI.IO0")
+  (net 1124 "/EC/ESPI.IO1")
+  (net 1125 "/EC/ESPI.IO2")
+  (net 1126 "/EC/ESPI.IO3")
+  (net 1127 "unconnected-(U6-GPIO104{slash}UART0_TX{slash}TFDP_CLK[VTR2_STRAP]-PadG12)")
+  (net 1128 "unconnected-(U6-GPIO105{slash}UART0_RX{slash}TFDP_DATA{slash}TRACECLK-PadF12)")
+  (net 1129 "unconnected-(U6-GPIO106{slash}PWROK-PadD2)")
+  (net 1130 "unconnected-(U6-GPIO107{slash}nSMI{slash}KSO04{slash}I2C10_SCL-PadK12)")
+  (net 1131 "unconnected-(U6-GPIO112{slash}KSO05-PadH13)")
+  (net 1132 "unconnected-(U6-GPIO113{slash}KSO06{slash}ICT9-PadJ13)")
+  (net 1133 "unconnected-(U6-GPIO114{slash}PS2_CLK0A{slash}nEC_SCI-PadJ12)")
+  (net 1134 "unconnected-(U6-GPIO115{slash}PS2_DAT0A-PadH12)")
+  (net 1135 "unconnected-(U6-GPIO120{slash}KSO07{slash}UART1_DTR#-PadK13)")
+  (net 1136 "unconnected-(U6-GPIO121{slash}PVT_IO0{slash}KSO08-PadC13)")
+  (net 1137 "unconnected-(U6-GPIO122{slash}PVT_IO1{slash}KSO09-PadE12)")
+  (net 1138 "unconnected-(U6-GPIO123{slash}PVT_IO2{slash}KSO10-PadD12)")
+  (net 1139 "unconnected-(U6-GPIO124{slash}PVT_CS#{slash}KSO11{slash}ICT12-PadH1)")
+  (net 1140 "unconnected-(U6-GPIO125{slash}PVT_CLK{slash}KSO12-PadC12)")
+  (net 1141 "unconnected-(U6-GPIO126{slash}PVT_IO3{slash}KSO13-PadD13)")
+  (net 1142 "unconnected-(U6-GPIO127{slash}A20M{slash}UART1_RTS#-PadA12)")
+  (net 1143 "unconnected-(U6-GPIO130{slash}I2C01_SDA{slash}SLV_SPI_IO0-PadK9)")
+  (net 1144 "unconnected-(U6-GPIO131{slash}I2C01_SCL{slash}SLV_SPI_CS#-PadH10)")
+  (net 1145 "unconnected-(U6-GPIO132{slash}I2C06_SDA{slash}KSO16-PadD10)")
+  (net 1146 "unconnected-(U6-GPIO140{slash}I2C06_SCL{slash}ICT5{slash}KSO17-PadB10)")
+  (net 1147 "unconnected-(U6-GPIO145{slash}I2C09_SDA{slash}JTAG_TDI{slash}UART2_RX-PadB8)")
+  (net 1148 "unconnected-(U6-GPIO146{slash}I2C09_SCL{slash}JTAG_TDO{slash}UART2_TX-PadB7)")
+  (net 1149 "unconnected-(U6-GPIO147{slash}I2C15_SDA{slash}JTAG_CLK{slash}UART2_DSR#-PadA7)")
+  (net 1150 "unconnected-(U6-GPIO150{slash}I2C15_SCL{slash}JTAG_TMS{slash}UART2_DTR#-PadB6)")
+  (net 1151 "unconnected-(U6-GPIO151{slash}ICT4{slash}KSO15-PadM11)")
+  (net 1152 "unconnected-(U6-GPIO152{slash}KSO14{slash}I2C07_SDA_ALT-PadG4)")
+  (net 1153 "unconnected-(U6-GPIO153{slash}LED2-PadE9)")
+  (net 1154 "unconnected-(U6-GPIO154{slash}I2C02_SDA{slash}PS2_CLK1B-PadB11)")
+  (net 1155 "unconnected-(U6-GPIO155{slash}I2C02_SCL{slash}PS2_DAT1B-PadB12)")
+  (net 1156 "unconnected-(U6-VCI_IN1#{slash}GPIO162-PadB3)")
+  (net 1157 "unconnected-(U6-VCI_IN0#{slash}GPIO163-PadE4)")
+  (net 1158 "unconnected-(U6-GPIO165{slash}32KHZ_IN{slash}CTOUT0-PadA8)")
+  (net 1159 "unconnected-(U6-GPIO170{slash}UART1_TX{slash}CEC_OUT[JTAG_STRAP]-PadG10)")
+  (net 1160 "unconnected-(U6-VCI_OVRD_IN{slash}GPIO172-PadB4)")
+  (net 1161 "unconnected-(U6-GPIO175{slash}CMP_VOUT1{slash}PWM8_ALT-PadE10)")
+  (net 1162 "unconnected-(U6-GPIO200{slash}ADC00{slash}TRACEDAT0-PadJ1)")
+  (net 1163 "unconnected-(U6-GPIO201{slash}ADC01{slash}TRACEDAT1-PadJ2)")
+  (net 1164 "unconnected-(U6-GPIO202{slash}ADC02{slash}TRACEDAT2-PadK1)")
+  (net 1165 "unconnected-(U6-GPIO203{slash}ADC03{slash}TRACEDAT3-PadK2)")
+  (net 1166 "unconnected-(U6-GPIO204{slash}ADC04-PadJ4)")
+  (net 1167 "unconnected-(U6-GPIO205{slash}ADC05-PadL1)")
+  (net 1168 "unconnected-(U6-GPIO206{slash}ADC06-PadL2)")
+  (net 1169 "unconnected-(U6-GPIO207{slash}ADC07[CMP_STRAP]-PadK4)")
+  (net 1170 "unconnected-(U6-GPIO221{slash}32KHz_OUT{slash}SYS_SHDN#-PadA1)")
+  (net 1171 "unconnected-(U6-GPIO223{slash}SHD_IO0-PadN7)")
+  (net 1172 "unconnected-(U6-GPIO224{slash}GPTP_IN0{slash}SHD_IO1-PadN5)")
+  (net 1173 "unconnected-(U6-GPIO226-PadC1)")
+  (net 1174 "unconnected-(U6-GPIO227{slash}SHD_IO2[PWRGD_STRAP]-PadM5)")
+  (net 1175 "unconnected-(U6-GPIO241{slash}PWM0_ALT{slash}CMP_VOUT0-PadD8)")
+  (net 1176 "unconnected-(U6-GPIO242{slash}CMP_VIN0-PadF2)")
+  (net 1177 "unconnected-(U6-GPIO244{slash}UART_CLK_ALT{slash}nEMI_INT_ALT{slash}CMP_VIN1-PadG2)")
+  (net 1178 "unconnected-(U6-GPIO246{slash}CTOUT1_ALT{slash}CMP_VREF0-PadE2)")
+  (net 1179 "unconnected-(U6-VCI_OUT{slash}GPIO250-PadF5)")
+  (net 1180 "unconnected-(U6-BGPO0{slash}GPIO253-PadD5)")
+  (net 1181 "unconnected-(U6-GPIO254{slash}PWM1_ALT{slash}CMP_VREF1-PadF1)")
+  (net 1182 "unconnected-(U6-GPIO255{slash}UART1_RX_ALT{slash}UART1_DSR#-PadD1)")
+  (net 1183 "unconnected-(U6-JTAG_RST#-PadE13)")
+  (net 1184 "unconnected-(U6-nRESET_IN-PadC2)")
+  (net 1185 "unconnected-(U6-VR_CAP-PadG1)")
+  (net 1186 "unconnected-(U6-VREF_ADC-PadH4)")
+  (net 1187 "unconnected-(U6-VTR_ANALOG-PadJ7)")
+  (net 1188 "unconnected-(U6-VTR_PLL-PadE1)")
+  (net 1189 "unconnected-(U6-VTR_REG-PadH2)")
+  (net 1190 "unconnected-(U6-VTR1-PadG5)")
+  (net 1191 "unconnected-(U6-VTR1-PadH5)")
+  (net 1192 "unconnected-(U6-VTR1-PadJ9)")
+  (net 1193 "unconnected-(U6-VTR2-PadJ8)")
+  (net 1194 "unconnected-(U6-VTR3-PadJ5)")
+  (net 1195 "unconnected-(U6-XTAL1-PadA2)")
+  (net 1196 "unconnected-(U6-XTAL2-PadA4)")
+  (net 1197 "/CPU_POWER/B18")
+  (net 1198 "Net-(C46-Pad1)")
+  (net 1199 "/CPU_POWER/MODE18")
+  (net 1200 "/CPU_POWER/FB18")
+  (net 1201 "+1V8")
+  (net 1202 "/CPU_POWER/PG18")
+  (net 1203 "unconnected-(U7-SS-Pad11)")
+  (net 1204 "/CPU_POWER/EN18")
+  (net 1205 "/CPU_POWER/SW18")
+  (net 1206 "/CPU_POWER/SW11")
+  (net 1207 "/CPU_POWER/B11")
+  (net 1208 "Net-(C52-Pad1)")
+  (net 1209 "/CPU_POWER/FB11")
+  (net 1210 "+1V1")
+  (net 1211 "unconnected-(U8-SS-Pad11)")
+  (net 1212 "/CPU_POWER/VCC18")
+  (net 1213 "/CPU_POWER/VCC11")
+  (net 1214 "/CPU_POWER/MODE11")
+  (net 1215 "/CPU_POWER/EN11")
+  (net 1216 "/CPU_POWER/PG11")
+  (net 1217 "unconnected-(U9-CMPOUT-Pad15)")
+  (net 1218 "/CHARGER/SW2")
+  (net 1219 "/CHARGER/BST2")
+  (net 1220 "/CHARGER/SW1")
+  (net 1221 "/CHARGER/BST1")
+  (net 1222 "/CHARGER/LODRV1")
+  (net 1223 "/CHARGER/LODRV2")
+  (net 1224 "/CHARGER/HIDRV1")
+  (net 1225 "/CHARGER/HIDRV2")
+  (net 1226 "/CHARGER/VSYS")
+  (net 1227 "Net-(C58-Pad1)")
+  (net 1228 "/CHARGER/COMP2")
+  (net 1229 "Net-(C66-Pad1)")
+  (net 1230 "/CHARGER/COMP1")
+  (net 1231 "/CHARGER/~{PROCHOT}")
+  (net 1232 "/CHARGER/BATR1")
+  (net 1233 "/CHARGER/ACP")
+  (net 1234 "/CHARGER/ACN")
+  (net 1235 "Net-(Q1-D)")
+  (net 1236 "/CHARGER/~{BATDRV}")
+  (net 1237 "/CHARGER/VIN")
+  (net 1238 "+3.3V")
+  (net 1239 "/CHRG_SDA")
+  (net 1240 "/CHRG_SCL")
+  (net 1241 "unconnected-(R158-Pad1)")
+  (net 1242 "/CHARGER/REGN")
+  (net 1243 "/CHARGER/IADPT")
+  (net 1244 "/CHARGER/IBAT")
+  (net 1245 "/CHARGER/VDDA")
+  (net 1246 "/CHARGER/ILIM_HIZ")
+  (net 1247 "Net-(U9-CELL_BATPRESZ)")
+  (net 1248 "/CHARGER/PSYS")
+  (net 1249 "/CHARGER/SRN1")
+  (net 1250 "/CHARGER/SRP")
+  (net 1251 "/CHARGER/SRN")
+  (net 1252 "/CPU_POWER/VCC1P05_OUT")
+  (net 1253 "/CPU_POWER/VCC1P05_PROC_OUT")
+  (net 1254 "/USBC2/CC2")
+  (net 1255 "/USBC3/VBUS")
+  (net 1256 "/USBC3/CC1")
+  (net 1257 "/USBC3/CC2")
+  (net 1258 "/USBC0/VLDO")
+  (net 1259 "/USBC1/VLDO")
+  (net 1260 "/USBC2/VLDO")
+  (net 1261 "/USBC3/VLDO")
+  (net 1262 "/USBC0/RXJ1-")
+  (net 1263 "/USBC0/RXC1-")
+  (net 1264 "/USBC1/RXJ1-")
+  (net 1265 "/USBC1/RXC1-")
+  (net 1266 "/USBC2/RXJ1-")
+  (net 1267 "/USBC2/RXC1-")
+  (net 1268 "/USBC3/RXJ1-")
+  (net 1269 "/USBC3/RXC1-")
+  (net 1270 "/USBC0/RXJ1+")
+  (net 1271 "/USBC0/RXC1+")
+  (net 1272 "/USBC1/RXJ1+")
+  (net 1273 "/USBC1/RXC1+")
+  (net 1274 "/USBC2/RXJ1+")
+  (net 1275 "/USBC2/RXC1+")
+  (net 1276 "/USBC3/RXJ1+")
+  (net 1277 "/USBC3/RXC1+")
+  (net 1278 "/USBC0/RXJ2-")
+  (net 1279 "/USBC0/RXC2-")
+  (net 1280 "/USBC0/RXJ2+")
+  (net 1281 "/USBC0/RXC2+")
+  (net 1282 "/USBC1/RXJ2-")
+  (net 1283 "/USBC1/RXC2-")
+  (net 1284 "/USBC1/RXJ2+")
+  (net 1285 "/USBC1/RXC2+")
+  (net 1286 "/USBC2/RXJ2-")
+  (net 1287 "/USBC2/RXC2-")
+  (net 1288 "/USBC2/RXJ2+")
+  (net 1289 "/USBC2/RXC2+")
+  (net 1290 "/USBC3/RXJ2-")
+  (net 1291 "/USBC3/RXC2-")
+  (net 1292 "/USBC3/RXJ2+")
+  (net 1293 "/USBC3/RXC2+")
+  (net 1294 "/USBC0/TXJ1-")
+  (net 1295 "/USBC0/TXC1-")
+  (net 1296 "/USBC0/TXJ1+")
+  (net 1297 "/USBC0/TXC1+")
+  (net 1298 "/USBC1/TXJ1-")
+  (net 1299 "/USBC1/TXC1-")
+  (net 1300 "/USBC1/TXJ1+")
+  (net 1301 "/USBC1/TXC1+")
+  (net 1302 "/USBC2/TXJ1-")
+  (net 1303 "/USBC2/TXC1-")
+  (net 1304 "/USBC2/TXJ1+")
+  (net 1305 "/USBC2/TXC1+")
+  (net 1306 "/USBC3/TXJ1-")
+  (net 1307 "/USBC3/TXC1-")
+  (net 1308 "/USBC3/TXJ1+")
+  (net 1309 "/USBC3/TXC1+")
+  (net 1310 "/USBC0/TXJ2-")
+  (net 1311 "/USBC0/TXC2-")
+  (net 1312 "/USBC0/TXJ2+")
+  (net 1313 "/USBC0/TXC2+")
+  (net 1314 "/USBC1/TXJ2-")
+  (net 1315 "/USBC1/TXC2-")
+  (net 1316 "/USBC1/TXJ2+")
+  (net 1317 "/USBC1/TXC2+")
+  (net 1318 "/USBC2/TXJ2-")
+  (net 1319 "/USBC2/TXC2-")
+  (net 1320 "/USBC2/TXJ2+")
+  (net 1321 "/USBC2/TXC2+")
+  (net 1322 "/USBC3/TXJ2-")
+  (net 1323 "/USBC3/TXC2-")
+  (net 1324 "/USBC3/TXJ2+")
+  (net 1325 "/USBC3/TXC2+")
+  (net 1326 "/USBC0/~{PROT_FLT}")
+  (net 1327 "/USBC0/PPHV")
+  (net 1328 "/USBC0/PHYADDR")
+  (net 1329 "/USBC0/EN_CHARGE")
+  (net 1330 "/C_LEFT_SCL")
+  (net 1331 "/C_RIGHT_SCL")
+  (net 1332 "/USBC0/~{DEBUG}")
+  (net 1333 "/~{C_LEFT_INT}")
+  (net 1334 "/USBC1/~{PROT_FLT}")
+  (net 1335 "/USBC1/PPHV")
+  (net 1336 "/C_RIGHT_SDA")
+  (net 1337 "/USBC1/EN_CHARGE")
+  (net 1338 "/USBC1/~{DEBUG}")
+  (net 1339 "/~{C_RIGHT_INT}")
+  (net 1340 "/USBC2/~{PROT_FLT}")
+  (net 1341 "/USBC2/PPHV")
+  (net 1342 "/USBC2/PHYADDR")
+  (net 1343 "/USBC2/EN_CHARGE")
+  (net 1344 "/USBC2/~{DEBUG}")
+  (net 1345 "/C_LEFT_SDA")
+  (net 1346 "/USBC3/~{PROT_FLT}")
+  (net 1347 "/USBC3/PPHV")
+  (net 1348 "/USBC3/EN_CHARGE")
+  (net 1349 "/USBC3/~{DEBUG}")
+  (net 1350 "/USBC0/VB_ESD")
+  (net 1351 "/USBC1/VB_ESD")
+  (net 1352 "/USBC2/VB_ESD")
+  (net 1353 "/USBC3/VB_ESD")
+  (net 1354 "/USBC0/C_CC1")
+  (net 1355 "/USBC0/C_SBU1")
+  (net 1356 "/USBC0/C_CC2")
+  (net 1357 "/USBC0/C_SBU2")
+  (net 1358 "/USBC1/C_CC1")
+  (net 1359 "/USBC1/C_SBU1")
+  (net 1360 "/USBC1/C_CC2")
+  (net 1361 "/USBC1/C_SBU2")
+  (net 1362 "/USBC2/C_CC1")
+  (net 1363 "/USBC2/C_SBU1")
+  (net 1364 "/USBC2/C_CC2")
+  (net 1365 "/USBC2/C_SBU2")
+  (net 1366 "/USBC3/C_CC1")
+  (net 1367 "/USBC3/C_SBU1")
+  (net 1368 "/USBC3/C_CC2")
+  (net 1369 "/USBC3/C_SBU2")
+  (net 1370 "/USBC0/RIREF")
+  (net 1371 "/USBC1/RIREF")
+  (net 1372 "/USBC2/RIREF")
+  (net 1373 "/USBC3/RIREF")
+  (net 1374 "/USBC0/~{FAULT}")
+  (net 1375 "/USBC1/~{FAULT}")
+  (net 1376 "/USBC2/~{FAULT}")
+  (net 1377 "/USBC3/~{FAULT}")
+  (net 1378 "Net-(Q6-G)")
+  (net 1379 "Net-(Q7-G)")
+  (net 1380 "Net-(Q8-G)")
+  (net 1381 "Net-(Q9-G)")
+  (net 1382 "Net-(Q10-D)")
+  (net 1383 "Net-(Q11-D)")
+  (net 1384 "Net-(Q12-D)")
+  (net 1385 "Net-(Q13-D)")
+  (net 1386 "/USBC0/SOURCE")
+  (net 1387 "/USBC1/SOURCE")
+  (net 1388 "/USBC2/SOURCE")
+  (net 1389 "/USBC3/SOURCE")
+  (net 1390 "/USBC0/OVP")
+  (net 1391 "/USBC1/OVP")
+  (net 1392 "/USBC2/OVP")
+  (net 1393 "/USBC3/OVP")
+  (net 1394 "/USBC0/SINK")
+  (net 1395 "/USBC1/SINK")
+  (net 1396 "/USBC2/SINK")
+  (net 1397 "/USBC3/SINK")
+  (net 1398 "/CHRG_OK")
+  (net 1399 "/CHRG_OTG_VAP")
+  (net 1400 "Net-(D36-Pad1)")
+  (net 1401 "/EC/VBAT")
+  (net 1402 "/EC/BATTERY")
+  (net 1403 "Net-(U26-BST)")
+  (net 1404 "Net-(U26-SW)")
+  (net 1405 "Net-(U26-DRVH)")
+  (net 1406 "Net-(Q14-BG)")
+  (net 1407 "Net-(L4-Pad1)")
+  (net 1408 "VCCINAUX")
+  (net 1409 "VCCGT")
+  (net 1410 "VCCCORE")
+  (net 1411 "/VCCINAUX/VREF")
+  (net 1412 "/VCCINAUX/SLEW")
+  (net 1413 "/VCCINAUX/VCCIN_AUX_FLTR")
+  (net 1414 "/VCCINAUX/V3")
+  (net 1415 "/VCCINAUX/V2")
+  (net 1416 "/VCCINAUX/V1")
+  (net 1417 "unconnected-(R164-Pad1)")
+  (net 1418 "/VCCINAUX/PGOOD")
+  (net 1419 "/VCCINAUX/TRIP")
+  (net 1420 "/VCCINAUX/VCCINAUX_SENSE")
+  (net 1421 "/VCCINAUX/VSSINAUX_SENSE")
+  (net 1422 "/VCCINAUX/VID0")
+  (net 1423 "/VCCINAUX/VID1")
+  (net 1424 "/VCCINAUX/EN")
+  (net 1425 "unconnected-(U27-ISEN3P-Pad1)")
+  (net 1426 "unconnected-(U27-ISEN3N-Pad2)")
+  (net 1427 "unconnected-(U27-ISEN4N-Pad3)")
+  (net 1428 "unconnected-(U27-ISEN4P-Pad4)")
+  (net 1429 "unconnected-(U27-ISEN2P-Pad5)")
+  (net 1430 "unconnected-(U27-ISEN2N-Pad6)")
+  (net 1431 "unconnected-(U27-ISEN1N-Pad7)")
+  (net 1432 "unconnected-(U27-ISEN1P-Pad8)")
+  (net 1433 "unconnected-(U27-FB-Pad9)")
+  (net 1434 "unconnected-(U27-COMP-Pad10)")
+  (net 1435 "unconnected-(U27-VREF_SPS-Pad13)")
+  (net 1436 "unconnected-(U27-VR_READY-Pad14)")
+  (net 1437 "unconnected-(U27-VCLK-Pad15)")
+  (net 1438 "unconnected-(U27-VDIO-Pad16)")
+  (net 1439 "unconnected-(U27-~{ALERT}-Pad17)")
+  (net 1440 "unconnected-(U27-~{VR_HOT}-Pad18)")
+  (net 1441 "unconnected-(U27-IMON-Pad19)")
+  (net 1442 "unconnected-(U27-VREF-Pad20)")
+  (net 1443 "unconnected-(U27-IMONA-Pad21)")
+  (net 1444 "unconnected-(U27-TSEN-Pad22)")
+  (net 1445 "unconnected-(U27-TSENA-Pad23)")
+  (net 1446 "unconnected-(U27-SET1-Pad24)")
+  (net 1447 "unconnected-(U27-SET2-Pad25)")
+  (net 1448 "unconnected-(U27-SET3-Pad26)")
+  (net 1449 "unconnected-(U27-SET4-Pad27)")
+  (net 1450 "unconnected-(U27-IMON_AUX-Pad28)")
+  (net 1451 "unconnected-(U27-PSYS-Pad29)")
+  (net 1452 "unconnected-(U27-COMPA-Pad32)")
+  (net 1453 "unconnected-(U27-FBA-Pad33)")
+  (net 1454 "unconnected-(U27-ISENA2N-Pad34)")
+  (net 1455 "unconnected-(U27-ISENA2P-Pad35)")
+  (net 1456 "unconnected-(U27-ISENA1P-Pad36)")
+  (net 1457 "unconnected-(U27-ISENA1N-Pad37)")
+  (net 1458 "unconnected-(U27-ISENP_AUX-Pad38)")
+  (net 1459 "unconnected-(U27-ISENN_AUX-Pad39)")
+  (net 1460 "unconnected-(U27-DBLR_PS-Pad40)")
+  (net 1461 "unconnected-(U27-DRVEN_F-Pad42)")
+  (net 1462 "unconnected-(U27-PWMA2-Pad43)")
+  (net 1463 "unconnected-(U27-PWMA1-Pad44)")
+  (net 1464 "unconnected-(U27-PWM2-Pad46)")
+  (net 1465 "unconnected-(U27-PWM4-Pad47)")
+  (net 1466 "unconnected-(U27-PWM3-Pad48)")
+  (net 1467 "unconnected-(U27-ANS_EN-Pad49)")
+  (net 1468 "unconnected-(U27-VRON-Pad51)")
+  (net 1469 "unconnected-(U27-VIN{slash}VSYS-Pad52)")
+  (net 1470 "Net-(U27-RGND)")
+  (net 1471 "Net-(U27-VSEN)")
+  (net 1472 "Net-(U27-VSENA)")
+  (net 1473 "Net-(U27-RGNDA)")
+  (net 1474 "/VCC_CORE_GT/DRVEN")
+  (net 1475 "Net-(U27-PWM1)")
+  (net 1476 "unconnected-(U28-PHASE-Pad2)")
+  (net 1477 "unconnected-(U28-UGATE-Pad3)")
+  (net 1478 "unconnected-(U28-BOOT-Pad4)")
+  (net 1479 "unconnected-(U28-LGATE-Pad7)")
 
   (footprint "local:R_0201_0603Metric" (layer "F.Cu")
     (tstamp 0057b18d-05ba-4a59-84ce-c74b5b4918f5)
@@ -1646,7 +1638,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp fe0c5f6d-358a-48e3-aa85-ad73b012c9d8))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 0ab429a8-e1d2-4308-9e83-15c2a9f21d1b))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1314 "/USBC3/TXJ1-") (pintype "passive") (tstamp 6b93d59e-c01a-4ab3-8e77-90e946098359))
+      (net 1306 "/USBC3/TXJ1-") (pintype "passive") (tstamp 6b93d59e-c01a-4ab3-8e77-90e946098359))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 6edcf1c1-c3f9-490d-989b-f2011b62b3b5))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -1756,7 +1748,7 @@
     (fp_line (start 3.65 2.15) (end 3.65 -2.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 89a298c7-08db-4488-bfe2-008b36974c19))
     (pad "1" smd roundrect (at -3.1125 0 180) (size 2.075 2.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.120482)
-      (net 1417 "VCCGT") (pintype "passive") (tstamp e5c3ee77-10cc-4dd8-9bad-c7654a6585dc))
+      (net 1409 "VCCGT") (pintype "passive") (tstamp e5c3ee77-10cc-4dd8-9bad-c7654a6585dc))
     (pad "2" smd roundrect (at 3.1125 0 180) (size 2.075 2.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.120482)
       (net 2 "GND") (pintype "passive") (tstamp d754a9c3-1063-4966-9497-e293f8d32408))
     (model "${KICAD6_3DMODEL_DIR}/Capacitor_Tantalum_SMD.3dshapes/CP_EIA-7343-20_Kemet-V.wrl"
@@ -1809,9 +1801,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 58787c86-f20b-40d2-85d5-bb5d980cb588))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 1d6dddb5-899f-44ac-b286-43e78e3d3298))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1218 "+1V1") (pintype "passive") (tstamp 7a3a2484-401a-4b5e-b21f-19bb66a19879))
+      (net 1210 "+1V1") (pintype "passive") (tstamp 7a3a2484-401a-4b5e-b21f-19bb66a19879))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1217 "/CPU_POWER/FB11") (pintype "passive") (tstamp 3e2e2eb5-024e-4be3-b5a0-f2e0cbaeaf1f))
+      (net 1209 "/CPU_POWER/FB11") (pintype "passive") (tstamp 3e2e2eb5-024e-4be3-b5a0-f2e0cbaeaf1f))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2045,7 +2037,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 5e5fd330-f22c-415c-b858-8f37e63d423c))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp 39ff3ef4-1551-4f4c-b405-e5eb038a38b3))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp 39ff3ef4-1551-4f4c-b405-e5eb038a38b3))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2096,7 +2088,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 986579f7-130d-4e4f-9601-23a1f75ca643))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 7fc39cef-3fc0-440b-a7d5-0235e5056e32))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1286 "/USBC0/RXJ2-") (pintype "passive") (tstamp 9a88ff62-be2f-4786-a10a-59ab3b4cfb1f))
+      (net 1278 "/USBC0/RXJ2-") (pintype "passive") (tstamp 9a88ff62-be2f-4786-a10a-59ab3b4cfb1f))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp f27882d9-0efa-4334-8c49-5e814bdf5455))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -2201,9 +2193,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 612d414d-2fa3-4a8e-9e8b-d5516c96ff39))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp f54cad47-5c2d-4044-b8c4-07de7f8ab35e))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1249 "unconnected-(R158-Pad1)") (pintype "passive") (tstamp 4dfeefcf-d7eb-46da-b49a-c013840ada6d))
+      (net 1241 "unconnected-(R158-Pad1)") (pintype "passive") (tstamp 4dfeefcf-d7eb-46da-b49a-c013840ada6d))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1406 "/CHRG_OK") (pintype "passive") (tstamp 102a122a-53e4-4d0c-8511-aed2e80288b7))
+      (net 1398 "/CHRG_OK") (pintype "passive") (tstamp 102a122a-53e4-4d0c-8511-aed2e80288b7))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2254,7 +2246,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 1914160e-4ce2-47d8-bba5-4e52ffa23c73))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 357b20b0-8083-4167-8ed0-c77cf2abc6a1))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1291 "/USBC1/RXC2-") (pintype "passive") (tstamp 2c35d915-09a7-4fa5-99ed-89dd824af468))
+      (net 1283 "/USBC1/RXC2-") (pintype "passive") (tstamp 2c35d915-09a7-4fa5-99ed-89dd824af468))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 422 "/CPU_USB/USBC1.RX-2") (pintype "passive") (tstamp 2a11d31b-52ac-4950-9dac-ac57b1f7c22c))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -2308,7 +2300,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f93b8912-3446-4715-a11c-a0563ff1a41b))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1245 "/CHARGER/VIN") (pintype "passive") (tstamp 72baa663-7eb4-4aad-ac4e-d0d84b7033e5))
+      (net 1237 "/CHARGER/VIN") (pintype "passive") (tstamp 72baa663-7eb4-4aad-ac4e-d0d84b7033e5))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 1dfa620a-8ba3-4e3a-94f3-1c6292c2b83f))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -2362,7 +2354,7 @@
     (fp_line (start 0.8 0.4) (end -0.8 0.4)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c4b4a47d-c2f3-4c8f-8366-abd6f40dd015))
     (pad "1" smd roundrect (at -0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1355 "/USBC3/PPHV") (pintype "passive") (tstamp 7ee72dee-b32a-45c8-8685-e4f141db965f))
+      (net 1347 "/USBC3/PPHV") (pintype "passive") (tstamp 7ee72dee-b32a-45c8-8685-e4f141db965f))
     (pad "2" smd roundrect (at 0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 7862e101-5008-4dfb-8874-d06ba59b301a))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
@@ -2573,9 +2565,9 @@
     (fp_line (start 0.3 0.15) (end -0.3 0.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3f7cd4ca-b10b-429c-864e-832b508e8162))
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1307 "/USBC1/TXC1-") (pintype "passive") (tstamp 083a01b6-a12a-43a3-90ad-c493342cc741))
+      (net 1299 "/USBC1/TXC1-") (pintype "passive") (tstamp 083a01b6-a12a-43a3-90ad-c493342cc741))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1306 "/USBC1/TXJ1-") (pintype "passive") (tstamp 7dfb8942-827f-4d73-b03a-00716b073921))
+      (net 1298 "/USBC1/TXJ1-") (pintype "passive") (tstamp 7dfb8942-827f-4d73-b03a-00716b073921))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2693,15 +2685,15 @@
     (fp_line (start 0.8 1.4) (end 0.8 -1.4)
       (stroke (width 0.1) (type default)) (layer "F.Fab") (tstamp 36cf32a7-eb37-4b28-a966-c3ccc08e0035))
     (pad "A1" smd circle (at -0.6 -1.2) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1383 "/USBC1/~{FAULT}") (pinfunction "~{FLT}") (pintype "open_collector") (tstamp be8fdfc3-0f53-40b2-8ee4-0697503695ab))
+      (net 1375 "/USBC1/~{FAULT}") (pinfunction "~{FLT}") (pintype "open_collector") (tstamp be8fdfc3-0f53-40b2-8ee4-0697503695ab))
     (pad "A2" smd circle (at -0.2 -1.2) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 78 "/USBC1/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp c83d160d-5c33-4c35-a6e2-75b676faf9ed))
     (pad "A3" smd circle (at 0.2 -1.2) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1395 "/USBC1/SOURCE") (pinfunction "EN1") (pintype "input") (tstamp 56b3190c-b112-4ef2-bdce-af9a2dbeade1))
+      (net 1387 "/USBC1/SOURCE") (pinfunction "EN1") (pintype "input") (tstamp 56b3190c-b112-4ef2-bdce-af9a2dbeade1))
     (pad "A4" smd circle (at 0.6 -1.2) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1379 "/USBC1/RIREF") (pinfunction "IREF") (pintype "passive") (tstamp f2c20597-c6d2-4438-aa09-1c5fed36bacd))
+      (net 1371 "/USBC1/RIREF") (pinfunction "IREF") (pintype "passive") (tstamp f2c20597-c6d2-4438-aa09-1c5fed36bacd))
     (pad "B1" smd circle (at -0.6 -0.8) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1343 "/USBC1/PPHV") (pinfunction "PPHV") (pintype "power_out") (tstamp cbfdb0fa-b922-4e85-826f-a68da0c6c7cf))
+      (net 1335 "/USBC1/PPHV") (pinfunction "PPHV") (pintype "power_out") (tstamp cbfdb0fa-b922-4e85-826f-a68da0c6c7cf))
     (pad "B2" smd circle (at -0.2 -0.8) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 78 "/USBC1/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 19f162b4-21d2-4a3f-a65c-7e786f236794))
     (pad "B3" smd circle (at 0.2 -0.8) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
@@ -2709,7 +2701,7 @@
     (pad "B4" smd circle (at 0.6 -0.8) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (tstamp 1bddf429-dd7e-45f1-93bb-fb399da9ef9a))
     (pad "C1" smd circle (at -0.6 -0.4) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1343 "/USBC1/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp bdbb8747-3562-460a-ad98-30bbaaf09bd2))
+      (net 1335 "/USBC1/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp bdbb8747-3562-460a-ad98-30bbaaf09bd2))
     (pad "C2" smd circle (at -0.2 -0.4) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 78 "/USBC1/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp be31e5e7-0521-4018-a65c-db8e28062173))
     (pad "C3" smd circle (at 0.2 -0.4) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
@@ -2717,7 +2709,7 @@
     (pad "C4" smd circle (at 0.6 -0.4) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 104 "+5V") (pinfunction "PP5V") (pintype "power_in") (tstamp 32130794-a1fb-4720-b036-21d52a40ffdc))
     (pad "D1" smd circle (at -0.6 0) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1343 "/USBC1/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp b8eb15ba-03f0-4c44-a3cf-54b6fa722f09))
+      (net 1335 "/USBC1/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp b8eb15ba-03f0-4c44-a3cf-54b6fa722f09))
     (pad "D2" smd circle (at -0.2 0) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 78 "/USBC1/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp a228f9cf-1db9-41d8-b9d6-b9c728fb7811))
     (pad "D3" smd circle (at 0.2 0) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
@@ -2725,7 +2717,7 @@
     (pad "D4" smd circle (at 0.6 0) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 104 "+5V") (pinfunction "PP5V") (pintype "power_in") (tstamp 84370e7d-a23c-4608-b069-a01a83786bfc))
     (pad "E1" smd circle (at -0.6 0.4) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1343 "/USBC1/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 9c084510-af56-40c7-b33d-a82c36668252))
+      (net 1335 "/USBC1/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 9c084510-af56-40c7-b33d-a82c36668252))
     (pad "E2" smd circle (at -0.2 0.4) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 78 "/USBC1/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 9ae642f4-9821-441b-a234-28097bd19a42))
     (pad "E3" smd circle (at 0.2 0.4) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
@@ -2733,19 +2725,19 @@
     (pad "E4" smd circle (at 0.6 0.4) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 104 "+5V") (pinfunction "PP5V") (pintype "power_in") (tstamp 831a047d-fba7-4ca6-880a-3a53f68103b0))
     (pad "F1" smd circle (at -0.6 0.8) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1343 "/USBC1/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 1f1ad952-9ca2-4d84-885d-2ff92ad32728))
+      (net 1335 "/USBC1/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 1f1ad952-9ca2-4d84-885d-2ff92ad32728))
     (pad "F2" smd circle (at -0.2 0.8) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 78 "/USBC1/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp d52c4536-d7df-4493-8cae-ee9668c61a79))
     (pad "F3" smd circle (at 0.2 0.8) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 78 "/USBC1/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 2402261a-e99e-4920-815b-1b622afed754))
     (pad "F4" smd circle (at 0.6 0.8) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1399 "/USBC1/OVP") (pinfunction "OVP") (pintype "passive") (tstamp 6e2d1669-d658-4e84-aaf2-8449e679c685))
+      (net 1391 "/USBC1/OVP") (pinfunction "OVP") (pintype "passive") (tstamp 6e2d1669-d658-4e84-aaf2-8449e679c685))
     (pad "G1" smd circle (at -0.6 1.2) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1403 "/USBC1/SINK") (pinfunction "EN0") (pintype "input") (tstamp e384277d-941c-409d-b2c5-15e9280cb8f4))
+      (net 1395 "/USBC1/SINK") (pinfunction "EN0") (pintype "input") (tstamp e384277d-941c-409d-b2c5-15e9280cb8f4))
     (pad "G2" smd circle (at -0.2 1.2) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 78 "/USBC1/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 1520d3fe-bc47-452f-887f-9d764315f40c))
     (pad "G3" smd circle (at 0.2 1.2) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1267 "/USBC1/VLDO") (pinfunction "VLDO") (pintype "power_out") (tstamp a4edb785-33f5-48fd-86d0-394634a4b69b))
+      (net 1259 "/USBC1/VLDO") (pinfunction "VLDO") (pintype "power_out") (tstamp a4edb785-33f5-48fd-86d0-394634a4b69b))
     (pad "G4" smd circle (at 0.6 1.2) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 4 "+3V3") (pinfunction "VIN") (pintype "power_in") (tstamp a9554c63-5d76-41fd-9796-51c9d14ee389))
   )
@@ -2793,9 +2785,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 5980e4ac-cb22-4468-97bb-f8728d19faf1))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 20955a51-2859-4f74-ac29-9c5b6a043719))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1209 "+1V8") (pintype "passive") (tstamp 327d7e85-1add-41e4-ae07-331fa004d258))
+      (net 1201 "+1V8") (pintype "passive") (tstamp 327d7e85-1add-41e4-ae07-331fa004d258))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1347 "/~{C_RIGHT_INT}") (pintype "passive") (tstamp e791fe2a-ef1d-4597-9ad2-2088f92d0821))
+      (net 1333 "/~{C_LEFT_INT}") (pintype "passive") (tstamp e791fe2a-ef1d-4597-9ad2-2088f92d0821))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -2847,7 +2839,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b4cd1cd0-493b-4563-b164-4fb6ba190800))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1245 "/CHARGER/VIN") (pintype "passive") (tstamp 959b814a-e1e6-45e8-8a82-f960e3705f13))
+      (net 1237 "/CHARGER/VIN") (pintype "passive") (tstamp 959b814a-e1e6-45e8-8a82-f960e3705f13))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp c31e1252-6ac2-4e77-b43c-29c8f04609eb))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -2899,9 +2891,9 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 832c00fd-a96b-437b-b031-3c374a198522))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 00e39239-90d4-4f4a-ba89-603a74c641ad))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1422 "/VCCINAUX/V3") (pintype "passive") (tstamp 86b70cd0-cd4b-4cd7-a58c-a2e0130982ea))
+      (net 1414 "/VCCINAUX/V3") (pintype "passive") (tstamp 86b70cd0-cd4b-4cd7-a58c-a2e0130982ea))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1423 "/VCCINAUX/V2") (pintype "passive") (tstamp beef5f30-dda2-4156-b4e3-b3758b92f31c))
+      (net 1415 "/VCCINAUX/V2") (pintype "passive") (tstamp beef5f30-dda2-4156-b4e3-b3758b92f31c))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3006,7 +2998,7 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b1f42aab-89fd-41a0-b0fb-b746304c81a0))
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1236 "/CHARGER/COMP2") (pintype "passive") (tstamp b38075ce-6111-4938-90a6-56ef26c04e9d))
+      (net 1228 "/CHARGER/COMP2") (pintype "passive") (tstamp b38075ce-6111-4938-90a6-56ef26c04e9d))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 01e4a9d3-7ad5-4dc1-baa8-12ba8e14a125))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -3059,7 +3051,7 @@
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 728393fe-995f-47dd-baf3-00526994a756))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1358 "/USBC0/VB_ESD") (pintype "passive") (tstamp 372d0b83-df54-43e0-8430-19b37db2c9a4))
+      (net 1350 "/USBC0/VB_ESD") (pintype "passive") (tstamp 372d0b83-df54-43e0-8430-19b37db2c9a4))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3113,7 +3105,7 @@
     (pad "1" smd roundrect (at -0.45 0 270) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 04a9667b-b3f2-4557-997a-2fb4c566b0d4))
     (pad "2" smd roundrect (at 0.45 0 270) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp 288dc7dc-e8d4-45a4-8e98-a339ec696e49))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp 288dc7dc-e8d4-45a4-8e98-a339ec696e49))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3215,7 +3207,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 349ad0b9-79de-4ce3-b67e-7a0d9330677d))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1257 "/CHARGER/SRN1") (pintype "passive") (tstamp 1d93b7ee-4c9c-4de4-a1ef-98a045098822))
+      (net 1249 "/CHARGER/SRN1") (pintype "passive") (tstamp 1d93b7ee-4c9c-4de4-a1ef-98a045098822))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 06bc41f2-7574-4ae4-a2f0-4b9b9512f9c1))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -3325,7 +3317,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp a061e87b-d23c-4843-966e-e7ec6fbc2e7d))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1417 "VCCGT") (pintype "passive") (tstamp 46a084dd-6d04-4477-9e55-f860bef372c5))
+      (net 1409 "VCCGT") (pintype "passive") (tstamp 46a084dd-6d04-4477-9e55-f860bef372c5))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3376,7 +3368,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 0c496b3e-1182-4c16-9fe3-e2d4626eb8f3))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 50139dc0-7464-4de6-bac1-082ca29db028))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1380 "/USBC2/RIREF") (pintype "passive") (tstamp e37251fa-23d8-460b-ad5b-45f3097eb62e))
+      (net 1372 "/USBC2/RIREF") (pintype "passive") (tstamp e37251fa-23d8-460b-ad5b-45f3097eb62e))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 2a70ea2c-3437-4ff4-a97b-f09f88d8389a))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -3434,7 +3426,7 @@
     (fp_line (start 3.65 2.15) (end 3.65 -2.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 320efeb4-96f3-4dd2-88a7-4422acb7c9da))
     (pad "1" smd roundrect (at -3.1125 0) (size 2.075 2.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.120482)
-      (net 1417 "VCCGT") (pintype "passive") (tstamp 86fec215-c406-4a39-84b3-b09735d17f15))
+      (net 1409 "VCCGT") (pintype "passive") (tstamp 86fec215-c406-4a39-84b3-b09735d17f15))
     (pad "2" smd roundrect (at 3.1125 0) (size 2.075 2.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.120482)
       (net 2 "GND") (pintype "passive") (tstamp 20556361-cf02-4a9e-a74b-d0a884338b77))
     (model "${KICAD6_3DMODEL_DIR}/Capacitor_Tantalum_SMD.3dshapes/CP_EIA-7343-20_Kemet-V.wrl"
@@ -3487,7 +3479,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 7af715ee-d0ee-4427-8caa-7c3e0adc6bcb))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 14691795-f906-4d45-8c67-9ea86e78f7e9))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1315 "/USBC3/TXC1-") (pintype "passive") (tstamp 9e05fc46-df8b-4765-a34e-a2f66fc7a17c))
+      (net 1307 "/USBC3/TXC1-") (pintype "passive") (tstamp 9e05fc46-df8b-4765-a34e-a2f66fc7a17c))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 449 "/CPU_USB/USBC3.TX-1") (pintype "passive") (tstamp bd880a2a-d424-4bc3-8e33-ecb010db9016))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -3543,7 +3535,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp f7d84511-03a8-4804-8d56-d93a855e766b))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1417 "VCCGT") (pintype "passive") (tstamp fb6f09ad-0c29-42f2-b7aa-d51e53063813))
+      (net 1409 "VCCGT") (pintype "passive") (tstamp fb6f09ad-0c29-42f2-b7aa-d51e53063813))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3594,9 +3586,9 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 45773183-7421-406f-93c7-5cd814d2d90a))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 6314c9af-9e06-436a-97c7-8f2eba5b71d0))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1388 "Net-(Q8-G)") (pintype "passive") (tstamp a81da2dc-0149-46cb-b8e6-823c0a1bf437))
+      (net 1380 "Net-(Q8-G)") (pintype "passive") (tstamp a81da2dc-0149-46cb-b8e6-823c0a1bf437))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1392 "Net-(Q12-D)") (pintype "passive") (tstamp 5027f722-256e-40b7-9b49-eab9a29988e9))
+      (net 1384 "Net-(Q12-D)") (pintype "passive") (tstamp 5027f722-256e-40b7-9b49-eab9a29988e9))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3719,7 +3711,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 9ffb8d11-c91d-4e54-a6d0-3f3872a50b69))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp f98515fb-62f5-4498-9e63-bf30054fe047))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp f98515fb-62f5-4498-9e63-bf30054fe047))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3770,7 +3762,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 8bd95058-2b19-4cf4-a6ef-94a86f975b5f))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp f9368009-e526-40c3-8f64-5deecd52beaa))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1354 "/USBC3/~{PROT_FLT}") (pintype "passive") (tstamp c2655be9-18a7-4b8f-956a-a68abdf98b08))
+      (net 1346 "/USBC3/~{PROT_FLT}") (pintype "passive") (tstamp c2655be9-18a7-4b8f-956a-a68abdf98b08))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 74 "/USBC3/BYP") (pintype "passive") (tstamp eaec36bf-5c40-4a2f-9bae-2c33f5d85ea0))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -3832,9 +3824,9 @@
     (fp_line (start 3 3) (end 3 -3)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 658184f4-0923-4843-96c4-f119447ad409))
     (pad "1" smd rect (at -2.075 0) (size 2.35 5.1) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1214 "/CPU_POWER/SW11") (pinfunction "1") (pintype "passive") (tstamp 1e66f0ab-6369-43ec-ae4d-3d3b3d508c78))
+      (net 1206 "/CPU_POWER/SW11") (pinfunction "1") (pintype "passive") (tstamp 1e66f0ab-6369-43ec-ae4d-3d3b3d508c78))
     (pad "2" smd rect (at 2.075 0) (size 2.35 5.1) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1216 "Net-(C52-Pad1)") (pinfunction "2") (pintype "passive") (tstamp 24d4fbf3-a615-49ba-91c6-00ab0daf5a11))
+      (net 1208 "Net-(C52-Pad1)") (pinfunction "2") (pintype "passive") (tstamp 24d4fbf3-a615-49ba-91c6-00ab0daf5a11))
     (model "${KICAD6_3DMODEL_DIR}/Inductor_SMD.3dshapes/L_Bourns_SRN6045TA.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -3886,7 +3878,7 @@
     (fp_line (start 0.8 0.4) (end -0.8 0.4)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0978bc3f-734a-4464-9d7d-8447c0d5e357))
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1267 "/USBC1/VLDO") (pintype "passive") (tstamp e2b6eeaa-8bcc-457b-a09b-86987b148253))
+      (net 1259 "/USBC1/VLDO") (pintype "passive") (tstamp e2b6eeaa-8bcc-457b-a09b-86987b148253))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 7494ba81-b713-4141-aff4-35bd805b85ba))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
@@ -4047,7 +4039,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d30e2293-fcd9-4217-b04c-390952e63b36))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1245 "/CHARGER/VIN") (pintype "passive") (tstamp 05084c87-d0aa-42db-85c8-85b0aca5ee64))
+      (net 1237 "/CHARGER/VIN") (pintype "passive") (tstamp 05084c87-d0aa-42db-85c8-85b0aca5ee64))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 7b9c235f-7696-47b0-acc2-4b1e7e06d698))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -4099,7 +4091,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 1a48ce09-c6ec-48e3-8985-36b00dc0f7cc))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 7e106180-d8d4-4a02-bc39-5c6ec770319f))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1429 "/VCCINAUX/VSSINAUX_SENSE") (pintype "passive") (tstamp 0385b216-b400-4c1c-a054-837beb417ac5))
+      (net 1421 "/VCCINAUX/VSSINAUX_SENSE") (pintype "passive") (tstamp 0385b216-b400-4c1c-a054-837beb417ac5))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 9cdd817c-b231-4295-8261-d142714abce3))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -4305,49 +4297,49 @@
     (pad "A1" smd rect (at -2.75 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp 9d54f6ec-f7f5-48d9-a84a-886ec667c08a))
     (pad "A2" smd rect (at -2.25 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1312 "/USBC2/TXJ1+") (pinfunction "TX1+") (pintype "bidirectional") (tstamp 4ceef5fa-4855-414e-98f4-94c5fd32165a))
+      (net 1304 "/USBC2/TXJ1+") (pinfunction "TX1+") (pintype "bidirectional") (tstamp 4ceef5fa-4855-414e-98f4-94c5fd32165a))
     (pad "A3" smd rect (at -1.75 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1310 "/USBC2/TXJ1-") (pinfunction "TX1-") (pintype "bidirectional") (tstamp 5a16f62b-b773-44f1-ac6d-45cae4a68bca))
+      (net 1302 "/USBC2/TXJ1-") (pinfunction "TX1-") (pintype "bidirectional") (tstamp 5a16f62b-b773-44f1-ac6d-45cae4a68bca))
     (pad "A4" smd rect (at -1.25 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 81 "/USBC2/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp a1c1dca5-38d3-4db0-af1e-269401bbf16e))
     (pad "A5" smd rect (at -0.75 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1370 "/USBC2/C_CC1") (pinfunction "CC1") (pintype "bidirectional") (tstamp 98b0e76e-c0b9-4a69-a24b-8655c9921bde))
+      (net 1362 "/USBC2/C_CC1") (pinfunction "CC1") (pintype "bidirectional") (tstamp 98b0e76e-c0b9-4a69-a24b-8655c9921bde))
     (pad "A6" smd rect (at -0.25 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 461 "/CPU_USB/USBC2.D+") (pinfunction "D+") (pintype "bidirectional") (tstamp eb70021b-ab31-4a78-bac1-64ef6280fe38))
     (pad "A7" smd rect (at 0.25 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 462 "/CPU_USB/USBC2.D-") (pinfunction "D-") (pintype "bidirectional") (tstamp 0b800439-91dd-4277-b7fe-4fd53eb4dbff))
     (pad "A8" smd rect (at 0.75 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1371 "/USBC2/C_SBU1") (pinfunction "SBU1") (pintype "bidirectional") (tstamp cd1d5dc5-4b54-4363-b278-92c2aba6f051))
+      (net 1363 "/USBC2/C_SBU1") (pinfunction "SBU1") (pintype "bidirectional") (tstamp cd1d5dc5-4b54-4363-b278-92c2aba6f051))
     (pad "A9" smd rect (at 1.25 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 81 "/USBC2/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 6492cc5d-3ddb-45e9-9f38-4e6cbbb4d212))
     (pad "A10" smd rect (at 1.75 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1294 "/USBC2/RXJ2-") (pinfunction "RX2-") (pintype "bidirectional") (tstamp e06eaf2b-c908-4039-994a-56c3c0b03048))
+      (net 1286 "/USBC2/RXJ2-") (pinfunction "RX2-") (pintype "bidirectional") (tstamp e06eaf2b-c908-4039-994a-56c3c0b03048))
     (pad "A11" smd rect (at 2.25 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1296 "/USBC2/RXJ2+") (pinfunction "RX2+") (pintype "bidirectional") (tstamp 72161b22-1962-4fdf-9dec-c0aff3f4452d))
+      (net 1288 "/USBC2/RXJ2+") (pinfunction "RX2+") (pintype "bidirectional") (tstamp 72161b22-1962-4fdf-9dec-c0aff3f4452d))
     (pad "A12" smd rect (at 2.75 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp 1cfe3151-104e-420d-970c-ab639622d26d))
     (pad "B1" smd rect (at 2.5 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp dd802d2d-65c9-4e9d-b27c-39a04e28e134))
     (pad "B2" smd rect (at 2 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1328 "/USBC2/TXJ2+") (pinfunction "TX2+") (pintype "bidirectional") (tstamp e96b2fbd-245a-4c52-87b0-9310795f4560))
+      (net 1320 "/USBC2/TXJ2+") (pinfunction "TX2+") (pintype "bidirectional") (tstamp e96b2fbd-245a-4c52-87b0-9310795f4560))
     (pad "B3" smd rect (at 1.5 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1326 "/USBC2/TXJ2-") (pinfunction "TX2-") (pintype "bidirectional") (tstamp 0f8a5f2b-c866-4d5a-988d-bb9332751f4e))
+      (net 1318 "/USBC2/TXJ2-") (pinfunction "TX2-") (pintype "bidirectional") (tstamp 0f8a5f2b-c866-4d5a-988d-bb9332751f4e))
     (pad "B4" smd rect (at 1 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 81 "/USBC2/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp a0c3f1ca-50ae-4537-af25-4d55872cad4a))
     (pad "B5" smd rect (at 0.5 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1372 "/USBC2/C_CC2") (pinfunction "CC2") (pintype "bidirectional") (tstamp a3dda4da-d18c-4fca-ae4a-30bbf90d2590))
+      (net 1364 "/USBC2/C_CC2") (pinfunction "CC2") (pintype "bidirectional") (tstamp a3dda4da-d18c-4fca-ae4a-30bbf90d2590))
     (pad "B6" smd rect (at 0 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 461 "/CPU_USB/USBC2.D+") (pinfunction "D+") (pintype "bidirectional") (tstamp 89c3797c-a090-48fe-a29f-37db69638508))
     (pad "B7" smd rect (at -0.5 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 462 "/CPU_USB/USBC2.D-") (pinfunction "D-") (pintype "bidirectional") (tstamp e5565b60-34bf-4fe4-8970-34ff7b10c648))
     (pad "B8" smd rect (at -1 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1373 "/USBC2/C_SBU2") (pinfunction "SBU2") (pintype "bidirectional") (tstamp 474af907-fd7d-4081-be20-92128dfc0882))
+      (net 1365 "/USBC2/C_SBU2") (pinfunction "SBU2") (pintype "bidirectional") (tstamp 474af907-fd7d-4081-be20-92128dfc0882))
     (pad "B9" smd rect (at -1.5 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 81 "/USBC2/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 70485aff-f31b-4a1f-8806-262a32e0c4e1))
     (pad "B10" smd rect (at -2 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1274 "/USBC2/RXJ1-") (pinfunction "RX1-") (pintype "bidirectional") (tstamp c3ea77f5-2fdf-4726-96c1-ff8d52e514e5))
+      (net 1266 "/USBC2/RXJ1-") (pinfunction "RX1-") (pintype "bidirectional") (tstamp c3ea77f5-2fdf-4726-96c1-ff8d52e514e5))
     (pad "B11" smd rect (at -2.5 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1282 "/USBC2/RXJ1+") (pinfunction "RX1+") (pintype "bidirectional") (tstamp ffa58ae8-d77b-4c90-8a5a-89f423e65045))
+      (net 1274 "/USBC2/RXJ1+") (pinfunction "RX1+") (pintype "bidirectional") (tstamp ffa58ae8-d77b-4c90-8a5a-89f423e65045))
     (pad "B12" smd rect (at -3 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp a6e7864b-bd15-4fa0-a0ca-4a8a02c22672))
     (pad "S1" smd roundrect (at -5 2.85 90) (size 1 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -4439,37 +4431,37 @@
     (fp_line (start 1.3 1.3) (end -1.3 1.3)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 54624b30-6b0b-4f88-b930-6134d1a38f26))
     (pad "1" smd roundrect (at -1.25 -0.8 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1348 "/USBC2/~{PROT_FLT}") (pinfunction "FRS") (pintype "output") (tstamp 90e80097-a32d-4a70-8f3e-fbb0c4fc5760))
+      (net 1340 "/USBC2/~{PROT_FLT}") (pinfunction "FRS") (pintype "output") (tstamp 90e80097-a32d-4a70-8f3e-fbb0c4fc5760))
     (pad "2" smd roundrect (at -1.25 -0.4 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1404 "/USBC2/SINK") (pinfunction "SNK") (pintype "output") (tstamp e75d492f-0b0a-4ee7-ab3d-6f35fc8c2bce))
+      (net 1396 "/USBC2/SINK") (pinfunction "SNK") (pintype "output") (tstamp e75d492f-0b0a-4ee7-ab3d-6f35fc8c2bce))
     (pad "3" smd roundrect (at -1.25 0 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 4 "+3V3") (pinfunction "VDD") (pintype "power_in") (tstamp 248c8087-8f50-4fdf-a977-d6309c7b527b))
     (pad "4" smd roundrect (at -1.25 0.4 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 73 "/USBC2/BYP") (pinfunction "BYPASS") (pintype "power_out") (tstamp 377de45b-a035-4b38-87e2-9469bb105490))
     (pad "5" smd roundrect (at -1.25 0.8 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1350 "/USBC2/PHYADDR") (pinfunction "ADDR") (pintype "input+no_connect") (tstamp 884cf196-e7f1-4043-8b51-00efb06b1a94))
+      (net 1342 "/USBC2/PHYADDR") (pinfunction "ADDR") (pintype "input+no_connect") (tstamp 884cf196-e7f1-4043-8b51-00efb06b1a94))
     (pad "6" smd roundrect (at -0.4 1.25 180) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1351 "/USBC2/EN_CHARGE") (pinfunction "ILIM") (pintype "bidirectional") (tstamp 71492a22-c837-4e3a-a298-2fbf40bc206b))
+      (net 1343 "/USBC2/EN_CHARGE") (pinfunction "ILIM") (pintype "bidirectional") (tstamp 71492a22-c837-4e3a-a298-2fbf40bc206b))
     (pad "7" smd roundrect (at 0 1.25 180) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1339 "/C_RIGHT_SCL") (pinfunction "SDA") (pintype "bidirectional") (tstamp 9245df82-e58c-4e9f-a955-e268dfba479f))
+      (net 1331 "/C_RIGHT_SCL") (pinfunction "SDA") (pintype "bidirectional") (tstamp 9245df82-e58c-4e9f-a955-e268dfba479f))
     (pad "8" smd roundrect (at 0.4 1.25 180) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1344 "/C_RIGHT_SDA") (pinfunction "SCL") (pintype "bidirectional") (tstamp 28cb7802-489f-44e4-b997-26735ba00343))
+      (net 1336 "/C_RIGHT_SDA") (pinfunction "SCL") (pintype "bidirectional") (tstamp 28cb7802-489f-44e4-b997-26735ba00343))
     (pad "9" smd roundrect (at 1.25 0.8 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1352 "/USBC2/~{DEBUG}") (pinfunction "~{DBG}") (pintype "output") (tstamp 9ddb2068-e3dc-458d-a5e2-5fd284183366))
+      (net 1344 "/USBC2/~{DEBUG}") (pinfunction "~{DBG}") (pintype "output") (tstamp 9ddb2068-e3dc-458d-a5e2-5fd284183366))
     (pad "10" smd roundrect (at 1.25 0.4 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1347 "/~{C_RIGHT_INT}") (pinfunction "~{INT}") (pintype "open_collector") (tstamp cf6686e7-0522-471c-820b-6351f36fb77a))
+      (net 1339 "/~{C_RIGHT_INT}") (pinfunction "~{INT}") (pintype "open_collector") (tstamp cf6686e7-0522-471c-820b-6351f36fb77a))
     (pad "11" smd roundrect (at 1.25 0 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1384 "/USBC2/~{FAULT}") (pinfunction "~{FAULT}") (pintype "input") (tstamp 9df0bb62-2e3c-49df-a2a3-9c7a97a633a2))
+      (net 1376 "/USBC2/~{FAULT}") (pinfunction "~{FAULT}") (pintype "input") (tstamp 9df0bb62-2e3c-49df-a2a3-9c7a97a633a2))
     (pad "12" smd roundrect (at 1.25 -0.4 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 104 "+5V") (pinfunction "VCONN") (pintype "power_in") (tstamp 8ea19935-14e5-4526-bf4e-9dd7af4a91dd))
     (pad "13" smd roundrect (at 1.25 -0.8 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 82 "/USBC2/CC1") (pinfunction "CC1") (pintype "passive") (tstamp 485f4cf4-89f7-4fd6-a89e-3176bfade84b))
     (pad "14" smd roundrect (at 0.4 -1.25 180) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1262 "/USBC2/CC2") (pinfunction "CC2") (pintype "passive") (tstamp ea8cac24-f9fe-4d2b-8da9-6a9e4c83f189))
+      (net 1254 "/USBC2/CC2") (pinfunction "CC2") (pintype "passive") (tstamp ea8cac24-f9fe-4d2b-8da9-6a9e4c83f189))
     (pad "15" smd roundrect (at 0 -1.25 180) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 81 "/USBC2/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 9bc92354-c474-4fcb-b777-848b16dab964))
     (pad "16" smd roundrect (at -0.4 -1.25 180) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1396 "/USBC2/SOURCE") (pinfunction "SRC") (pintype "output") (tstamp 6c7abb13-3445-4ab8-8547-86f6b67520d8))
+      (net 1388 "/USBC2/SOURCE") (pinfunction "SRC") (pintype "output") (tstamp 6c7abb13-3445-4ab8-8547-86f6b67520d8))
     (pad "17" smd roundrect (at 0 0 180) (size 1.1 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (solder_paste_margin -0.25) (tstamp 78b17388-90ec-41cb-983a-5769f9a87f41))
     (model "${KIPRJMOD}/models/PTN5110.step"
@@ -4524,7 +4516,7 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 03023f60-ed62-4ad0-a893-878820d541fa))
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1250 "/CHARGER/REGN") (pintype "passive") (tstamp a909eb1d-6c0e-4de2-a649-af4f5208426f))
+      (net 1242 "/CHARGER/REGN") (pintype "passive") (tstamp a909eb1d-6c0e-4de2-a649-af4f5208426f))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp de77c1d3-ea2f-4ddd-8631-0d942add9ab1))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -4580,7 +4572,7 @@
       (stroke (width 0.15) (type default)) (layer "F.Fab") (tstamp 532df33a-8fc4-472f-a586-68081883146d))
     (pad "1" smd roundrect (at -1.4 -0.9 270) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (chamfer_ratio 0.3) (chamfer top_left)
-      (net 1215 "/CPU_POWER/B11") (pinfunction "BST") (pintype "passive") (thermal_bridge_angle 45) (tstamp 5d4a6208-88d5-44b5-a038-25c9cc78e221))
+      (net 1207 "/CPU_POWER/B11") (pinfunction "BST") (pintype "passive") (thermal_bridge_angle 45) (tstamp 5d4a6208-88d5-44b5-a038-25c9cc78e221))
     (pad "2" smd roundrect (at -1.4 -0.45 90) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 800 "+VSW") (pinfunction "VIN") (pintype "power_in") (thermal_bridge_angle 45) (tstamp 42c35dca-2e4d-476c-84aa-62a56de8c3cb))
     (pad "3" smd roundrect (at -1.4 0 90) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -4592,40 +4584,40 @@
       (net 800 "+VSW") (pinfunction "VIN") (pintype "power_in") (thermal_bridge_angle 45) (tstamp feee2bb2-3142-4dd3-a03d-b05854326f57))
     (pad "6" smd roundrect (at -0.9 1.4) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (chamfer_ratio 0.3) (chamfer top_left)
-      (net 1214 "/CPU_POWER/SW11") (pinfunction "SW") (pintype "passive") (thermal_bridge_angle 45) (tstamp 470c0445-11ae-4cb4-83c1-c7c14751ed5b))
+      (net 1206 "/CPU_POWER/SW11") (pinfunction "SW") (pintype "passive") (thermal_bridge_angle 45) (tstamp 470c0445-11ae-4cb4-83c1-c7c14751ed5b))
     (pad "7" smd roundrect (at -0.45 1.4 180) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (thermal_bridge_angle 45) (tstamp 7f79ebff-2bbd-4fab-b0c5-93df9b19f214))
     (pad "8" smd roundrect (at 0 1.4 180) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (thermal_bridge_angle 45) (tstamp 47866724-b1b9-4ff5-8c66-4473c26fd7c0))
     (pad "9" smd roundrect (at 0.45 1.4 180) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1224 "/CPU_POWER/PG11") (pinfunction "PG") (pintype "open_emitter") (thermal_bridge_angle 45) (tstamp 0857a4d8-d6cb-41ed-9e5f-db3cbc2544d9))
+      (net 1216 "/CPU_POWER/PG11") (pinfunction "PG") (pintype "open_emitter") (thermal_bridge_angle 45) (tstamp 0857a4d8-d6cb-41ed-9e5f-db3cbc2544d9))
     (pad "10" smd roundrect (at 0.9 1.4 180) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (chamfer_ratio 0.3) (chamfer bottom_left)
       (net 2 "GND") (pinfunction "NC") (pintype "passive") (thermal_bridge_angle 45) (tstamp 117a2513-f8f2-45ec-bae7-ac8bc8ce5a8b))
     (pad "11" smd roundrect (at 1.4 0.9 90) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (chamfer_ratio 0.3) (chamfer top_left)
-      (net 1219 "unconnected-(U8-SS-Pad11)") (pinfunction "SS") (pintype "passive+no_connect") (thermal_bridge_angle 45) (tstamp 4cf26f1e-1fca-47aa-9c88-88fd13eb2711))
+      (net 1211 "unconnected-(U8-SS-Pad11)") (pinfunction "SS") (pintype "passive+no_connect") (thermal_bridge_angle 45) (tstamp 4cf26f1e-1fca-47aa-9c88-88fd13eb2711))
     (pad "12" smd roundrect (at 1.4 0.45 90) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1223 "/CPU_POWER/EN11") (pinfunction "EN") (pintype "input") (thermal_bridge_angle 45) (tstamp 94f21e5c-1646-48ed-8ce5-1340f7b6bcfc))
+      (net 1215 "/CPU_POWER/EN11") (pinfunction "EN") (pintype "input") (thermal_bridge_angle 45) (tstamp 94f21e5c-1646-48ed-8ce5-1340f7b6bcfc))
     (pad "13" smd roundrect (at 1.4 0 90) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "AGND") (pintype "power_in") (thermal_bridge_angle 45) (tstamp a5ff068c-ff5c-4cea-a4bc-734e50176455))
     (pad "14" smd roundrect (at 1.4 -0.45 90) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1217 "/CPU_POWER/FB11") (pinfunction "FB") (pintype "passive") (thermal_bridge_angle 45) (tstamp 02ce81e9-a4b0-44b1-a483-f09bbed0d4ed))
+      (net 1209 "/CPU_POWER/FB11") (pinfunction "FB") (pintype "passive") (thermal_bridge_angle 45) (tstamp 02ce81e9-a4b0-44b1-a483-f09bbed0d4ed))
     (pad "15" smd roundrect (at 1.4 -0.9 270) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (chamfer_ratio 0.3) (chamfer bottom_left)
-      (net 1222 "/CPU_POWER/MODE11") (pinfunction "MODE") (pintype "input") (thermal_bridge_angle 45) (tstamp 64863233-8788-4260-b530-80b911ae36b3))
+      (net 1214 "/CPU_POWER/MODE11") (pinfunction "MODE") (pintype "input") (thermal_bridge_angle 45) (tstamp 64863233-8788-4260-b530-80b911ae36b3))
     (pad "16" smd roundrect (at 0.9 -1.4 180) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (chamfer_ratio 0.3) (chamfer top_left)
       (net 2 "GND") (pinfunction "NC") (pintype "passive") (thermal_bridge_angle 45) (tstamp 7b6e8dd8-3e43-475b-85a8-4c18294c1b68))
     (pad "17" smd roundrect (at 0.45 -1.4 180) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1221 "/CPU_POWER/VCC11") (pinfunction "VCC") (pintype "passive") (thermal_bridge_angle 45) (tstamp 1a98e2b7-1d0e-41d8-b307-d3db51c61d02))
+      (net 1213 "/CPU_POWER/VCC11") (pinfunction "VCC") (pintype "passive") (thermal_bridge_angle 45) (tstamp 1a98e2b7-1d0e-41d8-b307-d3db51c61d02))
     (pad "18" smd roundrect (at 0 -1.4 180) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (thermal_bridge_angle 45) (tstamp 7b18c902-f1de-4614-82ca-a040be3f1b16))
     (pad "19" smd roundrect (at -0.45 -1.4 180) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1214 "/CPU_POWER/SW11") (pinfunction "SW") (pintype "passive") (thermal_bridge_angle 45) (tstamp 3b3c99e3-9c57-45cc-baf2-1d0cb6d74d11))
+      (net 1206 "/CPU_POWER/SW11") (pinfunction "SW") (pintype "passive") (thermal_bridge_angle 45) (tstamp 3b3c99e3-9c57-45cc-baf2-1d0cb6d74d11))
     (pad "20" smd roundrect (at -0.9 -1.4) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (chamfer_ratio 0.3) (chamfer bottom_left)
-      (net 1214 "/CPU_POWER/SW11") (pinfunction "SW") (pintype "passive") (thermal_bridge_angle 45) (tstamp 39a43362-8e11-4736-9375-0c8fa9b7ab0c))
+      (net 1206 "/CPU_POWER/SW11") (pinfunction "SW") (pintype "passive") (thermal_bridge_angle 45) (tstamp 39a43362-8e11-4736-9375-0c8fa9b7ab0c))
     (pad "21" smd roundrect (at 0 0) (size 0.775 0.86) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.07407407407)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (solder_mask_margin -0.05) (solder_paste_margin -0.07) (thermal_bridge_angle 45) (tstamp 69a8a2f6-c60b-494d-a484-65bada15ed04))
     (model ":KICAD7_3DMODEL_DIR:Package_DFN_QFN.3dshapes/QFN-20-1EP_3x3mm_P0.45mm_EP1.6x1.6mm.step"
@@ -4693,9 +4685,9 @@
     (fp_line (start 1.3 1.3) (end -1.3 1.3)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1042f22b-709e-4d41-91ea-ac08493a9a58))
     (pad "1" smd roundrect (at -1.25 -0.8 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1354 "/USBC3/~{PROT_FLT}") (pinfunction "FRS") (pintype "output") (tstamp 442493b6-18c1-464b-8eff-ba8b66e3e7a3))
+      (net 1346 "/USBC3/~{PROT_FLT}") (pinfunction "FRS") (pintype "output") (tstamp 442493b6-18c1-464b-8eff-ba8b66e3e7a3))
     (pad "2" smd roundrect (at -1.25 -0.4 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1405 "/USBC3/SINK") (pinfunction "SNK") (pintype "output") (tstamp 6a60ce39-1f58-4953-9111-c8ca31fd6421))
+      (net 1397 "/USBC3/SINK") (pinfunction "SNK") (pintype "output") (tstamp 6a60ce39-1f58-4953-9111-c8ca31fd6421))
     (pad "3" smd roundrect (at -1.25 0 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 4 "+3V3") (pinfunction "VDD") (pintype "power_in") (tstamp 79572777-0061-4499-82ea-e734af853239))
     (pad "4" smd roundrect (at -1.25 0.4 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -4703,27 +4695,27 @@
     (pad "5" smd roundrect (at -1.25 0.8 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "ADDR") (pintype "input") (tstamp 47036d37-3e18-4a56-9e0a-ad001c9b4fc4))
     (pad "6" smd roundrect (at -0.4 1.25 180) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1356 "/USBC3/EN_CHARGE") (pinfunction "ILIM") (pintype "bidirectional") (tstamp c6383286-0dae-4262-897b-c9c127682f06))
+      (net 1348 "/USBC3/EN_CHARGE") (pinfunction "ILIM") (pintype "bidirectional") (tstamp c6383286-0dae-4262-897b-c9c127682f06))
     (pad "7" smd roundrect (at 0 1.25 180) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1339 "/C_RIGHT_SCL") (pinfunction "SDA") (pintype "bidirectional") (tstamp 3cf4253e-2eac-403d-8eeb-675524aad664))
+      (net 1331 "/C_RIGHT_SCL") (pinfunction "SDA") (pintype "bidirectional") (tstamp 3cf4253e-2eac-403d-8eeb-675524aad664))
     (pad "8" smd roundrect (at 0.4 1.25 180) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1344 "/C_RIGHT_SDA") (pinfunction "SCL") (pintype "bidirectional") (tstamp 0b61515c-7f88-4726-b75d-e63499e6e16b))
+      (net 1336 "/C_RIGHT_SDA") (pinfunction "SCL") (pintype "bidirectional") (tstamp 0b61515c-7f88-4726-b75d-e63499e6e16b))
     (pad "9" smd roundrect (at 1.25 0.8 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1357 "/USBC3/~{DEBUG}") (pinfunction "~{DBG}") (pintype "output") (tstamp 0dfe30a1-692d-4ee1-89de-9a9742049ee4))
+      (net 1349 "/USBC3/~{DEBUG}") (pinfunction "~{DBG}") (pintype "output") (tstamp 0dfe30a1-692d-4ee1-89de-9a9742049ee4))
     (pad "10" smd roundrect (at 1.25 0.4 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1347 "/~{C_RIGHT_INT}") (pinfunction "~{INT}") (pintype "open_collector") (tstamp 474bc1b2-dc33-4731-b8c9-0ad635fd770e))
+      (net 1339 "/~{C_RIGHT_INT}") (pinfunction "~{INT}") (pintype "open_collector") (tstamp 474bc1b2-dc33-4731-b8c9-0ad635fd770e))
     (pad "11" smd roundrect (at 1.25 0 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1385 "/USBC3/~{FAULT}") (pinfunction "~{FAULT}") (pintype "input") (tstamp a1f71279-ad3b-470f-864f-11ae6b09e870))
+      (net 1377 "/USBC3/~{FAULT}") (pinfunction "~{FAULT}") (pintype "input") (tstamp a1f71279-ad3b-470f-864f-11ae6b09e870))
     (pad "12" smd roundrect (at 1.25 -0.4 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 104 "+5V") (pinfunction "VCONN") (pintype "power_in") (tstamp 40ff8d4e-a743-44c3-b891-54eb4fee65c3))
     (pad "13" smd roundrect (at 1.25 -0.8 180) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1264 "/USBC3/CC1") (pinfunction "CC1") (pintype "passive") (tstamp cefa5447-0c7c-4300-b271-4f7312ddc04e))
+      (net 1256 "/USBC3/CC1") (pinfunction "CC1") (pintype "passive") (tstamp cefa5447-0c7c-4300-b271-4f7312ddc04e))
     (pad "14" smd roundrect (at 0.4 -1.25 180) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1265 "/USBC3/CC2") (pinfunction "CC2") (pintype "passive") (tstamp e6f0047e-a799-4e27-8761-ed58f1cd3227))
+      (net 1257 "/USBC3/CC2") (pinfunction "CC2") (pintype "passive") (tstamp e6f0047e-a799-4e27-8761-ed58f1cd3227))
     (pad "15" smd roundrect (at 0 -1.25 180) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp b23501c0-6c56-49b0-8744-d280841a3b4a))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp b23501c0-6c56-49b0-8744-d280841a3b4a))
     (pad "16" smd roundrect (at -0.4 -1.25 180) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1397 "/USBC3/SOURCE") (pinfunction "SRC") (pintype "output") (tstamp b82cd2ad-cdd9-41f3-9148-6d7904737012))
+      (net 1389 "/USBC3/SOURCE") (pinfunction "SRC") (pintype "output") (tstamp b82cd2ad-cdd9-41f3-9148-6d7904737012))
     (pad "17" smd roundrect (at 0 0 180) (size 1.1 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (solder_paste_margin -0.25) (tstamp 4e641387-f7ca-421f-8c62-24f4663f8134))
     (model "${KIPRJMOD}/models/PTN5110.step"
@@ -4776,9 +4768,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 2f23346c-6614-47b0-aadb-5e06badfe9ad))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 387b7fd2-24da-4b05-bd14-472e7999103b))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1246 "+3.3V") (pintype "passive") (tstamp a076fd65-5176-4c18-a5e2-1e04241b1b2d))
+      (net 1238 "+3.3V") (pintype "passive") (tstamp a076fd65-5176-4c18-a5e2-1e04241b1b2d))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1247 "/CHRG_SDA") (pintype "passive") (tstamp 3a6c6f4d-8e41-433d-b316-d1e6b8408de3))
+      (net 1239 "/CHRG_SDA") (pintype "passive") (tstamp 3a6c6f4d-8e41-433d-b316-d1e6b8408de3))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4831,9 +4823,9 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7bcee86a-0001-4a90-b7c8-81b215948a04))
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1213 "/CPU_POWER/SW18") (pintype "passive") (tstamp 790a425a-8551-4e92-be6a-9a3a806c2fa1))
+      (net 1205 "/CPU_POWER/SW18") (pintype "passive") (tstamp 790a425a-8551-4e92-be6a-9a3a806c2fa1))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1205 "/CPU_POWER/B18") (pintype "passive") (tstamp da9dfdc1-0838-4733-b601-760a2a65ee9d))
+      (net 1197 "/CPU_POWER/B18") (pintype "passive") (tstamp da9dfdc1-0838-4733-b601-760a2a65ee9d))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4883,9 +4875,9 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 86e55f3d-e5d3-4456-9d1d-14d16a524216))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 89d8060f-5b26-4b0e-8eee-439406a1df5a))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1423 "/VCCINAUX/V2") (pintype "passive") (tstamp 26ada8e1-8200-4079-b562-51eb9a22fceb))
+      (net 1415 "/VCCINAUX/V2") (pintype "passive") (tstamp 26ada8e1-8200-4079-b562-51eb9a22fceb))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1424 "/VCCINAUX/V1") (pintype "passive") (tstamp 8ccd9bf3-f81a-4f14-a716-48ce3629bce3))
+      (net 1416 "/VCCINAUX/V1") (pintype "passive") (tstamp 8ccd9bf3-f81a-4f14-a716-48ce3629bce3))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -4936,9 +4928,9 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp dbf265f0-a6f6-40f5-ab21-7a9bebb3c4c1))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 835ea49a-7ff6-4bd9-a57c-f153158a2049))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1388 "Net-(Q8-G)") (pintype "passive") (tstamp f010026d-c3d0-4a5b-9ae7-030e85faeff7))
+      (net 1380 "Net-(Q8-G)") (pintype "passive") (tstamp f010026d-c3d0-4a5b-9ae7-030e85faeff7))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1245 "/CHARGER/VIN") (pintype "passive") (tstamp fe87a028-5cd9-465e-8b8f-90e60a51ad9e))
+      (net 1237 "/CHARGER/VIN") (pintype "passive") (tstamp fe87a028-5cd9-465e-8b8f-90e60a51ad9e))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5054,27 +5046,27 @@
     (fp_line (start 1.3 1.3) (end -1.3 1.3)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b4359637-5d8a-4bb6-8c7e-1871fb32647e))
     (pad "1" smd roundrect (at -1.25 -0.8) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1334 "/USBC0/~{PROT_FLT}") (pinfunction "FRS") (pintype "output") (tstamp a1835e99-8fa4-471e-9aa9-7415cfd895cd))
+      (net 1326 "/USBC0/~{PROT_FLT}") (pinfunction "FRS") (pintype "output") (tstamp a1835e99-8fa4-471e-9aa9-7415cfd895cd))
     (pad "2" smd roundrect (at -1.25 -0.4) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1402 "/USBC0/SINK") (pinfunction "SNK") (pintype "output") (tstamp 2adc4ab3-c227-4c08-8d80-c505d4129dcd))
+      (net 1394 "/USBC0/SINK") (pinfunction "SNK") (pintype "output") (tstamp 2adc4ab3-c227-4c08-8d80-c505d4129dcd))
     (pad "3" smd roundrect (at -1.25 0) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 4 "+3V3") (pinfunction "VDD") (pintype "power_in") (tstamp b0d400f4-210f-4d65-8500-184698d487ba))
     (pad "4" smd roundrect (at -1.25 0.4) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 71 "/USBC0/BYP") (pinfunction "BYPASS") (pintype "power_out") (tstamp 3888b72e-db95-4948-b691-f70a99aebb97))
     (pad "5" smd roundrect (at -1.25 0.8) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1336 "/USBC0/PHYADDR") (pinfunction "ADDR") (pintype "input+no_connect") (tstamp 01e92691-5e4e-4d7b-aa2f-7e3c575dd5f6))
+      (net 1328 "/USBC0/PHYADDR") (pinfunction "ADDR") (pintype "input+no_connect") (tstamp 01e92691-5e4e-4d7b-aa2f-7e3c575dd5f6))
     (pad "6" smd roundrect (at -0.4 1.25) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1337 "/USBC0/EN_CHARGE") (pinfunction "ILIM") (pintype "bidirectional") (tstamp eb85a24d-abbd-4904-b49e-2bdabac46889))
+      (net 1329 "/USBC0/EN_CHARGE") (pinfunction "ILIM") (pintype "bidirectional") (tstamp eb85a24d-abbd-4904-b49e-2bdabac46889))
     (pad "7" smd roundrect (at 0 1.25) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1353 "/C_LEFT_SDA") (pinfunction "SDA") (pintype "bidirectional") (tstamp fa92cc3c-41f4-47c8-a510-1b6900b01416))
+      (net 1345 "/C_LEFT_SDA") (pinfunction "SDA") (pintype "bidirectional") (tstamp fa92cc3c-41f4-47c8-a510-1b6900b01416))
     (pad "8" smd roundrect (at 0.4 1.25) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1338 "/C_LEFT_SCL") (pinfunction "SCL") (pintype "bidirectional") (tstamp dec7ac3b-268b-46b2-a58f-25b023124ec4))
+      (net 1330 "/C_LEFT_SCL") (pinfunction "SCL") (pintype "bidirectional") (tstamp dec7ac3b-268b-46b2-a58f-25b023124ec4))
     (pad "9" smd roundrect (at 1.25 0.8) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1340 "/USBC0/~{DEBUG}") (pinfunction "~{DBG}") (pintype "output") (tstamp b34ae3f8-49bf-4278-9d96-cc838c5f9ea2))
+      (net 1332 "/USBC0/~{DEBUG}") (pinfunction "~{DBG}") (pintype "output") (tstamp b34ae3f8-49bf-4278-9d96-cc838c5f9ea2))
     (pad "10" smd roundrect (at 1.25 0.4) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1341 "/~{C_LEFT_INT}") (pinfunction "~{INT}") (pintype "open_collector") (tstamp eacfadcd-9bd8-4c6a-811c-078bd6c185fe))
+      (net 1333 "/~{C_LEFT_INT}") (pinfunction "~{INT}") (pintype "open_collector") (tstamp eacfadcd-9bd8-4c6a-811c-078bd6c185fe))
     (pad "11" smd roundrect (at 1.25 0) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1382 "/USBC0/~{FAULT}") (pinfunction "~{FAULT}") (pintype "input") (tstamp abc57a76-4172-4cdd-b7f3-8309aba3f39b))
+      (net 1374 "/USBC0/~{FAULT}") (pinfunction "~{FAULT}") (pintype "input") (tstamp abc57a76-4172-4cdd-b7f3-8309aba3f39b))
     (pad "12" smd roundrect (at 1.25 -0.4) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 104 "+5V") (pinfunction "VCONN") (pintype "power_in") (tstamp 40ae0b33-468c-472a-be3e-b6c99c0d96a7))
     (pad "13" smd roundrect (at 1.25 -0.8) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -5084,7 +5076,7 @@
     (pad "15" smd roundrect (at 0 -1.25) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 75 "/USBC0/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp d0ee986d-45ac-48ac-9a5c-642a0be023ed))
     (pad "16" smd roundrect (at -0.4 -1.25) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1394 "/USBC0/SOURCE") (pinfunction "SRC") (pintype "output") (tstamp 58e1d38c-7ea4-4eab-bb69-5e956da23799))
+      (net 1386 "/USBC0/SOURCE") (pinfunction "SRC") (pintype "output") (tstamp 58e1d38c-7ea4-4eab-bb69-5e956da23799))
     (pad "17" smd roundrect (at 0 0) (size 1.1 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (solder_paste_margin -0.25) (tstamp 3f4c5629-8b49-42ed-8c8d-381de232c1d8))
     (model "${KIPRJMOD}/models/PTN5110.step"
@@ -5144,7 +5136,7 @@
     (pad "1" smd roundrect (at -0.32 0 90) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 47ea5e44-3a28-4e2f-bb78-5f0d634feb46))
     (pad "2" smd roundrect (at 0.32 0 90) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1313 "/USBC2/TXC1+") (pinfunction "A2") (pintype "passive") (tstamp df84528c-5281-47f0-ae44-560d9a7d8601))
+      (net 1305 "/USBC2/TXC1+") (pinfunction "A2") (pintype "passive") (tstamp df84528c-5281-47f0-ae44-560d9a7d8601))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5193,9 +5185,9 @@
     (fp_line (start 0.3 0.15) (end -0.3 0.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d1e4f900-7b92-4cd9-a6ba-deaecb131cc8))
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1303 "/USBC0/TXC1-") (pintype "passive") (tstamp 991e4000-d03b-42b0-8ba3-09ea295cdde1))
+      (net 1295 "/USBC0/TXC1-") (pintype "passive") (tstamp 991e4000-d03b-42b0-8ba3-09ea295cdde1))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1302 "/USBC0/TXJ1-") (pintype "passive") (tstamp c41dcedc-919d-48c5-bd42-f7625afdb76e))
+      (net 1294 "/USBC0/TXJ1-") (pintype "passive") (tstamp c41dcedc-919d-48c5-bd42-f7625afdb76e))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5246,7 +5238,7 @@
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 3943f29c-d7fa-40f0-9db0-0ecc1606f9a1))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1359 "/USBC1/VB_ESD") (pintype "passive") (tstamp acd22d06-0cf1-4ce5-b923-e4dd72f5b1d4))
+      (net 1351 "/USBC1/VB_ESD") (pintype "passive") (tstamp acd22d06-0cf1-4ce5-b923-e4dd72f5b1d4))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5295,9 +5287,9 @@
     (fp_line (start 0.3 0.15) (end -0.3 0.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 58403d32-e6a2-4188-9d3a-e2b846abf0a2))
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1313 "/USBC2/TXC1+") (pintype "passive") (tstamp 9698e727-262b-4938-a553-f106b51f830d))
+      (net 1305 "/USBC2/TXC1+") (pintype "passive") (tstamp 9698e727-262b-4938-a553-f106b51f830d))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1312 "/USBC2/TXJ1+") (pintype "passive") (tstamp 74a5f084-d73c-4522-8ef1-c771067c2b48))
+      (net 1304 "/USBC2/TXJ1+") (pintype "passive") (tstamp 74a5f084-d73c-4522-8ef1-c771067c2b48))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5355,11 +5347,11 @@
     (fp_line (start 0.67 1.1) (end -0.68 1.1)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0454ce36-298b-4fca-9965-aeda3a5ff506))
     (pad "1" smd rect (at -1 -0.65 270) (size 0.45 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1408 "Net-(D36-Pad1)") (pintype "passive") (tstamp f837d97a-39a0-433f-ab7b-36cc21c9c0a3))
+      (net 1400 "Net-(D36-Pad1)") (pintype "passive") (tstamp f837d97a-39a0-433f-ab7b-36cc21c9c0a3))
     (pad "2" smd rect (at -1 0.65 270) (size 0.45 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1246 "+3.3V") (pintype "passive") (tstamp e2ac0ac6-19fe-465a-bd6a-36ae330d1e3c))
+      (net 1238 "+3.3V") (pintype "passive") (tstamp e2ac0ac6-19fe-465a-bd6a-36ae330d1e3c))
     (pad "3" smd rect (at 1 0 270) (size 0.45 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1409 "/EC/VBAT") (pintype "passive") (tstamp b3808cbd-b0ee-4230-b716-1769d6f99ab1))
+      (net 1401 "/EC/VBAT") (pintype "passive") (tstamp b3808cbd-b0ee-4230-b716-1769d6f99ab1))
     (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-323_SC-70.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5425,9 +5417,9 @@
     (fp_line (start 1.3 1.3) (end -1.3 1.3)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7c4c6de1-5c29-4497-bf69-17f02600ac72))
     (pad "1" smd roundrect (at -1.25 -0.8) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1342 "/USBC1/~{PROT_FLT}") (pinfunction "FRS") (pintype "output") (tstamp 6f0a458c-525d-4c01-91b7-753175f4afc3))
+      (net 1334 "/USBC1/~{PROT_FLT}") (pinfunction "FRS") (pintype "output") (tstamp 6f0a458c-525d-4c01-91b7-753175f4afc3))
     (pad "2" smd roundrect (at -1.25 -0.4) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1403 "/USBC1/SINK") (pinfunction "SNK") (pintype "output") (tstamp 7cb75815-7882-4b8b-abe1-47c8aa6aef18))
+      (net 1395 "/USBC1/SINK") (pinfunction "SNK") (pintype "output") (tstamp 7cb75815-7882-4b8b-abe1-47c8aa6aef18))
     (pad "3" smd roundrect (at -1.25 0) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 4 "+3V3") (pinfunction "VDD") (pintype "power_in") (tstamp 6fd9ab28-cbc0-49ce-a773-d0c0674d223e))
     (pad "4" smd roundrect (at -1.25 0.4) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -5435,17 +5427,17 @@
     (pad "5" smd roundrect (at -1.25 0.8) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "ADDR") (pintype "input") (tstamp 6ce6be1e-3405-4c31-ab66-34c9c2920af8))
     (pad "6" smd roundrect (at -0.4 1.25) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1345 "/USBC1/EN_CHARGE") (pinfunction "ILIM") (pintype "bidirectional") (tstamp 9b014795-403e-45fd-83d6-43f069894a8e))
+      (net 1337 "/USBC1/EN_CHARGE") (pinfunction "ILIM") (pintype "bidirectional") (tstamp 9b014795-403e-45fd-83d6-43f069894a8e))
     (pad "7" smd roundrect (at 0 1.25) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1353 "/C_LEFT_SDA") (pinfunction "SDA") (pintype "bidirectional") (tstamp 8b310276-0e48-4205-9f74-8ad76acd4cbc))
+      (net 1345 "/C_LEFT_SDA") (pinfunction "SDA") (pintype "bidirectional") (tstamp 8b310276-0e48-4205-9f74-8ad76acd4cbc))
     (pad "8" smd roundrect (at 0.4 1.25) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1338 "/C_LEFT_SCL") (pinfunction "SCL") (pintype "bidirectional") (tstamp 2b0299b2-fdca-4542-aadc-6be194b5c0bb))
+      (net 1330 "/C_LEFT_SCL") (pinfunction "SCL") (pintype "bidirectional") (tstamp 2b0299b2-fdca-4542-aadc-6be194b5c0bb))
     (pad "9" smd roundrect (at 1.25 0.8) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1346 "/USBC1/~{DEBUG}") (pinfunction "~{DBG}") (pintype "output") (tstamp 310b70b9-8186-455c-a403-1806ac7a1392))
+      (net 1338 "/USBC1/~{DEBUG}") (pinfunction "~{DBG}") (pintype "output") (tstamp 310b70b9-8186-455c-a403-1806ac7a1392))
     (pad "10" smd roundrect (at 1.25 0.4) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1341 "/~{C_LEFT_INT}") (pinfunction "~{INT}") (pintype "open_collector") (tstamp 3989d9a6-453e-47af-9821-5a8b8008ab13))
+      (net 1333 "/~{C_LEFT_INT}") (pinfunction "~{INT}") (pintype "open_collector") (tstamp 3989d9a6-453e-47af-9821-5a8b8008ab13))
     (pad "11" smd roundrect (at 1.25 0) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1383 "/USBC1/~{FAULT}") (pinfunction "~{FAULT}") (pintype "input") (tstamp 232d2fb2-0492-4a86-bdc1-496ea37a405a))
+      (net 1375 "/USBC1/~{FAULT}") (pinfunction "~{FAULT}") (pintype "input") (tstamp 232d2fb2-0492-4a86-bdc1-496ea37a405a))
     (pad "12" smd roundrect (at 1.25 -0.4) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 104 "+5V") (pinfunction "VCONN") (pintype "power_in") (tstamp 1abe7f32-7efc-487a-af7c-5be4a0ce7599))
     (pad "13" smd roundrect (at 1.25 -0.8) (size 0.7 0.23) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -5455,7 +5447,7 @@
     (pad "15" smd roundrect (at 0 -1.25) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 78 "/USBC1/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp be0f7959-4ce0-489a-9f8a-14824d3e46f8))
     (pad "16" smd roundrect (at -0.4 -1.25) (size 0.23 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1395 "/USBC1/SOURCE") (pinfunction "SRC") (pintype "output") (tstamp 7cc53910-bf3e-4119-a043-85a79068a595))
+      (net 1387 "/USBC1/SOURCE") (pinfunction "SRC") (pintype "output") (tstamp 7cc53910-bf3e-4119-a043-85a79068a595))
     (pad "17" smd roundrect (at 0 0) (size 1.1 1) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.15)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (solder_paste_margin -0.25) (tstamp b3894387-51c2-4fa4-8e09-af9cd306b302))
     (model "${KIPRJMOD}/models/PTN5110.step"
@@ -5515,7 +5507,7 @@
     (pad "1" smd roundrect (at -0.32 0 270) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp f22ba5dc-fff0-4851-b4fd-0344aa5bd684))
     (pad "2" smd roundrect (at 0.32 0 270) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1297 "/USBC2/RXC2+") (pinfunction "A2") (pintype "passive") (tstamp c9625b3b-88ed-4bfc-8ca3-be91578a7c2c))
+      (net 1289 "/USBC2/RXC2+") (pinfunction "A2") (pintype "passive") (tstamp c9625b3b-88ed-4bfc-8ca3-be91578a7c2c))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5566,7 +5558,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 28c87c9f-3bed-47ae-9e3d-ae0e5678b031))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 3e7a9271-f807-4f27-9264-cfdc907890da))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1351 "/USBC2/EN_CHARGE") (pintype "passive") (tstamp 3dd723c0-468a-4ca5-9718-c6b37486db61))
+      (net 1343 "/USBC2/EN_CHARGE") (pintype "passive") (tstamp 3dd723c0-468a-4ca5-9718-c6b37486db61))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp aeba898f-fa67-4c5c-82e8-8e792af2659d))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -5626,7 +5618,7 @@
     (pad "1" smd roundrect (at -0.32 0 270) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 49161d53-460b-4ee7-a244-70e382a281b0))
     (pad "2" smd roundrect (at 0.32 0 270) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1305 "/USBC0/TXC1+") (pinfunction "A2") (pintype "passive") (tstamp be8740b2-3286-4d0a-8b93-a8f8b3752219))
+      (net 1297 "/USBC0/TXC1+") (pinfunction "A2") (pintype "passive") (tstamp be8740b2-3286-4d0a-8b93-a8f8b3752219))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5679,7 +5671,7 @@
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 71 "/USBC0/BYP") (pintype "passive") (tstamp 99a63f23-9f11-4679-ad2e-f579985b9b9d))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1382 "/USBC0/~{FAULT}") (pintype "passive") (tstamp 1c801d8c-e1fa-40d5-a7a9-872751efc8a4))
+      (net 1374 "/USBC0/~{FAULT}") (pintype "passive") (tstamp 1c801d8c-e1fa-40d5-a7a9-872751efc8a4))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5908,9 +5900,9 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f53c12fc-1af4-4bd2-89a5-1df1a89f209a))
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1214 "/CPU_POWER/SW11") (pintype "passive") (tstamp 30960728-9500-4964-a655-4dc88289b619))
+      (net 1206 "/CPU_POWER/SW11") (pintype "passive") (tstamp 30960728-9500-4964-a655-4dc88289b619))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1215 "/CPU_POWER/B11") (pintype "passive") (tstamp 9d57b4e5-fcc2-4ae8-b69f-9b6fa9315e84))
+      (net 1207 "/CPU_POWER/B11") (pintype "passive") (tstamp 9d57b4e5-fcc2-4ae8-b69f-9b6fa9315e84))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -5972,15 +5964,15 @@
     (pad "" smd rect (at 1.44 0.33) (size 0.63 0.5) (layers "F.Paste") (tstamp 40f7381c-8005-4d0a-9470-272deea9a241))
     (pad "" smd rect (at 1.44 0.9725) (size 0.63 0.505) (layers "F.Paste") (tstamp 5c6d290c-83a3-41c1-a0de-b97607c0b1a6))
     (pad "1" smd rect (at -1.44 -0.97) (size 0.63 0.5) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1226 "/CHARGER/SW2") (pinfunction "S") (pintype "passive") (tstamp 9c080ecf-44d1-4569-b4e6-369b81d30e62))
+      (net 1218 "/CHARGER/SW2") (pinfunction "S") (pintype "passive") (tstamp 9c080ecf-44d1-4569-b4e6-369b81d30e62))
     (pad "2" smd rect (at -1.44 -0.33) (size 0.63 0.5) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1226 "/CHARGER/SW2") (pinfunction "S") (pintype "passive") (tstamp 93bbde3d-72f9-4ea6-8e01-11d5d3fa37ac))
+      (net 1218 "/CHARGER/SW2") (pinfunction "S") (pintype "passive") (tstamp 93bbde3d-72f9-4ea6-8e01-11d5d3fa37ac))
     (pad "3" smd rect (at -1.44 0.33) (size 0.63 0.5) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1226 "/CHARGER/SW2") (pinfunction "S") (pintype "passive") (tstamp cc4b44da-6d3d-4f89-8f6c-69ecbd8e0cc5))
+      (net 1218 "/CHARGER/SW2") (pinfunction "S") (pintype "passive") (tstamp cc4b44da-6d3d-4f89-8f6c-69ecbd8e0cc5))
     (pad "4" smd rect (at -1.44 0.97) (size 0.63 0.5) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1233 "/CHARGER/HIDRV2") (pinfunction "G") (pintype "passive") (tstamp 55759338-bcf6-4f6f-b849-6b2eca64bef6))
+      (net 1225 "/CHARGER/HIDRV2") (pinfunction "G") (pintype "passive") (tstamp 55759338-bcf6-4f6f-b849-6b2eca64bef6))
     (pad "5" smd custom (at 0.385 0) (size 1.9 2.45) (layers "F.Cu" "F.Mask")
-      (net 1234 "/CHARGER/VSYS") (pinfunction "D") (pintype "passive") (thermal_bridge_angle 45)
+      (net 1226 "/CHARGER/VSYS") (pinfunction "D") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -6052,9 +6044,9 @@
     (fp_line (start 0.3 0.15) (end -0.3 0.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 65c8f933-a65f-4524-9082-85ced6a85a48))
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1291 "/USBC1/RXC2-") (pintype "passive") (tstamp a875b398-09df-4c71-b68d-8583ab62a662))
+      (net 1283 "/USBC1/RXC2-") (pintype "passive") (tstamp a875b398-09df-4c71-b68d-8583ab62a662))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1290 "/USBC1/RXJ2-") (pintype "passive") (tstamp ddadac41-01e2-4359-9099-66403852bfd4))
+      (net 1282 "/USBC1/RXJ2-") (pintype "passive") (tstamp ddadac41-01e2-4359-9099-66403852bfd4))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6232,23 +6224,23 @@
     (pad "" smd rect (at 1.94 0.55 90) (size 0.9 0.78) (layers "F.Paste") (tstamp f851e2b0-95c6-4f27-8bf6-ab67a0117106))
     (pad "" smd rect (at 1.94 1.65 90) (size 0.9 0.78) (layers "F.Paste") (tstamp 7ce45bed-2392-4a67-8c66-33c905f7ffe3))
     (pad "1" smd rect (at -2.75 -1.905 90) (size 0.5 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1245 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp a32a43a1-ae2e-46aa-9087-d6770432bd15))
+      (net 1237 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp a32a43a1-ae2e-46aa-9087-d6770432bd15))
     (pad "2" smd rect (at -2.75 -0.635 90) (size 0.5 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1245 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 71aa5ad4-55ca-4fd9-bb27-0c04f79ac24c))
+      (net 1237 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 71aa5ad4-55ca-4fd9-bb27-0c04f79ac24c))
     (pad "3" smd rect (at -2.75 0.635 90) (size 0.5 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1245 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 91d8f518-0bf6-4ad7-b5fc-6eecc19cab48))
+      (net 1237 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 91d8f518-0bf6-4ad7-b5fc-6eecc19cab48))
     (pad "4" smd rect (at -2.75 1.905 90) (size 0.5 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1389 "Net-(Q9-G)") (pinfunction "G") (pintype "input") (tstamp 1f298a8e-1da9-4769-8ec9-aecd2e64c7ac))
+      (net 1381 "Net-(Q9-G)") (pinfunction "G") (pintype "input") (tstamp 1f298a8e-1da9-4769-8ec9-aecd2e64c7ac))
     (pad "5" smd rect (at 0.465 0 90) (size 4.6 4.12) (layers "F.Cu" "F.Mask")
-      (net 1355 "/USBC3/PPHV") (pinfunction "D") (pintype "passive") (tstamp 0bf393ad-b73b-45ed-9470-5525f8db1213))
+      (net 1347 "/USBC3/PPHV") (pinfunction "D") (pintype "passive") (tstamp 0bf393ad-b73b-45ed-9470-5525f8db1213))
     (pad "5" smd rect (at 2.8 -1.905 90) (size 0.5 0.55) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1355 "/USBC3/PPHV") (pinfunction "D") (pintype "passive") (tstamp 907c38c3-c73b-4b4c-a770-2b7b04821d26))
+      (net 1347 "/USBC3/PPHV") (pinfunction "D") (pintype "passive") (tstamp 907c38c3-c73b-4b4c-a770-2b7b04821d26))
     (pad "5" smd rect (at 2.8 -0.635 90) (size 0.5 0.55) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1355 "/USBC3/PPHV") (pinfunction "D") (pintype "passive") (tstamp 0861b71a-84b3-400a-9638-9171dcc9e5c8))
+      (net 1347 "/USBC3/PPHV") (pinfunction "D") (pintype "passive") (tstamp 0861b71a-84b3-400a-9638-9171dcc9e5c8))
     (pad "5" smd rect (at 2.8 0.635 90) (size 0.5 0.55) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1355 "/USBC3/PPHV") (pinfunction "D") (pintype "passive") (tstamp eea4ac00-26cc-4ff7-8b90-ac8738b9fc37))
+      (net 1347 "/USBC3/PPHV") (pinfunction "D") (pintype "passive") (tstamp eea4ac00-26cc-4ff7-8b90-ac8738b9fc37))
     (pad "5" smd rect (at 2.8 1.905 90) (size 0.5 0.55) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1355 "/USBC3/PPHV") (pinfunction "D") (pintype "passive") (tstamp 874d4510-e721-44ab-9835-3b98d37083f4))
+      (net 1347 "/USBC3/PPHV") (pinfunction "D") (pintype "passive") (tstamp 874d4510-e721-44ab-9835-3b98d37083f4))
     (model "${KICAD6_3DMODEL_DIR}/Package_DFN_QFN.3dshapes/AO_DFN-8-1EP_5.55x5.2mm_P1.27mm_EP4.12x4.6mm.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6354,7 +6346,7 @@
     (pad "1" smd roundrect (at -0.7 0 270) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp a27bb025-b6d9-4414-9ac1-cae981dc93b0))
     (pad "2" smd roundrect (at 0.7 0 270) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp 1b38713d-3a80-4db6-b70c-b1c59537d022))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp 1b38713d-3a80-4db6-b70c-b1c59537d022))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6458,7 +6450,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c5922769-74c9-402b-908c-b2bb4f401320))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1234 "/CHARGER/VSYS") (pintype "passive") (tstamp 2ed86aea-0b4d-453a-9713-9adffc4ea7c3))
+      (net 1226 "/CHARGER/VSYS") (pintype "passive") (tstamp 2ed86aea-0b4d-453a-9713-9adffc4ea7c3))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 4f5668a9-7641-4ac9-ab44-b774b54e7af0))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -6513,7 +6505,7 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp cbe2f4f0-de2c-4f13-b75f-5e957a115908))
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1252 "/CHARGER/IBAT") (pintype "passive") (tstamp 36c8bb7d-4442-4906-9a13-6c2d44091942))
+      (net 1244 "/CHARGER/IBAT") (pintype "passive") (tstamp 36c8bb7d-4442-4906-9a13-6c2d44091942))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 1854e7de-dce9-4291-9014-c0456433157c))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -6575,49 +6567,49 @@
     (pad "A1" smd rect (at -2.75 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp cc95c67b-724b-4b6f-859e-3b51672c9b9b))
     (pad "A2" smd rect (at -2.25 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1304 "/USBC0/TXJ1+") (pinfunction "TX1+") (pintype "bidirectional") (tstamp 7fa61ad9-b84a-437f-ad30-ea69887c8005))
+      (net 1296 "/USBC0/TXJ1+") (pinfunction "TX1+") (pintype "bidirectional") (tstamp 7fa61ad9-b84a-437f-ad30-ea69887c8005))
     (pad "A3" smd rect (at -1.75 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1302 "/USBC0/TXJ1-") (pinfunction "TX1-") (pintype "bidirectional") (tstamp a346df63-9b0e-4af5-b6ec-3497176ceb2e))
+      (net 1294 "/USBC0/TXJ1-") (pinfunction "TX1-") (pintype "bidirectional") (tstamp a346df63-9b0e-4af5-b6ec-3497176ceb2e))
     (pad "A4" smd rect (at -1.25 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 75 "/USBC0/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 72101b08-ff9f-46cd-8f8a-15ff946ebbee))
     (pad "A5" smd rect (at -0.75 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1362 "/USBC0/C_CC1") (pinfunction "CC1") (pintype "bidirectional") (tstamp 24cae012-fd6f-487b-8b41-5ecc074a817f))
+      (net 1354 "/USBC0/C_CC1") (pinfunction "CC1") (pintype "bidirectional") (tstamp 24cae012-fd6f-487b-8b41-5ecc074a817f))
     (pad "A6" smd rect (at -0.25 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 457 "/CPU_USB/USBC0.D+") (pinfunction "D+") (pintype "bidirectional") (tstamp 71675590-1794-4903-b0f3-22309042e493))
     (pad "A7" smd rect (at 0.25 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 458 "/CPU_USB/USBC0.D-") (pinfunction "D-") (pintype "bidirectional") (tstamp aeeea886-1a50-47b1-b70b-977b7fd9b2fd))
     (pad "A8" smd rect (at 0.75 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1363 "/USBC0/C_SBU1") (pinfunction "SBU1") (pintype "bidirectional") (tstamp b815e852-3a28-41fa-a30b-0a7d5d0910e1))
+      (net 1355 "/USBC0/C_SBU1") (pinfunction "SBU1") (pintype "bidirectional") (tstamp b815e852-3a28-41fa-a30b-0a7d5d0910e1))
     (pad "A9" smd rect (at 1.25 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 75 "/USBC0/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 7d487429-2ff4-4f84-a074-9e80d377df4a))
     (pad "A10" smd rect (at 1.75 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1286 "/USBC0/RXJ2-") (pinfunction "RX2-") (pintype "bidirectional") (tstamp 42f0a8f7-6ab4-424d-b823-2fca925a91fe))
+      (net 1278 "/USBC0/RXJ2-") (pinfunction "RX2-") (pintype "bidirectional") (tstamp 42f0a8f7-6ab4-424d-b823-2fca925a91fe))
     (pad "A11" smd rect (at 2.25 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1288 "/USBC0/RXJ2+") (pinfunction "RX2+") (pintype "bidirectional") (tstamp 4287e4bb-6aab-4436-bb52-8442aa625dc0))
+      (net 1280 "/USBC0/RXJ2+") (pinfunction "RX2+") (pintype "bidirectional") (tstamp 4287e4bb-6aab-4436-bb52-8442aa625dc0))
     (pad "A12" smd rect (at 2.75 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp 6ba4d72b-ab70-408d-90c2-bed681192f75))
     (pad "B1" smd rect (at 2.5 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp 7ef8d613-19da-4a92-af6f-cf0b2d33167f))
     (pad "B2" smd rect (at 2 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1320 "/USBC0/TXJ2+") (pinfunction "TX2+") (pintype "bidirectional") (tstamp 597134b3-13dd-41ad-a1b7-24e8646b9559))
+      (net 1312 "/USBC0/TXJ2+") (pinfunction "TX2+") (pintype "bidirectional") (tstamp 597134b3-13dd-41ad-a1b7-24e8646b9559))
     (pad "B3" smd rect (at 1.5 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1318 "/USBC0/TXJ2-") (pinfunction "TX2-") (pintype "bidirectional") (tstamp 60675c18-1849-48f9-b92a-286e05251f75))
+      (net 1310 "/USBC0/TXJ2-") (pinfunction "TX2-") (pintype "bidirectional") (tstamp 60675c18-1849-48f9-b92a-286e05251f75))
     (pad "B4" smd rect (at 1 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 75 "/USBC0/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 23939b01-3a24-4794-aeac-349fb0b286d5))
     (pad "B5" smd rect (at 0.5 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1364 "/USBC0/C_CC2") (pinfunction "CC2") (pintype "bidirectional") (tstamp e0a828d5-d9d1-43ed-ac19-21bf01a6c1c8))
+      (net 1356 "/USBC0/C_CC2") (pinfunction "CC2") (pintype "bidirectional") (tstamp e0a828d5-d9d1-43ed-ac19-21bf01a6c1c8))
     (pad "B6" smd rect (at 0 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 457 "/CPU_USB/USBC0.D+") (pinfunction "D+") (pintype "bidirectional") (tstamp 1f8ead52-4e79-4308-b76e-609cd92f1626))
     (pad "B7" smd rect (at -0.5 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 458 "/CPU_USB/USBC0.D-") (pinfunction "D-") (pintype "bidirectional") (tstamp 7034fcae-324f-498d-94e9-b1393cac1ad9))
     (pad "B8" smd rect (at -1 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1365 "/USBC0/C_SBU2") (pinfunction "SBU2") (pintype "bidirectional") (tstamp aa38b33b-2500-479d-a9d1-005f6d409ff9))
+      (net 1357 "/USBC0/C_SBU2") (pinfunction "SBU2") (pintype "bidirectional") (tstamp aa38b33b-2500-479d-a9d1-005f6d409ff9))
     (pad "B9" smd rect (at -1.5 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 75 "/USBC0/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 6ce3e7ff-dc3e-47f3-a87f-299534b6b2b9))
     (pad "B10" smd rect (at -2 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1270 "/USBC0/RXJ1-") (pinfunction "RX1-") (pintype "bidirectional") (tstamp 5e2fcfd8-9b15-4657-9357-832be6488a33))
+      (net 1262 "/USBC0/RXJ1-") (pinfunction "RX1-") (pintype "bidirectional") (tstamp 5e2fcfd8-9b15-4657-9357-832be6488a33))
     (pad "B11" smd rect (at -2.5 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1278 "/USBC0/RXJ1+") (pinfunction "RX1+") (pintype "bidirectional") (tstamp 1f300bbd-96f4-4293-8994-fade5f8918f0))
+      (net 1270 "/USBC0/RXJ1+") (pinfunction "RX1+") (pintype "bidirectional") (tstamp 1f300bbd-96f4-4293-8994-fade5f8918f0))
     (pad "B12" smd rect (at -3 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp b32c52fe-64cc-42e2-99c0-1c601e11301b))
     (pad "S1" smd roundrect (at -5 2.85 270) (size 1 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -6694,7 +6686,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 35d836f9-c533-4184-98a5-e34e0b073f90))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp d8d24dfb-4274-45c9-b11e-63349c8ae765))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1302 "/USBC0/TXJ1-") (pintype "passive") (tstamp bdfe1563-dda3-49c0-9af9-40e691d26497))
+      (net 1294 "/USBC0/TXJ1-") (pintype "passive") (tstamp bdfe1563-dda3-49c0-9af9-40e691d26497))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 3355dcce-adb9-4533-8f43-d6b9031153c9))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -6766,23 +6758,23 @@
     (pad "" smd rect (at 1.94 0.55 270) (size 0.9 0.78) (layers "F.Paste") (tstamp 6dc79920-5eb7-4818-b8b3-c29c2933b219))
     (pad "" smd rect (at 1.94 1.65 270) (size 0.9 0.78) (layers "F.Paste") (tstamp 97d18433-70d4-4638-a03d-10811f55a1e8))
     (pad "1" smd rect (at -2.75 -1.905 270) (size 0.5 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1245 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 686c5c0e-ae86-4a20-a124-cd2ecde2fd72))
+      (net 1237 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 686c5c0e-ae86-4a20-a124-cd2ecde2fd72))
     (pad "2" smd rect (at -2.75 -0.635 270) (size 0.5 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1245 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 111afaa3-e217-41cc-9b9c-564aa469a08b))
+      (net 1237 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 111afaa3-e217-41cc-9b9c-564aa469a08b))
     (pad "3" smd rect (at -2.75 0.635 270) (size 0.5 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1245 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 236b02cf-e4d0-4cec-a8a7-5b0bb9c70758))
+      (net 1237 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 236b02cf-e4d0-4cec-a8a7-5b0bb9c70758))
     (pad "4" smd rect (at -2.75 1.905 270) (size 0.5 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1387 "Net-(Q7-G)") (pinfunction "G") (pintype "input") (tstamp 64ea8767-fd95-47cf-9341-6da4e1626184))
+      (net 1379 "Net-(Q7-G)") (pinfunction "G") (pintype "input") (tstamp 64ea8767-fd95-47cf-9341-6da4e1626184))
     (pad "5" smd rect (at 0.465 0 270) (size 4.6 4.12) (layers "F.Cu" "F.Mask")
-      (net 1343 "/USBC1/PPHV") (pinfunction "D") (pintype "passive") (tstamp a786319e-8b5b-4c74-a8f9-391a82bc77a6))
+      (net 1335 "/USBC1/PPHV") (pinfunction "D") (pintype "passive") (tstamp a786319e-8b5b-4c74-a8f9-391a82bc77a6))
     (pad "5" smd rect (at 2.8 -1.905 270) (size 0.5 0.55) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1343 "/USBC1/PPHV") (pinfunction "D") (pintype "passive") (tstamp a934bd01-70da-4e5d-8aa4-67dbba4daec8))
+      (net 1335 "/USBC1/PPHV") (pinfunction "D") (pintype "passive") (tstamp a934bd01-70da-4e5d-8aa4-67dbba4daec8))
     (pad "5" smd rect (at 2.8 -0.635 270) (size 0.5 0.55) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1343 "/USBC1/PPHV") (pinfunction "D") (pintype "passive") (tstamp 09726f71-ba9a-4754-a242-baa30ff229df))
+      (net 1335 "/USBC1/PPHV") (pinfunction "D") (pintype "passive") (tstamp 09726f71-ba9a-4754-a242-baa30ff229df))
     (pad "5" smd rect (at 2.8 0.635 270) (size 0.5 0.55) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1343 "/USBC1/PPHV") (pinfunction "D") (pintype "passive") (tstamp d21f6ca8-f765-43f2-8103-e617e7f52b71))
+      (net 1335 "/USBC1/PPHV") (pinfunction "D") (pintype "passive") (tstamp d21f6ca8-f765-43f2-8103-e617e7f52b71))
     (pad "5" smd rect (at 2.8 1.905 270) (size 0.5 0.55) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1343 "/USBC1/PPHV") (pinfunction "D") (pintype "passive") (tstamp 333ec710-1835-482f-a88d-c1a50776c6fc))
+      (net 1335 "/USBC1/PPHV") (pinfunction "D") (pintype "passive") (tstamp 333ec710-1835-482f-a88d-c1a50776c6fc))
     (model "${KICAD6_3DMODEL_DIR}/Package_DFN_QFN.3dshapes/AO_DFN-8-1EP_5.55x5.2mm_P1.27mm_EP4.12x4.6mm.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6832,9 +6824,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 6903a443-4b4c-4fc8-866e-b902e004f8d1))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp df8c4070-53b9-40d4-a796-c74f0a53152d))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1222 "/CPU_POWER/MODE11") (pintype "passive") (tstamp aee09861-7119-4260-8a78-558dfc4ed088))
+      (net 1214 "/CPU_POWER/MODE11") (pintype "passive") (tstamp aee09861-7119-4260-8a78-558dfc4ed088))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1221 "/CPU_POWER/VCC11") (pintype "passive") (tstamp 32dabaef-90ee-40e1-91ea-a43a9c261c52))
+      (net 1213 "/CPU_POWER/VCC11") (pintype "passive") (tstamp 32dabaef-90ee-40e1-91ea-a43a9c261c52))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6938,7 +6930,7 @@
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp fbaa43c3-f4fd-47a3-bc5f-3e847c221368))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1419 "/VCCINAUX/VREF") (pintype "passive") (tstamp 7991ff27-3eb9-484d-af3a-7ffa2ba31cd5))
+      (net 1411 "/VCCINAUX/VREF") (pintype "passive") (tstamp 7991ff27-3eb9-484d-af3a-7ffa2ba31cd5))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -6992,7 +6984,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp f99a148d-3249-4caf-914a-2d1a8a425af6))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp 5055da43-ca68-4205-ac51-97015ae765a6))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp 5055da43-ca68-4205-ac51-97015ae765a6))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7041,9 +7033,9 @@
     (fp_line (start 0.3 0.15) (end -0.3 0.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ca1fc690-5197-48e9-8a4b-c2d51185a099))
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1311 "/USBC2/TXC1-") (pintype "passive") (tstamp d35a4312-53bc-4f94-86b0-5b49c4b7a0c4))
+      (net 1303 "/USBC2/TXC1-") (pintype "passive") (tstamp d35a4312-53bc-4f94-86b0-5b49c4b7a0c4))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1310 "/USBC2/TXJ1-") (pintype "passive") (tstamp 91ec306e-0fc2-4e32-8e55-4975eb87275c))
+      (net 1302 "/USBC2/TXJ1-") (pintype "passive") (tstamp 91ec306e-0fc2-4e32-8e55-4975eb87275c))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7095,7 +7087,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 923f694e-27aa-45a7-898e-e1ebce2f8be3))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1234 "/CHARGER/VSYS") (pintype "passive") (tstamp a2281cc0-fcac-445b-869d-8d1cd1462d85))
+      (net 1226 "/CHARGER/VSYS") (pintype "passive") (tstamp a2281cc0-fcac-445b-869d-8d1cd1462d85))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp aff9c277-76e0-455b-a21a-88a54e97263c))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -7146,9 +7138,9 @@
     (fp_line (start 0.3 0.15) (end -0.3 0.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c0fd6861-dbd0-4ead-a2f8-32d19f41a16c))
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1295 "/USBC2/RXC2-") (pintype "passive") (tstamp c33501b2-6dea-4590-9ad4-5bd377aaee43))
+      (net 1287 "/USBC2/RXC2-") (pintype "passive") (tstamp c33501b2-6dea-4590-9ad4-5bd377aaee43))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1294 "/USBC2/RXJ2-") (pintype "passive") (tstamp 56f98537-f2ce-4d81-a1d7-fb43c21a59b9))
+      (net 1286 "/USBC2/RXJ2-") (pintype "passive") (tstamp 56f98537-f2ce-4d81-a1d7-fb43c21a59b9))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7199,7 +7191,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 5f980fc2-9ee1-4a82-8a93-42075283816a))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 5f4b85d0-c32d-4f27-91f7-9946684925c2))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1342 "/USBC1/~{PROT_FLT}") (pintype "passive") (tstamp e640d9a6-f4a7-4a03-b6d4-f17961f9ccdf))
+      (net 1334 "/USBC1/~{PROT_FLT}") (pintype "passive") (tstamp e640d9a6-f4a7-4a03-b6d4-f17961f9ccdf))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 72 "/USBC1/BYP") (pintype "passive") (tstamp 4c41d8de-1398-4638-a347-a3786bad5b0c))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -7313,9 +7305,9 @@
     (fp_line (start 5.8 5.05) (end 5.8 -5.05)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c39e25cd-b79d-4289-bb8d-82e5cd6f1704))
     (pad "1" smd rect (at -4.75 0 180) (size 3.5 4) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1415 "Net-(L4-Pad1)") (pinfunction "1") (pintype "passive") (tstamp dd757137-e3d3-4a51-acb6-e3caca7fe3ea))
+      (net 1407 "Net-(L4-Pad1)") (pinfunction "1") (pintype "passive") (tstamp dd757137-e3d3-4a51-acb6-e3caca7fe3ea))
     (pad "2" smd rect (at 4.75 0 180) (size 3.5 4) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "2") (pintype "passive") (tstamp 1070e4bb-0cf0-4754-9c97-ee132d265a3f))
+      (net 1408 "VCCINAUX") (pinfunction "2") (pintype "passive") (tstamp 1070e4bb-0cf0-4754-9c97-ee132d265a3f))
     (model "${KICAD6_3DMODEL_DIR}/Inductor_SMD.3dshapes/L_Chilisin_BMRG00101030.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7366,7 +7358,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 796286f7-c071-4f99-9911-b51dd129c410))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp f360f369-0cc9-437a-b73a-47b974a71394))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1287 "/USBC0/RXC2-") (pintype "passive") (tstamp 318c9476-b3de-46f6-9756-7bb4885b9231))
+      (net 1279 "/USBC0/RXC2-") (pintype "passive") (tstamp 318c9476-b3de-46f6-9756-7bb4885b9231))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 433 "/CPU_USB/USBC0.RX-2") (pintype "passive") (tstamp 6118e1b0-d18d-412a-97e8-8cf4f47b960b))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -7426,7 +7418,7 @@
     (pad "1" smd roundrect (at -0.32 0 270) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 6c3f88c3-433f-4837-b279-eb52d6f29c30))
     (pad "2" smd roundrect (at 0.32 0 270) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1309 "/USBC1/TXC1+") (pinfunction "A2") (pintype "passive") (tstamp 812e55b5-a98a-4b3d-87d3-af93d5656278))
+      (net 1301 "/USBC1/TXC1+") (pinfunction "A2") (pintype "passive") (tstamp 812e55b5-a98a-4b3d-87d3-af93d5656278))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7527,9 +7519,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 41778801-b449-4cde-869c-fec49f53b986))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 501bd0a8-c610-42c2-91eb-7c17cc323dfb))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1209 "+1V8") (pintype "passive") (tstamp f098381c-86a4-40a5-af4d-6e482e221dca))
+      (net 1201 "+1V8") (pintype "passive") (tstamp f098381c-86a4-40a5-af4d-6e482e221dca))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1339 "/C_RIGHT_SCL") (pintype "passive") (tstamp c96be46e-0882-435c-b35d-4c5a1e660d11))
+      (net 1331 "/C_RIGHT_SCL") (pintype "passive") (tstamp c96be46e-0882-435c-b35d-4c5a1e660d11))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7595,69 +7587,69 @@
     (pad "" smd roundrect (at 0.725 -0.725) (size 1.17 1.17) (layers "F.Paste") (roundrect_rratio 0.213675) (tstamp c1850c47-d029-444e-b62a-93fc842e8908))
     (pad "" smd roundrect (at 0.725 0.725) (size 1.17 1.17) (layers "F.Paste") (roundrect_rratio 0.213675) (tstamp c3079870-2104-47df-b539-739008ae2348))
     (pad "1" smd roundrect (at -2 -1.4) (size 0.7 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1243 "Net-(Q1-D)") (pinfunction "VBUS") (pintype "power_in") (tstamp 0b70e650-d165-4e72-9b6e-add8804013b3))
+      (net 1235 "Net-(Q1-D)") (pinfunction "VBUS") (pintype "power_in") (tstamp 0b70e650-d165-4e72-9b6e-add8804013b3))
     (pad "2" smd roundrect (at -2 -1) (size 0.7 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1242 "/CHARGER/ACN") (pinfunction "ACN") (pintype "passive") (tstamp d7bd064c-26e7-4a4a-87b5-d6da9e2d7cea))
+      (net 1234 "/CHARGER/ACN") (pinfunction "ACN") (pintype "passive") (tstamp d7bd064c-26e7-4a4a-87b5-d6da9e2d7cea))
     (pad "3" smd roundrect (at -2 -0.6) (size 0.7 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1241 "/CHARGER/ACP") (pinfunction "ACP") (pintype "passive") (tstamp e05ba4b3-50d0-4184-a634-c69d5d61da7f))
+      (net 1233 "/CHARGER/ACP") (pinfunction "ACP") (pintype "passive") (tstamp e05ba4b3-50d0-4184-a634-c69d5d61da7f))
     (pad "4" smd roundrect (at -2 -0.2) (size 0.7 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1406 "/CHRG_OK") (pinfunction "CHRG_OK") (pintype "open_collector") (tstamp 35de54ef-d67b-4f35-843f-521d782c2511))
+      (net 1398 "/CHRG_OK") (pinfunction "CHRG_OK") (pintype "open_collector") (tstamp 35de54ef-d67b-4f35-843f-521d782c2511))
     (pad "5" smd roundrect (at -2 0.2) (size 0.7 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1407 "/CHRG_OTG_VAP") (pinfunction "OTG/VAP") (pintype "input") (tstamp e50c641f-62a0-4f28-bc68-33d7814d9a28))
+      (net 1399 "/CHRG_OTG_VAP") (pinfunction "OTG/VAP") (pintype "input") (tstamp e50c641f-62a0-4f28-bc68-33d7814d9a28))
     (pad "6" smd roundrect (at -2 0.6) (size 0.7 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1254 "/CHARGER/ILIM_HIZ") (pinfunction "ILIM_HIZ") (pintype "passive") (tstamp e27686a8-8d73-4f4d-8748-cd514fab34a7))
+      (net 1246 "/CHARGER/ILIM_HIZ") (pinfunction "ILIM_HIZ") (pintype "passive") (tstamp e27686a8-8d73-4f4d-8748-cd514fab34a7))
     (pad "7" smd roundrect (at -2 1) (size 0.7 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1253 "/CHARGER/VDDA") (pinfunction "VDDA") (pintype "passive") (tstamp 9503a57d-a992-49f5-b2de-56e6f4af56d7))
+      (net 1245 "/CHARGER/VDDA") (pinfunction "VDDA") (pintype "passive") (tstamp 9503a57d-a992-49f5-b2de-56e6f4af56d7))
     (pad "8" smd roundrect (at -2 1.4) (size 0.7 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1251 "/CHARGER/IADPT") (pinfunction "IADPT") (pintype "passive") (tstamp e081e8f1-5fb3-40ac-9308-9583b4bdc585))
+      (net 1243 "/CHARGER/IADPT") (pinfunction "IADPT") (pintype "passive") (tstamp e081e8f1-5fb3-40ac-9308-9583b4bdc585))
     (pad "9" smd roundrect (at -1.4 2) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1252 "/CHARGER/IBAT") (pinfunction "IBAT") (pintype "passive") (tstamp d54a7fd8-3f9f-4d74-beff-1eb5ad32c45a))
+      (net 1244 "/CHARGER/IBAT") (pinfunction "IBAT") (pintype "passive") (tstamp d54a7fd8-3f9f-4d74-beff-1eb5ad32c45a))
     (pad "10" smd roundrect (at -1 2) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1256 "/CHARGER/PSYS") (pinfunction "PSYS") (pintype "output") (tstamp e73443d7-bc25-42e3-a75c-38de24d75481))
+      (net 1248 "/CHARGER/PSYS") (pinfunction "PSYS") (pintype "output") (tstamp e73443d7-bc25-42e3-a75c-38de24d75481))
     (pad "11" smd roundrect (at -0.6 2) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1239 "/CHARGER/~{PROCHOT}") (pinfunction "~{PROCHOT}") (pintype "open_collector") (tstamp 61e7fa59-06e3-4615-ba41-402c58179632))
+      (net 1231 "/CHARGER/~{PROCHOT}") (pinfunction "~{PROCHOT}") (pintype "open_collector") (tstamp 61e7fa59-06e3-4615-ba41-402c58179632))
     (pad "12" smd roundrect (at -0.2 2) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1247 "/CHRG_SDA") (pinfunction "SDA") (pintype "bidirectional") (tstamp 345a72c5-fe10-4bae-98c8-f111369be310))
+      (net 1239 "/CHRG_SDA") (pinfunction "SDA") (pintype "bidirectional") (tstamp 345a72c5-fe10-4bae-98c8-f111369be310))
     (pad "13" smd roundrect (at 0.2 2) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1248 "/CHRG_SCL") (pinfunction "SCL") (pintype "input") (tstamp d866619e-b83c-4bba-8da1-112b91978eec))
+      (net 1240 "/CHRG_SCL") (pinfunction "SCL") (pintype "input") (tstamp d866619e-b83c-4bba-8da1-112b91978eec))
     (pad "14" smd roundrect (at 0.6 2) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "CMPIN") (pintype "input") (tstamp 3990cb6a-b562-4e03-be1e-c3d2a829766c))
     (pad "15" smd roundrect (at 1 2) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1225 "unconnected-(U9-CMPOUT-Pad15)") (pinfunction "CMPOUT") (pintype "output+no_connect") (tstamp 7ce40a12-bbff-40fe-bdbf-841d307473c3))
+      (net 1217 "unconnected-(U9-CMPOUT-Pad15)") (pinfunction "CMPOUT") (pintype "output+no_connect") (tstamp 7ce40a12-bbff-40fe-bdbf-841d307473c3))
     (pad "16" smd roundrect (at 1.4 2) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1238 "/CHARGER/COMP1") (pinfunction "COMP1") (pintype "input") (tstamp 372a827e-50d7-454e-8cef-c145c0e6f529))
+      (net 1230 "/CHARGER/COMP1") (pinfunction "COMP1") (pintype "input") (tstamp 372a827e-50d7-454e-8cef-c145c0e6f529))
     (pad "17" smd roundrect (at 2 1.4) (size 0.7 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1236 "/CHARGER/COMP2") (pinfunction "COMP2") (pintype "input") (tstamp 994f0783-7eb5-4dde-b1e6-ec265aa16d1e))
+      (net 1228 "/CHARGER/COMP2") (pinfunction "COMP2") (pintype "input") (tstamp 994f0783-7eb5-4dde-b1e6-ec265aa16d1e))
     (pad "18" smd roundrect (at 2 1) (size 0.7 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1255 "Net-(U9-CELL_BATPRESZ)") (pinfunction "CELL_BATPRESZ") (pintype "input") (tstamp 23f07866-0756-4633-ae71-fb1af5e8d3c7))
+      (net 1247 "Net-(U9-CELL_BATPRESZ)") (pinfunction "CELL_BATPRESZ") (pintype "input") (tstamp 23f07866-0756-4633-ae71-fb1af5e8d3c7))
     (pad "19" smd roundrect (at 2 0.6) (size 0.7 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1259 "/CHARGER/SRN") (pinfunction "SRN") (pintype "passive") (tstamp d93e5ef8-b3d9-450c-b990-7eeeab16bc50))
+      (net 1251 "/CHARGER/SRN") (pinfunction "SRN") (pintype "passive") (tstamp d93e5ef8-b3d9-450c-b990-7eeeab16bc50))
     (pad "20" smd roundrect (at 2 0.2) (size 0.7 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1258 "/CHARGER/SRP") (pinfunction "SRP") (pintype "passive") (tstamp 0079119e-2e48-46b9-a56e-60ea9d5e404b))
+      (net 1250 "/CHARGER/SRP") (pinfunction "SRP") (pintype "passive") (tstamp 0079119e-2e48-46b9-a56e-60ea9d5e404b))
     (pad "21" smd roundrect (at 2 -0.2) (size 0.7 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1244 "/CHARGER/~{BATDRV}") (pinfunction "~{BATDRV}") (pintype "output") (tstamp f5e4303f-0e82-4021-b476-7491a6cfbe97))
+      (net 1236 "/CHARGER/~{BATDRV}") (pinfunction "~{BATDRV}") (pintype "output") (tstamp f5e4303f-0e82-4021-b476-7491a6cfbe97))
     (pad "22" smd roundrect (at 2 -0.6) (size 0.7 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1234 "/CHARGER/VSYS") (pinfunction "VSYS") (pintype "passive") (tstamp b14e911d-9f14-4fdd-9cb2-9ccaf8393f91))
+      (net 1226 "/CHARGER/VSYS") (pinfunction "VSYS") (pintype "passive") (tstamp b14e911d-9f14-4fdd-9cb2-9ccaf8393f91))
     (pad "23" smd roundrect (at 2 -1) (size 0.7 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1226 "/CHARGER/SW2") (pinfunction "SW2") (pintype "passive") (tstamp 46cfa66c-58df-4e0e-8d21-fd43716175e1))
+      (net 1218 "/CHARGER/SW2") (pinfunction "SW2") (pintype "passive") (tstamp 46cfa66c-58df-4e0e-8d21-fd43716175e1))
     (pad "24" smd roundrect (at 2 -1.4) (size 0.7 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1233 "/CHARGER/HIDRV2") (pinfunction "HIDRV2") (pintype "passive") (tstamp b9bb9542-1695-441c-9110-0d832c9ff391))
+      (net 1225 "/CHARGER/HIDRV2") (pinfunction "HIDRV2") (pintype "passive") (tstamp b9bb9542-1695-441c-9110-0d832c9ff391))
     (pad "25" smd roundrect (at 1.4 -2) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1227 "/CHARGER/BST2") (pinfunction "BTST2") (pintype "passive") (tstamp eefa9172-98b0-4769-9cb7-db372a832840))
+      (net 1219 "/CHARGER/BST2") (pinfunction "BTST2") (pintype "passive") (tstamp eefa9172-98b0-4769-9cb7-db372a832840))
     (pad "26" smd roundrect (at 1 -2) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1231 "/CHARGER/LODRV2") (pinfunction "LODRV2") (pintype "passive") (tstamp 61741c32-389d-49ce-816a-d78e066950ed))
+      (net 1223 "/CHARGER/LODRV2") (pinfunction "LODRV2") (pintype "passive") (tstamp 61741c32-389d-49ce-816a-d78e066950ed))
     (pad "27" smd roundrect (at 0.6 -2) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "PGND") (pintype "power_in") (tstamp 1243e706-bb4d-416f-913b-1672a927c6f5))
     (pad "28" smd roundrect (at 0.2 -2) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1250 "/CHARGER/REGN") (pinfunction "REGN") (pintype "power_in") (tstamp a32c8d1c-6cf9-43df-9e39-633c08453266))
+      (net 1242 "/CHARGER/REGN") (pinfunction "REGN") (pintype "power_in") (tstamp a32c8d1c-6cf9-43df-9e39-633c08453266))
     (pad "29" smd roundrect (at -0.2 -2) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1230 "/CHARGER/LODRV1") (pinfunction "LODRV1") (pintype "passive") (tstamp d643309c-e62e-427d-bcc9-32757acfbf5b))
+      (net 1222 "/CHARGER/LODRV1") (pinfunction "LODRV1") (pintype "passive") (tstamp d643309c-e62e-427d-bcc9-32757acfbf5b))
     (pad "30" smd roundrect (at -0.6 -2) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1229 "/CHARGER/BST1") (pinfunction "BTST1") (pintype "passive") (tstamp c42e03c8-62cb-4e6d-82aa-ee64807561c0))
+      (net 1221 "/CHARGER/BST1") (pinfunction "BTST1") (pintype "passive") (tstamp c42e03c8-62cb-4e6d-82aa-ee64807561c0))
     (pad "31" smd roundrect (at -1 -2) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1232 "/CHARGER/HIDRV1") (pinfunction "HIDRV1") (pintype "passive") (tstamp 4ea23593-8c0a-4329-83f5-6fc14815745d))
+      (net 1224 "/CHARGER/HIDRV1") (pinfunction "HIDRV1") (pintype "passive") (tstamp 4ea23593-8c0a-4329-83f5-6fc14815745d))
     (pad "32" smd roundrect (at -1.4 -2) (size 0.2 0.7) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1228 "/CHARGER/SW1") (pinfunction "SW1") (pintype "passive") (tstamp e962bf45-c54c-45ca-a119-6fdff587ca7f))
+      (net 1220 "/CHARGER/SW1") (pinfunction "SW1") (pintype "passive") (tstamp e962bf45-c54c-45ca-a119-6fdff587ca7f))
     (pad "33" smd rect (at 0 0) (size 2.8 2.8) (layers "F.Cu" "F.Mask")
       (net 2 "GND") (pinfunction "EP") (pintype "power_in") (tstamp c57593cf-bd9b-4caa-9639-89711f56bdb0))
     (model "${KICAD6_3DMODEL_DIR}/Package_DFN_QFN.3dshapes/QFN-32-1EP_4x4mm_P0.4mm_EP2.9x2.9mm.wrl"
@@ -7708,9 +7700,9 @@
     (fp_line (start 0.3 0.15) (end -0.3 0.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e82cc970-2520-4594-ae58-6017c3a3e482))
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1299 "/USBC3/RXC2-") (pintype "passive") (tstamp 6a4aa966-6c8e-4f44-b530-d4688c34d204))
+      (net 1291 "/USBC3/RXC2-") (pintype "passive") (tstamp 6a4aa966-6c8e-4f44-b530-d4688c34d204))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1298 "/USBC3/RXJ2-") (pintype "passive") (tstamp 4505eb4b-4b0d-4743-adc6-4a3761fe4986))
+      (net 1290 "/USBC3/RXJ2-") (pintype "passive") (tstamp 4505eb4b-4b0d-4743-adc6-4a3761fe4986))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -7836,116 +7828,116 @@
       (stroke (width 0.15) (type default)) (layer "F.Fab") (tstamp 4647d1b8-1516-42bb-8dae-7bc4d02c223a))
     (pad "1" smd roundrect (at -3.025 -2.4) (size 0.75 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
       (chamfer_ratio 0.5) (chamfer top_right)
-      (net 1433 "unconnected-(U27-ISEN3P-Pad1)") (pinfunction "ISEN3P") (pintype "passive") (thermal_bridge_angle 45) (tstamp f748e892-0594-43fe-850d-47bfbcc059bb))
+      (net 1425 "unconnected-(U27-ISEN3P-Pad1)") (pinfunction "ISEN3P") (pintype "passive") (thermal_bridge_angle 45) (tstamp f748e892-0594-43fe-850d-47bfbcc059bb))
     (pad "2" smd roundrect (at -2.975 -2) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1434 "unconnected-(U27-ISEN3N-Pad2)") (pinfunction "ISEN3N") (pintype "passive") (thermal_bridge_angle 45) (tstamp 39ff81da-9da0-47a7-bd55-94bcfa6bba2b))
+      (net 1426 "unconnected-(U27-ISEN3N-Pad2)") (pinfunction "ISEN3N") (pintype "passive") (thermal_bridge_angle 45) (tstamp 39ff81da-9da0-47a7-bd55-94bcfa6bba2b))
     (pad "3" smd roundrect (at -2.975 -1.6) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1435 "unconnected-(U27-ISEN4N-Pad3)") (pinfunction "ISEN4N") (pintype "passive") (thermal_bridge_angle 45) (tstamp 7b81dd0a-fa92-4ed7-91c5-9617c6683cc1))
+      (net 1427 "unconnected-(U27-ISEN4N-Pad3)") (pinfunction "ISEN4N") (pintype "passive") (thermal_bridge_angle 45) (tstamp 7b81dd0a-fa92-4ed7-91c5-9617c6683cc1))
     (pad "4" smd roundrect (at -2.975 -1.2) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1436 "unconnected-(U27-ISEN4P-Pad4)") (pinfunction "ISEN4P") (pintype "passive") (thermal_bridge_angle 45) (tstamp 568a1074-24cc-4772-b38b-1f6bb7a4de6d))
+      (net 1428 "unconnected-(U27-ISEN4P-Pad4)") (pinfunction "ISEN4P") (pintype "passive") (thermal_bridge_angle 45) (tstamp 568a1074-24cc-4772-b38b-1f6bb7a4de6d))
     (pad "5" smd roundrect (at -2.975 -0.8) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1437 "unconnected-(U27-ISEN2P-Pad5)") (pinfunction "ISEN2P") (pintype "passive") (thermal_bridge_angle 45) (tstamp ef990313-0ff6-4cef-b625-ef0d030015b3))
+      (net 1429 "unconnected-(U27-ISEN2P-Pad5)") (pinfunction "ISEN2P") (pintype "passive") (thermal_bridge_angle 45) (tstamp ef990313-0ff6-4cef-b625-ef0d030015b3))
     (pad "6" smd roundrect (at -2.975 -0.4) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1438 "unconnected-(U27-ISEN2N-Pad6)") (pinfunction "ISEN2N") (pintype "passive") (thermal_bridge_angle 45) (tstamp 2dc5a073-7336-4692-a7fb-5f7d311ee725))
+      (net 1430 "unconnected-(U27-ISEN2N-Pad6)") (pinfunction "ISEN2N") (pintype "passive") (thermal_bridge_angle 45) (tstamp 2dc5a073-7336-4692-a7fb-5f7d311ee725))
     (pad "7" smd roundrect (at -2.975 0) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1439 "unconnected-(U27-ISEN1N-Pad7)") (pinfunction "ISEN1N") (pintype "passive") (thermal_bridge_angle 45) (tstamp 0b87f1a4-db37-4614-b07b-4d9a8b7911b5))
+      (net 1431 "unconnected-(U27-ISEN1N-Pad7)") (pinfunction "ISEN1N") (pintype "passive") (thermal_bridge_angle 45) (tstamp 0b87f1a4-db37-4614-b07b-4d9a8b7911b5))
     (pad "8" smd roundrect (at -2.975 0.4) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1440 "unconnected-(U27-ISEN1P-Pad8)") (pinfunction "ISEN1P") (pintype "passive") (thermal_bridge_angle 45) (tstamp 39c21f81-c243-43cc-b6bf-d8a0e2b7d79b))
+      (net 1432 "unconnected-(U27-ISEN1P-Pad8)") (pinfunction "ISEN1P") (pintype "passive") (thermal_bridge_angle 45) (tstamp 39c21f81-c243-43cc-b6bf-d8a0e2b7d79b))
     (pad "9" smd roundrect (at -2.975 0.8) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1441 "unconnected-(U27-FB-Pad9)") (pinfunction "FB") (pintype "passive") (thermal_bridge_angle 45) (tstamp 04a57ec9-7faa-4def-b601-39c156242c9b))
+      (net 1433 "unconnected-(U27-FB-Pad9)") (pinfunction "FB") (pintype "passive") (thermal_bridge_angle 45) (tstamp 04a57ec9-7faa-4def-b601-39c156242c9b))
     (pad "10" smd roundrect (at -2.975 1.2) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1442 "unconnected-(U27-COMP-Pad10)") (pinfunction "COMP") (pintype "passive") (thermal_bridge_angle 45) (tstamp 372f6abc-9d7b-4c87-b2c2-24cf948b8fc0))
+      (net 1434 "unconnected-(U27-COMP-Pad10)") (pinfunction "COMP") (pintype "passive") (thermal_bridge_angle 45) (tstamp 372f6abc-9d7b-4c87-b2c2-24cf948b8fc0))
     (pad "11" smd roundrect (at -2.975 1.6) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1479 "Net-(U27-VSEN)") (pinfunction "VSEN") (pintype "passive") (thermal_bridge_angle 45) (tstamp 926861f8-d78b-45db-a5fd-c1b44d4ee8c5))
+      (net 1471 "Net-(U27-VSEN)") (pinfunction "VSEN") (pintype "passive") (thermal_bridge_angle 45) (tstamp 926861f8-d78b-45db-a5fd-c1b44d4ee8c5))
     (pad "12" smd roundrect (at -2.975 2) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1478 "Net-(U27-RGND)") (pinfunction "RGND") (pintype "passive") (thermal_bridge_angle 45) (tstamp 044f9559-f64f-4d70-bf69-8ab86871a07d))
+      (net 1470 "Net-(U27-RGND)") (pinfunction "RGND") (pintype "passive") (thermal_bridge_angle 45) (tstamp 044f9559-f64f-4d70-bf69-8ab86871a07d))
     (pad "13" smd roundrect (at -3.025 2.4) (size 0.75 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
       (chamfer_ratio 0.5) (chamfer bottom_right)
-      (net 1443 "unconnected-(U27-VREF_SPS-Pad13)") (pinfunction "VREF_SPS") (pintype "passive") (thermal_bridge_angle 45) (tstamp 9a1fffcf-002a-4d11-b21c-fc6c0f143ae1))
+      (net 1435 "unconnected-(U27-VREF_SPS-Pad13)") (pinfunction "VREF_SPS") (pintype "passive") (thermal_bridge_angle 45) (tstamp 9a1fffcf-002a-4d11-b21c-fc6c0f143ae1))
     (pad "14" smd roundrect (at -2.4 3.025) (size 0.2 0.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
       (chamfer_ratio 0.5) (chamfer top_left)
-      (net 1444 "unconnected-(U27-VR_READY-Pad14)") (pinfunction "VR_READY") (pintype "passive") (thermal_bridge_angle 45) (tstamp 7555c763-c99d-400c-a5ee-4886e852a903))
+      (net 1436 "unconnected-(U27-VR_READY-Pad14)") (pinfunction "VR_READY") (pintype "passive") (thermal_bridge_angle 45) (tstamp 7555c763-c99d-400c-a5ee-4886e852a903))
     (pad "15" smd roundrect (at -2 2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1445 "unconnected-(U27-VCLK-Pad15)") (pinfunction "VCLK") (pintype "input") (thermal_bridge_angle 45) (tstamp 42adba12-a3b6-4a62-be61-76cca7602859))
+      (net 1437 "unconnected-(U27-VCLK-Pad15)") (pinfunction "VCLK") (pintype "input") (thermal_bridge_angle 45) (tstamp 42adba12-a3b6-4a62-be61-76cca7602859))
     (pad "16" smd roundrect (at -1.6 2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1446 "unconnected-(U27-VDIO-Pad16)") (pinfunction "VDIO") (pintype "input") (thermal_bridge_angle 45) (tstamp f1821c10-c149-4a2b-b381-08a20d86e687))
+      (net 1438 "unconnected-(U27-VDIO-Pad16)") (pinfunction "VDIO") (pintype "input") (thermal_bridge_angle 45) (tstamp f1821c10-c149-4a2b-b381-08a20d86e687))
     (pad "17" smd roundrect (at -1.2 2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1447 "unconnected-(U27-~{ALERT}-Pad17)") (pinfunction "~{ALERT}") (pintype "output") (thermal_bridge_angle 45) (tstamp 3abaf517-16f2-4e94-934c-82149b8ffdba))
+      (net 1439 "unconnected-(U27-~{ALERT}-Pad17)") (pinfunction "~{ALERT}") (pintype "output") (thermal_bridge_angle 45) (tstamp 3abaf517-16f2-4e94-934c-82149b8ffdba))
     (pad "18" smd roundrect (at -0.8 2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1448 "unconnected-(U27-~{VR_HOT}-Pad18)") (pinfunction "~{VR_HOT}") (pintype "output") (thermal_bridge_angle 45) (tstamp 36917e06-0fbd-4ee9-8d2b-610e44efeed3))
+      (net 1440 "unconnected-(U27-~{VR_HOT}-Pad18)") (pinfunction "~{VR_HOT}") (pintype "output") (thermal_bridge_angle 45) (tstamp 36917e06-0fbd-4ee9-8d2b-610e44efeed3))
     (pad "19" smd roundrect (at -0.4 2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1449 "unconnected-(U27-IMON-Pad19)") (pinfunction "IMON") (pintype "output") (thermal_bridge_angle 45) (tstamp c5b72520-888d-4e51-87ac-33b3f7422050))
+      (net 1441 "unconnected-(U27-IMON-Pad19)") (pinfunction "IMON") (pintype "output") (thermal_bridge_angle 45) (tstamp c5b72520-888d-4e51-87ac-33b3f7422050))
     (pad "20" smd roundrect (at 0 2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1450 "unconnected-(U27-VREF-Pad20)") (pinfunction "VREF") (pintype "passive") (thermal_bridge_angle 45) (tstamp 7433bb94-6ac4-4ed6-9df8-508d5b730534))
+      (net 1442 "unconnected-(U27-VREF-Pad20)") (pinfunction "VREF") (pintype "passive") (thermal_bridge_angle 45) (tstamp 7433bb94-6ac4-4ed6-9df8-508d5b730534))
     (pad "21" smd roundrect (at 0.4 2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1451 "unconnected-(U27-IMONA-Pad21)") (pinfunction "IMONA") (pintype "output") (thermal_bridge_angle 45) (tstamp cce05d0f-4da1-4632-83da-ff553e914ede))
+      (net 1443 "unconnected-(U27-IMONA-Pad21)") (pinfunction "IMONA") (pintype "output") (thermal_bridge_angle 45) (tstamp cce05d0f-4da1-4632-83da-ff553e914ede))
     (pad "22" smd roundrect (at 0.8 2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1452 "unconnected-(U27-TSEN-Pad22)") (pinfunction "TSEN") (pintype "input") (thermal_bridge_angle 45) (tstamp 358b0456-07ab-4cea-87e5-e7e042c51156))
+      (net 1444 "unconnected-(U27-TSEN-Pad22)") (pinfunction "TSEN") (pintype "input") (thermal_bridge_angle 45) (tstamp 358b0456-07ab-4cea-87e5-e7e042c51156))
     (pad "23" smd roundrect (at 1.2 2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1453 "unconnected-(U27-TSENA-Pad23)") (pinfunction "TSENA") (pintype "input") (thermal_bridge_angle 45) (tstamp b2497b20-8657-4ce4-9dea-ca085096ebb3))
+      (net 1445 "unconnected-(U27-TSENA-Pad23)") (pinfunction "TSENA") (pintype "input") (thermal_bridge_angle 45) (tstamp b2497b20-8657-4ce4-9dea-ca085096ebb3))
     (pad "24" smd roundrect (at 1.6 2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1454 "unconnected-(U27-SET1-Pad24)") (pinfunction "SET1") (pintype "input") (thermal_bridge_angle 45) (tstamp 726729b6-d9d4-43cd-a7b8-1df2d2d1190b))
+      (net 1446 "unconnected-(U27-SET1-Pad24)") (pinfunction "SET1") (pintype "input") (thermal_bridge_angle 45) (tstamp 726729b6-d9d4-43cd-a7b8-1df2d2d1190b))
     (pad "25" smd roundrect (at 2 2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1455 "unconnected-(U27-SET2-Pad25)") (pinfunction "SET2") (pintype "input") (thermal_bridge_angle 45) (tstamp 0a7d470d-4155-4866-919b-52f44309994c))
+      (net 1447 "unconnected-(U27-SET2-Pad25)") (pinfunction "SET2") (pintype "input") (thermal_bridge_angle 45) (tstamp 0a7d470d-4155-4866-919b-52f44309994c))
     (pad "26" smd roundrect (at 2.4 3.025) (size 0.2 0.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
       (chamfer_ratio 0.5) (chamfer top_right)
-      (net 1456 "unconnected-(U27-SET3-Pad26)") (pinfunction "SET3") (pintype "input") (thermal_bridge_angle 45) (tstamp 5629156b-1697-4052-8f87-f735b59f527f))
+      (net 1448 "unconnected-(U27-SET3-Pad26)") (pinfunction "SET3") (pintype "input") (thermal_bridge_angle 45) (tstamp 5629156b-1697-4052-8f87-f735b59f527f))
     (pad "27" smd roundrect (at 3.025 2.4) (size 0.75 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
       (chamfer_ratio 0.5) (chamfer bottom_left)
-      (net 1457 "unconnected-(U27-SET4-Pad27)") (pinfunction "SET4") (pintype "input") (thermal_bridge_angle 45) (tstamp aa5af877-6fb3-4098-8c57-03e268f9def7))
+      (net 1449 "unconnected-(U27-SET4-Pad27)") (pinfunction "SET4") (pintype "input") (thermal_bridge_angle 45) (tstamp aa5af877-6fb3-4098-8c57-03e268f9def7))
     (pad "28" smd roundrect (at 2.975 2) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1458 "unconnected-(U27-IMON_AUX-Pad28)") (pinfunction "IMON_AUX") (pintype "output") (thermal_bridge_angle 45) (tstamp 65da4566-e326-4341-9c7d-ae461d99050b))
+      (net 1450 "unconnected-(U27-IMON_AUX-Pad28)") (pinfunction "IMON_AUX") (pintype "output") (thermal_bridge_angle 45) (tstamp 65da4566-e326-4341-9c7d-ae461d99050b))
     (pad "29" smd roundrect (at 2.975 1.6) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1459 "unconnected-(U27-PSYS-Pad29)") (pinfunction "PSYS") (pintype "input") (thermal_bridge_angle 45) (tstamp c5f4d4e7-7b10-4c96-adb8-58825777ffdf))
+      (net 1451 "unconnected-(U27-PSYS-Pad29)") (pinfunction "PSYS") (pintype "input") (thermal_bridge_angle 45) (tstamp c5f4d4e7-7b10-4c96-adb8-58825777ffdf))
     (pad "30" smd roundrect (at 2.975 1.2) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1481 "Net-(U27-RGNDA)") (pinfunction "RGNDA") (pintype "passive") (thermal_bridge_angle 45) (tstamp de0589d7-f0eb-4bea-b530-ee09244399d2))
+      (net 1473 "Net-(U27-RGNDA)") (pinfunction "RGNDA") (pintype "passive") (thermal_bridge_angle 45) (tstamp de0589d7-f0eb-4bea-b530-ee09244399d2))
     (pad "31" smd roundrect (at 2.975 0.8) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1480 "Net-(U27-VSENA)") (pinfunction "VSENA") (pintype "passive") (thermal_bridge_angle 45) (tstamp 8aa2c928-85d4-4e7a-9b5b-01a3f935bd7a))
+      (net 1472 "Net-(U27-VSENA)") (pinfunction "VSENA") (pintype "passive") (thermal_bridge_angle 45) (tstamp 8aa2c928-85d4-4e7a-9b5b-01a3f935bd7a))
     (pad "32" smd roundrect (at 2.975 0.4) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1460 "unconnected-(U27-COMPA-Pad32)") (pinfunction "COMPA") (pintype "passive") (thermal_bridge_angle 45) (tstamp 4f8126ff-c77c-455d-9057-d7523b594f24))
+      (net 1452 "unconnected-(U27-COMPA-Pad32)") (pinfunction "COMPA") (pintype "passive") (thermal_bridge_angle 45) (tstamp 4f8126ff-c77c-455d-9057-d7523b594f24))
     (pad "33" smd roundrect (at 2.975 0) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1461 "unconnected-(U27-FBA-Pad33)") (pinfunction "FBA") (pintype "passive") (thermal_bridge_angle 45) (tstamp 2a3e0b4b-79f3-432b-913a-c7636ac0c152))
+      (net 1453 "unconnected-(U27-FBA-Pad33)") (pinfunction "FBA") (pintype "passive") (thermal_bridge_angle 45) (tstamp 2a3e0b4b-79f3-432b-913a-c7636ac0c152))
     (pad "34" smd roundrect (at 2.975 -0.4) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1462 "unconnected-(U27-ISENA2N-Pad34)") (pinfunction "ISENA2N") (pintype "passive") (thermal_bridge_angle 45) (tstamp 2acebb8f-0d90-49a5-8386-62d375378b6f))
+      (net 1454 "unconnected-(U27-ISENA2N-Pad34)") (pinfunction "ISENA2N") (pintype "passive") (thermal_bridge_angle 45) (tstamp 2acebb8f-0d90-49a5-8386-62d375378b6f))
     (pad "35" smd roundrect (at 2.975 -0.8) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1463 "unconnected-(U27-ISENA2P-Pad35)") (pinfunction "ISENA2P") (pintype "passive") (thermal_bridge_angle 45) (tstamp 4cb366aa-7571-4773-8ab4-a5a24cd6654a))
+      (net 1455 "unconnected-(U27-ISENA2P-Pad35)") (pinfunction "ISENA2P") (pintype "passive") (thermal_bridge_angle 45) (tstamp 4cb366aa-7571-4773-8ab4-a5a24cd6654a))
     (pad "36" smd roundrect (at 2.975 -1.2) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1464 "unconnected-(U27-ISENA1P-Pad36)") (pinfunction "ISENA1P") (pintype "passive") (thermal_bridge_angle 45) (tstamp 7c942d46-d2dd-41dc-aa5e-36f2719a26bd))
+      (net 1456 "unconnected-(U27-ISENA1P-Pad36)") (pinfunction "ISENA1P") (pintype "passive") (thermal_bridge_angle 45) (tstamp 7c942d46-d2dd-41dc-aa5e-36f2719a26bd))
     (pad "37" smd roundrect (at 2.975 -1.6) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1465 "unconnected-(U27-ISENA1N-Pad37)") (pinfunction "ISENA1N") (pintype "passive") (thermal_bridge_angle 45) (tstamp 17715194-bf0a-45e5-b78b-412f900bdb42))
+      (net 1457 "unconnected-(U27-ISENA1N-Pad37)") (pinfunction "ISENA1N") (pintype "passive") (thermal_bridge_angle 45) (tstamp 17715194-bf0a-45e5-b78b-412f900bdb42))
     (pad "38" smd roundrect (at 2.975 -2) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1466 "unconnected-(U27-ISENP_AUX-Pad38)") (pinfunction "ISENP_AUX") (pintype "passive") (thermal_bridge_angle 45) (tstamp 8f3d640c-9387-49c7-9ce2-1cce1cd08962))
+      (net 1458 "unconnected-(U27-ISENP_AUX-Pad38)") (pinfunction "ISENP_AUX") (pintype "passive") (thermal_bridge_angle 45) (tstamp 8f3d640c-9387-49c7-9ce2-1cce1cd08962))
     (pad "39" smd roundrect (at 3.025 -2.4) (size 0.75 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
       (chamfer_ratio 0.5) (chamfer top_left)
-      (net 1467 "unconnected-(U27-ISENN_AUX-Pad39)") (pinfunction "ISENN_AUX") (pintype "passive") (thermal_bridge_angle 45) (tstamp 03863bcf-7b3e-4126-8eb4-257a799b4bd7))
+      (net 1459 "unconnected-(U27-ISENN_AUX-Pad39)") (pinfunction "ISENN_AUX") (pintype "passive") (thermal_bridge_angle 45) (tstamp 03863bcf-7b3e-4126-8eb4-257a799b4bd7))
     (pad "40" smd roundrect (at 2.4 -3.025) (size 0.2 0.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
       (chamfer_ratio 0.5) (chamfer bottom_right)
-      (net 1468 "unconnected-(U27-DBLR_PS-Pad40)") (pinfunction "DBLR_PS") (pintype "output") (thermal_bridge_angle 45) (tstamp 4713a585-2a9c-4b10-b009-c34577f640e2))
+      (net 1460 "unconnected-(U27-DBLR_PS-Pad40)") (pinfunction "DBLR_PS") (pintype "output") (thermal_bridge_angle 45) (tstamp 4713a585-2a9c-4b10-b009-c34577f640e2))
     (pad "41" smd roundrect (at 2 -2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1482 "/VCC_CORE_GT/DRVEN") (pinfunction "DRVEN") (pintype "output") (thermal_bridge_angle 45) (tstamp 7c1f269f-2aa5-41ff-88bf-ab9efb87bbb5))
+      (net 1474 "/VCC_CORE_GT/DRVEN") (pinfunction "DRVEN") (pintype "output") (thermal_bridge_angle 45) (tstamp 7c1f269f-2aa5-41ff-88bf-ab9efb87bbb5))
     (pad "42" smd roundrect (at 1.6 -2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1469 "unconnected-(U27-DRVEN_F-Pad42)") (pinfunction "DRVEN_F") (pintype "output") (thermal_bridge_angle 45) (tstamp 86cf9c0e-6f0f-42be-97ad-eddc153c163b))
+      (net 1461 "unconnected-(U27-DRVEN_F-Pad42)") (pinfunction "DRVEN_F") (pintype "output") (thermal_bridge_angle 45) (tstamp 86cf9c0e-6f0f-42be-97ad-eddc153c163b))
     (pad "43" smd roundrect (at 1.2 -2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1470 "unconnected-(U27-PWMA2-Pad43)") (pinfunction "PWMA2") (pintype "output") (thermal_bridge_angle 45) (tstamp 2e34b8a5-dea7-4e9a-9626-c5097ce99d17))
+      (net 1462 "unconnected-(U27-PWMA2-Pad43)") (pinfunction "PWMA2") (pintype "output") (thermal_bridge_angle 45) (tstamp 2e34b8a5-dea7-4e9a-9626-c5097ce99d17))
     (pad "44" smd roundrect (at 0.8 -2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1471 "unconnected-(U27-PWMA1-Pad44)") (pinfunction "PWMA1") (pintype "output") (thermal_bridge_angle 45) (tstamp 2cc92b28-f322-42a0-a5bb-be3a0452315b))
+      (net 1463 "unconnected-(U27-PWMA1-Pad44)") (pinfunction "PWMA1") (pintype "output") (thermal_bridge_angle 45) (tstamp 2cc92b28-f322-42a0-a5bb-be3a0452315b))
     (pad "45" smd roundrect (at 0.4 -2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1483 "Net-(U27-PWM1)") (pinfunction "PWM1") (pintype "output") (thermal_bridge_angle 45) (tstamp bb9aab43-7b0b-421c-9333-71282d67e3f1))
+      (net 1475 "Net-(U27-PWM1)") (pinfunction "PWM1") (pintype "output") (thermal_bridge_angle 45) (tstamp bb9aab43-7b0b-421c-9333-71282d67e3f1))
     (pad "46" smd roundrect (at 0 -2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1472 "unconnected-(U27-PWM2-Pad46)") (pinfunction "PWM2") (pintype "output") (thermal_bridge_angle 45) (tstamp 3b960443-3334-4d8e-a8ad-83a645463a2a))
+      (net 1464 "unconnected-(U27-PWM2-Pad46)") (pinfunction "PWM2") (pintype "output") (thermal_bridge_angle 45) (tstamp 3b960443-3334-4d8e-a8ad-83a645463a2a))
     (pad "47" smd roundrect (at -0.4 -2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1473 "unconnected-(U27-PWM4-Pad47)") (pinfunction "PWM4") (pintype "output") (thermal_bridge_angle 45) (tstamp 2d55504a-dec1-4fe5-bfd2-95412c71549b))
+      (net 1465 "unconnected-(U27-PWM4-Pad47)") (pinfunction "PWM4") (pintype "output") (thermal_bridge_angle 45) (tstamp 2d55504a-dec1-4fe5-bfd2-95412c71549b))
     (pad "48" smd roundrect (at -0.8 -2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1474 "unconnected-(U27-PWM3-Pad48)") (pinfunction "PWM3") (pintype "output") (thermal_bridge_angle 45) (tstamp e22b487e-7746-45bd-b77f-53f848b9b572))
+      (net 1466 "unconnected-(U27-PWM3-Pad48)") (pinfunction "PWM3") (pintype "output") (thermal_bridge_angle 45) (tstamp e22b487e-7746-45bd-b77f-53f848b9b572))
     (pad "49" smd roundrect (at -1.2 -2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1475 "unconnected-(U27-ANS_EN-Pad49)") (pinfunction "ANS_EN") (pintype "input") (thermal_bridge_angle 45) (tstamp 8cb6c6e4-1bee-4408-907b-d339a1a06168))
+      (net 1467 "unconnected-(U27-ANS_EN-Pad49)") (pinfunction "ANS_EN") (pintype "input") (thermal_bridge_angle 45) (tstamp 8cb6c6e4-1bee-4408-907b-d339a1a06168))
     (pad "50" smd roundrect (at -1.6 -2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
       (net 104 "+5V") (pinfunction "VCC") (pintype "power_in") (thermal_bridge_angle 45) (tstamp 7b13474e-3957-44b3-ad07-c57cf7f78d71))
     (pad "51" smd roundrect (at -2 -2.975 90) (size 0.85 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
-      (net 1476 "unconnected-(U27-VRON-Pad51)") (pinfunction "VRON") (pintype "input") (thermal_bridge_angle 45) (tstamp 884b92ee-6166-485a-9fbf-fd4eb53b98e4))
+      (net 1468 "unconnected-(U27-VRON-Pad51)") (pinfunction "VRON") (pintype "input") (thermal_bridge_angle 45) (tstamp 884b92ee-6166-485a-9fbf-fd4eb53b98e4))
     (pad "52" smd roundrect (at -2.4 -3.025) (size 0.2 0.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.1)
       (chamfer_ratio 0.5) (chamfer bottom_left)
-      (net 1477 "unconnected-(U27-VIN{slash}VSYS-Pad52)") (pinfunction "VIN/VSYS") (pintype "input") (thermal_bridge_angle 45) (tstamp dfe3de7b-d3b2-4314-af56-b5190cad5ce2))
+      (net 1469 "unconnected-(U27-VIN{slash}VSYS-Pad52)") (pinfunction "VIN/VSYS") (pintype "input") (thermal_bridge_angle 45) (tstamp dfe3de7b-d3b2-4314-af56-b5190cad5ce2))
     (pad "53" smd roundrect (at 0 0) (size 4.7 4.7) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.06382978723)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (solder_paste_margin -0.75) (thermal_bridge_angle 45) (tstamp c07cbe68-2736-4ec1-80d6-8af26848b3da))
   )
@@ -8010,9 +8002,9 @@
     (pad "3" smd rect (at -1.44 0.33 180) (size 0.63 0.5) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "S") (pintype "passive") (tstamp 8fb9aa1f-c59d-4622-82dc-d1ff7e058487))
     (pad "4" smd rect (at -1.44 0.97 180) (size 0.63 0.5) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1231 "/CHARGER/LODRV2") (pinfunction "G") (pintype "passive") (tstamp 2ad88f87-fc55-4aad-a0fa-9c0a0c61ff2a))
+      (net 1223 "/CHARGER/LODRV2") (pinfunction "G") (pintype "passive") (tstamp 2ad88f87-fc55-4aad-a0fa-9c0a0c61ff2a))
     (pad "5" smd custom (at 0.385 0 180) (size 1.9 2.45) (layers "F.Cu" "F.Mask")
-      (net 1226 "/CHARGER/SW2") (pinfunction "D") (pintype "passive") (thermal_bridge_angle 45)
+      (net 1218 "/CHARGER/SW2") (pinfunction "D") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -8089,7 +8081,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp de8222da-2bfd-44f2-a4a5-2494b13435c7))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1220 "/CPU_POWER/VCC18") (pintype "passive") (tstamp 3861cfd9-7a92-48a6-b567-82f69d9612c9))
+      (net 1212 "/CPU_POWER/VCC18") (pintype "passive") (tstamp 3861cfd9-7a92-48a6-b567-82f69d9612c9))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8140,7 +8132,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 604f5b6a-2c1a-49ad-92af-83ae5b53a006))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 3d72e125-1d6e-4f43-b669-2509ea5b82d5))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1311 "/USBC2/TXC1-") (pintype "passive") (tstamp d0ebbce5-c776-4ed1-b5e2-a26fb4522301))
+      (net 1303 "/USBC2/TXC1-") (pintype "passive") (tstamp d0ebbce5-c776-4ed1-b5e2-a26fb4522301))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 439 "/CPU_USB/USBC2.TX-1") (pintype "passive") (tstamp fae580e0-0f6c-4802-8dfa-16084c670c8d))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -8208,33 +8200,33 @@
     (pad "" smd roundrect (at 0.475 -0.475 180) (size 0.75 0.75) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp b8925210-bda0-4d41-9375-b507dd6dd282))
     (pad "" smd roundrect (at 0.475 0.475 180) (size 0.75 0.75) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 3ec0d057-45fd-4c22-bde5-4ca63ded8f65))
     (pad "1" smd roundrect (at -1.4 -0.8 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1429 "/VCCINAUX/VSSINAUX_SENSE") (pinfunction "GSNS") (pintype "passive") (tstamp 12c96b22-dd35-4486-b4d8-a52fd3626e1a))
+      (net 1421 "/VCCINAUX/VSSINAUX_SENSE") (pinfunction "GSNS") (pintype "passive") (tstamp 12c96b22-dd35-4486-b4d8-a52fd3626e1a))
     (pad "2" smd roundrect (at -1.4 -0.4 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1422 "/VCCINAUX/V3") (pinfunction "V3") (pintype "passive") (tstamp 0dfa1815-e14e-4f7c-9a24-4833ef0e8254))
+      (net 1414 "/VCCINAUX/V3") (pinfunction "V3") (pintype "passive") (tstamp 0dfa1815-e14e-4f7c-9a24-4833ef0e8254))
     (pad "3" smd roundrect (at -1.4 0 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1423 "/VCCINAUX/V2") (pinfunction "V2") (pintype "passive") (tstamp b9a9d3a0-c000-47fa-9c62-0e3f68b9a34a))
+      (net 1415 "/VCCINAUX/V2") (pinfunction "V2") (pintype "passive") (tstamp b9a9d3a0-c000-47fa-9c62-0e3f68b9a34a))
     (pad "4" smd roundrect (at -1.4 0.4 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1424 "/VCCINAUX/V1") (pinfunction "V1") (pintype "passive") (tstamp 9413e633-bb69-42c4-881c-f617175f3b89))
+      (net 1416 "/VCCINAUX/V1") (pinfunction "V1") (pintype "passive") (tstamp 9413e633-bb69-42c4-881c-f617175f3b89))
     (pad "5" smd roundrect (at -1.4 0.8 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "V0") (pintype "passive") (tstamp ebd73c62-ee0f-41dd-a5c4-071e21cf4f1e))
     (pad "6" smd roundrect (at -0.8 1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1419 "/VCCINAUX/VREF") (pinfunction "VREF") (pintype "passive") (tstamp 5209e84c-2955-4183-9581-d791474d1ae9))
+      (net 1411 "/VCCINAUX/VREF") (pinfunction "VREF") (pintype "passive") (tstamp 5209e84c-2955-4183-9581-d791474d1ae9))
     (pad "7" smd roundrect (at -0.4 1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1426 "/VCCINAUX/PGOOD") (pinfunction "PGOOD") (pintype "open_collector") (tstamp 15336dc2-8528-4842-828a-c993f6e96b03))
+      (net 1418 "/VCCINAUX/PGOOD") (pinfunction "PGOOD") (pintype "open_collector") (tstamp 15336dc2-8528-4842-828a-c993f6e96b03))
     (pad "8" smd roundrect (at 0 1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1430 "/VCCINAUX/VID0") (pinfunction "VID0") (pintype "input") (tstamp 4cfc0326-2275-44fb-819a-8c4f548bea01))
+      (net 1422 "/VCCINAUX/VID0") (pinfunction "VID0") (pintype "input") (tstamp 4cfc0326-2275-44fb-819a-8c4f548bea01))
     (pad "9" smd roundrect (at 0.4 1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1431 "/VCCINAUX/VID1") (pinfunction "VID1") (pintype "input") (tstamp 32a8f9cd-701a-4b4b-bef9-a0a922b20645))
+      (net 1423 "/VCCINAUX/VID1") (pinfunction "VID1") (pintype "input") (tstamp 32a8f9cd-701a-4b4b-bef9-a0a922b20645))
     (pad "10" smd roundrect (at 0.8 1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1432 "/VCCINAUX/EN") (pinfunction "EN") (pintype "input") (tstamp 1a625118-af3b-4af7-b368-aaf51b1418b0))
+      (net 1424 "/VCCINAUX/EN") (pinfunction "EN") (pintype "input") (tstamp 1a625118-af3b-4af7-b368-aaf51b1418b0))
     (pad "11" smd roundrect (at 1.4 0.8 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1411 "Net-(U26-BST)") (pinfunction "BST") (pintype "passive") (tstamp e40852aa-a560-467e-8595-a0bf21099da6))
+      (net 1403 "Net-(U26-BST)") (pinfunction "BST") (pintype "passive") (tstamp e40852aa-a560-467e-8595-a0bf21099da6))
     (pad "12" smd roundrect (at 1.4 0.4 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1412 "Net-(U26-SW)") (pinfunction "SW") (pintype "passive") (tstamp 3925270c-6679-4147-9270-84476297f0b8))
+      (net 1404 "Net-(U26-SW)") (pinfunction "SW") (pintype "passive") (tstamp 3925270c-6679-4147-9270-84476297f0b8))
     (pad "13" smd roundrect (at 1.4 0 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1413 "Net-(U26-DRVH)") (pinfunction "DRVH") (pintype "passive") (tstamp deba0b74-8d0b-4f71-afeb-48a972b4c423))
+      (net 1405 "Net-(U26-DRVH)") (pinfunction "DRVH") (pintype "passive") (tstamp deba0b74-8d0b-4f71-afeb-48a972b4c423))
     (pad "14" smd roundrect (at 1.4 -0.4 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1414 "Net-(Q14-BG)") (pinfunction "DRVL") (pintype "passive") (tstamp e70172cd-66dc-412c-80db-fbb286105823))
+      (net 1406 "Net-(Q14-BG)") (pinfunction "DRVL") (pintype "passive") (tstamp e70172cd-66dc-412c-80db-fbb286105823))
     (pad "15" smd roundrect (at 1.4 -0.8 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 104 "+5V") (pinfunction "V5IN") (pintype "passive") (tstamp 054c4b7f-76c6-4a53-8ebb-cce8a49adf97))
     (pad "16" smd roundrect (at 0.8 -1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -8242,11 +8234,11 @@
     (pad "17" smd roundrect (at 0.4 -1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (tstamp 43b5f21d-5d31-4787-a7eb-c1b0cf4cbac6))
     (pad "18" smd roundrect (at 0 -1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1427 "/VCCINAUX/TRIP") (pinfunction "TRIP") (pintype "passive") (tstamp 52d4007a-ae00-4fbc-a44b-76e50a3cbc07))
+      (net 1419 "/VCCINAUX/TRIP") (pinfunction "TRIP") (pintype "passive") (tstamp 52d4007a-ae00-4fbc-a44b-76e50a3cbc07))
     (pad "19" smd roundrect (at -0.4 -1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1420 "/VCCINAUX/SLEW") (pinfunction "SLEW") (pintype "passive") (tstamp 25d552ce-7b73-41d9-97b0-493610e634c6))
+      (net 1412 "/VCCINAUX/SLEW") (pinfunction "SLEW") (pintype "passive") (tstamp 25d552ce-7b73-41d9-97b0-493610e634c6))
     (pad "20" smd roundrect (at -0.8 -1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1428 "/VCCINAUX/VCCINAUX_SENSE") (pinfunction "VSNS") (pintype "passive") (tstamp ca18c753-c4b4-4f2f-9d1a-807577d77f16))
+      (net 1420 "/VCCINAUX/VCCINAUX_SENSE") (pinfunction "VSNS") (pintype "passive") (tstamp ca18c753-c4b4-4f2f-9d1a-807577d77f16))
     (pad "21" smd roundrect (at 0 0 180) (size 1.7 1.7) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.1176470588)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (tstamp 53ff8836-cf8d-4ddc-9c3b-26cce9a720d8))
     (model "${KICAD6_3DMODEL_DIR}/Package_DFN_QFN.3dshapes/QFN-20-1EP_3x3mm_P0.4mm_EP1.65x1.65mm.wrl"
@@ -8298,7 +8290,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp bff82ae9-897a-4a29-91b7-ea268b98e080))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 15fc9a82-0ef4-4f47-a85a-08a787105721))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1208 "/CPU_POWER/FB18") (pintype "passive") (tstamp 056d49c2-e955-4373-9edc-27cbef2eb764))
+      (net 1200 "/CPU_POWER/FB18") (pintype "passive") (tstamp 056d49c2-e955-4373-9edc-27cbef2eb764))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp aa0d85f2-9060-44e3-9b39-bf291b0369df))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -8354,7 +8346,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp a0c922d3-667d-4c8b-a468-79f179d5388f))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1417 "VCCGT") (pintype "passive") (tstamp a2095f60-b425-4a36-8425-566a7c06f94f))
+      (net 1409 "VCCGT") (pintype "passive") (tstamp a2095f60-b425-4a36-8425-566a7c06f94f))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8405,7 +8397,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 2a719524-de63-402c-8277-85dfe6ade560))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 53539bae-8eb7-458a-bce5-bab6e61b2c97))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1306 "/USBC1/TXJ1-") (pintype "passive") (tstamp 39f32370-8fd6-4c1c-8cbf-32b20be4df25))
+      (net 1298 "/USBC1/TXJ1-") (pintype "passive") (tstamp 39f32370-8fd6-4c1c-8cbf-32b20be4df25))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 409b19bb-067b-4350-a349-773edabd28b1))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -8459,7 +8451,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 74bf4f60-3568-4c17-9b59-6a81cca83b4b))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1234 "/CHARGER/VSYS") (pintype "passive") (tstamp d0f73ee8-8db5-47bc-8886-37ffb0592965))
+      (net 1226 "/CHARGER/VSYS") (pintype "passive") (tstamp d0f73ee8-8db5-47bc-8886-37ffb0592965))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 492c1baa-c86b-4266-989b-3d12bea2c515))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -8514,9 +8506,9 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3c19ec54-5bfc-462e-b5f9-8a25893ca347))
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1226 "/CHARGER/SW2") (pintype "passive") (tstamp 3a4deab7-cd9b-4a16-aada-da716c0a948e))
+      (net 1218 "/CHARGER/SW2") (pintype "passive") (tstamp 3a4deab7-cd9b-4a16-aada-da716c0a948e))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1227 "/CHARGER/BST2") (pintype "passive") (tstamp 9956695d-50b0-4539-8b33-e2719474ecb0))
+      (net 1219 "/CHARGER/BST2") (pintype "passive") (tstamp 9956695d-50b0-4539-8b33-e2719474ecb0))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8779,7 +8771,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp f7b9f89f-37cf-4c06-9493-59ead925c90e))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1221 "/CPU_POWER/VCC11") (pintype "passive") (tstamp e6ebf7ee-c7a0-475d-8cdb-7ed2e27ded1d))
+      (net 1213 "/CPU_POWER/VCC11") (pintype "passive") (tstamp e6ebf7ee-c7a0-475d-8cdb-7ed2e27ded1d))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8833,7 +8825,7 @@
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp ad080f31-b23d-4264-9efc-a95fb794557c))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1417 "VCCGT") (pintype "passive") (tstamp 7e4aa171-f9f8-47e2-a00c-a7376734782f))
+      (net 1409 "VCCGT") (pintype "passive") (tstamp 7e4aa171-f9f8-47e2-a00c-a7376734782f))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8884,7 +8876,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 193222b6-a819-46b6-b816-e1c1e3c9288c))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp b5d7d7fd-879d-430c-bcd5-2e3c1e38b4b0))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1400 "/USBC2/OVP") (pintype "passive") (tstamp 1fcad7c1-4c2d-4fdd-a025-c76734c8f05f))
+      (net 1392 "/USBC2/OVP") (pintype "passive") (tstamp 1fcad7c1-4c2d-4fdd-a025-c76734c8f05f))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp a5ea4f8b-80e9-463a-aea7-5f0c4384783c))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -8936,9 +8928,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 9e3916e9-9627-4920-bc7d-87c6300e088d))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp eb19837f-36d2-4565-a18d-3542499e7035))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1253 "/CHARGER/VDDA") (pintype "passive") (tstamp 8b0ae059-c38f-419a-8240-be674691aba0))
+      (net 1245 "/CHARGER/VDDA") (pintype "passive") (tstamp 8b0ae059-c38f-419a-8240-be674691aba0))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1255 "Net-(U9-CELL_BATPRESZ)") (pintype "passive") (tstamp 0692483f-26bd-45fc-9241-00c3b9d25617))
+      (net 1247 "Net-(U9-CELL_BATPRESZ)") (pintype "passive") (tstamp 0692483f-26bd-45fc-9241-00c3b9d25617))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -8989,7 +8981,7 @@
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp b723b335-de69-46c4-9911-e662d26afcc3))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1361 "/USBC3/VB_ESD") (pintype "passive") (tstamp 31671866-e478-42c3-bf8b-bc533ad2ce08))
+      (net 1353 "/USBC3/VB_ESD") (pintype "passive") (tstamp 31671866-e478-42c3-bf8b-bc533ad2ce08))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9123,25 +9115,25 @@
     (pad "" smd roundrect (at 0.475 -0.475 180) (size 0.75 0.75) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 11d02384-6dcb-4a1a-a1d8-f2917ab29618))
     (pad "" smd roundrect (at 0.475 0.475 180) (size 0.75 0.75) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 1d17041a-40e9-4d70-a3be-30c749d28a44))
     (pad "1" smd roundrect (at -1.4 -0.8 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1363 "/USBC0/C_SBU1") (pinfunction "C_SBU1") (pintype "bidirectional") (tstamp 07dc3f04-7fa0-4119-a8ac-c5e30930d6ba))
+      (net 1355 "/USBC0/C_SBU1") (pinfunction "C_SBU1") (pintype "bidirectional") (tstamp 07dc3f04-7fa0-4119-a8ac-c5e30930d6ba))
     (pad "2" smd roundrect (at -1.4 -0.4 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1365 "/USBC0/C_SBU2") (pinfunction "C_SBU2") (pintype "bidirectional") (tstamp 95102a06-e3bf-4149-850d-6ee1ba6f8e37))
+      (net 1357 "/USBC0/C_SBU2") (pinfunction "C_SBU2") (pintype "bidirectional") (tstamp 95102a06-e3bf-4149-850d-6ee1ba6f8e37))
     (pad "3" smd roundrect (at -1.4 0 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1358 "/USBC0/VB_ESD") (pinfunction "VBIAS") (pintype "passive") (tstamp 948e38fe-1e79-42e4-ae96-3a5eb434a689))
+      (net 1350 "/USBC0/VB_ESD") (pinfunction "VBIAS") (pintype "passive") (tstamp 948e38fe-1e79-42e4-ae96-3a5eb434a689))
     (pad "4" smd roundrect (at -1.4 0.4 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1362 "/USBC0/C_CC1") (pinfunction "C_CC1") (pintype "bidirectional") (tstamp d1c9b9ba-f7ca-4f2a-88ef-b1f16f087af0))
+      (net 1354 "/USBC0/C_CC1") (pinfunction "C_CC1") (pintype "bidirectional") (tstamp d1c9b9ba-f7ca-4f2a-88ef-b1f16f087af0))
     (pad "5" smd roundrect (at -1.4 0.8 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1364 "/USBC0/C_CC2") (pinfunction "C_CC2") (pintype "bidirectional") (tstamp ec2580c0-ed32-489b-a112-062f8dd91606))
+      (net 1356 "/USBC0/C_CC2") (pinfunction "C_CC2") (pintype "bidirectional") (tstamp ec2580c0-ed32-489b-a112-062f8dd91606))
     (pad "6" smd roundrect (at -0.8 1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1364 "/USBC0/C_CC2") (pinfunction "RPD_G2") (pintype "bidirectional") (tstamp 1a4b52fb-ff62-4587-ba9d-e9466eaa4303))
+      (net 1356 "/USBC0/C_CC2") (pinfunction "RPD_G2") (pintype "bidirectional") (tstamp 1a4b52fb-ff62-4587-ba9d-e9466eaa4303))
     (pad "7" smd roundrect (at -0.4 1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1362 "/USBC0/C_CC1") (pinfunction "RPD_G1") (pintype "bidirectional") (tstamp e7fd4490-84a0-454f-897f-f582a1d8f3c4))
+      (net 1354 "/USBC0/C_CC1") (pinfunction "RPD_G1") (pintype "bidirectional") (tstamp e7fd4490-84a0-454f-897f-f582a1d8f3c4))
     (pad "8" smd roundrect (at 0 1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (tstamp 51240633-ce21-46dc-8973-aa2f5e5f6a15))
     (pad "9" smd roundrect (at 0.4 1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1334 "/USBC0/~{PROT_FLT}") (pinfunction "~{FLT}") (pintype "open_collector") (tstamp ed52db80-4133-4c59-b48e-95f167ee4aae))
+      (net 1326 "/USBC0/~{PROT_FLT}") (pinfunction "~{FLT}") (pintype "open_collector") (tstamp ed52db80-4133-4c59-b48e-95f167ee4aae))
     (pad "10" smd roundrect (at 0.8 1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1266 "/USBC0/VLDO") (pinfunction "VPWR") (pintype "power_in") (tstamp 27c354bc-d4af-41df-9bd3-f16045bb83ca))
+      (net 1258 "/USBC0/VLDO") (pinfunction "VPWR") (pintype "power_in") (tstamp 27c354bc-d4af-41df-9bd3-f16045bb83ca))
     (pad "11" smd roundrect (at 1.4 0.8 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 76 "/USBC0/CC1") (pinfunction "CC1") (pintype "bidirectional") (tstamp 66b12799-7130-4f3e-8a2e-f9ff3ebcf2cb))
     (pad "12" smd roundrect (at 1.4 0.4 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -9213,9 +9205,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 6c322ca5-ae8c-4f81-8c70-136a3d87d456))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 5e8f7c8f-3471-4d35-ae31-ec43baf084fa))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1259 "/CHARGER/SRN") (pintype "passive") (tstamp eadec215-8733-47a6-a2c2-a2a0f0be2308))
+      (net 1251 "/CHARGER/SRN") (pintype "passive") (tstamp eadec215-8733-47a6-a2c2-a2a0f0be2308))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1257 "/CHARGER/SRN1") (pintype "passive") (tstamp 69c3bce2-c41e-4d3c-a91d-99e1973ec19a))
+      (net 1249 "/CHARGER/SRN1") (pintype "passive") (tstamp 69c3bce2-c41e-4d3c-a91d-99e1973ec19a))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9373,7 +9365,7 @@
     (pad "1" smd roundrect (at -0.7 0 270) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 67bdbd0a-71b5-4c93-b4e2-be5153a3f531))
     (pad "2" smd roundrect (at 0.7 0 270) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp 7e21babb-4a09-4034-8a56-366f37f9c927))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp 7e21babb-4a09-4034-8a56-366f37f9c927))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -9425,7 +9417,7 @@
     (fp_line (start 0.8 0.4) (end -0.8 0.4)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f362aa48-118c-4a32-a4dd-e71c16d04038))
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1343 "/USBC1/PPHV") (pintype "passive") (tstamp 3465aade-b147-4eeb-b98c-829de0f83463))
+      (net 1335 "/USBC1/PPHV") (pintype "passive") (tstamp 3465aade-b147-4eeb-b98c-829de0f83463))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp ef8c970d-f994-459e-bbf2-218229594bea))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
@@ -9479,7 +9471,7 @@
     (fp_line (start 0.8 0.4) (end -0.8 0.4)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a132bf20-e616-48db-955e-12b8d0ae2904))
     (pad "1" smd roundrect (at -0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1269 "/USBC3/VLDO") (pintype "passive") (tstamp 28d80570-a247-4ce3-8171-a82332e624d2))
+      (net 1261 "/USBC3/VLDO") (pintype "passive") (tstamp 28d80570-a247-4ce3-8171-a82332e624d2))
     (pad "2" smd roundrect (at 0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 8e1d9e83-417f-424e-a614-98aaa642991a))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
@@ -9533,7 +9525,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 93070430-5b60-43b5-8890-72a6551d4edd))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1234 "/CHARGER/VSYS") (pintype "passive") (tstamp 1defaf26-efbd-4e98-b0c4-5830ac5ec620))
+      (net 1226 "/CHARGER/VSYS") (pintype "passive") (tstamp 1defaf26-efbd-4e98-b0c4-5830ac5ec620))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 1f8de65d-434e-4327-8282-8c1c7789dead))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -9586,7 +9578,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 7202ffcd-79a6-4323-957c-f19c2d7ef12b))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 99f7c3b1-2e13-4548-8b88-d609202d6425))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1378 "/USBC0/RIREF") (pintype "passive") (tstamp 58a2b118-ddc4-4a31-b531-154946ecd8be))
+      (net 1370 "/USBC0/RIREF") (pintype "passive") (tstamp 58a2b118-ddc4-4a31-b531-154946ecd8be))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 71d6d706-b90e-4720-8c10-7f6c0853919f))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -9693,7 +9685,7 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e516c168-2d28-42ea-a115-be7994a80e50))
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1243 "Net-(Q1-D)") (pintype "passive") (tstamp 558d74e2-c2f9-46db-ae6f-f61a50b76cde))
+      (net 1235 "Net-(Q1-D)") (pintype "passive") (tstamp 558d74e2-c2f9-46db-ae6f-f61a50b76cde))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 5d2a1578-269f-4487-a960-2265add314eb))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -9751,7 +9743,7 @@
     (fp_line (start 3.65 2.15) (end 3.65 -2.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e3b2eae3-b8da-4973-aae6-d0d0e70a72c8))
     (pad "1" smd roundrect (at -3.1125 0 90) (size 2.075 2.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.120482)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp f07b7fd3-856c-45a2-9142-44c7c87814ab))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp f07b7fd3-856c-45a2-9142-44c7c87814ab))
     (pad "2" smd roundrect (at 3.1125 0 90) (size 2.075 2.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.120482)
       (net 2 "GND") (pintype "passive") (tstamp a7713e44-7361-4f81-a14a-5f84d4ea878e))
     (model "${KICAD6_3DMODEL_DIR}/Capacitor_Tantalum_SMD.3dshapes/CP_EIA-7343-20_Kemet-V.wrl"
@@ -9804,7 +9796,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 08067879-2290-4362-8322-ba6eebe649ed))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 81e3723c-2ca4-43dc-b017-a3e593a5b0df))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1294 "/USBC2/RXJ2-") (pintype "passive") (tstamp 9c6276c5-2d70-4c3b-913e-885eb4b0c640))
+      (net 1286 "/USBC2/RXJ2-") (pintype "passive") (tstamp 9c6276c5-2d70-4c3b-913e-885eb4b0c640))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 43cf1446-db2f-4f81-a5d4-11f63a0f9986))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -9907,7 +9899,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp ea7f29a1-2bc3-4ea3-b805-a74a73302ce9))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 9d022540-ba64-487d-b663-151e1e76aa6b))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1397 "/USBC3/SOURCE") (pintype "passive") (tstamp 6080f53c-1f62-42a9-82f9-0331112bf374))
+      (net 1389 "/USBC3/SOURCE") (pintype "passive") (tstamp 6080f53c-1f62-42a9-82f9-0331112bf374))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 6f1eb841-f05a-44a2-b19f-8e6a23dd87cc))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -10017,7 +10009,7 @@
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp ef4bfafb-ce46-4bbe-b53d-d97ba06c7a92))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp e883bbf5-2975-46a5-9639-0ba818158d2e))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp e883bbf5-2975-46a5-9639-0ba818158d2e))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -10323,261 +10315,261 @@
     (fp_rect (start -0.5 -0.5) (end 6.5 6.5)
       (stroke (width 0.12) (type default)) (fill none) (layer "F.Fab") (tstamp cec4a2c6-beaa-4531-97ef-bf88bc3f0f55))
     (pad "A1" smd circle (at 0 0) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1178 "unconnected-(U6-GPIO221{slash}32KHz_OUT{slash}SYS_SHDN#-PadA1)") (pinfunction "GPIO221/32KHz_OUT/SYS_SHDN#") (pintype "output") (tstamp 03677153-e305-49db-9b90-656e64914303))
+      (net 1170 "unconnected-(U6-GPIO221{slash}32KHz_OUT{slash}SYS_SHDN#-PadA1)") (pinfunction "GPIO221/32KHz_OUT/SYS_SHDN#") (pintype "output") (tstamp 03677153-e305-49db-9b90-656e64914303))
     (pad "A2" smd circle (at 0.5 0) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1203 "unconnected-(U6-XTAL1-PadA2)") (pinfunction "XTAL1") (pintype "bidirectional") (tstamp 2f0f0190-3e4b-429f-8d22-e10f6c9bea97))
+      (net 1195 "unconnected-(U6-XTAL1-PadA2)") (pinfunction "XTAL1") (pintype "bidirectional") (tstamp 2f0f0190-3e4b-429f-8d22-e10f6c9bea97))
     (pad "A3" smd circle (at 1 0) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1086 "unconnected-(U6-GPIO004{slash}I2C00_SCL{slash}UART2_DCD#-PadA3)") (pinfunction "GPIO004/I2C00_SCL/UART2_DCD#") (pintype "bidirectional") (tstamp f2869af9-6dc4-4894-8570-56dc3c084c3c))
+      (net 1240 "/CHRG_SCL") (pinfunction "GPIO004/I2C00_SCL/UART2_DCD#") (pintype "bidirectional") (tstamp f2869af9-6dc4-4894-8570-56dc3c084c3c))
     (pad "A4" smd circle (at 1.5 0) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1204 "unconnected-(U6-XTAL2-PadA4)") (pinfunction "XTAL2") (pintype "unspecified") (tstamp 131c469a-f5a8-45e5-a226-2e0e201bab0f))
+      (net 1196 "unconnected-(U6-XTAL2-PadA4)") (pinfunction "XTAL2") (pintype "unspecified") (tstamp 131c469a-f5a8-45e5-a226-2e0e201bab0f))
     (pad "A5" smd circle (at 2 0) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1151 "unconnected-(U6-GPIO143{slash}I2C04_SDA{slash}UART0_CTS#-PadA5)") (pinfunction "GPIO143/I2C04_SDA/UART0_CTS#") (pintype "bidirectional") (tstamp 060c211e-9011-439b-9556-2a299bfd4e46))
+      (net 1345 "/C_LEFT_SDA") (pinfunction "GPIO143/I2C04_SDA/UART0_CTS#") (pintype "bidirectional") (tstamp 060c211e-9011-439b-9556-2a299bfd4e46))
     (pad "A6" smd circle (at 2.5 0) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1149 "unconnected-(U6-GPIO141{slash}I2C05_SDA{slash}UART2_RTS#-PadA6)") (pinfunction "GPIO141/I2C05_SDA/UART2_RTS#") (pintype "bidirectional") (tstamp 61c20343-ec3f-455f-8b45-5c48f843aa6b))
+      (net 1336 "/C_RIGHT_SDA") (pinfunction "GPIO141/I2C05_SDA/UART2_RTS#") (pintype "bidirectional") (tstamp 61c20343-ec3f-455f-8b45-5c48f843aa6b))
     (pad "A7" smd circle (at 3 0) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1155 "unconnected-(U6-GPIO147{slash}I2C15_SDA{slash}JTAG_CLK{slash}UART2_DSR#-PadA7)") (pinfunction "GPIO147/I2C15_SDA/JTAG_CLK/UART2_DSR#") (pintype "bidirectional") (tstamp 5854c65d-0d34-4128-b09c-ee47f6bf35fe))
+      (net 1149 "unconnected-(U6-GPIO147{slash}I2C15_SDA{slash}JTAG_CLK{slash}UART2_DSR#-PadA7)") (pinfunction "GPIO147/I2C15_SDA/JTAG_CLK/UART2_DSR#") (pintype "bidirectional") (tstamp 5854c65d-0d34-4128-b09c-ee47f6bf35fe))
     (pad "A8" smd circle (at 3.5 0) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1166 "unconnected-(U6-GPIO165{slash}32KHZ_IN{slash}CTOUT0-PadA8)") (pinfunction "GPIO165/32KHZ_IN/CTOUT0") (pintype "output") (tstamp c10f8fad-7b45-4ca6-b663-b4e1dce4bd4f))
+      (net 1158 "unconnected-(U6-GPIO165{slash}32KHZ_IN{slash}CTOUT0-PadA8)") (pinfunction "GPIO165/32KHZ_IN/CTOUT0") (pintype "output") (tstamp c10f8fad-7b45-4ca6-b663-b4e1dce4bd4f))
     (pad "A9" smd circle (at 4 0) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1110 "unconnected-(U6-GPIO050{slash}ICT0_TACH0-PadA9)") (pinfunction "GPIO050/ICT0_TACH0") (pintype "bidirectional") (tstamp 1774de9f-c520-4da3-8eea-282cfb3cf7b2))
+      (net 1108 "unconnected-(U6-GPIO050{slash}ICT0_TACH0-PadA9)") (pinfunction "GPIO050/ICT0_TACH0") (pintype "bidirectional") (tstamp 1774de9f-c520-4da3-8eea-282cfb3cf7b2))
     (pad "A10" smd circle (at 4.5 0) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1118 "unconnected-(U6-GPIO060{slash}KBRST{slash}TST_CLK_OUT{slash}UART1_DCD#-PadA10)") (pinfunction "GPIO060/KBRST/TST_CLK_OUT/UART1_DCD#") (pintype "output") (tstamp b0b486fc-af4a-4b51-a631-450353b2547d))
+      (net 1116 "unconnected-(U6-GPIO060{slash}KBRST{slash}TST_CLK_OUT{slash}UART1_DCD#-PadA10)") (pinfunction "GPIO060/KBRST/TST_CLK_OUT/UART1_DCD#") (pintype "output") (tstamp b0b486fc-af4a-4b51-a631-450353b2547d))
     (pad "A11" smd circle (at 5 0) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1087 "unconnected-(U6-GPIO007{slash}I2C03_SDA{slash}PS2_CLK0B-PadA11)") (pinfunction "GPIO007/I2C03_SDA/PS2_CLK0B") (pintype "bidirectional") (tstamp 79412c62-e2bf-4f28-8b93-582208033981))
+      (net 1085 "unconnected-(U6-GPIO007{slash}I2C03_SDA{slash}PS2_CLK0B-PadA11)") (pinfunction "GPIO007/I2C03_SDA/PS2_CLK0B") (pintype "bidirectional") (tstamp 79412c62-e2bf-4f28-8b93-582208033981))
     (pad "A12" smd circle (at 5.5 0) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1144 "unconnected-(U6-GPIO127{slash}A20M{slash}UART1_RTS#-PadA12)") (pinfunction "GPIO127/A20M/UART1_RTS#") (pintype "bidirectional") (tstamp 4cc7d17a-744f-4145-b60a-7a401a6e3054))
+      (net 1142 "unconnected-(U6-GPIO127{slash}A20M{slash}UART1_RTS#-PadA12)") (pinfunction "GPIO127/A20M/UART1_RTS#") (pintype "bidirectional") (tstamp 4cc7d17a-744f-4145-b60a-7a401a6e3054))
     (pad "A13" smd circle (at 6 0) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1162 "unconnected-(U6-GPIO156{slash}LED0-PadA13)") (pinfunction "GPIO156/LED0") (pintype "bidirectional") (tstamp e6b2aff2-30c8-49af-b7b1-f55cbf4215c4))
+      (net 1333 "/~{C_LEFT_INT}") (pinfunction "GPIO156/LED0") (pintype "bidirectional") (tstamp e6b2aff2-30c8-49af-b7b1-f55cbf4215c4))
     (pad "B1" smd circle (at 0 0.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1117 "unconnected-(U6-GPIO057{slash}VCC_PWRGD{slash}GPSPI_CLK_ALT-PadB1)") (pinfunction "GPIO057/VCC_PWRGD/GPSPI_CLK_ALT") (pintype "bidirectional") (tstamp a0acf1f9-1bc6-45cd-9377-47f848927edd))
+      (net 1115 "unconnected-(U6-GPIO057{slash}VCC_PWRGD{slash}GPSPI_CLK_ALT-PadB1)") (pinfunction "GPIO057/VCC_PWRGD/GPSPI_CLK_ALT") (pintype "bidirectional") (tstamp a0acf1f9-1bc6-45cd-9377-47f848927edd))
     (pad "B2" smd circle (at 0.5 0.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1102 "unconnected-(U6-GPIO033{slash}TACH3-PadB2)") (pinfunction "GPIO033/TACH3") (pintype "bidirectional") (tstamp 816e4e57-c691-432c-8a81-d956e6421b15))
+      (net 1100 "unconnected-(U6-GPIO033{slash}TACH3-PadB2)") (pinfunction "GPIO033/TACH3") (pintype "bidirectional") (tstamp 816e4e57-c691-432c-8a81-d956e6421b15))
     (pad "B3" smd circle (at 1 0.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1164 "unconnected-(U6-VCI_IN1#{slash}GPIO162-PadB3)") (pinfunction "VCI_IN1#/GPIO162") (pintype "unspecified") (tstamp 34284209-5a3c-49e0-a3da-6b52913f012b))
+      (net 1156 "unconnected-(U6-VCI_IN1#{slash}GPIO162-PadB3)") (pinfunction "VCI_IN1#/GPIO162") (pintype "unspecified") (tstamp 34284209-5a3c-49e0-a3da-6b52913f012b))
     (pad "B4" smd circle (at 1.5 0.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1168 "unconnected-(U6-VCI_OVRD_IN{slash}GPIO172-PadB4)") (pinfunction "VCI_OVRD_IN/GPIO172") (pintype "unspecified") (tstamp 383fad7f-909a-492e-a4ec-6c954b7b3c8f))
+      (net 1160 "unconnected-(U6-VCI_OVRD_IN{slash}GPIO172-PadB4)") (pinfunction "VCI_OVRD_IN/GPIO172") (pintype "unspecified") (tstamp 383fad7f-909a-492e-a4ec-6c954b7b3c8f))
     (pad "B5" smd circle (at 2 0.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1152 "unconnected-(U6-GPIO144{slash}I2C04_SCL{slash}UART0_RTS#-PadB5)") (pinfunction "GPIO144/I2C04_SCL/UART0_RTS#") (pintype "bidirectional") (tstamp c4d4154b-7d3f-422c-a467-9696af1fcf7e))
+      (net 1330 "/C_LEFT_SCL") (pinfunction "GPIO144/I2C04_SCL/UART0_RTS#") (pintype "bidirectional") (tstamp c4d4154b-7d3f-422c-a467-9696af1fcf7e))
     (pad "B6" smd circle (at 2.5 0.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1156 "unconnected-(U6-GPIO150{slash}I2C15_SCL{slash}JTAG_TMS{slash}UART2_DTR#-PadB6)") (pinfunction "GPIO150/I2C15_SCL/JTAG_TMS/UART2_DTR#") (pintype "bidirectional") (tstamp f234b44e-de35-40d2-b894-7b1d9363b80a))
+      (net 1150 "unconnected-(U6-GPIO150{slash}I2C15_SCL{slash}JTAG_TMS{slash}UART2_DTR#-PadB6)") (pinfunction "GPIO150/I2C15_SCL/JTAG_TMS/UART2_DTR#") (pintype "bidirectional") (tstamp f234b44e-de35-40d2-b894-7b1d9363b80a))
     (pad "B7" smd circle (at 3 0.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1154 "unconnected-(U6-GPIO146{slash}I2C09_SCL{slash}JTAG_TDO{slash}UART2_TX-PadB7)") (pinfunction "GPIO146/I2C09_SCL/JTAG_TDO/UART2_TX") (pintype "bidirectional") (tstamp 60f214aa-a374-4c7a-bb70-cde948b9b434))
+      (net 1148 "unconnected-(U6-GPIO146{slash}I2C09_SCL{slash}JTAG_TDO{slash}UART2_TX-PadB7)") (pinfunction "GPIO146/I2C09_SCL/JTAG_TDO/UART2_TX") (pintype "bidirectional") (tstamp 60f214aa-a374-4c7a-bb70-cde948b9b434))
     (pad "B8" smd circle (at 3.5 0.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1153 "unconnected-(U6-GPIO145{slash}I2C09_SDA{slash}JTAG_TDI{slash}UART2_RX-PadB8)") (pinfunction "GPIO145/I2C09_SDA/JTAG_TDI/UART2_RX") (pintype "bidirectional") (tstamp a80d4cad-b2f6-42a6-afe6-ce1b3e31de4c))
+      (net 1147 "unconnected-(U6-GPIO145{slash}I2C09_SDA{slash}JTAG_TDI{slash}UART2_RX-PadB8)") (pinfunction "GPIO145/I2C09_SDA/JTAG_TDI/UART2_RX") (pintype "bidirectional") (tstamp a80d4cad-b2f6-42a6-afe6-ce1b3e31de4c))
     (pad "B9" smd circle (at 4 0.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1111 "unconnected-(U6-GPIO051{slash}ICT1_TACH1-PadB9)") (pinfunction "GPIO051/ICT1_TACH1") (pintype "bidirectional") (tstamp 5c44d073-66d4-4c07-a6a6-643c8405817f))
+      (net 1109 "unconnected-(U6-GPIO051{slash}ICT1_TACH1-PadB9)") (pinfunction "GPIO051/ICT1_TACH1") (pintype "bidirectional") (tstamp 5c44d073-66d4-4c07-a6a6-643c8405817f))
     (pad "B10" smd circle (at 4.5 0.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1148 "unconnected-(U6-GPIO140{slash}I2C06_SCL{slash}ICT5{slash}KSO17-PadB10)") (pinfunction "GPIO140/I2C06_SCL/ICT5/KSO17") (pintype "bidirectional") (tstamp 30c0e323-2294-4893-91a6-709f919cb2f9))
+      (net 1146 "unconnected-(U6-GPIO140{slash}I2C06_SCL{slash}ICT5{slash}KSO17-PadB10)") (pinfunction "GPIO140/I2C06_SCL/ICT5/KSO17") (pintype "bidirectional") (tstamp 30c0e323-2294-4893-91a6-709f919cb2f9))
     (pad "B11" smd circle (at 5 0.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1160 "unconnected-(U6-GPIO154{slash}I2C02_SDA{slash}PS2_CLK1B-PadB11)") (pinfunction "GPIO154/I2C02_SDA/PS2_CLK1B") (pintype "bidirectional") (tstamp 8cca9588-3c21-4b3d-a58c-a2760c385eac))
+      (net 1154 "unconnected-(U6-GPIO154{slash}I2C02_SDA{slash}PS2_CLK1B-PadB11)") (pinfunction "GPIO154/I2C02_SDA/PS2_CLK1B") (pintype "bidirectional") (tstamp 8cca9588-3c21-4b3d-a58c-a2760c385eac))
     (pad "B12" smd circle (at 5.5 0.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1161 "unconnected-(U6-GPIO155{slash}I2C02_SCL{slash}PS2_DAT1B-PadB12)") (pinfunction "GPIO155/I2C02_SCL/PS2_DAT1B") (pintype "bidirectional") (tstamp 23d9b6c2-f2b9-4624-9d00-a8524951306d))
+      (net 1155 "unconnected-(U6-GPIO155{slash}I2C02_SCL{slash}PS2_DAT1B-PadB12)") (pinfunction "GPIO155/I2C02_SCL/PS2_DAT1B") (pintype "bidirectional") (tstamp 23d9b6c2-f2b9-4624-9d00-a8524951306d))
     (pad "B13" smd circle (at 6 0.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1088 "unconnected-(U6-GPIO010{slash}I2C03_SCL{slash}PS2_DAT0B-PadB13)") (pinfunction "GPIO010/I2C03_SCL/PS2_DAT0B") (pintype "bidirectional") (tstamp 691ae3fc-50c0-4e67-b66d-11e33cb3a379))
+      (net 1086 "unconnected-(U6-GPIO010{slash}I2C03_SCL{slash}PS2_DAT0B-PadB13)") (pinfunction "GPIO010/I2C03_SCL/PS2_DAT0B") (pintype "bidirectional") (tstamp 691ae3fc-50c0-4e67-b66d-11e33cb3a379))
     (pad "C1" smd circle (at 0 1) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1181 "unconnected-(U6-GPIO226-PadC1)") (pinfunction "GPIO226") (pintype "bidirectional") (tstamp 27de6a0a-e480-4057-a224-d6ff5994d498))
+      (net 1173 "unconnected-(U6-GPIO226-PadC1)") (pinfunction "GPIO226") (pintype "bidirectional") (tstamp 27de6a0a-e480-4057-a224-d6ff5994d498))
     (pad "C2" smd circle (at 0.5 1) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1192 "unconnected-(U6-nRESET_IN-PadC2)") (pinfunction "nRESET_IN") (pintype "unspecified") (tstamp 4c594f5b-3c96-4150-b3ce-f58950a812fb))
+      (net 1184 "unconnected-(U6-nRESET_IN-PadC2)") (pinfunction "nRESET_IN") (pintype "unspecified") (tstamp 4c594f5b-3c96-4150-b3ce-f58950a812fb))
     (pad "C12" smd circle (at 5.5 1) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1142 "unconnected-(U6-GPIO125{slash}PVT_CLK{slash}KSO12-PadC12)") (pinfunction "GPIO125/PVT_CLK/KSO12") (pintype "unspecified") (tstamp cb1f3bfc-e699-47fc-a133-2ff06ca6d185))
+      (net 1140 "unconnected-(U6-GPIO125{slash}PVT_CLK{slash}KSO12-PadC12)") (pinfunction "GPIO125/PVT_CLK/KSO12") (pintype "unspecified") (tstamp cb1f3bfc-e699-47fc-a133-2ff06ca6d185))
     (pad "C13" smd circle (at 6 1) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1138 "unconnected-(U6-GPIO121{slash}PVT_IO0{slash}KSO08-PadC13)") (pinfunction "GPIO121/PVT_IO0/KSO08") (pintype "bidirectional") (tstamp 0d325a60-cd6f-425b-b982-b174d68d7a92))
+      (net 1136 "unconnected-(U6-GPIO121{slash}PVT_IO0{slash}KSO08-PadC13)") (pinfunction "GPIO121/PVT_IO0/KSO08") (pintype "bidirectional") (tstamp 0d325a60-cd6f-425b-b982-b174d68d7a92))
     (pad "D1" smd circle (at 0 1.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1190 "unconnected-(U6-GPIO255{slash}UART1_RX_ALT{slash}UART1_DSR#-PadD1)") (pinfunction "GPIO255/UART1_RX_ALT/UART1_DSR#") (pintype "bidirectional") (tstamp 80ebefd4-cf84-4a5f-a212-d5e4866627f1))
+      (net 1182 "unconnected-(U6-GPIO255{slash}UART1_RX_ALT{slash}UART1_DSR#-PadD1)") (pinfunction "GPIO255/UART1_RX_ALT/UART1_DSR#") (pintype "bidirectional") (tstamp 80ebefd4-cf84-4a5f-a212-d5e4866627f1))
     (pad "D2" smd circle (at 0.5 1.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1131 "unconnected-(U6-GPIO106{slash}PWROK-PadD2)") (pinfunction "GPIO106/PWROK") (pintype "bidirectional") (tstamp 13176888-5b82-4bd0-9227-caf57947d0c3))
+      (net 1129 "unconnected-(U6-GPIO106{slash}PWROK-PadD2)") (pinfunction "GPIO106/PWROK") (pintype "bidirectional") (tstamp 13176888-5b82-4bd0-9227-caf57947d0c3))
     (pad "D4" smd circle (at 1.5 1.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 1083 "unconnected-(U6-SYSPWR_PRES&VCI_IN3#{slash}GPIO000{slash}I2C11_SDA-PadD4)") (pinfunction "SYSPWR_PRES&VCI_IN3#/GPIO000/I2C11_SDA") (pintype "input") (tstamp ad099b82-87aa-4d03-ae7e-7e86a0141354))
     (pad "D5" smd circle (at 2 1.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1188 "unconnected-(U6-BGPO0{slash}GPIO253-PadD5)") (pinfunction "BGPO0/GPIO253") (pintype "unspecified") (tstamp 1189f0b9-acb5-4c37-9055-1fbf0111d8a7))
+      (net 1180 "unconnected-(U6-BGPO0{slash}GPIO253-PadD5)") (pinfunction "BGPO0/GPIO253") (pintype "unspecified") (tstamp 1189f0b9-acb5-4c37-9055-1fbf0111d8a7))
     (pad "D6" smd circle (at 2.5 1.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1085 "unconnected-(U6-GPIO003{slash}I2C00_SDA{slash}UART2_RI#-PadD6)") (pinfunction "GPIO003/I2C00_SDA/UART2_RI#") (pintype "bidirectional") (tstamp 8a56b794-c8dc-4572-b998-13cd2708745f))
+      (net 1239 "/CHRG_SDA") (pinfunction "GPIO003/I2C00_SDA/UART2_RI#") (pintype "bidirectional") (tstamp 8a56b794-c8dc-4572-b998-13cd2708745f))
     (pad "D7" smd circle (at 3 1.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1150 "unconnected-(U6-GPIO142{slash}I2C05_SCL{slash}UART2_CTS#-PadD7)") (pinfunction "GPIO142/I2C05_SCL/UART2_CTS#") (pintype "bidirectional") (tstamp b936e184-987e-40b2-a949-5460959d049f))
+      (net 1331 "/C_RIGHT_SCL") (pinfunction "GPIO142/I2C05_SCL/UART2_CTS#") (pintype "bidirectional") (tstamp b936e184-987e-40b2-a949-5460959d049f))
     (pad "D8" smd circle (at 3.5 1.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1183 "unconnected-(U6-GPIO241{slash}PWM0_ALT{slash}CMP_VOUT0-PadD8)") (pinfunction "GPIO241/PWM0_ALT/CMP_VOUT0") (pintype "output") (tstamp eeb11526-5415-4c92-9a2c-196bf63c33ec))
+      (net 1175 "unconnected-(U6-GPIO241{slash}PWM0_ALT{slash}CMP_VOUT0-PadD8)") (pinfunction "GPIO241/PWM0_ALT/CMP_VOUT0") (pintype "output") (tstamp eeb11526-5415-4c92-9a2c-196bf63c33ec))
     (pad "D9" smd circle (at 4 1.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1163 "unconnected-(U6-GPIO157{slash}LED1-PadD9)") (pinfunction "GPIO157/LED1") (pintype "bidirectional") (tstamp 1fc184b7-84c7-4d59-a9d9-66dc20fb1444))
+      (net 1339 "/~{C_RIGHT_INT}") (pinfunction "GPIO157/LED1") (pintype "bidirectional") (tstamp 1fc184b7-84c7-4d59-a9d9-66dc20fb1444))
     (pad "D10" smd circle (at 4.5 1.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1147 "unconnected-(U6-GPIO132{slash}I2C06_SDA{slash}KSO16-PadD10)") (pinfunction "GPIO132/I2C06_SDA/KSO16") (pintype "bidirectional") (tstamp e170c218-3a8e-45b6-8d5c-8d36bd296298))
+      (net 1145 "unconnected-(U6-GPIO132{slash}I2C06_SDA{slash}KSO16-PadD10)") (pinfunction "GPIO132/I2C06_SDA/KSO16") (pintype "bidirectional") (tstamp e170c218-3a8e-45b6-8d5c-8d36bd296298))
     (pad "D12" smd circle (at 5.5 1.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1140 "unconnected-(U6-GPIO123{slash}PVT_IO2{slash}KSO10-PadD12)") (pinfunction "GPIO123/PVT_IO2/KSO10") (pintype "bidirectional") (tstamp b3966e3f-a0c3-4598-b698-4b20ff1833bb))
+      (net 1138 "unconnected-(U6-GPIO123{slash}PVT_IO2{slash}KSO10-PadD12)") (pinfunction "GPIO123/PVT_IO2/KSO10") (pintype "bidirectional") (tstamp b3966e3f-a0c3-4598-b698-4b20ff1833bb))
     (pad "D13" smd circle (at 6 1.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1143 "unconnected-(U6-GPIO126{slash}PVT_IO3{slash}KSO13-PadD13)") (pinfunction "GPIO126/PVT_IO3/KSO13") (pintype "bidirectional") (tstamp 8d6d0247-7d80-469e-a6f6-ea1734613fb3))
+      (net 1141 "unconnected-(U6-GPIO126{slash}PVT_IO3{slash}KSO13-PadD13)") (pinfunction "GPIO126/PVT_IO3/KSO13") (pintype "bidirectional") (tstamp 8d6d0247-7d80-469e-a6f6-ea1734613fb3))
     (pad "E1" smd circle (at 0 2) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1196 "unconnected-(U6-VTR_PLL-PadE1)") (pinfunction "VTR_PLL") (pintype "unspecified") (tstamp f6cccc1d-c2bd-4c7b-9c62-02abe5fac0cf))
+      (net 1188 "unconnected-(U6-VTR_PLL-PadE1)") (pinfunction "VTR_PLL") (pintype "unspecified") (tstamp f6cccc1d-c2bd-4c7b-9c62-02abe5fac0cf))
     (pad "E2" smd circle (at 0.5 2) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1186 "unconnected-(U6-GPIO246{slash}CTOUT1_ALT{slash}CMP_VREF0-PadE2)") (pinfunction "GPIO246/CTOUT1_ALT/CMP_VREF0") (pintype "output") (tstamp 6335a86a-8847-4f07-ab0f-27bf0559989d))
+      (net 1178 "unconnected-(U6-GPIO246{slash}CTOUT1_ALT{slash}CMP_VREF0-PadE2)") (pinfunction "GPIO246/CTOUT1_ALT/CMP_VREF0") (pintype "output") (tstamp 6335a86a-8847-4f07-ab0f-27bf0559989d))
     (pad "E4" smd circle (at 1.5 2) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1165 "unconnected-(U6-VCI_IN0#{slash}GPIO163-PadE4)") (pinfunction "VCI_IN0#/GPIO163") (pintype "bidirectional") (tstamp dc22511d-34ff-4443-adca-5931f6f20682))
+      (net 1157 "unconnected-(U6-VCI_IN0#{slash}GPIO163-PadE4)") (pinfunction "VCI_IN0#/GPIO163") (pintype "bidirectional") (tstamp dc22511d-34ff-4443-adca-5931f6f20682))
     (pad "E5" smd circle (at 2 2) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1409 "/EC/VBAT") (pinfunction "VBAT") (pintype "unspecified") (tstamp dceb535d-225a-49d5-8898-653509f34d3a))
+      (net 1401 "/EC/VBAT") (pinfunction "VBAT") (pintype "unspecified") (tstamp dceb535d-225a-49d5-8898-653509f34d3a))
     (pad "E6" smd circle (at 2.5 2) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS_ANALOG") (pintype "power_in") (tstamp fe8f6178-d511-4692-9a24-6e534f8895a4))
     (pad "E7" smd circle (at 3 2) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS1") (pintype "power_in") (tstamp c8a3a9a6-dece-43de-bf26-03e4434423fb))
     (pad "E8" smd circle (at 3.5 2) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1107 "unconnected-(U6-GPIO045{slash}KSO01{slash}PWM2_ALT{slash}ICT14[CR_STRAP]-PadE8)") (pinfunction "GPIO045/KSO01/PWM2_ALT/ICT14[CR_STRAP]") (pintype "bidirectional") (tstamp aec18e7d-44d1-4842-b356-bebcc4699af1))
+      (net 1105 "unconnected-(U6-GPIO045{slash}KSO01{slash}PWM2_ALT{slash}ICT14[CR_STRAP]-PadE8)") (pinfunction "GPIO045/KSO01/PWM2_ALT/ICT14[CR_STRAP]") (pintype "bidirectional") (tstamp aec18e7d-44d1-4842-b356-bebcc4699af1))
     (pad "E9" smd circle (at 4 2) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1159 "unconnected-(U6-GPIO153{slash}LED2-PadE9)") (pinfunction "GPIO153/LED2") (pintype "bidirectional") (tstamp bde61410-70b2-4a24-ab9a-fb4d05fa9f21))
+      (net 1153 "unconnected-(U6-GPIO153{slash}LED2-PadE9)") (pinfunction "GPIO153/LED2") (pintype "bidirectional") (tstamp bde61410-70b2-4a24-ab9a-fb4d05fa9f21))
     (pad "E10" smd circle (at 4.5 2) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1169 "unconnected-(U6-GPIO175{slash}CMP_VOUT1{slash}PWM8_ALT-PadE10)") (pinfunction "GPIO175/CMP_VOUT1/PWM8_ALT") (pintype "output") (tstamp 2fa09593-d4b7-4e8d-9137-94abb6ed5178))
+      (net 1161 "unconnected-(U6-GPIO175{slash}CMP_VOUT1{slash}PWM8_ALT-PadE10)") (pinfunction "GPIO175/CMP_VOUT1/PWM8_ALT") (pintype "output") (tstamp 2fa09593-d4b7-4e8d-9137-94abb6ed5178))
     (pad "E12" smd circle (at 5.5 2) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1139 "unconnected-(U6-GPIO122{slash}PVT_IO1{slash}KSO09-PadE12)") (pinfunction "GPIO122/PVT_IO1/KSO09") (pintype "bidirectional") (tstamp 57c2b537-b96c-43b6-9c95-8282f0613719))
+      (net 1137 "unconnected-(U6-GPIO122{slash}PVT_IO1{slash}KSO09-PadE12)") (pinfunction "GPIO122/PVT_IO1/KSO09") (pintype "bidirectional") (tstamp 57c2b537-b96c-43b6-9c95-8282f0613719))
     (pad "E13" smd circle (at 6 2) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1191 "unconnected-(U6-JTAG_RST#-PadE13)") (pinfunction "JTAG_RST#") (pintype "unspecified") (tstamp 0c8a059a-0ec7-478c-99b8-1c8371e2cef5))
+      (net 1183 "unconnected-(U6-JTAG_RST#-PadE13)") (pinfunction "JTAG_RST#") (pintype "unspecified") (tstamp 0c8a059a-0ec7-478c-99b8-1c8371e2cef5))
     (pad "F1" smd circle (at 0 2.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1189 "unconnected-(U6-GPIO254{slash}PWM1_ALT{slash}CMP_VREF1-PadF1)") (pinfunction "GPIO254/PWM1_ALT/CMP_VREF1") (pintype "power_in") (tstamp 0818d038-21c7-4c72-9403-ab59a724532e))
+      (net 1181 "unconnected-(U6-GPIO254{slash}PWM1_ALT{slash}CMP_VREF1-PadF1)") (pinfunction "GPIO254/PWM1_ALT/CMP_VREF1") (pintype "power_in") (tstamp 0818d038-21c7-4c72-9403-ab59a724532e))
     (pad "F2" smd circle (at 0.5 2.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1184 "unconnected-(U6-GPIO242{slash}CMP_VIN0-PadF2)") (pinfunction "GPIO242/CMP_VIN0") (pintype "bidirectional") (tstamp 18fa5a4a-eb63-4a81-8ffd-b9677166dc71))
+      (net 1176 "unconnected-(U6-GPIO242{slash}CMP_VIN0-PadF2)") (pinfunction "GPIO242/CMP_VIN0") (pintype "bidirectional") (tstamp 18fa5a4a-eb63-4a81-8ffd-b9677166dc71))
     (pad "F4" smd circle (at 1.5 2.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1120 "unconnected-(U6-GPIO062(RESETO#){slash}I2C11_SCL-PadF4)") (pinfunction "GPIO062(RESETO#)/I2C11_SCL") (pintype "bidirectional") (tstamp 8a7b1564-d7b9-4ad7-9b35-edcc2659b4ac))
+      (net 1118 "unconnected-(U6-GPIO062(RESETO#){slash}I2C11_SCL-PadF4)") (pinfunction "GPIO062(RESETO#)/I2C11_SCL") (pintype "bidirectional") (tstamp 8a7b1564-d7b9-4ad7-9b35-edcc2659b4ac))
     (pad "F5" smd circle (at 2 2.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1187 "unconnected-(U6-VCI_OUT{slash}GPIO250-PadF5)") (pinfunction "VCI_OUT/GPIO250") (pintype "output") (tstamp 840cb85a-5037-40c3-904b-a21bee6b6d96))
+      (net 1179 "unconnected-(U6-VCI_OUT{slash}GPIO250-PadF5)") (pinfunction "VCI_OUT/GPIO250") (pintype "output") (tstamp 840cb85a-5037-40c3-904b-a21bee6b6d96))
     (pad "F9" smd circle (at 4 2.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1108 "unconnected-(U6-GPIO046{slash}KSO02{slash}ICT11-PadF9)") (pinfunction "GPIO046/KSO02/ICT11") (pintype "bidirectional") (tstamp c5173f99-b2bf-41a3-97bd-f5c29dd7876f))
+      (net 1106 "unconnected-(U6-GPIO046{slash}KSO02{slash}ICT11-PadF9)") (pinfunction "GPIO046/KSO02/ICT11") (pintype "bidirectional") (tstamp c5173f99-b2bf-41a3-97bd-f5c29dd7876f))
     (pad "F10" smd circle (at 4.5 2.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1109 "unconnected-(U6-GPIO047{slash}KSO03{slash}PWM3_ALT{slash}ICT13-PadF10)") (pinfunction "GPIO047/KSO03/PWM3_ALT/ICT13") (pintype "bidirectional") (tstamp 620750f0-6432-4cf0-91f1-2b59e86f59c8))
+      (net 1107 "unconnected-(U6-GPIO047{slash}KSO03{slash}PWM3_ALT{slash}ICT13-PadF10)") (pinfunction "GPIO047/KSO03/PWM3_ALT/ICT13") (pintype "bidirectional") (tstamp 620750f0-6432-4cf0-91f1-2b59e86f59c8))
     (pad "F12" smd circle (at 5.5 2.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1130 "unconnected-(U6-GPIO105{slash}UART0_RX{slash}TFDP_DATA{slash}TRACECLK-PadF12)") (pinfunction "GPIO105/UART0_RX/TFDP_DATA/TRACECLK") (pintype "bidirectional") (tstamp 1cd70b98-53a8-4586-bbd9-875222bf8524))
+      (net 1128 "unconnected-(U6-GPIO105{slash}UART0_RX{slash}TFDP_DATA{slash}TRACECLK-PadF12)") (pinfunction "GPIO105/UART0_RX/TFDP_DATA/TRACECLK") (pintype "bidirectional") (tstamp 1cd70b98-53a8-4586-bbd9-875222bf8524))
     (pad "F13" smd circle (at 6 2.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1105 "unconnected-(U6-GPIO043{slash}SB-TSI_CLK-PadF13)") (pinfunction "GPIO043/SB-TSI_CLK") (pintype "bidirectional") (tstamp 91a1b38a-9de0-42d1-aa06-35f2af88352f))
+      (net 1103 "unconnected-(U6-GPIO043{slash}SB-TSI_CLK-PadF13)") (pinfunction "GPIO043/SB-TSI_CLK") (pintype "bidirectional") (tstamp 91a1b38a-9de0-42d1-aa06-35f2af88352f))
     (pad "G1" smd circle (at 0 3) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1193 "unconnected-(U6-VR_CAP-PadG1)") (pinfunction "VR_CAP") (pintype "unspecified") (tstamp a9d7210d-2701-4977-8923-5f16f5782491))
+      (net 1185 "unconnected-(U6-VR_CAP-PadG1)") (pinfunction "VR_CAP") (pintype "unspecified") (tstamp a9d7210d-2701-4977-8923-5f16f5782491))
     (pad "G2" smd circle (at 0.5 3) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1185 "unconnected-(U6-GPIO244{slash}UART_CLK_ALT{slash}nEMI_INT_ALT{slash}CMP_VIN1-PadG2)") (pinfunction "GPIO244/UART_CLK_ALT/nEMI_INT_ALT/CMP_VIN1") (pintype "input") (tstamp d8efc528-0847-4397-8180-9a23f60527da))
+      (net 1177 "unconnected-(U6-GPIO244{slash}UART_CLK_ALT{slash}nEMI_INT_ALT{slash}CMP_VIN1-PadG2)") (pinfunction "GPIO244/UART_CLK_ALT/nEMI_INT_ALT/CMP_VIN1") (pintype "input") (tstamp d8efc528-0847-4397-8180-9a23f60527da))
     (pad "G4" smd circle (at 1.5 3) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1158 "unconnected-(U6-GPIO152{slash}KSO14{slash}I2C07_SDA_ALT-PadG4)") (pinfunction "GPIO152/KSO14/I2C07_SDA_ALT") (pintype "bidirectional") (tstamp 88de00c0-a3e2-4bc4-8f17-87f80e866251))
+      (net 1152 "unconnected-(U6-GPIO152{slash}KSO14{slash}I2C07_SDA_ALT-PadG4)") (pinfunction "GPIO152/KSO14/I2C07_SDA_ALT") (pintype "bidirectional") (tstamp 88de00c0-a3e2-4bc4-8f17-87f80e866251))
     (pad "G5" smd circle (at 2 3) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1198 "unconnected-(U6-VTR1-PadG5)") (pinfunction "VTR1") (pintype "bidirectional") (tstamp 4bd13c97-ad2e-4f99-a6ce-ccc949c97de4))
+      (net 1190 "unconnected-(U6-VTR1-PadG5)") (pinfunction "VTR1") (pintype "bidirectional") (tstamp 4bd13c97-ad2e-4f99-a6ce-ccc949c97de4))
     (pad "G9" smd circle (at 4 3) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS2") (pintype "power_in") (tstamp a81a004e-f77b-4c01-bd5f-5f2043c18394))
     (pad "G10" smd circle (at 4.5 3) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1167 "unconnected-(U6-GPIO170{slash}UART1_TX{slash}CEC_OUT[JTAG_STRAP]-PadG10)") (pinfunction "GPIO170/UART1_TX/CEC_OUT[JTAG_STRAP]") (pintype "output") (tstamp c3c68a3d-2482-45b3-90f3-01388c62b18d))
+      (net 1159 "unconnected-(U6-GPIO170{slash}UART1_TX{slash}CEC_OUT[JTAG_STRAP]-PadG10)") (pinfunction "GPIO170/UART1_TX/CEC_OUT[JTAG_STRAP]") (pintype "output") (tstamp c3c68a3d-2482-45b3-90f3-01388c62b18d))
     (pad "G12" smd circle (at 5.5 3) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1129 "unconnected-(U6-GPIO104{slash}UART0_TX{slash}TFDP_CLK[VTR2_STRAP]-PadG12)") (pinfunction "GPIO104/UART0_TX/TFDP_CLK[VTR2_STRAP]") (pintype "bidirectional") (tstamp bacf4965-3811-4b18-97bd-7d1543902f90))
+      (net 1127 "unconnected-(U6-GPIO104{slash}UART0_TX{slash}TFDP_CLK[VTR2_STRAP]-PadG12)") (pinfunction "GPIO104/UART0_TX/TFDP_CLK[VTR2_STRAP]") (pintype "bidirectional") (tstamp bacf4965-3811-4b18-97bd-7d1543902f90))
     (pad "G13" smd circle (at 6 3) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1104 "/EC/PECI") (pinfunction "GPIO042/PECI_DAT/SB-TSI_DAT") (pintype "bidirectional") (tstamp 1e0f8f39-e533-4c37-8e7d-9120710fd5f5))
+      (net 1102 "/EC/PECI") (pinfunction "GPIO042/PECI_DAT/SB-TSI_DAT") (pintype "bidirectional") (tstamp 1e0f8f39-e533-4c37-8e7d-9120710fd5f5))
     (pad "H1" smd circle (at 0 3.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1141 "unconnected-(U6-GPIO124{slash}PVT_CS#{slash}KSO11{slash}ICT12-PadH1)") (pinfunction "GPIO124/PVT_CS#/KSO11/ICT12") (pintype "bidirectional") (tstamp 0643f7bd-2d9e-4604-ad70-611eff7c049b))
+      (net 1139 "unconnected-(U6-GPIO124{slash}PVT_CS#{slash}KSO11{slash}ICT12-PadH1)") (pinfunction "GPIO124/PVT_CS#/KSO11/ICT12") (pintype "bidirectional") (tstamp 0643f7bd-2d9e-4604-ad70-611eff7c049b))
     (pad "H2" smd circle (at 0.5 3.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1197 "unconnected-(U6-VTR_REG-PadH2)") (pinfunction "VTR_REG") (pintype "unspecified") (tstamp 02e3b29b-3d7d-4b92-91fc-6b3ab05f0c07))
+      (net 1189 "unconnected-(U6-VTR_REG-PadH2)") (pinfunction "VTR_REG") (pintype "unspecified") (tstamp 02e3b29b-3d7d-4b92-91fc-6b3ab05f0c07))
     (pad "H4" smd circle (at 1.5 3.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1194 "unconnected-(U6-VREF_ADC-PadH4)") (pinfunction "VREF_ADC") (pintype "power_in") (tstamp 5334e036-140c-4838-ad0f-b91a14e03017))
+      (net 1186 "unconnected-(U6-VREF_ADC-PadH4)") (pinfunction "VREF_ADC") (pintype "power_in") (tstamp 5334e036-140c-4838-ad0f-b91a14e03017))
     (pad "H5" smd circle (at 2 3.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1199 "unconnected-(U6-VTR1-PadH5)") (pinfunction "VTR1") (pintype "bidirectional") (tstamp 60f59a93-d304-4521-b655-d68f3767d41c))
+      (net 1191 "unconnected-(U6-VTR1-PadH5)") (pinfunction "VTR1") (pintype "bidirectional") (tstamp 60f59a93-d304-4521-b655-d68f3767d41c))
     (pad "H9" smd circle (at 4 3.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS3") (pintype "power_in") (tstamp a680be0c-0fdb-46b2-b57d-e6e8b0ee3ffd))
     (pad "H10" smd circle (at 4.5 3.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1146 "unconnected-(U6-GPIO131{slash}I2C01_SCL{slash}SLV_SPI_CS#-PadH10)") (pinfunction "GPIO131/I2C01_SCL/SLV_SPI_CS#") (pintype "bidirectional") (tstamp 3707de54-f011-4e82-b446-e08efab7b8bb))
+      (net 1144 "unconnected-(U6-GPIO131{slash}I2C01_SCL{slash}SLV_SPI_CS#-PadH10)") (pinfunction "GPIO131/I2C01_SCL/SLV_SPI_CS#") (pintype "bidirectional") (tstamp 3707de54-f011-4e82-b446-e08efab7b8bb))
     (pad "H12" smd circle (at 5.5 3.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1136 "unconnected-(U6-GPIO115{slash}PS2_DAT0A-PadH12)") (pinfunction "GPIO115/PS2_DAT0A") (pintype "bidirectional") (tstamp 3127f4f6-79df-4f51-947f-9af301a2d560))
+      (net 1134 "unconnected-(U6-GPIO115{slash}PS2_DAT0A-PadH12)") (pinfunction "GPIO115/PS2_DAT0A") (pintype "bidirectional") (tstamp 3127f4f6-79df-4f51-947f-9af301a2d560))
     (pad "H13" smd circle (at 6 3.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1133 "unconnected-(U6-GPIO112{slash}KSO05-PadH13)") (pinfunction "GPIO112/KSO05") (pintype "bidirectional") (tstamp 9e29ae61-f059-400b-91fc-c26bd225f9c0))
+      (net 1131 "unconnected-(U6-GPIO112{slash}KSO05-PadH13)") (pinfunction "GPIO112/KSO05") (pintype "bidirectional") (tstamp 9e29ae61-f059-400b-91fc-c26bd225f9c0))
     (pad "J1" smd circle (at 0 4) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1170 "unconnected-(U6-GPIO200{slash}ADC00{slash}TRACEDAT0-PadJ1)") (pinfunction "GPIO200/ADC00/TRACEDAT0") (pintype "bidirectional") (tstamp d3f97dfe-2d4c-49a6-bdd7-f8d23750ddbd))
+      (net 1162 "unconnected-(U6-GPIO200{slash}ADC00{slash}TRACEDAT0-PadJ1)") (pinfunction "GPIO200/ADC00/TRACEDAT0") (pintype "bidirectional") (tstamp d3f97dfe-2d4c-49a6-bdd7-f8d23750ddbd))
     (pad "J2" smd circle (at 0.5 4) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1171 "unconnected-(U6-GPIO201{slash}ADC01{slash}TRACEDAT1-PadJ2)") (pinfunction "GPIO201/ADC01/TRACEDAT1") (pintype "bidirectional") (tstamp 5bdad255-e5e6-4df2-b378-8260c45f1c52))
+      (net 1163 "unconnected-(U6-GPIO201{slash}ADC01{slash}TRACEDAT1-PadJ2)") (pinfunction "GPIO201/ADC01/TRACEDAT1") (pintype "bidirectional") (tstamp 5bdad255-e5e6-4df2-b378-8260c45f1c52))
     (pad "J4" smd circle (at 1.5 4) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1174 "unconnected-(U6-GPIO204{slash}ADC04-PadJ4)") (pinfunction "GPIO204/ADC04") (pintype "bidirectional") (tstamp 8c76ccd9-6d02-44c3-ba64-81c999ac2f75))
+      (net 1166 "unconnected-(U6-GPIO204{slash}ADC04-PadJ4)") (pinfunction "GPIO204/ADC04") (pintype "bidirectional") (tstamp 8c76ccd9-6d02-44c3-ba64-81c999ac2f75))
     (pad "J5" smd circle (at 2 4) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1202 "unconnected-(U6-VTR3-PadJ5)") (pinfunction "VTR3") (pintype "bidirectional") (tstamp a4f48bab-b624-4917-a989-53777c142901))
+      (net 1194 "unconnected-(U6-VTR3-PadJ5)") (pinfunction "VTR3") (pintype "bidirectional") (tstamp a4f48bab-b624-4917-a989-53777c142901))
     (pad "J6" smd circle (at 2.5 4) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS_ADC") (pintype "power_in") (tstamp d48cd7e6-3bad-41f4-a493-f12e4608ccfc))
     (pad "J7" smd circle (at 3 4) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1195 "unconnected-(U6-VTR_ANALOG-PadJ7)") (pinfunction "VTR_ANALOG") (pintype "unspecified") (tstamp bf384862-4d7b-431b-88d0-102175e20649))
+      (net 1187 "unconnected-(U6-VTR_ANALOG-PadJ7)") (pinfunction "VTR_ANALOG") (pintype "unspecified") (tstamp bf384862-4d7b-431b-88d0-102175e20649))
     (pad "J8" smd circle (at 3.5 4) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1201 "unconnected-(U6-VTR2-PadJ8)") (pinfunction "VTR2") (pintype "bidirectional") (tstamp e5f8de0c-b9b7-40c0-988f-40bb371ffb42))
+      (net 1193 "unconnected-(U6-VTR2-PadJ8)") (pinfunction "VTR2") (pintype "bidirectional") (tstamp e5f8de0c-b9b7-40c0-988f-40bb371ffb42))
     (pad "J9" smd circle (at 4 4) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1200 "unconnected-(U6-VTR1-PadJ9)") (pinfunction "VTR1") (pintype "bidirectional") (tstamp 2e71b2bb-837c-4441-b702-3221468a1c8f))
+      (net 1192 "unconnected-(U6-VTR1-PadJ9)") (pinfunction "VTR1") (pintype "bidirectional") (tstamp 2e71b2bb-837c-4441-b702-3221468a1c8f))
     (pad "J10" smd circle (at 4.5 4) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1106 "unconnected-(U6-GPIO044{slash}VREF_VTT-PadJ10)") (pinfunction "GPIO044/VREF_VTT") (pintype "power_in") (tstamp 1be6dac8-5a4b-4690-9e88-f178359f0838))
+      (net 1104 "unconnected-(U6-GPIO044{slash}VREF_VTT-PadJ10)") (pinfunction "GPIO044/VREF_VTT") (pintype "power_in") (tstamp 1be6dac8-5a4b-4690-9e88-f178359f0838))
     (pad "J12" smd circle (at 5.5 4) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1135 "unconnected-(U6-GPIO114{slash}PS2_CLK0A{slash}nEC_SCI-PadJ12)") (pinfunction "GPIO114/PS2_CLK0A/nEC_SCI") (pintype "bidirectional") (tstamp d611beda-c23b-449a-b7d5-c1b4c4e97684))
+      (net 1133 "unconnected-(U6-GPIO114{slash}PS2_CLK0A{slash}nEC_SCI-PadJ12)") (pinfunction "GPIO114/PS2_CLK0A/nEC_SCI") (pintype "bidirectional") (tstamp d611beda-c23b-449a-b7d5-c1b4c4e97684))
     (pad "J13" smd circle (at 6 4) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1134 "unconnected-(U6-GPIO113{slash}KSO06{slash}ICT9-PadJ13)") (pinfunction "GPIO113/KSO06/ICT9") (pintype "bidirectional") (tstamp 70d61c04-a5c5-4fc0-b2a1-75a6dcbf9b94))
+      (net 1132 "unconnected-(U6-GPIO113{slash}KSO06{slash}ICT9-PadJ13)") (pinfunction "GPIO113/KSO06/ICT9") (pintype "bidirectional") (tstamp 70d61c04-a5c5-4fc0-b2a1-75a6dcbf9b94))
     (pad "K1" smd circle (at 0 4.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1172 "unconnected-(U6-GPIO202{slash}ADC02{slash}TRACEDAT2-PadK1)") (pinfunction "GPIO202/ADC02/TRACEDAT2") (pintype "bidirectional") (tstamp b014eab0-d46f-4538-bf06-f5d75c48f3f1))
+      (net 1164 "unconnected-(U6-GPIO202{slash}ADC02{slash}TRACEDAT2-PadK1)") (pinfunction "GPIO202/ADC02/TRACEDAT2") (pintype "bidirectional") (tstamp b014eab0-d46f-4538-bf06-f5d75c48f3f1))
     (pad "K2" smd circle (at 0.5 4.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1173 "unconnected-(U6-GPIO203{slash}ADC03{slash}TRACEDAT3-PadK2)") (pinfunction "GPIO203/ADC03/TRACEDAT3") (pintype "bidirectional") (tstamp 45555aa2-46fe-4dd6-b1c2-f545f40d86dc))
+      (net 1165 "unconnected-(U6-GPIO203{slash}ADC03{slash}TRACEDAT3-PadK2)") (pinfunction "GPIO203/ADC03/TRACEDAT3") (pintype "bidirectional") (tstamp 45555aa2-46fe-4dd6-b1c2-f545f40d86dc))
     (pad "K4" smd circle (at 1.5 4.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1177 "unconnected-(U6-GPIO207{slash}ADC07[CMP_STRAP]-PadK4)") (pinfunction "GPIO207/ADC07[CMP_STRAP]") (pintype "bidirectional") (tstamp 629c4091-35df-47f4-893d-3d63c53be02a))
+      (net 1169 "unconnected-(U6-GPIO207{slash}ADC07[CMP_STRAP]-PadK4)") (pinfunction "GPIO207/ADC07[CMP_STRAP]") (pintype "bidirectional") (tstamp 629c4091-35df-47f4-893d-3d63c53be02a))
     (pad "K5" smd circle (at 2 4.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1122 "unconnected-(U6-GPIO064{slash}PCI_RESET#-PadK5)") (pinfunction "GPIO064/PCI_RESET#") (pintype "bidirectional") (tstamp 33902a4b-7572-41f5-a6b1-6e0aed303bfb))
+      (net 1120 "unconnected-(U6-GPIO064{slash}PCI_RESET#-PadK5)") (pinfunction "GPIO064/PCI_RESET#") (pintype "bidirectional") (tstamp 33902a4b-7572-41f5-a6b1-6e0aed303bfb))
     (pad "K6" smd circle (at 2.5 4.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1089 "unconnected-(U6-GPIO011{slash}nSMI_ALT{slash}PWM4{slash}ICT7-PadK6)") (pinfunction "GPIO011/nSMI_ALT/PWM4/ICT7") (pintype "bidirectional") (tstamp 6608beb2-49a3-4194-881a-465cd0d9297a))
+      (net 1087 "unconnected-(U6-GPIO011{slash}nSMI_ALT{slash}PWM4{slash}ICT7-PadK6)") (pinfunction "GPIO011/nSMI_ALT/PWM4/ICT7") (pintype "bidirectional") (tstamp 6608beb2-49a3-4194-881a-465cd0d9297a))
     (pad "K7" smd circle (at 3 4.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1090 "unconnected-(U6-GPIO012{slash}I2C07_SDA{slash}SLV_SPI_IO2-PadK7)") (pinfunction "GPIO012/I2C07_SDA/SLV_SPI_IO2") (pintype "bidirectional") (tstamp ce4e2ff8-3082-439a-88a5-15e41f92876b))
+      (net 1088 "unconnected-(U6-GPIO012{slash}I2C07_SDA{slash}SLV_SPI_IO2-PadK7)") (pinfunction "GPIO012/I2C07_SDA/SLV_SPI_IO2") (pintype "bidirectional") (tstamp ce4e2ff8-3082-439a-88a5-15e41f92876b))
     (pad "K8" smd circle (at 3.5 4.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1091 "unconnected-(U6-GPIO013{slash}I2C07_SCL{slash}SLV_SPI_IO3-PadK8)") (pinfunction "GPIO013/I2C07_SCL/SLV_SPI_IO3") (pintype "bidirectional") (tstamp 2bd5c26c-eae3-48d6-894a-8570ffabc1d0))
+      (net 1089 "unconnected-(U6-GPIO013{slash}I2C07_SCL{slash}SLV_SPI_IO3-PadK8)") (pinfunction "GPIO013/I2C07_SCL/SLV_SPI_IO3") (pintype "bidirectional") (tstamp 2bd5c26c-eae3-48d6-894a-8570ffabc1d0))
     (pad "K9" smd circle (at 4 4.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1145 "unconnected-(U6-GPIO130{slash}I2C01_SDA{slash}SLV_SPI_IO0-PadK9)") (pinfunction "GPIO130/I2C01_SDA/SLV_SPI_IO0") (pintype "bidirectional") (tstamp ada9e211-889a-4e3a-bd0d-99f3b0c8918f))
+      (net 1143 "unconnected-(U6-GPIO130{slash}I2C01_SDA{slash}SLV_SPI_IO0-PadK9)") (pinfunction "GPIO130/I2C01_SDA/SLV_SPI_IO0") (pintype "bidirectional") (tstamp ada9e211-889a-4e3a-bd0d-99f3b0c8918f))
     (pad "K10" smd circle (at 4.5 4.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1112 "unconnected-(U6-GPIO052{slash}ICT2_TACH2-PadK10)") (pinfunction "GPIO052/ICT2_TACH2") (pintype "bidirectional") (tstamp 54bac2c4-a334-4670-b102-e878e6f74daa))
+      (net 1110 "unconnected-(U6-GPIO052{slash}ICT2_TACH2-PadK10)") (pinfunction "GPIO052/ICT2_TACH2") (pintype "bidirectional") (tstamp 54bac2c4-a334-4670-b102-e878e6f74daa))
     (pad "K12" smd circle (at 5.5 4.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1132 "unconnected-(U6-GPIO107{slash}nSMI{slash}KSO04{slash}I2C10_SCL-PadK12)") (pinfunction "GPIO107/nSMI/KSO04/I2C10_SCL") (pintype "bidirectional") (tstamp 582a759c-04f3-464d-abcc-432f028f56d9))
+      (net 1130 "unconnected-(U6-GPIO107{slash}nSMI{slash}KSO04{slash}I2C10_SCL-PadK12)") (pinfunction "GPIO107/nSMI/KSO04/I2C10_SCL") (pintype "bidirectional") (tstamp 582a759c-04f3-464d-abcc-432f028f56d9))
     (pad "K13" smd circle (at 6 4.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1137 "unconnected-(U6-GPIO120{slash}KSO07{slash}UART1_DTR#-PadK13)") (pinfunction "GPIO120/KSO07/UART1_DTR#") (pintype "bidirectional") (tstamp 8582f5ef-804f-46f9-af02-2bd3d0cd0327))
+      (net 1135 "unconnected-(U6-GPIO120{slash}KSO07{slash}UART1_DTR#-PadK13)") (pinfunction "GPIO120/KSO07/UART1_DTR#") (pintype "bidirectional") (tstamp 8582f5ef-804f-46f9-af02-2bd3d0cd0327))
     (pad "L1" smd circle (at 0 5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1175 "unconnected-(U6-GPIO205{slash}ADC05-PadL1)") (pinfunction "GPIO205/ADC05") (pintype "bidirectional") (tstamp fb0f0eb9-ad31-43ac-9e24-eebbd03b1b58))
+      (net 1167 "unconnected-(U6-GPIO205{slash}ADC05-PadL1)") (pinfunction "GPIO205/ADC05") (pintype "bidirectional") (tstamp fb0f0eb9-ad31-43ac-9e24-eebbd03b1b58))
     (pad "L2" smd circle (at 0.5 5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1176 "unconnected-(U6-GPIO206{slash}ADC06-PadL2)") (pinfunction "GPIO206/ADC06") (pintype "bidirectional") (tstamp d0a73d02-01bd-4f91-b5d4-10a3de251264))
+      (net 1168 "unconnected-(U6-GPIO206{slash}ADC06-PadL2)") (pinfunction "GPIO206/ADC06") (pintype "bidirectional") (tstamp d0a73d02-01bd-4f91-b5d4-10a3de251264))
     (pad "L12" smd circle (at 5.5 5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1099 "unconnected-(U6-GPIO030{slash}KSI5{slash}I2C10_SDA-PadL12)") (pinfunction "GPIO030/KSI5/I2C10_SDA") (pintype "bidirectional") (tstamp 1df15025-df99-4632-9e0c-305308ce900b))
+      (net 1097 "unconnected-(U6-GPIO030{slash}KSI5{slash}I2C10_SDA-PadL12)") (pinfunction "GPIO030/KSI5/I2C10_SDA") (pintype "bidirectional") (tstamp 1df15025-df99-4632-9e0c-305308ce900b))
     (pad "L13" smd circle (at 6 5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1098 "unconnected-(U6-GPIO027{slash}KSI4{slash}UART0_DSR#{slash}I2C12_SCL-PadL13)") (pinfunction "GPIO027/KSI4/UART0_DSR#/I2C12_SCL") (pintype "bidirectional") (tstamp f44fac13-9ce4-4303-bb95-072e319a495a))
+      (net 1096 "unconnected-(U6-GPIO027{slash}KSI4{slash}UART0_DSR#{slash}I2C12_SCL-PadL13)") (pinfunction "GPIO027/KSI4/UART0_DSR#/I2C12_SCL") (pintype "bidirectional") (tstamp f44fac13-9ce4-4303-bb95-072e319a495a))
     (pad "M1" smd circle (at 0 5.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1119 "/EC/ESPI.~{RESET}") (pinfunction "GPIO061/ESPI_RESET#/PWM7_ALT/nEC_SCI_ALT") (pintype "unspecified") (tstamp 12a441b5-985a-495a-96e2-67121c9e6224))
+      (net 1117 "/EC/ESPI.~{RESET}") (pinfunction "GPIO061/ESPI_RESET#/PWM7_ALT/nEC_SCI_ALT") (pintype "unspecified") (tstamp 12a441b5-985a-495a-96e2-67121c9e6224))
     (pad "M2" smd circle (at 0.5 5.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1124 "/EC/ESPI.~{CS}") (pinfunction "GPIO066/ESPI_CS#/I2C13_SDA") (pintype "bidirectional") (tstamp 97d02317-93b2-434b-8ee1-f8fa25bdd5ad))
+      (net 1122 "/EC/ESPI.~{CS}") (pinfunction "GPIO066/ESPI_CS#/I2C13_SDA") (pintype "bidirectional") (tstamp 97d02317-93b2-434b-8ee1-f8fa25bdd5ad))
     (pad "M3" smd circle (at 1 5.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1126 "/EC/ESPI.IO1") (pinfunction "GPIO071/ESPI_IO1/I2C14_SCL") (pintype "bidirectional") (tstamp ea86a819-b2f2-4e30-b3e9-ef7510fa49df))
+      (net 1124 "/EC/ESPI.IO1") (pinfunction "GPIO071/ESPI_IO1/I2C14_SCL") (pintype "bidirectional") (tstamp ea86a819-b2f2-4e30-b3e9-ef7510fa49df))
     (pad "M4" smd circle (at 1.5 5.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1128 "/EC/ESPI.IO3") (pinfunction "GPIO073/ESPI_IO3/I2C01_SCL_ALT") (pintype "bidirectional") (tstamp 6cbde3d0-ba7c-4ce5-8aa1-25327301f8aa))
+      (net 1126 "/EC/ESPI.IO3") (pinfunction "GPIO073/ESPI_IO3/I2C01_SCL_ALT") (pintype "bidirectional") (tstamp 6cbde3d0-ba7c-4ce5-8aa1-25327301f8aa))
     (pad "M5" smd circle (at 2 5.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1182 "unconnected-(U6-GPIO227{slash}SHD_IO2[PWRGD_STRAP]-PadM5)") (pinfunction "GPIO227/SHD_IO2[PWRGD_STRAP]") (pintype "bidirectional") (tstamp e920114a-3c80-415c-a5cd-7ebc5178f991))
+      (net 1174 "unconnected-(U6-GPIO227{slash}SHD_IO2[PWRGD_STRAP]-PadM5)") (pinfunction "GPIO227/SHD_IO2[PWRGD_STRAP]") (pintype "bidirectional") (tstamp e920114a-3c80-415c-a5cd-7ebc5178f991))
     (pad "M6" smd circle (at 2.5 5.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1115 "unconnected-(U6-GPIO055(RSMRST#){slash}PWM2{slash}SHD_CS0#[BSS_STRAP]-PadM6)") (pinfunction "GPIO055(RSMRST#)/PWM2/SHD_CS0#[BSS_STRAP]") (pintype "bidirectional") (tstamp 7296486b-6559-44dc-8735-dfaa62da5332))
+      (net 1113 "unconnected-(U6-GPIO055(RSMRST#){slash}PWM2{slash}SHD_CS0#[BSS_STRAP]-PadM6)") (pinfunction "GPIO055(RSMRST#)/PWM2/SHD_CS0#[BSS_STRAP]") (pintype "bidirectional") (tstamp 7296486b-6559-44dc-8735-dfaa62da5332))
     (pad "M7" smd circle (at 3 5.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1116 "unconnected-(U6-GPIO056{slash}PWM3{slash}SHD_CLK-PadM7)") (pinfunction "GPIO056/PWM3/SHD_CLK") (pintype "bidirectional") (tstamp 4492e244-5faa-4d5f-af45-9e2843333376))
+      (net 1114 "unconnected-(U6-GPIO056{slash}PWM3{slash}SHD_CLK-PadM7)") (pinfunction "GPIO056/PWM3/SHD_CLK") (pintype "bidirectional") (tstamp 4492e244-5faa-4d5f-af45-9e2843333376))
     (pad "M8" smd circle (at 3.5 5.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1092 "unconnected-(U6-GPIO014{slash}PWM6{slash}SLV_SPI_IO2{slash}GPTP_IN2-PadM8)") (pinfunction "GPIO014/PWM6/SLV_SPI_IO2/GPTP_IN2") (pintype "input") (tstamp ecc2038e-49e7-4e82-bb94-2863f77a6b20))
+      (net 1090 "unconnected-(U6-GPIO014{slash}PWM6{slash}SLV_SPI_IO2{slash}GPTP_IN2-PadM8)") (pinfunction "GPIO014/PWM6/SLV_SPI_IO2/GPTP_IN2") (pintype "input") (tstamp ecc2038e-49e7-4e82-bb94-2863f77a6b20))
     (pad "M9" smd circle (at 4 5.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1114 "unconnected-(U6-GPIO054{slash}PWM1{slash}SLV_SPI_SCLK-PadM9)") (pinfunction "GPIO054/PWM1/SLV_SPI_SCLK") (pintype "bidirectional") (tstamp 363a3382-bfbf-443d-93e8-4b63be5637b6))
+      (net 1112 "unconnected-(U6-GPIO054{slash}PWM1{slash}SLV_SPI_SCLK-PadM9)") (pinfunction "GPIO054/PWM1/SLV_SPI_SCLK") (pintype "bidirectional") (tstamp 363a3382-bfbf-443d-93e8-4b63be5637b6))
     (pad "M10" smd circle (at 4.5 5.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1096 "unconnected-(U6-GPIO021{slash}KSI2-PadM10)") (pinfunction "GPIO021/KSI2") (pintype "bidirectional") (tstamp 0bf9657a-d5fe-4d43-9e5e-e41f6dbe0f20))
+      (net 1094 "unconnected-(U6-GPIO021{slash}KSI2-PadM10)") (pinfunction "GPIO021/KSI2") (pintype "bidirectional") (tstamp 0bf9657a-d5fe-4d43-9e5e-e41f6dbe0f20))
     (pad "M11" smd circle (at 5 5.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1157 "unconnected-(U6-GPIO151{slash}ICT4{slash}KSO15-PadM11)") (pinfunction "GPIO151/ICT4/KSO15") (pintype "bidirectional") (tstamp b92dcd4b-1733-45b0-95d8-99386d4855a9))
+      (net 1151 "unconnected-(U6-GPIO151{slash}ICT4{slash}KSO15-PadM11)") (pinfunction "GPIO151/ICT4/KSO15") (pintype "bidirectional") (tstamp b92dcd4b-1733-45b0-95d8-99386d4855a9))
     (pad "M12" smd circle (at 5.5 5.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1103 "unconnected-(U6-GPIO040{slash}GPTP_OUT2{slash}KSO00{slash}UART1_CTS#-PadM12)") (pinfunction "GPIO040/GPTP_OUT2/KSO00/UART1_CTS#") (pintype "output") (tstamp ada61ce3-6c1d-4f9c-86af-fc88639183cf))
+      (net 1101 "unconnected-(U6-GPIO040{slash}GPTP_OUT2{slash}KSO00{slash}UART1_CTS#-PadM12)") (pinfunction "GPIO040/GPTP_OUT2/KSO00/UART1_CTS#") (pintype "output") (tstamp ada61ce3-6c1d-4f9c-86af-fc88639183cf))
     (pad "M13" smd circle (at 6 5.5) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1100 "unconnected-(U6-GPIO031{slash}KSI6{slash}GPTP_OUT1-PadM13)") (pinfunction "GPIO031/KSI6/GPTP_OUT1") (pintype "output") (tstamp bcbb3b1a-3566-411b-802f-ba205bcb7e45))
+      (net 1098 "unconnected-(U6-GPIO031{slash}KSI6{slash}GPTP_OUT1-PadM13)") (pinfunction "GPIO031/KSI6/GPTP_OUT1") (pintype "output") (tstamp bcbb3b1a-3566-411b-802f-ba205bcb7e45))
     (pad "N1" smd circle (at 0 6) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1123 "/EC/ESPI.CLK") (pinfunction "GPIO065/ESPI_CLKI2C13_SCL/ICT5_ALT") (pintype "bidirectional") (tstamp d56228f8-140e-417f-bcd1-442680a21166))
+      (net 1121 "/EC/ESPI.CLK") (pinfunction "GPIO065/ESPI_CLKI2C13_SCL/ICT5_ALT") (pintype "bidirectional") (tstamp d56228f8-140e-417f-bcd1-442680a21166))
     (pad "N2" smd circle (at 0.5 6) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1125 "/EC/ESPI.IO0") (pinfunction "GPIO070/ESPI_IO0/I2C14_SDA") (pintype "bidirectional") (tstamp 8f3085f6-5363-441c-bfa2-7f2e49d5131d))
+      (net 1123 "/EC/ESPI.IO0") (pinfunction "GPIO070/ESPI_IO0/I2C14_SDA") (pintype "bidirectional") (tstamp 8f3085f6-5363-441c-bfa2-7f2e49d5131d))
     (pad "N3" smd circle (at 1 6) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1127 "/EC/ESPI.IO2") (pinfunction "GPIO072/ESPI_IO2/I2C01_SDA_ALT") (pintype "bidirectional") (tstamp fd6c49e6-e57b-460a-bb9c-d62e766aebfc))
+      (net 1125 "/EC/ESPI.IO2") (pinfunction "GPIO072/ESPI_IO2/I2C01_SDA_ALT") (pintype "bidirectional") (tstamp fd6c49e6-e57b-460a-bb9c-d62e766aebfc))
     (pad "N4" smd circle (at 1.5 6) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1121 "/EC/ESPI.~{ALERT}") (pinfunction "GPIO063/ESPI_ALERT#/PWM6_ALT/ICT8") (pintype "bidirectional") (tstamp 0a979a12-744f-4c57-8ed2-15ea3babba75))
+      (net 1119 "/EC/ESPI.~{ALERT}") (pinfunction "GPIO063/ESPI_ALERT#/PWM6_ALT/ICT8") (pintype "bidirectional") (tstamp 0a979a12-744f-4c57-8ed2-15ea3babba75))
     (pad "N5" smd circle (at 2 6) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1180 "unconnected-(U6-GPIO224{slash}GPTP_IN0{slash}SHD_IO1-PadN5)") (pinfunction "GPIO224/GPTP_IN0/SHD_IO1") (pintype "bidirectional") (tstamp 3f3334f1-815b-4751-8426-67ec72f5f1bf))
+      (net 1172 "unconnected-(U6-GPIO224{slash}GPTP_IN0{slash}SHD_IO1-PadN5)") (pinfunction "GPIO224/GPTP_IN0/SHD_IO1") (pintype "bidirectional") (tstamp 3f3334f1-815b-4751-8426-67ec72f5f1bf))
     (pad "N6" smd circle (at 2.5 6) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1093 "unconnected-(U6-GPIO016{slash}GPTP_IN1{slash}SHD_IO3{slash}ICT3(DSW_PWROK)-PadN6)") (pinfunction "GPIO016/GPTP_IN1/SHD_IO3/ICT3(DSW_PWROK)") (pintype "input") (tstamp ef3b916d-16d6-4a88-a449-11146cd39395))
+      (net 1091 "unconnected-(U6-GPIO016{slash}GPTP_IN1{slash}SHD_IO3{slash}ICT3(DSW_PWROK)-PadN6)") (pinfunction "GPIO016/GPTP_IN1/SHD_IO3/ICT3(DSW_PWROK)") (pintype "input") (tstamp ef3b916d-16d6-4a88-a449-11146cd39395))
     (pad "N7" smd circle (at 3 6) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1179 "unconnected-(U6-GPIO223{slash}SHD_IO0-PadN7)") (pinfunction "GPIO223/SHD_IO0") (pintype "bidirectional") (tstamp e2c3e51d-2c7d-4e31-8927-8aa05575fce5))
+      (net 1171 "unconnected-(U6-GPIO223{slash}SHD_IO0-PadN7)") (pinfunction "GPIO223/SHD_IO0") (pintype "bidirectional") (tstamp e2c3e51d-2c7d-4e31-8927-8aa05575fce5))
     (pad "N8" smd circle (at 3.5 6) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 1084 "unconnected-(U6-GPIO002{slash}PWM5{slash}SHD_CS1#-PadN8)") (pinfunction "GPIO002/PWM5/SHD_CS1#") (pintype "bidirectional") (tstamp 01ec3775-f2be-46f9-87d1-8b95fe43f104))
     (pad "N9" smd circle (at 4 6) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1113 "unconnected-(U6-GPIO053{slash}PWM0{slash}SLV_SPI_MSTR_INT-PadN9)") (pinfunction "GPIO053/PWM0/SLV_SPI_MSTR_INT") (pintype "bidirectional") (tstamp 79710fff-9149-4c7b-851f-3ed8a6a25002))
+      (net 1111 "unconnected-(U6-GPIO053{slash}PWM0{slash}SLV_SPI_MSTR_INT-PadN9)") (pinfunction "GPIO053/PWM0/SLV_SPI_MSTR_INT") (pintype "bidirectional") (tstamp 79710fff-9149-4c7b-851f-3ed8a6a25002))
     (pad "N10" smd circle (at 4.5 6) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1095 "unconnected-(U6-GPIO020{slash}KSI1-PadN10)") (pinfunction "GPIO020/KSI1") (pintype "bidirectional") (tstamp ae31beec-c614-428b-8538-03f951c571a0))
+      (net 1093 "unconnected-(U6-GPIO020{slash}KSI1-PadN10)") (pinfunction "GPIO020/KSI1") (pintype "bidirectional") (tstamp ae31beec-c614-428b-8538-03f951c571a0))
     (pad "N11" smd circle (at 5 6) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1094 "unconnected-(U6-GPIO017{slash}KSI0{slash}UART0_DCD#-PadN11)") (pinfunction "GPIO017/KSI0/UART0_DCD#") (pintype "bidirectional") (tstamp b14f600e-478d-4a11-b797-c751c8a3f0ce))
+      (net 1092 "unconnected-(U6-GPIO017{slash}KSI0{slash}UART0_DCD#-PadN11)") (pinfunction "GPIO017/KSI0/UART0_DCD#") (pintype "bidirectional") (tstamp b14f600e-478d-4a11-b797-c751c8a3f0ce))
     (pad "N12" smd circle (at 5.5 6) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1101 "unconnected-(U6-GPIO032{slash}KSI7{slash}GPTP_OUT0{slash}UART0_RI#-PadN12)") (pinfunction "GPIO032/KSI7/GPTP_OUT0/UART0_RI#") (pintype "output") (tstamp 0fd88bf5-d61e-46ad-ba44-a226aea6a64c))
+      (net 1099 "unconnected-(U6-GPIO032{slash}KSI7{slash}GPTP_OUT0{slash}UART0_RI#-PadN12)") (pinfunction "GPIO032/KSI7/GPTP_OUT0/UART0_RI#") (pintype "output") (tstamp 0fd88bf5-d61e-46ad-ba44-a226aea6a64c))
     (pad "N13" smd circle (at 6 6) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1097 "unconnected-(U6-GPIO026{slash}KSI3{slash}UART0_DTR#{slash}I2C12_SDA-PadN13)") (pinfunction "GPIO026/KSI3/UART0_DTR#/I2C12_SDA") (pintype "bidirectional") (tstamp 7c19ef8a-a19b-49d3-85d6-0ca3062177fe))
+      (net 1095 "unconnected-(U6-GPIO026{slash}KSI3{slash}UART0_DTR#{slash}I2C12_SDA-PadN13)") (pinfunction "GPIO026/KSI3/UART0_DTR#/I2C12_SDA") (pintype "bidirectional") (tstamp 7c19ef8a-a19b-49d3-85d6-0ca3062177fe))
   )
 
   (footprint "local:C_0402_1005Metric" (layer "F.Cu")
@@ -10625,7 +10617,7 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 09e5b1c1-3375-4d7b-82b2-20675ae312ba))
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1237 "Net-(C66-Pad1)") (pintype "passive") (tstamp 5271a6e9-80fd-4292-b78c-fc76d9b04d44))
+      (net 1229 "Net-(C66-Pad1)") (pintype "passive") (tstamp 5271a6e9-80fd-4292-b78c-fc76d9b04d44))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp ba2b1e8d-9de0-42e0-9cd9-55b0166ee286))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -10678,7 +10670,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp baabecb3-550a-4af3-b5a4-d94ce7eb29a2))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp b497a207-60bc-4bb7-94ea-e6c36028f473))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1399 "/USBC1/OVP") (pintype "passive") (tstamp 1e6ca608-d9b0-4568-b09c-093cbb7a84e8))
+      (net 1391 "/USBC1/OVP") (pintype "passive") (tstamp 1e6ca608-d9b0-4568-b09c-093cbb7a84e8))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 1d919a34-77a7-432b-83e7-29a887415219))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -10874,7 +10866,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 3ae64d46-59e5-4d24-a4ce-18259895494b))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp b1cee424-7b04-474d-a906-5e9887f2bac7))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1309 "/USBC1/TXC1+") (pintype "passive") (tstamp f938bc18-70bf-4c73-9d7e-2d990e34e249))
+      (net 1301 "/USBC1/TXC1+") (pintype "passive") (tstamp f938bc18-70bf-4c73-9d7e-2d990e34e249))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 421 "/CPU_USB/USBC1.TX+1") (pintype "passive") (tstamp cbb06b54-3288-4a03-a42b-42f2df156f84))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -10927,7 +10919,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 4a3bc6c2-4606-4554-8aee-916950cf142b))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp cf7b6548-c39a-4c33-b599-a58181878fd4))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1345 "/USBC1/EN_CHARGE") (pintype "passive") (tstamp acbddcf2-263a-4223-9f38-d9e2564fb7d8))
+      (net 1337 "/USBC1/EN_CHARGE") (pintype "passive") (tstamp acbddcf2-263a-4223-9f38-d9e2564fb7d8))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 32a312c5-2247-4892-bdc7-c92f305570c1))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -11046,9 +11038,9 @@
     (fp_line (start 0.3 0.15) (end -0.3 0.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7cde349a-c1c9-4d05-a135-eb8607e9afa0))
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1289 "/USBC0/RXC2+") (pintype "passive") (tstamp 5668fa5c-4d26-46c8-9c17-a33ced549782))
+      (net 1281 "/USBC0/RXC2+") (pintype "passive") (tstamp 5668fa5c-4d26-46c8-9c17-a33ced549782))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1288 "/USBC0/RXJ2+") (pintype "passive") (tstamp f2e98b96-40ef-495c-b47b-9a1ab00f55ca))
+      (net 1280 "/USBC0/RXJ2+") (pintype "passive") (tstamp f2e98b96-40ef-495c-b47b-9a1ab00f55ca))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11106,7 +11098,7 @@
     (pad "1" smd roundrect (at -0.32 0 90) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 2833e2b0-60d2-4713-9b40-b4a9f12fc22a))
     (pad "2" smd roundrect (at 0.32 0 90) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1303 "/USBC0/TXC1-") (pinfunction "A2") (pintype "passive") (tstamp 174941ce-3c6f-4a26-b078-9bd4f2e4ac9e))
+      (net 1295 "/USBC0/TXC1-") (pinfunction "A2") (pintype "passive") (tstamp 174941ce-3c6f-4a26-b078-9bd4f2e4ac9e))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11158,7 +11150,7 @@
     (fp_line (start 0.8 0.4) (end -0.8 0.4)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ba81e2ad-1763-4b19-8fa7-61904044a59b))
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1335 "/USBC0/PPHV") (pintype "passive") (tstamp b41eb5d0-e687-488f-8cc6-554950d13d4a))
+      (net 1327 "/USBC0/PPHV") (pintype "passive") (tstamp b41eb5d0-e687-488f-8cc6-554950d13d4a))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp e0efe23e-663e-4199-bdb4-4afbc6834470))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
@@ -11210,7 +11202,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp e139d50c-98b0-4192-b6a9-ea8dbed29310))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 7ec849c0-729d-4233-9e12-824d8180e9f1))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1427 "/VCCINAUX/TRIP") (pintype "passive") (tstamp e161b1c0-2e18-4c75-b06b-87eea77c42c6))
+      (net 1419 "/VCCINAUX/TRIP") (pintype "passive") (tstamp e161b1c0-2e18-4c75-b06b-87eea77c42c6))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 4affab51-1ab9-4ec8-97c3-e6dbdb8d8a5a))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -11266,7 +11258,7 @@
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 35e2eeea-6662-4a70-a520-649c0794ac5d))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1417 "VCCGT") (pintype "passive") (tstamp d64934d3-c987-41c5-8f74-02005501a4be))
+      (net 1409 "VCCGT") (pintype "passive") (tstamp d64934d3-c987-41c5-8f74-02005501a4be))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11316,9 +11308,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 76b4793d-273c-4130-a82a-a2a9829d21a6))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 76d4c9d3-f0b2-44d5-a6f8-c33541612aef))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1258 "/CHARGER/SRP") (pintype "passive") (tstamp 5536cb26-8893-4ea2-9184-773f6987e75d))
+      (net 1250 "/CHARGER/SRP") (pintype "passive") (tstamp 5536cb26-8893-4ea2-9184-773f6987e75d))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1240 "/CHARGER/BATR1") (pintype "passive") (tstamp 702e9c83-16aa-468a-8a19-c93edcf089d9))
+      (net 1232 "/CHARGER/BATR1") (pintype "passive") (tstamp 702e9c83-16aa-468a-8a19-c93edcf089d9))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11481,7 +11473,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp c1285b7d-b375-4b77-b927-864c574873cb))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp c217ea26-e512-4126-a788-13e171c38f6f))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp c217ea26-e512-4126-a788-13e171c38f6f))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11534,9 +11526,9 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 08c59555-2404-4e16-b377-9f432ae6e1e4))
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1228 "/CHARGER/SW1") (pintype "passive") (tstamp 7dace836-848a-4091-a81c-b2ea79652049))
+      (net 1220 "/CHARGER/SW1") (pintype "passive") (tstamp 7dace836-848a-4091-a81c-b2ea79652049))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1229 "/CHARGER/BST1") (pintype "passive") (tstamp 25bb32b2-0082-482a-a244-9efca948ce22))
+      (net 1221 "/CHARGER/BST1") (pintype "passive") (tstamp 25bb32b2-0082-482a-a244-9efca948ce22))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11587,7 +11579,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 89739942-4b81-4314-8bbf-7eb5dbac5892))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 22ae4140-0871-4925-9770-548d1e10dff5))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1313 "/USBC2/TXC1+") (pintype "passive") (tstamp 85f30782-93c2-4340-a903-6f43e7be7b41))
+      (net 1305 "/USBC2/TXC1+") (pintype "passive") (tstamp 85f30782-93c2-4340-a903-6f43e7be7b41))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 435 "/CPU_USB/USBC2.TX+1") (pintype "passive") (tstamp f44b408e-19f8-40e3-a52d-3c75cdfffc91))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -11692,9 +11684,9 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp ce84c56f-6698-4f5e-a333-1a25bf4fcf67))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 8f57cb59-5db3-427a-9eb2-0eff8200d57c))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1389 "Net-(Q9-G)") (pintype "passive") (tstamp c06bc3ad-d1ff-4726-b6c8-1b140d9436de))
+      (net 1381 "Net-(Q9-G)") (pintype "passive") (tstamp c06bc3ad-d1ff-4726-b6c8-1b140d9436de))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1245 "/CHARGER/VIN") (pintype "passive") (tstamp a1fbb5b7-3f7c-49e9-907c-04c4072dce10))
+      (net 1237 "/CHARGER/VIN") (pintype "passive") (tstamp a1fbb5b7-3f7c-49e9-907c-04c4072dce10))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11745,7 +11737,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 19da80cd-8664-4c22-a7b2-01f3882d6d26))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 738a9ab4-4132-4bc3-9d84-fcb27bf8a4c1))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1401 "/USBC3/OVP") (pintype "passive") (tstamp a8c0c1b6-7b34-4cbf-bce6-046ebc8a8912))
+      (net 1393 "/USBC3/OVP") (pintype "passive") (tstamp a8c0c1b6-7b34-4cbf-bce6-046ebc8a8912))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 870fe0d9-6c97-4b64-a7b7-83abccc88b97))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -11798,9 +11790,9 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 8a913454-f999-414e-8683-e682820229f6))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 4f750b4c-0542-4c21-b579-a455cb83bce5))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1386 "Net-(Q6-G)") (pintype "passive") (tstamp 7c54d63c-4055-45c0-88b6-357b20cddc5d))
+      (net 1378 "Net-(Q6-G)") (pintype "passive") (tstamp 7c54d63c-4055-45c0-88b6-357b20cddc5d))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1245 "/CHARGER/VIN") (pintype "passive") (tstamp 7fda3692-f2ff-4bfb-989f-8ed099c70a9d))
+      (net 1237 "/CHARGER/VIN") (pintype "passive") (tstamp 7fda3692-f2ff-4bfb-989f-8ed099c70a9d))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11854,7 +11846,7 @@
     (pad "1" smd roundrect (at -0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 74dbf80d-4411-41c4-a8f7-4f5887afa492))
     (pad "2" smd roundrect (at 0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp e7246230-1044-4c30-8852-39da95adceb4))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp e7246230-1044-4c30-8852-39da95adceb4))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -11906,7 +11898,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 38197dae-c8ec-40ab-8c2a-233e451386ef))
     (pad "1" smd roundrect (at -0.8375 0 270) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1234 "/CHARGER/VSYS") (pintype "passive") (tstamp 71a9197c-9fa5-420f-a27f-9a5cd37c2121))
+      (net 1226 "/CHARGER/VSYS") (pintype "passive") (tstamp 71a9197c-9fa5-420f-a27f-9a5cd37c2121))
     (pad "2" smd roundrect (at 0.8375 0 270) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 5ca5a436-2a6d-4d08-8c62-bdd8e13fb1f3))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -11959,7 +11951,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp b815e452-8667-4672-b18b-194cc7e52cba))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp a68a8e68-2090-4af0-8195-d0e5f2728aba))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1299 "/USBC3/RXC2-") (pintype "passive") (tstamp 03ec4100-cae7-4bfa-9c1f-1eed661eea01))
+      (net 1291 "/USBC3/RXC2-") (pintype "passive") (tstamp 03ec4100-cae7-4bfa-9c1f-1eed661eea01))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 455 "/CPU_USB/USBC3.RX-2") (pintype "passive") (tstamp a66578a7-e700-4df9-b601-a4d08348ac09))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -12012,9 +12004,9 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp f9cee161-af77-4412-8333-6fb10f9be3fd))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp d0264262-6816-4810-a5ba-a040a236a68e))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1386 "Net-(Q6-G)") (pintype "passive") (tstamp 17346da7-6526-4a8b-bf7d-ede7ba7fbeb4))
+      (net 1378 "Net-(Q6-G)") (pintype "passive") (tstamp 17346da7-6526-4a8b-bf7d-ede7ba7fbeb4))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1390 "Net-(Q10-D)") (pintype "passive") (tstamp 21106402-e2de-4c52-9acf-5096bae8c2d7))
+      (net 1382 "Net-(Q10-D)") (pintype "passive") (tstamp 21106402-e2de-4c52-9acf-5096bae8c2d7))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -12067,9 +12059,9 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c740da5c-0a1e-4368-8001-333532bd1fd2))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1209 "+1V8") (pintype "passive") (tstamp c23dc997-8597-413a-b114-d8772de9c765))
+      (net 1201 "+1V8") (pintype "passive") (tstamp c23dc997-8597-413a-b114-d8772de9c765))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1206 "Net-(C46-Pad1)") (pintype "passive") (tstamp 2d7a1ade-6bac-431d-82cc-4b5373f6eccd))
+      (net 1198 "Net-(C46-Pad1)") (pintype "passive") (tstamp 2d7a1ade-6bac-431d-82cc-4b5373f6eccd))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -12120,9 +12112,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 1c879eeb-0a8e-45c9-9321-9fbb27ad06a8))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp f4ab0b90-0786-43a0-a76e-59c920cabc76))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1209 "+1V8") (pintype "passive") (tstamp 42d264f3-aa77-4332-a715-8ce36c772bcb))
+      (net 1201 "+1V8") (pintype "passive") (tstamp 42d264f3-aa77-4332-a715-8ce36c772bcb))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1344 "/C_RIGHT_SDA") (pintype "passive") (tstamp f192859f-aa99-48d9-8de6-6de1f8643b5b))
+      (net 1336 "/C_RIGHT_SDA") (pintype "passive") (tstamp f192859f-aa99-48d9-8de6-6de1f8643b5b))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -12175,9 +12167,9 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 956b8891-16d4-4f7c-9016-e1b93177b2cb))
     (pad "1" smd roundrect (at -0.8375 0 180) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1257 "/CHARGER/SRN1") (pintype "passive") (tstamp ba30c58c-7705-4ac8-b92e-3c4d555adacb))
+      (net 1249 "/CHARGER/SRN1") (pintype "passive") (tstamp ba30c58c-7705-4ac8-b92e-3c4d555adacb))
     (pad "2" smd roundrect (at 0.8375 0 180) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1240 "/CHARGER/BATR1") (pintype "passive") (tstamp ef63a2aa-bb2d-4973-b24d-06edb313673a))
+      (net 1232 "/CHARGER/BATR1") (pintype "passive") (tstamp ef63a2aa-bb2d-4973-b24d-06edb313673a))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -12229,7 +12221,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f6bb95eb-0627-4ed2-bba6-345ca3b73e67))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1234 "/CHARGER/VSYS") (pintype "passive") (tstamp b25eaa74-badb-47b2-b4c7-d6e531f794ba))
+      (net 1226 "/CHARGER/VSYS") (pintype "passive") (tstamp b25eaa74-badb-47b2-b4c7-d6e531f794ba))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp d8b5cc34-52f5-4fe8-96cc-1149e65330f7))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -12337,7 +12329,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 13d05ab6-810d-4b88-8311-03b5e4bf978c))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 74b13293-595c-4315-8dea-cc6bedcfc252))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1395 "/USBC1/SOURCE") (pintype "passive") (tstamp e04545a0-1e77-499d-a8ec-1963f62701b5))
+      (net 1387 "/USBC1/SOURCE") (pintype "passive") (tstamp e04545a0-1e77-499d-a8ec-1963f62701b5))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 450c65ed-779f-438f-8c1f-6f853ff356b9))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -12397,7 +12389,7 @@
     (pad "1" smd roundrect (at -0.32 0 270) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 787b9330-c223-428e-9387-435e53606ad6))
     (pad "2" smd roundrect (at 0.32 0 270) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1287 "/USBC0/RXC2-") (pinfunction "A2") (pintype "passive") (tstamp 5dff36df-3b77-433c-a4dd-f9571ac4ae26))
+      (net 1279 "/USBC0/RXC2-") (pinfunction "A2") (pintype "passive") (tstamp 5dff36df-3b77-433c-a4dd-f9571ac4ae26))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -12448,7 +12440,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 60d4a886-d09c-407e-8713-e321d7887e87))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 5f08eaa3-1662-44ba-b318-ea2d01b4a140))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1304 "/USBC0/TXJ1+") (pintype "passive") (tstamp 57de6e67-89d1-4e96-91a4-7304b961e929))
+      (net 1296 "/USBC0/TXJ1+") (pintype "passive") (tstamp 57de6e67-89d1-4e96-91a4-7304b961e929))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 8d10aa17-40c7-4b6e-9022-4b80d0ab4610))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -12504,7 +12496,7 @@
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp bd46839b-2431-41b6-9089-4c888c2bd721))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp 6179d23c-c74c-4aca-8c84-264b332535ab))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp 6179d23c-c74c-4aca-8c84-264b332535ab))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -12620,25 +12612,25 @@
     (pad "" smd roundrect (at 0.475 -0.475 180) (size 0.75 0.75) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 4abdc5cb-5257-43da-95df-7e5e2dedcd19))
     (pad "" smd roundrect (at 0.475 0.475 180) (size 0.75 0.75) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 40793860-d27c-491a-be2c-c1a72287b2d5))
     (pad "1" smd roundrect (at -1.4 -0.8 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1367 "/USBC1/C_SBU1") (pinfunction "C_SBU1") (pintype "bidirectional") (tstamp babd2cad-36fa-4319-adbd-c81158a033db))
+      (net 1359 "/USBC1/C_SBU1") (pinfunction "C_SBU1") (pintype "bidirectional") (tstamp babd2cad-36fa-4319-adbd-c81158a033db))
     (pad "2" smd roundrect (at -1.4 -0.4 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1369 "/USBC1/C_SBU2") (pinfunction "C_SBU2") (pintype "bidirectional") (tstamp c5eeef27-ca81-4b7c-b238-7daa7d6f3e55))
+      (net 1361 "/USBC1/C_SBU2") (pinfunction "C_SBU2") (pintype "bidirectional") (tstamp c5eeef27-ca81-4b7c-b238-7daa7d6f3e55))
     (pad "3" smd roundrect (at -1.4 0 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1359 "/USBC1/VB_ESD") (pinfunction "VBIAS") (pintype "passive") (tstamp 65d3928c-be2a-45df-8ca6-9b2009b1cbd6))
+      (net 1351 "/USBC1/VB_ESD") (pinfunction "VBIAS") (pintype "passive") (tstamp 65d3928c-be2a-45df-8ca6-9b2009b1cbd6))
     (pad "4" smd roundrect (at -1.4 0.4 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1366 "/USBC1/C_CC1") (pinfunction "C_CC1") (pintype "bidirectional") (tstamp 87613778-8dd0-4f0a-8b3d-971f9056bd4d))
+      (net 1358 "/USBC1/C_CC1") (pinfunction "C_CC1") (pintype "bidirectional") (tstamp 87613778-8dd0-4f0a-8b3d-971f9056bd4d))
     (pad "5" smd roundrect (at -1.4 0.8 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1368 "/USBC1/C_CC2") (pinfunction "C_CC2") (pintype "bidirectional") (tstamp 45e4da8a-34f5-4488-9cd3-38a0a2c15c96))
+      (net 1360 "/USBC1/C_CC2") (pinfunction "C_CC2") (pintype "bidirectional") (tstamp 45e4da8a-34f5-4488-9cd3-38a0a2c15c96))
     (pad "6" smd roundrect (at -0.8 1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1368 "/USBC1/C_CC2") (pinfunction "RPD_G2") (pintype "bidirectional") (tstamp c5e60235-17c0-4767-805d-2b1fa5582f24))
+      (net 1360 "/USBC1/C_CC2") (pinfunction "RPD_G2") (pintype "bidirectional") (tstamp c5e60235-17c0-4767-805d-2b1fa5582f24))
     (pad "7" smd roundrect (at -0.4 1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1366 "/USBC1/C_CC1") (pinfunction "RPD_G1") (pintype "bidirectional") (tstamp ef7d4cae-114f-4c1a-b7b9-d991a3bd4527))
+      (net 1358 "/USBC1/C_CC1") (pinfunction "RPD_G1") (pintype "bidirectional") (tstamp ef7d4cae-114f-4c1a-b7b9-d991a3bd4527))
     (pad "8" smd roundrect (at 0 1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (tstamp bb1e87a5-72ea-4995-841a-878839db9c9f))
     (pad "9" smd roundrect (at 0.4 1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1342 "/USBC1/~{PROT_FLT}") (pinfunction "~{FLT}") (pintype "open_collector") (tstamp 37297089-bf4e-4979-bd07-ed9f3c02c36b))
+      (net 1334 "/USBC1/~{PROT_FLT}") (pinfunction "~{FLT}") (pintype "open_collector") (tstamp 37297089-bf4e-4979-bd07-ed9f3c02c36b))
     (pad "10" smd roundrect (at 0.8 1.4 270) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1267 "/USBC1/VLDO") (pinfunction "VPWR") (pintype "power_in") (tstamp 5924ab7c-e321-4fd4-97ee-b7514fc40553))
+      (net 1259 "/USBC1/VLDO") (pinfunction "VPWR") (pintype "power_in") (tstamp 5924ab7c-e321-4fd4-97ee-b7514fc40553))
     (pad "11" smd roundrect (at 1.4 0.8 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 79 "/USBC1/CC1") (pinfunction "CC1") (pintype "bidirectional") (tstamp 1dc3976b-f16a-4662-bda9-44a7676a9dc3))
     (pad "12" smd roundrect (at 1.4 0.4 180) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -12714,7 +12706,7 @@
     (pad "1" smd roundrect (at -0.7 0 270) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 61e79c3a-4ef6-4019-9cd9-6c26f8db960e))
     (pad "2" smd roundrect (at 0.7 0 270) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp 89830d95-6e30-40d9-a3a2-a1430d03fd73))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp 89830d95-6e30-40d9-a3a2-a1430d03fd73))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -12764,9 +12756,9 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 5a3c3e74-866c-488d-b862-31f6ded826f5))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 393ebdd1-aab3-4aa5-a3d0-cdbb9f9e32a7))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp 770a724f-d457-4e21-ae45-9f912013b2b3))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp 770a724f-d457-4e21-ae45-9f912013b2b3))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1428 "/VCCINAUX/VCCINAUX_SENSE") (pintype "passive") (tstamp 37e36746-99f7-42fd-858e-13ec78090802))
+      (net 1420 "/VCCINAUX/VCCINAUX_SENSE") (pintype "passive") (tstamp 37e36746-99f7-42fd-858e-13ec78090802))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -12816,7 +12808,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp df966db1-7af4-4d0d-ac2b-2f76ca26aaa9))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp daae272f-07c9-4fcd-9478-e70447447fe0))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1256 "/CHARGER/PSYS") (pintype "passive") (tstamp 913dd924-807f-43b8-b359-364b9188ff38))
+      (net 1248 "/CHARGER/PSYS") (pintype "passive") (tstamp 913dd924-807f-43b8-b359-364b9188ff38))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp a39571a6-2bb4-4bc9-889a-8b1a17d0d1ca))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -12876,7 +12868,7 @@
     (pad "1" smd roundrect (at -0.32 0 90) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 0d738597-e005-4a8b-b4d3-8d2e26a43a42))
     (pad "2" smd roundrect (at 0.32 0 90) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1307 "/USBC1/TXC1-") (pinfunction "A2") (pintype "passive") (tstamp 7404245b-5d03-444e-a675-0c8c5e57b280))
+      (net 1299 "/USBC1/TXC1-") (pinfunction "A2") (pintype "passive") (tstamp 7404245b-5d03-444e-a675-0c8c5e57b280))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -12931,7 +12923,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 5851d942-1ec3-4403-9d6e-266ad54931aa))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1230 "/CHARGER/LODRV1") (pintype "passive") (tstamp 3d805547-6dda-4012-9155-cf01162d8d96))
+      (net 1222 "/CHARGER/LODRV1") (pintype "passive") (tstamp 3d805547-6dda-4012-9155-cf01162d8d96))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -12984,7 +12976,7 @@
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 78 "/USBC1/VBUS") (pintype "passive") (tstamp 1734dbae-e834-47f4-8531-89418b9926b9))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1399 "/USBC1/OVP") (pintype "passive") (tstamp 5b32e0de-30be-47ff-9629-9cbf47d07dab))
+      (net 1391 "/USBC1/OVP") (pintype "passive") (tstamp 5b32e0de-30be-47ff-9629-9cbf47d07dab))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -13038,7 +13030,7 @@
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp defc5d57-925f-44f1-a3c2-b9b5080fb55e))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1417 "VCCGT") (pintype "passive") (tstamp cfb9062d-16fc-400d-9e69-7e211dce29ad))
+      (net 1409 "VCCGT") (pintype "passive") (tstamp cfb9062d-16fc-400d-9e69-7e211dce29ad))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -13090,7 +13082,7 @@
     (fp_line (start 0.8 0.4) (end -0.8 0.4)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 00406278-0345-4146-bbfa-093eb296eb2b))
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1216 "Net-(C52-Pad1)") (pintype "passive") (tstamp a06f20fd-903a-46bd-b6ed-36135bbe0dcd))
+      (net 1208 "Net-(C52-Pad1)") (pintype "passive") (tstamp a06f20fd-903a-46bd-b6ed-36135bbe0dcd))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 353c9f37-75c3-4c1b-8c32-4ab31c7ddcfb))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
@@ -13143,7 +13135,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp bf528583-9918-46f3-b11e-3f8db84afc60))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp dcfff543-2c24-4346-9861-ec7371c9f9cd))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1312 "/USBC2/TXJ1+") (pintype "passive") (tstamp 50fdf1e3-45ff-4063-9615-30247206ea11))
+      (net 1304 "/USBC2/TXJ1+") (pintype "passive") (tstamp 50fdf1e3-45ff-4063-9615-30247206ea11))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 5abc98b6-7904-4999-bb60-4d206e34fab9))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -13201,7 +13193,7 @@
     (fp_line (start 3.65 2.15) (end 3.65 -2.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 36492fe2-a91c-427f-934f-a25208225ae9))
     (pad "1" smd roundrect (at -3.1125 0 180) (size 2.075 2.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.120482)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp 73f92980-ffcc-4b89-9ca3-bd03392677bb))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp 73f92980-ffcc-4b89-9ca3-bd03392677bb))
     (pad "2" smd roundrect (at 3.1125 0 180) (size 2.075 2.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.120482)
       (net 2 "GND") (pintype "passive") (tstamp 94a2682d-f6e0-44f1-b1cf-b3943a6c14c9))
     (model "${KICAD6_3DMODEL_DIR}/Capacitor_Tantalum_SMD.3dshapes/CP_EIA-7343-20_Kemet-V.wrl"
@@ -13256,7 +13248,7 @@
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 75 "/USBC0/VBUS") (pintype "passive") (tstamp 4bfe62a9-77e1-4a47-9f4b-1eeed42c38c4))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1398 "/USBC0/OVP") (pintype "passive") (tstamp f9843789-fe3f-4bde-b330-d4424a7ce354))
+      (net 1390 "/USBC0/OVP") (pintype "passive") (tstamp f9843789-fe3f-4bde-b330-d4424a7ce354))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -13307,9 +13299,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 19d98df7-379e-44d8-93c9-ebe12678c3e6))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 5f5d7476-c996-43c1-ae3d-d4e6f9c6fa2f))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1209 "+1V8") (pintype "passive") (tstamp 6980aedf-88cb-4e2b-899b-c025ddeb906a))
+      (net 1201 "+1V8") (pintype "passive") (tstamp 6980aedf-88cb-4e2b-899b-c025ddeb906a))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1208 "/CPU_POWER/FB18") (pintype "passive") (tstamp 0328e38f-72f7-4800-8e56-9c48f550eda7))
+      (net 1200 "/CPU_POWER/FB18") (pintype "passive") (tstamp 0328e38f-72f7-4800-8e56-9c48f550eda7))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -13361,7 +13353,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9ed3ba97-820d-4df3-b0d7-bcbcb8f739b1))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1245 "/CHARGER/VIN") (pintype "passive") (tstamp 891ce846-b470-4152-9248-5b84e803deb3))
+      (net 1237 "/CHARGER/VIN") (pintype "passive") (tstamp 891ce846-b470-4152-9248-5b84e803deb3))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 1c1c0cf3-1824-4085-a9a0-99d0cb6f0fe6))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -13417,7 +13409,7 @@
     (pad "1" smd roundrect (at -0.45 0 270) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 0d06b5fc-dd95-4294-87a5-e07bccfc2263))
     (pad "2" smd roundrect (at 0.45 0 270) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp e98be050-6d12-4ec7-845e-7fcd36bbc499))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp e98be050-6d12-4ec7-845e-7fcd36bbc499))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -13577,9 +13569,9 @@
     (fp_line (start 3 3) (end 3 -3)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 08374182-3e6e-4cee-9503-bd483242c8db))
     (pad "1" smd rect (at -2.075 0) (size 2.35 5.1) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1213 "/CPU_POWER/SW18") (pinfunction "1") (pintype "passive") (tstamp 5746e163-0ea2-4c8d-a529-645eea14aa4f))
+      (net 1205 "/CPU_POWER/SW18") (pinfunction "1") (pintype "passive") (tstamp 5746e163-0ea2-4c8d-a529-645eea14aa4f))
     (pad "2" smd rect (at 2.075 0) (size 2.35 5.1) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1206 "Net-(C46-Pad1)") (pinfunction "2") (pintype "passive") (tstamp 46a10604-7ce9-4f81-a16f-44efa8660177))
+      (net 1198 "Net-(C46-Pad1)") (pinfunction "2") (pintype "passive") (tstamp 46a10604-7ce9-4f81-a16f-44efa8660177))
     (model "${KICAD6_3DMODEL_DIR}/Inductor_SMD.3dshapes/L_Bourns_SRN6045TA.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -13633,7 +13625,7 @@
     (pad "1" smd roundrect (at -0.45 0 90) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp db2770f2-a7ba-4a86-a697-2b27b55dc394))
     (pad "2" smd roundrect (at 0.45 0 90) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp 987bc5dd-4f9c-4c00-911e-ecd48412bd62))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp 987bc5dd-4f9c-4c00-911e-ecd48412bd62))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -13701,9 +13693,9 @@
     (pad "3" smd rect (at -1.44 0.33) (size 0.63 0.5) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "S") (pintype "passive") (tstamp 5ac23c48-5dc3-4ec8-885e-d465a83995c5))
     (pad "4" smd rect (at -1.44 0.97) (size 0.63 0.5) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1230 "/CHARGER/LODRV1") (pinfunction "G") (pintype "passive") (tstamp 20dbe594-754c-4368-98e7-25d131e8c2ec))
+      (net 1222 "/CHARGER/LODRV1") (pinfunction "G") (pintype "passive") (tstamp 20dbe594-754c-4368-98e7-25d131e8c2ec))
     (pad "5" smd custom (at 0.385 0) (size 1.9 2.45) (layers "F.Cu" "F.Mask")
-      (net 1228 "/CHARGER/SW1") (pinfunction "D") (pintype "passive") (thermal_bridge_angle 45)
+      (net 1220 "/CHARGER/SW1") (pinfunction "D") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -13830,9 +13822,9 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a7149b72-cb2d-4fb3-a6e4-cc8c532e3f28))
     (pad "1" smd roundrect (at -0.45 0 270) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1411 "Net-(U26-BST)") (pintype "passive") (tstamp cf405e63-9932-404d-9bf9-eca7ca7f0666))
+      (net 1403 "Net-(U26-BST)") (pintype "passive") (tstamp cf405e63-9932-404d-9bf9-eca7ca7f0666))
     (pad "2" smd roundrect (at 0.45 0 270) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1412 "Net-(U26-SW)") (pintype "passive") (tstamp 7d21d6d9-1db3-4576-8535-970ffef9590b))
+      (net 1404 "Net-(U26-SW)") (pintype "passive") (tstamp 7d21d6d9-1db3-4576-8535-970ffef9590b))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -13883,7 +13875,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp c17793c5-f99a-4f0d-bc56-9d59b13b5202))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 42ccb02d-4f54-4295-ac3d-ec94c812b0ff))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1289 "/USBC0/RXC2+") (pintype "passive") (tstamp da540411-6e94-43bb-9e7b-2971633fa3cb))
+      (net 1281 "/USBC0/RXC2+") (pintype "passive") (tstamp da540411-6e94-43bb-9e7b-2971633fa3cb))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 434 "/CPU_USB/USBC0.RX+2") (pintype "passive") (tstamp 78568509-2a6e-4ea3-a6e8-be4fc46b8b00))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -13936,7 +13928,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 01648587-96df-4d18-bfa8-745f47b0650f))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp fa3752d6-e279-4fc4-9b18-0a670dbe06ca))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1300 "/USBC3/RXJ2+") (pintype "passive") (tstamp 9c48cbcb-2107-4113-8a4f-9e34e160a976))
+      (net 1292 "/USBC3/RXJ2+") (pintype "passive") (tstamp 9c48cbcb-2107-4113-8a4f-9e34e160a976))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 3297322b-ca92-4eac-b600-0bae34d3c0a1))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -13988,7 +13980,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 8f038c7f-91b5-40b3-8771-0d8ad090176f))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp b8195d4e-6736-48e5-a871-ca3783105eb2))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1424 "/VCCINAUX/V1") (pintype "passive") (tstamp 82dd1473-78e5-4c8c-8552-b42e9ccd692c))
+      (net 1416 "/VCCINAUX/V1") (pintype "passive") (tstamp 82dd1473-78e5-4c8c-8552-b42e9ccd692c))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp c7df7367-fc8f-4a91-b3cf-ee4059782df8))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -14041,7 +14033,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp ba1becf0-3432-4de4-8e26-20f96ffe0833))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 8f8034e9-df7e-4977-823b-382897f40acb))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1293 "/USBC1/RXC2+") (pintype "passive") (tstamp 43b3cced-897d-412b-8030-56b52b90009b))
+      (net 1285 "/USBC1/RXC2+") (pintype "passive") (tstamp 43b3cced-897d-412b-8030-56b52b90009b))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 423 "/CPU_USB/USBC1.RX+2") (pintype "passive") (tstamp b0435ed3-58c8-4fa2-8d9e-a720d66899a9))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -14097,7 +14089,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 4c2a621f-281f-4304-a22e-0e272e72038f))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp 068eeddb-1889-42ee-aff7-10a76d9471f8))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp 068eeddb-1889-42ee-aff7-10a76d9471f8))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -14264,7 +14256,7 @@
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 72 "/USBC1/BYP") (pintype "passive") (tstamp 81072917-3040-4c9a-80be-6ff9281c8380))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1383 "/USBC1/~{FAULT}") (pintype "passive") (tstamp ab838c9e-6c3a-4144-b11d-3527f8faeb98))
+      (net 1375 "/USBC1/~{FAULT}") (pintype "passive") (tstamp ab838c9e-6c3a-4144-b11d-3527f8faeb98))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -14317,7 +14309,7 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7742dbbb-a4be-4c19-9a5c-91ad69a19262))
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1241 "/CHARGER/ACP") (pintype "passive") (tstamp ab11df3d-95a6-4674-8d27-58861d054a68))
+      (net 1233 "/CHARGER/ACP") (pintype "passive") (tstamp ab11df3d-95a6-4674-8d27-58861d054a68))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 05af0bc8-322e-45a0-a663-b1b7270dd067))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -14422,9 +14414,9 @@
     (fp_line (start 0.3 0.15) (end -0.3 0.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1c7f3c5b-d30a-4711-be23-221a2acd7633))
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1309 "/USBC1/TXC1+") (pintype "passive") (tstamp adcff882-9616-4bc6-bab3-6ad81b3b4681))
+      (net 1301 "/USBC1/TXC1+") (pintype "passive") (tstamp adcff882-9616-4bc6-bab3-6ad81b3b4681))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1308 "/USBC1/TXJ1+") (pintype "passive") (tstamp f4ec2086-5400-4163-8dfc-4ea522ee30ff))
+      (net 1300 "/USBC1/TXJ1+") (pintype "passive") (tstamp f4ec2086-5400-4163-8dfc-4ea522ee30ff))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -14478,7 +14470,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 1583ac95-2119-4889-ae61-68698a25cd74))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1417 "VCCGT") (pintype "passive") (tstamp 2f10a29c-860d-40b1-9d50-7b907c5c2935))
+      (net 1409 "VCCGT") (pintype "passive") (tstamp 2f10a29c-860d-40b1-9d50-7b907c5c2935))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -14529,7 +14521,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 1aed8e9d-c556-4e3e-a780-0bee99b463e3))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp fb2139d2-ba59-4559-a2ba-edf3b6c6a8c2))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1348 "/USBC2/~{PROT_FLT}") (pintype "passive") (tstamp 2683f189-07f8-4ca4-a242-6721cb857057))
+      (net 1340 "/USBC2/~{PROT_FLT}") (pintype "passive") (tstamp 2683f189-07f8-4ca4-a242-6721cb857057))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 73 "/USBC2/BYP") (pintype "passive") (tstamp 431a50d0-1268-4b87-b9d0-f4b1a50af5b0))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -14581,7 +14573,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 9cd2c045-ad18-4594-b2b7-3214aa525b08))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 9bb8f21e-2466-484e-b7b3-22888c06c11c))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1217 "/CPU_POWER/FB11") (pintype "passive") (tstamp 0cc01983-8963-4d9f-8a8b-f21850b2efcf))
+      (net 1209 "/CPU_POWER/FB11") (pintype "passive") (tstamp 0cc01983-8963-4d9f-8a8b-f21850b2efcf))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 152b8b9e-e682-4435-853b-22d82a51a356))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -14685,7 +14677,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp d9266e36-2ed9-412a-9955-fb8e74574e1d))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 4299f444-f21f-44d1-b47a-34ecfa9df980))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1303 "/USBC0/TXC1-") (pintype "passive") (tstamp e23e2f15-902d-42d0-a75f-7660b5481afd))
+      (net 1295 "/USBC0/TXC1-") (pintype "passive") (tstamp e23e2f15-902d-42d0-a75f-7660b5481afd))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 432 "/CPU_USB/USBC0.TX-1") (pintype "passive") (tstamp 9be21dc4-5bea-47fe-985d-a6ce20b2d58b))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -14738,7 +14730,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 7557212f-acfb-415e-984d-1367d4a28aaa))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 3e5e9ef7-6c36-4105-9ea8-026812daad72))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1317 "/USBC3/TXC1+") (pintype "passive") (tstamp e64816ca-f19a-487b-a349-7156d30c490a))
+      (net 1309 "/USBC3/TXC1+") (pintype "passive") (tstamp e64816ca-f19a-487b-a349-7156d30c490a))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 445 "/CPU_USB/USBC3.TX+1") (pintype "passive") (tstamp 62d5325d-a744-4120-bb30-4e56cb0ed1cc))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -14789,9 +14781,9 @@
     (fp_line (start 0.3 0.15) (end -0.3 0.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp baa8c202-c599-4874-b4ce-04874498ed5f))
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1297 "/USBC2/RXC2+") (pintype "passive") (tstamp 768b5173-3f44-431a-947c-40b43d46e6da))
+      (net 1289 "/USBC2/RXC2+") (pintype "passive") (tstamp 768b5173-3f44-431a-947c-40b43d46e6da))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1296 "/USBC2/RXJ2+") (pintype "passive") (tstamp 7de5936b-d80f-4ec6-ac81-77093449c75f))
+      (net 1288 "/USBC2/RXJ2+") (pintype "passive") (tstamp 7de5936b-d80f-4ec6-ac81-77093449c75f))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -14894,9 +14886,9 @@
     (fp_line (start 0.3 0.15) (end -0.3 0.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 850d295b-b96f-4ec4-8237-1dc8d012a6b9))
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1317 "/USBC3/TXC1+") (pintype "passive") (tstamp c9108139-c949-4d1e-b1e6-3d9d6d94967b))
+      (net 1309 "/USBC3/TXC1+") (pintype "passive") (tstamp c9108139-c949-4d1e-b1e6-3d9d6d94967b))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1316 "/USBC3/TXJ1+") (pintype "passive") (tstamp 1ac7f101-61c7-4404-a5dc-ce4530f54b43))
+      (net 1308 "/USBC3/TXJ1+") (pintype "passive") (tstamp 1ac7f101-61c7-4404-a5dc-ce4530f54b43))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -14949,7 +14941,7 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3d7bc904-4cfc-4695-97e3-281fd597bd46))
     (pad "1" smd roundrect (at -0.45 0 270) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1238 "/CHARGER/COMP1") (pintype "passive") (tstamp c5083d58-0d80-44ce-9f8a-dea92c96340b))
+      (net 1230 "/CHARGER/COMP1") (pintype "passive") (tstamp c5083d58-0d80-44ce-9f8a-dea92c96340b))
     (pad "2" smd roundrect (at 0.45 0 270) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 4b7c8dae-e8d1-43f6-8ae7-78f31c5f909d))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -15063,7 +15055,7 @@
     (pad "1" smd roundrect (at -0.32 0 90) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 21dbd64a-1099-4a39-8cc4-cf5b5456c53d))
     (pad "2" smd roundrect (at 0.32 0 90) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1293 "/USBC1/RXC2+") (pinfunction "A2") (pintype "passive") (tstamp 32aef483-2c0f-4777-995a-62ad90f1d34e))
+      (net 1285 "/USBC1/RXC2+") (pinfunction "A2") (pintype "passive") (tstamp 32aef483-2c0f-4777-995a-62ad90f1d34e))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -15166,9 +15158,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp bee4290d-de99-4fcb-8877-264b3b8e5978))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 4b76aa29-c66a-4984-8e87-ef0729a98c16))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1243 "Net-(Q1-D)") (pintype "passive") (tstamp 077470b7-475f-411a-9b5b-c4a92eecca8c))
+      (net 1235 "Net-(Q1-D)") (pintype "passive") (tstamp 077470b7-475f-411a-9b5b-c4a92eecca8c))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1242 "/CHARGER/ACN") (pintype "passive") (tstamp acfa589d-2f7e-4231-be62-a32e50a21c0a))
+      (net 1234 "/CHARGER/ACN") (pintype "passive") (tstamp acfa589d-2f7e-4231-be62-a32e50a21c0a))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -15238,23 +15230,23 @@
     (pad "" smd rect (at 1.94 0.55 270) (size 0.9 0.78) (layers "F.Paste") (tstamp bef07b0f-59c1-44ab-bae4-8fdaeceac533))
     (pad "" smd rect (at 1.94 1.65 270) (size 0.9 0.78) (layers "F.Paste") (tstamp f644b13d-6e33-4c1a-ad14-d080aa36fa77))
     (pad "1" smd rect (at -2.75 -1.905 270) (size 0.5 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1245 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 45e1b054-ade3-4a38-8e25-96c5977eda49))
+      (net 1237 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 45e1b054-ade3-4a38-8e25-96c5977eda49))
     (pad "2" smd rect (at -2.75 -0.635 270) (size 0.5 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1245 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 8bf98b03-93f9-4e91-a5c9-e73bde9ed4ca))
+      (net 1237 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 8bf98b03-93f9-4e91-a5c9-e73bde9ed4ca))
     (pad "3" smd rect (at -2.75 0.635 270) (size 0.5 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1245 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp c7421b42-8e96-45df-b873-af765292879e))
+      (net 1237 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp c7421b42-8e96-45df-b873-af765292879e))
     (pad "4" smd rect (at -2.75 1.905 270) (size 0.5 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1386 "Net-(Q6-G)") (pinfunction "G") (pintype "input") (tstamp 77cb284a-e6b6-4846-a00b-a6d0be03cee1))
+      (net 1378 "Net-(Q6-G)") (pinfunction "G") (pintype "input") (tstamp 77cb284a-e6b6-4846-a00b-a6d0be03cee1))
     (pad "5" smd rect (at 0.465 0 270) (size 4.6 4.12) (layers "F.Cu" "F.Mask")
-      (net 1335 "/USBC0/PPHV") (pinfunction "D") (pintype "passive") (tstamp 70e8feaf-a981-44ec-be66-5929131317c0))
+      (net 1327 "/USBC0/PPHV") (pinfunction "D") (pintype "passive") (tstamp 70e8feaf-a981-44ec-be66-5929131317c0))
     (pad "5" smd rect (at 2.8 -1.905 270) (size 0.5 0.55) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1335 "/USBC0/PPHV") (pinfunction "D") (pintype "passive") (tstamp c3b04d5d-5da4-41a1-ac30-674b04a62a14))
+      (net 1327 "/USBC0/PPHV") (pinfunction "D") (pintype "passive") (tstamp c3b04d5d-5da4-41a1-ac30-674b04a62a14))
     (pad "5" smd rect (at 2.8 -0.635 270) (size 0.5 0.55) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1335 "/USBC0/PPHV") (pinfunction "D") (pintype "passive") (tstamp ebd27d45-1282-4f52-a8f4-3629b4f61a37))
+      (net 1327 "/USBC0/PPHV") (pinfunction "D") (pintype "passive") (tstamp ebd27d45-1282-4f52-a8f4-3629b4f61a37))
     (pad "5" smd rect (at 2.8 0.635 270) (size 0.5 0.55) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1335 "/USBC0/PPHV") (pinfunction "D") (pintype "passive") (tstamp 7039e8d1-4bc6-4854-bbcc-7bbb3c796a8b))
+      (net 1327 "/USBC0/PPHV") (pinfunction "D") (pintype "passive") (tstamp 7039e8d1-4bc6-4854-bbcc-7bbb3c796a8b))
     (pad "5" smd rect (at 2.8 1.905 270) (size 0.5 0.55) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1335 "/USBC0/PPHV") (pinfunction "D") (pintype "passive") (tstamp c6e93e2d-9a71-4d9e-9472-787ba02815c9))
+      (net 1327 "/USBC0/PPHV") (pinfunction "D") (pintype "passive") (tstamp c6e93e2d-9a71-4d9e-9472-787ba02815c9))
     (model "${KICAD6_3DMODEL_DIR}/Package_DFN_QFN.3dshapes/AO_DFN-8-1EP_5.55x5.2mm_P1.27mm_EP4.12x4.6mm.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -15307,9 +15299,9 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp db5d1f8f-3496-453a-ae7b-244e79ef801d))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1218 "+1V1") (pintype "passive") (tstamp 832732ef-5594-4a2c-b3b7-658b41ca3617))
+      (net 1210 "+1V1") (pintype "passive") (tstamp 832732ef-5594-4a2c-b3b7-658b41ca3617))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1216 "Net-(C52-Pad1)") (pintype "passive") (tstamp 0d708f7a-eb0b-44a6-acbe-a64b868436d1))
+      (net 1208 "Net-(C52-Pad1)") (pintype "passive") (tstamp 0d708f7a-eb0b-44a6-acbe-a64b868436d1))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -15363,7 +15355,7 @@
     (pad "1" smd roundrect (at -0.7 0 270) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 0f94ee36-3cff-436f-8a35-fb2039b85008))
     (pad "2" smd roundrect (at 0.7 0 270) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp 747a817b-0d08-4495-9e3e-6cb741428c23))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp 747a817b-0d08-4495-9e3e-6cb741428c23))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -15415,7 +15407,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6d8dbaf2-47c9-4fa3-9174-6197dabdeef6))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1234 "/CHARGER/VSYS") (pintype "passive") (tstamp 1f6f2640-41b9-4bdd-a85c-8ad854235fa0))
+      (net 1226 "/CHARGER/VSYS") (pintype "passive") (tstamp 1f6f2640-41b9-4bdd-a85c-8ad854235fa0))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp fb0264a7-c5a5-4b91-8dbb-dbd75ec3cc26))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -15469,7 +15461,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a963bdce-fa3b-4203-9ee2-1bc18386c97e))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1234 "/CHARGER/VSYS") (pintype "passive") (tstamp c13e6b88-a274-4799-bde6-27da6b880d42))
+      (net 1226 "/CHARGER/VSYS") (pintype "passive") (tstamp c13e6b88-a274-4799-bde6-27da6b880d42))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp f5b3f464-9e28-49cd-a1ab-87d130a5a22a))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -15576,9 +15568,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp ed9b90c4-cf66-4ec0-8d10-9b0926f4cfaa))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp e8cf350a-5b4a-4b50-803f-6e63062e22ee))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1246 "+3.3V") (pintype "passive") (tstamp cda3b809-95ad-4419-a469-f4d01eaff67c))
+      (net 1238 "+3.3V") (pintype "passive") (tstamp cda3b809-95ad-4419-a469-f4d01eaff67c))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1248 "/CHRG_SCL") (pintype "passive") (tstamp b4b20faf-2ae7-4f21-b1dd-b9acc5c05142))
+      (net 1240 "/CHRG_SCL") (pintype "passive") (tstamp b4b20faf-2ae7-4f21-b1dd-b9acc5c05142))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -15629,7 +15621,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp def2d94c-cfeb-4f7f-84dc-44e617f65dbc))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 47869f9a-a64c-4cf9-b419-c5fd61ab7150))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1396 "/USBC2/SOURCE") (pintype "passive") (tstamp 6e878dfe-c227-41b8-9022-c7d55a3fe5ce))
+      (net 1388 "/USBC2/SOURCE") (pintype "passive") (tstamp 6e878dfe-c227-41b8-9022-c7d55a3fe5ce))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 939cdfc1-9e0f-4962-8776-3b8481730f4e))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -15684,7 +15676,7 @@
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 74 "/USBC3/BYP") (pintype "passive") (tstamp 457badfd-bea3-4249-9938-f412277fc0fc))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1385 "/USBC3/~{FAULT}") (pintype "passive") (tstamp 878863a2-f836-4dd6-8f3c-90a272c76648))
+      (net 1377 "/USBC3/~{FAULT}") (pintype "passive") (tstamp 878863a2-f836-4dd6-8f3c-90a272c76648))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -15734,9 +15726,9 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp adeb2b28-2f5f-41a2-b4ef-7e1ef5244d4c))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp d6aea2b3-4c56-43cb-be0e-38a9ebab6d6f))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1419 "/VCCINAUX/VREF") (pintype "passive") (tstamp a9b44e18-2269-43f8-9237-cf331526ad99))
+      (net 1411 "/VCCINAUX/VREF") (pintype "passive") (tstamp a9b44e18-2269-43f8-9237-cf331526ad99))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1422 "/VCCINAUX/V3") (pintype "passive") (tstamp aad3ce45-58fa-4295-a031-aa3eecab5dfc))
+      (net 1414 "/VCCINAUX/V3") (pintype "passive") (tstamp aad3ce45-58fa-4295-a031-aa3eecab5dfc))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -15790,7 +15782,7 @@
       (stroke (width 0.15) (type default)) (layer "F.Fab") (tstamp a2a38770-918a-4b14-bc40-a2d640c94fe1))
     (pad "1" smd roundrect (at -1.4 -0.9 270) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (chamfer_ratio 0.3) (chamfer top_left)
-      (net 1205 "/CPU_POWER/B18") (pinfunction "BST") (pintype "passive") (thermal_bridge_angle 45) (tstamp 84f4cc36-5027-49f7-a767-0df61e46e0f3))
+      (net 1197 "/CPU_POWER/B18") (pinfunction "BST") (pintype "passive") (thermal_bridge_angle 45) (tstamp 84f4cc36-5027-49f7-a767-0df61e46e0f3))
     (pad "2" smd roundrect (at -1.4 -0.45 90) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 800 "+VSW") (pinfunction "VIN") (pintype "power_in") (thermal_bridge_angle 45) (tstamp bcccfdd3-f500-4ad8-a2f4-a7ad2d8f7e05))
     (pad "3" smd roundrect (at -1.4 0 90) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -15802,40 +15794,40 @@
       (net 800 "+VSW") (pinfunction "VIN") (pintype "power_in") (thermal_bridge_angle 45) (tstamp 03c5b6c6-3859-48f8-b6a5-effafd065658))
     (pad "6" smd roundrect (at -0.9 1.4) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (chamfer_ratio 0.3) (chamfer top_left)
-      (net 1213 "/CPU_POWER/SW18") (pinfunction "SW") (pintype "passive") (thermal_bridge_angle 45) (tstamp 77f0f4a8-2148-4cd6-981f-c1dec171dda1))
+      (net 1205 "/CPU_POWER/SW18") (pinfunction "SW") (pintype "passive") (thermal_bridge_angle 45) (tstamp 77f0f4a8-2148-4cd6-981f-c1dec171dda1))
     (pad "7" smd roundrect (at -0.45 1.4 180) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (thermal_bridge_angle 45) (tstamp d890e37d-fa28-451c-a389-b74596c7b30a))
     (pad "8" smd roundrect (at 0 1.4 180) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (thermal_bridge_angle 45) (tstamp 9c6d8a51-5278-4421-b8a5-9e21ce76fb75))
     (pad "9" smd roundrect (at 0.45 1.4 180) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1210 "/CPU_POWER/PG18") (pinfunction "PG") (pintype "open_emitter") (thermal_bridge_angle 45) (tstamp 6908c0f9-041d-4f50-8087-c7999ca0b05e))
+      (net 1202 "/CPU_POWER/PG18") (pinfunction "PG") (pintype "open_emitter") (thermal_bridge_angle 45) (tstamp 6908c0f9-041d-4f50-8087-c7999ca0b05e))
     (pad "10" smd roundrect (at 0.9 1.4 180) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (chamfer_ratio 0.3) (chamfer bottom_left)
       (net 2 "GND") (pinfunction "NC") (pintype "passive") (thermal_bridge_angle 45) (tstamp dede9440-d137-46c8-b9c4-5da1b7412124))
     (pad "11" smd roundrect (at 1.4 0.9 90) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (chamfer_ratio 0.3) (chamfer top_left)
-      (net 1211 "unconnected-(U7-SS-Pad11)") (pinfunction "SS") (pintype "passive+no_connect") (thermal_bridge_angle 45) (tstamp f882bc54-a98f-496b-87ad-27c533c91fbe))
+      (net 1203 "unconnected-(U7-SS-Pad11)") (pinfunction "SS") (pintype "passive+no_connect") (thermal_bridge_angle 45) (tstamp f882bc54-a98f-496b-87ad-27c533c91fbe))
     (pad "12" smd roundrect (at 1.4 0.45 90) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1212 "/CPU_POWER/EN18") (pinfunction "EN") (pintype "input") (thermal_bridge_angle 45) (tstamp eb93df49-d1af-48e4-b7e1-50c4580336db))
+      (net 1204 "/CPU_POWER/EN18") (pinfunction "EN") (pintype "input") (thermal_bridge_angle 45) (tstamp eb93df49-d1af-48e4-b7e1-50c4580336db))
     (pad "13" smd roundrect (at 1.4 0 90) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "AGND") (pintype "power_in") (thermal_bridge_angle 45) (tstamp 3d2f2cde-00ef-4f2a-ba07-4837938db703))
     (pad "14" smd roundrect (at 1.4 -0.45 90) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1208 "/CPU_POWER/FB18") (pinfunction "FB") (pintype "passive") (thermal_bridge_angle 45) (tstamp 3ae22542-44d4-47f1-9519-64e4f9401348))
+      (net 1200 "/CPU_POWER/FB18") (pinfunction "FB") (pintype "passive") (thermal_bridge_angle 45) (tstamp 3ae22542-44d4-47f1-9519-64e4f9401348))
     (pad "15" smd roundrect (at 1.4 -0.9 270) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (chamfer_ratio 0.3) (chamfer bottom_left)
-      (net 1207 "/CPU_POWER/MODE18") (pinfunction "MODE") (pintype "input") (thermal_bridge_angle 45) (tstamp 7714eb66-4a75-4e73-a720-a69923e2dfed))
+      (net 1199 "/CPU_POWER/MODE18") (pinfunction "MODE") (pintype "input") (thermal_bridge_angle 45) (tstamp 7714eb66-4a75-4e73-a720-a69923e2dfed))
     (pad "16" smd roundrect (at 0.9 -1.4 180) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (chamfer_ratio 0.3) (chamfer top_left)
       (net 2 "GND") (pinfunction "NC") (pintype "passive") (thermal_bridge_angle 45) (tstamp bdb0f4ac-5764-41aa-8187-b2c6006ae15b))
     (pad "17" smd roundrect (at 0.45 -1.4 180) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1220 "/CPU_POWER/VCC18") (pinfunction "VCC") (pintype "passive") (thermal_bridge_angle 45) (tstamp 9042efd5-df72-4522-a843-9ce68d1645ac))
+      (net 1212 "/CPU_POWER/VCC18") (pinfunction "VCC") (pintype "passive") (thermal_bridge_angle 45) (tstamp 9042efd5-df72-4522-a843-9ce68d1645ac))
     (pad "18" smd roundrect (at 0 -1.4 180) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (thermal_bridge_angle 45) (tstamp 94747ac2-60ed-4d61-ac33-036b1f61deab))
     (pad "19" smd roundrect (at -0.45 -1.4 180) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1213 "/CPU_POWER/SW18") (pinfunction "SW") (pintype "passive") (thermal_bridge_angle 45) (tstamp c1258e36-6bcb-48df-84da-bf793c92b2c2))
+      (net 1205 "/CPU_POWER/SW18") (pinfunction "SW") (pintype "passive") (thermal_bridge_angle 45) (tstamp c1258e36-6bcb-48df-84da-bf793c92b2c2))
     (pad "20" smd roundrect (at -0.9 -1.4) (size 0.2 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (chamfer_ratio 0.3) (chamfer bottom_left)
-      (net 1213 "/CPU_POWER/SW18") (pinfunction "SW") (pintype "passive") (thermal_bridge_angle 45) (tstamp 74adbef9-7a0c-4cbe-b732-7e938c881c2f))
+      (net 1205 "/CPU_POWER/SW18") (pinfunction "SW") (pintype "passive") (thermal_bridge_angle 45) (tstamp 74adbef9-7a0c-4cbe-b732-7e938c881c2f))
     (pad "21" smd roundrect (at 0 0) (size 0.775 0.86) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.07407407407)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (solder_mask_margin -0.05) (solder_paste_margin -0.07) (thermal_bridge_angle 45) (tstamp f669fb8d-db2f-4bc5-84e2-435d027554f8))
     (model ":KICAD7_3DMODEL_DIR:Package_DFN_QFN.3dshapes/QFN-20-1EP_3x3mm_P0.45mm_EP1.6x1.6mm.step"
@@ -15891,7 +15883,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp f303d440-75f5-421a-9018-ec26d400de15))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp 27b9bfea-17d9-4234-8d03-5863936ee66c))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp 27b9bfea-17d9-4234-8d03-5863936ee66c))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -15942,7 +15934,7 @@
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 135473db-5279-4084-b772-d2c1239267a2))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1409 "/EC/VBAT") (pintype "passive") (tstamp 14bb6192-1dd3-4c7a-b2ea-3a3a015ba487))
+      (net 1401 "/EC/VBAT") (pintype "passive") (tstamp 14bb6192-1dd3-4c7a-b2ea-3a3a015ba487))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -16000,7 +15992,7 @@
     (pad "1" smd roundrect (at -0.32 0 270) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 0fc5abe0-9b15-4a3b-a88e-2bdfea9d1b37))
     (pad "2" smd roundrect (at 0.32 0 270) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1311 "/USBC2/TXC1-") (pinfunction "A2") (pintype "passive") (tstamp c048faf8-e7c5-485c-a5c4-bdb9b971aca2))
+      (net 1303 "/USBC2/TXC1-") (pinfunction "A2") (pintype "passive") (tstamp c048faf8-e7c5-485c-a5c4-bdb9b971aca2))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -16050,7 +16042,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 33509813-df1c-48a8-8819-3f48a519de28))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp f2345a30-7920-457c-a537-381be2b07d18))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1254 "/CHARGER/ILIM_HIZ") (pintype "passive") (tstamp 24e49f49-7eba-44d4-b1a9-5add62f0fdec))
+      (net 1246 "/CHARGER/ILIM_HIZ") (pintype "passive") (tstamp 24e49f49-7eba-44d4-b1a9-5add62f0fdec))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp f9c3059f-4b3b-4fe4-b7c8-72011c969581))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -16106,7 +16098,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 52fe600a-9c50-41e1-bddc-6d4b64aa711b))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp 7cdcb1be-42d6-451b-9f1c-e876b2b1d81f))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp 7cdcb1be-42d6-451b-9f1c-e876b2b1d81f))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -16157,7 +16149,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 60371f77-32f3-46f3-8bfc-44247fb8454a))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp acf2d4e4-efff-474d-b73a-7004119e3df6))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1308 "/USBC1/TXJ1+") (pintype "passive") (tstamp 051a4958-8c0b-47d0-86ef-2de8e0cf49f1))
+      (net 1300 "/USBC1/TXJ1+") (pintype "passive") (tstamp 051a4958-8c0b-47d0-86ef-2de8e0cf49f1))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 0e6cfdd0-3966-4611-9f43-8e02386005d0))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -16210,7 +16202,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 120ba378-6914-4111-9ebd-192bec65f3b8))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 02980910-aec9-4af8-87bb-f1289e3dc80a))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1356 "/USBC3/EN_CHARGE") (pintype "passive") (tstamp a58275a1-be57-4c39-aeef-bcea806bc59f))
+      (net 1348 "/USBC3/EN_CHARGE") (pintype "passive") (tstamp a58275a1-be57-4c39-aeef-bcea806bc59f))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 02c7370e-5fc7-44d3-97e3-7d92c3c97832))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -16266,7 +16258,7 @@
     (pad "1" smd roundrect (at -0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 8671fb04-a6d0-4839-9bca-000c5c93323e))
     (pad "2" smd roundrect (at 0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1417 "VCCGT") (pintype "passive") (tstamp 56c491c8-7a35-4230-8152-6f4fc281c8a3))
+      (net 1409 "VCCGT") (pintype "passive") (tstamp 56c491c8-7a35-4230-8152-6f4fc281c8a3))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -16320,7 +16312,7 @@
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 9eaf0267-5e70-4437-b95e-d57128cba248))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp d840b0a3-835c-4812-bd8e-0fe72a81a753))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp d840b0a3-835c-4812-bd8e-0fe72a81a753))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -16386,29 +16378,29 @@
     (pad "" smd roundrect (at 0.475 -0.475) (size 0.75 0.75) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp d30a4032-7ce8-4505-a6c8-74e809ff82ee))
     (pad "" smd roundrect (at 0.475 0.475) (size 0.75 0.75) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp aca6e3e0-4485-4edd-8ded-a6591169e164))
     (pad "1" smd roundrect (at -1.4 -0.8) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1375 "/USBC3/C_SBU1") (pinfunction "C_SBU1") (pintype "bidirectional") (tstamp 8e01482b-1e03-4dbb-a827-8543b5dbae09))
+      (net 1367 "/USBC3/C_SBU1") (pinfunction "C_SBU1") (pintype "bidirectional") (tstamp 8e01482b-1e03-4dbb-a827-8543b5dbae09))
     (pad "2" smd roundrect (at -1.4 -0.4) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1377 "/USBC3/C_SBU2") (pinfunction "C_SBU2") (pintype "bidirectional") (tstamp fd2d34a1-d10c-4f01-b839-68a2fbfa31cc))
+      (net 1369 "/USBC3/C_SBU2") (pinfunction "C_SBU2") (pintype "bidirectional") (tstamp fd2d34a1-d10c-4f01-b839-68a2fbfa31cc))
     (pad "3" smd roundrect (at -1.4 0) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1361 "/USBC3/VB_ESD") (pinfunction "VBIAS") (pintype "passive") (tstamp 43835d81-bf3c-487c-8bce-d3a0a2e0a027))
+      (net 1353 "/USBC3/VB_ESD") (pinfunction "VBIAS") (pintype "passive") (tstamp 43835d81-bf3c-487c-8bce-d3a0a2e0a027))
     (pad "4" smd roundrect (at -1.4 0.4) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1374 "/USBC3/C_CC1") (pinfunction "C_CC1") (pintype "bidirectional") (tstamp 49b8f40f-b734-4fbd-849c-47cdfe3b77a2))
+      (net 1366 "/USBC3/C_CC1") (pinfunction "C_CC1") (pintype "bidirectional") (tstamp 49b8f40f-b734-4fbd-849c-47cdfe3b77a2))
     (pad "5" smd roundrect (at -1.4 0.8) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1376 "/USBC3/C_CC2") (pinfunction "C_CC2") (pintype "bidirectional") (tstamp 79998f10-2e1f-4820-9608-b8a4e58979ca))
+      (net 1368 "/USBC3/C_CC2") (pinfunction "C_CC2") (pintype "bidirectional") (tstamp 79998f10-2e1f-4820-9608-b8a4e58979ca))
     (pad "6" smd roundrect (at -0.8 1.4 90) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1376 "/USBC3/C_CC2") (pinfunction "RPD_G2") (pintype "bidirectional") (tstamp 337f6ea8-dbf5-44ff-9e98-db838db79c41))
+      (net 1368 "/USBC3/C_CC2") (pinfunction "RPD_G2") (pintype "bidirectional") (tstamp 337f6ea8-dbf5-44ff-9e98-db838db79c41))
     (pad "7" smd roundrect (at -0.4 1.4 90) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1374 "/USBC3/C_CC1") (pinfunction "RPD_G1") (pintype "bidirectional") (tstamp e08d2f00-c8b5-4551-8206-980b9ab8678e))
+      (net 1366 "/USBC3/C_CC1") (pinfunction "RPD_G1") (pintype "bidirectional") (tstamp e08d2f00-c8b5-4551-8206-980b9ab8678e))
     (pad "8" smd roundrect (at 0 1.4 90) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (tstamp 5e2753bf-1bff-4d05-b7e4-6e55eb500401))
     (pad "9" smd roundrect (at 0.4 1.4 90) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1354 "/USBC3/~{PROT_FLT}") (pinfunction "~{FLT}") (pintype "open_collector") (tstamp f4d58688-d942-4c90-9e6a-1d0b0125e8c3))
+      (net 1346 "/USBC3/~{PROT_FLT}") (pinfunction "~{FLT}") (pintype "open_collector") (tstamp f4d58688-d942-4c90-9e6a-1d0b0125e8c3))
     (pad "10" smd roundrect (at 0.8 1.4 90) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1269 "/USBC3/VLDO") (pinfunction "VPWR") (pintype "power_in") (tstamp 4ff61cfb-c3d2-406b-a82e-5d40a992cdd1))
+      (net 1261 "/USBC3/VLDO") (pinfunction "VPWR") (pintype "power_in") (tstamp 4ff61cfb-c3d2-406b-a82e-5d40a992cdd1))
     (pad "11" smd roundrect (at 1.4 0.8) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1264 "/USBC3/CC1") (pinfunction "CC1") (pintype "bidirectional") (tstamp 9bdd9df0-fda2-49b1-a9cd-1801dbbb8263))
+      (net 1256 "/USBC3/CC1") (pinfunction "CC1") (pintype "bidirectional") (tstamp 9bdd9df0-fda2-49b1-a9cd-1801dbbb8263))
     (pad "12" smd roundrect (at 1.4 0.4) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1265 "/USBC3/CC2") (pinfunction "CC2") (pintype "bidirectional") (tstamp 8e602d12-f40b-4f49-912b-8325305c9251))
+      (net 1257 "/USBC3/CC2") (pinfunction "CC2") (pintype "bidirectional") (tstamp 8e602d12-f40b-4f49-912b-8325305c9251))
     (pad "13" smd roundrect (at 1.4 0) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (tstamp e177d403-d5b0-4919-a603-8242a604e61d))
     (pad "14" smd roundrect (at 1.4 -0.4) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -16696,7 +16688,7 @@
     (pad "1" smd roundrect (at -0.32 0 270) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 645cfd2c-fc7f-4190-856c-afc0898b5e6e))
     (pad "2" smd roundrect (at 0.32 0 270) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1301 "/USBC3/RXC2+") (pinfunction "A2") (pintype "passive") (tstamp f64810e0-ab23-482a-8088-ba279e5c1d35))
+      (net 1293 "/USBC3/RXC2+") (pinfunction "A2") (pintype "passive") (tstamp f64810e0-ab23-482a-8088-ba279e5c1d35))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -16746,7 +16738,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 528123e2-06b3-492e-8a6a-4d3c94a77333))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp cba524e8-0a7a-401a-8551-cc0c1973e567))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1251 "/CHARGER/IADPT") (pintype "passive") (tstamp 49ef5445-2fbd-4122-8e5b-178e9f592eb2))
+      (net 1243 "/CHARGER/IADPT") (pintype "passive") (tstamp 49ef5445-2fbd-4122-8e5b-178e9f592eb2))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 65266b8c-b888-423a-807b-76d5db366b97))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -16849,9 +16841,9 @@
     (fp_line (start 0.3 0.15) (end -0.3 0.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp beed9ac0-e476-4dcd-bebb-75843bc541e4))
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1301 "/USBC3/RXC2+") (pintype "passive") (tstamp e8711b45-1117-4761-8ef5-9b85bbc623a6))
+      (net 1293 "/USBC3/RXC2+") (pintype "passive") (tstamp e8711b45-1117-4761-8ef5-9b85bbc623a6))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1300 "/USBC3/RXJ2+") (pintype "passive") (tstamp 7efa63a5-9dfc-4286-861d-df939385aebc))
+      (net 1292 "/USBC3/RXJ2+") (pintype "passive") (tstamp 7efa63a5-9dfc-4286-861d-df939385aebc))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -16902,7 +16894,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 87b8c4f4-8a04-49cc-ba75-5d95e1e9c706))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp a271261f-125d-46e2-ae60-5024acf536c1))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1295 "/USBC2/RXC2-") (pintype "passive") (tstamp db087e75-193f-4f5b-b60b-25b0b172690e))
+      (net 1287 "/USBC2/RXC2-") (pintype "passive") (tstamp db087e75-193f-4f5b-b60b-25b0b172690e))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 446 "/CPU_USB/USBC2.RX-2") (pintype "passive") (tstamp 67d53325-a069-4f99-8928-97e8ec3bd516))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -16958,7 +16950,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 3029dded-7c61-4c16-a5f4-4a9cebd8f921))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1417 "VCCGT") (pintype "passive") (tstamp 7342f10e-e0d5-4a11-ac75-ca2609de0052))
+      (net 1409 "VCCGT") (pintype "passive") (tstamp 7342f10e-e0d5-4a11-ac75-ca2609de0052))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -17008,9 +17000,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp bd783681-8e62-4268-ae65-0ba1a2bdc2c7))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 6ececa26-b99e-4496-95df-16e62a62de21))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1250 "/CHARGER/REGN") (pintype "passive") (tstamp a0711742-d353-4aef-9155-a6e99b7d5ef4))
+      (net 1242 "/CHARGER/REGN") (pintype "passive") (tstamp a0711742-d353-4aef-9155-a6e99b7d5ef4))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1253 "/CHARGER/VDDA") (pintype "passive") (tstamp 12e60cfe-80e1-45bc-966d-55297fa3f6b7))
+      (net 1245 "/CHARGER/VDDA") (pintype "passive") (tstamp 12e60cfe-80e1-45bc-966d-55297fa3f6b7))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -17127,29 +17119,29 @@
     (pad "" smd roundrect (at 0.475 -0.475) (size 0.75 0.75) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 39eeb30c-6fac-452e-8f5e-4c253e50a2ab))
     (pad "" smd roundrect (at 0.475 0.475) (size 0.75 0.75) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 652738c8-cc87-4db8-9815-4f0b64c576be))
     (pad "1" smd roundrect (at -1.4 -0.8) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1371 "/USBC2/C_SBU1") (pinfunction "C_SBU1") (pintype "bidirectional") (tstamp 9c3ef5d3-1ded-4748-938e-06606ece8fa1))
+      (net 1363 "/USBC2/C_SBU1") (pinfunction "C_SBU1") (pintype "bidirectional") (tstamp 9c3ef5d3-1ded-4748-938e-06606ece8fa1))
     (pad "2" smd roundrect (at -1.4 -0.4) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1373 "/USBC2/C_SBU2") (pinfunction "C_SBU2") (pintype "bidirectional") (tstamp 653e9a90-9078-47be-8b41-a1ade601a8e4))
+      (net 1365 "/USBC2/C_SBU2") (pinfunction "C_SBU2") (pintype "bidirectional") (tstamp 653e9a90-9078-47be-8b41-a1ade601a8e4))
     (pad "3" smd roundrect (at -1.4 0) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1360 "/USBC2/VB_ESD") (pinfunction "VBIAS") (pintype "passive") (tstamp 27527f13-a574-4ba6-a0d2-22d79a1bf178))
+      (net 1352 "/USBC2/VB_ESD") (pinfunction "VBIAS") (pintype "passive") (tstamp 27527f13-a574-4ba6-a0d2-22d79a1bf178))
     (pad "4" smd roundrect (at -1.4 0.4) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1370 "/USBC2/C_CC1") (pinfunction "C_CC1") (pintype "bidirectional") (tstamp 267e41d6-8246-49fb-ab7a-9c967a9bba43))
+      (net 1362 "/USBC2/C_CC1") (pinfunction "C_CC1") (pintype "bidirectional") (tstamp 267e41d6-8246-49fb-ab7a-9c967a9bba43))
     (pad "5" smd roundrect (at -1.4 0.8) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1372 "/USBC2/C_CC2") (pinfunction "C_CC2") (pintype "bidirectional") (tstamp bdd0856b-dcbc-475a-a3f0-59b29047589e))
+      (net 1364 "/USBC2/C_CC2") (pinfunction "C_CC2") (pintype "bidirectional") (tstamp bdd0856b-dcbc-475a-a3f0-59b29047589e))
     (pad "6" smd roundrect (at -0.8 1.4 90) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1372 "/USBC2/C_CC2") (pinfunction "RPD_G2") (pintype "bidirectional") (tstamp ac5db254-9e63-430a-a631-98249be85564))
+      (net 1364 "/USBC2/C_CC2") (pinfunction "RPD_G2") (pintype "bidirectional") (tstamp ac5db254-9e63-430a-a631-98249be85564))
     (pad "7" smd roundrect (at -0.4 1.4 90) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1370 "/USBC2/C_CC1") (pinfunction "RPD_G1") (pintype "bidirectional") (tstamp abfeffb7-e2b6-4d6d-92dc-620c0ba7ad41))
+      (net 1362 "/USBC2/C_CC1") (pinfunction "RPD_G1") (pintype "bidirectional") (tstamp abfeffb7-e2b6-4d6d-92dc-620c0ba7ad41))
     (pad "8" smd roundrect (at 0 1.4 90) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (tstamp d5b5ac10-0be0-4e22-a6d4-961ae5018ef7))
     (pad "9" smd roundrect (at 0.4 1.4 90) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1348 "/USBC2/~{PROT_FLT}") (pinfunction "~{FLT}") (pintype "open_collector") (tstamp 989adca0-0a1c-48d8-86a5-66aeba92c6fc))
+      (net 1340 "/USBC2/~{PROT_FLT}") (pinfunction "~{FLT}") (pintype "open_collector") (tstamp 989adca0-0a1c-48d8-86a5-66aeba92c6fc))
     (pad "10" smd roundrect (at 0.8 1.4 90) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1268 "/USBC2/VLDO") (pinfunction "VPWR") (pintype "power_in") (tstamp 163b72e0-588a-49a5-8adb-33cb47bca7ae))
+      (net 1260 "/USBC2/VLDO") (pinfunction "VPWR") (pintype "power_in") (tstamp 163b72e0-588a-49a5-8adb-33cb47bca7ae))
     (pad "11" smd roundrect (at 1.4 0.8) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 82 "/USBC2/CC1") (pinfunction "CC1") (pintype "bidirectional") (tstamp ffd0eba2-2888-44cb-9f94-4d4894f50010))
     (pad "12" smd roundrect (at 1.4 0.4) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1262 "/USBC2/CC2") (pinfunction "CC2") (pintype "bidirectional") (tstamp 9ab967ea-2e6e-4425-b0ad-b5017b703100))
+      (net 1254 "/USBC2/CC2") (pinfunction "CC2") (pintype "bidirectional") (tstamp 9ab967ea-2e6e-4425-b0ad-b5017b703100))
     (pad "13" smd roundrect (at 1.4 0) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (tstamp 173a266b-28a3-44a2-93b4-795036277fa7))
     (pad "14" smd roundrect (at 1.4 -0.4) (size 0.6 0.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -17225,11 +17217,11 @@
     (fp_line (start 0.67 1.1) (end -0.68 1.1)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a286e11d-e452-4cd6-bccf-827e495e8bb9))
     (pad "1" smd rect (at -1 -0.65 270) (size 0.45 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1345 "/USBC1/EN_CHARGE") (pinfunction "G") (pintype "input") (tstamp 2ac9e001-89e3-4b88-9b03-3b84a493a9da))
+      (net 1337 "/USBC1/EN_CHARGE") (pinfunction "G") (pintype "input") (tstamp 2ac9e001-89e3-4b88-9b03-3b84a493a9da))
     (pad "2" smd rect (at -1 0.65 270) (size 0.45 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "S") (pintype "passive") (tstamp a6002584-3f28-41fa-b453-eadc3292e45c))
     (pad "3" smd rect (at 1 0 270) (size 0.45 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1391 "Net-(Q11-D)") (pinfunction "D") (pintype "passive") (tstamp b89e499b-259e-46e4-a0ca-3388e1529b29))
+      (net 1383 "Net-(Q11-D)") (pinfunction "D") (pintype "passive") (tstamp b89e499b-259e-46e4-a0ca-3388e1529b29))
     (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-323_SC-70.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -17282,7 +17274,7 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 46f7336c-3d29-4e28-a4e3-b5ca5159c03f))
     (pad "1" smd roundrect (at -0.45 0 90) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1235 "Net-(C58-Pad1)") (pintype "passive") (tstamp ace77ec3-5237-41ed-911c-9c2708cdb283))
+      (net 1227 "Net-(C58-Pad1)") (pintype "passive") (tstamp ace77ec3-5237-41ed-911c-9c2708cdb283))
     (pad "2" smd roundrect (at 0.45 0 90) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 8fb95bef-01cc-44f0-a645-9d746555dd73))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -17392,7 +17384,7 @@
     (pad "1" smd roundrect (at -0.32 0 90) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 522da503-5b1f-4df2-9413-4b4dafbcda2c))
     (pad "2" smd roundrect (at 0.32 0 90) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1299 "/USBC3/RXC2-") (pinfunction "A2") (pintype "passive") (tstamp 43f529c2-7c0e-45e3-9cd3-1e59724794ef))
+      (net 1291 "/USBC3/RXC2-") (pinfunction "A2") (pintype "passive") (tstamp 43f529c2-7c0e-45e3-9cd3-1e59724794ef))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -17508,11 +17500,11 @@
     (pad "3" smd roundrect (at -0.8875 0.65 180) (size 0.375 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp b9fb215b-35c1-4b1e-b04c-eff4740e7844))
     (pad "4" smd roundrect (at 0.8875 0.65 180) (size 0.375 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1263 "/USBC3/VBUS") (pinfunction "IN") (pintype "passive") (tstamp c5475df8-bb36-48cc-9709-01e18b9ac98f))
+      (net 1255 "/USBC3/VBUS") (pinfunction "IN") (pintype "passive") (tstamp c5475df8-bb36-48cc-9709-01e18b9ac98f))
     (pad "5" smd roundrect (at 0.8875 0 180) (size 0.375 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1263 "/USBC3/VBUS") (pinfunction "IN") (pintype "passive") (tstamp 154e255c-5350-4575-946f-58f3c5837b17))
+      (net 1255 "/USBC3/VBUS") (pinfunction "IN") (pintype "passive") (tstamp 154e255c-5350-4575-946f-58f3c5837b17))
     (pad "6" smd roundrect (at 0.8875 -0.65 180) (size 0.375 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1263 "/USBC3/VBUS") (pinfunction "IN") (pintype "passive") (tstamp 84de9653-e43a-4191-95a1-3e6378256d65))
+      (net 1255 "/USBC3/VBUS") (pinfunction "IN") (pintype "passive") (tstamp 84de9653-e43a-4191-95a1-3e6378256d65))
     (pad "7" smd rect (at 0 0 180) (size 1 1.6) (layers "F.Cu" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp 7e81d081-5d41-4fcf-9d4d-ef9a4a520650))
     (model "${KICAD6_3DMODEL_DIR}/Package_SON.3dshapes/WSON-6-1EP_2x2mm_P0.65mm_EP1x1.6mm.wrl"
@@ -17564,9 +17556,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 28e283a2-b478-407f-9694-4af72307fa81))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 9d19c345-8645-4267-a6fa-38ce62104a4c))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1207 "/CPU_POWER/MODE18") (pintype "passive") (tstamp cf101a73-7ad6-4276-865a-1357f96a00ef))
+      (net 1199 "/CPU_POWER/MODE18") (pintype "passive") (tstamp cf101a73-7ad6-4276-865a-1357f96a00ef))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1220 "/CPU_POWER/VCC18") (pintype "passive") (tstamp edba4c12-3584-4ea0-8ab0-fe736e7e1739))
+      (net 1212 "/CPU_POWER/VCC18") (pintype "passive") (tstamp edba4c12-3584-4ea0-8ab0-fe736e7e1739))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -17617,7 +17609,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 660a38d7-6eaf-4deb-8360-30627dfd6c32))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 29bf948c-0e7b-4007-b3dd-b7ae7b3ddada))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1292 "/USBC1/RXJ2+") (pintype "passive") (tstamp 95f68fc8-ef2b-4c1d-a6b8-7a0df8a58b7d))
+      (net 1284 "/USBC1/RXJ2+") (pintype "passive") (tstamp 95f68fc8-ef2b-4c1d-a6b8-7a0df8a58b7d))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 4c709c9b-dd04-4df4-a12f-989c325611f5))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -17671,7 +17663,7 @@
     (fp_line (start 0.8 0.4) (end -0.8 0.4)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 73f8e551-974b-4a36-a61d-bdf943f432fe))
     (pad "1" smd roundrect (at -0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1349 "/USBC2/PPHV") (pintype "passive") (tstamp 493e7e77-9602-47b6-bfff-90f42e880c67))
+      (net 1341 "/USBC2/PPHV") (pintype "passive") (tstamp 493e7e77-9602-47b6-bfff-90f42e880c67))
     (pad "2" smd roundrect (at 0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 80f1f6e5-38b6-42c6-9885-1c93eab7c671))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
@@ -17878,7 +17870,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1fc6fac9-429f-4e83-bbf0-0c5ae3433b7b))
     (pad "1" smd roundrect (at -0.8375 0 270) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1234 "/CHARGER/VSYS") (pintype "passive") (tstamp 51e5f67d-b1d3-4fa6-9d48-938cc382c2da))
+      (net 1226 "/CHARGER/VSYS") (pintype "passive") (tstamp 51e5f67d-b1d3-4fa6-9d48-938cc382c2da))
     (pad "2" smd roundrect (at 0.8375 0 270) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp f3df7138-ba9a-48cd-8630-ef413b725883))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -17931,7 +17923,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 6b53cf30-f32a-448a-bf09-3b7d360c13c6))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 55f5cb6f-6f72-418b-80c4-94b874365241))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1307 "/USBC1/TXC1-") (pintype "passive") (tstamp caaaec59-d360-4106-997d-78372b3d75ca))
+      (net 1299 "/USBC1/TXC1-") (pintype "passive") (tstamp caaaec59-d360-4106-997d-78372b3d75ca))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 424 "/CPU_USB/USBC1.TX-1") (pintype "passive") (tstamp b40f2bf6-5ad1-46c8-9b70-c6ccfc3a8852))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -18051,15 +18043,15 @@
     (fp_line (start 0.8 1.4) (end 0.8 -1.4)
       (stroke (width 0.1) (type default)) (layer "F.Fab") (tstamp 00c7e3e2-ce4f-4f22-b04a-a899f95c6b00))
     (pad "A1" smd circle (at -0.6 -1.2) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1382 "/USBC0/~{FAULT}") (pinfunction "~{FLT}") (pintype "open_collector") (tstamp db8bd469-1911-4abe-a2c2-38263710a0f4))
+      (net 1374 "/USBC0/~{FAULT}") (pinfunction "~{FLT}") (pintype "open_collector") (tstamp db8bd469-1911-4abe-a2c2-38263710a0f4))
     (pad "A2" smd circle (at -0.2 -1.2) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 75 "/USBC0/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 6e1ff3f7-d877-400f-8964-3f8feec24a3b))
     (pad "A3" smd circle (at 0.2 -1.2) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1394 "/USBC0/SOURCE") (pinfunction "EN1") (pintype "input") (tstamp ffaef119-a3e3-4fa9-a13a-444da3ac4a9f))
+      (net 1386 "/USBC0/SOURCE") (pinfunction "EN1") (pintype "input") (tstamp ffaef119-a3e3-4fa9-a13a-444da3ac4a9f))
     (pad "A4" smd circle (at 0.6 -1.2) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1378 "/USBC0/RIREF") (pinfunction "IREF") (pintype "passive") (tstamp 97d22d39-ef99-40ee-85ec-32f106d31fec))
+      (net 1370 "/USBC0/RIREF") (pinfunction "IREF") (pintype "passive") (tstamp 97d22d39-ef99-40ee-85ec-32f106d31fec))
     (pad "B1" smd circle (at -0.6 -0.8) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1335 "/USBC0/PPHV") (pinfunction "PPHV") (pintype "power_out") (tstamp 9422d449-7d37-4dc5-9cce-3fa37e92d3b0))
+      (net 1327 "/USBC0/PPHV") (pinfunction "PPHV") (pintype "power_out") (tstamp 9422d449-7d37-4dc5-9cce-3fa37e92d3b0))
     (pad "B2" smd circle (at -0.2 -0.8) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 75 "/USBC0/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 13f5290e-0fae-47b8-be6a-e3b810f18f9b))
     (pad "B3" smd circle (at 0.2 -0.8) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
@@ -18067,7 +18059,7 @@
     (pad "B4" smd circle (at 0.6 -0.8) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (tstamp 82e9bb28-5bae-41b6-ba4a-d00eaaf22355))
     (pad "C1" smd circle (at -0.6 -0.4) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1335 "/USBC0/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 4265f44b-820e-4367-abc7-ca66049b5ed1))
+      (net 1327 "/USBC0/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 4265f44b-820e-4367-abc7-ca66049b5ed1))
     (pad "C2" smd circle (at -0.2 -0.4) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 75 "/USBC0/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 47e3fc15-446b-4ca1-b0f3-885fa60eaca0))
     (pad "C3" smd circle (at 0.2 -0.4) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
@@ -18075,7 +18067,7 @@
     (pad "C4" smd circle (at 0.6 -0.4) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 104 "+5V") (pinfunction "PP5V") (pintype "power_in") (tstamp 1da62a59-da0f-42cf-a225-56f52018a587))
     (pad "D1" smd circle (at -0.6 0) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1335 "/USBC0/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 62c4fe6f-9887-4031-b807-c687dcdebe98))
+      (net 1327 "/USBC0/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 62c4fe6f-9887-4031-b807-c687dcdebe98))
     (pad "D2" smd circle (at -0.2 0) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 75 "/USBC0/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp e9265f8b-95d0-469f-adbf-90e529527fcc))
     (pad "D3" smd circle (at 0.2 0) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
@@ -18083,7 +18075,7 @@
     (pad "D4" smd circle (at 0.6 0) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 104 "+5V") (pinfunction "PP5V") (pintype "power_in") (tstamp 3554959a-2684-41d8-95e2-362e13c768c5))
     (pad "E1" smd circle (at -0.6 0.4) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1335 "/USBC0/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 8a12c207-7657-4541-8e61-3dae368a8010))
+      (net 1327 "/USBC0/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 8a12c207-7657-4541-8e61-3dae368a8010))
     (pad "E2" smd circle (at -0.2 0.4) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 75 "/USBC0/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 3441104f-4655-41ad-bfbf-505712b58c90))
     (pad "E3" smd circle (at 0.2 0.4) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
@@ -18091,19 +18083,19 @@
     (pad "E4" smd circle (at 0.6 0.4) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 104 "+5V") (pinfunction "PP5V") (pintype "power_in") (tstamp 54ca67ab-e507-4ffa-b003-bd70545e1e95))
     (pad "F1" smd circle (at -0.6 0.8) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1335 "/USBC0/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 09f8d21a-da22-4181-a243-d9c7420f80fe))
+      (net 1327 "/USBC0/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 09f8d21a-da22-4181-a243-d9c7420f80fe))
     (pad "F2" smd circle (at -0.2 0.8) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 75 "/USBC0/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 4e08f48c-b36f-4ccc-89d7-816b1300009f))
     (pad "F3" smd circle (at 0.2 0.8) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 75 "/USBC0/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 72baf912-86ad-453a-b29f-be9f8c33dbe6))
     (pad "F4" smd circle (at 0.6 0.8) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1398 "/USBC0/OVP") (pinfunction "OVP") (pintype "passive") (tstamp 672595a5-0bc3-4e00-a8e6-7c4c2485ce29))
+      (net 1390 "/USBC0/OVP") (pinfunction "OVP") (pintype "passive") (tstamp 672595a5-0bc3-4e00-a8e6-7c4c2485ce29))
     (pad "G1" smd circle (at -0.6 1.2) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1402 "/USBC0/SINK") (pinfunction "EN0") (pintype "input") (tstamp dfd623bf-283d-4a04-92b2-defa4ad1df41))
+      (net 1394 "/USBC0/SINK") (pinfunction "EN0") (pintype "input") (tstamp dfd623bf-283d-4a04-92b2-defa4ad1df41))
     (pad "G2" smd circle (at -0.2 1.2) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 75 "/USBC0/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp a0fd9079-1c4a-492f-9668-76b47b73a7d3))
     (pad "G3" smd circle (at 0.2 1.2) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1266 "/USBC0/VLDO") (pinfunction "VLDO") (pintype "power_out") (tstamp dbbd03a9-64cc-4643-b571-8c264a95835e))
+      (net 1258 "/USBC0/VLDO") (pinfunction "VLDO") (pintype "power_out") (tstamp dbbd03a9-64cc-4643-b571-8c264a95835e))
     (pad "G4" smd circle (at 0.6 1.2) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 4 "+3V3") (pinfunction "VIN") (pintype "power_in") (tstamp 2fadfda8-4abc-4c29-964e-c4ea7dfe705e))
   )
@@ -18154,7 +18146,7 @@
     (pad "1" smd roundrect (at -0.45 0 90) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp e7004131-6f52-4c01-b2a6-fa86b454824c))
     (pad "2" smd roundrect (at 0.45 0 90) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp 54d5dd6e-16bc-4980-8c0e-c9ce24bd9ca0))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp 54d5dd6e-16bc-4980-8c0e-c9ce24bd9ca0))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -18205,7 +18197,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 295e1dee-4a56-4a7b-beb5-5d89abd14380))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 7b40ce09-3d6d-4801-ae34-58a62cd0f01c))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1290 "/USBC1/RXJ2-") (pintype "passive") (tstamp 1870bf2e-e9c4-47e2-80e4-5da2538d6880))
+      (net 1282 "/USBC1/RXJ2-") (pintype "passive") (tstamp 1870bf2e-e9c4-47e2-80e4-5da2538d6880))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 3a2595eb-d7bc-4ee5-b206-5df413070721))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -18275,9 +18267,9 @@
     (fp_line (start 4 -3.3) (end 4 3.3)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4b80ce0e-02d5-46d3-bf91-a46d7dd7c90f))
     (pad "1" smd rect (at -2.825 0 270) (size 6.6 2.85) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1228 "/CHARGER/SW1") (pinfunction "1") (pintype "passive") (tstamp a6792f12-857f-457b-9579-16ecf4996cd4))
+      (net 1220 "/CHARGER/SW1") (pinfunction "1") (pintype "passive") (tstamp a6792f12-857f-457b-9579-16ecf4996cd4))
     (pad "2" smd rect (at 2.825 0 270) (size 6.6 2.85) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1226 "/CHARGER/SW2") (pinfunction "2") (pintype "passive") (tstamp a0a24f51-3eaf-40d0-a21b-e88b18961e05))
+      (net 1218 "/CHARGER/SW2") (pinfunction "2") (pintype "passive") (tstamp a0a24f51-3eaf-40d0-a21b-e88b18961e05))
     (model "${KICAD6_3DMODEL_DIR}/Inductor_SMD.3dshapes/L_Bourns_SRN8040TA.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -18327,9 +18319,9 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 58235931-5996-45d1-9ae9-0ac66dcca58c))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 2aa2efd5-201c-4d89-852b-68655e26a4b6))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1425 "unconnected-(R164-Pad1)") (pintype "passive") (tstamp 1d7c4daa-e20e-477f-86f9-26ed4e0ae23d))
+      (net 1417 "unconnected-(R164-Pad1)") (pintype "passive") (tstamp 1d7c4daa-e20e-477f-86f9-26ed4e0ae23d))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1426 "/VCCINAUX/PGOOD") (pintype "passive") (tstamp 5d6d4921-0c9b-4143-9eec-376a600c1a37))
+      (net 1418 "/VCCINAUX/PGOOD") (pintype "passive") (tstamp 5d6d4921-0c9b-4143-9eec-376a600c1a37))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -18380,7 +18372,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 091f3200-2948-4a58-84f7-aed166b6353d))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp c43dbd2a-04ee-4870-85f6-025049af692c))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1334 "/USBC0/~{PROT_FLT}") (pintype "passive") (tstamp ab6e5613-32ba-4d01-a0a2-85b4f3f427b8))
+      (net 1326 "/USBC0/~{PROT_FLT}") (pintype "passive") (tstamp ab6e5613-32ba-4d01-a0a2-85b4f3f427b8))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 71 "/USBC0/BYP") (pintype "passive") (tstamp 6548d40b-d065-425d-9012-2234a6048dbd))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -18433,7 +18425,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp e9272be1-362d-4e45-8c00-945486f34c73))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp bed73d8f-290f-40ae-a0a5-6dbb96274b95))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1298 "/USBC3/RXJ2-") (pintype "passive") (tstamp 9979eb13-04d6-444d-ad64-3e36d9fd40ca))
+      (net 1290 "/USBC3/RXJ2-") (pintype "passive") (tstamp 9979eb13-04d6-444d-ad64-3e36d9fd40ca))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 6fa5a8f3-78d9-4cba-b3d2-070ed79738a3))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -18487,7 +18479,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4d2114e2-31ee-4bc5-b1d8-b8df901ab2a4))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1245 "/CHARGER/VIN") (pintype "passive") (tstamp e5298135-e236-4e7b-b74d-263a4d186e1a))
+      (net 1237 "/CHARGER/VIN") (pintype "passive") (tstamp e5298135-e236-4e7b-b74d-263a4d186e1a))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 15674a1e-3c2d-45ba-9aeb-97d7d1528d27))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -18703,7 +18695,7 @@
     (pad "1" smd roundrect (at -0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp a647b79f-7567-46a3-90fd-03f6c4d69668))
     (pad "2" smd roundrect (at 0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1417 "VCCGT") (pintype "passive") (tstamp a310b306-4265-4907-8797-a148faf57168))
+      (net 1409 "VCCGT") (pintype "passive") (tstamp a310b306-4265-4907-8797-a148faf57168))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -19093,7 +19085,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp b0cec80e-ba67-4c81-ad45-72ace355f2e2))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 10559d61-0336-4bcc-b55e-404cff9767ab))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1301 "/USBC3/RXC2+") (pintype "passive") (tstamp 0f5ece8a-b3de-4cc4-bc83-e48a2190f24f))
+      (net 1293 "/USBC3/RXC2+") (pintype "passive") (tstamp 0f5ece8a-b3de-4cc4-bc83-e48a2190f24f))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 456 "/CPU_USB/USBC3.RX+2") (pintype "passive") (tstamp 561b58a5-dd4e-4699-8d63-b0d9fef9dc72))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -19153,11 +19145,11 @@
     (fp_line (start 0.67 1.1) (end -0.68 1.1)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp bcb5903c-f1e5-4bfd-9da6-9df7c5aa5138))
     (pad "1" smd rect (at -1 -0.65 270) (size 0.45 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1337 "/USBC0/EN_CHARGE") (pinfunction "G") (pintype "input") (tstamp f2c3754c-7ac6-4e9a-9183-dc02f6943139))
+      (net 1329 "/USBC0/EN_CHARGE") (pinfunction "G") (pintype "input") (tstamp f2c3754c-7ac6-4e9a-9183-dc02f6943139))
     (pad "2" smd rect (at -1 0.65 270) (size 0.45 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "S") (pintype "passive") (tstamp 7a4e6436-96c1-4444-9803-b911d837b9ad))
     (pad "3" smd rect (at 1 0 270) (size 0.45 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1390 "Net-(Q10-D)") (pinfunction "D") (pintype "passive") (tstamp 7b633d71-e6b6-434e-9f18-8d5122455f37))
+      (net 1382 "Net-(Q10-D)") (pinfunction "D") (pintype "passive") (tstamp 7b633d71-e6b6-434e-9f18-8d5122455f37))
     (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-323_SC-70.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -19313,7 +19305,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 4c68756a-0568-4991-adfa-a45b01467159))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 4553727a-b06f-494c-94ab-5daeb22ef051))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1394 "/USBC0/SOURCE") (pintype "passive") (tstamp 7e89a695-62d6-41a5-a2ba-e496b0bab898))
+      (net 1386 "/USBC0/SOURCE") (pintype "passive") (tstamp 7e89a695-62d6-41a5-a2ba-e496b0bab898))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 2a84bd69-1c54-473d-8bf7-e6a4e052de14))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -19366,7 +19358,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 15779809-df15-4f4f-a1fa-6f79c88f7642))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 7cda5b0e-bc0b-437d-8bac-22c7a308e1e2))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1296 "/USBC2/RXJ2+") (pintype "passive") (tstamp 2bda13d7-87ea-4a35-ac9d-df196d7e0e66))
+      (net 1288 "/USBC2/RXJ2+") (pintype "passive") (tstamp 2bda13d7-87ea-4a35-ac9d-df196d7e0e66))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 020f2b65-fef7-46c5-9009-8191ac5f281d))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -19422,7 +19414,7 @@
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 69927fca-db91-4c9e-be31-33e570e20751))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp 1b313fc8-ee62-4d9b-abf4-572155c849eb))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp 1b313fc8-ee62-4d9b-abf4-572155c849eb))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -19473,7 +19465,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp f52cdfe7-fd7f-4f2a-8b1f-2405d6547909))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp ad5c00fa-ed7b-4325-85f1-c9c12994d795))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1398 "/USBC0/OVP") (pintype "passive") (tstamp 8f6b7d05-a803-4d05-9a56-6cd13b577aa4))
+      (net 1390 "/USBC0/OVP") (pintype "passive") (tstamp 8f6b7d05-a803-4d05-9a56-6cd13b577aa4))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 1aa10dc8-775c-493a-afc2-24b320138a1e))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -19526,7 +19518,7 @@
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 45403309-9c53-4cd7-b429-e5edcee42a09))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1360 "/USBC2/VB_ESD") (pintype "passive") (tstamp 1d3d1c18-2d9a-4c1f-a5e2-3d5189cd142a))
+      (net 1352 "/USBC2/VB_ESD") (pintype "passive") (tstamp 1d3d1c18-2d9a-4c1f-a5e2-3d5189cd142a))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -19628,9 +19620,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 73ecd4e9-2020-4c47-b7bd-1ed6fb11260e))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp fb3a931f-f595-4f9a-bc6b-525c44341db2))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1209 "+1V8") (pintype "passive") (tstamp 9867656c-9fcd-464a-a089-c8f7e07a454f))
+      (net 1201 "+1V8") (pintype "passive") (tstamp 9867656c-9fcd-464a-a089-c8f7e07a454f))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1338 "/C_LEFT_SCL") (pintype "passive") (tstamp b2396ea9-f12b-47c9-a7a5-e733d985b21d))
+      (net 1345 "/C_LEFT_SDA") (pintype "passive") (tstamp b2396ea9-f12b-47c9-a7a5-e733d985b21d))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -19684,7 +19676,7 @@
     (pad "1" smd roundrect (at -0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp ba0713cc-1ecf-40cf-9f83-aff93d1fec3d))
     (pad "2" smd roundrect (at 0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1417 "VCCGT") (pintype "passive") (tstamp 7f8e7ecb-1c44-4674-9af3-7d78ff0a5805))
+      (net 1409 "VCCGT") (pintype "passive") (tstamp 7f8e7ecb-1c44-4674-9af3-7d78ff0a5805))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -19735,7 +19727,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 6a7b802b-482b-4d97-8f5b-40963938f8da))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 90fd8102-eea6-4304-bfb4-5783fc4a6deb))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1288 "/USBC0/RXJ2+") (pintype "passive") (tstamp 7a89369f-1537-44af-b2fe-35b48ec5aadd))
+      (net 1280 "/USBC0/RXJ2+") (pintype "passive") (tstamp 7a89369f-1537-44af-b2fe-35b48ec5aadd))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 3d23dc23-1bfb-4b37-966a-331b63437cbc))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -20491,49 +20483,49 @@
     (pad "A1" smd rect (at -2.75 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp 1e4ee201-fd6d-4578-82ea-c033b5214062))
     (pad "A2" smd rect (at -2.25 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1308 "/USBC1/TXJ1+") (pinfunction "TX1+") (pintype "bidirectional") (tstamp 2043dbf0-8425-4808-8c71-a32e8c8801b1))
+      (net 1300 "/USBC1/TXJ1+") (pinfunction "TX1+") (pintype "bidirectional") (tstamp 2043dbf0-8425-4808-8c71-a32e8c8801b1))
     (pad "A3" smd rect (at -1.75 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1306 "/USBC1/TXJ1-") (pinfunction "TX1-") (pintype "bidirectional") (tstamp 9a4258e8-05e2-4b72-9c41-794119487676))
+      (net 1298 "/USBC1/TXJ1-") (pinfunction "TX1-") (pintype "bidirectional") (tstamp 9a4258e8-05e2-4b72-9c41-794119487676))
     (pad "A4" smd rect (at -1.25 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 78 "/USBC1/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp e3210a68-fd65-4911-98da-20d5a38c1823))
     (pad "A5" smd rect (at -0.75 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1366 "/USBC1/C_CC1") (pinfunction "CC1") (pintype "bidirectional") (tstamp 8fdfa821-b24f-486c-adb2-04fe2de0f7b9))
+      (net 1358 "/USBC1/C_CC1") (pinfunction "CC1") (pintype "bidirectional") (tstamp 8fdfa821-b24f-486c-adb2-04fe2de0f7b9))
     (pad "A6" smd rect (at -0.25 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 459 "/CPU_USB/USBC1.D+") (pinfunction "D+") (pintype "bidirectional") (tstamp 32261da3-5237-498a-b8d2-c059b1740181))
     (pad "A7" smd rect (at 0.25 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 460 "/CPU_USB/USBC1.D-") (pinfunction "D-") (pintype "bidirectional") (tstamp a47be0fa-97ea-4b72-8289-bfefc7c6fe39))
     (pad "A8" smd rect (at 0.75 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1367 "/USBC1/C_SBU1") (pinfunction "SBU1") (pintype "bidirectional") (tstamp ecd53fd2-3149-4884-946a-0a02aa401608))
+      (net 1359 "/USBC1/C_SBU1") (pinfunction "SBU1") (pintype "bidirectional") (tstamp ecd53fd2-3149-4884-946a-0a02aa401608))
     (pad "A9" smd rect (at 1.25 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 78 "/USBC1/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 61419174-a6f6-4135-99c7-fe1dc18f81ba))
     (pad "A10" smd rect (at 1.75 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1290 "/USBC1/RXJ2-") (pinfunction "RX2-") (pintype "bidirectional") (tstamp ac12b5dc-1e77-4e5a-a3f9-8f0a11f1d3a4))
+      (net 1282 "/USBC1/RXJ2-") (pinfunction "RX2-") (pintype "bidirectional") (tstamp ac12b5dc-1e77-4e5a-a3f9-8f0a11f1d3a4))
     (pad "A11" smd rect (at 2.25 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1292 "/USBC1/RXJ2+") (pinfunction "RX2+") (pintype "bidirectional") (tstamp 5c32c0ab-5260-4d4c-bf4f-19652b8ac1f6))
+      (net 1284 "/USBC1/RXJ2+") (pinfunction "RX2+") (pintype "bidirectional") (tstamp 5c32c0ab-5260-4d4c-bf4f-19652b8ac1f6))
     (pad "A12" smd rect (at 2.75 -5.02 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp 0076c244-6d56-4a89-a2da-3a26b5c64a8a))
     (pad "B1" smd rect (at 2.5 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp 3a4fd5d4-86d4-4730-b37e-abc0daa9df74))
     (pad "B2" smd rect (at 2 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1324 "/USBC1/TXJ2+") (pinfunction "TX2+") (pintype "bidirectional") (tstamp 403ad10e-252a-4a63-88ed-cff6da02b30e))
+      (net 1316 "/USBC1/TXJ2+") (pinfunction "TX2+") (pintype "bidirectional") (tstamp 403ad10e-252a-4a63-88ed-cff6da02b30e))
     (pad "B3" smd rect (at 1.5 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1322 "/USBC1/TXJ2-") (pinfunction "TX2-") (pintype "bidirectional") (tstamp b78ed1b0-516e-409e-9f18-3b9a76d110a2))
+      (net 1314 "/USBC1/TXJ2-") (pinfunction "TX2-") (pintype "bidirectional") (tstamp b78ed1b0-516e-409e-9f18-3b9a76d110a2))
     (pad "B4" smd rect (at 1 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 78 "/USBC1/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 05324d13-a810-4f39-bdf5-af24cb541b91))
     (pad "B5" smd rect (at 0.5 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1368 "/USBC1/C_CC2") (pinfunction "CC2") (pintype "bidirectional") (tstamp f359261e-a51e-421d-94f6-da56bd521ba0))
+      (net 1360 "/USBC1/C_CC2") (pinfunction "CC2") (pintype "bidirectional") (tstamp f359261e-a51e-421d-94f6-da56bd521ba0))
     (pad "B6" smd rect (at 0 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 459 "/CPU_USB/USBC1.D+") (pinfunction "D+") (pintype "bidirectional") (tstamp 29b29e22-5d2c-4631-a85c-50a41f80833e))
     (pad "B7" smd rect (at -0.5 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 460 "/CPU_USB/USBC1.D-") (pinfunction "D-") (pintype "bidirectional") (tstamp 5042cfee-1fc4-4acb-8752-1f6605effdb6))
     (pad "B8" smd rect (at -1 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1369 "/USBC1/C_SBU2") (pinfunction "SBU2") (pintype "bidirectional") (tstamp 936ba8aa-3c26-4c18-8a57-50a8dd9b4fb7))
+      (net 1361 "/USBC1/C_SBU2") (pinfunction "SBU2") (pintype "bidirectional") (tstamp 936ba8aa-3c26-4c18-8a57-50a8dd9b4fb7))
     (pad "B9" smd rect (at -1.5 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 78 "/USBC1/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 295245dd-f9de-4020-b721-6a7d5b618de7))
     (pad "B10" smd rect (at -2 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1272 "/USBC1/RXJ1-") (pinfunction "RX1-") (pintype "bidirectional") (tstamp 7ad0fe10-918c-465e-9356-4d4ab168e292))
+      (net 1264 "/USBC1/RXJ1-") (pinfunction "RX1-") (pintype "bidirectional") (tstamp 7ad0fe10-918c-465e-9356-4d4ab168e292))
     (pad "B11" smd rect (at -2.5 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1280 "/USBC1/RXJ1+") (pinfunction "RX1+") (pintype "bidirectional") (tstamp da1f560d-af96-419b-80a3-1b990f92adc9))
+      (net 1272 "/USBC1/RXJ1+") (pinfunction "RX1+") (pintype "bidirectional") (tstamp da1f560d-af96-419b-80a3-1b990f92adc9))
     (pad "B12" smd rect (at -3 -3.32 270) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp f72eea9c-24f9-449a-ba75-c398b47cafbd))
     (pad "S1" smd roundrect (at -5 2.85 270) (size 1 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -20613,7 +20605,7 @@
     (pad "1" smd roundrect (at -0.45 0 270) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp df3662b2-f345-41b3-a79f-6855b16322a7))
     (pad "2" smd roundrect (at 0.45 0 270) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp 4b103b8c-f64c-430e-bd23-ef2bb44e7ac9))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp 4b103b8c-f64c-430e-bd23-ef2bb44e7ac9))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -20773,7 +20765,7 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp d3f9f0b8-1693-4d01-8650-e54f7ff16060))
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1243 "Net-(Q1-D)") (pintype "passive") (tstamp 228dbc14-32ad-4d65-9316-a227a6f16c45))
+      (net 1235 "Net-(Q1-D)") (pintype "passive") (tstamp 228dbc14-32ad-4d65-9316-a227a6f16c45))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 1b880aa8-a2d7-4e51-97af-10b7bbd0ef5a))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -21054,7 +21046,7 @@
     (pad "AD58" smd circle (at -10.9196 15.19 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 24aef254-d51e-4c8e-9129-fa49c68cb246))
     (pad "AD61" smd circle (at -11.94 15.19 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp b1043edb-992e-40a9-8777-7ecb8a24a45a))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp b1043edb-992e-40a9-8777-7ecb8a24a45a))
     (pad "AE6" smd circle (at 10.0382 14.6378 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 244 "unconnected-(U5D-DDIB_AUXP-PadAE6)") (pinfunction "DDIB_AUXP") (pintype "bidirectional+no_connect") (tstamp ad4c100b-1ce5-465b-ab19-d1335cd6611c))
     (pad "AE8" smd circle (at 9.3882 14.6378 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21110,7 +21102,7 @@
     (pad "AF27" smd circle (at 1.4899 14.2519 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 376 "unconnected-(U5P-RSVD-PadAF27)") (pinfunction "RSVD") (pintype "unspecified+no_connect") (tstamp f6d9d67a-343f-4188-9999-28441e912b67))
     (pad "AF30" smd circle (at 0.4889 14.2519 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1428 "/VCCINAUX/VCCINAUX_SENSE") (pinfunction "VCCINAUX_SENSE") (pintype "unspecified") (tstamp c1195266-520a-443f-9b3e-221cae168ee0))
+      (net 1420 "/VCCINAUX/VCCINAUX_SENSE") (pinfunction "VCCINAUX_SENSE") (pintype "unspecified") (tstamp c1195266-520a-443f-9b3e-221cae168ee0))
     (pad "AF32" smd circle (at -0.5121 14.2519 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 248 "unconnected-(U5D-DISP_UTILS_2-PadAF32)") (pinfunction "DISP_UTILS_2") (pintype "output+no_connect") (tstamp 69f80f2d-cb79-4cf3-9158-e9857eebee2c))
     (pad "AF35" smd circle (at -1.5131 14.2519 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21144,7 +21136,7 @@
     (pad "AG58" smd circle (at -10.9196 14.1956 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 286f7521-e80d-4870-84ea-79f463f372d3))
     (pad "AG61" smd circle (at -11.94 14.1956 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 6455e06f-94d2-4a39-9c9f-cfec538abe7f))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 6455e06f-94d2-4a39-9c9f-cfec538abe7f))
     (pad "AH6" smd circle (at 10.0382 13.7868 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 199 "/CPU_DDI/HDMI.D+0") (pinfunction "DDIB_TXP[0]") (pintype "output") (tstamp cb6cef62-bdca-447e-b96e-b5ca64475906))
     (pad "AH8" smd circle (at 9.3882 13.7868 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21164,7 +21156,7 @@
     (pad "AH27" smd circle (at 1.4899 13.6019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 383 "unconnected-(U5P-RSVD-PadAH27)") (pinfunction "RSVD") (pintype "unspecified+no_connect") (tstamp 5e439474-04aa-416e-ab01-30711fb2a0de))
     (pad "AH30" smd circle (at 0.4889 13.6019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1429 "/VCCINAUX/VSSINAUX_SENSE") (pinfunction "VSSINAUX_SENSE") (pintype "unspecified") (tstamp d1876457-889d-44ef-bb3d-f94f95554e19))
+      (net 1421 "/VCCINAUX/VSSINAUX_SENSE") (pinfunction "VSSINAUX_SENSE") (pintype "unspecified") (tstamp d1876457-889d-44ef-bb3d-f94f95554e19))
     (pad "AH32" smd circle (at -0.5121 13.6019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 387 "unconnected-(U5L-THERMTRIP#-PadAH32)") (pinfunction "THERMTRIP#") (pintype "output") (tstamp c95c4e5c-b672-4ade-ab7f-ba4487d686b5))
     (pad "AH35" smd circle (at -1.5131 13.6019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21258,7 +21250,7 @@
     (pad "AL17" smd circle (at 5.4939 12.3019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 35164ba3-c518-4142-806a-e3b2c783eb72))
     (pad "AL20" smd circle (at 4.4929 12.3019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp e86b68be-c155-46fe-ad34-712ab9cf0025))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp e86b68be-c155-46fe-ad34-712ab9cf0025))
     (pad "AL22" smd circle (at 3.4919 12.3019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp d2363148-72a0-43d4-aa92-1c817a0dedb5))
     (pad "AL25" smd circle (at 2.4909 12.3019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21268,7 +21260,7 @@
     (pad "AL30" smd circle (at 0.4889 12.3019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 406 "unconnected-(U5P-RSVD-PadAL30)") (pinfunction "RSVD") (pintype "unspecified+no_connect") (tstamp 66e5f120-2c34-484b-b5ab-3520aed8bfa8))
     (pad "AL32" smd circle (at -0.5121 12.3019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 19d72754-2c29-4561-9a59-e0c41190499e))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 19d72754-2c29-4561-9a59-e0c41190499e))
     (pad "AL35" smd circle (at -1.5131 12.3019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 407 "unconnected-(U5T-RSVD_TP-PadAL35)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp 5fdc6a4f-0263-4320-a9d2-eb81e5c80cc9))
     (pad "AL37" smd circle (at -2.5141 12.3019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21302,7 +21294,7 @@
     (pad "AM11" smd circle (at 8.1138 11.8849 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 4dd8b08a-e5ec-4cdd-8dcf-91b84ab0daf7))
     (pad "AM15" smd circle (at 6.4949 11.8679 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1261 "/CPU_POWER/VCC1P05_PROC_OUT") (pinfunction "VCC_DISPIO") (pintype "power_in") (tstamp 88bd759b-23fe-40f6-86a4-8b59456f3fe1))
+      (net 1253 "/CPU_POWER/VCC1P05_PROC_OUT") (pinfunction "VCC_DISPIO") (pintype "power_in") (tstamp 88bd759b-23fe-40f6-86a4-8b59456f3fe1))
     (pad "AM41" smd circle (at -4.1219 11.934 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VCC1P8_PROC") (pintype "power_in") (tstamp dda6c4ef-d15c-454c-923f-60cc02907efb))
     (pad "AM44" smd circle (at -5.179 12.0129 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21324,21 +21316,21 @@
     (pad "AN17" smd circle (at 5.4939 11.6519 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp c7bffb23-4f91-40d9-b44a-378d89d52230))
     (pad "AN20" smd circle (at 4.4929 11.6519 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 0fc9ab72-1e1a-45fb-9d67-6bc2a03957b5))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 0fc9ab72-1e1a-45fb-9d67-6bc2a03957b5))
     (pad "AN22" smd circle (at 3.4919 11.6519 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 9d48ce24-f8a7-49b6-8aa1-0e40b6bcf7ea))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 9d48ce24-f8a7-49b6-8aa1-0e40b6bcf7ea))
     (pad "AN25" smd circle (at 2.4909 11.6519 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 410 "unconnected-(U5T-RSVD_TP-PadAN25)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp c42043b0-2b6e-4857-a666-5b8c6121520d))
     (pad "AN27" smd circle (at 1.4899 11.6519 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 411 "unconnected-(U5T-RSVD_TP-PadAN27)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp 523b34a0-42a3-400f-b333-d10160cd0304))
     (pad "AN30" smd circle (at 0.4889 11.6519 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 5b0c1b26-7606-4655-91a5-f9b69020d668))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 5b0c1b26-7606-4655-91a5-f9b69020d668))
     (pad "AN32" smd circle (at -0.5121 11.6519 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 4f7ddf5b-d659-49e4-ae4b-f3e594d1bbbd))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 4f7ddf5b-d659-49e4-ae4b-f3e594d1bbbd))
     (pad "AN35" smd circle (at -1.5131 11.6519 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 412 "unconnected-(U5T-RSVD_TP-PadAN35)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp cc64c220-05a2-4460-b248-b68bef20bc2b))
     (pad "AN37" smd circle (at -2.5141 11.6519 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp d667b73b-d229-4132-81dc-b8b5aa14e914))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp d667b73b-d229-4132-81dc-b8b5aa14e914))
     (pad "AN40" smd circle (at -3.5121 11.6519 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 720cf98d-702e-488f-9552-49bb0fc997af))
     (pad "AN43" smd circle (at -4.6786 11.5978 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21350,7 +21342,7 @@
     (pad "AN58" smd circle (at -10.9196 11.5978 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 8e7db366-c3c4-4410-b7c3-ef7f6a5c3876))
     (pad "AN61" smd circle (at -11.94 11.5978 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 53ef3bab-3e08-4e7e-864f-b61ec02b9f76))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 53ef3bab-3e08-4e7e-864f-b61ec02b9f76))
     (pad "AP1" smd circle (at 11.94 11.2938 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 6c9d3317-bdb8-4d91-930a-acb08ccd300a))
     (pad "AP3" smd circle (at 11.29 11.2938 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21368,7 +21360,7 @@
     (pad "AP15" smd circle (at 6.4399 11.2179 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 24b09d2f-9aa3-4910-982c-9cb63f8fcdbc))
     (pad "AP17" smd circle (at 5.4939 11.0019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 73cffca7-e041-4e3d-b1d1-5df20ce43440))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 73cffca7-e041-4e3d-b1d1-5df20ce43440))
     (pad "AP20" smd circle (at 4.4929 11.0019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 7df86f39-d4ae-4295-8592-d01b65273096))
     (pad "AP22" smd circle (at 3.4919 11.0019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21376,19 +21368,19 @@
     (pad "AP25" smd circle (at 2.4909 11.0019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 507f6d11-8d1b-4a61-8440-545061044d22))
     (pad "AP27" smd circle (at 1.4899 11.0019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp a664fc33-038e-422c-9719-2e20a298b32e))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp a664fc33-038e-422c-9719-2e20a298b32e))
     (pad "AP30" smd circle (at 0.4889 11.0019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp e30d9074-3775-4d81-b959-dea6d00830b3))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp e30d9074-3775-4d81-b959-dea6d00830b3))
     (pad "AP32" smd circle (at -0.5121 11.0019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp d4ee5b5e-6597-4fa9-be85-61573093b75d))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp d4ee5b5e-6597-4fa9-be85-61573093b75d))
     (pad "AP35" smd circle (at -1.5131 11.0019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp d62d78ca-2939-4e01-9b25-32f4c006d82d))
     (pad "AP37" smd circle (at -2.5141 11.0019 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp fac1e24b-5adc-488f-a479-897de9208870))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp fac1e24b-5adc-488f-a479-897de9208870))
     (pad "AP41" smd circle (at -4.153 11.2149 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 6efe9c73-2e7e-4302-8b62-face20052230))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 6efe9c73-2e7e-4302-8b62-face20052230))
     (pad "AP44" smd circle (at -5.179 11.1827 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp c5a23aa5-64be-4ab5-a816-9bd654e6c73a))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp c5a23aa5-64be-4ab5-a816-9bd654e6c73a))
     (pad "AP47" smd circle (at -6.433 11.2515 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 998 "/CPU_DDR/DDR2.DQ30") (pinfunction "DDR2_DQ[3][6]") (pintype "bidirectional") (tstamp f2d8b696-d93b-4f9a-b50a-d43164d2c3e9))
     (pad "AP50" smd circle (at -7.496 11.1976 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21412,9 +21404,9 @@
     (pad "AR14" smd circle (at 6.9467 10.8083 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 465 "unconnected-(U5X-VCC1P05_PROC_OUT-PadAR14)") (pinfunction "VCC1P05_PROC_OUT") (pintype "power_in") (tstamp 8eb6cba7-adf9-447b-96a8-6a914222eec3))
     (pad "AR43" smd circle (at -4.6514 10.7957 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 72f0f093-fec7-4dba-ac33-c139f71ad1d6))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 72f0f093-fec7-4dba-ac33-c139f71ad1d6))
     (pad "AR45" smd circle (at -5.5968 10.6823 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 90f9ed90-5810-400c-8567-178fd54e8af6))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 90f9ed90-5810-400c-8567-178fd54e8af6))
     (pad "AR48" smd circle (at -6.997 10.6239 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 997 "/CPU_DDR/DDR2.DQ29") (pinfunction "DDR2_DQ[3][5]") (pintype "bidirectional") (tstamp caa578c3-cb2d-4889-848d-8cfd97acd096))
     (pad "AR51" smd circle (at -7.9866 10.6239 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21436,9 +21428,9 @@
     (pad "AT11" smd circle (at 8.0882 10.3828 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 467 "unconnected-(U5T-RSVD_TP-PadAT11)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp 6c11095d-1189-492a-9ff4-3f056d521710))
     (pad "AT12" smd circle (at 7.4382 10.3828 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1261 "/CPU_POWER/VCC1P05_PROC_OUT") (pinfunction "VCC1P05_PROC_OUT") (pintype "power_in") (tstamp 9e9ae332-c8aa-4644-a3dd-73ce7b6cbe39))
+      (net 1253 "/CPU_POWER/VCC1P05_PROC_OUT") (pinfunction "VCC1P05_PROC_OUT") (pintype "power_in") (tstamp 9e9ae332-c8aa-4644-a3dd-73ce7b6cbe39))
     (pad "AT44" smd circle (at -5.071 10.2989 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp f6caacd6-0810-46d6-8619-52ff25fb8031))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp f6caacd6-0810-46d6-8619-52ff25fb8031))
     (pad "AT47" smd circle (at -6.428 10.2989 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 3dda6edf-2840-48de-9c34-0bfe5ca78c63))
     (pad "AT57" smd circle (at -10.442 10.2989 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21452,9 +21444,9 @@
     (pad "AU14" smd circle (at 6.9467 9.9573 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 468 "unconnected-(U5X-VCC1P05_PROC_OUT-PadAU14)") (pinfunction "VCC1P05_PROC_OUT") (pintype "power_in") (tstamp 768bbc39-36ad-4a3d-aa30-71d939a83636))
     (pad "AU43" smd circle (at -4.6514 9.802 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 4dddfe8f-3b83-41f8-a1c6-46e4e5df4ef8))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 4dddfe8f-3b83-41f8-a1c6-46e4e5df4ef8))
     (pad "AU45" smd circle (at -5.5968 9.9155 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp db761918-6631-46dc-a71a-6c0d0ab70d94))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp db761918-6631-46dc-a71a-6c0d0ab70d94))
     (pad "AU48" smd circle (at -6.997 9.9739 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 992 "/CPU_DDR/DDR2.DQ26") (pinfunction "DDR2_DQ[3][2]") (pintype "bidirectional") (tstamp c537a74f-9ab9-490b-a72f-ce3d9abaca4a))
     (pad "AU51" smd circle (at -7.9866 9.9739 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21480,7 +21472,7 @@
     (pad "AV12" smd circle (at 7.4382 9.5318 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 469 "unconnected-(U5L-VCC_CFG_PU_OUT-PadAV12)") (pinfunction "VCC_CFG_PU_OUT") (pintype "output") (tstamp 7f115173-32da-4e49-965c-c5951deed346))
     (pad "AV44" smd circle (at -5.179 9.4151 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp c45ed8c3-e80e-468f-aa15-39c043adfacb))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp c45ed8c3-e80e-468f-aa15-39c043adfacb))
     (pad "AV50" smd circle (at -7.496 9.4002 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 990 "/CPU_DDR/DDR2.DQ24") (pinfunction "DDR2_DQ[3][0]") (pintype "bidirectional") (tstamp 316c2d26-fdb6-42f5-8311-338e120b1fbf))
     (pad "AV53" smd circle (at -8.78 9.5108 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21530,9 +21522,9 @@
     (pad "AY58" smd circle (at -10.9196 9 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 6702c0c6-1b42-47c0-b453-1dd7bfcfc9a1))
     (pad "AY61" smd circle (at -11.94 9 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 9a691339-fc3e-42ec-bd36-7dd55d7f4aae))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 9a691339-fc3e-42ec-bd36-7dd55d7f4aae))
     (pad "B3" smd circle (at 11.312 23.8119 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp f4a1de3c-c17b-4a0d-90d5-56850b1a81a7))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp f4a1de3c-c17b-4a0d-90d5-56850b1a81a7))
     (pad "B4" smd circle (at 10.662 23.812 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 710b1cda-1cc2-4c15-af38-0a29bbd44e30))
     (pad "B34" smd circle (at -1.3986 24.115 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21564,7 +21556,7 @@
     (pad "BA14" smd circle (at 6.9467 8.2553 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 472 "unconnected-(U5T-RSVD_TP-PadBA14)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp 67b2b791-b400-4f69-9b67-2008029c9ea1))
     (pad "BA44" smd circle (at -5.179 8.5849 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 6b240071-6488-4bd2-be0c-6748f37ff70b))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 6b240071-6488-4bd2-be0c-6748f37ff70b))
     (pad "BA50" smd circle (at -7.496 8.5998 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 989 "/CPU_DDR/DDR2.DQ23") (pinfunction "DDR2_DQ[2][7]") (pintype "bidirectional") (tstamp 38bb4c98-c548-476f-b775-9e97fbe5574e))
     (pad "BA53" smd circle (at -8.78 8.4892 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21588,9 +21580,9 @@
     (pad "BB12" smd circle (at 7.4382 7.8298 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 2f094725-5bbb-4168-8eb0-d031b7b0746d))
     (pad "BB43" smd circle (at -4.6514 8.1979 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp d32ae9af-adc2-448b-a616-974e492fae06))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp d32ae9af-adc2-448b-a616-974e492fae06))
     (pad "BB45" smd circle (at -5.5968 8.0845 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp f52dff9f-d6e5-4a4f-8979-890d60a3a3f9))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp f52dff9f-d6e5-4a4f-8979-890d60a3a3f9))
     (pad "BB48" smd circle (at -6.997 8.0261 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 987 "/CPU_DDR/DDR2.DQ21") (pinfunction "DDR2_DQ[2][5]") (pintype "bidirectional") (tstamp e4bc98f9-bc03-42c2-b706-6151d485a768))
     (pad "BB51" smd circle (at -7.9866 8.0261 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21606,7 +21598,7 @@
     (pad "BC14" smd circle (at 6.9467 7.4043 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp d4ece496-bf6b-4764-9bb9-c4957a4b2be9))
     (pad "BC44" smd circle (at -5.071 7.7011 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp b69e9e70-289b-4844-b1c6-74b98c4c33da))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp b69e9e70-289b-4844-b1c6-74b98c4c33da))
     (pad "BC47" smd circle (at -6.428 7.7011 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp da6e465d-8102-4e99-9614-2751a2f72edc))
     (pad "BC57" smd circle (at -10.442 7.7011 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21620,9 +21612,9 @@
     (pad "BD4" smd circle (at 10.727 7.0688 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp d3d1f92e-ac8b-4985-aa1b-3a93c9d71824))
     (pad "BD43" smd circle (at -4.6514 7.2042 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp a8d819d5-12ce-42b1-99e9-cdfa0017270d))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp a8d819d5-12ce-42b1-99e9-cdfa0017270d))
     (pad "BD45" smd circle (at -5.5968 7.3177 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp d223e6d7-e88c-4c63-a59d-75c8fd5c86a8))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp d223e6d7-e88c-4c63-a59d-75c8fd5c86a8))
     (pad "BD48" smd circle (at -6.997 7.3761 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 982 "/CPU_DDR/DDR2.DQ18") (pinfunction "DDR2_DQ[2][2]") (pintype "bidirectional") (tstamp 7dc03dc0-e957-4ec1-bb81-dcfef95e1d57))
     (pad "BD51" smd circle (at -7.9866 7.3761 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21650,7 +21642,7 @@
     (pad "BE12" smd circle (at 7.4382 6.9788 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp ba73b3d2-a5c3-4911-a01d-051527b6bb5a))
     (pad "BE44" smd circle (at -5.179 6.8173 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 4b13d8fd-dd07-47f7-ab96-b9a00095ac0c))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 4b13d8fd-dd07-47f7-ab96-b9a00095ac0c))
     (pad "BE47" smd circle (at -6.433 6.7485 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 981 "/CPU_DDR/DDR2.DQ17") (pinfunction "DDR2_DQ[2][1]") (pintype "bidirectional") (tstamp d3de65bd-d48b-420c-9f20-c6603a0d8aeb))
     (pad "BE50" smd circle (at -7.496 6.8024 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21716,7 +21708,7 @@
     (pad "BH14" smd circle (at 6.9467 5.7023 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 478 "unconnected-(U5T-RSVD_TP-PadBH14)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp 327734b0-da74-4540-875a-2b077a76c3eb))
     (pad "BH43" smd circle (at -4.6786 5.4078 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp ed689d61-7413-4c16-8541-9c33f131fd4c))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp ed689d61-7413-4c16-8541-9c33f131fd4c))
     (pad "BH46" smd circle (at -5.8822 5.4078 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 60ff8e94-cab0-4b63-94ed-7a278662d287))
     (pad "BH48" smd circle (at -6.9836 5.4078 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21724,7 +21716,7 @@
     (pad "BH58" smd circle (at -10.9196 5.4078 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp f6e10efb-3776-4987-8611-ea07e6782b5a))
     (pad "BH61" smd circle (at -11.94 5.4078 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp bfd5cbb3-4a28-4059-b5fc-2cedb95eb29e))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp bfd5cbb3-4a28-4059-b5fc-2cedb95eb29e))
     (pad "BJ6" smd circle (at 10.0382 5.2768 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp f2711ffe-3fb0-4be0-947d-cf4f45b8748d))
     (pad "BJ8" smd circle (at 9.3882 5.2768 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21750,9 +21742,9 @@
     (pad "BK14" smd circle (at 6.9467 4.8513 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 481 "unconnected-(U5T-RSVD_TP-PadBK14)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp 0f708d3e-88c5-4999-a202-8da912f1f5fd))
     (pad "BK43" smd circle (at -4.6514 4.6057 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 433ead21-f833-4a93-a6d3-f10418feae8d))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 433ead21-f833-4a93-a6d3-f10418feae8d))
     (pad "BK44" smd circle (at -5.179 4.9927 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 3ff7111b-9b85-4951-8dba-c8842cd0b0e4))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 3ff7111b-9b85-4951-8dba-c8842cd0b0e4))
     (pad "BK53" smd circle (at -8.78 4.897 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 956 "/CPU_DDR/DDR1.DQ28") (pinfunction "DDR1_DQ[3][4]") (pintype "bidirectional") (tstamp 815e5128-10b2-4f41-a733-8cc420a0a9d5))
     (pad "BK57" smd circle (at -10.4212 4.9871 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21772,7 +21764,7 @@
     (pad "BL12" smd circle (at 7.4382 4.4258 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 482 "unconnected-(U5T-RSVD_TP-PadBL12)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp ed0516a5-29aa-42c3-804c-3b010f0d320c))
     (pad "BL45" smd circle (at -5.5968 4.4923 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 3479705f-bdbc-4cc6-a800-b5c7d9624ff7))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 3479705f-bdbc-4cc6-a800-b5c7d9624ff7))
     (pad "BL48" smd circle (at -6.997 4.4339 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 957 "/CPU_DDR/DDR1.DQ29") (pinfunction "DDR1_DQ[3][5]") (pintype "bidirectional") (tstamp 71aee4f6-6438-4596-a486-981c0e4847a0))
     (pad "BL51" smd circle (at -7.9866 4.4339 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21792,7 +21784,7 @@
     (pad "BM14" smd circle (at 6.9467 4.0003 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 19d5fcc6-4155-412a-affa-e0b75a121c9f))
     (pad "BM44" smd circle (at -5.071 4.1089 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 59f8aba4-1d61-4d9b-81c8-c914a77b9224))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 59f8aba4-1d61-4d9b-81c8-c914a77b9224))
     (pad "BM47" smd circle (at -6.425 4.106 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 4f021777-800a-4579-8e1e-2710b9a75e02))
     (pad "BM57" smd circle (at -10.442 4.1089 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21810,13 +21802,13 @@
     (pad "BN9" smd circle (at 8.7382 3.5748 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 5a29ec93-2c66-4e7f-8d23-980c0f46075a))
     (pad "BN11" smd circle (at 8.0882 3.5748 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 1637d01a-ac1e-4ffb-a117-bdf1787a6e29))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 1637d01a-ac1e-4ffb-a117-bdf1787a6e29))
     (pad "BN12" smd circle (at 7.4382 3.5748 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 7d502113-3ade-4ebb-94a6-c80197a04705))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 7d502113-3ade-4ebb-94a6-c80197a04705))
     (pad "BN43" smd circle (at -4.6514 3.612 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 483 "unconnected-(U5T-RSVD_TP-PadBN43)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp c3136df4-baf8-499e-ae6b-311ff63daafa))
     (pad "BN45" smd circle (at -5.5968 3.7255 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 15993e57-65f2-4863-9b51-3b75db1133e1))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 15993e57-65f2-4863-9b51-3b75db1133e1))
     (pad "BN48" smd circle (at -6.997 3.7839 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 952 "/CPU_DDR/DDR1.DQ26") (pinfunction "DDR1_DQ[3][2]") (pintype "bidirectional") (tstamp 9770871a-6aa8-4ed0-b186-6206c171665c))
     (pad "BN51" smd circle (at -7.9866 3.7839 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21832,7 +21824,7 @@
     (pad "BP4" smd circle (at 10.727 3.1688 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 279f8a03-464b-4953-941c-8da33b2dbf6f))
     (pad "BP14" smd circle (at 6.9467 3.1493 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp ddb86de2-c886-4337-81ee-cbdaf22983df))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp ddb86de2-c886-4337-81ee-cbdaf22983df))
     (pad "BP44" smd circle (at -5.179 3.2251 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 484 "unconnected-(U5T-RSVD_TP-PadBP44)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp 0d3ecf2d-66b0-41fe-a3b2-361b907b5b7c))
     (pad "BP47" smd circle (at -6.433 3.1563 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21860,9 +21852,9 @@
     (pad "BR9" smd circle (at 8.7382 2.7238 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp ab78c9f2-ba18-47c2-b7f4-a5d4599f6b84))
     (pad "BR11" smd circle (at 8.0882 2.7238 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 21bebf6a-37c5-49f0-9433-b5b86996da88))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 21bebf6a-37c5-49f0-9433-b5b86996da88))
     (pad "BR12" smd circle (at 7.4382 2.7238 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 5b624057-a437-4f6c-99a1-063b13d6c3d2))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 5b624057-a437-4f6c-99a1-063b13d6c3d2))
     (pad "BR43" smd circle (at -4.6786 2.81 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 5850f38e-a0e0-488e-89ac-77e606d0c2f8))
     (pad "BR46" smd circle (at -5.8822 2.81 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21872,13 +21864,13 @@
     (pad "BR58" smd circle (at -10.9196 2.81 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 2cc08035-e163-4339-8e6e-9fa8102cfb22))
     (pad "BR61" smd circle (at -11.94 2.81 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 9654209d-86c0-443d-8308-77f6a1426041))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 9654209d-86c0-443d-8308-77f6a1426041))
     (pad "BT4" smd circle (at 10.727 2.5188 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 6ada783a-fa22-44ad-a13d-27fdb6a91b7a))
     (pad "BT14" smd circle (at 6.9467 2.2983 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 8e6857c1-17d4-4a62-bd68-5ef6b16ba263))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 8e6857c1-17d4-4a62-bd68-5ef6b16ba263))
     (pad "BT44" smd circle (at -5.179 2.3949 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 90b689db-9fb0-4d1f-9e50-11ef6dc0dc2e))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 90b689db-9fb0-4d1f-9e50-11ef6dc0dc2e))
     (pad "BT47" smd circle (at -6.433 2.4637 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 948 "/CPU_DDR/DDR1.DQ22") (pinfunction "DDR1_DQ[2][6]") (pintype "bidirectional") (tstamp 37efeb2a-f831-4ab5-8530-e8dca5409f56))
     (pad "BT50" smd circle (at -7.496 2.4098 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21904,13 +21896,13 @@
     (pad "BU9" smd circle (at 8.7382 1.8728 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 80bc728c-0d76-437a-b4d1-c90d9154ff12))
     (pad "BU11" smd circle (at 8.0882 1.8728 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 93d0260a-00b9-46ac-bd58-5faa2f52a947))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 93d0260a-00b9-46ac-bd58-5faa2f52a947))
     (pad "BU12" smd circle (at 7.4382 1.8728 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp bf0abc2a-8b09-4537-9e01-1a774e3e3f5f))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp bf0abc2a-8b09-4537-9e01-1a774e3e3f5f))
     (pad "BU43" smd circle (at -4.6514 2.0079 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 3b6bb5b8-cbde-49ff-a597-290eda0f741a))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 3b6bb5b8-cbde-49ff-a597-290eda0f741a))
     (pad "BU45" smd circle (at -5.5968 1.8945 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 7fbd24ab-d0d0-4f0f-a135-86a74b925fcc))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 7fbd24ab-d0d0-4f0f-a135-86a74b925fcc))
     (pad "BU48" smd circle (at -6.997 1.8361 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 947 "/CPU_DDR/DDR1.DQ21") (pinfunction "DDR1_DQ[2][5]") (pintype "bidirectional") (tstamp 12de8a27-d5b9-4769-b232-1b5b57b0547d))
     (pad "BU51" smd circle (at -7.9866 1.8361 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21928,9 +21920,9 @@
     (pad "BV3" smd circle (at 11.29 1.5438 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 454 "/CPU_USB/USBC3.TX-2") (pinfunction "TCP3_TX_N1") (pintype "output") (tstamp 8dd7df0f-5ebb-4cab-9f43-3917373d5465))
     (pad "BV14" smd circle (at 6.9467 1.4473 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 35caef50-d62c-4c38-b623-4814dab0fef4))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 35caef50-d62c-4c38-b623-4814dab0fef4))
     (pad "BV44" smd circle (at -5.071 1.5111 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp a712c677-62e5-42a9-8592-f34151ec4054))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp a712c677-62e5-42a9-8592-f34151ec4054))
     (pad "BV47" smd circle (at -6.428 1.5111 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 1ecf52df-8dc9-43e3-8922-f2aee10de10a))
     (pad "BV57" smd circle (at -10.442 1.5111 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21948,11 +21940,11 @@
     (pad "BW11" smd circle (at 8.0882 1.0218 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 485 "unconnected-(U5T-RSVD_TP-PadBW11)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp 4821f373-a9a5-497c-95bb-0aac79601ddc))
     (pad "BW12" smd circle (at 7.4382 1.0218 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp b6e5a7a3-41ab-4323-bf83-863661cd80d6))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp b6e5a7a3-41ab-4323-bf83-863661cd80d6))
     (pad "BW43" smd circle (at -4.6514 1.0142 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 7aba121f-52c4-432a-b297-9c8172c790f5))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 7aba121f-52c4-432a-b297-9c8172c790f5))
     (pad "BW45" smd circle (at -5.5968 1.1277 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 8a026259-ecb5-454c-a36a-14e4d594d28e))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 8a026259-ecb5-454c-a36a-14e4d594d28e))
     (pad "BW48" smd circle (at -6.997 1.1861 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 942 "/CPU_DDR/DDR1.DQ18") (pinfunction "DDR1_DQ[2][2]") (pintype "bidirectional") (tstamp 698afda1-98fd-403d-b997-9f8b361c8a0f))
     (pad "BW51" smd circle (at -7.9866 1.1861 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -21966,11 +21958,11 @@
     (pad "BW61" smd circle (at -11.94 1.1861 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 865 "/CPU_DDR/DDR0.DQS-2") (pinfunction "DDR1_DQSN[0]") (pintype "bidirectional") (tstamp 2b15cd13-442a-46bf-a55b-c2c5aec2596d))
     (pad "BY1" smd circle (at 11.94 0.8938 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 79bd7bcc-77ab-4c6c-b8cd-049af938b87b))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 79bd7bcc-77ab-4c6c-b8cd-049af938b87b))
     (pad "BY3" smd circle (at 11.29 0.8938 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 3ce339b4-2fc2-45bb-9be2-8dbe87d392a8))
     (pad "BY44" smd circle (at -5.179 0.6273 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp a2633caf-1681-41d2-b4ce-10cb5f45d691))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp a2633caf-1681-41d2-b4ce-10cb5f45d691))
     (pad "BY50" smd circle (at -7.496 0.6124 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 940 "/CPU_DDR/DDR1.DQ16") (pinfunction "DDR1_DQ[2][0]") (pintype "bidirectional") (tstamp 2d0beaca-a965-4e77-91d1-103ac72c1a5b))
     (pad "BY53" smd circle (at -8.78 0.723 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22030,9 +22022,9 @@
     (pad "C51" smd circle (at -8.0416 23.4325 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 1038 "/CPU_DDR/DDR3.DQ0") (pinfunction "DDR3_DQ[0][0]") (pintype "bidirectional") (tstamp ef9c79b7-3a4a-4bf0-bb8a-fdbb0e1ea8c7))
     (pad "CA1" smd circle (at 11.94 0.2438 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 33b6adfd-4756-4368-ac41-04e2ef908c09))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 33b6adfd-4756-4368-ac41-04e2ef908c09))
     (pad "CA3" smd circle (at 11.29 0.2438 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 9e3152ab-e849-4d44-872c-4f64d27705c9))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 9e3152ab-e849-4d44-872c-4f64d27705c9))
     (pad "CA14" smd circle (at 6.9467 0.5963 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 4c31da53-35ec-4154-9d3f-584f82e11b84))
     (pad "CA43" smd circle (at -4.6786 0.2122 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22050,7 +22042,7 @@
     (pad "CA58" smd circle (at -10.9196 0.2122 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 64c6bcaf-19bf-40c0-8432-926d2f2a5a0f))
     (pad "CA61" smd circle (at -11.94 0.2122 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 14115484-ad1f-42e8-82b2-ec47a0b19a91))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 14115484-ad1f-42e8-82b2-ec47a0b19a91))
     (pad "CB4" smd circle (at 10.727 -0.0812 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 890e72e8-0ef2-401c-a6e8-63e74305032d))
     (pad "CB6" smd circle (at 10.0382 0.1708 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22062,17 +22054,17 @@
     (pad "CB11" smd circle (at 8.0882 0.1708 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 490 "unconnected-(U5T-RSVD_TP-PadCB11)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp d3e48b2d-c2c6-415c-8458-13131551793d))
     (pad "CB12" smd circle (at 7.4382 0.1708 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 0cf64b4e-ff4b-4221-96d0-b9e8f035ceb1))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 0cf64b4e-ff4b-4221-96d0-b9e8f035ceb1))
     (pad "CB55" smd circle (at -9.7996 -0.1366 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 259 "unconnected-(U5G-NC-PadCB55)") (pinfunction "NC") (pintype "output+no_connect") (tstamp f3af0093-27bf-4723-860b-65406947e0a7))
     (pad "CC1" smd circle (at 11.94 -0.4062 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp d8482b3b-909c-44eb-9d2e-660def105bb3))
     (pad "CC3" smd circle (at 11.29 -0.4062 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp b62884fa-e89f-4540-9363-577577bd4ebc))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp b62884fa-e89f-4540-9363-577577bd4ebc))
     (pad "CC14" smd circle (at 6.9467 -0.2547 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 7b9f2b76-2d35-4606-a1a3-6f88457ffa06))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 7b9f2b76-2d35-4606-a1a3-6f88457ffa06))
     (pad "CC44" smd circle (at -5.1028 -0.285 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 87b62e74-3380-4d4b-89ef-8c73c250d413))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 87b62e74-3380-4d4b-89ef-8c73c250d413))
     (pad "CC47" smd circle (at -6.421 -0.285 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 915 "/CPU_DDR/DDR1.CS0") (pinfunction "DDR1_CS[0]") (pintype "output") (tstamp 69532b05-711f-4158-a100-b7169cda074c))
     (pad "CC50" smd circle (at -7.5526 -0.285 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22086,17 +22078,17 @@
     (pad "CC60" smd circle (at -11.4514 -0.3526 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 261 "unconnected-(U5G-NC-PadCC60)") (pinfunction "NC") (pintype "output+no_connect") (tstamp 7d48c7ae-8a01-4393-859d-ab4f9307801f))
     (pad "CD6" smd circle (at 10.0382 -0.6802 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 12aea213-7bc8-4c1e-b3af-f4011adc8ecc))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 12aea213-7bc8-4c1e-b3af-f4011adc8ecc))
     (pad "CD8" smd circle (at 9.3882 -0.6802 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 3d2bd085-2d79-4037-9fa4-f3088caa25c4))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 3d2bd085-2d79-4037-9fa4-f3088caa25c4))
     (pad "CD9" smd circle (at 8.7382 -0.6802 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 1aeada58-b2a8-4ea8-9835-868c5d2dec42))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 1aeada58-b2a8-4ea8-9835-868c5d2dec42))
     (pad "CD11" smd circle (at 8.0882 -0.6802 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 3ce69101-210d-4369-ae8f-cc859abbf013))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 3ce69101-210d-4369-ae8f-cc859abbf013))
     (pad "CD12" smd circle (at 7.4382 -0.6802 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 3d19554b-e524-4495-b8be-428b3d26e6c1))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 3d19554b-e524-4495-b8be-428b3d26e6c1))
     (pad "CD43" smd circle (at -4.6786 -0.7822 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp fe39e876-cce8-4060-8e13-7236d25b62e8))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp fe39e876-cce8-4060-8e13-7236d25b62e8))
     (pad "CD46" smd circle (at -5.892 -0.7652 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 233a3a2e-6496-4d5f-837c-a11b7cf90ff7))
     (pad "CD48" smd circle (at -6.726 -0.8592 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22106,17 +22098,17 @@
     (pad "CD58" smd circle (at -10.9196 -0.7822 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp a2b27287-2e56-4206-a463-708e9f701c94))
     (pad "CD61" smd circle (at -11.94 -0.7822 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 06744a75-46f2-45ca-b0bd-e428850b6d80))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 06744a75-46f2-45ca-b0bd-e428850b6d80))
     (pad "CE1" smd circle (at 11.94 -1.0562 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 571c5d14-0787-442a-9d6d-5a29a9476f0d))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 571c5d14-0787-442a-9d6d-5a29a9476f0d))
     (pad "CE3" smd circle (at 11.29 -1.0562 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 5ea753c0-6736-4346-9b4d-1ad23348fcf8))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 5ea753c0-6736-4346-9b4d-1ad23348fcf8))
     (pad "CE4" smd circle (at 10.727 -1.3812 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp c6773852-1f07-4680-a136-ebd7ec1a82bd))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp c6773852-1f07-4680-a136-ebd7ec1a82bd))
     (pad "CE14" smd circle (at 6.9467 -1.1057 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 2187a8d2-34e5-43bd-b886-728309c42cc9))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 2187a8d2-34e5-43bd-b886-728309c42cc9))
     (pad "CE44" smd circle (at -5.179 -1.1973 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 1277c7f2-372a-4402-b38b-3d41a29ef333))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 1277c7f2-372a-4402-b38b-3d41a29ef333))
     (pad "CE51" smd circle (at -8.1528 -1.1223 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 7f2edc4d-f132-4654-a6e7-27ad8e53d899))
     (pad "CE53" smd circle (at -8.78 -1.293 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22128,23 +22120,23 @@
     (pad "CE60" smd circle (at -11.4398 -1.1991 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 912 "/CPU_DDR/DDR1.CA4") (pinfunction "DDR1_CA[4]") (pintype "output") (tstamp c5a10ba6-04e3-4d70-a139-b6a21524bd75))
     (pad "CF1" smd circle (at 11.94 -1.7062 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp d16f539f-67f1-4ed9-90f3-e3d6936c9924))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp d16f539f-67f1-4ed9-90f3-e3d6936c9924))
     (pad "CF3" smd circle (at 11.29 -1.7062 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 16ad87d5-2ea2-44f9-9c7c-9408962958c5))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 16ad87d5-2ea2-44f9-9c7c-9408962958c5))
     (pad "CF6" smd circle (at 10.0382 -1.5312 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 700c7c4c-2b66-430a-9616-00e5f57a51be))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 700c7c4c-2b66-430a-9616-00e5f57a51be))
     (pad "CF8" smd circle (at 9.3882 -1.5312 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 3eb28ba2-73fd-42bc-a85f-cf9ff0130ec4))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 3eb28ba2-73fd-42bc-a85f-cf9ff0130ec4))
     (pad "CF9" smd circle (at 8.7382 -1.5312 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 5707075d-630a-4229-a81e-96668ef71641))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 5707075d-630a-4229-a81e-96668ef71641))
     (pad "CF11" smd circle (at 8.0882 -1.5312 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 3a0aa8b3-c9dd-4e50-b1c5-64a5c8e3b216))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 3a0aa8b3-c9dd-4e50-b1c5-64a5c8e3b216))
     (pad "CF12" smd circle (at 7.4382 -1.5312 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp a84071e6-ab60-4f5b-a174-b8f4b277a035))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp a84071e6-ab60-4f5b-a174-b8f4b277a035))
     (pad "CF43" smd circle (at -4.6514 -1.5843 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 51bfac3e-0af2-4191-9242-5559e9876d29))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 51bfac3e-0af2-4191-9242-5559e9876d29))
     (pad "CF45" smd circle (at -5.5968 -1.6977 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp cafcbdc0-19af-47da-8bda-1c59c535e7f3))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp cafcbdc0-19af-47da-8bda-1c59c535e7f3))
     (pad "CF47" smd circle (at -6.5924 -1.6908 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp cde7df01-0cb3-4ac3-a0cd-c16d6d6b1688))
     (pad "CF49" smd circle (at -7.3314 -1.7839 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22160,19 +22152,19 @@
     (pad "CF61" smd circle (at -11.94 -1.7561 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 902 "/CPU_DDR/DDR1.CK-0") (pinfunction "DDR1_CLK_N[0]") (pintype "output") (tstamp 6edc4470-393d-4ff3-87a6-e2099be66f6d))
     (pad "CG4" smd circle (at 10.727 -2.0312 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 8a3ecc3b-20ac-4ce5-a9e2-b157dd9fb0e7))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 8a3ecc3b-20ac-4ce5-a9e2-b157dd9fb0e7))
     (pad "CG14" smd circle (at 6.9467 -1.9567 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 1181757d-1384-4adf-bd4f-f0489d800fde))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 1181757d-1384-4adf-bd4f-f0489d800fde))
     (pad "CG44" smd circle (at -5.071 -2.0811 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 32616cc3-612e-4e9d-9502-94bdf17ef9c7))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 32616cc3-612e-4e9d-9502-94bdf17ef9c7))
     (pad "CG57" smd circle (at -10.442 -2.0811 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 2bd5196f-34cb-4a94-b5b7-91c9a226a352))
     (pad "CG59" smd circle (at -11.377 -2.0811 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 57cf5de9-2924-4675-ada7-2aafc6da591e))
     (pad "CH1" smd circle (at 11.94 -2.3562 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp e2c29bd3-c215-4b2a-8a28-a68f89e89314))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp e2c29bd3-c215-4b2a-8a28-a68f89e89314))
     (pad "CH3" smd circle (at 11.29 -2.3562 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp a6dad6e5-0d40-4d22-8c90-06500e60cc87))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp a6dad6e5-0d40-4d22-8c90-06500e60cc87))
     (pad "CH6" smd circle (at 10.0382 -2.3822 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp c481524b-4f52-4ef5-844e-5ff0080b93b9))
     (pad "CH8" smd circle (at 9.3882 -2.3822 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22186,7 +22178,7 @@
     (pad "CH43" smd circle (at -4.6514 -2.578 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 491 "unconnected-(U5T-RSVD_TP-PadCH43)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp d4ecc8cc-5d59-419f-b4af-e9c7b1c01ff1))
     (pad "CH45" smd circle (at -5.5968 -2.4645 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp b932e6d4-7b97-4061-b2e3-758291c47eb8))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp b932e6d4-7b97-4061-b2e3-758291c47eb8))
     (pad "CH46" smd circle (at -6.1918 -2.2027 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 910 "/CPU_DDR/DDR1.CA6") (pinfunction "DDR1_CA[6]") (pintype "output") (tstamp 9c50f6ff-0570-40df-897c-c5b67b829240))
     (pad "CH48" smd circle (at -6.8828 -2.2784 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22220,17 +22212,17 @@
     (pad "CK3" smd circle (at 11.29 -3.0062 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 3bd03054-c6ad-4cc9-bc5a-b63bce98455a))
     (pad "CK4" smd circle (at 10.727 -3.3312 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp e84afd5b-f087-4e5a-9298-9b4f53e9050c))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp e84afd5b-f087-4e5a-9298-9b4f53e9050c))
     (pad "CK6" smd circle (at 10.0382 -3.2332 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 9717d34d-83be-444a-892c-72e198748d85))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 9717d34d-83be-444a-892c-72e198748d85))
     (pad "CK8" smd circle (at 9.3882 -3.2332 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 29a848d8-0116-4d57-827e-3c7eb02acb5d))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 29a848d8-0116-4d57-827e-3c7eb02acb5d))
     (pad "CK9" smd circle (at 8.7382 -3.2332 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp e27d6bc1-aa48-41f8-b616-af266cc1b0ff))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp e27d6bc1-aa48-41f8-b616-af266cc1b0ff))
     (pad "CK11" smd circle (at 8.0882 -3.2332 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 61cf9891-f547-444c-970b-c9d4519bb875))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 61cf9891-f547-444c-970b-c9d4519bb875))
     (pad "CK12" smd circle (at 7.4382 -3.2332 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 9a001c37-9f5d-46c2-9b31-2e0572315d2b))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 9a001c37-9f5d-46c2-9b31-2e0572315d2b))
     (pad "CK43" smd circle (at -4.6786 -3.38 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 8fae95d2-d108-445e-9698-d1af094b20c2))
     (pad "CK46" smd circle (at -5.8822 -3.38 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22246,27 +22238,27 @@
     (pad "CK58" smd circle (at -10.9196 -3.38 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 0302686e-d11b-4af2-8d3e-a1008ca2d92d))
     (pad "CK61" smd circle (at -11.94 -3.38 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 94149c1a-5412-41c0-8fa0-9b020257a2c6))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 94149c1a-5412-41c0-8fa0-9b020257a2c6))
     (pad "CL1" smd circle (at 11.94 -3.6562 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 43ed6b74-d840-462f-b846-aff2a37778ed))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 43ed6b74-d840-462f-b846-aff2a37778ed))
     (pad "CL3" smd circle (at 11.29 -3.6562 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 4c8a85f4-a795-4fc7-ad4d-02eb40e6abe9))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 4c8a85f4-a795-4fc7-ad4d-02eb40e6abe9))
     (pad "CL14" smd circle (at 6.9467 -3.6587 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp d0d1e342-ed3c-4728-863a-f52ca7869ac9))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp d0d1e342-ed3c-4728-863a-f52ca7869ac9))
     (pad "CL55" smd circle (at -9.7996 -3.7288 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 266 "unconnected-(U5G-NC-PadCL55)") (pinfunction "NC") (pintype "output+no_connect") (tstamp b514cc7e-1578-4712-b2f1-3c53ef799b30))
     (pad "CM4" smd circle (at 10.727 -3.9812 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp c25ea701-dcfe-4764-b310-84306df06c68))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp c25ea701-dcfe-4764-b310-84306df06c68))
     (pad "CM6" smd circle (at 10.0382 -4.0842 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 9c4b9c2a-b086-4c1d-aec6-b4e52d6fe36f))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 9c4b9c2a-b086-4c1d-aec6-b4e52d6fe36f))
     (pad "CM8" smd circle (at 9.3882 -4.0842 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp ce099a6a-4a61-42c3-b7d7-db9e037e6f00))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp ce099a6a-4a61-42c3-b7d7-db9e037e6f00))
     (pad "CM9" smd circle (at 8.7382 -4.0842 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp a978b80e-aebb-45e1-971f-6bb74e29d2ed))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp a978b80e-aebb-45e1-971f-6bb74e29d2ed))
     (pad "CM11" smd circle (at 8.0882 -4.0842 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp de72711f-9b5e-444c-88e3-e76f3a2182b9))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp de72711f-9b5e-444c-88e3-e76f3a2182b9))
     (pad "CM12" smd circle (at 7.4382 -4.0842 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 882855a9-bb6c-42ca-8a71-a66e3027bc2f))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 882855a9-bb6c-42ca-8a71-a66e3027bc2f))
     (pad "CM44" smd circle (at -5.1028 -3.8772 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 492 "unconnected-(U5T-RSVD_TP-PadCM44)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp 6688a55f-3d27-4a12-9534-e59d4554c825))
     (pad "CM47" smd circle (at -6.421 -3.8772 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22282,11 +22274,11 @@
     (pad "CM60" smd circle (at -11.4514 -3.9448 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 268 "unconnected-(U5G-NC-PadCM60)") (pinfunction "NC") (pintype "output+no_connect") (tstamp dec0b8e1-7923-41b1-bbd6-a71584d1c8e7))
     (pad "CN1" smd circle (at 11.94 -4.3062 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp f69fbe73-b4ed-4c8d-b160-f5424fa8011d))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp f69fbe73-b4ed-4c8d-b160-f5424fa8011d))
     (pad "CN3" smd circle (at 11.29 -4.3062 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 4ce8383f-c9c4-4681-8edd-8c34e83f8654))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 4ce8383f-c9c4-4681-8edd-8c34e83f8654))
     (pad "CN14" smd circle (at 6.9467 -4.5097 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp e641e6c6-af90-41e7-9edc-dcb712ee11f2))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp e641e6c6-af90-41e7-9edc-dcb712ee11f2))
     (pad "CN43" smd circle (at -4.6786 -4.3744 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 493 "unconnected-(U5T-RSVD_TP-PadCN43)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp e7501e27-beb2-4079-98d9-d5230f848309))
     (pad "CN46" smd circle (at -5.892 -4.3574 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22298,25 +22290,25 @@
     (pad "CN58" smd circle (at -10.9196 -4.3744 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 69d26297-df4c-4a07-96ad-b5a711bf54e7))
     (pad "CN61" smd circle (at -11.94 -4.3744 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp ec6a18ac-f2b7-403e-860d-918609426e98))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp ec6a18ac-f2b7-403e-860d-918609426e98))
     (pad "CP1" smd circle (at 11.94 -4.9562 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp f64d1af5-363d-45af-ade8-ae8c2df8a555))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp f64d1af5-363d-45af-ade8-ae8c2df8a555))
     (pad "CP3" smd circle (at 11.29 -4.9562 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 10f9b18b-7163-4a35-b18b-6f3376aa5c92))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 10f9b18b-7163-4a35-b18b-6f3376aa5c92))
     (pad "CP4" smd circle (at 10.727 -4.6312 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 0becb9b0-400f-4e14-9e9f-eebcd446dd4f))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 0becb9b0-400f-4e14-9e9f-eebcd446dd4f))
     (pad "CP6" smd circle (at 10.0382 -4.9352 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp b0dcf8d6-cc86-4fe5-ba3b-ca7502738295))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp b0dcf8d6-cc86-4fe5-ba3b-ca7502738295))
     (pad "CP8" smd circle (at 9.3882 -4.9352 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp e2a71066-7191-4098-8d27-cc40c7b4f57b))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp e2a71066-7191-4098-8d27-cc40c7b4f57b))
     (pad "CP9" smd circle (at 8.7382 -4.9352 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp fd2c364c-a168-4d42-b46d-83c5f49a6311))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp fd2c364c-a168-4d42-b46d-83c5f49a6311))
     (pad "CP11" smd circle (at 8.0882 -4.9352 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 03a1c4f4-14fc-4b0d-85da-bff5f429d029))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 03a1c4f4-14fc-4b0d-85da-bff5f429d029))
     (pad "CP12" smd circle (at 7.4382 -4.9352 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 4dea3ce5-5acb-472d-8772-af4cf15a7e84))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp 4dea3ce5-5acb-472d-8772-af4cf15a7e84))
     (pad "CP44" smd circle (at -5.179 -4.7895 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp c3a9abef-c890-4597-a2bf-d014dbb2dbac))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp c3a9abef-c890-4597-a2bf-d014dbb2dbac))
     (pad "CP51" smd circle (at -8.1528 -4.7145 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 751cf37b-5cdf-4dac-9a3f-4cafc7c8204b))
     (pad "CP53" smd circle (at -8.78 -4.8852 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22328,13 +22320,13 @@
     (pad "CP60" smd circle (at -11.4398 -4.7913 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 892 "/CPU_DDR/DDR0.CA9") (pinfunction "DDR0_CA[9]") (pintype "output") (tstamp fa691ba9-1414-4941-ba22-d653a56b9638))
     (pad "CR4" smd circle (at 10.727 -5.2812 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1418 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp f8df9d9c-25ad-4088-a46c-3eaf4b9e0b69))
+      (net 1410 "VCCCORE") (pinfunction "VCCCORE") (pintype "power_in") (tstamp f8df9d9c-25ad-4088-a46c-3eaf4b9e0b69))
     (pad "CR14" smd circle (at 6.9467 -5.3607 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 494 "unconnected-(U5T-RSVD_TP-PadCR14)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp efbc6e3e-0047-4c0e-b889-898b0ffb3ccf))
     (pad "CR43" smd circle (at -4.6514 -5.1765 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp e48c29a1-485a-4157-9676-3ea3645738de))
     (pad "CR45" smd circle (at -5.5968 -5.2899 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 8a498a7f-ba1c-4088-b5ba-ae0cae4bcdc7))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 8a498a7f-ba1c-4088-b5ba-ae0cae4bcdc7))
     (pad "CR47" smd circle (at -6.5924 -5.283 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp b8aaa689-c147-41c9-8834-b4dbc0c16493))
     (pad "CR49" smd circle (at -7.3314 -5.3761 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22350,9 +22342,9 @@
     (pad "CR61" smd circle (at -11.94 -5.3483 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 898 "/CPU_DDR/DDR0.CK-0") (pinfunction "DDR0_CLK_N[0]") (pintype "output") (tstamp 40ee600a-f753-460f-8c64-8894efeaeff0))
     (pad "CT1" smd circle (at 11.94 -5.6062 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1478 "Net-(U27-RGND)") (pinfunction "VCCCORE_VSS_SENSE") (pintype "unspecified") (tstamp 11b2e04d-e42a-4d2b-8154-4ab14124986a))
+      (net 1470 "Net-(U27-RGND)") (pinfunction "VCCCORE_VSS_SENSE") (pintype "unspecified") (tstamp 11b2e04d-e42a-4d2b-8154-4ab14124986a))
     (pad "CT3" smd circle (at 11.29 -5.6062 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1479 "Net-(U27-VSEN)") (pinfunction "VCCCORE_SENSE") (pintype "unspecified") (tstamp 584b24ae-1bb8-4361-bad8-45961dbb8b0d))
+      (net 1471 "Net-(U27-VSEN)") (pinfunction "VCCCORE_SENSE") (pintype "unspecified") (tstamp 584b24ae-1bb8-4361-bad8-45961dbb8b0d))
     (pad "CT6" smd circle (at 10.0382 -5.7862 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp eb3f0047-6974-4cef-b8bd-05e2a6cc3a9d))
     (pad "CT8" smd circle (at 9.3882 -5.7862 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22364,7 +22356,7 @@
     (pad "CT12" smd circle (at 7.4382 -5.7862 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 495 "unconnected-(U5T-RSVD_TP-PadCT12)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp cbe3ac8c-7692-4281-ab8a-f3a38d518eb2))
     (pad "CT44" smd circle (at -5.071 -5.6733 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 1350e558-0ffb-4667-9745-f0fa527bca14))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 1350e558-0ffb-4667-9745-f0fa527bca14))
     (pad "CT46" smd circle (at -6.1918 -5.7949 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 890 "/CPU_DDR/DDR0.CA7") (pinfunction "DDR0_CA[7]") (pintype "output") (tstamp 3eb2a5bb-fa10-46a5-bd74-a0f295165081))
     (pad "CT57" smd circle (at -10.442 -5.6733 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22374,9 +22366,9 @@
     (pad "CU4" smd circle (at 10.727 -5.9312 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 002ea1ca-8669-4723-9b3f-8a073b997274))
     (pad "CU43" smd circle (at -4.6514 -6.1702 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp c838df31-7f00-49a4-830c-6af8cd6a4ee2))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp c838df31-7f00-49a4-830c-6af8cd6a4ee2))
     (pad "CU45" smd circle (at -5.5968 -6.0567 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp e5d379b8-eff4-467a-b508-1ca505f73896))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp e5d379b8-eff4-467a-b508-1ca505f73896))
     (pad "CU48" smd circle (at -6.8828 -5.8706 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 888 "/CPU_DDR/DDR0.CA5") (pinfunction "DDR0_CA[5]") (pintype "output") (tstamp 1d1c77ef-2688-47dd-8459-2ec6a8c2ddef))
     (pad "CU51" smd circle (at -7.9866 -5.9983 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22390,15 +22382,15 @@
     (pad "CU61" smd circle (at -11.94 -5.9983 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 896 "/CPU_DDR/DDR0.CK+0") (pinfunction "DDR0_CLK_P[0]") (pintype "output") (tstamp d130018f-743b-4617-80b2-5f8d30c10875))
     (pad "CV1" smd circle (at 11.94 -6.2562 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1480 "Net-(U27-VSENA)") (pinfunction "VCCGT_SENSE") (pintype "unspecified") (tstamp 40b7c0c2-99ae-47aa-b34e-55d972d644bd))
+      (net 1472 "Net-(U27-VSENA)") (pinfunction "VCCGT_SENSE") (pintype "unspecified") (tstamp 40b7c0c2-99ae-47aa-b34e-55d972d644bd))
     (pad "CV3" smd circle (at 11.29 -6.2562 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1481 "Net-(U27-RGNDA)") (pinfunction "VCCGT_VSS_SENSE") (pintype "unspecified") (tstamp 046f4b0c-4b05-48de-88ac-19f6ca3f11d5))
+      (net 1473 "Net-(U27-RGNDA)") (pinfunction "VCCGT_VSS_SENSE") (pintype "unspecified") (tstamp 046f4b0c-4b05-48de-88ac-19f6ca3f11d5))
     (pad "CV4" smd circle (at 10.727 -6.5812 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp c54df83d-bd37-494d-a213-f099e0677c90))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp c54df83d-bd37-494d-a213-f099e0677c90))
     (pad "CV14" smd circle (at 6.9467 -6.2117 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 2ce70eca-ad97-4b25-bf4e-0220f2963762))
     (pad "CV44" smd circle (at -5.179 -6.5571 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 77e73764-2f18-42ef-8e32-6f0dd0888b62))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 77e73764-2f18-42ef-8e32-6f0dd0888b62))
     (pad "CV50" smd circle (at -7.496 -6.572 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 887 "/CPU_DDR/DDR0.CA4") (pinfunction "DDR0_CA[4]") (pintype "output") (tstamp 9a46d252-0f33-4da5-baad-9f98440fc885))
     (pad "CV53" smd circle (at -8.78 -6.4614 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22408,19 +22400,19 @@
     (pad "CV60" smd circle (at -11.4398 -6.5553 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 884 "/CPU_DDR/DDR0.CS1") (pinfunction "DDR0_CS[1]") (pintype "output") (tstamp a7d1fd00-7bc9-4deb-b334-f5dff905166b))
     (pad "CW1" smd circle (at 11.94 -6.9062 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp b0d292a4-1b14-4116-97b3-52f9d2a9d63f))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp b0d292a4-1b14-4116-97b3-52f9d2a9d63f))
     (pad "CW3" smd circle (at 11.29 -6.9062 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 523866b4-25c0-48d0-9a5f-06da033e5ceb))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 523866b4-25c0-48d0-9a5f-06da033e5ceb))
     (pad "CW6" smd circle (at 10.0382 -6.6372 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 923ba294-34ef-46fc-8425-9039de7cf198))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 923ba294-34ef-46fc-8425-9039de7cf198))
     (pad "CW8" smd circle (at 9.3882 -6.6372 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp b40b8dc1-d925-4004-a71a-7966d4387a89))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp b40b8dc1-d925-4004-a71a-7966d4387a89))
     (pad "CW9" smd circle (at 8.7382 -6.6372 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp df31ee46-caa1-43e9-9c34-e1846f9b83eb))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp df31ee46-caa1-43e9-9c34-e1846f9b83eb))
     (pad "CW11" smd circle (at 8.0882 -6.6372 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp b7f54d39-4843-43b4-a777-0b1c991ddca0))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp b7f54d39-4843-43b4-a777-0b1c991ddca0))
     (pad "CW12" smd circle (at 7.4382 -6.6372 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 5b91ee06-4665-4f02-afeb-d18cdbd14687))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 5b91ee06-4665-4f02-afeb-d18cdbd14687))
     (pad "CW43" smd circle (at -4.6786 -6.9722 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 784e78cc-e187-4131-b479-05f1d87b3296))
     (pad "CW46" smd circle (at -5.8822 -6.9722 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22436,13 +22428,13 @@
     (pad "CW58" smd circle (at -10.9196 -6.9722 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp e253b080-a1d8-43e4-9b45-334b52d1c29b))
     (pad "CW61" smd circle (at -11.94 -6.9722 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp ffbd15f7-129b-4128-8962-709475395b6b))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp ffbd15f7-129b-4128-8962-709475395b6b))
     (pad "CY4" smd circle (at 10.727 -7.2312 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 39f2ab6d-e4f5-4c77-816d-e131dc34ae9d))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 39f2ab6d-e4f5-4c77-816d-e131dc34ae9d))
     (pad "CY14" smd circle (at 6.9467 -7.0627 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp cb089f98-f009-4805-a38b-e7440c36a1fc))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp cb089f98-f009-4805-a38b-e7440c36a1fc))
     (pad "CY44" smd circle (at -5.179 -7.3873 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp ece6f07c-ab84-45d6-a253-0af82f2694d9))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp ece6f07c-ab84-45d6-a253-0af82f2694d9))
     (pad "CY47" smd circle (at -6.433 -7.3185 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 938 "/CPU_DDR/DDR1.DQ14") (pinfunction "DDR0_DQ[3][6]") (pintype "bidirectional") (tstamp 840cf7ab-cee8-4ec6-b535-14bc5c55f366))
     (pad "CY50" smd circle (at -7.496 -7.3724 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22456,7 +22448,7 @@
     (pad "CY60" smd circle (at -11.4398 -7.3891 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 857 "/CPU_DDR/DDR0.DQ12") (pinfunction "DDR0_DQ[1][4]") (pintype "bidirectional") (tstamp dbce5a44-9cd6-43a0-90cc-887469fd3470))
     (pad "D3" smd circle (at 11.312 23.1619 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 2aca0c03-e9ad-4ad2-a6bc-0394cca177ed))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 2aca0c03-e9ad-4ad2-a6bc-0394cca177ed))
     (pad "D4" smd circle (at 10.662 23.137 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp abf191dc-f5dd-40a8-a849-8a11b9a00ea4))
     (pad "D6" smd circle (at 9.9118 23.1179 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22500,9 +22492,9 @@
     (pad "D61" smd circle (at -11.94 23.33 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 500 "unconnected-(U5T-RSVD_TP-PadD61)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp ce852596-b2d1-4b5a-ae99-17e228bd1675))
     (pad "DA1" smd circle (at 11.94 -7.5562 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp bda36a09-aa8a-4fac-960b-e8bc68685f72))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp bda36a09-aa8a-4fac-960b-e8bc68685f72))
     (pad "DA3" smd circle (at 11.29 -7.5562 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp ac10df0d-6181-4d23-8e49-185f5640ed85))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp ac10df0d-6181-4d23-8e49-185f5640ed85))
     (pad "DA6" smd circle (at 10.0382 -7.4882 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 7f75ed14-648a-4c95-bdee-a72aecf34a09))
     (pad "DA8" smd circle (at 9.3882 -7.4882 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22514,7 +22506,7 @@
     (pad "DA12" smd circle (at 7.4382 -7.4882 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 87690d2b-6a82-46a8-9efd-0b2df1375ca5))
     (pad "DA43" smd circle (at -4.6514 -7.7743 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp d77a39b2-2f34-4b27-8117-d4eb67b30768))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp d77a39b2-2f34-4b27-8117-d4eb67b30768))
     (pad "DA53" smd circle (at -8.78 -7.483 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 936 "/CPU_DDR/DDR1.DQ12") (pinfunction "DDR0_DQ[3][4]") (pintype "bidirectional") (tstamp 9fb28ebe-3af9-4cc4-9ba6-633deafe62a3))
     (pad "DA58" smd circle (at -10.9324 -7.7956 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22524,7 +22516,7 @@
     (pad "DB14" smd circle (at 6.9467 -7.9137 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 25dd6e7d-189b-4356-87ff-2c21006f85d2))
     (pad "DB45" smd circle (at -5.5968 -7.8877 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 4ade6599-a761-4897-923f-c8570fd9dcd7))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 4ade6599-a761-4897-923f-c8570fd9dcd7))
     (pad "DB48" smd circle (at -6.997 -7.9461 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 937 "/CPU_DDR/DDR1.DQ13") (pinfunction "DDR0_DQ[3][5]") (pintype "bidirectional") (tstamp 4c706ec8-f721-4c7d-a19f-5e62fa485e85))
     (pad "DB51" smd circle (at -7.9866 -7.9461 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22536,23 +22528,23 @@
     (pad "DB61" smd circle (at -11.94 -7.9461 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 856 "/CPU_DDR/DDR0.DQS+1") (pinfunction "DDR0_DQSP[1]") (pintype "bidirectional") (tstamp f3ca1893-eeec-4d2c-881d-fc6d5ff8b5ce))
     (pad "DC1" smd circle (at 11.94 -8.2062 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 9180d998-59c2-4d0e-927c-ba67a921c740))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 9180d998-59c2-4d0e-927c-ba67a921c740))
     (pad "DC3" smd circle (at 11.29 -8.2062 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 7035fbfa-5cd7-4476-b7cf-02544a3486ad))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 7035fbfa-5cd7-4476-b7cf-02544a3486ad))
     (pad "DC4" smd circle (at 10.727 -8.5312 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp ef422aa2-4fe2-41b1-a18f-9329d4ba6bc7))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp ef422aa2-4fe2-41b1-a18f-9329d4ba6bc7))
     (pad "DC6" smd circle (at 10.0382 -8.3392 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp a27420f8-d971-463f-8d0a-ca4b2dfca1c8))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp a27420f8-d971-463f-8d0a-ca4b2dfca1c8))
     (pad "DC8" smd circle (at 9.3882 -8.3392 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp a3c52f6a-4a9b-4c00-a3c9-b58d1759521c))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp a3c52f6a-4a9b-4c00-a3c9-b58d1759521c))
     (pad "DC9" smd circle (at 8.7382 -8.3392 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp c920ab99-0ac9-4bd6-8163-d4cd52034965))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp c920ab99-0ac9-4bd6-8163-d4cd52034965))
     (pad "DC11" smd circle (at 8.0882 -8.3392 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp ef4f46b7-2ea4-41f6-985b-81c688d1395a))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp ef4f46b7-2ea4-41f6-985b-81c688d1395a))
     (pad "DC12" smd circle (at 7.4382 -8.3392 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 49a26f91-75db-4fbf-a170-af15b01fda8c))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 49a26f91-75db-4fbf-a170-af15b01fda8c))
     (pad "DC44" smd circle (at -5.071 -8.2711 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp b2d8ddd7-00c3-4505-b68f-5a6379aa8218))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp b2d8ddd7-00c3-4505-b68f-5a6379aa8218))
     (pad "DC47" smd circle (at -6.428 -8.2711 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 618e436c-e813-451e-b901-e726248be2e9))
     (pad "DC48" smd circle (at -6.997 -8.5961 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22568,31 +22560,31 @@
     (pad "DC61" smd circle (at -11.94 -8.5961 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 855 "/CPU_DDR/DDR0.DQS-1") (pinfunction "DDR0_DQSN[1]") (pintype "bidirectional") (tstamp 0252b473-c6e3-46f3-b545-5b39ea92ecff))
     (pad "DD1" smd circle (at 11.94 -8.8562 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 57649cf5-9609-435e-80b9-7dc25944915e))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 57649cf5-9609-435e-80b9-7dc25944915e))
     (pad "DD3" smd circle (at 11.29 -8.8562 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 4d7fe289-8980-4b18-9bec-a430aca65cc6))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 4d7fe289-8980-4b18-9bec-a430aca65cc6))
     (pad "DD14" smd circle (at 6.9467 -8.7647 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 69bdfc3f-5b81-4752-9f19-a7af2779dc93))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 69bdfc3f-5b81-4752-9f19-a7af2779dc93))
     (pad "DD43" smd circle (at -4.6514 -8.768 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 7902bf5d-e681-4bdc-b44d-6099fcf3b84a))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 7902bf5d-e681-4bdc-b44d-6099fcf3b84a))
     (pad "DD45" smd circle (at -5.5968 -8.6545 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 0ef3e59b-6230-4b2d-a209-8d35f857de78))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 0ef3e59b-6230-4b2d-a209-8d35f857de78))
     (pad "DD56" smd circle (at -9.8862 -8.609 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 853 "/CPU_DDR/DDR0.DQ10") (pinfunction "DDR0_DQ[1][2]") (pintype "bidirectional") (tstamp 1e772884-ede1-483e-bb7b-682a520a146e))
     (pad "DD58" smd circle (at -10.9324 -8.7466 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 851 "/CPU_DDR/DDR0.DQ8") (pinfunction "DDR0_DQ[1][0]") (pintype "bidirectional") (tstamp be6b7de3-1d86-4a93-8cf6-edb1c4ec44e6))
     (pad "DE4" smd circle (at 10.727 -9.1812 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp d502d334-d1ed-4f64-a8aa-1ebc02e5b8d2))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp d502d334-d1ed-4f64-a8aa-1ebc02e5b8d2))
     (pad "DE6" smd circle (at 10.0382 -9.1902 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp de487fa1-4d77-4158-b3ad-831954a24843))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp de487fa1-4d77-4158-b3ad-831954a24843))
     (pad "DE8" smd circle (at 9.3882 -9.1902 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp dcb93b6e-5698-4227-959c-831a410c4f20))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp dcb93b6e-5698-4227-959c-831a410c4f20))
     (pad "DE9" smd circle (at 8.7382 -9.1902 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 9dd55dd9-9e2b-4630-8ffb-ed5e49836479))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 9dd55dd9-9e2b-4630-8ffb-ed5e49836479))
     (pad "DE11" smd circle (at 8.0882 -9.1902 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 5999b637-31b9-4e00-a71f-b29daa2980f7))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 5999b637-31b9-4e00-a71f-b29daa2980f7))
     (pad "DE12" smd circle (at 7.4382 -9.1902 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 5ae358f6-937a-4c81-a8a0-37e8f7920e49))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 5ae358f6-937a-4c81-a8a0-37e8f7920e49))
     (pad "DE44" smd circle (at -5.179 -9.1549 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 744a77ff-0bfd-4674-9b23-f9813f2766b5))
     (pad "DE47" smd circle (at -6.433 -9.2237 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22610,11 +22602,11 @@
     (pad "DE60" smd circle (at -11.4398 -9.1531 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 854 "/CPU_DDR/DDR0.DQ11") (pinfunction "DDR0_DQ[1][3]") (pintype "bidirectional") (tstamp 7ab5241c-f95e-416b-9cbd-07405f7685cc))
     (pad "DF1" smd circle (at 11.94 -9.5062 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 16dbc30b-3b8c-4e6e-a564-3cc3f0579bda))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 16dbc30b-3b8c-4e6e-a564-3cc3f0579bda))
     (pad "DF3" smd circle (at 11.29 -9.5062 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 5fafeeba-0848-4420-9ee7-60d5b439b522))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 5fafeeba-0848-4420-9ee7-60d5b439b522))
     (pad "DF14" smd circle (at 6.9467 -9.6157 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 0e4a3680-fa8d-4f49-9336-73770f013d3b))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 0e4a3680-fa8d-4f49-9336-73770f013d3b))
     (pad "DF43" smd circle (at -4.6786 -9.57 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp b78590e7-8df7-49b4-ae83-4b813940ea15))
     (pad "DF46" smd circle (at -5.8822 -9.57 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22624,13 +22616,13 @@
     (pad "DF58" smd circle (at -10.9196 -9.57 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 8bb26cfe-7df9-4dd4-9100-8c1d130e4e28))
     (pad "DF61" smd circle (at -11.94 -9.57 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp d70484bd-90f0-43a0-ae75-cf1c7f41eb2c))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp d70484bd-90f0-43a0-ae75-cf1c7f41eb2c))
     (pad "DG1" smd circle (at 11.94 -10.1562 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 501 "unconnected-(U5L-PCH_OPIRCOMP-PadDG1)") (pinfunction "PCH_OPIRCOMP") (pintype "unspecified") (tstamp d0a40750-9901-4d7b-9d85-172a746cc338))
     (pad "DG3" smd circle (at 11.29 -10.1562 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 502 "unconnected-(U5L-PECI-PadDG3)") (pinfunction "PECI") (pintype "bidirectional") (tstamp e965a6fe-a968-4b34-aa38-e91061c6403c))
     (pad "DG4" smd circle (at 10.727 -9.8312 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1417 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 8c2f6b91-508e-4d76-93be-9990d4c43078))
+      (net 1409 "VCCGT") (pinfunction "VCCGT") (pintype "power_in") (tstamp 8c2f6b91-508e-4d76-93be-9990d4c43078))
     (pad "DG6" smd circle (at 10.0382 -10.0412 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 57eb33d9-f8a4-46fc-b1c8-c4845ad560cf))
     (pad "DG8" smd circle (at 9.3882 -10.0412 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22664,7 +22656,7 @@
     (pad "DH43" smd circle (at -4.6514 -10.3721 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 505 "unconnected-(U5T-RSVD_TP-PadDH43)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp 0b1b1afd-c78f-4de3-9c04-814268a24901))
     (pad "DH45" smd circle (at -5.5968 -10.4855 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 69d01471-ca15-408d-81ee-e0ce11ec07fa))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 69d01471-ca15-408d-81ee-e0ce11ec07fa))
     (pad "DH48" smd circle (at -6.997 -10.5439 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 927 "/CPU_DDR/DDR1.DQ5") (pinfunction "DDR0_DQ[2][5]") (pintype "bidirectional") (tstamp 014a6b7d-abcc-4bc0-888d-95b2f4b40ac2))
     (pad "DH51" smd circle (at -7.9866 -10.5439 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22692,9 +22684,9 @@
     (pad "DJ12" smd circle (at 7.4382 -10.8922 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 510 "unconnected-(U5T-RSVD_TP-PadDJ12)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp 6276b9cd-f230-41c5-9930-c096f0da1dcc))
     (pad "DJ41" smd circle (at -3.9174 -10.9504 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 40d65bd7-3beb-419e-9131-7732d9934f2b))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 40d65bd7-3beb-419e-9131-7732d9934f2b))
     (pad "DJ44" smd circle (at -5.071 -10.8689 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 9990cb06-55aa-49ea-87f9-21ff6ec8ead4))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 9990cb06-55aa-49ea-87f9-21ff6ec8ead4))
     (pad "DJ47" smd circle (at -6.428 -10.8689 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 8f914d95-9a61-43a7-ba15-b4624988af57))
     (pad "DJ57" smd circle (at -10.442 -10.8689 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22706,11 +22698,11 @@
     (pad "DK14" smd circle (at 6.7467 -11.3207 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 5c872afd-594f-402d-93a3-7b4d4b374f45))
     (pad "DK40" smd circle (at -3.4259 -11.3759 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 7b223f9d-040b-4d2f-b639-d2419679a1bc))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 7b223f9d-040b-4d2f-b639-d2419679a1bc))
     (pad "DK43" smd circle (at -4.6514 -11.3658 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp ae219568-7b29-4510-b9d3-828db11260da))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp ae219568-7b29-4510-b9d3-828db11260da))
     (pad "DK45" smd circle (at -5.5968 -11.2523 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 5817ab79-3e0c-4a8f-a6a1-3083071fd87a))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 5817ab79-3e0c-4a8f-a6a1-3083071fd87a))
     (pad "DK48" smd circle (at -6.997 -11.1939 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 922 "/CPU_DDR/DDR1.DQ2") (pinfunction "DDR0_DQ[2][2]") (pintype "bidirectional") (tstamp dbf4dd3c-c14c-4187-a34e-359e9d70ad43))
     (pad "DK51" smd circle (at -7.9866 -11.1939 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22736,7 +22728,7 @@
     (pad "DL13" smd circle (at 7.2382 -11.7462 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 64932295-11a9-4e77-95d1-c5630cdc4dc8))
     (pad "DL44" smd circle (at -5.179 -11.7527 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 1f88728c-6af8-4169-8c21-5f28c8120dc6))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 1f88728c-6af8-4169-8c21-5f28c8120dc6))
     (pad "DL50" smd circle (at -7.496 -11.7676 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 920 "/CPU_DDR/DDR1.DQ0") (pinfunction "DDR0_DQ[2][0]") (pintype "bidirectional") (tstamp 9dedc5b5-5957-42a6-b7e4-ef579338ef65))
     (pad "DL53" smd circle (at -8.78 -11.657 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22746,17 +22738,17 @@
     (pad "DL60" smd circle (at -11.4398 -11.7509 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 844 "/CPU_DDR/DDR0.DQ3") (pinfunction "DDR0_DQ[0][3]") (pintype "bidirectional") (tstamp 3c348bef-08d9-4bb0-b4c4-08b612609d80))
     (pad "DM1" smd circle (at 11.94 -12.1062 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 8c128ee3-4324-40cd-83fb-413a71f69280))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 8c128ee3-4324-40cd-83fb-413a71f69280))
     (pad "DM4" smd circle (at 10.8832 -11.9862 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 87593b9c-42be-4d98-9202-52de94681432))
     (pad "DM6" smd circle (at 9.933 -11.9862 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp fa7ab175-788e-4f09-a5be-e86ff56c3565))
     (pad "DM14" smd circle (at 6.7467 -12.1717 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp fef0e795-3188-45ab-a151-2cdc30c7d72f))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp fef0e795-3188-45ab-a151-2cdc30c7d72f))
     (pad "DM41" smd circle (at -3.9174 -11.8014 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp cf660e9e-84d9-44b3-8232-b0df8468e506))
     (pad "DM43" smd circle (at -4.6786 -12.1678 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 78b6b0cc-0751-43ad-88ff-9c0dee76ea13))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 78b6b0cc-0751-43ad-88ff-9c0dee76ea13))
     (pad "DM46" smd circle (at -5.8822 -12.1678 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 82a5d1af-f76a-4414-bf86-033891800d69))
     (pad "DM47" smd circle (at -6.433 -11.8215 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22794,9 +22786,9 @@
     (pad "DP6" smd circle (at 9.8666 -12.6478 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 522 "unconnected-(U5M-CLKOUT_PCIE_N4{slash}UFS_REF_CLK-PadDP6)") (pinfunction "CLKOUT_PCIE_N4/UFS_REF_CLK") (pintype "output") (tstamp c5a99543-c4be-4f7d-b22b-7061f637c886))
     (pad "DP41" smd circle (at -3.9174 -12.6524 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp ada6d9be-d124-4da5-9c36-703e7635bf82))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp ada6d9be-d124-4da5-9c36-703e7635bf82))
     (pad "DP42" smd circle (at -4.5674 -12.8224 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 65c3e5aa-9a05-407f-96fe-2a2bad2bb7b4))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 65c3e5aa-9a05-407f-96fe-2a2bad2bb7b4))
     (pad "DP44" smd circle (at -5.2174 -12.6524 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 285 "unconnected-(U5H-GPP_A4{slash}ESPI_CS0#-PadDP44)") (pinfunction "GPP_A4/ESPI_CS0#") (pintype "output") (tstamp f41dbfb0-2157-4074-807b-6e70d9ba1ba4))
     (pad "DP46" smd circle (at -5.8674 -12.8224 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22816,9 +22808,9 @@
     (pad "DR6" smd circle (at 10.1604 -13.2286 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 524 "unconnected-(U5M-CLKOUT_PCIE_N2-PadDR6)") (pinfunction "CLKOUT_PCIE_N2") (pintype "output") (tstamp e39c118c-67bb-441e-931a-de7eeca161d0))
     (pad "DR14" smd circle (at 6.7467 -13.0227 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp e1931bb2-d797-45b3-ab13-2c85b766a14b))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp e1931bb2-d797-45b3-ab13-2c85b766a14b))
     (pad "DR40" smd circle (at -3.4259 -13.0779 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 41d92d0f-81d5-4e0b-a1bf-682919ceca11))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 41d92d0f-81d5-4e0b-a1bf-682919ceca11))
     (pad "DR56" smd circle (at -9.9431 -13.0327 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 525 "unconnected-(U5J-GPP_B8{slash}ISH_I2C1_SCL{slash}I2C3_SCL-PadDR56)") (pinfunction "GPP_B8/ISH_I2C1_SCL/I2C3_SCL") (pintype "input") (tstamp f6d66641-f1a3-4bb8-adc0-1414aaf093e5))
     (pad "DR58" smd circle (at -10.8904 -13.0763 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22834,7 +22826,7 @@
     (pad "DT13" smd circle (at 7.2382 -13.4482 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 21c4129e-e296-40f9-9f0d-5db5bacbad63))
     (pad "DT41" smd circle (at -3.9174 -13.5034 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 47a0a466-1782-4a80-87eb-204fcfd0905f))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 47a0a466-1782-4a80-87eb-204fcfd0905f))
     (pad "DT42" smd circle (at -4.5674 -13.5034 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 527 "unconnected-(U5P-RSVD-PadDT42)") (pinfunction "RSVD") (pintype "unspecified+no_connect") (tstamp 52f46a1f-1a91-4f2c-8a40-1395b10f6c57))
     (pad "DT44" smd circle (at -5.2174 -13.5034 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22868,11 +22860,11 @@
     (pad "DU6" smd circle (at 9.8666 -13.8089 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 534 "unconnected-(U5M-CLKOUT_PCIE_N5-PadDU6)") (pinfunction "CLKOUT_PCIE_N5") (pintype "output") (tstamp 80024a7c-bdd7-4d97-a521-1cd423f564d7))
     (pad "DU14" smd circle (at 6.7467 -13.8737 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp da6c2aa2-b30d-4cda-94ec-538d46419c0c))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp da6c2aa2-b30d-4cda-94ec-538d46419c0c))
     (pad "DU40" smd circle (at -3.4259 -13.9289 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 3a24adb2-09e8-4477-a8e2-1525a282a8fd))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 3a24adb2-09e8-4477-a8e2-1525a282a8fd))
     (pad "DV2" smd circle (at 11.615 -14.4539 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 8770b538-1093-42ac-b4b3-4d8ed0498dd0))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 8770b538-1093-42ac-b4b3-4d8ed0498dd0))
     (pad "DV4" smd circle (at 10.8832 -14.4564 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 054fe012-7ae7-44d6-9b65-c14eb35ea578))
     (pad "DV6" smd circle (at 9.933 -14.4564 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22886,7 +22878,7 @@
     (pad "DV13" smd circle (at 7.2382 -14.2992 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp a799c1c4-6e18-45d6-abb0-03bb1a7082d5))
     (pad "DV41" smd circle (at -3.9174 -14.3544 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1246 "+3.3V") (pinfunction "VCCPRIM_3P3") (pintype "power_in") (tstamp 43c4d67b-5603-4d6b-81eb-1697abdb95ce))
+      (net 1238 "+3.3V") (pinfunction "VCCPRIM_3P3") (pintype "power_in") (tstamp 43c4d67b-5603-4d6b-81eb-1697abdb95ce))
     (pad "DV42" smd circle (at -4.5674 -14.3544 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 537 "unconnected-(U5L-TP-PadDV42)") (pinfunction "TP") (pintype "unspecified") (tstamp 94e5ae22-c22a-4be8-8693-c4eff70c82de))
     (pad "DV44" smd circle (at -5.2174 -14.3544 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22912,15 +22904,15 @@
     (pad "DW14" smd circle (at 6.7467 -14.7247 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 1f86e674-694a-4020-a8a1-6eda29a6c804))
     (pad "DW20" smd circle (at 4.5937 -14.7659 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp ee0dc02f-8e2e-4592-a0a3-98307a079730))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp ee0dc02f-8e2e-4592-a0a3-98307a079730))
     (pad "DW22" smd circle (at 3.5927 -14.7659 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp d90ea04f-b485-4e01-9199-bef02bec3bd2))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp d90ea04f-b485-4e01-9199-bef02bec3bd2))
     (pad "DW25" smd circle (at 2.5917 -14.7659 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp f15f8c82-cf57-4620-9f04-0aac3846229b))
     (pad "DW27" smd circle (at 1.5907 -14.7659 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 0c158a40-54c0-486b-bbb3-16d6ab6cda94))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 0c158a40-54c0-486b-bbb3-16d6ab6cda94))
     (pad "DW30" smd circle (at 0.5897 -14.7659 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp b5b9b8ce-8828-4e40-922f-9dd6e6efb327))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp b5b9b8ce-8828-4e40-922f-9dd6e6efb327))
     (pad "DW32" smd circle (at -0.4113 -14.7659 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 538 "unconnected-(U5T-RSVD_TP-PadDW32)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp b10c496d-23fa-4c1a-954a-21bce5d55d0b))
     (pad "DW35" smd circle (at -1.4123 -14.7659 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22928,7 +22920,7 @@
     (pad "DW37" smd circle (at -2.4133 -14.7659 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 539 "unconnected-(U5T-RSVD_TP-PadDW37)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp 275fdc38-cb32-477b-a186-21bda5ebaffa))
     (pad "DW40" smd circle (at -3.4259 -14.7799 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1246 "+3.3V") (pinfunction "VCCPRIM_3P3") (pintype "power_in") (tstamp b641e653-c170-49b3-80fb-54f04813abca))
+      (net 1238 "+3.3V") (pinfunction "VCCPRIM_3P3") (pintype "power_in") (tstamp b641e653-c170-49b3-80fb-54f04813abca))
     (pad "DW56" smd circle (at -9.8661 -14.9737 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 540 "unconnected-(U5J-GPP_B14{slash}SPKR{slash}TIME_SYNC1{slash}SATA_LED#{slash}ISH_GP6-PadDW56)") (pinfunction "GPP_B14/SPKR/TIME_SYNC1/SATA_LED#/ISH_GP6") (pintype "input") (tstamp 61610b82-fef8-4429-a8b1-0cf3f2b79f1b))
     (pad "DW57" smd circle (at -10.5361 -14.9646 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22954,15 +22946,15 @@
     (pad "DY18" smd circle (at 5.0942 -15.1809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 547 "unconnected-(U5T-RSVD_TP-PadDY18)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp 8579d549-cb02-4bc7-ad2c-e13e92622ec0))
     (pad "DY21" smd circle (at 4.0932 -15.1809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 0f48e2ca-2a85-4905-b307-bb092a475680))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 0f48e2ca-2a85-4905-b307-bb092a475680))
     (pad "DY23" smd circle (at 3.0922 -15.1809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp d5c4c151-0e8e-47d5-9eb4-cd75b6d4599e))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp d5c4c151-0e8e-47d5-9eb4-cd75b6d4599e))
     (pad "DY26" smd circle (at 2.0912 -15.1809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 7e340282-79ca-4550-a702-c510ac7eb201))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 7e340282-79ca-4550-a702-c510ac7eb201))
     (pad "DY28" smd circle (at 1.0902 -15.1809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp c7b9e7d7-8e28-4b3c-bf98-709b995e1f29))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp c7b9e7d7-8e28-4b3c-bf98-709b995e1f29))
     (pad "DY31" smd circle (at 0.0892 -15.1809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp d462df66-6926-48d8-a09d-db942cbe36eb))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp d462df66-6926-48d8-a09d-db942cbe36eb))
     (pad "DY33" smd circle (at -0.9118 -15.1809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 836481cc-bd38-48aa-a34f-319043743d77))
     (pad "DY36" smd circle (at -1.9128 -15.1809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22970,9 +22962,9 @@
     (pad "DY38" smd circle (at -2.9138 -15.1809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 88abc542-76a4-48c6-804e-1128e274caef))
     (pad "DY41" smd circle (at -3.9174 -15.2054 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp aa75695a-2266-4c87-ba70-fd23dac538fc))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp aa75695a-2266-4c87-ba70-fd23dac538fc))
     (pad "DY42" smd circle (at -4.5674 -15.2054 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 4c1dc597-e438-423d-acfa-c2b2a2b69aaa))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 4c1dc597-e438-423d-acfa-c2b2a2b69aaa))
     (pad "DY44" smd circle (at -5.2174 -15.2054 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 548 "unconnected-(U5L-INTRUDER#-PadDY44)") (pinfunction "INTRUDER#") (pintype "unspecified") (tstamp 423f2264-a611-4d1f-b753-a8de3111b6e6))
     (pad "DY46" smd circle (at -5.8674 -15.2054 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -22990,7 +22982,7 @@
     (pad "DY61" smd circle (at -11.94 -15.0848 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 549 "unconnected-(U5J-GPP_B15{slash}TIME_SYNC0{slash}ISH_GP7-PadDY61)") (pinfunction "GPP_B15/TIME_SYNC0/ISH_GP7") (pintype "input") (tstamp 909c98a5-1b82-4271-a7d6-cb00add4b290))
     (pad "E1" smd circle (at 11.94 22.9938 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 62bd8160-7501-461b-8992-1f881e4ad35e))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 62bd8160-7501-461b-8992-1f881e4ad35e))
     (pad "E37" smd circle (at -2.5705 22.815 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 305 "unconnected-(U5A-CSI_A_DN[0]{slash}CSI_B_DN[3]-PadE37)") (pinfunction "CSI_A_DN[0]/CSI_B_DN[3]") (pintype "input") (tstamp fc2e15c0-7083-4cf2-9e1f-e9806b2e1b40))
     (pad "E41" smd circle (at -4.09 22.9213 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -23030,25 +23022,25 @@
     (pad "EB16" smd circle (at 6.0952 -15.8309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 558 "unconnected-(U5T-RSVD_TP-PadEB16)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp def6ebf9-2060-4a11-ab0b-58b7f7edf8ca))
     (pad "EB18" smd circle (at 5.0942 -15.8309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 808d8584-55f0-4662-aa40-742eef0b49e9))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 808d8584-55f0-4662-aa40-742eef0b49e9))
     (pad "EB21" smd circle (at 4.0932 -15.8309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 197279b5-cff2-48bc-879b-46ccaf758748))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 197279b5-cff2-48bc-879b-46ccaf758748))
     (pad "EB23" smd circle (at 3.0922 -15.8309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp a6feb266-fd0b-4bb5-a26c-f039a6ca333c))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp a6feb266-fd0b-4bb5-a26c-f039a6ca333c))
     (pad "EB26" smd circle (at 2.0912 -15.8309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 644f527b-d1cb-484a-866b-f9191d132591))
     (pad "EB28" smd circle (at 1.0902 -15.8309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp f1447da4-ec39-4162-8698-08b0bdcba4e9))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp f1447da4-ec39-4162-8698-08b0bdcba4e9))
     (pad "EB31" smd circle (at 0.0892 -15.8309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 4f277916-1a83-4786-87da-f407fe621c2c))
     (pad "EB33" smd circle (at -0.9118 -15.8309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1246 "+3.3V") (pinfunction "VCCPRIM_3P3") (pintype "power_in") (tstamp c1578406-d9a5-4ca4-8fed-678d6e6e7a61))
+      (net 1238 "+3.3V") (pinfunction "VCCPRIM_3P3") (pintype "power_in") (tstamp c1578406-d9a5-4ca4-8fed-678d6e6e7a61))
     (pad "EB36" smd circle (at -1.9128 -15.8309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 559 "unconnected-(U5X-VCCPRIM1P05_OUT_PCH-PadEB36)") (pinfunction "VCCPRIM1P05_OUT_PCH") (pintype "power_in") (tstamp 0d62ae85-818c-4729-8404-5e063cd37096))
     (pad "EB38" smd circle (at -2.9138 -15.8309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 801 "Net-(U5X-VCCPRIM1P05_OUT_PCH-PadEB38)") (pinfunction "VCCPRIM1P05_OUT_PCH") (pintype "power_in") (tstamp ac771d7b-b161-4c92-8be4-a89d8e84b35f))
     (pad "EB41" smd circle (at -3.9174 -16.0564 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1246 "+3.3V") (pinfunction "VCCPRIM_3P3") (pintype "power_in") (tstamp 1f98c978-503a-4d43-bc4d-c7fc85a0c1c6))
+      (net 1238 "+3.3V") (pinfunction "VCCPRIM_3P3") (pintype "power_in") (tstamp 1f98c978-503a-4d43-bc4d-c7fc85a0c1c6))
     (pad "EB42" smd circle (at -4.5674 -16.0564 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 560 "unconnected-(U5X-VCCDSW_3P3-PadEB42)") (pinfunction "VCCDSW_3P3") (pintype "power_in") (tstamp 0277b6d7-b72a-4b6f-9943-7ab47ef7f48c))
     (pad "EB44" smd circle (at -5.2174 -16.0564 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -23078,23 +23070,23 @@
     (pad "EC6" smd circle (at 9.8666 -16.2791 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 568 "unconnected-(U5Q-PCIE11_RXN{slash}SATA0_RXN-PadEC6)") (pinfunction "PCIE11_RXN/SATA0_RXN") (pintype "input") (tstamp 50139199-9978-4700-bbb6-90587b36d290))
     (pad "EC14" smd circle (at 6.7467 -16.4267 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp bef5e374-0937-480f-9997-a95a2641c967))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp bef5e374-0937-480f-9997-a95a2641c967))
     (pad "EC16" smd circle (at 6.0952 -16.4809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp fe94a05d-04f1-4c13-9117-5ecd8d56fa25))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp fe94a05d-04f1-4c13-9117-5ecd8d56fa25))
     (pad "EC18" smd circle (at 5.0942 -16.4809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 569 "unconnected-(U5P-RSVD-PadEC18)") (pinfunction "RSVD") (pintype "unspecified+no_connect") (tstamp 3b75de01-2866-41c1-92e5-3bde0e0d1b5d))
     (pad "EC21" smd circle (at 4.0932 -16.4809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp f8f17402-f976-427d-a263-278081252f41))
     (pad "EC23" smd circle (at 3.0922 -16.4809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 30e2036f-1dac-4757-8eaa-8831f6286d90))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 30e2036f-1dac-4757-8eaa-8831f6286d90))
     (pad "EC26" smd circle (at 2.0912 -16.4809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp f7842b60-2e17-4c74-a718-3e5067bc3f9f))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp f7842b60-2e17-4c74-a718-3e5067bc3f9f))
     (pad "EC28" smd circle (at 1.0902 -16.4809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp c9a85732-9bfa-484c-96a5-1ef22d8eeeb9))
     (pad "EC31" smd circle (at 0.0892 -16.4809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1246 "+3.3V") (pinfunction "VCCPRIM_3P3") (pintype "power_in") (tstamp 34037b16-c28b-4456-b75a-3b2cfa02b79a))
+      (net 1238 "+3.3V") (pinfunction "VCCPRIM_3P3") (pintype "power_in") (tstamp 34037b16-c28b-4456-b75a-3b2cfa02b79a))
     (pad "EC33" smd circle (at -0.9118 -16.4809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1246 "+3.3V") (pinfunction "VCCPRIM_3P3") (pintype "power_in") (tstamp 4029fcc7-ab16-4309-bd28-ac8bf064a558))
+      (net 1238 "+3.3V") (pinfunction "VCCPRIM_3P3") (pintype "power_in") (tstamp 4029fcc7-ab16-4309-bd28-ac8bf064a558))
     (pad "EC36" smd circle (at -1.9128 -16.4809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 570 "unconnected-(U5X-VCCPRIM1P05_OUT_PCH-PadEC36)") (pinfunction "VCCPRIM1P05_OUT_PCH") (pintype "power_in") (tstamp 45aa5d9e-22d9-47ea-ad99-17c9e6dd4cf8))
     (pad "EC38" smd circle (at -2.9138 -16.4809 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -23104,7 +23096,7 @@
     (pad "EC61" smd circle (at -11.94 -16.2168 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 572 "unconnected-(U5R-SPI0_IO2-PadEC61)") (pinfunction "SPI0_IO2") (pintype "bidirectional") (tstamp 1356335a-84c0-45ff-a265-0f9a66f0f653))
     (pad "ED2" smd circle (at 11.615 -16.9241 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp ca42ba30-2e09-49b3-898c-217b994e9095))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp ca42ba30-2e09-49b3-898c-217b994e9095))
     (pad "ED4" smd circle (at 10.8832 -16.9266 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 4571f597-d26a-4b24-bbcf-e8bf8f447b66))
     (pad "ED6" smd circle (at 9.933 -16.9266 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -23124,7 +23116,7 @@
     (pad "ED60" smd circle (at -11.5582 -16.8053 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 1773ce55-f978-405b-9f3f-6d02033e875a))
     (pad "EE14" smd circle (at 6.7467 -17.2777 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 8e93643d-5c36-42cb-addc-a359b2952a57))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 8e93643d-5c36-42cb-addc-a359b2952a57))
     (pad "EE16" smd circle (at 6.0952 -17.1309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp fe1d5110-c381-4433-aac8-8bb30bdda305))
     (pad "EE18" smd circle (at 5.0942 -17.1309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -23136,9 +23128,9 @@
     (pad "EE26" smd circle (at 2.0912 -17.1309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 578 "unconnected-(U5L-CL_CLK-PadEE26)") (pinfunction "CL_CLK") (pintype "output") (tstamp 61f0d8fa-0377-44ec-a71a-226be6283879))
     (pad "EE28" smd circle (at 1.0902 -17.1309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 060f9702-4333-4610-bd08-267ec8b6fdb6))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 060f9702-4333-4610-bd08-267ec8b6fdb6))
     (pad "EE31" smd circle (at 0.0892 -17.1309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1246 "+3.3V") (pinfunction "VCCPRIM_3P3") (pintype "power_in") (tstamp 6d9f6951-6c29-49fb-923f-b94aee75f25c))
+      (net 1238 "+3.3V") (pinfunction "VCCPRIM_3P3") (pintype "power_in") (tstamp 6d9f6951-6c29-49fb-923f-b94aee75f25c))
     (pad "EE33" smd circle (at -0.9118 -17.1309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 579 "unconnected-(U5X-VCCPGPPR-PadEE33)") (pinfunction "VCCPGPPR") (pintype "power_in") (tstamp a062999f-0c4e-4ea0-82b0-38dc3c593433))
     (pad "EE36" smd circle (at -1.9128 -17.1309 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -23218,7 +23210,7 @@
     (pad "EG6" smd circle (at 10.1604 -18.169 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 608 "unconnected-(U5M-PCIE7_RXN-PadEG6)") (pinfunction "PCIE7_RXN") (pintype "input") (tstamp 53c98bdb-cb2f-4e9e-b4e8-622c59acb61a))
     (pad "EG14" smd circle (at 6.7467 -18.1287 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 47e0d02b-d270-45bf-b3cd-51042c04bfaf))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 47e0d02b-d270-45bf-b3cd-51042c04bfaf))
     (pad "EG56" smd circle (at -10.1599 -18.0327 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 609 "unconnected-(U5R-SPI0_CLK-PadEG56)") (pinfunction "SPI0_CLK") (pintype "output") (tstamp dd80f071-1274-4f74-8f1b-0bbb7838a16a))
     (pad "EG58" smd circle (at -10.8104 -18.0327 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -23322,7 +23314,7 @@
     (pad "EK60" smd circle (at -11.5382 -19.3085 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 334 "unconnected-(U5I-GPD7-PadEK60)") (pinfunction "GPD7") (pintype "output") (tstamp c905063e-132d-46ed-9ec8-89067f4612e4))
     (pad "EL2" smd circle (at 11.615 -19.4218 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp fcbc3dc3-e074-40b4-a051-a6235c8fbe47))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp fcbc3dc3-e074-40b4-a051-a6235c8fbe47))
     (pad "EL4" smd circle (at 10.8832 -19.4218 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 15dac40e-3e16-4c68-b64a-d1019cb79e27))
     (pad "EL6" smd circle (at 9.933 -19.4218 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -23542,7 +23534,7 @@
     (pad "EU61" smd circle (at -11.94 -22.03 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 701 "unconnected-(U5P-RSVD-PadEU61)") (pinfunction "RSVD") (pintype "unspecified+no_connect") (tstamp ecd0f3ad-1dc5-45a4-8d9a-74df40b1ceaa))
     (pad "EV3" smd circle (at 11.312 -22.5118 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1260 "/CPU_POWER/VCC1P05_OUT") (pinfunction "VCC1P05_OUT_FET") (pintype "power_in") (tstamp fb828727-1840-4d97-9d66-01163a1d5ce6))
+      (net 1252 "/CPU_POWER/VCC1P05_OUT") (pinfunction "VCC1P05_OUT_FET") (pintype "power_in") (tstamp fb828727-1840-4d97-9d66-01163a1d5ce6))
     (pad "EV4" smd circle (at 10.662 -22.5118 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp b7cc841a-812b-4076-9aa3-e668bf92d6a1))
     (pad "EV6" smd circle (at 9.9318 -22.3917 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -23598,7 +23590,7 @@
     (pad "EV59" smd circle (at -11.3119 -22.5118 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp d4024f38-ac2c-45e8-b8e8-6487caa6d203))
     (pad "EW1" smd circle (at 11.94 -22.68 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1260 "/CPU_POWER/VCC1P05_OUT") (pinfunction "VCC1P05_OUT_FET") (pintype "power_in") (tstamp 67a049fd-4adb-4aaa-a848-069ca4e85a55))
+      (net 1252 "/CPU_POWER/VCC1P05_OUT") (pinfunction "VCC1P05_OUT_FET") (pintype "power_in") (tstamp 67a049fd-4adb-4aaa-a848-069ca4e85a55))
     (pad "EW11" smd circle (at 8.0952 -22.7053 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 714 "unconnected-(U5U-PCIE3_TXP{slash}USB32_3_TXP-PadEW11)") (pinfunction "PCIE3_TXP/USB32_3_TXP") (pintype "output") (tstamp 3eef241b-60a8-46d6-81ab-1d6dcb59cb3e))
     (pad "EW17" smd circle (at 5.5758 -22.6603 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -23616,7 +23608,7 @@
     (pad "EW61" smd circle (at -11.94 -22.68 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 2e6c2066-c392-45ed-99bc-82110e488cd1))
     (pad "EY1" smd circle (at 11.94 -23.33 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1260 "/CPU_POWER/VCC1P05_OUT") (pinfunction "VCC1P05_OUT_FET") (pintype "power_in") (tstamp acf5c07b-f2ce-4db0-b328-c07758655a57))
+      (net 1252 "/CPU_POWER/VCC1P05_OUT") (pinfunction "VCC1P05_OUT_FET") (pintype "power_in") (tstamp acf5c07b-f2ce-4db0-b328-c07758655a57))
     (pad "EY3" smd circle (at 11.312 -23.162 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 8c8aabf5-bb0f-495d-98ab-cead3d917073))
     (pad "EY4" smd circle (at 10.662 -23.162 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -23690,9 +23682,9 @@
     (pad "EY61" smd circle (at -11.94 -23.33 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 735 "unconnected-(U5T-RSVD_TP-PadEY61)") (pinfunction "RSVD_TP") (pintype "unspecified+no_connect") (tstamp c2000589-98c0-4f5e-b4d3-0f6e038c83dc))
     (pad "F1" smd circle (at 11.94 22.3438 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 5627ec27-ffc1-4ff6-ade0-496a8674e1ec))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 5627ec27-ffc1-4ff6-ade0-496a8674e1ec))
     (pad "F3" smd circle (at 11.312 22.5118 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp edcad871-d4de-4dcc-9f1b-34debef9df47))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp edcad871-d4de-4dcc-9f1b-34debef9df47))
     (pad "F4" smd circle (at 10.662 22.437 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 117c5eae-fa7c-43a4-953b-6fed3f78fe03))
     (pad "F6" smd circle (at 9.9118 22.4179 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -23804,7 +23796,7 @@
     (pad "FB29" smd circle (at 0.6264 -23.9588 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 170 "/CPU_PCIEX4/PCIEX4_A.~{CLKREQ}") (pinfunction "GPP_D5/SRCCLKREQ0#") (pintype "input") (tstamp b22a0537-5497-4cf9-90e3-4e594cc3e481))
     (pad "FB33" smd circle (at -0.651 -24.0581 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1209 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 47489aa7-796b-4407-9f45-0a2dfc593fe2))
+      (net 1201 "+1V8") (pinfunction "VCCPRIM_1P8") (pintype "power_in") (tstamp 47489aa7-796b-4407-9f45-0a2dfc593fe2))
     (pad "FB36" smd circle (at -1.8518 -23.9588 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 159 "/CPU_PCIEX4/PCIEX4_B.~{CLKREQ}") (pinfunction "GPP_D6/SRCCLKREQ1#") (pintype "input") (tstamp aada9218-fbb9-4ebc-9f74-245756649e3d))
     (pad "FB39" smd circle (at -3.1292 -24.0581 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -23872,7 +23864,7 @@
     (pad "FC60" smd circle (at -11.4805 -24.44 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 09fb70ce-070f-4a14-b7cb-5514592c3d93))
     (pad "G3" smd circle (at 11.312 21.8618 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 3c9cb724-63ea-4d60-ac52-85a13c7a0dc1))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 3c9cb724-63ea-4d60-ac52-85a13c7a0dc1))
     (pad "G11" smd circle (at 7.8934 21.84 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 139 "/CPU_PCIEX4/PCIEX4_B.TX+0") (pinfunction "PCIEX4_B_TXP[0]") (pintype "output") (tstamp e37f4959-d0c9-4ac2-911e-e787edf102a3))
     (pad "G14" smd circle (at 6.7624 21.84 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -23916,7 +23908,7 @@
     (pad "H1" smd circle (at 11.94 21.6938 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 89f84823-f082-4891-9fd3-4bb0dec2724d))
     (pad "H4" smd circle (at 10.615 21.586 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 39ce39de-70e6-43be-9812-0e0fd1690223))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 39ce39de-70e6-43be-9812-0e0fd1690223))
     (pad "H6" smd circle (at 9.9648 21.5859 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 3405dcc0-07dd-495b-8c33-e03f6cb2332b))
     (pad "H8" smd circle (at 9.3148 21.5859 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -23942,9 +23934,9 @@
     (pad "H59" smd circle (at -11.3768 21.705 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VCC1P8_PROC") (pintype "power_in") (tstamp 11d52f4d-c516-4794-bc7b-df246fcc5999))
     (pad "J1" smd circle (at 11.94 21.0438 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 893d4e88-ca12-4c85-a75b-9195448c6295))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 893d4e88-ca12-4c85-a75b-9195448c6295))
     (pad "J3" smd circle (at 11.29 21.0438 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 81f4522b-5db1-4c0a-82cc-ac79cf10a0c2))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 81f4522b-5db1-4c0a-82cc-ac79cf10a0c2))
     (pad "J11" smd circle (at 7.8934 21.19 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 340fd60f-fcec-462a-808c-895a528d2d34))
     (pad "J14" smd circle (at 6.7624 21.19 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -23986,7 +23978,7 @@
     (pad "J55" smd circle (at -9.75 21.055 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 4a70abcf-2be3-4e65-af46-0c60476ac2f8))
     (pad "J61" smd circle (at -11.94 21.38 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp b26c2b80-3399-4782-b9ea-1a36db8eceb8))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp b26c2b80-3399-4782-b9ea-1a36db8eceb8))
     (pad "K4" smd circle (at 10.727 20.7188 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 9d4c13dc-1700-44a4-b942-7c1fe1fd6ec2))
     (pad "K44" smd circle (at -5.3013 20.6189 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -24000,9 +23992,9 @@
     (pad "K60" smd circle (at -11.4398 20.9631 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 1064 "/CPU_DDR/DDR3.DQ20") (pinfunction "DDR3_DQ[2][4]") (pintype "bidirectional") (tstamp 428fbc6b-0ac2-44ad-8c5f-009ad47895dc))
     (pad "L1" smd circle (at 11.94 20.3938 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp ea13ad32-8cf0-4924-9cf3-ddb2ded1f47c))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp ea13ad32-8cf0-4924-9cf3-ddb2ded1f47c))
     (pad "L3" smd circle (at 11.29 20.3938 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 3584a735-1e5d-4024-8cef-fe598f910633))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp 3584a735-1e5d-4024-8cef-fe598f910633))
     (pad "L6" smd circle (at 10.0382 20.5948 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 775 "unconnected-(U5L-PROC_PREQ#-PadL6)") (pinfunction "PROC_PREQ#") (pintype "input") (tstamp 66ea1136-484e-467c-af29-ea8326995847))
     (pad "L8" smd circle (at 9.3882 20.5948 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -24098,7 +24090,7 @@
     (pad "N1" smd circle (at 11.94 19.7438 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 1609e670-b00a-49ca-a5a5-821bcfe9edf7))
     (pad "N3" smd circle (at 11.29 19.7438 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1416 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp b92f8646-bc77-41cb-b4c3-c2c1a09ada3b))
+      (net 1408 "VCCINAUX") (pinfunction "VCCIN_AUX") (pintype "power_in") (tstamp b92f8646-bc77-41cb-b4c3-c2c1a09ada3b))
     (pad "N4" smd circle (at 10.727 19.4188 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 1ad7af7a-a08e-47d3-897e-694e3c5aa212))
     (pad "N6" smd circle (at 10.0382 19.7438 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -24124,7 +24116,7 @@
     (pad "N61" smd circle (at -11.94 19.7561 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 1063 "/CPU_DDR/DDR3.DQS+2") (pinfunction "DDR3_DQSP[2]") (pintype "bidirectional") (tstamp de236946-4d4e-48bc-8fbb-7fb2c2d1e1e1))
     (pad "P1" smd circle (at 11.94 19.0938 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1421 "/VCCINAUX/VCCIN_AUX_FLTR") (pinfunction "VCCIN_AUX_FLTR") (pintype "power_in") (tstamp 73b0b0fa-e6be-4bc4-abe2-974b54fce2c2))
+      (net 1413 "/VCCINAUX/VCCIN_AUX_FLTR") (pinfunction "VCCIN_AUX_FLTR") (pintype "power_in") (tstamp 73b0b0fa-e6be-4bc4-abe2-974b54fce2c2))
     (pad "P3" smd circle (at 11.29 19.0938 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 0be66f1b-2525-41ba-a491-79aaf0790aaa))
     (pad "P11" smd circle (at 8.0329 19.1269 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -24184,7 +24176,7 @@
     (pad "R58" smd circle (at -10.9196 18.7822 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 4c5df601-ec91-425a-b311-4de6268ffe90))
     (pad "R61" smd circle (at -11.94 18.7822 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp ef15d817-b992-43a2-93c0-d31a14a79e2d))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp ef15d817-b992-43a2-93c0-d31a14a79e2d))
     (pad "T1" smd circle (at 11.94 18.4438 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 2120a82e-2fd8-450e-af56-f02c2079ae94))
     (pad "T3" smd circle (at 11.29 18.4438 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -24282,7 +24274,7 @@
     (pad "V58" smd circle (at -10.9196 17.7878 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 1ea135b5-ca7c-4b47-909a-22fb2177a2db))
     (pad "V61" smd circle (at -11.94 17.7878 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1218 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 3152b771-9bab-4a30-81d7-598ebcdafaff))
+      (net 1210 "+1V1") (pinfunction "VDD2") (pintype "power_in") (tstamp 3152b771-9bab-4a30-81d7-598ebcdafaff))
     (pad "W1" smd circle (at 11.94 17.1438 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 9fd0efc1-3d0f-450c-8317-754fe8d3aa12))
     (pad "W3" smd circle (at 11.29 17.1438 90) (size 0.25 0.25) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -24392,9 +24384,9 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 149ae82e-3e23-4098-8ef4-1f71ee931636))
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1240 "/CHARGER/BATR1") (pintype "passive") (tstamp 3c93799c-18b6-47f5-9e53-cdade4128556))
+      (net 1232 "/CHARGER/BATR1") (pintype "passive") (tstamp 3c93799c-18b6-47f5-9e53-cdade4128556))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1257 "/CHARGER/SRN1") (pintype "passive") (tstamp a6fe66dd-8add-42e4-9872-b1ee2fbbf6ec))
+      (net 1249 "/CHARGER/SRN1") (pintype "passive") (tstamp a6fe66dd-8add-42e4-9872-b1ee2fbbf6ec))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -24496,7 +24488,7 @@
     (fp_line (start 0.8 0.4) (end -0.8 0.4)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ec352ebe-a981-4071-a8b2-f6f0d5888035))
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1206 "Net-(C46-Pad1)") (pintype "passive") (tstamp 15ae79e7-f8c9-4e17-a326-fc0e878d11dc))
+      (net 1198 "Net-(C46-Pad1)") (pintype "passive") (tstamp 15ae79e7-f8c9-4e17-a326-fc0e878d11dc))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 1fb30fe0-73af-4b2b-8ad0-ca67d12a8aad))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
@@ -25134,7 +25126,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 7011b2dc-d127-4b03-9977-65ca8cd59932))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp f06e6644-5edc-420d-acfb-b295687d7556))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1207 "/CPU_POWER/MODE18") (pintype "passive") (tstamp 751153a0-8cfc-4a2a-afdf-7100d69f100b))
+      (net 1199 "/CPU_POWER/MODE18") (pintype "passive") (tstamp 751153a0-8cfc-4a2a-afdf-7100d69f100b))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 9c6f912f-b792-4a9e-aefa-0ebca7f7f62c))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -25404,7 +25396,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 66a3fbca-ee99-4db4-9073-d1e07ef97998))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp b87e3b5e-7ed1-4235-8d69-4d2c03337b4f))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1337 "/USBC0/EN_CHARGE") (pintype "passive") (tstamp df438b26-9ccd-405b-8adc-f28b83ba9974))
+      (net 1329 "/USBC0/EN_CHARGE") (pintype "passive") (tstamp df438b26-9ccd-405b-8adc-f28b83ba9974))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp cd4cc862-816c-49a8-92f1-eb3646a9ac65))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -25462,7 +25454,7 @@
     (fp_line (start 3.65 2.15) (end 3.65 -2.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f2d96075-97f0-445e-b574-1598009ed881))
     (pad "1" smd roundrect (at -3.1125 0) (size 2.075 2.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.120482)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp e539fa87-7d1d-4a73-85de-d09c3ad35935))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp e539fa87-7d1d-4a73-85de-d09c3ad35935))
     (pad "2" smd roundrect (at 3.1125 0) (size 2.075 2.55) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.120482)
       (net 2 "GND") (pintype "passive") (tstamp 03ca331f-0417-4284-9da5-c85d57122db0))
     (model "${KICAD6_3DMODEL_DIR}/Capacitor_Tantalum_SMD.3dshapes/CP_EIA-7343-20_Kemet-V.wrl"
@@ -25686,7 +25678,7 @@
     (pad "1" smd roundrect (at -0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp c14fa08e-afca-416d-945d-3382fe60bfa9))
     (pad "2" smd roundrect (at 0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp 9fbf66d7-d8d0-43c5-93ca-485512a810c5))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp 9fbf66d7-d8d0-43c5-93ca-485512a810c5))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -25786,9 +25778,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp ce7ee7e2-277f-4023-ac55-bdab60b41a52))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp a518654b-b08d-4823-83a5-58f9d9bfe784))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1253 "/CHARGER/VDDA") (pintype "passive") (tstamp fb6ad783-ce3d-4fe8-a5ad-8a3175339ab1))
+      (net 1245 "/CHARGER/VDDA") (pintype "passive") (tstamp fb6ad783-ce3d-4fe8-a5ad-8a3175339ab1))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1254 "/CHARGER/ILIM_HIZ") (pintype "passive") (tstamp e272c625-6610-45e2-b5cd-fe079436b952))
+      (net 1246 "/CHARGER/ILIM_HIZ") (pintype "passive") (tstamp e272c625-6610-45e2-b5cd-fe079436b952))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -25900,7 +25892,7 @@
     (pad "1" smd roundrect (at -0.32 0 270) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp ebd58daa-0f21-4ea2-8169-28219d10f632))
     (pad "2" smd roundrect (at 0.32 0 270) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1291 "/USBC1/RXC2-") (pinfunction "A2") (pintype "passive") (tstamp ed4cb3cc-3d18-4113-bd3d-5f1ad844b7e3))
+      (net 1283 "/USBC1/RXC2-") (pinfunction "A2") (pintype "passive") (tstamp ed4cb3cc-3d18-4113-bd3d-5f1ad844b7e3))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -26055,9 +26047,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp c78154c6-d607-482e-932a-7a53b53a98e8))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 0604c077-0c8b-483a-a5c6-12f718615f62))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1245 "/CHARGER/VIN") (pintype "passive") (tstamp 7f8060b2-e527-4a55-bf43-3fd7627491c5))
+      (net 1237 "/CHARGER/VIN") (pintype "passive") (tstamp 7f8060b2-e527-4a55-bf43-3fd7627491c5))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1241 "/CHARGER/ACP") (pintype "passive") (tstamp b73f84ec-a639-40dc-bcbb-9818877f3564))
+      (net 1233 "/CHARGER/ACP") (pintype "passive") (tstamp b73f84ec-a639-40dc-bcbb-9818877f3564))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -26119,15 +26111,15 @@
     (pad "" smd rect (at 1.44 0.33 180) (size 0.63 0.5) (layers "F.Paste") (tstamp 4e466a77-a81a-4c9a-b97b-c5cf173f5c56))
     (pad "" smd rect (at 1.44 0.9725 180) (size 0.63 0.505) (layers "F.Paste") (tstamp e2ffba71-58ac-4fa0-bbf0-801ad99bf883))
     (pad "1" smd rect (at -1.44 -0.97 180) (size 0.63 0.5) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1228 "/CHARGER/SW1") (pinfunction "S") (pintype "passive") (tstamp 6ce8dfc5-32c1-4551-b2fa-716ef4038f2a))
+      (net 1220 "/CHARGER/SW1") (pinfunction "S") (pintype "passive") (tstamp 6ce8dfc5-32c1-4551-b2fa-716ef4038f2a))
     (pad "2" smd rect (at -1.44 -0.33 180) (size 0.63 0.5) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1228 "/CHARGER/SW1") (pinfunction "S") (pintype "passive") (tstamp 1493882c-c680-4023-8b37-6c930c4730b8))
+      (net 1220 "/CHARGER/SW1") (pinfunction "S") (pintype "passive") (tstamp 1493882c-c680-4023-8b37-6c930c4730b8))
     (pad "3" smd rect (at -1.44 0.33 180) (size 0.63 0.5) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1228 "/CHARGER/SW1") (pinfunction "S") (pintype "passive") (tstamp ed70639f-334e-48e2-81ad-b7b202be92f6))
+      (net 1220 "/CHARGER/SW1") (pinfunction "S") (pintype "passive") (tstamp ed70639f-334e-48e2-81ad-b7b202be92f6))
     (pad "4" smd rect (at -1.44 0.97 180) (size 0.63 0.5) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1232 "/CHARGER/HIDRV1") (pinfunction "G") (pintype "passive") (tstamp 2cd4e3f8-06cb-45de-8f0f-19d4de1966e8))
+      (net 1224 "/CHARGER/HIDRV1") (pinfunction "G") (pintype "passive") (tstamp 2cd4e3f8-06cb-45de-8f0f-19d4de1966e8))
     (pad "5" smd custom (at 0.385 0 180) (size 1.9 2.45) (layers "F.Cu" "F.Mask")
-      (net 1243 "Net-(Q1-D)") (pinfunction "D") (pintype "passive") (thermal_bridge_angle 45)
+      (net 1235 "Net-(Q1-D)") (pinfunction "D") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -26201,9 +26193,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp f2c38216-31a0-4446-9707-3ee8b5aea96c))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp bc8dfad5-5794-4297-8155-c6f0020a2588))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1209 "+1V8") (pintype "passive") (tstamp 6cd387bd-8f3e-4612-b9f7-e845340d257d))
+      (net 1201 "+1V8") (pintype "passive") (tstamp 6cd387bd-8f3e-4612-b9f7-e845340d257d))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1341 "/~{C_LEFT_INT}") (pintype "passive") (tstamp 846a1019-d375-4b4d-8a49-9de78d803bd0))
+      (net 1339 "/~{C_RIGHT_INT}") (pintype "passive") (tstamp 846a1019-d375-4b4d-8a49-9de78d803bd0))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -26257,19 +26249,19 @@
     (pad "" smd roundrect (at 0 -0.3) (size 0.48 0.48) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 93abede8-9d22-494d-92b8-86c2278c1f00))
     (pad "" smd roundrect (at 0 0.3) (size 0.48 0.48) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 09ba1b1c-390a-4780-9203-cde5b116a5c4))
     (pad "1" smd roundrect (at -0.975 -0.75) (size 0.75 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1482 "/VCC_CORE_GT/DRVEN") (pinfunction "EN") (pintype "input") (tstamp f884bffd-046d-436d-a997-3cbbdd764b2a))
+      (net 1474 "/VCC_CORE_GT/DRVEN") (pinfunction "EN") (pintype "input") (tstamp f884bffd-046d-436d-a997-3cbbdd764b2a))
     (pad "2" smd roundrect (at -0.975 -0.25) (size 0.75 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1484 "unconnected-(U28-PHASE-Pad2)") (pinfunction "PHASE") (pintype "passive") (tstamp 7ee8eae4-25bf-435f-b877-8429461396a2))
+      (net 1476 "unconnected-(U28-PHASE-Pad2)") (pinfunction "PHASE") (pintype "passive") (tstamp 7ee8eae4-25bf-435f-b877-8429461396a2))
     (pad "3" smd roundrect (at -0.975 0.25) (size 0.75 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1485 "unconnected-(U28-UGATE-Pad3)") (pinfunction "UGATE") (pintype "output") (tstamp fa8823cb-eb98-4558-bf51-49e1c17710dd))
+      (net 1477 "unconnected-(U28-UGATE-Pad3)") (pinfunction "UGATE") (pintype "output") (tstamp fa8823cb-eb98-4558-bf51-49e1c17710dd))
     (pad "4" smd roundrect (at -0.975 0.75) (size 0.75 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1486 "unconnected-(U28-BOOT-Pad4)") (pinfunction "BOOT") (pintype "passive") (tstamp 36b7dd24-a60e-4c05-992d-c37b3b859c66))
+      (net 1478 "unconnected-(U28-BOOT-Pad4)") (pinfunction "BOOT") (pintype "passive") (tstamp 36b7dd24-a60e-4c05-992d-c37b3b859c66))
     (pad "5" smd roundrect (at 0.975 0.75) (size 0.75 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1483 "Net-(U27-PWM1)") (pinfunction "PWM") (pintype "input") (tstamp ebdca262-0058-4d72-a654-7b3258a730b4))
+      (net 1475 "Net-(U27-PWM1)") (pinfunction "PWM") (pintype "input") (tstamp ebdca262-0058-4d72-a654-7b3258a730b4))
     (pad "6" smd roundrect (at 0.975 0.25) (size 0.75 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (tstamp a115cf0a-2c2b-4c52-8059-ad75d69de3fc))
     (pad "7" smd roundrect (at 0.975 -0.25) (size 0.75 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1487 "unconnected-(U28-LGATE-Pad7)") (pinfunction "LGATE") (pintype "output") (tstamp 11c8ada0-7d74-46c7-9605-979128c018f2))
+      (net 1479 "unconnected-(U28-LGATE-Pad7)") (pinfunction "LGATE") (pintype "output") (tstamp 11c8ada0-7d74-46c7-9605-979128c018f2))
     (pad "8" smd roundrect (at 0.975 -0.75) (size 0.75 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 104 "+5V") (pinfunction "VCC") (pintype "power_in") (tstamp ba09b396-c422-4626-8960-80f9ac66d836))
     (pad "9" smd rect (at 0 0) (size 0.6 1.2) (layers "F.Cu" "F.Mask")
@@ -26328,7 +26320,7 @@
     (pad "1" smd roundrect (at -0.45 0 90) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp fcb5d76d-68ab-4746-bdb8-9d247253b1a4))
     (pad "2" smd roundrect (at 0.45 0 90) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1231 "/CHARGER/LODRV2") (pintype "passive") (tstamp 28542fa0-2a08-4bcc-9e2e-7b6e2ad28565))
+      (net 1223 "/CHARGER/LODRV2") (pintype "passive") (tstamp 28542fa0-2a08-4bcc-9e2e-7b6e2ad28565))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -26380,7 +26372,7 @@
     (fp_line (start 0.8 0.4) (end -0.8 0.4)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ab2246cf-7b5a-4850-ab57-9055548ccdf5))
     (pad "1" smd roundrect (at -0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1263 "/USBC3/VBUS") (pintype "passive") (tstamp 19f5500e-d423-4ffd-9ba2-990410eab4b7))
+      (net 1255 "/USBC3/VBUS") (pintype "passive") (tstamp 19f5500e-d423-4ffd-9ba2-990410eab4b7))
     (pad "2" smd roundrect (at 0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 06ad9664-be67-40db-9ca5-5fd7237219da))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
@@ -26435,7 +26427,7 @@
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 73 "/USBC2/BYP") (pintype "passive") (tstamp c6bdccb4-0c59-4fda-ab12-4f1d9899794d))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1384 "/USBC2/~{FAULT}") (pintype "passive") (tstamp 09699cd0-7f3f-48d4-b713-64a4ad1909e2))
+      (net 1376 "/USBC2/~{FAULT}") (pintype "passive") (tstamp 09699cd0-7f3f-48d4-b713-64a4ad1909e2))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -26493,11 +26485,11 @@
     (fp_line (start 0.67 1.1) (end -0.68 1.1)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1d94ce3c-9fd7-4f1f-acd2-ac394838d68d))
     (pad "1" smd rect (at -1 -0.65 90) (size 0.45 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1356 "/USBC3/EN_CHARGE") (pinfunction "G") (pintype "input") (tstamp 7ac26e2f-ab68-4eca-9919-310993c68df5))
+      (net 1348 "/USBC3/EN_CHARGE") (pinfunction "G") (pintype "input") (tstamp 7ac26e2f-ab68-4eca-9919-310993c68df5))
     (pad "2" smd rect (at -1 0.65 90) (size 0.45 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "S") (pintype "passive") (tstamp 2f0c714f-785d-4ea1-ae97-bd539bfe055b))
     (pad "3" smd rect (at 1 0 90) (size 0.45 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1393 "Net-(Q13-D)") (pinfunction "D") (pintype "passive") (tstamp ef8490ac-9f21-4e7d-834f-811b5bc477e6))
+      (net 1385 "Net-(Q13-D)") (pinfunction "D") (pintype "passive") (tstamp ef8490ac-9f21-4e7d-834f-811b5bc477e6))
     (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-323_SC-70.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -26546,9 +26538,9 @@
     (fp_line (start 0.3 0.15) (end -0.3 0.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 06336d28-aea5-4b61-9e07-1fdf79f82979))
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1293 "/USBC1/RXC2+") (pintype "passive") (tstamp 90dd26e6-003c-4665-a043-249438f6ae73))
+      (net 1285 "/USBC1/RXC2+") (pintype "passive") (tstamp 90dd26e6-003c-4665-a043-249438f6ae73))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1292 "/USBC1/RXJ2+") (pintype "passive") (tstamp b500188e-2d4a-45b4-bfe4-18c7fd485b24))
+      (net 1284 "/USBC1/RXJ2+") (pintype "passive") (tstamp b500188e-2d4a-45b4-bfe4-18c7fd485b24))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -26600,7 +26592,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f9f4cd72-7ccc-40c8-a2f4-7bf57b5922a4))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1257 "/CHARGER/SRN1") (pintype "passive") (tstamp b74ba06c-4ddc-4924-b7b7-0c042a311d70))
+      (net 1249 "/CHARGER/SRN1") (pintype "passive") (tstamp b74ba06c-4ddc-4924-b7b7-0c042a311d70))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp ebe0c497-68d6-465d-9b77-405daee74a09))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -26652,7 +26644,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 04e4b6b7-3663-4be7-9cf5-f917c38c14af))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 36d870d2-c1a8-4a44-a68e-7768a79f9b1d))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1255 "Net-(U9-CELL_BATPRESZ)") (pintype "passive") (tstamp c18a7841-899e-465c-a7a6-676a347400e1))
+      (net 1247 "Net-(U9-CELL_BATPRESZ)") (pintype "passive") (tstamp c18a7841-899e-465c-a7a6-676a347400e1))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 5978abfc-7557-47b9-8287-ae3877a26bf6))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -26705,9 +26697,9 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 1ffd0a58-11c0-4b70-b374-19154ff9fe14))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 7ad44a5d-c353-448b-8c0d-e569d9b43ab9))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1387 "Net-(Q7-G)") (pintype "passive") (tstamp a0f0d489-5a47-432f-bafe-b37f2f87d285))
+      (net 1379 "Net-(Q7-G)") (pintype "passive") (tstamp a0f0d489-5a47-432f-bafe-b37f2f87d285))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1245 "/CHARGER/VIN") (pintype "passive") (tstamp 1b9077da-7a57-4c6a-bfa0-eb1ed9a6dbab))
+      (net 1237 "/CHARGER/VIN") (pintype "passive") (tstamp 1b9077da-7a57-4c6a-bfa0-eb1ed9a6dbab))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -26815,7 +26807,7 @@
     (pad "1" smd roundrect (at -0.32 0 90) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 7122ce05-ebf1-42b0-9dea-8f715e2d2021))
     (pad "2" smd roundrect (at 0.32 0 90) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1317 "/USBC3/TXC1+") (pinfunction "A2") (pintype "passive") (tstamp c6c7eecf-9312-4ea8-b3bb-5d11aba7d9fb))
+      (net 1309 "/USBC3/TXC1+") (pinfunction "A2") (pintype "passive") (tstamp c6c7eecf-9312-4ea8-b3bb-5d11aba7d9fb))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -26869,7 +26861,7 @@
     (pad "1" smd roundrect (at -0.7 0 270) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 36c4989d-f7f4-427d-975a-85b101267bf0))
     (pad "2" smd roundrect (at 0.7 0 270) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1421 "/VCCINAUX/VCCIN_AUX_FLTR") (pintype "passive") (tstamp 62c84641-82b7-40dc-9cd0-254ab53f734d))
+      (net 1413 "/VCCINAUX/VCCIN_AUX_FLTR") (pintype "passive") (tstamp 62c84641-82b7-40dc-9cd0-254ab53f734d))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -26927,7 +26919,7 @@
     (pad "1" smd roundrect (at -0.32 0 90) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp d21c32dc-44b6-4721-99ac-f205df2ba6e9))
     (pad "2" smd roundrect (at 0.32 0 90) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1289 "/USBC0/RXC2+") (pinfunction "A2") (pintype "passive") (tstamp 56415351-5b6f-4657-8f99-64d42e9a2d35))
+      (net 1281 "/USBC0/RXC2+") (pinfunction "A2") (pintype "passive") (tstamp 56415351-5b6f-4657-8f99-64d42e9a2d35))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -26978,9 +26970,9 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp c331e4dd-a079-43fc-8509-828d8c62152e))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp c44e788d-0593-4c1f-88bf-af8eed49a0e0))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1263 "/USBC3/VBUS") (pintype "passive") (tstamp d105e9c0-1387-4ef7-b78e-1f5b73e2c3f2))
+      (net 1255 "/USBC3/VBUS") (pintype "passive") (tstamp d105e9c0-1387-4ef7-b78e-1f5b73e2c3f2))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1401 "/USBC3/OVP") (pintype "passive") (tstamp b5e81f89-5418-4ac6-b1fe-a5f5d5ea0f14))
+      (net 1393 "/USBC3/OVP") (pintype "passive") (tstamp b5e81f89-5418-4ac6-b1fe-a5f5d5ea0f14))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -27082,9 +27074,9 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp ca8abbc4-2aa1-4f5f-b4c1-635a6871d857))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 71c64a1e-a774-402d-a3cc-513f26943511))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1236 "/CHARGER/COMP2") (pintype "passive") (tstamp 8cfd8f64-280a-4033-8bb8-6fd82076c4cc))
+      (net 1228 "/CHARGER/COMP2") (pintype "passive") (tstamp 8cfd8f64-280a-4033-8bb8-6fd82076c4cc))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1235 "Net-(C58-Pad1)") (pintype "passive") (tstamp 15b5b18d-e209-4638-8197-f713ad6101b5))
+      (net 1227 "Net-(C58-Pad1)") (pintype "passive") (tstamp 15b5b18d-e209-4638-8197-f713ad6101b5))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -27138,7 +27130,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp df120274-a663-4db7-acc6-2f047a0d0493))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp 61166feb-4622-4023-8a8f-b132a6f8a807))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp 61166feb-4622-4023-8a8f-b132a6f8a807))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -27296,7 +27288,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8d79e600-60f1-4aa9-91c3-e3f74dd4967c))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1245 "/CHARGER/VIN") (pintype "passive") (tstamp e3586ae4-3a0d-4e35-b134-6c3443ca3cc2))
+      (net 1237 "/CHARGER/VIN") (pintype "passive") (tstamp e3586ae4-3a0d-4e35-b134-6c3443ca3cc2))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp f392f00f-2f04-4275-88e3-00f653bc7cf8))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -27403,7 +27395,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 1d0e1d37-8550-4698-81ce-df877b312ba7))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 90be0e82-0806-45f0-8c21-ef8b912b1ab8))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1316 "/USBC3/TXJ1+") (pintype "passive") (tstamp 605ef344-1204-4a1b-a911-420cda4fbf53))
+      (net 1308 "/USBC3/TXJ1+") (pintype "passive") (tstamp 605ef344-1204-4a1b-a911-420cda4fbf53))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 7d84fc35-c9e8-4b79-9ff2-b0d85f2a8112))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -27525,7 +27517,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 4365151c-9b66-45eb-9a62-4976ca9b2301))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 64c8c651-429f-47ad-9d5c-11c20ce22e49))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1379 "/USBC1/RIREF") (pintype "passive") (tstamp 4c116c5b-5157-437f-853d-42766dfb2b72))
+      (net 1371 "/USBC1/RIREF") (pintype "passive") (tstamp 4c116c5b-5157-437f-853d-42766dfb2b72))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 252457d7-864f-491e-b97c-310e15dcd246))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -27589,15 +27581,15 @@
     (pad "" smd rect (at 1.44 0.33) (size 0.63 0.5) (layers "F.Paste") (tstamp 3c07a9c8-5f24-4d7b-8f5d-b847efa9d616))
     (pad "" smd rect (at 1.44 0.9725) (size 0.63 0.505) (layers "F.Paste") (tstamp 7070a2e9-1be2-4dd5-8355-4bb406d86a32))
     (pad "1" smd rect (at -1.44 -0.97) (size 0.63 0.5) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1234 "/CHARGER/VSYS") (pinfunction "S") (pintype "passive") (tstamp fa41e489-b0c0-4bb6-a034-43332a6a53f1))
+      (net 1226 "/CHARGER/VSYS") (pinfunction "S") (pintype "passive") (tstamp fa41e489-b0c0-4bb6-a034-43332a6a53f1))
     (pad "2" smd rect (at -1.44 -0.33) (size 0.63 0.5) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1234 "/CHARGER/VSYS") (pinfunction "S") (pintype "passive") (tstamp 54957c10-0a88-4a43-8781-37ab93199e01))
+      (net 1226 "/CHARGER/VSYS") (pinfunction "S") (pintype "passive") (tstamp 54957c10-0a88-4a43-8781-37ab93199e01))
     (pad "3" smd rect (at -1.44 0.33) (size 0.63 0.5) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1234 "/CHARGER/VSYS") (pinfunction "S") (pintype "passive") (tstamp dd42edb3-d60b-4a16-81f7-47447b533e2a))
+      (net 1226 "/CHARGER/VSYS") (pinfunction "S") (pintype "passive") (tstamp dd42edb3-d60b-4a16-81f7-47447b533e2a))
     (pad "4" smd rect (at -1.44 0.97) (size 0.63 0.5) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1244 "/CHARGER/~{BATDRV}") (pinfunction "G") (pintype "input") (tstamp 9abbd4c2-2ea9-4589-990f-ac6f51e5d948))
+      (net 1236 "/CHARGER/~{BATDRV}") (pinfunction "G") (pintype "input") (tstamp 9abbd4c2-2ea9-4589-990f-ac6f51e5d948))
     (pad "5" smd custom (at 0.385 0) (size 1.9 2.45) (layers "F.Cu" "F.Mask")
-      (net 1240 "/CHARGER/BATR1") (pinfunction "D") (pintype "passive") (thermal_bridge_angle 45)
+      (net 1232 "/CHARGER/BATR1") (pinfunction "D") (pintype "passive") (thermal_bridge_angle 45)
       (options (clearance outline) (anchor rect))
       (primitives
         (gr_poly
@@ -27671,9 +27663,9 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp d85d418a-fd4c-47f5-9850-754928859150))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp f39c2ab5-dd77-4620-93d4-6cf59ef9f2a7))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1389 "Net-(Q9-G)") (pintype "passive") (tstamp 49fc8273-81c1-4ce2-b9d7-26e17de420a8))
+      (net 1381 "Net-(Q9-G)") (pintype "passive") (tstamp 49fc8273-81c1-4ce2-b9d7-26e17de420a8))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1393 "Net-(Q13-D)") (pintype "passive") (tstamp 9c4b8069-0526-4dda-b3a7-8c7645233493))
+      (net 1385 "Net-(Q13-D)") (pintype "passive") (tstamp 9c4b8069-0526-4dda-b3a7-8c7645233493))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -27727,7 +27719,7 @@
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp f7e25bd0-676c-4634-aadb-165b13348d42))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1417 "VCCGT") (pintype "passive") (tstamp 7ec3bed0-4ef4-46aa-8c5e-1d585b5fd602))
+      (net 1409 "VCCGT") (pintype "passive") (tstamp 7ec3bed0-4ef4-46aa-8c5e-1d585b5fd602))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -27776,9 +27768,9 @@
     (fp_line (start 0.3 0.15) (end -0.3 0.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 70a0ced5-d740-4b99-b4d0-6e7c947f9835))
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1315 "/USBC3/TXC1-") (pintype "passive") (tstamp 975a2921-74da-470d-a411-36a2d6278c4a))
+      (net 1307 "/USBC3/TXC1-") (pintype "passive") (tstamp 975a2921-74da-470d-a411-36a2d6278c4a))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1314 "/USBC3/TXJ1-") (pintype "passive") (tstamp 33a37891-675d-4a75-a714-be0dcbb27ecd))
+      (net 1306 "/USBC3/TXJ1-") (pintype "passive") (tstamp 33a37891-675d-4a75-a714-be0dcbb27ecd))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -27830,7 +27822,7 @@
     (fp_line (start 0.8 0.4) (end -0.8 0.4)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4727987f-0d15-4948-8859-4a1be7ef6922))
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1206 "Net-(C46-Pad1)") (pintype "passive") (tstamp 731a85d3-2428-4057-a05a-6a0d3cbd5406))
+      (net 1198 "Net-(C46-Pad1)") (pintype "passive") (tstamp 731a85d3-2428-4057-a05a-6a0d3cbd5406))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp e60f884a-9ded-47fb-b750-6169aa2e5dbc))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
@@ -27890,7 +27882,7 @@
     (pad "1" smd roundrect (at -0.32 0 270) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 978fa1b9-cc48-4d96-b4ff-a6a8f98478b2))
     (pad "2" smd roundrect (at 0.32 0 270) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1315 "/USBC3/TXC1-") (pinfunction "A2") (pintype "passive") (tstamp 59ce59db-78ae-4222-9d9b-93c64cc3550b))
+      (net 1307 "/USBC3/TXC1-") (pinfunction "A2") (pintype "passive") (tstamp 59ce59db-78ae-4222-9d9b-93c64cc3550b))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -27941,7 +27933,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 5038329d-8334-4b59-9845-8da50e5e0a40))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 17068832-24ff-4ed6-88db-e22f24df9611))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1310 "/USBC2/TXJ1-") (pintype "passive") (tstamp 2d3192f7-3a7e-48f5-a6a7-c207c4ef1b75))
+      (net 1302 "/USBC2/TXJ1-") (pintype "passive") (tstamp 2d3192f7-3a7e-48f5-a6a7-c207c4ef1b75))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 060c3e03-1aa6-49e1-bb83-004577dc1859))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -27994,7 +27986,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 18464632-9b14-471e-93e3-5fdd244b3460))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 47bbc142-16f9-4e4c-b1c2-fab2cd5d27b1))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1381 "/USBC3/RIREF") (pintype "passive") (tstamp de8cd70d-b112-4fbf-b2c8-a04fe2c2f65d))
+      (net 1373 "/USBC3/RIREF") (pintype "passive") (tstamp de8cd70d-b112-4fbf-b2c8-a04fe2c2f65d))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp c3698603-96c1-4b9e-a34f-4fc49d27ce93))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -28048,7 +28040,7 @@
     (fp_line (start 0.8 0.4) (end -0.8 0.4)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 99480c32-2976-4bbd-b9fd-b0d8ae55d2ae))
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1266 "/USBC0/VLDO") (pintype "passive") (tstamp de1b3256-33a0-4b81-8c03-873afa2e1841))
+      (net 1258 "/USBC0/VLDO") (pintype "passive") (tstamp de1b3256-33a0-4b81-8c03-873afa2e1841))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 5490de63-71f2-4645-be19-04241da59dcf))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
@@ -28102,7 +28094,7 @@
     (fp_line (start 0.8 0.4) (end -0.8 0.4)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3a9de5ef-3334-4873-bfed-99df8a02da89))
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1216 "Net-(C52-Pad1)") (pintype "passive") (tstamp b7b8877a-24fc-4813-b078-bd9dbd02ced0))
+      (net 1208 "Net-(C52-Pad1)") (pintype "passive") (tstamp b7b8877a-24fc-4813-b078-bd9dbd02ced0))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp d5690699-8091-4737-8206-90e22f1a441f))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
@@ -28294,15 +28286,15 @@
     (fp_line (start 0.8 1.4) (end 0.8 -1.4)
       (stroke (width 0.1) (type default)) (layer "F.Fab") (tstamp 6d0a84d1-f276-4a84-a89e-fabba89944bd))
     (pad "A1" smd circle (at -0.6 -1.2 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1384 "/USBC2/~{FAULT}") (pinfunction "~{FLT}") (pintype "open_collector") (tstamp f7e19351-2df0-4bd7-8392-d165b90027e6))
+      (net 1376 "/USBC2/~{FAULT}") (pinfunction "~{FLT}") (pintype "open_collector") (tstamp f7e19351-2df0-4bd7-8392-d165b90027e6))
     (pad "A2" smd circle (at -0.2 -1.2 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 81 "/USBC2/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp cd1207ee-836b-4183-82c6-7b68f2395557))
     (pad "A3" smd circle (at 0.2 -1.2 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1396 "/USBC2/SOURCE") (pinfunction "EN1") (pintype "input") (tstamp 72721b88-63c4-4556-ae86-430b5e469340))
+      (net 1388 "/USBC2/SOURCE") (pinfunction "EN1") (pintype "input") (tstamp 72721b88-63c4-4556-ae86-430b5e469340))
     (pad "A4" smd circle (at 0.6 -1.2 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1380 "/USBC2/RIREF") (pinfunction "IREF") (pintype "passive") (tstamp 6c358bbd-fe3d-4405-8a97-f67601e46c0e))
+      (net 1372 "/USBC2/RIREF") (pinfunction "IREF") (pintype "passive") (tstamp 6c358bbd-fe3d-4405-8a97-f67601e46c0e))
     (pad "B1" smd circle (at -0.6 -0.8 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1349 "/USBC2/PPHV") (pinfunction "PPHV") (pintype "power_out") (tstamp a103466c-1122-4312-a9a0-335376924c67))
+      (net 1341 "/USBC2/PPHV") (pinfunction "PPHV") (pintype "power_out") (tstamp a103466c-1122-4312-a9a0-335376924c67))
     (pad "B2" smd circle (at -0.2 -0.8 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 81 "/USBC2/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp df7ffbb3-20bd-48da-95ab-08b13a551793))
     (pad "B3" smd circle (at 0.2 -0.8 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
@@ -28310,7 +28302,7 @@
     (pad "B4" smd circle (at 0.6 -0.8 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (tstamp 24ecb645-5e9d-4929-8db2-c5d1a5a6da38))
     (pad "C1" smd circle (at -0.6 -0.4 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1349 "/USBC2/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 890e923b-bff7-40cb-b867-ecd6cb2f6643))
+      (net 1341 "/USBC2/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 890e923b-bff7-40cb-b867-ecd6cb2f6643))
     (pad "C2" smd circle (at -0.2 -0.4 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 81 "/USBC2/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 65133e0d-5e6e-4d6b-ae11-8664656153aa))
     (pad "C3" smd circle (at 0.2 -0.4 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
@@ -28318,7 +28310,7 @@
     (pad "C4" smd circle (at 0.6 -0.4 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 104 "+5V") (pinfunction "PP5V") (pintype "power_in") (tstamp 029027c9-80cd-4f46-a6dd-800053f67b49))
     (pad "D1" smd circle (at -0.6 0 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1349 "/USBC2/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp baa929f5-f9d5-4379-bb61-766e35e76a76))
+      (net 1341 "/USBC2/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp baa929f5-f9d5-4379-bb61-766e35e76a76))
     (pad "D2" smd circle (at -0.2 0 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 81 "/USBC2/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 0d8bad07-45a5-4a96-9213-1639d9cf8a3f))
     (pad "D3" smd circle (at 0.2 0 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
@@ -28326,7 +28318,7 @@
     (pad "D4" smd circle (at 0.6 0 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 104 "+5V") (pinfunction "PP5V") (pintype "power_in") (tstamp a19484b4-f282-489a-8ac0-f5ff76755a19))
     (pad "E1" smd circle (at -0.6 0.4 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1349 "/USBC2/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp b2979a08-2182-4bfb-b73e-003176d5c31d))
+      (net 1341 "/USBC2/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp b2979a08-2182-4bfb-b73e-003176d5c31d))
     (pad "E2" smd circle (at -0.2 0.4 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 81 "/USBC2/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp cf539253-f911-4943-8f96-b545c6d4b742))
     (pad "E3" smd circle (at 0.2 0.4 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
@@ -28334,19 +28326,19 @@
     (pad "E4" smd circle (at 0.6 0.4 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 104 "+5V") (pinfunction "PP5V") (pintype "power_in") (tstamp 0a61ee9e-a02b-4d26-8590-44b3581d2a6d))
     (pad "F1" smd circle (at -0.6 0.8 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1349 "/USBC2/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 24f5ef0d-ec5c-476d-ba69-f5612cb5be8a))
+      (net 1341 "/USBC2/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 24f5ef0d-ec5c-476d-ba69-f5612cb5be8a))
     (pad "F2" smd circle (at -0.2 0.8 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 81 "/USBC2/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 67ff17dd-8c51-43fb-908e-de912062d14a))
     (pad "F3" smd circle (at 0.2 0.8 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 81 "/USBC2/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp ce9a7a39-b6b0-484e-87b3-d3480b9b5df6))
     (pad "F4" smd circle (at 0.6 0.8 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1400 "/USBC2/OVP") (pinfunction "OVP") (pintype "passive") (tstamp 1f53758f-adad-4717-98c4-672c34413d80))
+      (net 1392 "/USBC2/OVP") (pinfunction "OVP") (pintype "passive") (tstamp 1f53758f-adad-4717-98c4-672c34413d80))
     (pad "G1" smd circle (at -0.6 1.2 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1404 "/USBC2/SINK") (pinfunction "EN0") (pintype "input") (tstamp 581e4794-567f-41a7-a730-dca5a850cbc1))
+      (net 1396 "/USBC2/SINK") (pinfunction "EN0") (pintype "input") (tstamp 581e4794-567f-41a7-a730-dca5a850cbc1))
     (pad "G2" smd circle (at -0.2 1.2 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 81 "/USBC2/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 25f334b6-143c-4ccf-9163-9c41aa6ea4ac))
     (pad "G3" smd circle (at 0.2 1.2 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1268 "/USBC2/VLDO") (pinfunction "VLDO") (pintype "power_out") (tstamp 8db21ac4-d053-42dd-be41-22496fb83385))
+      (net 1260 "/USBC2/VLDO") (pinfunction "VLDO") (pintype "power_out") (tstamp 8db21ac4-d053-42dd-be41-22496fb83385))
     (pad "G4" smd circle (at 0.6 1.2 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 4 "+3V3") (pinfunction "VIN") (pintype "power_in") (tstamp 027a0735-dd38-4228-9a80-f00ab5e86d3e))
   )
@@ -28394,7 +28386,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 552c9772-0b39-4185-90b9-29543d289caa))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 2adc82a6-d7d5-4649-8d21-061c278772da))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1297 "/USBC2/RXC2+") (pintype "passive") (tstamp 0938cf83-b884-44e8-ac9b-126d8e08b09c))
+      (net 1289 "/USBC2/RXC2+") (pintype "passive") (tstamp 0938cf83-b884-44e8-ac9b-126d8e08b09c))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 447 "/CPU_USB/USBC2.RX+2") (pintype "passive") (tstamp cef7c30d-711b-461e-86b2-cac954c0928b))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -28448,7 +28440,7 @@
     (fp_line (start 0.8 0.4) (end -0.8 0.4)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4571f131-53b9-47a3-8519-9d69c9e89858))
     (pad "1" smd roundrect (at -0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1216 "Net-(C52-Pad1)") (pintype "passive") (tstamp 451a9e28-266c-44d7-ac30-e22eddd339b7))
+      (net 1208 "Net-(C52-Pad1)") (pintype "passive") (tstamp 451a9e28-266c-44d7-ac30-e22eddd339b7))
     (pad "2" smd roundrect (at 0.7 0) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp d7d1a06b-e35b-4a84-a33a-6b92e657f0f6))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
@@ -28567,7 +28559,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 96aea115-3a7b-4698-9636-080f6dfd0844))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1417 "VCCGT") (pintype "passive") (tstamp 56ade5ae-da76-4390-bbac-42c000942e76))
+      (net 1409 "VCCGT") (pintype "passive") (tstamp 56ade5ae-da76-4390-bbac-42c000942e76))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -28619,7 +28611,7 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 65c72001-21d8-478f-9aa4-f5bb59e18076))
     (pad "1" smd roundrect (at -0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1240 "/CHARGER/BATR1") (pintype "passive") (tstamp b442d288-729e-4ec5-912b-bf29f897e231))
+      (net 1232 "/CHARGER/BATR1") (pintype "passive") (tstamp b442d288-729e-4ec5-912b-bf29f897e231))
     (pad "2" smd roundrect (at 0.8375 0) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp a759320f-3e10-4435-9218-cab85e42d877))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl"
@@ -28691,23 +28683,23 @@
     (pad "" smd rect (at 1.94 0.55 90) (size 0.9 0.78) (layers "F.Paste") (tstamp 00f65c4c-9286-4579-88c9-a9ce635cd61f))
     (pad "" smd rect (at 1.94 1.65 90) (size 0.9 0.78) (layers "F.Paste") (tstamp 29be3870-1b19-4a4f-ad75-7b021d43f4a0))
     (pad "1" smd rect (at -2.75 -1.905 90) (size 0.5 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1245 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 5080024e-403d-4479-ae00-7d0e2f9fd981))
+      (net 1237 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 5080024e-403d-4479-ae00-7d0e2f9fd981))
     (pad "2" smd rect (at -2.75 -0.635 90) (size 0.5 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1245 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 901144f4-4365-46a4-848f-9366922969c2))
+      (net 1237 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp 901144f4-4365-46a4-848f-9366922969c2))
     (pad "3" smd rect (at -2.75 0.635 90) (size 0.5 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1245 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp d1bfd731-4a8d-4bb8-ac87-b57d4b765c0a))
+      (net 1237 "/CHARGER/VIN") (pinfunction "S") (pintype "passive") (tstamp d1bfd731-4a8d-4bb8-ac87-b57d4b765c0a))
     (pad "4" smd rect (at -2.75 1.905 90) (size 0.5 0.65) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1388 "Net-(Q8-G)") (pinfunction "G") (pintype "input") (tstamp 621472d0-093e-44e5-a7aa-2a75353628a5))
+      (net 1380 "Net-(Q8-G)") (pinfunction "G") (pintype "input") (tstamp 621472d0-093e-44e5-a7aa-2a75353628a5))
     (pad "5" smd rect (at 0.465 0 90) (size 4.6 4.12) (layers "F.Cu" "F.Mask")
-      (net 1349 "/USBC2/PPHV") (pinfunction "D") (pintype "passive") (tstamp 97032b21-824f-48f8-bb1c-4b794d887bde))
+      (net 1341 "/USBC2/PPHV") (pinfunction "D") (pintype "passive") (tstamp 97032b21-824f-48f8-bb1c-4b794d887bde))
     (pad "5" smd rect (at 2.8 -1.905 90) (size 0.5 0.55) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1349 "/USBC2/PPHV") (pinfunction "D") (pintype "passive") (tstamp be7ef101-a990-43b4-b692-7f09eb81caaf))
+      (net 1341 "/USBC2/PPHV") (pinfunction "D") (pintype "passive") (tstamp be7ef101-a990-43b4-b692-7f09eb81caaf))
     (pad "5" smd rect (at 2.8 -0.635 90) (size 0.5 0.55) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1349 "/USBC2/PPHV") (pinfunction "D") (pintype "passive") (tstamp d67b17fd-4c95-4dc2-9713-106a37cad86e))
+      (net 1341 "/USBC2/PPHV") (pinfunction "D") (pintype "passive") (tstamp d67b17fd-4c95-4dc2-9713-106a37cad86e))
     (pad "5" smd rect (at 2.8 0.635 90) (size 0.5 0.55) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1349 "/USBC2/PPHV") (pinfunction "D") (pintype "passive") (tstamp a8e56347-c3f4-457e-83bf-f9db66777efb))
+      (net 1341 "/USBC2/PPHV") (pinfunction "D") (pintype "passive") (tstamp a8e56347-c3f4-457e-83bf-f9db66777efb))
     (pad "5" smd rect (at 2.8 1.905 90) (size 0.5 0.55) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1349 "/USBC2/PPHV") (pinfunction "D") (pintype "passive") (tstamp f300d07c-499a-410e-a963-55d778b8822a))
+      (net 1341 "/USBC2/PPHV") (pinfunction "D") (pintype "passive") (tstamp f300d07c-499a-410e-a963-55d778b8822a))
     (model "${KICAD6_3DMODEL_DIR}/Package_DFN_QFN.3dshapes/AO_DFN-8-1EP_5.55x5.2mm_P1.27mm_EP4.12x4.6mm.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -28760,7 +28752,7 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 2978a95a-e38f-49e4-ba5e-1a3795ada3db))
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1251 "/CHARGER/IADPT") (pintype "passive") (tstamp cdc959a1-4f1a-4f57-bca3-e0c45793e481))
+      (net 1243 "/CHARGER/IADPT") (pintype "passive") (tstamp cdc959a1-4f1a-4f57-bca3-e0c45793e481))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 55e1bdd2-f878-46fa-be70-94c793057748))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -28811,9 +28803,9 @@
     (fp_line (start 0.3 0.15) (end -0.3 0.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8433ffa4-a90d-4c52-9dd7-1c1b2d1dfdac))
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1287 "/USBC0/RXC2-") (pintype "passive") (tstamp ae2a3f59-50fe-410c-b4dd-18c4258d51fc))
+      (net 1279 "/USBC0/RXC2-") (pintype "passive") (tstamp ae2a3f59-50fe-410c-b4dd-18c4258d51fc))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1286 "/USBC0/RXJ2-") (pintype "passive") (tstamp a0efc6f7-e495-4f36-bb66-8dc314eeb7fd))
+      (net 1278 "/USBC0/RXJ2-") (pintype "passive") (tstamp a0efc6f7-e495-4f36-bb66-8dc314eeb7fd))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -28931,59 +28923,59 @@
     (fp_line (start 0.8 1.4) (end 0.8 -1.4)
       (stroke (width 0.1) (type default)) (layer "F.Fab") (tstamp e9c06f05-c836-4a54-8d36-5bafbcef57fc))
     (pad "A1" smd circle (at -0.6 -1.2 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1385 "/USBC3/~{FAULT}") (pinfunction "~{FLT}") (pintype "open_collector") (tstamp b17b7ac9-81ed-492b-91f7-8e666b7b61e0))
+      (net 1377 "/USBC3/~{FAULT}") (pinfunction "~{FLT}") (pintype "open_collector") (tstamp b17b7ac9-81ed-492b-91f7-8e666b7b61e0))
     (pad "A2" smd circle (at -0.2 -1.2 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 07e7b9bd-1a74-440d-aa83-e74f0460e309))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 07e7b9bd-1a74-440d-aa83-e74f0460e309))
     (pad "A3" smd circle (at 0.2 -1.2 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1397 "/USBC3/SOURCE") (pinfunction "EN1") (pintype "input") (tstamp 86eb7cb9-7194-4feb-bf7c-2bb5b4f8ff9e))
+      (net 1389 "/USBC3/SOURCE") (pinfunction "EN1") (pintype "input") (tstamp 86eb7cb9-7194-4feb-bf7c-2bb5b4f8ff9e))
     (pad "A4" smd circle (at 0.6 -1.2 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1381 "/USBC3/RIREF") (pinfunction "IREF") (pintype "passive") (tstamp 1a1581c5-aff9-454d-835a-42097154e23d))
+      (net 1373 "/USBC3/RIREF") (pinfunction "IREF") (pintype "passive") (tstamp 1a1581c5-aff9-454d-835a-42097154e23d))
     (pad "B1" smd circle (at -0.6 -0.8 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1355 "/USBC3/PPHV") (pinfunction "PPHV") (pintype "power_out") (tstamp 7ec9cde3-0ce2-4ad8-9c17-262e7b36c699))
+      (net 1347 "/USBC3/PPHV") (pinfunction "PPHV") (pintype "power_out") (tstamp 7ec9cde3-0ce2-4ad8-9c17-262e7b36c699))
     (pad "B2" smd circle (at -0.2 -0.8 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 07755783-1d64-437a-8528-6319a8f0d689))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 07755783-1d64-437a-8528-6319a8f0d689))
     (pad "B3" smd circle (at 0.2 -0.8 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 4f4582f8-9a5c-47ed-a3ec-2775e0d7cab3))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 4f4582f8-9a5c-47ed-a3ec-2775e0d7cab3))
     (pad "B4" smd circle (at 0.6 -0.8 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "power_in") (tstamp d7814c9c-aa2c-4eb8-8c38-bfb95afe949d))
     (pad "C1" smd circle (at -0.6 -0.4 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1355 "/USBC3/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp a85f8baa-bd63-4bfc-98c6-10dc56a7b462))
+      (net 1347 "/USBC3/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp a85f8baa-bd63-4bfc-98c6-10dc56a7b462))
     (pad "C2" smd circle (at -0.2 -0.4 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 5daef3d8-0a50-45f6-9b97-9bcc21de1c17))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 5daef3d8-0a50-45f6-9b97-9bcc21de1c17))
     (pad "C3" smd circle (at 0.2 -0.4 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp d80ef466-2d5b-4b8f-b182-c79c48692dd1))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp d80ef466-2d5b-4b8f-b182-c79c48692dd1))
     (pad "C4" smd circle (at 0.6 -0.4 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 104 "+5V") (pinfunction "PP5V") (pintype "power_in") (tstamp bb0e2b8a-bccd-4ef0-9d92-f70f42b17440))
     (pad "D1" smd circle (at -0.6 0 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1355 "/USBC3/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 0b4f3853-9698-4529-9ee8-505edbe618b5))
+      (net 1347 "/USBC3/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp 0b4f3853-9698-4529-9ee8-505edbe618b5))
     (pad "D2" smd circle (at -0.2 0 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 0a425855-1344-4c8d-a615-8b020928c448))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 0a425855-1344-4c8d-a615-8b020928c448))
     (pad "D3" smd circle (at 0.2 0 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 440c23ab-0456-4527-af53-f40a566acdab))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 440c23ab-0456-4527-af53-f40a566acdab))
     (pad "D4" smd circle (at 0.6 0 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 104 "+5V") (pinfunction "PP5V") (pintype "power_in") (tstamp 14518242-799c-4b0b-9767-1981c4697958))
     (pad "E1" smd circle (at -0.6 0.4 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1355 "/USBC3/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp cada9a2d-dec6-4da4-b199-ed4663cc8ffe))
+      (net 1347 "/USBC3/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp cada9a2d-dec6-4da4-b199-ed4663cc8ffe))
     (pad "E2" smd circle (at -0.2 0.4 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp ae6f9501-40be-433a-b37b-559f69bbff66))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp ae6f9501-40be-433a-b37b-559f69bbff66))
     (pad "E3" smd circle (at 0.2 0.4 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 6eb88432-7883-4569-bbee-af4ba1cbabd4))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 6eb88432-7883-4569-bbee-af4ba1cbabd4))
     (pad "E4" smd circle (at 0.6 0.4 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 104 "+5V") (pinfunction "PP5V") (pintype "power_in") (tstamp 58443bd3-6694-4a23-a0a1-27f668fad1ac))
     (pad "F1" smd circle (at -0.6 0.8 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1355 "/USBC3/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp be4c7175-9770-451f-bfc9-d3f163f7ca5f))
+      (net 1347 "/USBC3/PPHV") (pinfunction "PPHV") (pintype "passive") (tstamp be4c7175-9770-451f-bfc9-d3f163f7ca5f))
     (pad "F2" smd circle (at -0.2 0.8 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp d4b29a30-390c-4813-ab79-da43c63ddec2))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp d4b29a30-390c-4813-ab79-da43c63ddec2))
     (pad "F3" smd circle (at 0.2 0.8 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp a035d6a9-202b-433d-9a49-9aa2e24fafed))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp a035d6a9-202b-433d-9a49-9aa2e24fafed))
     (pad "F4" smd circle (at 0.6 0.8 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1401 "/USBC3/OVP") (pinfunction "OVP") (pintype "passive") (tstamp b046d672-20a2-4da6-8bee-609578f3197e))
+      (net 1393 "/USBC3/OVP") (pinfunction "OVP") (pintype "passive") (tstamp b046d672-20a2-4da6-8bee-609578f3197e))
     (pad "G1" smd circle (at -0.6 1.2 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1405 "/USBC3/SINK") (pinfunction "EN0") (pintype "input") (tstamp 8f70fc3d-a009-4281-bb70-2108a3d51f2f))
+      (net 1397 "/USBC3/SINK") (pinfunction "EN0") (pintype "input") (tstamp 8f70fc3d-a009-4281-bb70-2108a3d51f2f))
     (pad "G2" smd circle (at -0.2 1.2 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 755f6dfa-518e-4b87-9e1e-824611b2ccfc))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 755f6dfa-518e-4b87-9e1e-824611b2ccfc))
     (pad "G3" smd circle (at 0.2 1.2 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
-      (net 1269 "/USBC3/VLDO") (pinfunction "VLDO") (pintype "power_out") (tstamp 3d44ac80-55de-471b-b2b1-d01495ab9483))
+      (net 1261 "/USBC3/VLDO") (pinfunction "VLDO") (pintype "power_out") (tstamp 3d44ac80-55de-471b-b2b1-d01495ab9483))
     (pad "G4" smd circle (at 0.6 1.2 180) (size 0.23 0.23) (layers "F.Cu" "F.Mask")
       (net 4 "+3V3") (pinfunction "VIN") (pintype "power_in") (tstamp 2f2d0a25-1cbe-4927-a4bb-7f5cc6866b0a))
   )
@@ -29034,7 +29026,7 @@
     (pad "1" smd roundrect (at -0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp bd1ecd21-9e58-4830-bc9f-1c847260101a))
     (pad "2" smd roundrect (at 0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1418 "VCCCORE") (pintype "passive") (tstamp 1dacd8c6-9c56-41b3-9143-0404032c084f))
+      (net 1410 "VCCCORE") (pintype "passive") (tstamp 1dacd8c6-9c56-41b3-9143-0404032c084f))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -29162,7 +29154,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp aacd98cf-c63c-42dd-baeb-21f34f0b67f2))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp db6f98e3-16fa-483b-b407-52a6e2fb0763))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1222 "/CPU_POWER/MODE11") (pintype "passive") (tstamp 23463a50-63a5-4495-94cd-438ea75958c0))
+      (net 1214 "/CPU_POWER/MODE11") (pintype "passive") (tstamp 23463a50-63a5-4495-94cd-438ea75958c0))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp bceba4ec-a5e2-4462-92dd-4f63d825cae5))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -29218,7 +29210,7 @@
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 1149c025-411d-4962-bdd5-326b30dd6ce4))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1420 "/VCCINAUX/SLEW") (pintype "passive") (tstamp cba1831b-10b3-47b1-a7d2-18deed9c9e0b))
+      (net 1412 "/VCCINAUX/SLEW") (pintype "passive") (tstamp cba1831b-10b3-47b1-a7d2-18deed9c9e0b))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -29447,7 +29439,7 @@
     (fp_line (start 0.5 0.25) (end -0.5 0.25)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 5286a01e-08a6-4d2e-b785-76956e71bd14))
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1242 "/CHARGER/ACN") (pintype "passive") (tstamp 83c6acd9-3dae-449e-9e47-3a0708560173))
+      (net 1234 "/CHARGER/ACN") (pintype "passive") (tstamp 83c6acd9-3dae-449e-9e47-3a0708560173))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 3114379f-9335-4512-9955-cbd7fb29fc5d))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -29502,9 +29494,9 @@
     (fp_line (start 1 0.6) (end -1 0.6)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9b4cb56a-8696-4cb7-b845-bc63ebe11cac))
     (pad "1" smd roundrect (at -0.8375 0 180) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1243 "Net-(Q1-D)") (pintype "passive") (tstamp 7f5bd922-1aa4-4797-aa6c-4de46cb7ac14))
+      (net 1235 "Net-(Q1-D)") (pintype "passive") (tstamp 7f5bd922-1aa4-4797-aa6c-4de46cb7ac14))
     (pad "2" smd roundrect (at 0.8375 0 180) (size 0.775 1.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1245 "/CHARGER/VIN") (pintype "passive") (tstamp 98add03b-42ed-4c8a-937a-9de260ec02b9))
+      (net 1237 "/CHARGER/VIN") (pintype "passive") (tstamp 98add03b-42ed-4c8a-937a-9de260ec02b9))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -29670,11 +29662,11 @@
     (fp_line (start 0.67 1.1) (end -0.68 1.1)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 36073fea-4a8c-4242-a51a-7516f104b129))
     (pad "1" smd rect (at -1 -0.65 90) (size 0.45 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1351 "/USBC2/EN_CHARGE") (pinfunction "G") (pintype "input") (tstamp 9a7c017f-f83f-4162-b22f-7dd3f71cba66))
+      (net 1343 "/USBC2/EN_CHARGE") (pinfunction "G") (pintype "input") (tstamp 9a7c017f-f83f-4162-b22f-7dd3f71cba66))
     (pad "2" smd rect (at -1 0.65 90) (size 0.45 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "S") (pintype "passive") (tstamp 4bd22f79-e1b8-4073-8ee0-dcf6d2b2b0ab))
     (pad "3" smd rect (at 1 0 90) (size 0.45 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1392 "Net-(Q12-D)") (pinfunction "D") (pintype "passive") (tstamp 5a4416ea-c5ec-4da5-9aa9-3540244e0193))
+      (net 1384 "Net-(Q12-D)") (pinfunction "D") (pintype "passive") (tstamp 5a4416ea-c5ec-4da5-9aa9-3540244e0193))
     (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-323_SC-70.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -29830,17 +29822,17 @@
     (pad "1" smd rect (at -2.695 -1.27 180) (size 0.85 1.92) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 800 "+VSW") (pinfunction "VIN") (pintype "passive") (solder_paste_margin -0.12) (tstamp bc03ca68-35ef-4136-bc46-e8574c6cd20c))
     (pad "3" smd rect (at -2.695 0.635 90) (size 0.65 0.85) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1413 "Net-(U26-DRVH)") (pinfunction "TG") (pintype "passive") (solder_paste_margin -0.12) (tstamp c39048c5-fb3e-40a6-8429-fb0dfef7c03e))
+      (net 1405 "Net-(U26-DRVH)") (pinfunction "TG") (pintype "passive") (solder_paste_margin -0.12) (tstamp c39048c5-fb3e-40a6-8429-fb0dfef7c03e))
     (pad "4" smd rect (at -2.695 1.905 90) (size 0.65 0.85) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1412 "Net-(U26-SW)") (pinfunction "TG") (pintype "passive") (solder_paste_margin -0.12) (tstamp c20ec98f-45b0-4109-b4dc-ca9c58f9d088))
+      (net 1404 "Net-(U26-SW)") (pinfunction "TG") (pintype "passive") (solder_paste_margin -0.12) (tstamp c20ec98f-45b0-4109-b4dc-ca9c58f9d088))
     (pad "5" smd rect (at 2.695 1.905 90) (size 0.65 0.85) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1414 "Net-(Q14-BG)") (pinfunction "BG") (pintype "passive") (solder_paste_margin -0.12) (tstamp b0f67974-4933-475b-8170-86d9a2a6632c))
+      (net 1406 "Net-(Q14-BG)") (pinfunction "BG") (pintype "passive") (solder_paste_margin -0.12) (tstamp b0f67974-4933-475b-8170-86d9a2a6632c))
     (pad "6" smd rect (at 2.695 0.635 90) (size 0.65 0.85) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1415 "Net-(L4-Pad1)") (pinfunction "VSW") (pintype "passive") (solder_paste_margin -0.12) (tstamp 1744c95b-1d1d-434e-96cb-0276c4509d24))
+      (net 1407 "Net-(L4-Pad1)") (pinfunction "VSW") (pintype "passive") (solder_paste_margin -0.12) (tstamp 1744c95b-1d1d-434e-96cb-0276c4509d24))
     (pad "7" smd rect (at 2.695 -0.635 90) (size 0.65 0.85) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1415 "Net-(L4-Pad1)") (pinfunction "VSW") (pintype "passive") (solder_paste_margin -0.12) (tstamp 41fb5df4-ecc5-4eec-a43c-f7abb2b63036))
+      (net 1407 "Net-(L4-Pad1)") (pinfunction "VSW") (pintype "passive") (solder_paste_margin -0.12) (tstamp 41fb5df4-ecc5-4eec-a43c-f7abb2b63036))
     (pad "8" smd rect (at 2.695 -1.905 90) (size 0.65 0.85) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1415 "Net-(L4-Pad1)") (pinfunction "VSW") (pintype "passive") (solder_paste_margin -0.12) (tstamp 4806b433-f66f-40ba-a51d-bf7b11a1a660))
+      (net 1407 "Net-(L4-Pad1)") (pinfunction "VSW") (pintype "passive") (solder_paste_margin -0.12) (tstamp 4806b433-f66f-40ba-a51d-bf7b11a1a660))
     (pad "9" smd rect (at -1.125 -2.4025 180) (size 0.4 0.491) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "PGND") (pintype "passive") (solder_paste_margin -0.0295) (tstamp c7594b30-7af0-4b03-a425-5a8773061ab5))
     (pad "9" smd rect (at -1.125 2.4025 180) (size 0.4 0.491) (layers "F.Cu" "F.Paste" "F.Mask")
@@ -30009,7 +30001,7 @@
     (pad "1" smd roundrect (at -0.32 0 90) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 13e4ea47-327a-45bc-a2b1-2b5089319686))
     (pad "2" smd roundrect (at 0.32 0 90) (size 0.46 0.4) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1295 "/USBC2/RXC2-") (pinfunction "A2") (pintype "passive") (tstamp ca011dd2-db77-49d7-80b0-c1e877ce8738))
+      (net 1287 "/USBC2/RXC2-") (pinfunction "A2") (pintype "passive") (tstamp ca011dd2-db77-49d7-80b0-c1e877ce8738))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -30113,7 +30105,7 @@
     (pad "1" smd roundrect (at -0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp a4291fb9-626e-4962-9286-650d07bfccec))
     (pad "2" smd roundrect (at 0.45 0) (size 0.45 0.5) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1417 "VCCGT") (pintype "passive") (tstamp 71649212-cde7-4845-ac00-4b44f58e98be))
+      (net 1409 "VCCGT") (pintype "passive") (tstamp 71649212-cde7-4845-ac00-4b44f58e98be))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -30166,7 +30158,7 @@
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 81 "/USBC2/VBUS") (pintype "passive") (tstamp e7cbaf89-d9e0-4603-8120-e1a89c72217a))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1400 "/USBC2/OVP") (pintype "passive") (tstamp 4e738eef-e9bb-4a83-b471-dc69a7844849))
+      (net 1392 "/USBC2/OVP") (pintype "passive") (tstamp 4e738eef-e9bb-4a83-b471-dc69a7844849))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -30217,9 +30209,9 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 6e618ef0-b74a-4870-aa8f-522bae803a2b))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 402454ae-1f11-4291-80ac-5254046e7529))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1387 "Net-(Q7-G)") (pintype "passive") (tstamp bc002c1f-9030-452d-a413-52db8d0a7d33))
+      (net 1379 "Net-(Q7-G)") (pintype "passive") (tstamp bc002c1f-9030-452d-a413-52db8d0a7d33))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1391 "Net-(Q11-D)") (pintype "passive") (tstamp b69d9ef6-2b19-4f11-ae9c-5016e7e9650e))
+      (net 1383 "Net-(Q11-D)") (pintype "passive") (tstamp b69d9ef6-2b19-4f11-ae9c-5016e7e9650e))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -30321,9 +30313,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 3e5f85e3-c8cf-4296-add0-45b2be95530e))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 536e69f7-d610-4899-afa3-b5f8e210fea1))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1408 "Net-(D36-Pad1)") (pintype "passive") (tstamp 19a7492d-d7d3-47a5-8c50-d3e1758f682a))
+      (net 1400 "Net-(D36-Pad1)") (pintype "passive") (tstamp 19a7492d-d7d3-47a5-8c50-d3e1758f682a))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1410 "/EC/BATTERY") (pintype "passive") (tstamp ae5ba4ce-cd4b-49d5-a9d4-7fabd1a1e882))
+      (net 1402 "/EC/BATTERY") (pintype "passive") (tstamp ae5ba4ce-cd4b-49d5-a9d4-7fabd1a1e882))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -30374,9 +30366,9 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 770111c6-6bbf-4434-9cd5-cfcbc3f1c14e))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 4efbf6cb-d8d7-411e-ae83-a8856e01c8ee))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1209 "+1V8") (pintype "passive") (tstamp 28b5f398-2ba1-42b1-8fe3-a3f4164ffae7))
+      (net 1201 "+1V8") (pintype "passive") (tstamp 28b5f398-2ba1-42b1-8fe3-a3f4164ffae7))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1353 "/C_LEFT_SDA") (pintype "passive") (tstamp 2b0c753d-2cf1-412c-829f-82e3902e1420))
+      (net 1330 "/C_LEFT_SCL") (pintype "passive") (tstamp 2b0c753d-2cf1-412c-829f-82e3902e1420))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -30531,7 +30523,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp c7319a43-7c88-43f9-bd38-c04e3a004198))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp cb333840-801c-4a14-a1a2-5cc6b544dbdb))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1305 "/USBC0/TXC1+") (pintype "passive") (tstamp 7b3295f9-7dcd-453c-9cf8-f623ebd980ff))
+      (net 1297 "/USBC0/TXC1+") (pintype "passive") (tstamp 7b3295f9-7dcd-453c-9cf8-f623ebd980ff))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
       (net 431 "/CPU_USB/USBC0.TX+1") (pintype "passive") (tstamp ea7b614a-0ee3-4952-b4b4-24ea936e9d68))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -30582,9 +30574,9 @@
     (fp_line (start 0.3 0.15) (end -0.3 0.15)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 9e1e9b80-f952-4008-b21a-fd66a46b2f5f))
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1305 "/USBC0/TXC1+") (pintype "passive") (tstamp 54d76da8-4412-4b32-95a1-ef0f9bffb099))
+      (net 1297 "/USBC0/TXC1+") (pintype "passive") (tstamp 54d76da8-4412-4b32-95a1-ef0f9bffb099))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1304 "/USBC0/TXJ1+") (pintype "passive") (tstamp 3c25943b-fb1f-4cf6-a049-9fc59d8a82e0))
+      (net 1296 "/USBC0/TXJ1+") (pintype "passive") (tstamp 3c25943b-fb1f-4cf6-a049-9fc59d8a82e0))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -30634,9 +30626,9 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp b022c8e3-eaf3-486e-ad90-701340c836fc))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "F.Paste") (roundrect_rratio 0.25) (tstamp 8df9ce66-2b30-433a-9938-d1887fdb6221))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1238 "/CHARGER/COMP1") (pintype "passive") (tstamp ea681126-8c11-4906-bb90-d907cb153857))
+      (net 1230 "/CHARGER/COMP1") (pintype "passive") (tstamp ea681126-8c11-4906-bb90-d907cb153857))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "F.Cu" "F.Mask") (roundrect_rratio 0.25)
-      (net 1237 "Net-(C66-Pad1)") (pintype "passive") (tstamp d1c53558-6bca-447a-8153-b482526ea0ee))
+      (net 1229 "Net-(C66-Pad1)") (pintype "passive") (tstamp d1c53558-6bca-447a-8153-b482526ea0ee))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -30696,49 +30688,49 @@
     (pad "A1" smd rect (at -2.75 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp e25e1856-0342-4a45-9369-7c78d1aec22e))
     (pad "A2" smd rect (at -2.25 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1316 "/USBC3/TXJ1+") (pinfunction "TX1+") (pintype "bidirectional") (tstamp 15dff2fb-530a-4b71-b511-4be8644c276b))
+      (net 1308 "/USBC3/TXJ1+") (pinfunction "TX1+") (pintype "bidirectional") (tstamp 15dff2fb-530a-4b71-b511-4be8644c276b))
     (pad "A3" smd rect (at -1.75 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1314 "/USBC3/TXJ1-") (pinfunction "TX1-") (pintype "bidirectional") (tstamp 3dbdddf1-9fe0-40ab-a362-f21b829e3ad9))
+      (net 1306 "/USBC3/TXJ1-") (pinfunction "TX1-") (pintype "bidirectional") (tstamp 3dbdddf1-9fe0-40ab-a362-f21b829e3ad9))
     (pad "A4" smd rect (at -1.25 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp bda290aa-8d5e-4de6-9b4d-e2e59963dc21))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp bda290aa-8d5e-4de6-9b4d-e2e59963dc21))
     (pad "A5" smd rect (at -0.75 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1374 "/USBC3/C_CC1") (pinfunction "CC1") (pintype "bidirectional") (tstamp e6e00fff-f040-4bb3-8c6c-2c82d5ad05b4))
+      (net 1366 "/USBC3/C_CC1") (pinfunction "CC1") (pintype "bidirectional") (tstamp e6e00fff-f040-4bb3-8c6c-2c82d5ad05b4))
     (pad "A6" smd rect (at -0.25 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 463 "/CPU_USB/USBC3.D+") (pinfunction "D+") (pintype "bidirectional") (tstamp 27a437d7-601a-477c-a7f3-d0ac38da5a32))
     (pad "A7" smd rect (at 0.25 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 464 "/CPU_USB/USBC3.D-") (pinfunction "D-") (pintype "bidirectional") (tstamp 2915b64e-0f78-453d-90a4-e11c3a3d6866))
     (pad "A8" smd rect (at 0.75 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1375 "/USBC3/C_SBU1") (pinfunction "SBU1") (pintype "bidirectional") (tstamp 65696694-18b5-4ffd-9895-2eb7aab453ec))
+      (net 1367 "/USBC3/C_SBU1") (pinfunction "SBU1") (pintype "bidirectional") (tstamp 65696694-18b5-4ffd-9895-2eb7aab453ec))
     (pad "A9" smd rect (at 1.25 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 64a62ccc-1d4f-4cfb-8efb-089b7340c749))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 64a62ccc-1d4f-4cfb-8efb-089b7340c749))
     (pad "A10" smd rect (at 1.75 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1298 "/USBC3/RXJ2-") (pinfunction "RX2-") (pintype "bidirectional") (tstamp defe0ea5-60a6-41f8-8747-abc8781e84dd))
+      (net 1290 "/USBC3/RXJ2-") (pinfunction "RX2-") (pintype "bidirectional") (tstamp defe0ea5-60a6-41f8-8747-abc8781e84dd))
     (pad "A11" smd rect (at 2.25 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1300 "/USBC3/RXJ2+") (pinfunction "RX2+") (pintype "bidirectional") (tstamp f1e11bbe-c798-48be-a8bb-67819b7fd028))
+      (net 1292 "/USBC3/RXJ2+") (pinfunction "RX2+") (pintype "bidirectional") (tstamp f1e11bbe-c798-48be-a8bb-67819b7fd028))
     (pad "A12" smd rect (at 2.75 -5.02 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp 3b4f5dcb-d4ca-4d10-a071-ae0f2694e4b0))
     (pad "B1" smd rect (at 2.5 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp fe558467-d407-4006-8d22-10a9f92fd43a))
     (pad "B2" smd rect (at 2 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1332 "/USBC3/TXJ2+") (pinfunction "TX2+") (pintype "bidirectional") (tstamp 34fa7aa8-e34d-4b2b-87ef-413122df6337))
+      (net 1324 "/USBC3/TXJ2+") (pinfunction "TX2+") (pintype "bidirectional") (tstamp 34fa7aa8-e34d-4b2b-87ef-413122df6337))
     (pad "B3" smd rect (at 1.5 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1330 "/USBC3/TXJ2-") (pinfunction "TX2-") (pintype "bidirectional") (tstamp bbfa1d1e-df52-40c1-99d5-72a4361bfbc2))
+      (net 1322 "/USBC3/TXJ2-") (pinfunction "TX2-") (pintype "bidirectional") (tstamp bbfa1d1e-df52-40c1-99d5-72a4361bfbc2))
     (pad "B4" smd rect (at 1 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 80741bc0-cd63-4c83-bd6e-f4cb17086ae8))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 80741bc0-cd63-4c83-bd6e-f4cb17086ae8))
     (pad "B5" smd rect (at 0.5 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1376 "/USBC3/C_CC2") (pinfunction "CC2") (pintype "bidirectional") (tstamp 9d756739-ce90-4f8c-812e-dc00a55dce48))
+      (net 1368 "/USBC3/C_CC2") (pinfunction "CC2") (pintype "bidirectional") (tstamp 9d756739-ce90-4f8c-812e-dc00a55dce48))
     (pad "B6" smd rect (at 0 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 463 "/CPU_USB/USBC3.D+") (pinfunction "D+") (pintype "bidirectional") (tstamp 4b1edd50-932b-46af-9821-ce3b427d0b14))
     (pad "B7" smd rect (at -0.5 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 464 "/CPU_USB/USBC3.D-") (pinfunction "D-") (pintype "bidirectional") (tstamp 959e1f41-47f4-4488-82ca-c093b423e19d))
     (pad "B8" smd rect (at -1 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1377 "/USBC3/C_SBU2") (pinfunction "SBU2") (pintype "bidirectional") (tstamp 8e7c2477-7133-4222-8763-aae1b8231413))
+      (net 1369 "/USBC3/C_SBU2") (pinfunction "SBU2") (pintype "bidirectional") (tstamp 8e7c2477-7133-4222-8763-aae1b8231413))
     (pad "B9" smd rect (at -1.5 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1263 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 605c1d8e-6a55-47ce-a5d7-02edcca2a224))
+      (net 1255 "/USBC3/VBUS") (pinfunction "VBUS") (pintype "passive") (tstamp 605c1d8e-6a55-47ce-a5d7-02edcca2a224))
     (pad "B10" smd rect (at -2 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1276 "/USBC3/RXJ1-") (pinfunction "RX1-") (pintype "bidirectional") (tstamp 02fb0005-5b2a-4357-817d-9efba35acdb2))
+      (net 1268 "/USBC3/RXJ1-") (pinfunction "RX1-") (pintype "bidirectional") (tstamp 02fb0005-5b2a-4357-817d-9efba35acdb2))
     (pad "B11" smd rect (at -2.5 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
-      (net 1284 "/USBC3/RXJ1+") (pinfunction "RX1+") (pintype "bidirectional") (tstamp 93b47179-ef6a-454e-85b9-8922923f41e8))
+      (net 1276 "/USBC3/RXJ1+") (pinfunction "RX1+") (pintype "bidirectional") (tstamp 93b47179-ef6a-454e-85b9-8922923f41e8))
     (pad "B12" smd rect (at -3 -3.32 90) (size 0.3 0.7) (layers "F.Cu" "F.Paste" "F.Mask")
       (net 2 "GND") (pinfunction "GND") (pintype "passive") (tstamp 11acd61b-3eed-451b-b633-ca2fc4a83cd5))
     (pad "S1" smd roundrect (at -5 2.85 90) (size 1 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -30816,7 +30808,7 @@
     (fp_line (start 0.8 0.4) (end -0.8 0.4)
       (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4ddea3d2-9201-4387-972b-a772a3ccfc3c))
     (pad "1" smd roundrect (at -0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 1268 "/USBC2/VLDO") (pintype "passive") (tstamp 3ad8a45c-4996-4685-9f01-88b2f26a2ddf))
+      (net 1260 "/USBC2/VLDO") (pintype "passive") (tstamp 3ad8a45c-4996-4685-9f01-88b2f26a2ddf))
     (pad "2" smd roundrect (at 0.7 0 180) (size 0.65 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 23cd01ba-6b96-46b7-bb72-fe20d4a340a7))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
@@ -30867,9 +30859,9 @@
     (fp_line (start 0.3 0.15) (end 0.3 -0.15)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp abc0165f-a954-46aa-87d7-27cbd1feda19))
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1325 "/USBC1/TXC2+") (pintype "passive") (tstamp beaba96b-22b0-47bd-90b9-bf8efc477877))
+      (net 1317 "/USBC1/TXC2+") (pintype "passive") (tstamp beaba96b-22b0-47bd-90b9-bf8efc477877))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1324 "/USBC1/TXJ2+") (pintype "passive") (tstamp 6aed9c54-4949-4161-ae02-ad1239d7c462))
+      (net 1316 "/USBC1/TXJ2+") (pintype "passive") (tstamp 6aed9c54-4949-4161-ae02-ad1239d7c462))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -30920,7 +30912,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 9b448198-6d61-4830-8127-2e1e7ae810c6))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp fc8ad6a7-397f-46fc-b340-3d47677e618e))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1271 "/USBC0/RXC1-") (pintype "passive") (tstamp d56b1af0-c8dd-435e-9918-4930ff400373))
+      (net 1263 "/USBC0/RXC1-") (pintype "passive") (tstamp d56b1af0-c8dd-435e-9918-4930ff400373))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 436 "/CPU_USB/USBC0.RX-1") (pintype "passive") (tstamp cd880125-4b41-4b66-a6a5-10e9ce0e47b3))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -30973,7 +30965,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp a3ea7c59-047b-4993-a4b5-7f091b7ee59d))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp a8e1c197-aaed-4321-a1ce-41ac97817184))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1323 "/USBC1/TXC2-") (pintype "passive") (tstamp 28311efb-00b8-471c-a1c9-0f4d9e07ec92))
+      (net 1315 "/USBC1/TXC2-") (pintype "passive") (tstamp 28311efb-00b8-471c-a1c9-0f4d9e07ec92))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 419 "/CPU_USB/USBC1.TX-2") (pintype "passive") (tstamp 33e7836f-8d76-47da-994d-92c5713e35b2))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -31029,7 +31021,7 @@
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 8cd6d205-4ed0-4524-b1f0-69049a7ab4c8))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp b704b06d-3d77-4ef7-bd27-7bcaf4ca09a4))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp b704b06d-3d77-4ef7-bd27-7bcaf4ca09a4))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -31082,7 +31074,7 @@
     (fp_line (start 0.5 0.25) (end 0.5 -0.25)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 904ae9d0-f304-46fd-9cb7-52efb6d5d7a3))
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1218 "+1V1") (pintype "passive") (tstamp ae02aec5-20fe-49d2-bd55-3bf5031d43ad))
+      (net 1210 "+1V1") (pintype "passive") (tstamp ae02aec5-20fe-49d2-bd55-3bf5031d43ad))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 0afd626f-c6fe-4ab6-b769-737706f52b20))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -31142,7 +31134,7 @@
     (pad "1" smd roundrect (at -0.32 0 270) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp d95e65f3-c837-4630-bb92-3de4bd761b7d))
     (pad "2" smd roundrect (at 0.32 0 270) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1279 "/USBC0/RXC1+") (pinfunction "A2") (pintype "passive") (tstamp c953f3b5-14b3-45ee-b533-fefabde26876))
+      (net 1271 "/USBC0/RXC1+") (pinfunction "A2") (pintype "passive") (tstamp c953f3b5-14b3-45ee-b533-fefabde26876))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -31193,7 +31185,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 7b9e8aaa-b1ff-4c54-9db9-19456ce8849d))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 1a74969c-212b-4035-8949-77d9aa6735c3))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1329 "/USBC2/TXC2+") (pintype "passive") (tstamp 470f00d0-2289-42df-aecf-0f8ad7bb1542))
+      (net 1321 "/USBC2/TXC2+") (pintype "passive") (tstamp 470f00d0-2289-42df-aecf-0f8ad7bb1542))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 441 "/CPU_USB/USBC2.TX+2") (pintype "passive") (tstamp d3072f47-72d1-4b77-9ef0-a5f38e6a7f43))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -31300,7 +31292,7 @@
     (pad "1" smd roundrect (at -0.7 0 180) (size 0.65 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 98130742-509e-4b7f-81c4-4cf0703b38c3))
     (pad "2" smd roundrect (at 0.7 0 180) (size 0.65 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp 7d24b397-66ea-493c-8de7-865b6c373ed0))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp 7d24b397-66ea-493c-8de7-865b6c373ed0))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -31354,7 +31346,7 @@
     (pad "1" smd roundrect (at -0.7 0 180) (size 0.65 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp cb9c28d4-f5b2-485f-9442-3786fcf714e6))
     (pad "2" smd roundrect (at 0.7 0 180) (size 0.65 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp 5fbf4d72-1520-496e-86d9-1c77cfc156d4))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp 5fbf4d72-1520-496e-86d9-1c77cfc156d4))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -31407,7 +31399,7 @@
     (fp_line (start 0.5 0.25) (end 0.5 -0.25)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1377937a-2e8a-40e3-b85f-3d06ee9bfd18))
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1218 "+1V1") (pintype "passive") (tstamp 6e29fc89-3353-4b3e-acf2-b7de39e9e3b2))
+      (net 1210 "+1V1") (pintype "passive") (tstamp 6e29fc89-3353-4b3e-acf2-b7de39e9e3b2))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 5c7b282c-6183-401d-8089-0c0cf59326be))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -31458,9 +31450,9 @@
     (fp_line (start 0.3 0.15) (end 0.3 -0.15)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d77b34d3-8b5c-4d20-8fa1-eba929356168))
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1275 "/USBC2/RXC1-") (pintype "passive") (tstamp 22d41c81-d83e-4116-8037-52dc7973189c))
+      (net 1267 "/USBC2/RXC1-") (pintype "passive") (tstamp 22d41c81-d83e-4116-8037-52dc7973189c))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1274 "/USBC2/RXJ1-") (pintype "passive") (tstamp 5bcdbd81-9a27-4530-88e1-428f50f5c197))
+      (net 1266 "/USBC2/RXJ1-") (pintype "passive") (tstamp 5bcdbd81-9a27-4530-88e1-428f50f5c197))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -31518,7 +31510,7 @@
     (pad "1" smd roundrect (at -0.32 0 270) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp ae692847-7a20-445e-87b9-3f361377f772))
     (pad "2" smd roundrect (at 0.32 0 270) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1281 "/USBC1/RXC1+") (pinfunction "A2") (pintype "passive") (tstamp 32b3018d-071e-46d6-a163-703e3b2f9c1c))
+      (net 1273 "/USBC1/RXC1+") (pinfunction "A2") (pintype "passive") (tstamp 32b3018d-071e-46d6-a163-703e3b2f9c1c))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -31569,7 +31561,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 88c990e5-01ae-4714-a70d-5a68eff8e5de))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 0dac2e58-66f2-42f5-814f-f3708834ba54))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1272 "/USBC1/RXJ1-") (pintype "passive") (tstamp 157e2d41-53c7-4c25-849b-2db0d69a7641))
+      (net 1264 "/USBC1/RXJ1-") (pintype "passive") (tstamp 157e2d41-53c7-4c25-849b-2db0d69a7641))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp dfae61b3-050c-434b-a47a-1abd9db72012))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -31625,7 +31617,7 @@
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 651fbdf0-cecd-4bbe-a035-336eb701d111))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp 84b0af29-8f29-4e19-bdf1-5d7d507942cc))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp 84b0af29-8f29-4e19-bdf1-5d7d507942cc))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -31683,7 +31675,7 @@
     (pad "1" smd roundrect (at -0.32 0 90) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 957c13e2-4ffa-4798-9959-d152c49781a5))
     (pad "2" smd roundrect (at 0.32 0 90) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1321 "/USBC0/TXC2+") (pinfunction "A2") (pintype "passive") (tstamp 78ce7176-3a35-467e-80fd-dab46e4874c9))
+      (net 1313 "/USBC0/TXC2+") (pinfunction "A2") (pintype "passive") (tstamp 78ce7176-3a35-467e-80fd-dab46e4874c9))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -31732,9 +31724,9 @@
     (fp_line (start 0.3 0.15) (end 0.3 -0.15)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1c4ff555-b650-40eb-8e1f-b08b25745845))
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1333 "/USBC3/TXC2+") (pintype "passive") (tstamp b7b0ea45-89b7-42a6-bf96-0ab03a05345a))
+      (net 1325 "/USBC3/TXC2+") (pintype "passive") (tstamp b7b0ea45-89b7-42a6-bf96-0ab03a05345a))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1332 "/USBC3/TXJ2+") (pintype "passive") (tstamp f28c56ce-6e06-47c7-adf6-3449e6f71437))
+      (net 1324 "/USBC3/TXJ2+") (pintype "passive") (tstamp f28c56ce-6e06-47c7-adf6-3449e6f71437))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -31785,7 +31777,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp bd64648b-4db8-4744-abce-9b18ae30fe80))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 0be4e2df-d4bc-4e2e-9419-c19d15330e28))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1274 "/USBC2/RXJ1-") (pintype "passive") (tstamp 3815b1e9-2835-4279-bfbd-6aac07c4675a))
+      (net 1266 "/USBC2/RXJ1-") (pintype "passive") (tstamp 3815b1e9-2835-4279-bfbd-6aac07c4675a))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp f5077cbb-2e7a-4a94-9479-7ba2547aa768))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -31845,7 +31837,7 @@
     (pad "1" smd roundrect (at -0.32 0 90) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 6b7ad844-368f-46c4-833e-2dfafb34c30f))
     (pad "2" smd roundrect (at 0.32 0 90) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1285 "/USBC3/RXC1+") (pinfunction "A2") (pintype "passive") (tstamp 5d83f6f5-f251-44fa-b03a-afb50adf6570))
+      (net 1277 "/USBC3/RXC1+") (pinfunction "A2") (pintype "passive") (tstamp 5d83f6f5-f251-44fa-b03a-afb50adf6570))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -31949,7 +31941,7 @@
     (fp_line (start 0.5 0.25) (end 0.5 -0.25)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 37a4bc28-c756-49e9-ab5d-c35bc685439e))
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1218 "+1V1") (pintype "passive") (tstamp 80019777-fa96-48c3-9f3d-64561feb9141))
+      (net 1210 "+1V1") (pintype "passive") (tstamp 80019777-fa96-48c3-9f3d-64561feb9141))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 0c94b1e9-56a0-4af1-9cc3-e37325ddfadc))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -32009,7 +32001,7 @@
     (pad "1" smd roundrect (at -0.32 0 90) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp f44b333b-c7eb-46eb-9d8d-a88b05de5157))
     (pad "2" smd roundrect (at 0.32 0 90) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1271 "/USBC0/RXC1-") (pinfunction "A2") (pintype "passive") (tstamp 8930dabf-f74e-4619-bc30-5cad4879b95a))
+      (net 1263 "/USBC0/RXC1-") (pinfunction "A2") (pintype "passive") (tstamp 8930dabf-f74e-4619-bc30-5cad4879b95a))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -32067,7 +32059,7 @@
     (pad "1" smd roundrect (at -0.32 0 270) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp df9e5b02-68d1-4788-8594-c8d0d7cd0dd8))
     (pad "2" smd roundrect (at 0.32 0 270) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1323 "/USBC1/TXC2-") (pinfunction "A2") (pintype "passive") (tstamp bf3a7c88-c3b1-4bd0-98ef-65c51d480d27))
+      (net 1315 "/USBC1/TXC2-") (pinfunction "A2") (pintype "passive") (tstamp bf3a7c88-c3b1-4bd0-98ef-65c51d480d27))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -32169,7 +32161,7 @@
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 623e6974-b27d-4ee4-888b-011e97316439))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1263 "/USBC3/VBUS") (pintype "passive") (tstamp de828deb-ab34-41bd-bdc7-2287238808eb))
+      (net 1255 "/USBC3/VBUS") (pintype "passive") (tstamp de828deb-ab34-41bd-bdc7-2287238808eb))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -32227,7 +32219,7 @@
     (pad "1" smd roundrect (at -0.32 0 270) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 7bad6c17-4b1d-409a-935e-4a793b781a1a))
     (pad "2" smd roundrect (at 0.32 0 270) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1333 "/USBC3/TXC2+") (pinfunction "A2") (pintype "passive") (tstamp 0564d0ed-e9ae-4c8c-a50d-c7f1c99f0012))
+      (net 1325 "/USBC3/TXC2+") (pinfunction "A2") (pintype "passive") (tstamp 0564d0ed-e9ae-4c8c-a50d-c7f1c99f0012))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -32278,7 +32270,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 2f860486-3f2c-4a29-b5d7-e69340b93879))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 5e3bd8f6-9c08-4548-8383-0da9850b814a))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1270 "/USBC0/RXJ1-") (pintype "passive") (tstamp 5dd46422-497c-4302-9179-e6f7b2595434))
+      (net 1262 "/USBC0/RXJ1-") (pintype "passive") (tstamp 5dd46422-497c-4302-9179-e6f7b2595434))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp d2b9e56f-0b54-4e14-8dc4-f304b7a32dab))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -32331,7 +32323,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 8eb91897-9f89-4389-8bdc-0ee388241e0f))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 773e91f7-3433-4060-bb9c-a13864714981))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1282 "/USBC2/RXJ1+") (pintype "passive") (tstamp d5041979-4edd-4c74-a61c-a19ec8c90b13))
+      (net 1274 "/USBC2/RXJ1+") (pintype "passive") (tstamp d5041979-4edd-4c74-a61c-a19ec8c90b13))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 3b1f55a3-18f0-4699-9dfa-baf2662a53a4))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -32382,9 +32374,9 @@
     (fp_line (start 0.3 0.15) (end 0.3 -0.15)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e51406f2-38d3-48ce-857e-289a1fe9242a))
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1321 "/USBC0/TXC2+") (pintype "passive") (tstamp 83529b4d-cd61-48c5-992a-4bbd2b1fde86))
+      (net 1313 "/USBC0/TXC2+") (pintype "passive") (tstamp 83529b4d-cd61-48c5-992a-4bbd2b1fde86))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1320 "/USBC0/TXJ2+") (pintype "passive") (tstamp 8f50dcdd-1a16-4955-bb66-5e7f06a67a7c))
+      (net 1312 "/USBC0/TXJ2+") (pintype "passive") (tstamp 8f50dcdd-1a16-4955-bb66-5e7f06a67a7c))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -32442,7 +32434,7 @@
     (pad "1" smd roundrect (at -0.32 0 270) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 0a04579a-5f59-4ce5-8c25-623d60a84afd))
     (pad "2" smd roundrect (at 0.32 0 270) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1319 "/USBC0/TXC2-") (pinfunction "A2") (pintype "passive") (tstamp 99a2944b-5a50-49ff-acb7-9c5ee54c1386))
+      (net 1311 "/USBC0/TXC2-") (pinfunction "A2") (pintype "passive") (tstamp 99a2944b-5a50-49ff-acb7-9c5ee54c1386))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -32493,7 +32485,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp eff9a0c3-fa8c-489b-b966-b446bdc992bf))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp d294d2cb-6af3-4916-b9eb-91c84077a986))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1330 "/USBC3/TXJ2-") (pintype "passive") (tstamp 6e2c1740-c843-4d61-8332-2b9cd5f11e52))
+      (net 1322 "/USBC3/TXJ2-") (pintype "passive") (tstamp 6e2c1740-c843-4d61-8332-2b9cd5f11e52))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 31b0f207-f785-489f-9705-efd8eea23a4a))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -32544,9 +32536,9 @@
     (fp_line (start 0.3 0.15) (end 0.3 -0.15)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6522130c-feb0-4140-b4f5-8e1d06cc8645))
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1273 "/USBC1/RXC1-") (pintype "passive") (tstamp 203698a8-cc3c-43d6-b8f2-554a8a2b6d03))
+      (net 1265 "/USBC1/RXC1-") (pintype "passive") (tstamp 203698a8-cc3c-43d6-b8f2-554a8a2b6d03))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1272 "/USBC1/RXJ1-") (pintype "passive") (tstamp a5169b72-69e9-4a25-8a8a-75051e3892de))
+      (net 1264 "/USBC1/RXJ1-") (pintype "passive") (tstamp a5169b72-69e9-4a25-8a8a-75051e3892de))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -32597,7 +32589,7 @@
     (pad "1" smd roundrect (at -0.25 0 90) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 4b973782-7cc3-436a-a3de-30b6e1a6f843))
     (pad "2" smd roundrect (at 0.25 0 90) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1263 "/USBC3/VBUS") (pintype "passive") (tstamp 47eda95e-285c-4bf3-97f3-f38b813865fd))
+      (net 1255 "/USBC3/VBUS") (pintype "passive") (tstamp 47eda95e-285c-4bf3-97f3-f38b813865fd))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -32655,7 +32647,7 @@
     (pad "1" smd roundrect (at -0.32 0 90) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 9c912be7-784f-4d15-b48c-02ad632e5e1d))
     (pad "2" smd roundrect (at 0.32 0 90) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1325 "/USBC1/TXC2+") (pinfunction "A2") (pintype "passive") (tstamp e4b10e10-169b-40e5-a6d0-455f960ea320))
+      (net 1317 "/USBC1/TXC2+") (pinfunction "A2") (pintype "passive") (tstamp e4b10e10-169b-40e5-a6d0-455f960ea320))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -32706,7 +32698,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp c7db12c6-18e8-4c7a-bf63-eb449fdc6ff9))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 412906c6-6b3f-4f03-a9e4-6067f62f345d))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1331 "/USBC3/TXC2-") (pintype "passive") (tstamp e939908b-047d-4959-9b3f-dc139002ea4a))
+      (net 1323 "/USBC3/TXC2-") (pintype "passive") (tstamp e939908b-047d-4959-9b3f-dc139002ea4a))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 454 "/CPU_USB/USBC3.TX-2") (pintype "passive") (tstamp 769d8bed-4b2c-427a-8e0b-dac516a9eacb))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -32761,7 +32753,7 @@
     (fp_line (start 0.5 0.25) (end 0.5 -0.25)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c4e37616-919b-4b99-b9ab-c6de4f24f527))
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1218 "+1V1") (pintype "passive") (tstamp e9c453d8-fe7d-433c-ad2b-0c420073a06a))
+      (net 1210 "+1V1") (pintype "passive") (tstamp e9c453d8-fe7d-433c-ad2b-0c420073a06a))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 416f1d71-1bc0-4881-99c6-b05cf3434f99))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -32814,7 +32806,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 0ddc2467-c736-44f8-8dd4-225d45b53d0f))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp d59ff031-6bbc-48ae-abf7-68666f7b0e51))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1332 "/USBC3/TXJ2+") (pintype "passive") (tstamp c71851de-f71b-49b4-907b-15a7a639ca7b))
+      (net 1324 "/USBC3/TXJ2+") (pintype "passive") (tstamp c71851de-f71b-49b4-907b-15a7a639ca7b))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 1dbd9269-d3ff-478e-bb9c-f7af388cb3b0))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -32976,7 +32968,7 @@
     (pad "1" smd roundrect (at -0.32 0 270) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 89428489-7d48-42f2-8d85-ced637eab879))
     (pad "2" smd roundrect (at 0.32 0 270) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1329 "/USBC2/TXC2+") (pinfunction "A2") (pintype "passive") (tstamp 636ef85e-fa6c-467a-9944-8c1997f0bad2))
+      (net 1321 "/USBC2/TXC2+") (pinfunction "A2") (pintype "passive") (tstamp 636ef85e-fa6c-467a-9944-8c1997f0bad2))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -33027,7 +33019,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp fd8c3a61-c695-4fb5-9d28-e59d2be16970))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp df8ec49b-10a5-4d00-83e8-8466d188ee5d))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1333 "/USBC3/TXC2+") (pintype "passive") (tstamp 6257cc27-0977-4072-9c23-a804b29782fc))
+      (net 1325 "/USBC3/TXC2+") (pintype "passive") (tstamp 6257cc27-0977-4072-9c23-a804b29782fc))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 451 "/CPU_USB/USBC3.TX+2") (pintype "passive") (tstamp 943f8b68-0fbe-4205-b62b-c87062c31664))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -33078,9 +33070,9 @@
     (fp_line (start 0.3 0.15) (end 0.3 -0.15)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 02efd048-14cc-4932-b239-5d8a66334d65))
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1271 "/USBC0/RXC1-") (pintype "passive") (tstamp 12d99365-a047-4dbd-aea4-fb0e67e1b7d0))
+      (net 1263 "/USBC0/RXC1-") (pintype "passive") (tstamp 12d99365-a047-4dbd-aea4-fb0e67e1b7d0))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1270 "/USBC0/RXJ1-") (pintype "passive") (tstamp d0bcf850-7fa9-445a-9c7f-8414bf0bdefc))
+      (net 1262 "/USBC0/RXJ1-") (pintype "passive") (tstamp d0bcf850-7fa9-445a-9c7f-8414bf0bdefc))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -33133,7 +33125,7 @@
     (fp_line (start 0.5 0.25) (end 0.5 -0.25)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c671acbd-6529-46cd-b59f-c129cfb27ef8))
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1218 "+1V1") (pintype "passive") (tstamp 62099738-95f5-422f-9be6-aa1019e84901))
+      (net 1210 "+1V1") (pintype "passive") (tstamp 62099738-95f5-422f-9be6-aa1019e84901))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 560eae5b-bc98-44a9-8942-6d6a46867869))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -33186,7 +33178,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 2cb434d1-b441-49eb-8852-7742b344afd7))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 2efcfbca-d1e4-40fb-997e-d9874bf2c40b))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1273 "/USBC1/RXC1-") (pintype "passive") (tstamp 4d33b67b-d594-4b5c-be16-a099972ece5d))
+      (net 1265 "/USBC1/RXC1-") (pintype "passive") (tstamp 4d33b67b-d594-4b5c-be16-a099972ece5d))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 426 "/CPU_USB/USBC1.RX-1") (pintype "passive") (tstamp f4df2bd5-2c2d-432e-b9ed-9cd6a13f3ae5))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -33237,9 +33229,9 @@
     (fp_line (start 0.3 0.15) (end 0.3 -0.15)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c25f19da-7b89-4521-809b-e69170e892a9))
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1281 "/USBC1/RXC1+") (pintype "passive") (tstamp d3462237-c2bb-4e74-99ee-54cde94e9832))
+      (net 1273 "/USBC1/RXC1+") (pintype "passive") (tstamp d3462237-c2bb-4e74-99ee-54cde94e9832))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1280 "/USBC1/RXJ1+") (pintype "passive") (tstamp 3b11bbbb-1f20-4dcd-8b2d-44edcce475c5))
+      (net 1272 "/USBC1/RXJ1+") (pintype "passive") (tstamp 3b11bbbb-1f20-4dcd-8b2d-44edcce475c5))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -33293,7 +33285,7 @@
     (pad "1" smd roundrect (at -0.7 0 180) (size 0.65 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp f6c81fa9-bbe5-4c84-b636-58f5fe969cd7))
     (pad "2" smd roundrect (at 0.7 0 180) (size 0.65 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp e150d4cc-ff57-4fd1-bfe6-d22a01271fd0))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp e150d4cc-ff57-4fd1-bfe6-d22a01271fd0))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -33346,7 +33338,7 @@
     (fp_line (start 0.5 0.25) (end 0.5 -0.25)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp e63c0d76-ac10-4f7b-87a3-f3878c79d3b3))
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1218 "+1V1") (pintype "passive") (tstamp f0fd722c-7616-4799-bafd-7895200328f4))
+      (net 1210 "+1V1") (pintype "passive") (tstamp f0fd722c-7616-4799-bafd-7895200328f4))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 34944b77-a199-449f-859c-d61e23989cc0))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -33397,9 +33389,9 @@
     (fp_line (start 0.3 0.15) (end 0.3 -0.15)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 11aed993-6257-435e-8df2-9d50a1d9aa13))
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1319 "/USBC0/TXC2-") (pintype "passive") (tstamp 24451f8a-8449-4177-a932-a311c415f487))
+      (net 1311 "/USBC0/TXC2-") (pintype "passive") (tstamp 24451f8a-8449-4177-a932-a311c415f487))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1318 "/USBC0/TXJ2-") (pintype "passive") (tstamp 96aaa327-8f63-4dc6-ae23-aa0db8b2852a))
+      (net 1310 "/USBC0/TXJ2-") (pintype "passive") (tstamp 96aaa327-8f63-4dc6-ae23-aa0db8b2852a))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -33453,7 +33445,7 @@
     (pad "1" smd roundrect (at -0.7 0 180) (size 0.65 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 8fb38d09-21b2-4229-acee-48b6c649cb74))
     (pad "2" smd roundrect (at 0.7 0 180) (size 0.65 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp a1c0cd8c-7c24-44f7-9e72-dac053f5944c))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp a1c0cd8c-7c24-44f7-9e72-dac053f5944c))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -33502,9 +33494,9 @@
     (fp_line (start 0.3 0.15) (end 0.3 -0.15)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 3936832b-2680-4da0-a1b7-026cc97fb492))
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1279 "/USBC0/RXC1+") (pintype "passive") (tstamp adb69fd6-8f4c-4466-b4e8-6471563c6480))
+      (net 1271 "/USBC0/RXC1+") (pintype "passive") (tstamp adb69fd6-8f4c-4466-b4e8-6471563c6480))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1278 "/USBC0/RXJ1+") (pintype "passive") (tstamp 4ce08198-62c7-48fd-974c-6bed34bec85c))
+      (net 1270 "/USBC0/RXJ1+") (pintype "passive") (tstamp 4ce08198-62c7-48fd-974c-6bed34bec85c))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -33658,7 +33650,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 00e309e0-f785-42d0-a668-8e80fd44658b))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp bcfdb2e4-4775-4450-b966-f87f634239f7))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1328 "/USBC2/TXJ2+") (pintype "passive") (tstamp 6ef5d119-da6d-4eb8-a227-63ff1823830b))
+      (net 1320 "/USBC2/TXJ2+") (pintype "passive") (tstamp 6ef5d119-da6d-4eb8-a227-63ff1823830b))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 12544c44-03a5-43f2-9948-19241d92b22f))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -33714,7 +33706,7 @@
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp cbeba95f-bd63-4931-a747-84088adf461c))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp fcaa4569-0fd3-445a-ad7e-8aaf24bf3783))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp fcaa4569-0fd3-445a-ad7e-8aaf24bf3783))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -33765,7 +33757,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp cec843e3-974f-4390-ab62-04de9b95d570))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 55565ff0-5e79-4d4d-aa10-3db2262af7f9))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1319 "/USBC0/TXC2-") (pintype "passive") (tstamp 048ab277-0daf-4f89-baf0-17eba3e7598c))
+      (net 1311 "/USBC0/TXC2-") (pintype "passive") (tstamp 048ab277-0daf-4f89-baf0-17eba3e7598c))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 429 "/CPU_USB/USBC0.TX-2") (pintype "passive") (tstamp 893bc617-3a3f-4828-a259-99f7b787108e))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -33820,7 +33812,7 @@
     (fp_line (start 0.5 0.25) (end 0.5 -0.25)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ef44b88a-5a63-415d-9cf2-cda39f87984c))
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1218 "+1V1") (pintype "passive") (tstamp 03091da5-242f-46ca-8522-22676b5cd61c))
+      (net 1210 "+1V1") (pintype "passive") (tstamp 03091da5-242f-46ca-8522-22676b5cd61c))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 2b6fee0e-4d50-487a-b50b-e91e8b92551c))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -33873,7 +33865,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 775d2d55-d4e2-439e-859b-4060119e82b1))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 8cbbecae-3fa4-43ad-b85a-3499a3211132))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1321 "/USBC0/TXC2+") (pintype "passive") (tstamp 26817f5e-9b0c-4f48-92a3-b166b5ac9dbf))
+      (net 1313 "/USBC0/TXC2+") (pintype "passive") (tstamp 26817f5e-9b0c-4f48-92a3-b166b5ac9dbf))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 425 "/CPU_USB/USBC0.TX+2") (pintype "passive") (tstamp 30e02fa4-cd2b-4ac9-9d4a-6bb76ca965dc))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -33924,9 +33916,9 @@
     (fp_line (start 0.3 0.15) (end 0.3 -0.15)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 6c116abe-b6a1-4ac8-9192-7f8e6e778052))
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1329 "/USBC2/TXC2+") (pintype "passive") (tstamp 9c175d34-32a4-4dda-830b-f3038b7c73a9))
+      (net 1321 "/USBC2/TXC2+") (pintype "passive") (tstamp 9c175d34-32a4-4dda-830b-f3038b7c73a9))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1328 "/USBC2/TXJ2+") (pintype "passive") (tstamp 176d4bb9-97d3-4e2e-9ce4-dd2ae94f6d02))
+      (net 1320 "/USBC2/TXJ2+") (pintype "passive") (tstamp 176d4bb9-97d3-4e2e-9ce4-dd2ae94f6d02))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -33980,7 +33972,7 @@
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp f9eb5f49-df05-49e0-b869-1198441d9666))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp 54392bc7-ca82-4b36-be1d-d94e62084097))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp 54392bc7-ca82-4b36-be1d-d94e62084097))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -34031,7 +34023,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 24b52977-cd6c-460e-8d7c-4decb8388692))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 3fc64d8b-e537-4d95-bc96-77bc21b9598f))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1318 "/USBC0/TXJ2-") (pintype "passive") (tstamp 357b9286-ab43-4198-8074-67d2881554e1))
+      (net 1310 "/USBC0/TXJ2-") (pintype "passive") (tstamp 357b9286-ab43-4198-8074-67d2881554e1))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 451fd4ce-7c2b-4dd8-8ee6-192f156574dd))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -34091,7 +34083,7 @@
     (pad "1" smd roundrect (at -0.32 0 90) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 8fe703fc-0807-4820-b302-ef785029c001))
     (pad "2" smd roundrect (at 0.32 0 90) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1283 "/USBC2/RXC1+") (pinfunction "A2") (pintype "passive") (tstamp 103e4fea-926a-4209-925b-6d3215eb6591))
+      (net 1275 "/USBC2/RXC1+") (pinfunction "A2") (pintype "passive") (tstamp 103e4fea-926a-4209-925b-6d3215eb6591))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -34142,7 +34134,7 @@
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp e8f1a9ca-76bf-40f0-881e-f1d4860ddd93))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1263 "/USBC3/VBUS") (pintype "passive") (tstamp 8b58bd75-4af4-4bdb-9f39-cbd188be517e))
+      (net 1255 "/USBC3/VBUS") (pintype "passive") (tstamp 8b58bd75-4af4-4bdb-9f39-cbd188be517e))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -34193,7 +34185,7 @@
     (pad "1" smd roundrect (at -0.25 0 270) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 53c73343-9dd4-4840-ac9c-6865399c8138))
     (pad "2" smd roundrect (at 0.25 0 270) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1263 "/USBC3/VBUS") (pintype "passive") (tstamp 9b80fe0b-f365-4c64-baf5-725a9b49a4f1))
+      (net 1255 "/USBC3/VBUS") (pintype "passive") (tstamp 9b80fe0b-f365-4c64-baf5-725a9b49a4f1))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -34244,7 +34236,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp eb155f4b-a7c3-4b77-8b88-50e3e4bb0495))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 6bbd0fec-aa9a-44d4-b37c-e24fd9e54e5a))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1280 "/USBC1/RXJ1+") (pintype "passive") (tstamp 3604e55d-a600-4370-ae64-18f5e487b30a))
+      (net 1272 "/USBC1/RXJ1+") (pintype "passive") (tstamp 3604e55d-a600-4370-ae64-18f5e487b30a))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 7fd87193-430d-47a3-b699-ff01d121a0e9))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -34304,7 +34296,7 @@
     (pad "1" smd roundrect (at -0.32 0 90) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 34f0f7d7-500c-403f-b639-8a4f974949df))
     (pad "2" smd roundrect (at 0.32 0 90) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1327 "/USBC2/TXC2-") (pinfunction "A2") (pintype "passive") (tstamp d3911313-7266-4624-afe4-fb7c3bf9a338))
+      (net 1319 "/USBC2/TXC2-") (pinfunction "A2") (pintype "passive") (tstamp d3911313-7266-4624-afe4-fb7c3bf9a338))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -34357,7 +34349,7 @@
     (fp_line (start 0.5 0.25) (end 0.5 -0.25)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 32711880-96ea-438e-be93-7bc1e6b0e8ce))
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1218 "+1V1") (pintype "passive") (tstamp 27d34ca8-c7c4-4d23-9acb-54d6086837f5))
+      (net 1210 "+1V1") (pintype "passive") (tstamp 27d34ca8-c7c4-4d23-9acb-54d6086837f5))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 01ddbce0-0b84-4248-a627-7381115328e8))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -34412,7 +34404,7 @@
     (fp_line (start 0.5 0.25) (end 0.5 -0.25)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 13aab4c7-c4b3-4407-8043-9c4abb52f54b))
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1218 "+1V1") (pintype "passive") (tstamp 24db12ec-9e7e-4b15-a155-9e62d27c8d5d))
+      (net 1210 "+1V1") (pintype "passive") (tstamp 24db12ec-9e7e-4b15-a155-9e62d27c8d5d))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 1f986ff2-7b15-4d42-b810-ab0486f68887))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -34465,7 +34457,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 4b0fd6de-f1f7-4160-8425-e3a107fc992f))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 87fe356f-76d6-48d7-8aaa-2e88cdeecae8))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1320 "/USBC0/TXJ2+") (pintype "passive") (tstamp 6467b5cf-3c64-4f25-9e89-a67a62995b55))
+      (net 1312 "/USBC0/TXJ2+") (pintype "passive") (tstamp 6467b5cf-3c64-4f25-9e89-a67a62995b55))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 6770f0fc-b6d9-4c2c-b920-5b7ff11acfd1))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -34518,7 +34510,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 3362618a-ffa0-435f-bb83-421e48a9d742))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 9109537f-0124-4380-a473-34aefcaabcc7))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1322 "/USBC1/TXJ2-") (pintype "passive") (tstamp 0b72392a-48ca-445b-85ca-9d3f8bdcca5a))
+      (net 1314 "/USBC1/TXJ2-") (pintype "passive") (tstamp 0b72392a-48ca-445b-85ca-9d3f8bdcca5a))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp d5e556c9-d4ad-4fc2-9af8-8e8dbef61850))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -34574,7 +34566,7 @@
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 18f591f0-f159-4a8f-a8de-1a7714ab5ece))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp a9650062-9b8f-4735-806d-f080b8282e06))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp a9650062-9b8f-4735-806d-f080b8282e06))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -34623,9 +34615,9 @@
     (fp_line (start 0.3 0.15) (end 0.3 -0.15)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 343f17d9-01b6-4672-bb12-ba2615733328))
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1285 "/USBC3/RXC1+") (pintype "passive") (tstamp 670bbcfb-f9d7-47d8-98a6-193153112b6c))
+      (net 1277 "/USBC3/RXC1+") (pintype "passive") (tstamp 670bbcfb-f9d7-47d8-98a6-193153112b6c))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1284 "/USBC3/RXJ1+") (pintype "passive") (tstamp 719fa2a5-d13b-4606-b247-c4692a536a64))
+      (net 1276 "/USBC3/RXJ1+") (pintype "passive") (tstamp 719fa2a5-d13b-4606-b247-c4692a536a64))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -34734,7 +34726,7 @@
     (pad "1" smd roundrect (at -0.32 0 90) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp a08a604f-020e-4166-af5e-c63cc1e93863))
     (pad "2" smd roundrect (at 0.32 0 90) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1273 "/USBC1/RXC1-") (pinfunction "A2") (pintype "passive") (tstamp 40eef9f3-ded2-4671-bd67-660bc4b1fdb9))
+      (net 1265 "/USBC1/RXC1-") (pinfunction "A2") (pintype "passive") (tstamp 40eef9f3-ded2-4671-bd67-660bc4b1fdb9))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -34836,7 +34828,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 649e343a-45cc-4830-955a-c410178cdda9))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp a9178b8b-8c11-4fca-ae2c-776a8dd6576d))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1278 "/USBC0/RXJ1+") (pintype "passive") (tstamp e56a69d6-70ee-411c-96f7-5b753ded3024))
+      (net 1270 "/USBC0/RXJ1+") (pintype "passive") (tstamp e56a69d6-70ee-411c-96f7-5b753ded3024))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 512054b2-b38b-45bc-8123-950681d78a90))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -34940,7 +34932,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp e60f9f37-4602-4bfc-b7c2-50b77adfb142))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 8916eba8-b906-48da-8edc-b92622f54019))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1326 "/USBC2/TXJ2-") (pintype "passive") (tstamp 66af1c42-dfc9-4f75-88ef-7deba2841d64))
+      (net 1318 "/USBC2/TXJ2-") (pintype "passive") (tstamp 66af1c42-dfc9-4f75-88ef-7deba2841d64))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 6984ea63-7ded-4166-9a65-f573f409f129))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -34993,7 +34985,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 644afc53-1618-495b-b6b4-32eed5a6be40))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp e9e00d5f-c9de-4397-95bc-1e86cd95d4d8))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1281 "/USBC1/RXC1+") (pintype "passive") (tstamp aecfd555-9404-428e-a1dd-c0b88ac93f55))
+      (net 1273 "/USBC1/RXC1+") (pintype "passive") (tstamp aecfd555-9404-428e-a1dd-c0b88ac93f55))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 427 "/CPU_USB/USBC1.RX+1") (pintype "passive") (tstamp 5b24ba06-3a4f-4ea1-aceb-45d077119158))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -35044,9 +35036,9 @@
     (fp_line (start 0.3 0.15) (end 0.3 -0.15)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f45322ab-a3d0-4730-b7c5-43827790930e))
     (pad "1" smd roundrect (at -0.25 0 180) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1323 "/USBC1/TXC2-") (pintype "passive") (tstamp 9ec780eb-be55-4b9c-8245-40fa769bef5f))
+      (net 1315 "/USBC1/TXC2-") (pintype "passive") (tstamp 9ec780eb-be55-4b9c-8245-40fa769bef5f))
     (pad "2" smd roundrect (at 0.25 0 180) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1322 "/USBC1/TXJ2-") (pintype "passive") (tstamp 76350cdb-9dff-4246-babe-8d0c04a342aa))
+      (net 1314 "/USBC1/TXJ2-") (pintype "passive") (tstamp 76350cdb-9dff-4246-babe-8d0c04a342aa))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -35097,7 +35089,7 @@
     (pad "" smd roundrect (at -0.295 0 90) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp e3d726c9-59a8-4ec9-8d48-ad878dcfb429))
     (pad "" smd roundrect (at 0.295 0 90) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 1c8ad2fb-409c-4770-9de3-5c4e446ce389))
     (pad "1" smd roundrect (at -0.27 0 90) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1276 "/USBC3/RXJ1-") (pintype "passive") (tstamp 7a882fa9-bc95-4dff-9a67-5a1b6cf04eaa))
+      (net 1268 "/USBC3/RXJ1-") (pintype "passive") (tstamp 7a882fa9-bc95-4dff-9a67-5a1b6cf04eaa))
     (pad "2" smd roundrect (at 0.27 0 90) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 2140e9a6-eb81-4d4c-bddf-26284d356c60))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -35208,7 +35200,7 @@
     (pad "1" smd roundrect (at -0.32 0 270) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 30a7c88a-396c-4a37-9123-9d15cffc7785))
     (pad "2" smd roundrect (at 0.32 0 270) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1277 "/USBC3/RXC1-") (pinfunction "A2") (pintype "passive") (tstamp 831c80f3-3e03-4d69-a730-93aceec56050))
+      (net 1269 "/USBC3/RXC1-") (pinfunction "A2") (pintype "passive") (tstamp 831c80f3-3e03-4d69-a730-93aceec56050))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -35259,7 +35251,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp bc3df77a-419e-4ba3-8d90-6dc1779a5459))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 7a7bceac-4071-4f36-bc1e-02196d7b468e))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1324 "/USBC1/TXJ2+") (pintype "passive") (tstamp 66d7a95a-25b7-435c-b446-2b512d608e2c))
+      (net 1316 "/USBC1/TXJ2+") (pintype "passive") (tstamp 66d7a95a-25b7-435c-b446-2b512d608e2c))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp bd2aa7bd-0b83-4ffc-83c5-ecf7aa0f025c))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -35314,7 +35306,7 @@
     (fp_line (start 0.5 0.25) (end 0.5 -0.25)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 59381020-52bb-404c-84fb-4540c730ad66))
     (pad "1" smd roundrect (at -0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1218 "+1V1") (pintype "passive") (tstamp 1d7c92c0-19b9-4d8c-a65c-bf89dc3905a9))
+      (net 1210 "+1V1") (pintype "passive") (tstamp 1d7c92c0-19b9-4d8c-a65c-bf89dc3905a9))
     (pad "2" smd roundrect (at 0.45 0 180) (size 0.45 0.5) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 81440e74-5c5c-40aa-b11a-1b02e4272a72))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0402_1005Metric.wrl"
@@ -35367,7 +35359,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 225d6b25-1e99-41f6-9643-de9df372d1ef))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 70554739-b3af-4bcd-ba13-51b90477c899))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1277 "/USBC3/RXC1-") (pintype "passive") (tstamp 9e8eeaa0-43f7-4fe3-9f4b-20a2c20470e9))
+      (net 1269 "/USBC3/RXC1-") (pintype "passive") (tstamp 9e8eeaa0-43f7-4fe3-9f4b-20a2c20470e9))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 452 "/CPU_USB/USBC3.RX-1") (pintype "passive") (tstamp a8b9f0e1-dbc8-4126-a095-d34a5a52a2f1))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -35420,7 +35412,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 510efcd5-8caf-4759-a613-3375e2f2236b))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 53cdb852-8210-4b4d-ab66-6cf9e0a65665))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1283 "/USBC2/RXC1+") (pintype "passive") (tstamp 77683970-c90a-424c-8fcf-ef2175a5c806))
+      (net 1275 "/USBC2/RXC1+") (pintype "passive") (tstamp 77683970-c90a-424c-8fcf-ef2175a5c806))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 443 "/CPU_USB/USBC2.RX+1") (pintype "passive") (tstamp b9e512f2-2d07-43fd-b4f6-ed964b7fc5bf))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -35473,7 +35465,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp a3cb403a-53fe-4736-8d24-fda2f59b74a3))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 55c166e9-ae31-47cb-acb0-c33302e6d7de))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1327 "/USBC2/TXC2-") (pintype "passive") (tstamp 8e91e461-f7a4-4fde-9c83-e829e047c510))
+      (net 1319 "/USBC2/TXC2-") (pintype "passive") (tstamp 8e91e461-f7a4-4fde-9c83-e829e047c510))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 444 "/CPU_USB/USBC2.TX-2") (pintype "passive") (tstamp 0bbc0f5e-c5f7-41b0-829d-aea91b0ca21c))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -35526,7 +35518,7 @@
     (pad "" smd roundrect (at -0.295 0 270) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp c06cc5fc-a1d3-4c56-a78c-2783524641db))
     (pad "" smd roundrect (at 0.295 0 270) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp f2153006-a479-4dec-b24c-610138005455))
     (pad "1" smd roundrect (at -0.27 0 270) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1284 "/USBC3/RXJ1+") (pintype "passive") (tstamp a6212538-d017-4bbd-b472-1941e09e3a80))
+      (net 1276 "/USBC3/RXJ1+") (pintype "passive") (tstamp a6212538-d017-4bbd-b472-1941e09e3a80))
     (pad "2" smd roundrect (at 0.27 0 270) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 9ded48bf-1f58-4e06-8c09-ea0dbb8c21af))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -35577,9 +35569,9 @@
     (fp_line (start 0.3 0.15) (end 0.3 -0.15)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 52f96a2f-bb39-47e3-9837-0d1b0d7ef998))
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1283 "/USBC2/RXC1+") (pintype "passive") (tstamp 28f80f72-94ce-4778-8067-3fd159a6c090))
+      (net 1275 "/USBC2/RXC1+") (pintype "passive") (tstamp 28f80f72-94ce-4778-8067-3fd159a6c090))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1282 "/USBC2/RXJ1+") (pintype "passive") (tstamp 259c299c-ed2a-4cf8-b0b2-773da3c78713))
+      (net 1274 "/USBC2/RXJ1+") (pintype "passive") (tstamp 259c299c-ed2a-4cf8-b0b2-773da3c78713))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -35739,7 +35731,7 @@
     (pad "1" smd roundrect (at -0.32 0 270) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp c755b05d-8460-46b5-9536-8e1736f5aab2))
     (pad "2" smd roundrect (at 0.32 0 270) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1275 "/USBC2/RXC1-") (pinfunction "A2") (pintype "passive") (tstamp 28831ccc-7f20-4149-b3db-f846dd7fd4bd))
+      (net 1267 "/USBC2/RXC1-") (pinfunction "A2") (pintype "passive") (tstamp 28831ccc-7f20-4149-b3db-f846dd7fd4bd))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -35790,7 +35782,7 @@
     (pad "" smd roundrect (at -0.295 0 180) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 03a73e39-233b-412b-9b86-67fdb3c5eeaa))
     (pad "" smd roundrect (at 0.295 0 180) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp a3983924-0545-4cf3-bad4-e53c1f44876a))
     (pad "1" smd roundrect (at -0.27 0 180) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1285 "/USBC3/RXC1+") (pintype "passive") (tstamp bacaba34-de58-47b3-a241-9cdf4a6fd3a5))
+      (net 1277 "/USBC3/RXC1+") (pintype "passive") (tstamp bacaba34-de58-47b3-a241-9cdf4a6fd3a5))
     (pad "2" smd roundrect (at 0.27 0 180) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 453 "/CPU_USB/USBC3.RX+1") (pintype "passive") (tstamp 0924128a-6319-4d13-ab71-c41ae35bca17))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -35846,7 +35838,7 @@
     (pad "1" smd roundrect (at -0.7 0 180) (size 0.65 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pintype "passive") (tstamp 4f73326f-293a-4133-86b8-fbc8ac7ec009))
     (pad "2" smd roundrect (at 0.7 0 180) (size 0.65 0.8) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1416 "VCCINAUX") (pintype "passive") (tstamp aee9d7bb-4a10-4a38-a540-9ed935b2a707))
+      (net 1408 "VCCINAUX") (pintype "passive") (tstamp aee9d7bb-4a10-4a38-a540-9ed935b2a707))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -35897,7 +35889,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp f12e438d-c60b-470c-b77e-b2821ae60156))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp dac0e2a9-8e55-4a7f-b0ff-9cb3d6bf133c))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1275 "/USBC2/RXC1-") (pintype "passive") (tstamp f101805d-f2a3-46c5-8ddc-51061110fffc))
+      (net 1267 "/USBC2/RXC1-") (pintype "passive") (tstamp f101805d-f2a3-46c5-8ddc-51061110fffc))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 442 "/CPU_USB/USBC2.RX-1") (pintype "passive") (tstamp db08c9dd-809c-4e10-99b7-432818f8c2d8))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -35948,9 +35940,9 @@
     (fp_line (start 0.3 0.15) (end 0.3 -0.15)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 584ffe61-4072-456d-bbc7-fae46f9538f7))
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1327 "/USBC2/TXC2-") (pintype "passive") (tstamp 1a9284b0-912d-4f44-ba66-b0ac244e534a))
+      (net 1319 "/USBC2/TXC2-") (pintype "passive") (tstamp 1a9284b0-912d-4f44-ba66-b0ac244e534a))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1326 "/USBC2/TXJ2-") (pintype "passive") (tstamp d9d3b4c2-127c-4f93-a3f5-ec0e484a4c43))
+      (net 1318 "/USBC2/TXJ2-") (pintype "passive") (tstamp d9d3b4c2-127c-4f93-a3f5-ec0e484a4c43))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -35999,9 +35991,9 @@
     (fp_line (start 0.3 0.15) (end 0.3 -0.15)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d0fc98d0-7b05-4f69-9106-c1fc3865e24d))
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1277 "/USBC3/RXC1-") (pintype "passive") (tstamp a2c06f4d-4b86-4744-b593-d418b87cee5a))
+      (net 1269 "/USBC3/RXC1-") (pintype "passive") (tstamp a2c06f4d-4b86-4744-b593-d418b87cee5a))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1276 "/USBC3/RXJ1-") (pintype "passive") (tstamp d0aea7f7-f349-4f7c-989d-71c45a88fa74))
+      (net 1268 "/USBC3/RXJ1-") (pintype "passive") (tstamp d0aea7f7-f349-4f7c-989d-71c45a88fa74))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -36052,7 +36044,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 381fb84d-f895-45f2-9404-6a1661b54beb))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp cf3b3260-aae3-4a03-b61a-052883006f53))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1279 "/USBC0/RXC1+") (pintype "passive") (tstamp 328f7dfb-7de0-406b-8980-82277ddf9085))
+      (net 1271 "/USBC0/RXC1+") (pintype "passive") (tstamp 328f7dfb-7de0-406b-8980-82277ddf9085))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 437 "/CPU_USB/USBC0.RX+1") (pintype "passive") (tstamp 3ecbb0fb-c708-41df-9266-903a9ab9e29c))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -36103,9 +36095,9 @@
     (fp_line (start 0.3 0.15) (end 0.3 -0.15)
       (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c9f163c2-19ac-427a-9ddf-ae9130c951b9))
     (pad "1" smd roundrect (at -0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1331 "/USBC3/TXC2-") (pintype "passive") (tstamp 18c6601c-4b6c-41fa-98ce-74767d06d4cb))
+      (net 1323 "/USBC3/TXC2-") (pintype "passive") (tstamp 18c6601c-4b6c-41fa-98ce-74767d06d4cb))
     (pad "2" smd roundrect (at 0.25 0) (size 0.3 0.3) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25)
-      (net 1330 "/USBC3/TXJ2-") (pintype "passive") (tstamp 9dd53639-4639-4ec4-b2df-f7ccff1710cb))
+      (net 1322 "/USBC3/TXJ2-") (pintype "passive") (tstamp 9dd53639-4639-4ec4-b2df-f7ccff1710cb))
     (model "${KISYS3DMOD}/Capacitor_SMD.3dshapes/C_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -36163,7 +36155,7 @@
     (pad "1" smd roundrect (at -0.32 0 90) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 2 "GND") (pinfunction "A1") (pintype "passive") (tstamp 65562f1b-ce26-4b35-957c-d9dbce36e2f8))
     (pad "2" smd roundrect (at 0.32 0 90) (size 0.46 0.4) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1331 "/USBC3/TXC2-") (pinfunction "A2") (pintype "passive") (tstamp 9ff5d95a-cd9b-4027-ae59-c329bf7e028e))
+      (net 1323 "/USBC3/TXC2-") (pinfunction "A2") (pintype "passive") (tstamp 9ff5d95a-cd9b-4027-ae59-c329bf7e028e))
     (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_0201_0603Metric.wrl"
       (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -36214,7 +36206,7 @@
     (pad "" smd roundrect (at -0.295 0) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 343aad9c-ca64-4bf9-a17a-93d41b173332))
     (pad "" smd roundrect (at 0.295 0) (size 0.238 0.27) (layers "B.Paste") (roundrect_rratio 0.25) (tstamp 4db7de87-636b-4e8c-ae11-c06c633c9d5b))
     (pad "1" smd roundrect (at -0.27 0) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
-      (net 1325 "/USBC1/TXC2+") (pintype "passive") (tstamp ec1907db-2247-419b-a76d-52d7fc53e1e0))
+      (net 1317 "/USBC1/TXC2+") (pintype "passive") (tstamp ec1907db-2247-419b-a76d-52d7fc53e1e0))
     (pad "2" smd roundrect (at 0.27 0) (size 0.36 0.3) (layers "B.Cu" "B.Mask") (roundrect_rratio 0.25)
       (net 417 "/CPU_USB/USBC1.TX+2") (pintype "passive") (tstamp 24f7a1cc-fe20-4f1b-93e0-cff09644eb3b))
     (model "${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0201_0603Metric.wrl"
@@ -36844,210 +36836,210 @@
   (via (at 191.5186 141.9618) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 938) (tstamp b8a93d7c-2c32-4ba0-99fd-df1c1c70c5b3))
   (segment (start 191.6276 143.496) (end 191.2186 143.5118) (width 0.075) (layer "F.Cu") (net 939) (tstamp eda1bfdd-b1d4-4970-aca4-6a56c20cf380))
   (via (at 191.2186 143.5118) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 939) (tstamp f6ee6772-85c8-46ff-8813-a31177859a08))
-  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1263) (tstamp 0896fa8f-44dc-4f6c-84bb-7909546e2e6b))
-  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1263) (tstamp 0da37d8f-4590-41c6-ac2f-3e5d8cbe15ac))
-  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1263) (tstamp 1b15c8ff-b3e4-4c2d-86eb-b1ad9cf4eead))
-  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1263) (tstamp 207e86bb-d8e2-4aaa-90ba-ab96c90ef334))
-  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1263) (tstamp 3e25323e-6178-49a8-b96a-12f55f56a71a))
-  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1263) (tstamp 5e1610d2-39ad-4816-a4be-67d1e7b0adcc))
-  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1263) (tstamp 650cc613-df0d-4f19-9e5d-0671c8571df0))
-  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1263) (tstamp 65b73952-84b8-46cb-b58c-4eda84127d92))
-  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1263) (tstamp 68cc55bc-d3c2-4e83-bcb4-25f6cdcb9846))
-  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1263) (tstamp 808ac57a-e7b3-43e4-9769-0dab09651732))
-  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1263) (tstamp 880f97f8-afaf-4e0a-925d-103485430d87))
-  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1263) (tstamp 8cfcd02c-c6d8-4792-b4ab-d55a504400d9))
-  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1263) (tstamp 915b2fed-b520-46ed-a2a4-f0f17c71dc61))
-  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1263) (tstamp 9e7fb221-24e7-4bd4-9d3a-3d70c4c26888))
-  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1263) (tstamp a4d714ca-b149-42cf-9899-47971f202a1d))
-  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1263) (tstamp a9670ee4-1f60-4e5f-a706-27d78aa08c6a))
-  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1263) (tstamp ac0acb3d-8bed-43df-90b7-518f23c122c4))
-  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1263) (tstamp b2254475-1695-4ed9-b695-9596928d3b64))
-  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1263) (tstamp c8a09774-5251-4757-ac48-feacd199f5e3))
-  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1263) (tstamp ca89c779-fe40-4316-b0ba-59f5e4a39d08))
-  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1263) (tstamp cc91a8ae-fb6f-4f6d-94f3-938c8a349f45))
-  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1263) (tstamp df63de3f-03d6-4686-8e12-983033744f7b))
-  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1263) (tstamp fd484661-67e9-4f9d-b4bb-493cb1c8c205))
-  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1263) (tstamp fef1b4b7-408b-4291-825c-dff5e57e0d09))
-  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp 18ee7952-f1b1-40cb-82ca-8ae13221833d))
-  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp 1de9e5a3-a0e6-45d4-a30e-304c760c10ed))
-  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp 235a5346-6769-43d3-be16-b8902a3addf9))
-  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp 27fbbcd6-c437-4a8c-8ac4-49c517f327e4))
-  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp 2dac1e43-1148-4de6-a045-ace5c50d9cfe))
-  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp 2dd5888f-900f-4f50-b331-9c872193f4a1))
-  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp 3492183f-86e1-470a-9f17-c85f0b62a140))
-  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp 36acdbbf-b830-4506-b4b5-2ca73d9f1970))
-  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp 3fbeb927-b752-4aa7-8950-41e1e045968c))
-  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp 3fcccbe7-47eb-45f4-8931-003dac3fad6f))
-  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp 4ff25362-3d17-4803-9fa6-6c676f2cf057))
-  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp 6162d74e-7c16-447b-a58c-ac04d0a36c74))
-  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp 6d598036-43f3-4d32-a33d-d747d79c7765))
-  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp 85f4135d-4a85-4253-b9bf-1fd96e630485))
-  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp 942bded3-a196-471e-8c30-7e68e3d3b0ad))
-  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp a9c6bd2b-a7ef-4d2b-902a-02f7f3842573))
-  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp b3cd7818-de1f-41d6-93f8-d0a0a2af96eb))
-  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp b5b398f6-cd69-4f1c-a3b1-23a5bc4e5320))
-  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp b9a761bd-2ff9-4906-8c33-0ba6802373ae))
-  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp bf248671-a1be-4433-a449-b170a3140d95))
-  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp c23b1ca7-7c4d-44f5-b5f9-55adf482d81c))
-  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp d29a8467-fb0b-4cdc-8c76-5939329cd53d))
-  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp d3ffddd6-4c51-4ca0-9c00-0566b541c595))
-  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1263) (tstamp e6d891de-34ae-40df-8ca9-9991f9efb3ed))
-  (segment (start 40.82 155) (end 41.5 155) (width 0.2) (layer "F.Cu") (net 1364) (tstamp 483f2c83-78e5-4fbf-831b-8ef4900e2af8))
-  (segment (start 40.82 155) (end 41.5 155) (width 0.2) (layer "F.Cu") (net 1364) (tstamp 8bc830ec-b920-4c11-8a06-7ef9a6ea8843))
-  (segment (start 40.82 155) (end 41.5 155) (width 0.2) (layer "F.Cu") (net 1364) (tstamp eb885200-7114-421d-99b8-0b30a1276a11))
-  (via (at 41.5 155) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1364) (tstamp 2090a75c-243a-457a-a490-85a29531887b))
-  (via (at 41.5 155) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1364) (tstamp 7c75e6f0-2ef8-47a4-8c03-99ca560b7dc5))
-  (via (at 41.5 155) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1364) (tstamp d5cf189b-a4b0-49bd-ac35-810270b4f575))
-  (segment (start 40.82 153.5) (end 41.5 153.5) (width 0.2) (layer "F.Cu") (net 1365) (tstamp 5829a67d-debf-477b-a645-d481e172b4a5))
-  (segment (start 40.82 153.5) (end 41.5 153.5) (width 0.2) (layer "F.Cu") (net 1365) (tstamp 6cb19114-17d2-4456-87d0-9a36250d929b))
-  (segment (start 40.82 153.5) (end 41.5 153.5) (width 0.2) (layer "F.Cu") (net 1365) (tstamp e9cf82a0-d361-42c1-9f7d-39a08dcf0d27))
-  (via (at 41.5 153.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1365) (tstamp 09efb011-6657-4c5b-8006-5bad9665db0f))
-  (via (at 41.5 153.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1365) (tstamp 45eb554c-19e0-4c8e-b2c2-c9024be2fae9))
-  (via (at 41.5 153.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1365) (tstamp b4adfd9b-e21c-4f95-bac6-316048717e22))
-  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 203fe5f5-a5c3-44d4-8405-eb4d17bf7894))
-  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 2abf69de-8294-41ba-845a-2fa731592266))
-  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 2b487a13-6f5f-4327-87f0-42a039be7850))
-  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 374217f7-50fe-4889-bf30-613500082e0f))
-  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 8395fe67-6799-4932-9e02-77a9c2a2ef8c))
-  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 9c302e46-56c1-4251-90cb-6d9727ab768d))
-  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1368) (tstamp bfb7d512-f507-482b-878d-c5be15c62feb))
-  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1368) (tstamp caf9edfc-a1f4-42fc-aa55-a7df0a376fd8))
-  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1368) (tstamp d1d6cb3c-d23d-4e00-8c0f-c898704a3d87))
-  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1368) (tstamp f7524ae6-5fe3-445c-b10c-1cab32dea270))
-  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1368) (tstamp fe54a0ea-c15d-46a4-9199-46e84bf1f0eb))
-  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp 0952987d-fbbf-444d-811f-e24cbc72b8b6))
-  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp 17517ec2-a4a5-4471-bb4c-2f49c6d1ea61))
-  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp 1cfe97f2-2902-4409-8e7f-997b86370c76))
-  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp 1d8ab1b0-8ab6-481b-ba1c-52099896656b))
-  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp 1e6ba410-5e55-4a46-8ae1-e4930a8b3b0d))
-  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp 2ab86541-5572-4969-a688-e831d9ad14ae))
-  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp 3a1b254b-8064-412f-a336-6c39f7d100a1))
-  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp 9d089d1b-dd8a-4a2f-8fa1-c97560b3cd47))
-  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp ac7467d9-d006-479f-ba6e-57aaa4188da6))
-  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp c1ba51c2-0608-49b0-8dae-15a9a7515bee))
-  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp c9e0c53f-74d1-49f8-85e2-051f19faaec4))
-  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp 5aed2870-a81c-428e-bdbb-4c6bf0c73200))
-  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp 5e3a278d-5177-4eef-a5d0-0d2e15aeec04))
-  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp 6d05e711-99d9-446e-993b-df45cc7cdb69))
-  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp 721b5160-1102-405f-a5fb-e013801f7703))
-  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp 7f1942ae-a1de-4d84-a9cb-6048662c2ff3))
-  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp 829ab0e0-4231-4303-8f33-6bad8635e5d7))
-  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp 88e208e8-8832-492d-9b59-6f4e5196e64e))
-  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp a3a95ef6-5f08-4270-bba6-9428e2f74d53))
-  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp b8d91e70-f7a0-40b0-b0ab-499907d223ea))
-  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp e72b925a-f036-4219-a6af-03f45a255814))
-  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp fb444eeb-1b14-4155-892e-73144b8afa31))
-  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 44aea230-004b-41d9-a240-70e3c498ec11))
-  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 49a4d2e5-89ed-4960-b95e-b1163aa17ca5))
-  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 5cb6e94d-62d0-4b9c-afd8-745c4ffc2620))
-  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 616b6986-e54d-42dc-85b7-f972946e18bd))
-  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 6c7ffd22-d792-4a0f-83dc-a379c1b6b807))
-  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 77b1d0b6-fa73-41ee-9aa8-d2976baf28a6))
-  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 82178da7-b560-459f-bd63-82afcafbb55c))
-  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 989d53e0-625d-4d64-aa01-0b5d62fdefb9))
-  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp cc884a62-f3f8-4483-91a9-916623ca0204))
-  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp d7ef0f6d-0e44-44b9-8235-9d4fa7d3846a))
-  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp fee89348-5ba6-44bc-8192-fa3b8e74b406))
-  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1372) (tstamp 086e0679-8278-4a96-8273-cf91ec97e816))
-  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1372) (tstamp 0a7de384-a176-4881-a203-091fa7aef500))
-  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1372) (tstamp 10198dcc-04f5-4c92-b238-f63b2eed8572))
-  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1372) (tstamp 1a6ca81b-2786-478e-9f21-1fc460798af8))
-  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1372) (tstamp 373dafe2-863e-4ad4-810b-b92ba3cd6aeb))
-  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1372) (tstamp 460c929a-855d-4af9-ba84-ee7429cdb28a))
-  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1372) (tstamp 4c5b1875-1a7a-42c3-a66d-2815507a1bf3))
-  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1372) (tstamp 5e9c7a9c-fe9c-4b40-b2f6-46db6add7f9e))
-  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1372) (tstamp 7455887b-ec34-47c6-99f2-5ba2b93b89bd))
-  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1372) (tstamp 971789a8-8361-4395-8a1a-2ad6932fc13a))
-  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1372) (tstamp a40a5555-dce6-4ee3-9d3f-7ccea925d171))
-  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1372) (tstamp a70d0fdd-b1fb-4f0f-b3c5-67481cade1bb))
-  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1372) (tstamp b20dfce2-d0a8-4e0f-8d8d-4d709adb47eb))
-  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1372) (tstamp 0b4e08ff-123a-47e7-ab53-faa28bb116f4))
-  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1372) (tstamp 22bb68b7-54f6-4eb2-a346-290806e81da4))
-  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1372) (tstamp 59b36f47-41fb-47a7-a9f7-c555098e67fc))
-  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1372) (tstamp 5a546d65-c67d-491c-a944-7ef85448d458))
-  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1372) (tstamp 6cef468b-6c10-491b-881b-2ff00eee5292))
-  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1372) (tstamp 910e5e73-2f4b-4e03-a63d-efbf9e198667))
-  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1372) (tstamp aaf6a2b4-7c0d-4446-8f8a-c08927a4d042))
-  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1372) (tstamp b09596a0-8e34-46fe-ad0d-0c664211d672))
-  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1372) (tstamp b7bd838c-ccb2-49bc-9bd6-a3bb8fb540eb))
-  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1372) (tstamp bb0cbfd9-e6dd-4167-8b67-ee5148933034))
-  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1372) (tstamp c52070cc-a218-4e1e-b286-0ff99210bc82))
-  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1372) (tstamp ebba9c28-c15d-4d40-a169-d81f713b99a0))
-  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1372) (tstamp fb9851b3-220e-4a12-a4d9-09664196a988))
-  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1373) (tstamp 4e6f0773-9257-42a9-a0c4-54171c5a778c))
-  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1373) (tstamp 529babd4-6308-4754-ac00-5364e5f70721))
-  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1373) (tstamp 55371fab-553d-4b3f-8819-8f539dbfa721))
-  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1373) (tstamp 5f9c26bc-eac1-416e-9d4f-03811b867d2b))
-  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1373) (tstamp 6f6e3c25-fee2-4453-842a-2935f64935f9))
-  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1373) (tstamp 6f8b7af9-4d77-4b44-b80c-f5cf056bd2f3))
-  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1373) (tstamp 751e98a2-244f-4e00-929e-3a941e336f81))
-  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1373) (tstamp 764650be-266a-421e-9c9b-8d415d5f15af))
-  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1373) (tstamp 77565948-2355-45c7-a5d3-d1a30dc759d0))
-  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1373) (tstamp a567479e-3f9e-4845-adf3-d71c07e18318))
-  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1373) (tstamp c6889ac9-a7a5-4396-bfcc-3431c5252b55))
-  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1373) (tstamp dbc6cd51-cfb1-4c32-a32a-21df94273b97))
-  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1373) (tstamp e3f134a4-07fd-4dee-a7a2-8c7e9ccb2a78))
-  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1373) (tstamp 064d2743-ac95-43a7-b22f-a4b85ec603f7))
-  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1373) (tstamp 11ae7f47-faec-4b9b-8a21-41d70e27b0e2))
-  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1373) (tstamp 153a4498-9898-469a-8b46-fe752bfb11fe))
-  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1373) (tstamp 2c9b9452-52bb-4904-8e42-e7b553a26d3c))
-  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1373) (tstamp 438a8665-4497-463e-b9c5-e4d32944185e))
-  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1373) (tstamp 8288a6fa-c71b-44bb-aa82-fb332bae10e3))
-  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1373) (tstamp ab2ed4ba-3afc-4279-a001-6f2861171cc7))
-  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1373) (tstamp d5aa3db3-375c-4be1-9fd0-be18060a03ec))
-  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1373) (tstamp d685ea7b-9f79-410d-8f66-806fd82cf534))
-  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1373) (tstamp e5425768-1087-410d-829a-44ba2026ff37))
-  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1373) (tstamp e689f65d-9896-4800-911c-a68bbad16adf))
-  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1373) (tstamp f7b39e3f-8de2-4ab5-9afd-e189fa562379))
-  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1373) (tstamp f8c5eec0-c9f3-4e75-8349-a13ad5a287f1))
-  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1376) (tstamp 12f41ff3-bf64-41ce-8c3d-0a1a6e85bf86))
-  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1376) (tstamp 17338c1d-787c-4022-8079-253f06cf2ecd))
-  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1376) (tstamp 18c1bf4d-23f0-4eeb-809d-3ea0c8242567))
-  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1376) (tstamp 2677aa66-d6d9-4198-b446-b9bc06c9f824))
-  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1376) (tstamp 2a83ab21-a0c0-448d-8d98-cf2d77111cd6))
-  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1376) (tstamp 3ecf450b-9b3f-4697-bf9b-8089bf03697d))
-  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1376) (tstamp 41ed714f-45f5-43ff-b7e6-b58709c55da0))
-  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1376) (tstamp 6daafb18-897d-4121-9f34-b4191361f37e))
-  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1376) (tstamp 7d7ba411-baf4-405a-8148-a8356dedb85f))
-  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1376) (tstamp 810d7de1-dd42-43e1-9ba6-6b9befd97990))
-  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1376) (tstamp 973c2eb1-c8c4-44ea-a89d-757591151964))
-  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1376) (tstamp 9fb2eaf1-d097-4e5c-936e-50c5d7af7102))
-  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1376) (tstamp 0ac455f6-01c7-44bd-bb01-e43868fb9cd9))
-  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1376) (tstamp 25e180ce-932b-4442-8e24-1254c2533510))
-  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1376) (tstamp 3abfc891-bb1e-4c2c-9f95-7b4997414770))
-  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1376) (tstamp 64cc36c0-faf9-4ac4-a345-d12b44c1f3a6))
-  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1376) (tstamp 74c9a27d-9f4b-4e5f-b39d-ec3c53f263bd))
-  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1376) (tstamp 8c521271-24cd-4759-9260-e73d3db504b4))
-  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1376) (tstamp b555c906-df03-4f83-9e7e-87f81bc477a1))
-  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1376) (tstamp b83fc593-81b9-45ee-a9ea-f936fa3b0407))
-  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1376) (tstamp d8e2ad88-8e26-4226-b648-66523612b389))
-  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1376) (tstamp df81bd28-633b-4f0c-a3dc-acb1bc9fe665))
-  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1376) (tstamp e8a4eed6-a98f-416c-a59b-6fcd0d07a181))
-  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1376) (tstamp f1e140ef-143b-4b30-8d2f-4b8f6eee130d))
-  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1377) (tstamp 13ae410d-60ef-49f4-906d-20866cf63d57))
-  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1377) (tstamp 2f0b5ad3-2609-43fa-87b7-37b7e99db07e))
-  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1377) (tstamp 3b93dda0-7e8c-4186-be7f-afc1d53518e3))
-  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1377) (tstamp 3dec6fa7-3ce9-482b-a2a2-185dbe7eff31))
-  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1377) (tstamp 49f930cb-caf7-4124-911c-f01be29aee23))
-  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1377) (tstamp 561241dd-f2a5-4812-bf06-c8c6262baed2))
-  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1377) (tstamp 6a1bcb15-c98f-4a6d-9209-ba9df57ce882))
-  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1377) (tstamp 8de1b870-2582-4024-956f-bbf2d7fab24d))
-  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1377) (tstamp 916e4d08-e125-439a-a83b-cd4323daa120))
-  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1377) (tstamp a90a9fb6-7419-4de1-9ab7-23d1c96cc258))
-  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1377) (tstamp b95b14b6-3e70-4f1a-9cc0-ad7f23ff8207))
-  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1377) (tstamp bc650b00-d083-435f-8a5a-e5ecdab17831))
-  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1377) (tstamp 04f7e924-d886-4fa6-bc69-cafc6bb8e6c0))
-  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1377) (tstamp 171e1abc-809d-4772-b37e-351e41e5a126))
-  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1377) (tstamp 2be9e21a-6606-479c-a650-d2fa4719ca13))
-  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1377) (tstamp 41ca75f9-98f9-4df9-8744-9341cb9d121d))
-  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1377) (tstamp 4d3c51ec-5a5c-4e3b-8a38-8723fe98f7d9))
-  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1377) (tstamp 53e950be-9422-46e6-90a7-abed9aa9ee7f))
-  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1377) (tstamp 63bb3465-64f0-4dc2-891c-b9bcf81e582d))
-  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1377) (tstamp 675d599a-f5d8-4dff-b954-93922e65edc1))
-  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1377) (tstamp 7a2e8075-ed20-419a-8f5a-6ed20c6ae0ef))
-  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1377) (tstamp ac30331d-22fa-4427-99cf-ad36ae785200))
-  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1377) (tstamp b6387909-0523-4a94-b383-8bddb4898e83))
-  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1377) (tstamp e199ca9c-cae9-4945-a006-0e5a66a006d4))
+  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1255) (tstamp 0896fa8f-44dc-4f6c-84bb-7909546e2e6b))
+  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1255) (tstamp 0da37d8f-4590-41c6-ac2f-3e5d8cbe15ac))
+  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1255) (tstamp 1b15c8ff-b3e4-4c2d-86eb-b1ad9cf4eead))
+  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1255) (tstamp 207e86bb-d8e2-4aaa-90ba-ab96c90ef334))
+  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1255) (tstamp 3e25323e-6178-49a8-b96a-12f55f56a71a))
+  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1255) (tstamp 5e1610d2-39ad-4816-a4be-67d1e7b0adcc))
+  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1255) (tstamp 650cc613-df0d-4f19-9e5d-0671c8571df0))
+  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1255) (tstamp 65b73952-84b8-46cb-b58c-4eda84127d92))
+  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1255) (tstamp 68cc55bc-d3c2-4e83-bcb4-25f6cdcb9846))
+  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1255) (tstamp 808ac57a-e7b3-43e4-9769-0dab09651732))
+  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1255) (tstamp 880f97f8-afaf-4e0a-925d-103485430d87))
+  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1255) (tstamp 8cfcd02c-c6d8-4792-b4ab-d55a504400d9))
+  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1255) (tstamp 915b2fed-b520-46ed-a2a4-f0f17c71dc61))
+  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1255) (tstamp 9e7fb221-24e7-4bd4-9d3a-3d70c4c26888))
+  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1255) (tstamp a4d714ca-b149-42cf-9899-47971f202a1d))
+  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1255) (tstamp a9670ee4-1f60-4e5f-a706-27d78aa08c6a))
+  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1255) (tstamp ac0acb3d-8bed-43df-90b7-518f23c122c4))
+  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1255) (tstamp b2254475-1695-4ed9-b695-9596928d3b64))
+  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1255) (tstamp c8a09774-5251-4757-ac48-feacd199f5e3))
+  (segment (start 384.78 137.5) (end 385.35 137.5) (width 0.2) (layer "F.Cu") (net 1255) (tstamp ca89c779-fe40-4316-b0ba-59f5e4a39d08))
+  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1255) (tstamp cc91a8ae-fb6f-4f6d-94f3-938c8a349f45))
+  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1255) (tstamp df63de3f-03d6-4686-8e12-983033744f7b))
+  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1255) (tstamp fd484661-67e9-4f9d-b4bb-493cb1c8c205))
+  (segment (start 384.78 140) (end 385.35 140) (width 0.2) (layer "F.Cu") (net 1255) (tstamp fef1b4b7-408b-4291-825c-dff5e57e0d09))
+  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp 18ee7952-f1b1-40cb-82ca-8ae13221833d))
+  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp 1de9e5a3-a0e6-45d4-a30e-304c760c10ed))
+  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp 235a5346-6769-43d3-be16-b8902a3addf9))
+  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp 27fbbcd6-c437-4a8c-8ac4-49c517f327e4))
+  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp 2dac1e43-1148-4de6-a045-ace5c50d9cfe))
+  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp 2dd5888f-900f-4f50-b331-9c872193f4a1))
+  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp 3492183f-86e1-470a-9f17-c85f0b62a140))
+  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp 36acdbbf-b830-4506-b4b5-2ca73d9f1970))
+  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp 3fbeb927-b752-4aa7-8950-41e1e045968c))
+  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp 3fcccbe7-47eb-45f4-8931-003dac3fad6f))
+  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp 4ff25362-3d17-4803-9fa6-6c676f2cf057))
+  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp 6162d74e-7c16-447b-a58c-ac04d0a36c74))
+  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp 6d598036-43f3-4d32-a33d-d747d79c7765))
+  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp 85f4135d-4a85-4253-b9bf-1fd96e630485))
+  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp 942bded3-a196-471e-8c30-7e68e3d3b0ad))
+  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp a9c6bd2b-a7ef-4d2b-902a-02f7f3842573))
+  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp b3cd7818-de1f-41d6-93f8-d0a0a2af96eb))
+  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp b5b398f6-cd69-4f1c-a3b1-23a5bc4e5320))
+  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp b9a761bd-2ff9-4906-8c33-0ba6802373ae))
+  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp bf248671-a1be-4433-a449-b170a3140d95))
+  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp c23b1ca7-7c4d-44f5-b5f9-55adf482d81c))
+  (via (at 385.35 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp d29a8467-fb0b-4cdc-8c76-5939329cd53d))
+  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp d3ffddd6-4c51-4ca0-9c00-0566b541c595))
+  (via (at 385.35 140) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1255) (tstamp e6d891de-34ae-40df-8ca9-9991f9efb3ed))
+  (segment (start 40.82 155) (end 41.5 155) (width 0.2) (layer "F.Cu") (net 1356) (tstamp 483f2c83-78e5-4fbf-831b-8ef4900e2af8))
+  (segment (start 40.82 155) (end 41.5 155) (width 0.2) (layer "F.Cu") (net 1356) (tstamp 8bc830ec-b920-4c11-8a06-7ef9a6ea8843))
+  (segment (start 40.82 155) (end 41.5 155) (width 0.2) (layer "F.Cu") (net 1356) (tstamp eb885200-7114-421d-99b8-0b30a1276a11))
+  (via (at 41.5 155) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1356) (tstamp 2090a75c-243a-457a-a490-85a29531887b))
+  (via (at 41.5 155) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1356) (tstamp 7c75e6f0-2ef8-47a4-8c03-99ca560b7dc5))
+  (via (at 41.5 155) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1356) (tstamp d5cf189b-a4b0-49bd-ac35-810270b4f575))
+  (segment (start 40.82 153.5) (end 41.5 153.5) (width 0.2) (layer "F.Cu") (net 1357) (tstamp 5829a67d-debf-477b-a645-d481e172b4a5))
+  (segment (start 40.82 153.5) (end 41.5 153.5) (width 0.2) (layer "F.Cu") (net 1357) (tstamp 6cb19114-17d2-4456-87d0-9a36250d929b))
+  (segment (start 40.82 153.5) (end 41.5 153.5) (width 0.2) (layer "F.Cu") (net 1357) (tstamp e9cf82a0-d361-42c1-9f7d-39a08dcf0d27))
+  (via (at 41.5 153.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1357) (tstamp 09efb011-6657-4c5b-8006-5bad9665db0f))
+  (via (at 41.5 153.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1357) (tstamp 45eb554c-19e0-4c8e-b2c2-c9024be2fae9))
+  (via (at 41.5 153.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1357) (tstamp b4adfd9b-e21c-4f95-bac6-316048717e22))
+  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1360) (tstamp 203fe5f5-a5c3-44d4-8405-eb4d17bf7894))
+  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1360) (tstamp 2abf69de-8294-41ba-845a-2fa731592266))
+  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1360) (tstamp 2b487a13-6f5f-4327-87f0-42a039be7850))
+  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1360) (tstamp 374217f7-50fe-4889-bf30-613500082e0f))
+  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1360) (tstamp 8395fe67-6799-4932-9e02-77a9c2a2ef8c))
+  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1360) (tstamp 9c302e46-56c1-4251-90cb-6d9727ab768d))
+  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1360) (tstamp bfb7d512-f507-482b-878d-c5be15c62feb))
+  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1360) (tstamp caf9edfc-a1f4-42fc-aa55-a7df0a376fd8))
+  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1360) (tstamp d1d6cb3c-d23d-4e00-8c0f-c898704a3d87))
+  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1360) (tstamp f7524ae6-5fe3-445c-b10c-1cab32dea270))
+  (segment (start 40.82 139) (end 41.5 139) (width 0.2) (layer "F.Cu") (net 1360) (tstamp fe54a0ea-c15d-46a4-9199-46e84bf1f0eb))
+  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1360) (tstamp 0952987d-fbbf-444d-811f-e24cbc72b8b6))
+  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1360) (tstamp 17517ec2-a4a5-4471-bb4c-2f49c6d1ea61))
+  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1360) (tstamp 1cfe97f2-2902-4409-8e7f-997b86370c76))
+  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1360) (tstamp 1d8ab1b0-8ab6-481b-ba1c-52099896656b))
+  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1360) (tstamp 1e6ba410-5e55-4a46-8ae1-e4930a8b3b0d))
+  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1360) (tstamp 2ab86541-5572-4969-a688-e831d9ad14ae))
+  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1360) (tstamp 3a1b254b-8064-412f-a336-6c39f7d100a1))
+  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1360) (tstamp 9d089d1b-dd8a-4a2f-8fa1-c97560b3cd47))
+  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1360) (tstamp ac7467d9-d006-479f-ba6e-57aaa4188da6))
+  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1360) (tstamp c1ba51c2-0608-49b0-8dae-15a9a7515bee))
+  (via (at 41.5 139) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1360) (tstamp c9e0c53f-74d1-49f8-85e2-051f19faaec4))
+  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1361) (tstamp 5aed2870-a81c-428e-bdbb-4c6bf0c73200))
+  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1361) (tstamp 5e3a278d-5177-4eef-a5d0-0d2e15aeec04))
+  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1361) (tstamp 6d05e711-99d9-446e-993b-df45cc7cdb69))
+  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1361) (tstamp 721b5160-1102-405f-a5fb-e013801f7703))
+  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1361) (tstamp 7f1942ae-a1de-4d84-a9cb-6048662c2ff3))
+  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1361) (tstamp 829ab0e0-4231-4303-8f33-6bad8635e5d7))
+  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1361) (tstamp 88e208e8-8832-492d-9b59-6f4e5196e64e))
+  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1361) (tstamp a3a95ef6-5f08-4270-bba6-9428e2f74d53))
+  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1361) (tstamp b8d91e70-f7a0-40b0-b0ab-499907d223ea))
+  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1361) (tstamp e72b925a-f036-4219-a6af-03f45a255814))
+  (segment (start 40.82 137.5) (end 41.5 137.5) (width 0.2) (layer "F.Cu") (net 1361) (tstamp fb444eeb-1b14-4155-892e-73144b8afa31))
+  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1361) (tstamp 44aea230-004b-41d9-a240-70e3c498ec11))
+  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1361) (tstamp 49a4d2e5-89ed-4960-b95e-b1163aa17ca5))
+  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1361) (tstamp 5cb6e94d-62d0-4b9c-afd8-745c4ffc2620))
+  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1361) (tstamp 616b6986-e54d-42dc-85b7-f972946e18bd))
+  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1361) (tstamp 6c7ffd22-d792-4a0f-83dc-a379c1b6b807))
+  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1361) (tstamp 77b1d0b6-fa73-41ee-9aa8-d2976baf28a6))
+  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1361) (tstamp 82178da7-b560-459f-bd63-82afcafbb55c))
+  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1361) (tstamp 989d53e0-625d-4d64-aa01-0b5d62fdefb9))
+  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1361) (tstamp cc884a62-f3f8-4483-91a9-916623ca0204))
+  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1361) (tstamp d7ef0f6d-0e44-44b9-8235-9d4fa7d3846a))
+  (via (at 41.5 137.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1361) (tstamp fee89348-5ba6-44bc-8192-fa3b8e74b406))
+  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1364) (tstamp 086e0679-8278-4a96-8273-cf91ec97e816))
+  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1364) (tstamp 0a7de384-a176-4881-a203-091fa7aef500))
+  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1364) (tstamp 10198dcc-04f5-4c92-b238-f63b2eed8572))
+  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1364) (tstamp 1a6ca81b-2786-478e-9f21-1fc460798af8))
+  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1364) (tstamp 373dafe2-863e-4ad4-810b-b92ba3cd6aeb))
+  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1364) (tstamp 460c929a-855d-4af9-ba84-ee7429cdb28a))
+  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1364) (tstamp 4c5b1875-1a7a-42c3-a66d-2815507a1bf3))
+  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1364) (tstamp 5e9c7a9c-fe9c-4b40-b2f6-46db6add7f9e))
+  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1364) (tstamp 7455887b-ec34-47c6-99f2-5ba2b93b89bd))
+  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1364) (tstamp 971789a8-8361-4395-8a1a-2ad6932fc13a))
+  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1364) (tstamp a40a5555-dce6-4ee3-9d3f-7ccea925d171))
+  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1364) (tstamp a70d0fdd-b1fb-4f0f-b3c5-67481cade1bb))
+  (segment (start 384.78 154) (end 384.1 154) (width 0.2) (layer "F.Cu") (net 1364) (tstamp b20dfce2-d0a8-4e0f-8d8d-4d709adb47eb))
+  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1364) (tstamp 0b4e08ff-123a-47e7-ab53-faa28bb116f4))
+  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1364) (tstamp 22bb68b7-54f6-4eb2-a346-290806e81da4))
+  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1364) (tstamp 59b36f47-41fb-47a7-a9f7-c555098e67fc))
+  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1364) (tstamp 5a546d65-c67d-491c-a944-7ef85448d458))
+  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1364) (tstamp 6cef468b-6c10-491b-881b-2ff00eee5292))
+  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1364) (tstamp 910e5e73-2f4b-4e03-a63d-efbf9e198667))
+  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1364) (tstamp aaf6a2b4-7c0d-4446-8f8a-c08927a4d042))
+  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1364) (tstamp b09596a0-8e34-46fe-ad0d-0c664211d672))
+  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1364) (tstamp b7bd838c-ccb2-49bc-9bd6-a3bb8fb540eb))
+  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1364) (tstamp bb0cbfd9-e6dd-4167-8b67-ee5148933034))
+  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1364) (tstamp c52070cc-a218-4e1e-b286-0ff99210bc82))
+  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1364) (tstamp ebba9c28-c15d-4d40-a169-d81f713b99a0))
+  (via (at 384.1 154) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1364) (tstamp fb9851b3-220e-4a12-a4d9-09664196a988))
+  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1365) (tstamp 4e6f0773-9257-42a9-a0c4-54171c5a778c))
+  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1365) (tstamp 529babd4-6308-4754-ac00-5364e5f70721))
+  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1365) (tstamp 55371fab-553d-4b3f-8819-8f539dbfa721))
+  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1365) (tstamp 5f9c26bc-eac1-416e-9d4f-03811b867d2b))
+  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1365) (tstamp 6f6e3c25-fee2-4453-842a-2935f64935f9))
+  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1365) (tstamp 6f8b7af9-4d77-4b44-b80c-f5cf056bd2f3))
+  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1365) (tstamp 751e98a2-244f-4e00-929e-3a941e336f81))
+  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1365) (tstamp 764650be-266a-421e-9c9b-8d415d5f15af))
+  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1365) (tstamp 77565948-2355-45c7-a5d3-d1a30dc759d0))
+  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1365) (tstamp a567479e-3f9e-4845-adf3-d71c07e18318))
+  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1365) (tstamp c6889ac9-a7a5-4396-bfcc-3431c5252b55))
+  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1365) (tstamp dbc6cd51-cfb1-4c32-a32a-21df94273b97))
+  (segment (start 384.78 155.5) (end 384.1 155.5) (width 0.2) (layer "F.Cu") (net 1365) (tstamp e3f134a4-07fd-4dee-a7a2-8c7e9ccb2a78))
+  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1365) (tstamp 064d2743-ac95-43a7-b22f-a4b85ec603f7))
+  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1365) (tstamp 11ae7f47-faec-4b9b-8a21-41d70e27b0e2))
+  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1365) (tstamp 153a4498-9898-469a-8b46-fe752bfb11fe))
+  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1365) (tstamp 2c9b9452-52bb-4904-8e42-e7b553a26d3c))
+  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1365) (tstamp 438a8665-4497-463e-b9c5-e4d32944185e))
+  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1365) (tstamp 8288a6fa-c71b-44bb-aa82-fb332bae10e3))
+  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1365) (tstamp ab2ed4ba-3afc-4279-a001-6f2861171cc7))
+  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1365) (tstamp d5aa3db3-375c-4be1-9fd0-be18060a03ec))
+  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1365) (tstamp d685ea7b-9f79-410d-8f66-806fd82cf534))
+  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1365) (tstamp e5425768-1087-410d-829a-44ba2026ff37))
+  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1365) (tstamp e689f65d-9896-4800-911c-a68bbad16adf))
+  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1365) (tstamp f7b39e3f-8de2-4ab5-9afd-e189fa562379))
+  (via (at 384.1 155.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1365) (tstamp f8c5eec0-c9f3-4e75-8349-a13ad5a287f1))
+  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 12f41ff3-bf64-41ce-8c3d-0a1a6e85bf86))
+  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 17338c1d-787c-4022-8079-253f06cf2ecd))
+  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 18c1bf4d-23f0-4eeb-809d-3ea0c8242567))
+  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 2677aa66-d6d9-4198-b446-b9bc06c9f824))
+  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 2a83ab21-a0c0-448d-8d98-cf2d77111cd6))
+  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 3ecf450b-9b3f-4697-bf9b-8089bf03697d))
+  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 41ed714f-45f5-43ff-b7e6-b58709c55da0))
+  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 6daafb18-897d-4121-9f34-b4191361f37e))
+  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 7d7ba411-baf4-405a-8148-a8356dedb85f))
+  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 810d7de1-dd42-43e1-9ba6-6b9befd97990))
+  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 973c2eb1-c8c4-44ea-a89d-757591151964))
+  (segment (start 384.78 138) (end 384.1 138) (width 0.2) (layer "F.Cu") (net 1368) (tstamp 9fb2eaf1-d097-4e5c-936e-50c5d7af7102))
+  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp 0ac455f6-01c7-44bd-bb01-e43868fb9cd9))
+  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp 25e180ce-932b-4442-8e24-1254c2533510))
+  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp 3abfc891-bb1e-4c2c-9f95-7b4997414770))
+  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp 64cc36c0-faf9-4ac4-a345-d12b44c1f3a6))
+  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp 74c9a27d-9f4b-4e5f-b39d-ec3c53f263bd))
+  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp 8c521271-24cd-4759-9260-e73d3db504b4))
+  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp b555c906-df03-4f83-9e7e-87f81bc477a1))
+  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp b83fc593-81b9-45ee-a9ea-f936fa3b0407))
+  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp d8e2ad88-8e26-4226-b648-66523612b389))
+  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp df81bd28-633b-4f0c-a3dc-acb1bc9fe665))
+  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp e8a4eed6-a98f-416c-a59b-6fcd0d07a181))
+  (via (at 384.1 138) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1368) (tstamp f1e140ef-143b-4b30-8d2f-4b8f6eee130d))
+  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp 13ae410d-60ef-49f4-906d-20866cf63d57))
+  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp 2f0b5ad3-2609-43fa-87b7-37b7e99db07e))
+  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp 3b93dda0-7e8c-4186-be7f-afc1d53518e3))
+  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp 3dec6fa7-3ce9-482b-a2a2-185dbe7eff31))
+  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp 49f930cb-caf7-4124-911c-f01be29aee23))
+  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp 561241dd-f2a5-4812-bf06-c8c6262baed2))
+  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp 6a1bcb15-c98f-4a6d-9209-ba9df57ce882))
+  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp 8de1b870-2582-4024-956f-bbf2d7fab24d))
+  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp 916e4d08-e125-439a-a83b-cd4323daa120))
+  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp a90a9fb6-7419-4de1-9ab7-23d1c96cc258))
+  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp b95b14b6-3e70-4f1a-9cc0-ad7f23ff8207))
+  (segment (start 384.78 139.5) (end 384.1 139.5) (width 0.2) (layer "F.Cu") (net 1369) (tstamp bc650b00-d083-435f-8a5a-e5ecdab17831))
+  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 04f7e924-d886-4fa6-bc69-cafc6bb8e6c0))
+  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 171e1abc-809d-4772-b37e-351e41e5a126))
+  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 2be9e21a-6606-479c-a650-d2fa4719ca13))
+  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 41ca75f9-98f9-4df9-8744-9341cb9d121d))
+  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 4d3c51ec-5a5c-4e3b-8a38-8723fe98f7d9))
+  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 53e950be-9422-46e6-90a7-abed9aa9ee7f))
+  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 63bb3465-64f0-4dc2-891c-b9bcf81e582d))
+  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 675d599a-f5d8-4dff-b954-93922e65edc1))
+  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp 7a2e8075-ed20-419a-8f5a-6ed20c6ae0ef))
+  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp ac30331d-22fa-4427-99cf-ad36ae785200))
+  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp b6387909-0523-4a94-b383-8bddb4898e83))
+  (via (at 384.1 139.5) (size 0.4) (drill 0.2) (layers "F.Cu" "B.Cu") (net 1369) (tstamp e199ca9c-cae9-4945-a006-0e5a66a006d4))
 
   (zone (net 0) (net_name "") (layers "F.Cu" "In1.Cu" "In2.Cu" "In3.Cu" "In4.Cu" "In5.Cu" "In6.Cu" "In7.Cu" "In8.Cu" "B.Cu") (tstamp da2ac185-8fdc-4f41-9c6d-6bb916a3a218) (hatch edge 0.508)
     (connect_pads (clearance 0))