From d0dd10d4d9d933bafe576aa2d484b6bb4726eb5f Mon Sep 17 00:00:00 2001
From: Rishabh Gupta <belikerishabh@gmail.com>
Date: Sun, 8 Dec 2024 17:03:12 +0530
Subject: [PATCH] fix: port numbers in order

---
 .../process-components-and-pads.ts            |   19 +-
 .../process-plated-holes.ts                   |   14 +-
 tests/assets/repro/arduino-nano.json          | 3427 ++++++++++++-----
 tests/repros/repro-4-arduino-nano.test.ts     |    7 +-
 tests/repros/repro2-motor-driver.test.ts      |   10 +
 5 files changed, 2466 insertions(+), 1011 deletions(-)

diff --git a/lib/dsn-pcb/circuit-json-to-dsn-json/process-components-and-pads.ts b/lib/dsn-pcb/circuit-json-to-dsn-json/process-components-and-pads.ts
index c22dafc..f75b68e 100644
--- a/lib/dsn-pcb/circuit-json-to-dsn-json/process-components-and-pads.ts
+++ b/lib/dsn-pcb/circuit-json-to-dsn-json/process-components-and-pads.ts
@@ -1,7 +1,9 @@
 import type {
   AnyCircuitElement,
   PcbComponent,
+  PcbPort,
   SourceComponentBase,
+  SourcePort,
 } from "circuit-json"
 import { getComponentValue } from "lib/utils/get-component-value"
 import { getFootprintName } from "lib/utils/get-footprint-name"
@@ -119,6 +121,18 @@ export function processComponentsAndPads(
                 firstComponent.sourceComponent?.source_component_id,
           ) as PcbComponent
           if (pad.shape === "rect") {
+            // Find the corresponding pcb_port and its source_port
+            const pcbPort = circuitElements.find(
+              (e) => e.type === "pcb_port" && e.pcb_port_id === pad.pcb_port_id,
+            ) as PcbPort
+            const sourcePort =
+              pcbPort &&
+              (circuitElements.find(
+                (e) =>
+                  e.type === "source_port" &&
+                  e.source_port_id === pcbPort.source_port_id,
+              ) as SourcePort)
+
             return {
               padstack_name: getPadstackName({
                 shape: "rect",
@@ -126,8 +140,9 @@ export function processComponentsAndPads(
                 height: pad.height * 1000,
               }),
               pin_number:
-                pad.port_hints?.find((hint) => !Number.isNaN(Number(hint))) ||
-                1,
+                sourcePort?.port_hints?.find(
+                  (hint) => !Number.isNaN(Number(hint)),
+                ) || 1,
               x: (pad.x - pcbComponent.center.x) * 1000,
               y: (pad.y - pcbComponent.center.y) * 1000,
             }
diff --git a/lib/dsn-pcb/circuit-json-to-dsn-json/process-plated-holes.ts b/lib/dsn-pcb/circuit-json-to-dsn-json/process-plated-holes.ts
index b3dda20..66dd678 100644
--- a/lib/dsn-pcb/circuit-json-to-dsn-json/process-plated-holes.ts
+++ b/lib/dsn-pcb/circuit-json-to-dsn-json/process-plated-holes.ts
@@ -1,7 +1,9 @@
 import type {
   AnyCircuitElement,
   PcbComponent,
+  PcbPort,
   SourceComponentBase,
+  SourcePort,
 } from "circuit-json"
 import {
   createCircularPadstack,
@@ -153,18 +155,24 @@ export function processPlatedHoles(
             ? pin
             : undefined
         } else if (hole.shape === "oval" || hole.shape === "pill") {
+          // Find the corresponding pcb_port and its source_port
+          const pcbPort = circuitElements.find(
+            (e) => e.type === "pcb_port" && e.pcb_port_id === hole.pcb_port_id,
+          ) as PcbPort
+          const sourcePort = pcbPort && circuitElements.find(
+            (e) => e.type === "source_port" && e.source_port_id === pcbPort.source_port_id,
+          ) as SourcePort
+
           const pin = {
             padstack_name: getPadstackName({
               shape: hole.shape,
               width: hole.hole_width * 1000,
               height: hole.hole_height * 1000,
             }),
-            pin_number:
-              hole.port_hints?.find((hint) => !Number.isNaN(Number(hint))) || 1,
+            pin_number: sourcePort?.port_hints?.find(hint => !Number.isNaN(Number(hint))) || 1,
             x: (Number(hole.x.toFixed(3)) - pcbComponent.center.x) * 1000,
             y: (Number(hole.y.toFixed(3)) - pcbComponent.center.y) * 1000,
           }
-
           // Only return pin if it doesn't already exist in the image
           return !existingImage.pins.some(
             (existingPin) =>
diff --git a/tests/assets/repro/arduino-nano.json b/tests/assets/repro/arduino-nano.json
index 71bd9d9..4c44776 100644
--- a/tests/assets/repro/arduino-nano.json
+++ b/tests/assets/repro/arduino-nano.json
@@ -4,7 +4,12 @@
     "source_port_id": "source_port_0",
     "name": "GND1",
     "pin_number": 1,
-    "port_hints": ["A1", "GND1", "pin1", "1"],
+    "port_hints": [
+      "A1",
+      "GND1",
+      "pin1",
+      "1"
+    ],
     "source_component_id": "source_component_0"
   },
   {
@@ -12,7 +17,12 @@
     "source_port_id": "source_port_1",
     "name": "GND2",
     "pin_number": 2,
-    "port_hints": ["B12", "GND2", "pin2", "2"],
+    "port_hints": [
+      "B12",
+      "GND2",
+      "pin2",
+      "2"
+    ],
     "source_component_id": "source_component_0"
   },
   {
@@ -20,7 +30,12 @@
     "source_port_id": "source_port_2",
     "name": "VBUS1",
     "pin_number": 3,
-    "port_hints": ["A4", "VBUS1", "pin3", "3"],
+    "port_hints": [
+      "A4",
+      "VBUS1",
+      "pin3",
+      "3"
+    ],
     "source_component_id": "source_component_0"
   },
   {
@@ -28,7 +43,12 @@
     "source_port_id": "source_port_3",
     "name": "VBUS2",
     "pin_number": 4,
-    "port_hints": ["B9", "VBUS2", "pin4", "4"],
+    "port_hints": [
+      "B9",
+      "VBUS2",
+      "pin4",
+      "4"
+    ],
     "source_component_id": "source_component_0"
   },
   {
@@ -36,7 +56,12 @@
     "source_port_id": "source_port_4",
     "name": "SBU2",
     "pin_number": 5,
-    "port_hints": ["B8", "SBU2", "pin5", "5"],
+    "port_hints": [
+      "B8",
+      "SBU2",
+      "pin5",
+      "5"
+    ],
     "source_component_id": "source_component_0"
   },
   {
@@ -44,7 +69,12 @@
     "source_port_id": "source_port_5",
     "name": "CC1",
     "pin_number": 6,
-    "port_hints": ["A5", "CC1", "pin6", "6"],
+    "port_hints": [
+      "A5",
+      "CC1",
+      "pin6",
+      "6"
+    ],
     "source_component_id": "source_component_0"
   },
   {
@@ -52,7 +82,12 @@
     "source_port_id": "source_port_6",
     "name": "DM2",
     "pin_number": 7,
-    "port_hints": ["B7", "DM2", "pin7", "7"],
+    "port_hints": [
+      "B7",
+      "DM2",
+      "pin7",
+      "7"
+    ],
     "source_component_id": "source_component_0"
   },
   {
@@ -60,7 +95,12 @@
     "source_port_id": "source_port_7",
     "name": "DP1",
     "pin_number": 8,
-    "port_hints": ["A6", "DP1", "pin8", "8"],
+    "port_hints": [
+      "A6",
+      "DP1",
+      "pin8",
+      "8"
+    ],
     "source_component_id": "source_component_0"
   },
   {
@@ -68,7 +108,12 @@
     "source_port_id": "source_port_8",
     "name": "DM1",
     "pin_number": 9,
-    "port_hints": ["A7", "DM1", "pin9", "9"],
+    "port_hints": [
+      "A7",
+      "DM1",
+      "pin9",
+      "9"
+    ],
     "source_component_id": "source_component_0"
   },
   {
@@ -76,7 +121,12 @@
     "source_port_id": "source_port_9",
     "name": "DP2",
     "pin_number": 10,
-    "port_hints": ["B6", "DP2", "pin10", "10"],
+    "port_hints": [
+      "B6",
+      "DP2",
+      "pin10",
+      "10"
+    ],
     "source_component_id": "source_component_0"
   },
   {
@@ -84,7 +134,12 @@
     "source_port_id": "source_port_10",
     "name": "SBU1",
     "pin_number": 11,
-    "port_hints": ["A8", "SBU1", "pin11", "11"],
+    "port_hints": [
+      "A8",
+      "SBU1",
+      "pin11",
+      "11"
+    ],
     "source_component_id": "source_component_0"
   },
   {
@@ -92,7 +147,12 @@
     "source_port_id": "source_port_11",
     "name": "CC2",
     "pin_number": 12,
-    "port_hints": ["B5", "CC2", "pin12", "12"],
+    "port_hints": [
+      "B5",
+      "CC2",
+      "pin12",
+      "12"
+    ],
     "source_component_id": "source_component_0"
   },
   {
@@ -100,7 +160,12 @@
     "source_port_id": "source_port_12",
     "name": "VBUS1",
     "pin_number": 13,
-    "port_hints": ["A9", "VBUS1", "pin13", "13"],
+    "port_hints": [
+      "A9",
+      "VBUS1",
+      "pin13",
+      "13"
+    ],
     "source_component_id": "source_component_0"
   },
   {
@@ -108,7 +173,12 @@
     "source_port_id": "source_port_13",
     "name": "VBUS2",
     "pin_number": 14,
-    "port_hints": ["B4", "VBUS2", "pin14", "14"],
+    "port_hints": [
+      "B4",
+      "VBUS2",
+      "pin14",
+      "14"
+    ],
     "source_component_id": "source_component_0"
   },
   {
@@ -116,7 +186,12 @@
     "source_port_id": "source_port_14",
     "name": "GND1",
     "pin_number": 15,
-    "port_hints": ["A12", "GND1", "pin15", "15"],
+    "port_hints": [
+      "A12",
+      "GND1",
+      "pin15",
+      "15"
+    ],
     "source_component_id": "source_component_0"
   },
   {
@@ -124,7 +199,64 @@
     "source_port_id": "source_port_15",
     "name": "GND2",
     "pin_number": 16,
-    "port_hints": ["B1", "GND2", "pin16", "16"],
+    "port_hints": [
+      "B1",
+      "GND2",
+      "pin16",
+      "16"
+    ],
+    "source_component_id": "source_component_0"
+  },
+  {
+    "type": "source_port",
+    "source_port_id": "source_port_16",
+    "name": "ALT0",
+    "pin_number": 17,
+    "port_hints": [
+      "alt_0",
+      "ALT0",
+      "pin17",
+      "17"
+    ],
+    "source_component_id": "source_component_0"
+  },
+  {
+    "type": "source_port",
+    "source_port_id": "source_port_17",
+    "name": "ALT1",
+    "pin_number": 18,
+    "port_hints": [
+      "alt_1",
+      "ALT1",
+      "pin18",
+      "18"
+    ],
+    "source_component_id": "source_component_0"
+  },
+  {
+    "type": "source_port",
+    "source_port_id": "source_port_18",
+    "name": "ALT2",
+    "pin_number": 19,
+    "port_hints": [
+      "alt_2",
+      "ALT2",
+      "pin19",
+      "19"
+    ],
+    "source_component_id": "source_component_0"
+  },
+  {
+    "type": "source_port",
+    "source_port_id": "source_port_19",
+    "name": "ALT3",
+    "pin_number": 20,
+    "port_hints": [
+      "alt_3",
+      "ALT3",
+      "pin20",
+      "20"
+    ],
     "source_component_id": "source_component_0"
   },
   {
@@ -134,263 +266,395 @@
     "name": "USBC",
     "manufacturer_part_number": "TYPE-C-31-M-12",
     "supplier_part_numbers": {
-      "jlcpcb": ["C165948"]
+      "jlcpcb": [
+        "C165948"
+      ]
     }
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_16",
+    "source_port_id": "source_port_20",
     "name": "D3",
     "pin_number": 1,
-    "port_hints": ["D3", "pin1", "1"],
+    "port_hints": [
+      "D3",
+      "pin1",
+      "1"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_17",
+    "source_port_id": "source_port_21",
     "name": "D4",
     "pin_number": 2,
-    "port_hints": ["D4", "pin2", "2"],
+    "port_hints": [
+      "D4",
+      "pin2",
+      "2"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_18",
+    "source_port_id": "source_port_22",
     "name": "GND",
     "pin_number": 3,
-    "port_hints": ["GND", "pin3", "3"],
+    "port_hints": [
+      "GND",
+      "pin3",
+      "3"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_19",
+    "source_port_id": "source_port_23",
     "name": "VCC",
     "pin_number": 4,
-    "port_hints": ["VCC", "pin4", "4"],
+    "port_hints": [
+      "VCC",
+      "pin4",
+      "4"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_20",
+    "source_port_id": "source_port_24",
     "name": "A6",
     "pin_number": 5,
-    "port_hints": ["A6", "pin5", "5"],
+    "port_hints": [
+      "A6",
+      "pin5",
+      "5"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_21",
+    "source_port_id": "source_port_25",
     "name": "A7",
     "pin_number": 6,
-    "port_hints": ["A7", "pin6", "6"],
+    "port_hints": [
+      "A7",
+      "pin6",
+      "6"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_22",
+    "source_port_id": "source_port_26",
     "name": "A0",
     "pin_number": 7,
-    "port_hints": ["A0", "pin7", "7"],
+    "port_hints": [
+      "A0",
+      "pin7",
+      "7"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_23",
+    "source_port_id": "source_port_27",
     "name": "A1",
     "pin_number": 8,
-    "port_hints": ["A1", "pin8", "8"],
+    "port_hints": [
+      "A1",
+      "pin8",
+      "8"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_24",
+    "source_port_id": "source_port_28",
     "name": "A2",
     "pin_number": 9,
-    "port_hints": ["A2", "pin9", "9"],
+    "port_hints": [
+      "A2",
+      "pin9",
+      "9"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_25",
+    "source_port_id": "source_port_29",
     "name": "A3",
     "pin_number": 10,
-    "port_hints": ["A3", "pin10", "10"],
+    "port_hints": [
+      "A3",
+      "pin10",
+      "10"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_26",
+    "source_port_id": "source_port_30",
     "name": "A4",
     "pin_number": 11,
-    "port_hints": ["A4", "pin11", "11"],
+    "port_hints": [
+      "A4",
+      "pin11",
+      "11"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_27",
+    "source_port_id": "source_port_31",
     "name": "A5",
     "pin_number": 12,
-    "port_hints": ["A5", "pin12", "12"],
+    "port_hints": [
+      "A5",
+      "pin12",
+      "12"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_28",
+    "source_port_id": "source_port_32",
     "name": "D13",
     "pin_number": 13,
-    "port_hints": ["D13", "pin13", "13"],
+    "port_hints": [
+      "D13",
+      "pin13",
+      "13"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_29",
+    "source_port_id": "source_port_33",
     "name": "D12",
     "pin_number": 14,
-    "port_hints": ["D12", "pin14", "14"],
+    "port_hints": [
+      "D12",
+      "pin14",
+      "14"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_30",
+    "source_port_id": "source_port_34",
     "name": "D11",
     "pin_number": 15,
-    "port_hints": ["D11", "pin15", "15"],
+    "port_hints": [
+      "D11",
+      "pin15",
+      "15"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_31",
+    "source_port_id": "source_port_35",
     "name": "D10",
     "pin_number": 16,
-    "port_hints": ["D10", "pin16", "16"],
+    "port_hints": [
+      "D10",
+      "pin16",
+      "16"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_32",
+    "source_port_id": "source_port_36",
     "name": "D9",
     "pin_number": 17,
-    "port_hints": ["D9", "pin17", "17"],
+    "port_hints": [
+      "D9",
+      "pin17",
+      "17"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_33",
+    "source_port_id": "source_port_37",
     "name": "D8",
     "pin_number": 18,
-    "port_hints": ["D8", "pin18", "18"],
+    "port_hints": [
+      "D8",
+      "pin18",
+      "18"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_34",
+    "source_port_id": "source_port_38",
     "name": "RESET",
     "pin_number": 19,
-    "port_hints": ["RESET", "pin19", "19"],
+    "port_hints": [
+      "RESET",
+      "pin19",
+      "19"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_35",
+    "source_port_id": "source_port_39",
     "name": "GND",
     "pin_number": 20,
-    "port_hints": ["GND", "pin20", "20"],
+    "port_hints": [
+      "GND",
+      "pin20",
+      "20"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_36",
+    "source_port_id": "source_port_40",
     "name": "VIN",
     "pin_number": 21,
-    "port_hints": ["VIN", "pin21", "21"],
+    "port_hints": [
+      "VIN",
+      "pin21",
+      "21"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_37",
+    "source_port_id": "source_port_41",
     "name": "D7",
     "pin_number": 22,
-    "port_hints": ["D7", "pin22", "22"],
+    "port_hints": [
+      "D7",
+      "pin22",
+      "22"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_38",
+    "source_port_id": "source_port_42",
     "name": "D6",
     "pin_number": 23,
-    "port_hints": ["D6", "pin23", "23"],
+    "port_hints": [
+      "D6",
+      "pin23",
+      "23"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_39",
+    "source_port_id": "source_port_43",
     "name": "D5",
     "pin_number": 24,
-    "port_hints": ["D5", "pin24", "24"],
+    "port_hints": [
+      "D5",
+      "pin24",
+      "24"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_40",
+    "source_port_id": "source_port_44",
     "name": "D4",
     "pin_number": 25,
-    "port_hints": ["D4", "pin25", "25"],
+    "port_hints": [
+      "D4",
+      "pin25",
+      "25"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_41",
+    "source_port_id": "source_port_45",
     "name": "D3",
     "pin_number": 26,
-    "port_hints": ["D3", "pin26", "26"],
+    "port_hints": [
+      "D3",
+      "pin26",
+      "26"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_42",
+    "source_port_id": "source_port_46",
     "name": "D2",
     "pin_number": 27,
-    "port_hints": ["D2", "pin27", "27"],
+    "port_hints": [
+      "D2",
+      "pin27",
+      "27"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_43",
+    "source_port_id": "source_port_47",
     "name": "D1",
     "pin_number": 28,
-    "port_hints": ["TX", "D1", "pin28", "28"],
+    "port_hints": [
+      "TX",
+      "D1",
+      "pin28",
+      "28"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_44",
+    "source_port_id": "source_port_48",
     "name": "D0",
     "pin_number": 29,
-    "port_hints": ["RX", "D0", "pin29", "29"],
+    "port_hints": [
+      "RX",
+      "D0",
+      "pin29",
+      "29"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_45",
+    "source_port_id": "source_port_49",
     "name": "RESET",
     "pin_number": 30,
-    "port_hints": ["RESET", "pin30", "30"],
+    "port_hints": [
+      "RESET",
+      "pin30",
+      "30"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_46",
+    "source_port_id": "source_port_50",
     "name": "GND",
     "pin_number": 31,
-    "port_hints": ["GND", "pin31", "31"],
+    "port_hints": [
+      "GND",
+      "pin31",
+      "31"
+    ],
     "source_component_id": "source_component_1"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_47",
+    "source_port_id": "source_port_51",
     "name": "VCC",
     "pin_number": 32,
-    "port_hints": ["VCC", "pin32", "32"],
+    "port_hints": [
+      "VCC",
+      "pin32",
+      "32"
+    ],
     "source_component_id": "source_component_1"
   },
   {
@@ -403,18 +667,26 @@
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_48",
+    "source_port_id": "source_port_52",
     "name": "pos",
     "pin_number": 1,
-    "port_hints": ["pos", "pin1", "1"],
+    "port_hints": [
+      "pos",
+      "pin1",
+      "1"
+    ],
     "source_component_id": "source_component_2"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_49",
+    "source_port_id": "source_port_53",
     "name": "neg",
     "pin_number": 2,
-    "port_hints": ["neg", "pin2", "2"],
+    "port_hints": [
+      "neg",
+      "pin2",
+      "2"
+    ],
     "source_component_id": "source_component_2"
   },
   {
@@ -423,23 +695,33 @@
     "ftype": "simple_chip",
     "name": "LED",
     "supplier_part_numbers": {
-      "jlcpcb": ["C965799"]
+      "jlcpcb": [
+        "C965799"
+      ]
     }
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_50",
+    "source_port_id": "source_port_54",
     "name": "pos",
     "pin_number": 1,
-    "port_hints": ["pos", "pin1", "1"],
+    "port_hints": [
+      "pos",
+      "pin1",
+      "1"
+    ],
     "source_component_id": "source_component_3"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_51",
+    "source_port_id": "source_port_55",
     "name": "neg",
     "pin_number": 2,
-    "port_hints": ["neg", "pin2", "2"],
+    "port_hints": [
+      "neg",
+      "pin2",
+      "2"
+    ],
     "source_component_id": "source_component_3"
   },
   {
@@ -448,23 +730,33 @@
     "ftype": "simple_chip",
     "name": "LED",
     "supplier_part_numbers": {
-      "jlcpcb": ["C965799"]
+      "jlcpcb": [
+        "C965799"
+      ]
     }
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_52",
+    "source_port_id": "source_port_56",
     "name": "pos",
     "pin_number": 1,
-    "port_hints": ["pos", "pin1", "1"],
+    "port_hints": [
+      "pos",
+      "pin1",
+      "1"
+    ],
     "source_component_id": "source_component_4"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_53",
+    "source_port_id": "source_port_57",
     "name": "neg",
     "pin_number": 2,
-    "port_hints": ["neg", "pin2", "2"],
+    "port_hints": [
+      "neg",
+      "pin2",
+      "2"
+    ],
     "source_component_id": "source_component_4"
   },
   {
@@ -473,39 +765,53 @@
     "ftype": "simple_chip",
     "name": "LED",
     "supplier_part_numbers": {
-      "jlcpcb": ["C965799"]
+      "jlcpcb": [
+        "C965799"
+      ]
     }
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_54",
+    "source_port_id": "source_port_58",
     "name": "pin1",
     "pin_number": 1,
-    "port_hints": ["pin1", "1"],
+    "port_hints": [
+      "pin1",
+      "1"
+    ],
     "source_component_id": "source_component_5"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_55",
+    "source_port_id": "source_port_59",
     "name": "pin2",
     "pin_number": 2,
-    "port_hints": ["pin2", "2"],
+    "port_hints": [
+      "pin2",
+      "2"
+    ],
     "source_component_id": "source_component_5"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_56",
+    "source_port_id": "source_port_60",
     "name": "pin3",
     "pin_number": 3,
-    "port_hints": ["pin3", "3"],
+    "port_hints": [
+      "pin3",
+      "3"
+    ],
     "source_component_id": "source_component_5"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_57",
+    "source_port_id": "source_port_61",
     "name": "pin4",
     "pin_number": 4,
-    "port_hints": ["pin4", "4"],
+    "port_hints": [
+      "pin4",
+      "4"
+    ],
     "source_component_id": "source_component_5"
   },
   {
@@ -514,23 +820,37 @@
     "ftype": "simple_chip",
     "name": "SW1",
     "supplier_part_numbers": {
-      "jlcpcb": ["C110153"]
+      "jlcpcb": [
+        "C110153"
+      ]
     }
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_58",
+    "source_port_id": "source_port_62",
     "name": "pin1",
     "pin_number": 1,
-    "port_hints": ["anode", "pos", "left", "pin1", "1"],
+    "port_hints": [
+      "anode",
+      "pos",
+      "left",
+      "pin1",
+      "1"
+    ],
     "source_component_id": "source_component_6"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_59",
+    "source_port_id": "source_port_63",
     "name": "pin2",
     "pin_number": 2,
-    "port_hints": ["cathode", "neg", "right", "pin2", "2"],
+    "port_hints": [
+      "cathode",
+      "neg",
+      "right",
+      "pin2",
+      "2"
+    ],
     "source_component_id": "source_component_6"
   },
   {
@@ -539,24 +859,38 @@
     "ftype": "simple_resistor",
     "name": "R1",
     "supplier_part_numbers": {
-      "jlcpcb": ["C22548"]
+      "jlcpcb": [
+        "C22548"
+      ]
     },
     "resistance": 1000
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_60",
+    "source_port_id": "source_port_64",
     "name": "pin1",
     "pin_number": 1,
-    "port_hints": ["anode", "pos", "left", "pin1", "1"],
+    "port_hints": [
+      "anode",
+      "pos",
+      "left",
+      "pin1",
+      "1"
+    ],
     "source_component_id": "source_component_7"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_61",
+    "source_port_id": "source_port_65",
     "name": "pin2",
     "pin_number": 2,
-    "port_hints": ["cathode", "neg", "right", "pin2", "2"],
+    "port_hints": [
+      "cathode",
+      "neg",
+      "right",
+      "pin2",
+      "2"
+    ],
     "source_component_id": "source_component_7"
   },
   {
@@ -565,24 +899,38 @@
     "ftype": "simple_resistor",
     "name": "R2",
     "supplier_part_numbers": {
-      "jlcpcb": ["C22548"]
+      "jlcpcb": [
+        "C22548"
+      ]
     },
     "resistance": 1000
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_62",
+    "source_port_id": "source_port_66",
     "name": "pin1",
     "pin_number": 1,
-    "port_hints": ["anode", "pos", "left", "pin1", "1"],
+    "port_hints": [
+      "anode",
+      "pos",
+      "left",
+      "pin1",
+      "1"
+    ],
     "source_component_id": "source_component_8"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_63",
+    "source_port_id": "source_port_67",
     "name": "pin2",
     "pin_number": 2,
-    "port_hints": ["cathode", "neg", "right", "pin2", "2"],
+    "port_hints": [
+      "cathode",
+      "neg",
+      "right",
+      "pin2",
+      "2"
+    ],
     "source_component_id": "source_component_8"
   },
   {
@@ -591,128 +939,175 @@
     "ftype": "simple_resistor",
     "name": "R3",
     "supplier_part_numbers": {
-      "jlcpcb": ["C22548"]
+      "jlcpcb": [
+        "C22548"
+      ]
     },
     "resistance": 1000
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_64",
+    "source_port_id": "source_port_68",
     "name": "pin1",
     "pin_number": 1,
-    "port_hints": ["pin1", "1"],
+    "port_hints": [
+      "pin1",
+      "1"
+    ],
     "source_component_id": "source_component_9"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_65",
+    "source_port_id": "source_port_69",
     "name": "pin2",
     "pin_number": 2,
-    "port_hints": ["pin2", "2"],
+    "port_hints": [
+      "pin2",
+      "2"
+    ],
     "source_component_id": "source_component_9"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_66",
+    "source_port_id": "source_port_70",
     "name": "pin3",
     "pin_number": 3,
-    "port_hints": ["pin3", "3"],
+    "port_hints": [
+      "pin3",
+      "3"
+    ],
     "source_component_id": "source_component_9"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_67",
+    "source_port_id": "source_port_71",
     "name": "pin4",
     "pin_number": 4,
-    "port_hints": ["pin4", "4"],
+    "port_hints": [
+      "pin4",
+      "4"
+    ],
     "source_component_id": "source_component_9"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_68",
+    "source_port_id": "source_port_72",
     "name": "pin5",
     "pin_number": 5,
-    "port_hints": ["pin5", "5"],
+    "port_hints": [
+      "pin5",
+      "5"
+    ],
     "source_component_id": "source_component_9"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_69",
+    "source_port_id": "source_port_73",
     "name": "pin6",
     "pin_number": 6,
-    "port_hints": ["pin6", "6"],
+    "port_hints": [
+      "pin6",
+      "6"
+    ],
     "source_component_id": "source_component_9"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_70",
+    "source_port_id": "source_port_74",
     "name": "pin7",
     "pin_number": 7,
-    "port_hints": ["pin7", "7"],
+    "port_hints": [
+      "pin7",
+      "7"
+    ],
     "source_component_id": "source_component_9"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_71",
+    "source_port_id": "source_port_75",
     "name": "pin8",
     "pin_number": 8,
-    "port_hints": ["pin8", "8"],
+    "port_hints": [
+      "pin8",
+      "8"
+    ],
     "source_component_id": "source_component_9"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_72",
+    "source_port_id": "source_port_76",
     "name": "pin9",
     "pin_number": 9,
-    "port_hints": ["pin9", "9"],
+    "port_hints": [
+      "pin9",
+      "9"
+    ],
     "source_component_id": "source_component_9"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_73",
+    "source_port_id": "source_port_77",
     "name": "pin10",
     "pin_number": 10,
-    "port_hints": ["pin10", "10"],
+    "port_hints": [
+      "pin10",
+      "10"
+    ],
     "source_component_id": "source_component_9"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_74",
+    "source_port_id": "source_port_78",
     "name": "pin11",
     "pin_number": 11,
-    "port_hints": ["pin11", "11"],
+    "port_hints": [
+      "pin11",
+      "11"
+    ],
     "source_component_id": "source_component_9"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_75",
+    "source_port_id": "source_port_79",
     "name": "pin12",
     "pin_number": 12,
-    "port_hints": ["pin12", "12"],
+    "port_hints": [
+      "pin12",
+      "12"
+    ],
     "source_component_id": "source_component_9"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_76",
+    "source_port_id": "source_port_80",
     "name": "pin13",
     "pin_number": 13,
-    "port_hints": ["pin13", "13"],
+    "port_hints": [
+      "pin13",
+      "13"
+    ],
     "source_component_id": "source_component_9"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_77",
+    "source_port_id": "source_port_81",
     "name": "pin14",
     "pin_number": 14,
-    "port_hints": ["pin14", "14"],
+    "port_hints": [
+      "pin14",
+      "14"
+    ],
     "source_component_id": "source_component_9"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_78",
+    "source_port_id": "source_port_82",
     "name": "pin15",
     "pin_number": 15,
-    "port_hints": ["pin15", "15"],
+    "port_hints": [
+      "pin15",
+      "15"
+    ],
     "source_component_id": "source_component_9"
   },
   {
@@ -721,129 +1116,178 @@
     "ftype": "simple_pin_header",
     "name": "JP_right",
     "supplier_part_numbers": {
-      "jlcpcb": ["C7501269", "C725947", "C2894957"]
+      "jlcpcb": [
+        "C7501269",
+        "C725947",
+        "C2894957"
+      ]
     },
     "pin_count": 15,
     "gender": "male"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_79",
+    "source_port_id": "source_port_83",
     "name": "pin1",
     "pin_number": 1,
-    "port_hints": ["pin1", "1"],
+    "port_hints": [
+      "pin1",
+      "1"
+    ],
     "source_component_id": "source_component_10"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_80",
+    "source_port_id": "source_port_84",
     "name": "pin2",
     "pin_number": 2,
-    "port_hints": ["pin2", "2"],
+    "port_hints": [
+      "pin2",
+      "2"
+    ],
     "source_component_id": "source_component_10"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_81",
+    "source_port_id": "source_port_85",
     "name": "pin3",
     "pin_number": 3,
-    "port_hints": ["pin3", "3"],
+    "port_hints": [
+      "pin3",
+      "3"
+    ],
     "source_component_id": "source_component_10"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_82",
+    "source_port_id": "source_port_86",
     "name": "pin4",
     "pin_number": 4,
-    "port_hints": ["pin4", "4"],
+    "port_hints": [
+      "pin4",
+      "4"
+    ],
     "source_component_id": "source_component_10"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_83",
+    "source_port_id": "source_port_87",
     "name": "pin5",
     "pin_number": 5,
-    "port_hints": ["pin5", "5"],
+    "port_hints": [
+      "pin5",
+      "5"
+    ],
     "source_component_id": "source_component_10"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_84",
+    "source_port_id": "source_port_88",
     "name": "pin6",
     "pin_number": 6,
-    "port_hints": ["pin6", "6"],
+    "port_hints": [
+      "pin6",
+      "6"
+    ],
     "source_component_id": "source_component_10"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_85",
+    "source_port_id": "source_port_89",
     "name": "pin7",
     "pin_number": 7,
-    "port_hints": ["pin7", "7"],
+    "port_hints": [
+      "pin7",
+      "7"
+    ],
     "source_component_id": "source_component_10"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_86",
+    "source_port_id": "source_port_90",
     "name": "pin8",
     "pin_number": 8,
-    "port_hints": ["pin8", "8"],
+    "port_hints": [
+      "pin8",
+      "8"
+    ],
     "source_component_id": "source_component_10"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_87",
+    "source_port_id": "source_port_91",
     "name": "pin9",
     "pin_number": 9,
-    "port_hints": ["pin9", "9"],
+    "port_hints": [
+      "pin9",
+      "9"
+    ],
     "source_component_id": "source_component_10"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_88",
+    "source_port_id": "source_port_92",
     "name": "pin10",
     "pin_number": 10,
-    "port_hints": ["pin10", "10"],
+    "port_hints": [
+      "pin10",
+      "10"
+    ],
     "source_component_id": "source_component_10"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_89",
+    "source_port_id": "source_port_93",
     "name": "pin11",
     "pin_number": 11,
-    "port_hints": ["pin11", "11"],
+    "port_hints": [
+      "pin11",
+      "11"
+    ],
     "source_component_id": "source_component_10"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_90",
+    "source_port_id": "source_port_94",
     "name": "pin12",
     "pin_number": 12,
-    "port_hints": ["pin12", "12"],
+    "port_hints": [
+      "pin12",
+      "12"
+    ],
     "source_component_id": "source_component_10"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_91",
+    "source_port_id": "source_port_95",
     "name": "pin13",
     "pin_number": 13,
-    "port_hints": ["pin13", "13"],
+    "port_hints": [
+      "pin13",
+      "13"
+    ],
     "source_component_id": "source_component_10"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_92",
+    "source_port_id": "source_port_96",
     "name": "pin14",
     "pin_number": 14,
-    "port_hints": ["pin14", "14"],
+    "port_hints": [
+      "pin14",
+      "14"
+    ],
     "source_component_id": "source_component_10"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_93",
+    "source_port_id": "source_port_97",
     "name": "pin15",
     "pin_number": 15,
-    "port_hints": ["pin15", "15"],
+    "port_hints": [
+      "pin15",
+      "15"
+    ],
     "source_component_id": "source_component_10"
   },
   {
@@ -852,33 +1296,46 @@
     "ftype": "simple_pin_header",
     "name": "JP_left",
     "supplier_part_numbers": {
-      "jlcpcb": ["C7501269", "C725947", "C2894957"]
+      "jlcpcb": [
+        "C7501269",
+        "C725947",
+        "C2894957"
+      ]
     },
     "pin_count": 15,
     "gender": "male"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_94",
+    "source_port_id": "source_port_98",
     "name": "pin1",
     "pin_number": 1,
-    "port_hints": ["pin1", "1"],
+    "port_hints": [
+      "pin1",
+      "1"
+    ],
     "source_component_id": "source_component_11"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_95",
+    "source_port_id": "source_port_99",
     "name": "pin2",
     "pin_number": 2,
-    "port_hints": ["pin2", "2"],
+    "port_hints": [
+      "pin2",
+      "2"
+    ],
     "source_component_id": "source_component_11"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_96",
+    "source_port_id": "source_port_100",
     "name": "pin3",
     "pin_number": 3,
-    "port_hints": ["pin3", "3"],
+    "port_hints": [
+      "pin3",
+      "3"
+    ],
     "source_component_id": "source_component_11"
   },
   {
@@ -887,33 +1344,46 @@
     "ftype": "simple_pin_header",
     "name": "top",
     "supplier_part_numbers": {
-      "jlcpcb": ["C49257", "C2937625", "C6332196"]
+      "jlcpcb": [
+        "C49257",
+        "C2937625",
+        "C6332196"
+      ]
     },
     "pin_count": 3,
     "gender": "male"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_97",
+    "source_port_id": "source_port_101",
     "name": "pin1",
     "pin_number": 1,
-    "port_hints": ["pin1", "1"],
+    "port_hints": [
+      "pin1",
+      "1"
+    ],
     "source_component_id": "source_component_12"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_98",
+    "source_port_id": "source_port_102",
     "name": "pin2",
     "pin_number": 2,
-    "port_hints": ["pin2", "2"],
+    "port_hints": [
+      "pin2",
+      "2"
+    ],
     "source_component_id": "source_component_12"
   },
   {
     "type": "source_port",
-    "source_port_id": "source_port_99",
+    "source_port_id": "source_port_103",
     "name": "pin3",
     "pin_number": 3,
-    "port_hints": ["pin3", "3"],
+    "port_hints": [
+      "pin3",
+      "3"
+    ],
     "source_component_id": "source_component_12"
   },
   {
@@ -922,7 +1392,11 @@
     "ftype": "simple_pin_header",
     "name": "top2",
     "supplier_part_numbers": {
-      "jlcpcb": ["C49257", "C2937625", "C6332196"]
+      "jlcpcb": [
+        "C49257",
+        "C2937625",
+        "C6332196"
+      ]
     },
     "pin_count": 3,
     "gender": "male"
@@ -942,233 +1416,336 @@
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_0",
-    "connected_source_port_ids": ["source_port_49"],
-    "connected_source_net_ids": ["source_net_0"],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net0"
+    "connected_source_port_ids": [
+      "source_port_53"
+    ],
+    "connected_source_net_ids": [
+      "source_net_0"
+    ],
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net0"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_1",
-    "connected_source_port_ids": ["source_port_49"],
-    "connected_source_net_ids": ["source_net_0"],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net0"
+    "connected_source_port_ids": [
+      "source_port_53"
+    ],
+    "connected_source_net_ids": [
+      "source_net_0"
+    ],
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net0"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_2",
-    "connected_source_port_ids": ["source_port_49"],
-    "connected_source_net_ids": ["source_net_0"],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net0"
+    "connected_source_port_ids": [
+      "source_port_53"
+    ],
+    "connected_source_net_ids": [
+      "source_net_0"
+    ],
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net0"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_3",
-    "connected_source_port_ids": ["source_port_55", "source_port_58"],
+    "connected_source_port_ids": [
+      "source_port_59",
+      "source_port_62"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net1"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net1"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_4",
-    "connected_source_port_ids": ["source_port_56"],
-    "connected_source_net_ids": ["source_net_1"],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net2"
+    "connected_source_port_ids": [
+      "source_port_60"
+    ],
+    "connected_source_net_ids": [
+      "source_net_1"
+    ],
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net2"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_5",
-    "connected_source_port_ids": ["source_port_89", "source_port_41"],
+    "connected_source_port_ids": [
+      "source_port_93",
+      "source_port_45"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net3"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net3"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_6",
-    "connected_source_port_ids": ["source_port_90", "source_port_42"],
+    "connected_source_port_ids": [
+      "source_port_94",
+      "source_port_46"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net4"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net4"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_7",
-    "connected_source_port_ids": ["source_port_92", "source_port_45"],
+    "connected_source_port_ids": [
+      "source_port_96",
+      "source_port_49"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net5"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net5"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_8",
-    "connected_source_port_ids": ["source_port_83", "source_port_32"],
+    "connected_source_port_ids": [
+      "source_port_87",
+      "source_port_36"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net6"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net6"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_9",
-    "connected_source_port_ids": ["source_port_93", "source_port_43"],
+    "connected_source_port_ids": [
+      "source_port_97",
+      "source_port_47"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net7"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net7"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_10",
-    "connected_source_port_ids": ["source_port_64", "source_port_36"],
+    "connected_source_port_ids": [
+      "source_port_68",
+      "source_port_40"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net8"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net8"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_11",
-    "connected_source_port_ids": ["source_port_65", "source_port_35"],
+    "connected_source_port_ids": [
+      "source_port_69",
+      "source_port_39"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net9"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net9"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_12",
-    "connected_source_port_ids": ["source_port_66", "source_port_34"],
+    "connected_source_port_ids": [
+      "source_port_70",
+      "source_port_38"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net10"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net10"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_13",
-    "connected_source_port_ids": ["source_port_67", "source_port_19"],
+    "connected_source_port_ids": [
+      "source_port_71",
+      "source_port_23"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net11"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net11"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_14",
-    "connected_source_port_ids": ["source_port_68", "source_port_47"],
+    "connected_source_port_ids": [
+      "source_port_72",
+      "source_port_51"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net12"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net12"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_15",
-    "connected_source_port_ids": ["source_port_69", "source_port_46"],
+    "connected_source_port_ids": [
+      "source_port_73",
+      "source_port_50"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net13"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net13"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_16",
-    "connected_source_port_ids": ["source_port_70", "source_port_20"],
+    "connected_source_port_ids": [
+      "source_port_74",
+      "source_port_24"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net14"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net14"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_17",
-    "connected_source_port_ids": ["source_port_87", "source_port_39"],
+    "connected_source_port_ids": [
+      "source_port_91",
+      "source_port_43"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net15"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net15"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_18",
-    "connected_source_port_ids": ["source_port_71", "source_port_21"],
+    "connected_source_port_ids": [
+      "source_port_75",
+      "source_port_25"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net16"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net16"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_19",
-    "connected_source_port_ids": ["source_port_72", "source_port_22"],
+    "connected_source_port_ids": [
+      "source_port_76",
+      "source_port_26"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net17"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net17"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_20",
-    "connected_source_port_ids": ["source_port_82", "source_port_31"],
+    "connected_source_port_ids": [
+      "source_port_86",
+      "source_port_35"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net18"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net18"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_21",
-    "connected_source_port_ids": ["source_port_73", "source_port_23"],
+    "connected_source_port_ids": [
+      "source_port_77",
+      "source_port_27"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net19"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net19"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_22",
-    "connected_source_port_ids": ["source_port_74", "source_port_24"],
+    "connected_source_port_ids": [
+      "source_port_78",
+      "source_port_28"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net20"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net20"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_23",
-    "connected_source_port_ids": ["source_port_75", "source_port_25"],
+    "connected_source_port_ids": [
+      "source_port_79",
+      "source_port_29"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net21"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net21"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_24",
-    "connected_source_port_ids": ["source_port_76", "source_port_26"],
+    "connected_source_port_ids": [
+      "source_port_80",
+      "source_port_30"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net22"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net22"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_25",
-    "connected_source_port_ids": ["source_port_80", "source_port_29"],
+    "connected_source_port_ids": [
+      "source_port_84",
+      "source_port_33"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net23"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net23"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_26",
-    "connected_source_port_ids": ["source_port_91", "source_port_18"],
+    "connected_source_port_ids": [
+      "source_port_95",
+      "source_port_22"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net24"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net24"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_27",
-    "connected_source_port_ids": ["source_port_79", "source_port_28"],
+    "connected_source_port_ids": [
+      "source_port_83",
+      "source_port_32"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net25"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net25"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_28",
-    "connected_source_port_ids": ["source_port_84", "source_port_33"],
+    "connected_source_port_ids": [
+      "source_port_88",
+      "source_port_37"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net26"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net26"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_29",
-    "connected_source_port_ids": ["source_port_77", "source_port_27"],
+    "connected_source_port_ids": [
+      "source_port_81",
+      "source_port_31"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net27"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net27"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_30",
-    "connected_source_port_ids": ["source_port_86", "source_port_38"],
+    "connected_source_port_ids": [
+      "source_port_90",
+      "source_port_42"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net28"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net28"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_31",
-    "connected_source_port_ids": ["source_port_85", "source_port_37"],
+    "connected_source_port_ids": [
+      "source_port_89",
+      "source_port_41"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net29"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net29"
   },
   {
     "type": "source_trace",
     "source_trace_id": "source_trace_32",
-    "connected_source_port_ids": ["source_port_81", "source_port_30"],
+    "connected_source_port_ids": [
+      "source_port_85",
+      "source_port_34"
+    ],
     "connected_source_net_ids": [],
-    "subcircuit_connectivity_map_key": "unnamedsubcircuit59142_connectivity_net30"
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit1321_connectivity_net30"
   },
   {
     "type": "schematic_component",
@@ -1180,11 +1757,14 @@
     "rotation": 0,
     "size": {
       "width": 1.6,
-      "height": 3.2
+      "height": 3.6000000000000005
     },
     "port_arrangement": {
       "left_side": {
-        "pins": [],
+        "pins": [
+          "ALT0",
+          "ALT3"
+        ],
         "direction": "top-to-bottom"
       },
       "right_side": {
@@ -1198,12 +1778,17 @@
           "CC1",
           "CC2",
           "SBU1",
-          "SBU2"
+          "SBU2",
+          "ALT2",
+          "ALT1"
         ],
         "direction": "top-to-bottom"
       },
       "bottom_side": {
-        "pins": ["GND1", "GND2"],
+        "pins": [
+          "GND1",
+          "GND2"
+        ],
         "direction": "left-to-right"
       }
     },
@@ -1238,7 +1823,11 @@
       "13": "VBUS1",
       "14": "VBUS2",
       "15": "GND1",
-      "16": "GND2"
+      "16": "GND2",
+      "17": "ALT0",
+      "18": "ALT1",
+      "19": "ALT2",
+      "20": "ALT3"
     },
     "source_component_id": "source_component_0"
   },
@@ -1251,7 +1840,7 @@
     "rotation": 0,
     "position": {
       "x": 0.9,
-      "y": 1.9500000000000002
+      "y": 2.1500000000000004
     },
     "color": "#006464"
   },
@@ -1264,7 +1853,7 @@
     "rotation": 0,
     "position": {
       "x": 0.9,
-      "y": 2.1500000000000004
+      "y": 2.3500000000000005
     },
     "color": "#006464"
   },
@@ -1357,11 +1946,15 @@
     },
     "port_arrangement": {
       "left_side": {
-        "pins": [1],
+        "pins": [
+          1
+        ],
         "direction": "top-to-bottom"
       },
       "right_side": {
-        "pins": [2],
+        "pins": [
+          2
+        ],
         "direction": "bottom-to-top"
       }
     },
@@ -1412,11 +2005,15 @@
     },
     "port_arrangement": {
       "left_side": {
-        "pins": [1],
+        "pins": [
+          1
+        ],
         "direction": "top-to-bottom"
       },
       "right_side": {
-        "pins": [2],
+        "pins": [
+          2
+        ],
         "direction": "bottom-to-top"
       }
     },
@@ -1467,11 +2064,15 @@
     },
     "port_arrangement": {
       "left_side": {
-        "pins": [1],
+        "pins": [
+          1
+        ],
         "direction": "top-to-bottom"
       },
       "right_side": {
-        "pins": [2],
+        "pins": [
+          2
+        ],
         "direction": "bottom-to-top"
       }
     },
@@ -1522,11 +2123,17 @@
     },
     "port_arrangement": {
       "left_side": {
-        "pins": [1, 3],
+        "pins": [
+          1,
+          3
+        ],
         "direction": "top-to-bottom"
       },
       "right_side": {
-        "pins": [4, 2],
+        "pins": [
+          4,
+          2
+        ],
         "direction": "bottom-to-top"
       }
     },
@@ -1819,14 +2426,14 @@
     "schematic_component_id": "schematic_component_0",
     "center": {
       "x": -0.6,
-      "y": -2
+      "y": -2.2
     },
     "source_port_id": "source_port_0",
     "facing_direction": "down",
     "distance_from_component_edge": 0.4,
     "side_of_component": "bottom",
     "pin_number": 1,
-    "true_ccw_index": 0,
+    "true_ccw_index": 2,
     "display_pin_label": "GND1"
   },
   {
@@ -1835,14 +2442,14 @@
     "schematic_component_id": "schematic_component_0",
     "center": {
       "x": -0.39999999999999997,
-      "y": -2
+      "y": -2.2
     },
     "source_port_id": "source_port_1",
     "facing_direction": "down",
     "distance_from_component_edge": 0.4,
     "side_of_component": "bottom",
     "pin_number": 2,
-    "true_ccw_index": 1,
+    "true_ccw_index": 3,
     "display_pin_label": "GND2"
   },
   {
@@ -1851,14 +2458,14 @@
     "schematic_component_id": "schematic_component_0",
     "center": {
       "x": 1.2000000000000002,
-      "y": 1.4000000000000001
+      "y": 1.6000000000000003
     },
     "source_port_id": "source_port_2",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
     "pin_number": 3,
-    "true_ccw_index": 11,
+    "true_ccw_index": 15,
     "display_pin_label": "VBUS1"
   },
   {
@@ -1867,14 +2474,14 @@
     "schematic_component_id": "schematic_component_0",
     "center": {
       "x": 1.2000000000000002,
-      "y": 1.2
+      "y": 1.4000000000000001
     },
     "source_port_id": "source_port_3",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
     "pin_number": 4,
-    "true_ccw_index": 10,
+    "true_ccw_index": 14,
     "display_pin_label": "VBUS2"
   },
   {
@@ -1883,14 +2490,14 @@
     "schematic_component_id": "schematic_component_0",
     "center": {
       "x": 1.2000000000000002,
-      "y": -1.4000000000000001
+      "y": -1.2000000000000002
     },
     "source_port_id": "source_port_4",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
     "pin_number": 5,
-    "true_ccw_index": 2,
+    "true_ccw_index": 6,
     "display_pin_label": "SBU2"
   },
   {
@@ -1899,14 +2506,14 @@
     "schematic_component_id": "schematic_component_0",
     "center": {
       "x": 1.2000000000000002,
-      "y": -0.6000000000000001
+      "y": -0.40000000000000036
     },
     "source_port_id": "source_port_5",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
     "pin_number": 6,
-    "true_ccw_index": 5,
+    "true_ccw_index": 9,
     "display_pin_label": "CC1"
   },
   {
@@ -1915,14 +2522,14 @@
     "schematic_component_id": "schematic_component_0",
     "center": {
       "x": 1.2000000000000002,
-      "y": 0
+      "y": 0.19999999999999973
     },
     "source_port_id": "source_port_6",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
     "pin_number": 7,
-    "true_ccw_index": 6,
+    "true_ccw_index": 10,
     "display_pin_label": "DM2"
   },
   {
@@ -1931,14 +2538,14 @@
     "schematic_component_id": "schematic_component_0",
     "center": {
       "x": 1.2000000000000002,
-      "y": 0.5999999999999999
+      "y": 0.8
     },
     "source_port_id": "source_port_7",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
     "pin_number": 8,
-    "true_ccw_index": 9,
+    "true_ccw_index": 13,
     "display_pin_label": "DP1"
   },
   {
@@ -1947,14 +2554,14 @@
     "schematic_component_id": "schematic_component_0",
     "center": {
       "x": 1.2000000000000002,
-      "y": 0.19999999999999996
+      "y": 0.3999999999999997
     },
     "source_port_id": "source_port_8",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
     "pin_number": 9,
-    "true_ccw_index": 7,
+    "true_ccw_index": 11,
     "display_pin_label": "DM1"
   },
   {
@@ -1963,14 +2570,14 @@
     "schematic_component_id": "schematic_component_0",
     "center": {
       "x": 1.2000000000000002,
-      "y": 0.3999999999999999
+      "y": 0.5999999999999999
     },
     "source_port_id": "source_port_9",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
     "pin_number": 10,
-    "true_ccw_index": 8,
+    "true_ccw_index": 12,
     "display_pin_label": "DP2"
   },
   {
@@ -1979,14 +2586,14 @@
     "schematic_component_id": "schematic_component_0",
     "center": {
       "x": 1.2000000000000002,
-      "y": -1.2000000000000002
+      "y": -1.0000000000000002
     },
     "source_port_id": "source_port_10",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
     "pin_number": 11,
-    "true_ccw_index": 3,
+    "true_ccw_index": 7,
     "display_pin_label": "SBU1"
   },
   {
@@ -1995,14 +2602,14 @@
     "schematic_component_id": "schematic_component_0",
     "center": {
       "x": 1.2000000000000002,
-      "y": -0.8
+      "y": -0.6000000000000003
     },
     "source_port_id": "source_port_11",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
     "pin_number": 12,
-    "true_ccw_index": 4,
+    "true_ccw_index": 8,
     "display_pin_label": "CC2"
   },
   {
@@ -2064,12 +2671,76 @@
   {
     "type": "schematic_port",
     "schematic_port_id": "schematic_port_16",
+    "schematic_component_id": "schematic_component_0",
+    "center": {
+      "x": -1.2000000000000002,
+      "y": 0.1
+    },
+    "source_port_id": "source_port_16",
+    "facing_direction": "left",
+    "distance_from_component_edge": 0.4,
+    "side_of_component": "left",
+    "pin_number": 17,
+    "true_ccw_index": 0,
+    "display_pin_label": "ALT0"
+  },
+  {
+    "type": "schematic_port",
+    "schematic_port_id": "schematic_port_17",
+    "schematic_component_id": "schematic_component_0",
+    "center": {
+      "x": 1.2000000000000002,
+      "y": -1.6000000000000003
+    },
+    "source_port_id": "source_port_17",
+    "facing_direction": "right",
+    "distance_from_component_edge": 0.4,
+    "side_of_component": "right",
+    "pin_number": 18,
+    "true_ccw_index": 4,
+    "display_pin_label": "ALT1"
+  },
+  {
+    "type": "schematic_port",
+    "schematic_port_id": "schematic_port_18",
+    "schematic_component_id": "schematic_component_0",
+    "center": {
+      "x": 1.2000000000000002,
+      "y": -1.4000000000000004
+    },
+    "source_port_id": "source_port_18",
+    "facing_direction": "right",
+    "distance_from_component_edge": 0.4,
+    "side_of_component": "right",
+    "pin_number": 19,
+    "true_ccw_index": 5,
+    "display_pin_label": "ALT2"
+  },
+  {
+    "type": "schematic_port",
+    "schematic_port_id": "schematic_port_19",
+    "schematic_component_id": "schematic_component_0",
+    "center": {
+      "x": -1.2000000000000002,
+      "y": -0.1
+    },
+    "source_port_id": "source_port_19",
+    "facing_direction": "left",
+    "distance_from_component_edge": 0.4,
+    "side_of_component": "left",
+    "pin_number": 20,
+    "true_ccw_index": 1,
+    "display_pin_label": "ALT3"
+  },
+  {
+    "type": "schematic_port",
+    "schematic_port_id": "schematic_port_20",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": -1.05,
       "y": 9.5
     },
-    "source_port_id": "source_port_16",
+    "source_port_id": "source_port_20",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2079,13 +2750,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_17",
+    "schematic_port_id": "schematic_port_21",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": -1.05,
       "y": 9.3
     },
-    "source_port_id": "source_port_17",
+    "source_port_id": "source_port_21",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2095,13 +2766,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_18",
+    "schematic_port_id": "schematic_port_22",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": -1.05,
       "y": 9.1
     },
-    "source_port_id": "source_port_18",
+    "source_port_id": "source_port_22",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2111,13 +2782,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_19",
+    "schematic_port_id": "schematic_port_23",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": -1.05,
       "y": 8.9
     },
-    "source_port_id": "source_port_19",
+    "source_port_id": "source_port_23",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2127,13 +2798,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_20",
+    "schematic_port_id": "schematic_port_24",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": -1.05,
       "y": 8.7
     },
-    "source_port_id": "source_port_20",
+    "source_port_id": "source_port_24",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2143,13 +2814,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_21",
+    "schematic_port_id": "schematic_port_25",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": -1.05,
       "y": 8.5
     },
-    "source_port_id": "source_port_21",
+    "source_port_id": "source_port_25",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2159,13 +2830,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_22",
+    "schematic_port_id": "schematic_port_26",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": -1.05,
       "y": 8.3
     },
-    "source_port_id": "source_port_22",
+    "source_port_id": "source_port_26",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2175,13 +2846,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_23",
+    "schematic_port_id": "schematic_port_27",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": -1.05,
       "y": 8.1
     },
-    "source_port_id": "source_port_23",
+    "source_port_id": "source_port_27",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2191,13 +2862,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_24",
+    "schematic_port_id": "schematic_port_28",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": -1.05,
       "y": 7.9
     },
-    "source_port_id": "source_port_24",
+    "source_port_id": "source_port_28",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2207,13 +2878,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_25",
+    "schematic_port_id": "schematic_port_29",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": -1.05,
       "y": 7.7
     },
-    "source_port_id": "source_port_25",
+    "source_port_id": "source_port_29",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2223,13 +2894,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_26",
+    "schematic_port_id": "schematic_port_30",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": -1.05,
       "y": 7.5
     },
-    "source_port_id": "source_port_26",
+    "source_port_id": "source_port_30",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2239,13 +2910,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_27",
+    "schematic_port_id": "schematic_port_31",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": -1.05,
       "y": 7.300000000000001
     },
-    "source_port_id": "source_port_27",
+    "source_port_id": "source_port_31",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2255,13 +2926,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_28",
+    "schematic_port_id": "schematic_port_32",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": -1.05,
       "y": 7.1000000000000005
     },
-    "source_port_id": "source_port_28",
+    "source_port_id": "source_port_32",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2271,13 +2942,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_29",
+    "schematic_port_id": "schematic_port_33",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": -1.05,
       "y": 6.9
     },
-    "source_port_id": "source_port_29",
+    "source_port_id": "source_port_33",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2287,13 +2958,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_30",
+    "schematic_port_id": "schematic_port_34",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": -1.05,
       "y": 6.7
     },
-    "source_port_id": "source_port_30",
+    "source_port_id": "source_port_34",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2303,13 +2974,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_31",
+    "schematic_port_id": "schematic_port_35",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": -1.05,
       "y": 6.5
     },
-    "source_port_id": "source_port_31",
+    "source_port_id": "source_port_35",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2319,13 +2990,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_32",
+    "schematic_port_id": "schematic_port_36",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": 1.05,
       "y": 6.5
     },
-    "source_port_id": "source_port_32",
+    "source_port_id": "source_port_36",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2335,13 +3006,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_33",
+    "schematic_port_id": "schematic_port_37",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": 1.05,
       "y": 6.699999999999999
     },
-    "source_port_id": "source_port_33",
+    "source_port_id": "source_port_37",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2351,13 +3022,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_34",
+    "schematic_port_id": "schematic_port_38",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": 1.05,
       "y": 6.9
     },
-    "source_port_id": "source_port_34",
+    "source_port_id": "source_port_38",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2367,13 +3038,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_35",
+    "schematic_port_id": "schematic_port_39",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": 1.05,
       "y": 7.1
     },
-    "source_port_id": "source_port_35",
+    "source_port_id": "source_port_39",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2383,13 +3054,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_36",
+    "schematic_port_id": "schematic_port_40",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": 1.05,
       "y": 7.3
     },
-    "source_port_id": "source_port_36",
+    "source_port_id": "source_port_40",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2399,13 +3070,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_37",
+    "schematic_port_id": "schematic_port_41",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": 1.05,
       "y": 7.5
     },
-    "source_port_id": "source_port_37",
+    "source_port_id": "source_port_41",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2415,13 +3086,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_38",
+    "schematic_port_id": "schematic_port_42",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": 1.05,
       "y": 7.699999999999999
     },
-    "source_port_id": "source_port_38",
+    "source_port_id": "source_port_42",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2431,13 +3102,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_39",
+    "schematic_port_id": "schematic_port_43",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": 1.05,
       "y": 7.8999999999999995
     },
-    "source_port_id": "source_port_39",
+    "source_port_id": "source_port_43",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2447,13 +3118,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_40",
+    "schematic_port_id": "schematic_port_44",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": 1.05,
       "y": 8.1
     },
-    "source_port_id": "source_port_40",
+    "source_port_id": "source_port_44",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2463,13 +3134,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_41",
+    "schematic_port_id": "schematic_port_45",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": 1.05,
       "y": 8.299999999999999
     },
-    "source_port_id": "source_port_41",
+    "source_port_id": "source_port_45",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2479,13 +3150,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_42",
+    "schematic_port_id": "schematic_port_46",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": 1.05,
       "y": 8.5
     },
-    "source_port_id": "source_port_42",
+    "source_port_id": "source_port_46",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2495,13 +3166,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_43",
+    "schematic_port_id": "schematic_port_47",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": 1.05,
       "y": 8.7
     },
-    "source_port_id": "source_port_43",
+    "source_port_id": "source_port_47",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2511,13 +3182,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_44",
+    "schematic_port_id": "schematic_port_48",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": 1.05,
       "y": 8.9
     },
-    "source_port_id": "source_port_44",
+    "source_port_id": "source_port_48",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2527,13 +3198,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_45",
+    "schematic_port_id": "schematic_port_49",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": 1.05,
       "y": 9.1
     },
-    "source_port_id": "source_port_45",
+    "source_port_id": "source_port_49",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2543,13 +3214,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_46",
+    "schematic_port_id": "schematic_port_50",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": 1.05,
       "y": 9.3
     },
-    "source_port_id": "source_port_46",
+    "source_port_id": "source_port_50",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2559,13 +3230,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_47",
+    "schematic_port_id": "schematic_port_51",
     "schematic_component_id": "schematic_component_1",
     "center": {
       "x": 1.05,
       "y": 9.5
     },
-    "source_port_id": "source_port_47",
+    "source_port_id": "source_port_51",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2575,13 +3246,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_48",
+    "schematic_port_id": "schematic_port_52",
     "schematic_component_id": "schematic_component_2",
     "center": {
       "x": -16.15,
       "y": -6
     },
-    "source_port_id": "source_port_48",
+    "source_port_id": "source_port_52",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2591,13 +3262,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_49",
+    "schematic_port_id": "schematic_port_53",
     "schematic_component_id": "schematic_component_2",
     "center": {
       "x": -13.85,
       "y": -6
     },
-    "source_port_id": "source_port_49",
+    "source_port_id": "source_port_53",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2607,13 +3278,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_50",
+    "schematic_port_id": "schematic_port_54",
     "schematic_component_id": "schematic_component_3",
     "center": {
       "x": -16.15,
       "y": -3
     },
-    "source_port_id": "source_port_50",
+    "source_port_id": "source_port_54",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2623,13 +3294,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_51",
+    "schematic_port_id": "schematic_port_55",
     "schematic_component_id": "schematic_component_3",
     "center": {
       "x": -13.85,
       "y": -3
     },
-    "source_port_id": "source_port_51",
+    "source_port_id": "source_port_55",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2639,13 +3310,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_52",
+    "schematic_port_id": "schematic_port_56",
     "schematic_component_id": "schematic_component_4",
     "center": {
       "x": -16.15,
       "y": 0
     },
-    "source_port_id": "source_port_52",
+    "source_port_id": "source_port_56",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2655,13 +3326,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_53",
+    "schematic_port_id": "schematic_port_57",
     "schematic_component_id": "schematic_component_4",
     "center": {
       "x": -13.85,
       "y": 0
     },
-    "source_port_id": "source_port_53",
+    "source_port_id": "source_port_57",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2671,13 +3342,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_54",
+    "schematic_port_id": "schematic_port_58",
     "schematic_component_id": "schematic_component_5",
     "center": {
       "x": -5.15,
       "y": 0.375
     },
-    "source_port_id": "source_port_54",
+    "source_port_id": "source_port_58",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2686,13 +3357,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_55",
+    "schematic_port_id": "schematic_port_59",
     "schematic_component_id": "schematic_component_5",
     "center": {
       "x": -2.85,
       "y": 0.375
     },
-    "source_port_id": "source_port_55",
+    "source_port_id": "source_port_59",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2701,13 +3372,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_56",
+    "schematic_port_id": "schematic_port_60",
     "schematic_component_id": "schematic_component_5",
     "center": {
       "x": -5.15,
       "y": -0.375
     },
-    "source_port_id": "source_port_56",
+    "source_port_id": "source_port_60",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -2716,13 +3387,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_57",
+    "schematic_port_id": "schematic_port_61",
     "schematic_component_id": "schematic_component_5",
     "center": {
       "x": -2.85,
       "y": -0.375
     },
-    "source_port_id": "source_port_57",
+    "source_port_id": "source_port_61",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2731,13 +3402,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_58",
+    "schematic_port_id": "schematic_port_62",
     "schematic_component_id": "schematic_component_6",
     "center": {
       "x": -7.5337907,
       "y": -3.9958051999999995
     },
-    "source_port_id": "source_port_58",
+    "source_port_id": "source_port_62",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "pin_number": 1,
@@ -2745,13 +3416,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_59",
+    "schematic_port_id": "schematic_port_63",
     "schematic_component_id": "schematic_component_6",
     "center": {
       "x": -6.466209299999999,
       "y": -3.995258700000001
     },
-    "source_port_id": "source_port_59",
+    "source_port_id": "source_port_63",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "pin_number": 2,
@@ -2759,13 +3430,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_60",
+    "schematic_port_id": "schematic_port_64",
     "schematic_component_id": "schematic_component_7",
     "center": {
       "x": -7.5337907,
       "y": -3.9958051999999995
     },
-    "source_port_id": "source_port_60",
+    "source_port_id": "source_port_64",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "pin_number": 1,
@@ -2773,13 +3444,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_61",
+    "schematic_port_id": "schematic_port_65",
     "schematic_component_id": "schematic_component_7",
     "center": {
       "x": -6.466209299999999,
       "y": -3.995258700000001
     },
-    "source_port_id": "source_port_61",
+    "source_port_id": "source_port_65",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "pin_number": 2,
@@ -2787,13 +3458,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_62",
+    "schematic_port_id": "schematic_port_66",
     "schematic_component_id": "schematic_component_8",
     "center": {
       "x": -7.5337907,
       "y": -3.9958051999999995
     },
-    "source_port_id": "source_port_62",
+    "source_port_id": "source_port_66",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "pin_number": 1,
@@ -2801,13 +3472,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_63",
+    "schematic_port_id": "schematic_port_67",
     "schematic_component_id": "schematic_component_8",
     "center": {
       "x": -6.466209299999999,
       "y": -3.995258700000001
     },
-    "source_port_id": "source_port_63",
+    "source_port_id": "source_port_67",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "pin_number": 2,
@@ -2815,13 +3486,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_64",
+    "schematic_port_id": "schematic_port_68",
     "schematic_component_id": "schematic_component_9",
     "center": {
       "x": -5.85,
       "y": 6.6
     },
-    "source_port_id": "source_port_64",
+    "source_port_id": "source_port_68",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2830,13 +3501,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_65",
+    "schematic_port_id": "schematic_port_69",
     "schematic_component_id": "schematic_component_9",
     "center": {
       "x": -5.85,
       "y": 6.8
     },
-    "source_port_id": "source_port_65",
+    "source_port_id": "source_port_69",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2845,13 +3516,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_66",
+    "schematic_port_id": "schematic_port_70",
     "schematic_component_id": "schematic_component_9",
     "center": {
       "x": -5.85,
       "y": 7
     },
-    "source_port_id": "source_port_66",
+    "source_port_id": "source_port_70",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2860,13 +3531,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_67",
+    "schematic_port_id": "schematic_port_71",
     "schematic_component_id": "schematic_component_9",
     "center": {
       "x": -5.85,
       "y": 7.2
     },
-    "source_port_id": "source_port_67",
+    "source_port_id": "source_port_71",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2875,13 +3546,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_68",
+    "schematic_port_id": "schematic_port_72",
     "schematic_component_id": "schematic_component_9",
     "center": {
       "x": -5.85,
       "y": 7.4
     },
-    "source_port_id": "source_port_68",
+    "source_port_id": "source_port_72",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2890,13 +3561,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_69",
+    "schematic_port_id": "schematic_port_73",
     "schematic_component_id": "schematic_component_9",
     "center": {
       "x": -5.85,
       "y": 7.6
     },
-    "source_port_id": "source_port_69",
+    "source_port_id": "source_port_73",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2905,13 +3576,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_70",
+    "schematic_port_id": "schematic_port_74",
     "schematic_component_id": "schematic_component_9",
     "center": {
       "x": -5.85,
       "y": 7.8
     },
-    "source_port_id": "source_port_70",
+    "source_port_id": "source_port_74",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2920,13 +3591,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_71",
+    "schematic_port_id": "schematic_port_75",
     "schematic_component_id": "schematic_component_9",
     "center": {
       "x": -5.85,
       "y": 8
     },
-    "source_port_id": "source_port_71",
+    "source_port_id": "source_port_75",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2935,13 +3606,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_72",
+    "schematic_port_id": "schematic_port_76",
     "schematic_component_id": "schematic_component_9",
     "center": {
       "x": -5.85,
       "y": 8.2
     },
-    "source_port_id": "source_port_72",
+    "source_port_id": "source_port_76",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2950,13 +3621,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_73",
+    "schematic_port_id": "schematic_port_77",
     "schematic_component_id": "schematic_component_9",
     "center": {
       "x": -5.85,
       "y": 8.4
     },
-    "source_port_id": "source_port_73",
+    "source_port_id": "source_port_77",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2965,13 +3636,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_74",
+    "schematic_port_id": "schematic_port_78",
     "schematic_component_id": "schematic_component_9",
     "center": {
       "x": -5.85,
       "y": 8.6
     },
-    "source_port_id": "source_port_74",
+    "source_port_id": "source_port_78",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2980,13 +3651,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_75",
+    "schematic_port_id": "schematic_port_79",
     "schematic_component_id": "schematic_component_9",
     "center": {
       "x": -5.85,
       "y": 8.799999999999999
     },
-    "source_port_id": "source_port_75",
+    "source_port_id": "source_port_79",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -2995,13 +3666,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_76",
+    "schematic_port_id": "schematic_port_80",
     "schematic_component_id": "schematic_component_9",
     "center": {
       "x": -5.85,
       "y": 9
     },
-    "source_port_id": "source_port_76",
+    "source_port_id": "source_port_80",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -3010,13 +3681,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_77",
+    "schematic_port_id": "schematic_port_81",
     "schematic_component_id": "schematic_component_9",
     "center": {
       "x": -5.85,
       "y": 9.2
     },
-    "source_port_id": "source_port_77",
+    "source_port_id": "source_port_81",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -3025,13 +3696,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_78",
+    "schematic_port_id": "schematic_port_82",
     "schematic_component_id": "schematic_component_9",
     "center": {
       "x": -5.85,
       "y": 9.4
     },
-    "source_port_id": "source_port_78",
+    "source_port_id": "source_port_82",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -3040,13 +3711,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_79",
+    "schematic_port_id": "schematic_port_83",
     "schematic_component_id": "schematic_component_10",
     "center": {
       "x": 5.8,
       "y": 9.4
     },
-    "source_port_id": "source_port_79",
+    "source_port_id": "source_port_83",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -3055,13 +3726,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_80",
+    "schematic_port_id": "schematic_port_84",
     "schematic_component_id": "schematic_component_10",
     "center": {
       "x": 5.8,
       "y": 9.2
     },
-    "source_port_id": "source_port_80",
+    "source_port_id": "source_port_84",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -3070,13 +3741,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_81",
+    "schematic_port_id": "schematic_port_85",
     "schematic_component_id": "schematic_component_10",
     "center": {
       "x": 5.8,
       "y": 9
     },
-    "source_port_id": "source_port_81",
+    "source_port_id": "source_port_85",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -3085,13 +3756,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_82",
+    "schematic_port_id": "schematic_port_86",
     "schematic_component_id": "schematic_component_10",
     "center": {
       "x": 5.8,
       "y": 8.8
     },
-    "source_port_id": "source_port_82",
+    "source_port_id": "source_port_86",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -3100,13 +3771,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_83",
+    "schematic_port_id": "schematic_port_87",
     "schematic_component_id": "schematic_component_10",
     "center": {
       "x": 5.8,
       "y": 8.6
     },
-    "source_port_id": "source_port_83",
+    "source_port_id": "source_port_87",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -3115,13 +3786,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_84",
+    "schematic_port_id": "schematic_port_88",
     "schematic_component_id": "schematic_component_10",
     "center": {
       "x": 5.8,
       "y": 8.4
     },
-    "source_port_id": "source_port_84",
+    "source_port_id": "source_port_88",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -3130,13 +3801,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_85",
+    "schematic_port_id": "schematic_port_89",
     "schematic_component_id": "schematic_component_10",
     "center": {
       "x": 5.8,
       "y": 8.2
     },
-    "source_port_id": "source_port_85",
+    "source_port_id": "source_port_89",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -3145,13 +3816,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_86",
+    "schematic_port_id": "schematic_port_90",
     "schematic_component_id": "schematic_component_10",
     "center": {
       "x": 5.8,
       "y": 8
     },
-    "source_port_id": "source_port_86",
+    "source_port_id": "source_port_90",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -3160,13 +3831,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_87",
+    "schematic_port_id": "schematic_port_91",
     "schematic_component_id": "schematic_component_10",
     "center": {
       "x": 5.8,
       "y": 7.800000000000001
     },
-    "source_port_id": "source_port_87",
+    "source_port_id": "source_port_91",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -3175,13 +3846,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_88",
+    "schematic_port_id": "schematic_port_92",
     "schematic_component_id": "schematic_component_10",
     "center": {
       "x": 5.8,
       "y": 7.6000000000000005
     },
-    "source_port_id": "source_port_88",
+    "source_port_id": "source_port_92",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -3190,13 +3861,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_89",
+    "schematic_port_id": "schematic_port_93",
     "schematic_component_id": "schematic_component_10",
     "center": {
       "x": 5.8,
       "y": 7.4
     },
-    "source_port_id": "source_port_89",
+    "source_port_id": "source_port_93",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -3205,13 +3876,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_90",
+    "schematic_port_id": "schematic_port_94",
     "schematic_component_id": "schematic_component_10",
     "center": {
       "x": 5.8,
       "y": 7.2
     },
-    "source_port_id": "source_port_90",
+    "source_port_id": "source_port_94",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -3220,13 +3891,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_91",
+    "schematic_port_id": "schematic_port_95",
     "schematic_component_id": "schematic_component_10",
     "center": {
       "x": 5.8,
       "y": 7
     },
-    "source_port_id": "source_port_91",
+    "source_port_id": "source_port_95",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -3235,13 +3906,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_92",
+    "schematic_port_id": "schematic_port_96",
     "schematic_component_id": "schematic_component_10",
     "center": {
       "x": 5.8,
       "y": 6.8
     },
-    "source_port_id": "source_port_92",
+    "source_port_id": "source_port_96",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -3250,13 +3921,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_93",
+    "schematic_port_id": "schematic_port_97",
     "schematic_component_id": "schematic_component_10",
     "center": {
       "x": 5.8,
       "y": 6.6
     },
-    "source_port_id": "source_port_93",
+    "source_port_id": "source_port_97",
     "facing_direction": "left",
     "distance_from_component_edge": 0.4,
     "side_of_component": "left",
@@ -3265,13 +3936,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_94",
+    "schematic_port_id": "schematic_port_98",
     "schematic_component_id": "schematic_component_11",
     "center": {
       "x": 6.6,
       "y": -5.2
     },
-    "source_port_id": "source_port_94",
+    "source_port_id": "source_port_98",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -3280,13 +3951,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_95",
+    "schematic_port_id": "schematic_port_99",
     "schematic_component_id": "schematic_component_11",
     "center": {
       "x": 6.6,
       "y": -5
     },
-    "source_port_id": "source_port_95",
+    "source_port_id": "source_port_99",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -3295,13 +3966,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_96",
+    "schematic_port_id": "schematic_port_100",
     "schematic_component_id": "schematic_component_11",
     "center": {
       "x": 6.6,
       "y": -4.8
     },
-    "source_port_id": "source_port_96",
+    "source_port_id": "source_port_100",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -3310,13 +3981,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_97",
+    "schematic_port_id": "schematic_port_101",
     "schematic_component_id": "schematic_component_12",
     "center": {
       "x": 4.6,
       "y": -5.2
     },
-    "source_port_id": "source_port_97",
+    "source_port_id": "source_port_101",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -3325,13 +3996,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_98",
+    "schematic_port_id": "schematic_port_102",
     "schematic_component_id": "schematic_component_12",
     "center": {
       "x": 4.6,
       "y": -5
     },
-    "source_port_id": "source_port_98",
+    "source_port_id": "source_port_102",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -3340,13 +4011,13 @@
   },
   {
     "type": "schematic_port",
-    "schematic_port_id": "schematic_port_99",
+    "schematic_port_id": "schematic_port_103",
     "schematic_component_id": "schematic_component_12",
     "center": {
       "x": 4.6,
       "y": -4.8
     },
-    "source_port_id": "source_port_99",
+    "source_port_id": "source_port_103",
     "facing_direction": "right",
     "distance_from_component_edge": 0.4,
     "side_of_component": "right",
@@ -3430,7 +4101,7 @@
         "to": {
           "route_type": "wire",
           "x": -1.8000000000000003,
-          "y": 2.6,
+          "y": 2.8000000000000003,
           "width": 0.1,
           "layer": "top"
         }
@@ -3439,14 +4110,14 @@
         "from": {
           "route_type": "wire",
           "x": -1.8000000000000003,
-          "y": 2.6,
+          "y": 2.8000000000000003,
           "width": 0.1,
           "layer": "top"
         },
         "to": {
           "route_type": "wire",
           "x": -7.533790700000001,
-          "y": 2.6,
+          "y": 2.8000000000000003,
           "width": 0.1,
           "layer": "top"
         }
@@ -3455,14 +4126,14 @@
         "from": {
           "route_type": "wire",
           "x": -7.533790700000001,
-          "y": 2.6,
+          "y": 2.8000000000000003,
           "width": 0.1,
           "layer": "top"
         },
         "to": {
           "route_type": "wire",
           "x": -7.533790700000001,
-          "y": -3.775002,
+          "y": -3.7750019999999993,
           "width": 0.1,
           "layer": "top"
         }
@@ -3471,7 +4142,7 @@
         "from": {
           "route_type": "wire",
           "x": -7.533790700000001,
-          "y": -3.775002,
+          "y": -3.7750019999999993,
           "width": 0.1,
           "layer": "top"
         },
@@ -4167,7 +4838,7 @@
         "to": {
           "route_type": "wire",
           "x": 1.0499999999999998,
-          "y": 3.2500000000000004,
+          "y": 3.4500000000000006,
           "width": 0.1,
           "layer": "top"
         }
@@ -4176,14 +4847,14 @@
         "from": {
           "route_type": "wire",
           "x": 1.0499999999999998,
-          "y": 3.2500000000000004,
+          "y": 3.4500000000000006,
           "width": 0.1,
           "layer": "top"
         },
         "to": {
           "route_type": "wire",
           "x": 1.05,
-          "y": 3.2500000000000004,
+          "y": 3.4500000000000006,
           "width": 0.1,
           "layer": "top"
         }
@@ -4192,7 +4863,7 @@
         "from": {
           "route_type": "wire",
           "x": 1.05,
-          "y": 3.2500000000000004,
+          "y": 3.4500000000000006,
           "width": 0.1,
           "layer": "top"
         },
@@ -4479,7 +5150,7 @@
         "to": {
           "route_type": "wire",
           "x": 1.15,
-          "y": 3.3500000000000005,
+          "y": 3.5500000000000007,
           "width": 0.1,
           "layer": "top"
         }
@@ -4488,14 +5159,14 @@
         "from": {
           "route_type": "wire",
           "x": 1.15,
-          "y": 3.3500000000000005,
+          "y": 3.5500000000000007,
           "width": 0.1,
           "layer": "top"
         },
         "to": {
           "route_type": "wire",
           "x": 1.1500000000000001,
-          "y": 3.3500000000000005,
+          "y": 3.5500000000000007,
           "width": 0.1,
           "layer": "top"
         }
@@ -4504,7 +5175,7 @@
         "from": {
           "route_type": "wire",
           "x": 1.1500000000000001,
-          "y": 3.3500000000000005,
+          "y": 3.5500000000000007,
           "width": 0.1,
           "layer": "top"
         },
@@ -4941,7 +5612,7 @@
         "to": {
           "route_type": "wire",
           "x": 1.25,
-          "y": 3.4500000000000006,
+          "y": 3.650000000000001,
           "width": 0.1,
           "layer": "top"
         }
@@ -4950,14 +5621,14 @@
         "from": {
           "route_type": "wire",
           "x": 1.25,
-          "y": 3.4500000000000006,
+          "y": 3.650000000000001,
           "width": 0.1,
           "layer": "top"
         },
         "to": {
           "route_type": "wire",
           "x": 1.2500000000000002,
-          "y": 3.4500000000000006,
+          "y": 3.650000000000001,
           "width": 0.1,
           "layer": "top"
         }
@@ -4966,7 +5637,7 @@
         "from": {
           "route_type": "wire",
           "x": 1.2500000000000002,
-          "y": 3.4500000000000006,
+          "y": 3.650000000000001,
           "width": 0.1,
           "layer": "top"
         },
@@ -5609,7 +6280,7 @@
         "to": {
           "route_type": "wire",
           "x": 1.35,
-          "y": 3.5500000000000007,
+          "y": 3.750000000000001,
           "width": 0.1,
           "layer": "top"
         }
@@ -5618,14 +6289,14 @@
         "from": {
           "route_type": "wire",
           "x": 1.35,
-          "y": 3.5500000000000007,
+          "y": 3.750000000000001,
           "width": 0.1,
           "layer": "top"
         },
         "to": {
           "route_type": "wire",
           "x": 1.3500000000000003,
-          "y": 3.5500000000000007,
+          "y": 3.750000000000001,
           "width": 0.1,
           "layer": "top"
         }
@@ -5634,7 +6305,7 @@
         "from": {
           "route_type": "wire",
           "x": 1.3500000000000003,
-          "y": 3.5500000000000007,
+          "y": 3.750000000000001,
           "width": 0.1,
           "layer": "top"
         },
@@ -10456,7 +11127,7 @@
       "x": 0,
       "y": 20.5
     },
-    "width": 6.579999837440005,
+    "width": 6.58,
     "height": 1.5,
     "layer": "top",
     "rotation": 0,
@@ -10469,7 +11140,7 @@
       "x": 0,
       "y": 18.5
     },
-    "width": 6.579999837440005,
+    "width": 6.58,
     "height": 1.5,
     "layer": "top",
     "rotation": 0,
@@ -10507,57 +11178,81 @@
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_0",
     "pcb_component_id": "pcb_component_0",
+    "pcb_port_id": "pcb_port_18",
     "outer_width": 1.1999975999999999,
     "outer_height": 1.7999964,
     "hole_width": 0.7999983999999999,
     "hole_height": 1.3999972,
     "shape": "pill",
-    "port_hints": ["alt_2"],
+    "port_hints": [
+      "alt_2"
+    ],
     "x": 4.32511199999999,
     "y": -19.274086349999948,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_1",
     "pcb_component_id": "pcb_component_0",
+    "pcb_port_id": "pcb_port_17",
     "outer_width": 1.1999975999999999,
     "outer_height": 1.9999959999999999,
     "hole_width": 0.7999983999999999,
     "hole_height": 1.5999968,
     "shape": "pill",
-    "port_hints": ["alt_1"],
+    "port_hints": [
+      "alt_1"
+    ],
     "x": 4.32511199999999,
     "y": -15.094262350000122,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_2",
     "pcb_component_id": "pcb_component_0",
+    "pcb_port_id": "pcb_port_16",
     "outer_width": 1.1999975999999999,
     "outer_height": 1.9999959999999999,
     "hole_width": 0.7999983999999999,
     "hole_height": 1.5999968,
     "shape": "pill",
-    "port_hints": ["alt_0"],
+    "port_hints": [
+      "alt_0"
+    ],
     "x": -4.32511199999999,
     "y": -15.094262350000122,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_3",
     "pcb_component_id": "pcb_component_0",
+    "pcb_port_id": "pcb_port_19",
     "outer_width": 1.1999975999999999,
     "outer_height": 1.7999964,
     "hole_width": 0.7999983999999999,
     "hole_height": 1.3999972,
     "shape": "pill",
-    "port_hints": ["alt_3"],
+    "port_hints": [
+      "alt_3"
+    ],
     "x": -4.32511199999999,
     "y": -19.274086349999948,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_smtpad",
@@ -10568,7 +11263,9 @@
     "shape": "rect",
     "width": 0.29999939999999997,
     "height": 1.2999973999999999,
-    "port_hints": ["B8"],
+    "port_hints": [
+      "B8"
+    ],
     "x": -1.7500600000000759,
     "y": -14.05091295000011
   },
@@ -10593,7 +11290,9 @@
     "shape": "rect",
     "width": 0.29999939999999997,
     "height": 1.2999973999999999,
-    "port_hints": ["A5"],
+    "port_hints": [
+      "A5"
+    ],
     "x": -1.2499339999999393,
     "y": -14.05091295000011
   },
@@ -10618,7 +11317,9 @@
     "shape": "rect",
     "width": 0.29999939999999997,
     "height": 1.2999973999999999,
-    "port_hints": ["B7"],
+    "port_hints": [
+      "B7"
+    ],
     "x": -0.7500619999999572,
     "y": -14.05091295000011
   },
@@ -10643,7 +11344,9 @@
     "shape": "rect",
     "width": 0.29999939999999997,
     "height": 1.2999973999999999,
-    "port_hints": ["A6"],
+    "port_hints": [
+      "A6"
+    ],
     "x": -0.2499359999999342,
     "y": -14.05091295000011
   },
@@ -10668,7 +11371,9 @@
     "shape": "rect",
     "width": 0.29999939999999997,
     "height": 1.2999973999999999,
-    "port_hints": ["A7"],
+    "port_hints": [
+      "A7"
+    ],
     "x": 0.2499359999999342,
     "y": -14.05091295000011
   },
@@ -10693,7 +11398,9 @@
     "shape": "rect",
     "width": 0.29999939999999997,
     "height": 1.2999973999999999,
-    "port_hints": ["B6"],
+    "port_hints": [
+      "B6"
+    ],
     "x": 0.7500619999999572,
     "y": -14.05091295000011
   },
@@ -10718,7 +11425,9 @@
     "shape": "rect",
     "width": 0.29999939999999997,
     "height": 1.2999973999999999,
-    "port_hints": ["A8"],
+    "port_hints": [
+      "A8"
+    ],
     "x": 1.2496799999998984,
     "y": -14.05091295000011
   },
@@ -10743,7 +11452,9 @@
     "shape": "rect",
     "width": 0.29999939999999997,
     "height": 1.2999973999999999,
-    "port_hints": ["B5"],
+    "port_hints": [
+      "B5"
+    ],
     "x": 1.7500600000000759,
     "y": -14.05091295000011
   },
@@ -10768,7 +11479,9 @@
     "shape": "rect",
     "width": 0.29999939999999997,
     "height": 1.2999973999999999,
-    "port_hints": ["A1"],
+    "port_hints": [
+      "A1"
+    ],
     "x": -3.3500060000000076,
     "y": -14.05091295000011
   },
@@ -10793,7 +11506,9 @@
     "shape": "rect",
     "width": 0.29999939999999997,
     "height": 1.2999973999999999,
-    "port_hints": ["B12"],
+    "port_hints": [
+      "B12"
+    ],
     "x": -3.0500319999999874,
     "y": -14.05091295000011
   },
@@ -10818,7 +11533,9 @@
     "shape": "rect",
     "width": 0.29999939999999997,
     "height": 1.2999973999999999,
-    "port_hints": ["A4"],
+    "port_hints": [
+      "A4"
+    ],
     "x": -2.5499059999999645,
     "y": -14.05091295000011
   },
@@ -10843,7 +11560,9 @@
     "shape": "rect",
     "width": 0.29999939999999997,
     "height": 1.2999973999999999,
-    "port_hints": ["B9"],
+    "port_hints": [
+      "B9"
+    ],
     "x": -2.249932000000058,
     "y": -14.05091295000011
   },
@@ -10868,7 +11587,9 @@
     "shape": "rect",
     "width": 0.29999939999999997,
     "height": 1.2999973999999999,
-    "port_hints": ["B4"],
+    "port_hints": [
+      "B4"
+    ],
     "x": 2.249932000000058,
     "y": -14.05091295000011
   },
@@ -10893,7 +11614,9 @@
     "shape": "rect",
     "width": 0.29999939999999997,
     "height": 1.2999973999999999,
-    "port_hints": ["A9"],
+    "port_hints": [
+      "A9"
+    ],
     "x": 2.5501600000000053,
     "y": -14.05091295000011
   },
@@ -10918,7 +11641,9 @@
     "shape": "rect",
     "width": 0.29999939999999997,
     "height": 1.2999973999999999,
-    "port_hints": ["B1"],
+    "port_hints": [
+      "B1"
+    ],
     "x": 3.050032000000101,
     "y": -14.05091295000011
   },
@@ -10943,7 +11668,9 @@
     "shape": "rect",
     "width": 0.29999939999999997,
     "height": 1.2999973999999999,
-    "port_hints": ["A12"],
+    "port_hints": [
+      "A12"
+    ],
     "x": 3.3500060000000076,
     "y": -14.05091295000011
   },
@@ -11035,12 +11762,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_16",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_16",
+    "pcb_port_id": "pcb_port_20",
     "layer": "top",
     "shape": "rect",
     "width": 0.25,
     "height": 1,
-    "port_hints": ["1"],
+    "port_hints": [
+      "1"
+    ],
     "x": -1.7500000000000002,
     "y": -11.5
   },
@@ -11060,12 +11789,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_17",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_17",
+    "pcb_port_id": "pcb_port_21",
     "layer": "top",
     "shape": "rect",
     "width": 0.25,
     "height": 1,
-    "port_hints": ["2"],
+    "port_hints": [
+      "2"
+    ],
     "x": -1.2500000000000002,
     "y": -11.5
   },
@@ -11085,12 +11816,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_18",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_18",
+    "pcb_port_id": "pcb_port_22",
     "layer": "top",
     "shape": "rect",
     "width": 0.25,
     "height": 1,
-    "port_hints": ["3"],
+    "port_hints": [
+      "3"
+    ],
     "x": -0.7500000000000002,
     "y": -11.5
   },
@@ -11110,12 +11843,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_19",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_19",
+    "pcb_port_id": "pcb_port_23",
     "layer": "top",
     "shape": "rect",
     "width": 0.25,
     "height": 1,
-    "port_hints": ["4"],
+    "port_hints": [
+      "4"
+    ],
     "x": -0.2500000000000002,
     "y": -11.5
   },
@@ -11135,12 +11870,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_20",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_20",
+    "pcb_port_id": "pcb_port_24",
     "layer": "top",
     "shape": "rect",
     "width": 0.25,
     "height": 1,
-    "port_hints": ["5"],
+    "port_hints": [
+      "5"
+    ],
     "x": 0.24999999999999978,
     "y": -11.5
   },
@@ -11160,12 +11897,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_21",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_21",
+    "pcb_port_id": "pcb_port_25",
     "layer": "top",
     "shape": "rect",
     "width": 0.25,
     "height": 1,
-    "port_hints": ["6"],
+    "port_hints": [
+      "6"
+    ],
     "x": 0.7499999999999998,
     "y": -11.5
   },
@@ -11185,12 +11924,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_22",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_22",
+    "pcb_port_id": "pcb_port_26",
     "layer": "top",
     "shape": "rect",
     "width": 0.25,
     "height": 1,
-    "port_hints": ["7"],
+    "port_hints": [
+      "7"
+    ],
     "x": 1.2499999999999998,
     "y": -11.5
   },
@@ -11210,12 +11951,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_23",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_23",
+    "pcb_port_id": "pcb_port_27",
     "layer": "top",
     "shape": "rect",
     "width": 0.25,
     "height": 1,
-    "port_hints": ["8"],
+    "port_hints": [
+      "8"
+    ],
     "x": 1.7499999999999998,
     "y": -11.5
   },
@@ -11235,12 +11978,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_24",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_24",
+    "pcb_port_id": "pcb_port_28",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 0.25,
-    "port_hints": ["9"],
+    "port_hints": [
+      "9"
+    ],
     "x": 3.5,
     "y": -9.75
   },
@@ -11260,12 +12005,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_25",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_25",
+    "pcb_port_id": "pcb_port_29",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 0.25,
-    "port_hints": ["10"],
+    "port_hints": [
+      "10"
+    ],
     "x": 3.5,
     "y": -9.25
   },
@@ -11285,12 +12032,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_26",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_26",
+    "pcb_port_id": "pcb_port_30",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 0.25,
-    "port_hints": ["11"],
+    "port_hints": [
+      "11"
+    ],
     "x": 3.5,
     "y": -8.75
   },
@@ -11310,12 +12059,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_27",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_27",
+    "pcb_port_id": "pcb_port_31",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 0.25,
-    "port_hints": ["12"],
+    "port_hints": [
+      "12"
+    ],
     "x": 3.5,
     "y": -8.25
   },
@@ -11335,12 +12086,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_28",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_28",
+    "pcb_port_id": "pcb_port_32",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 0.25,
-    "port_hints": ["13"],
+    "port_hints": [
+      "13"
+    ],
     "x": 3.5,
     "y": -7.75
   },
@@ -11360,12 +12113,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_29",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_29",
+    "pcb_port_id": "pcb_port_33",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 0.25,
-    "port_hints": ["14"],
+    "port_hints": [
+      "14"
+    ],
     "x": 3.5,
     "y": -7.25
   },
@@ -11385,12 +12140,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_30",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_30",
+    "pcb_port_id": "pcb_port_34",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 0.25,
-    "port_hints": ["15"],
+    "port_hints": [
+      "15"
+    ],
     "x": 3.5,
     "y": -6.75
   },
@@ -11410,12 +12167,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_31",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_31",
+    "pcb_port_id": "pcb_port_35",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 0.25,
-    "port_hints": ["16"],
+    "port_hints": [
+      "16"
+    ],
     "x": 3.5,
     "y": -6.25
   },
@@ -11435,12 +12194,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_32",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_32",
+    "pcb_port_id": "pcb_port_36",
     "layer": "top",
     "shape": "rect",
     "width": 0.25,
     "height": 1,
-    "port_hints": ["17"],
+    "port_hints": [
+      "17"
+    ],
     "x": 1.7500000000000002,
     "y": -4.5
   },
@@ -11460,12 +12221,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_33",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_33",
+    "pcb_port_id": "pcb_port_37",
     "layer": "top",
     "shape": "rect",
     "width": 0.25,
     "height": 1,
-    "port_hints": ["18"],
+    "port_hints": [
+      "18"
+    ],
     "x": 1.2500000000000002,
     "y": -4.5
   },
@@ -11485,12 +12248,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_34",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_34",
+    "pcb_port_id": "pcb_port_38",
     "layer": "top",
     "shape": "rect",
     "width": 0.25,
     "height": 1,
-    "port_hints": ["19"],
+    "port_hints": [
+      "19"
+    ],
     "x": 0.7500000000000002,
     "y": -4.5
   },
@@ -11510,12 +12275,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_35",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_35",
+    "pcb_port_id": "pcb_port_39",
     "layer": "top",
     "shape": "rect",
     "width": 0.25,
     "height": 1,
-    "port_hints": ["20"],
+    "port_hints": [
+      "20"
+    ],
     "x": 0.2500000000000002,
     "y": -4.5
   },
@@ -11535,12 +12302,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_36",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_36",
+    "pcb_port_id": "pcb_port_40",
     "layer": "top",
     "shape": "rect",
     "width": 0.25,
     "height": 1,
-    "port_hints": ["21"],
+    "port_hints": [
+      "21"
+    ],
     "x": -0.24999999999999978,
     "y": -4.5
   },
@@ -11560,12 +12329,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_37",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_37",
+    "pcb_port_id": "pcb_port_41",
     "layer": "top",
     "shape": "rect",
     "width": 0.25,
     "height": 1,
-    "port_hints": ["22"],
+    "port_hints": [
+      "22"
+    ],
     "x": -0.7499999999999998,
     "y": -4.5
   },
@@ -11585,12 +12356,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_38",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_38",
+    "pcb_port_id": "pcb_port_42",
     "layer": "top",
     "shape": "rect",
     "width": 0.25,
     "height": 1,
-    "port_hints": ["23"],
+    "port_hints": [
+      "23"
+    ],
     "x": -1.2499999999999998,
     "y": -4.5
   },
@@ -11610,12 +12383,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_39",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_39",
+    "pcb_port_id": "pcb_port_43",
     "layer": "top",
     "shape": "rect",
     "width": 0.25,
     "height": 1,
-    "port_hints": ["24"],
+    "port_hints": [
+      "24"
+    ],
     "x": -1.7499999999999998,
     "y": -4.5
   },
@@ -11635,12 +12410,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_40",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_40",
+    "pcb_port_id": "pcb_port_44",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 0.25,
-    "port_hints": ["25"],
+    "port_hints": [
+      "25"
+    ],
     "x": -3.5,
     "y": -6.25
   },
@@ -11660,12 +12437,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_41",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_41",
+    "pcb_port_id": "pcb_port_45",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 0.25,
-    "port_hints": ["26"],
+    "port_hints": [
+      "26"
+    ],
     "x": -3.5,
     "y": -6.75
   },
@@ -11685,12 +12464,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_42",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_42",
+    "pcb_port_id": "pcb_port_46",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 0.25,
-    "port_hints": ["27"],
+    "port_hints": [
+      "27"
+    ],
     "x": -3.5,
     "y": -7.25
   },
@@ -11710,12 +12491,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_43",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_43",
+    "pcb_port_id": "pcb_port_47",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 0.25,
-    "port_hints": ["28"],
+    "port_hints": [
+      "28"
+    ],
     "x": -3.5,
     "y": -7.75
   },
@@ -11735,12 +12518,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_44",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_44",
+    "pcb_port_id": "pcb_port_48",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 0.25,
-    "port_hints": ["29"],
+    "port_hints": [
+      "29"
+    ],
     "x": -3.5,
     "y": -8.25
   },
@@ -11760,12 +12545,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_45",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_45",
+    "pcb_port_id": "pcb_port_49",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 0.25,
-    "port_hints": ["30"],
+    "port_hints": [
+      "30"
+    ],
     "x": -3.5,
     "y": -8.75
   },
@@ -11785,12 +12572,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_46",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_46",
+    "pcb_port_id": "pcb_port_50",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 0.25,
-    "port_hints": ["31"],
+    "port_hints": [
+      "31"
+    ],
     "x": -3.5,
     "y": -9.25
   },
@@ -11810,12 +12599,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_47",
     "pcb_component_id": "pcb_component_1",
-    "pcb_port_id": "pcb_port_47",
+    "pcb_port_id": "pcb_port_51",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 0.25,
-    "port_hints": ["32"],
+    "port_hints": [
+      "32"
+    ],
     "x": -3.5,
     "y": -9.75
   },
@@ -11944,12 +12735,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_48",
     "pcb_component_id": "pcb_component_2",
-    "pcb_port_id": "pcb_port_49",
+    "pcb_port_id": "pcb_port_53",
     "layer": "top",
     "shape": "rect",
     "width": 0.7999983999999999,
     "height": 0.7999983999999999,
-    "port_hints": ["2"],
+    "port_hints": [
+      "2"
+    ],
     "x": -4.996571000000017,
     "y": 12.200408000000039
   },
@@ -11969,12 +12762,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_49",
     "pcb_component_id": "pcb_component_2",
-    "pcb_port_id": "pcb_port_48",
+    "pcb_port_id": "pcb_port_52",
     "layer": "top",
     "shape": "rect",
     "width": 0.7999983999999999,
     "height": 0.7999983999999999,
-    "port_hints": ["1"],
+    "port_hints": [
+      "1"
+    ],
     "x": -5.003428999999983,
     "y": 13.799591999999961
   },
@@ -12214,12 +13009,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_50",
     "pcb_component_id": "pcb_component_3",
-    "pcb_port_id": "pcb_port_51",
+    "pcb_port_id": "pcb_port_55",
     "layer": "top",
     "shape": "rect",
     "width": 0.7999983999999999,
     "height": 0.7999983999999999,
-    "port_hints": ["2"],
+    "port_hints": [
+      "2"
+    ],
     "x": 0.003428999999982758,
     "y": 12.200408000000039
   },
@@ -12239,12 +13036,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_51",
     "pcb_component_id": "pcb_component_3",
-    "pcb_port_id": "pcb_port_50",
+    "pcb_port_id": "pcb_port_54",
     "layer": "top",
     "shape": "rect",
     "width": 0.7999983999999999,
     "height": 0.7999983999999999,
-    "port_hints": ["1"],
+    "port_hints": [
+      "1"
+    ],
     "x": -0.003428999999982758,
     "y": 13.799591999999961
   },
@@ -12484,12 +13283,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_52",
     "pcb_component_id": "pcb_component_4",
-    "pcb_port_id": "pcb_port_53",
+    "pcb_port_id": "pcb_port_57",
     "layer": "top",
     "shape": "rect",
     "width": 0.7999983999999999,
     "height": 0.7999983999999999,
-    "port_hints": ["2"],
+    "port_hints": [
+      "2"
+    ],
     "x": 5.003428999999983,
     "y": 12.200408000000039
   },
@@ -12509,12 +13310,14 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_53",
     "pcb_component_id": "pcb_component_4",
-    "pcb_port_id": "pcb_port_52",
+    "pcb_port_id": "pcb_port_56",
     "layer": "top",
     "shape": "rect",
     "width": 0.7999983999999999,
     "height": 0.7999983999999999,
-    "port_hints": ["1"],
+    "port_hints": [
+      "1"
+    ],
     "x": 4.996571000000017,
     "y": 13.799591999999961
   },
@@ -12754,53 +13557,73 @@
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_4",
     "pcb_component_id": "pcb_component_5",
-    "pcb_port_id": "pcb_port_57",
+    "pcb_port_id": "pcb_port_61",
     "outer_diameter": 1.9999959999999999,
     "hole_diameter": 1.3000228,
     "shape": "circle",
-    "port_hints": ["4"],
+    "port_hints": [
+      "4"
+    ],
     "x": 3.2499299999998357,
     "y": -0.249932000000058,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_5",
     "pcb_component_id": "pcb_component_5",
-    "pcb_port_id": "pcb_port_55",
+    "pcb_port_id": "pcb_port_59",
     "outer_diameter": 1.9999959999999999,
     "hole_diameter": 1.3000228,
     "shape": "circle",
-    "port_hints": ["2"],
+    "port_hints": [
+      "2"
+    ],
     "x": 3.2499299999998357,
     "y": 4.249932000000058,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_6",
     "pcb_component_id": "pcb_component_5",
-    "pcb_port_id": "pcb_port_54",
+    "pcb_port_id": "pcb_port_58",
     "outer_diameter": 1.9999959999999999,
     "hole_diameter": 1.3000228,
     "shape": "circle",
-    "port_hints": ["1"],
+    "port_hints": [
+      "1"
+    ],
     "x": -3.2499299999999494,
     "y": 4.249932000000058,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_7",
     "pcb_component_id": "pcb_component_5",
-    "pcb_port_id": "pcb_port_56",
+    "pcb_port_id": "pcb_port_60",
     "outer_diameter": 1.9999959999999999,
     "hole_diameter": 1.3000228,
     "shape": "circle",
-    "port_hints": ["3"],
+    "port_hints": [
+      "3"
+    ],
     "x": -3.2499299999999494,
     "y": -0.249932000000058,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_silkscreen_path",
@@ -12874,12 +13697,15 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_54",
     "pcb_component_id": "pcb_component_6",
-    "pcb_port_id": "pcb_port_58",
+    "pcb_port_id": "pcb_port_62",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 1,
-    "port_hints": ["1", "left"],
+    "port_hints": [
+      "1",
+      "left"
+    ],
     "x": 5,
     "y": 7.15
   },
@@ -12899,12 +13725,15 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_55",
     "pcb_component_id": "pcb_component_6",
-    "pcb_port_id": "pcb_port_59",
+    "pcb_port_id": "pcb_port_63",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 1,
-    "port_hints": ["2", "right"],
+    "port_hints": [
+      "2",
+      "right"
+    ],
     "x": 5,
     "y": 8.85
   },
@@ -12924,12 +13753,15 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_56",
     "pcb_component_id": "pcb_component_7",
-    "pcb_port_id": "pcb_port_60",
+    "pcb_port_id": "pcb_port_64",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 1,
-    "port_hints": ["1", "left"],
+    "port_hints": [
+      "1",
+      "left"
+    ],
     "x": -5.204748896376251e-17,
     "y": 7.15
   },
@@ -12949,12 +13781,15 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_57",
     "pcb_component_id": "pcb_component_7",
-    "pcb_port_id": "pcb_port_61",
+    "pcb_port_id": "pcb_port_65",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 1,
-    "port_hints": ["2", "right"],
+    "port_hints": [
+      "2",
+      "right"
+    ],
     "x": 5.204748896376251e-17,
     "y": 8.85
   },
@@ -12974,12 +13809,15 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_58",
     "pcb_component_id": "pcb_component_8",
-    "pcb_port_id": "pcb_port_62",
+    "pcb_port_id": "pcb_port_66",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 1,
-    "port_hints": ["1", "left"],
+    "port_hints": [
+      "1",
+      "left"
+    ],
     "x": -5,
     "y": 7.15
   },
@@ -12999,12 +13837,15 @@
     "type": "pcb_smtpad",
     "pcb_smtpad_id": "pcb_smtpad_59",
     "pcb_component_id": "pcb_component_8",
-    "pcb_port_id": "pcb_port_63",
+    "pcb_port_id": "pcb_port_67",
     "layer": "top",
     "shape": "rect",
     "width": 1,
     "height": 1,
-    "port_hints": ["2", "right"],
+    "port_hints": [
+      "2",
+      "right"
+    ],
     "x": -5,
     "y": 8.85
   },
@@ -13027,10 +13868,15 @@
     "outer_diameter": 1.88,
     "hole_diameter": 1.78,
     "shape": "circle",
-    "port_hints": ["top_left"],
+    "port_hints": [
+      "top_left"
+    ],
     "x": 8,
     "y": 20,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
@@ -13039,10 +13885,15 @@
     "outer_diameter": 1.88,
     "hole_diameter": 1.78,
     "shape": "circle",
-    "port_hints": ["top_right"],
+    "port_hints": [
+      "top_right"
+    ],
     "x": -8,
     "y": 20,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
@@ -13051,10 +13902,15 @@
     "outer_diameter": 1.88,
     "hole_diameter": 1.78,
     "shape": "circle",
-    "port_hints": ["bottom_left"],
+    "port_hints": [
+      "bottom_left"
+    ],
     "x": 8,
     "y": -20,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
@@ -13063,484 +13919,671 @@
     "outer_diameter": 1.88,
     "hole_diameter": 1.78,
     "shape": "circle",
-    "port_hints": ["bottom_right"],
+    "port_hints": [
+      "bottom_right"
+    ],
     "x": -8,
     "y": -20,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_12",
     "pcb_component_id": "pcb_component_9",
-    "pcb_port_id": "pcb_port_64",
+    "pcb_port_id": "pcb_port_68",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["1"],
+    "port_hints": [
+      "1"
+    ],
     "x": 8.000000000000004,
     "y": 17.78,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_13",
     "pcb_component_id": "pcb_component_9",
-    "pcb_port_id": "pcb_port_65",
+    "pcb_port_id": "pcb_port_69",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["2"],
+    "port_hints": [
+      "2"
+    ],
     "x": 8.000000000000004,
     "y": 15.240000000000002,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_14",
     "pcb_component_id": "pcb_component_9",
-    "pcb_port_id": "pcb_port_66",
+    "pcb_port_id": "pcb_port_70",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["3"],
+    "port_hints": [
+      "3"
+    ],
     "x": 8.000000000000002,
     "y": 12.700000000000001,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_15",
     "pcb_component_id": "pcb_component_9",
-    "pcb_port_id": "pcb_port_67",
+    "pcb_port_id": "pcb_port_71",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["4"],
+    "port_hints": [
+      "4"
+    ],
     "x": 8.000000000000002,
     "y": 10.16,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_16",
     "pcb_component_id": "pcb_component_9",
-    "pcb_port_id": "pcb_port_68",
+    "pcb_port_id": "pcb_port_72",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["5"],
+    "port_hints": [
+      "5"
+    ],
     "x": 8.000000000000002,
     "y": 7.620000000000001,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_17",
     "pcb_component_id": "pcb_component_9",
-    "pcb_port_id": "pcb_port_69",
+    "pcb_port_id": "pcb_port_73",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["6"],
+    "port_hints": [
+      "6"
+    ],
     "x": 8.000000000000002,
     "y": 5.080000000000002,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_18",
     "pcb_component_id": "pcb_component_9",
-    "pcb_port_id": "pcb_port_70",
+    "pcb_port_id": "pcb_port_74",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["7"],
+    "port_hints": [
+      "7"
+    ],
     "x": 8,
     "y": 2.540000000000001,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_19",
     "pcb_component_id": "pcb_component_9",
-    "pcb_port_id": "pcb_port_71",
+    "pcb_port_id": "pcb_port_75",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["8"],
+    "port_hints": [
+      "8"
+    ],
     "x": 8,
     "y": 0,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_20",
     "pcb_component_id": "pcb_component_9",
-    "pcb_port_id": "pcb_port_72",
+    "pcb_port_id": "pcb_port_76",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["9"],
+    "port_hints": [
+      "9"
+    ],
     "x": 7.999999999999999,
     "y": -2.539999999999999,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_21",
     "pcb_component_id": "pcb_component_9",
-    "pcb_port_id": "pcb_port_73",
+    "pcb_port_id": "pcb_port_77",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["10"],
+    "port_hints": [
+      "10"
+    ],
     "x": 7.999999999999999,
     "y": -5.079999999999998,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_22",
     "pcb_component_id": "pcb_component_9",
-    "pcb_port_id": "pcb_port_74",
+    "pcb_port_id": "pcb_port_78",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["11"],
+    "port_hints": [
+      "11"
+    ],
     "x": 7.999999999999998,
     "y": -7.619999999999997,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_23",
     "pcb_component_id": "pcb_component_9",
-    "pcb_port_id": "pcb_port_75",
+    "pcb_port_id": "pcb_port_79",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["12"],
+    "port_hints": [
+      "12"
+    ],
     "x": 7.999999999999998,
     "y": -10.16,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_24",
     "pcb_component_id": "pcb_component_9",
-    "pcb_port_id": "pcb_port_76",
+    "pcb_port_id": "pcb_port_80",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["13"],
+    "port_hints": [
+      "13"
+    ],
     "x": 7.999999999999997,
     "y": -12.7,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_25",
     "pcb_component_id": "pcb_component_9",
-    "pcb_port_id": "pcb_port_77",
+    "pcb_port_id": "pcb_port_81",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["14"],
+    "port_hints": [
+      "14"
+    ],
     "x": 7.999999999999997,
     "y": -15.240000000000002,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_26",
     "pcb_component_id": "pcb_component_9",
-    "pcb_port_id": "pcb_port_78",
+    "pcb_port_id": "pcb_port_82",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["15"],
+    "port_hints": [
+      "15"
+    ],
     "x": 7.9999999999999964,
     "y": -17.78,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_27",
     "pcb_component_id": "pcb_component_10",
-    "pcb_port_id": "pcb_port_79",
+    "pcb_port_id": "pcb_port_83",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["1"],
+    "port_hints": [
+      "1"
+    ],
     "x": -7.9999999999999964,
     "y": 17.78,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_28",
     "pcb_component_id": "pcb_component_10",
-    "pcb_port_id": "pcb_port_80",
+    "pcb_port_id": "pcb_port_84",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["2"],
+    "port_hints": [
+      "2"
+    ],
     "x": -7.999999999999997,
     "y": 15.240000000000002,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_29",
     "pcb_component_id": "pcb_component_10",
-    "pcb_port_id": "pcb_port_81",
+    "pcb_port_id": "pcb_port_85",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["3"],
+    "port_hints": [
+      "3"
+    ],
     "x": -7.999999999999997,
     "y": 12.700000000000001,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_30",
     "pcb_component_id": "pcb_component_10",
-    "pcb_port_id": "pcb_port_82",
+    "pcb_port_id": "pcb_port_86",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["4"],
+    "port_hints": [
+      "4"
+    ],
     "x": -7.999999999999998,
     "y": 10.16,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_31",
     "pcb_component_id": "pcb_component_10",
-    "pcb_port_id": "pcb_port_83",
+    "pcb_port_id": "pcb_port_87",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["5"],
+    "port_hints": [
+      "5"
+    ],
     "x": -7.999999999999998,
     "y": 7.620000000000001,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_32",
     "pcb_component_id": "pcb_component_10",
-    "pcb_port_id": "pcb_port_84",
+    "pcb_port_id": "pcb_port_88",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["6"],
+    "port_hints": [
+      "6"
+    ],
     "x": -7.999999999999999,
     "y": 5.080000000000002,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_33",
     "pcb_component_id": "pcb_component_10",
-    "pcb_port_id": "pcb_port_85",
+    "pcb_port_id": "pcb_port_89",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["7"],
+    "port_hints": [
+      "7"
+    ],
     "x": -7.999999999999999,
     "y": 2.540000000000001,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_34",
     "pcb_component_id": "pcb_component_10",
-    "pcb_port_id": "pcb_port_86",
+    "pcb_port_id": "pcb_port_90",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["8"],
+    "port_hints": [
+      "8"
+    ],
     "x": -8,
     "y": 0,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_35",
     "pcb_component_id": "pcb_component_10",
-    "pcb_port_id": "pcb_port_87",
+    "pcb_port_id": "pcb_port_91",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["9"],
+    "port_hints": [
+      "9"
+    ],
     "x": -8,
     "y": -2.539999999999999,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_36",
     "pcb_component_id": "pcb_component_10",
-    "pcb_port_id": "pcb_port_88",
+    "pcb_port_id": "pcb_port_92",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["10"],
+    "port_hints": [
+      "10"
+    ],
     "x": -8.000000000000002,
     "y": -5.079999999999998,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_37",
     "pcb_component_id": "pcb_component_10",
-    "pcb_port_id": "pcb_port_89",
+    "pcb_port_id": "pcb_port_93",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["11"],
+    "port_hints": [
+      "11"
+    ],
     "x": -8.000000000000002,
     "y": -7.619999999999997,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_38",
     "pcb_component_id": "pcb_component_10",
-    "pcb_port_id": "pcb_port_90",
+    "pcb_port_id": "pcb_port_94",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["12"],
+    "port_hints": [
+      "12"
+    ],
     "x": -8.000000000000002,
     "y": -10.16,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_39",
     "pcb_component_id": "pcb_component_10",
-    "pcb_port_id": "pcb_port_91",
+    "pcb_port_id": "pcb_port_95",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["13"],
+    "port_hints": [
+      "13"
+    ],
     "x": -8.000000000000002,
     "y": -12.7,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_40",
     "pcb_component_id": "pcb_component_10",
-    "pcb_port_id": "pcb_port_92",
+    "pcb_port_id": "pcb_port_96",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["14"],
+    "port_hints": [
+      "14"
+    ],
     "x": -8.000000000000004,
     "y": -15.240000000000002,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_41",
     "pcb_component_id": "pcb_component_10",
-    "pcb_port_id": "pcb_port_93",
+    "pcb_port_id": "pcb_port_97",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["15"],
+    "port_hints": [
+      "15"
+    ],
     "x": -8.000000000000004,
     "y": -17.78,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_42",
     "pcb_component_id": "pcb_component_11",
-    "pcb_port_id": "pcb_port_94",
+    "pcb_port_id": "pcb_port_98",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["1"],
-    "x": -2.5399999187200026,
+    "port_hints": [
+      "1"
+    ],
+    "x": -2.54,
     "y": 20.5,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_43",
     "pcb_component_id": "pcb_component_11",
-    "pcb_port_id": "pcb_port_95",
+    "pcb_port_id": "pcb_port_99",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["2"],
+    "port_hints": [
+      "2"
+    ],
     "x": 0,
     "y": 20.5,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_44",
     "pcb_component_id": "pcb_component_11",
-    "pcb_port_id": "pcb_port_96",
+    "pcb_port_id": "pcb_port_100",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["3"],
-    "x": 2.5399999187200026,
+    "port_hints": [
+      "3"
+    ],
+    "x": 2.54,
     "y": 20.5,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_45",
     "pcb_component_id": "pcb_component_12",
-    "pcb_port_id": "pcb_port_97",
+    "pcb_port_id": "pcb_port_101",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["1"],
-    "x": -2.5399999187200026,
+    "port_hints": [
+      "1"
+    ],
+    "x": -2.54,
     "y": 18.5,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_46",
     "pcb_component_id": "pcb_component_12",
-    "pcb_port_id": "pcb_port_98",
+    "pcb_port_id": "pcb_port_102",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["2"],
+    "port_hints": [
+      "2"
+    ],
     "x": 0,
     "y": 18.5,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_plated_hole",
     "pcb_plated_hole_id": "pcb_plated_hole_47",
     "pcb_component_id": "pcb_component_12",
-    "pcb_port_id": "pcb_port_99",
+    "pcb_port_id": "pcb_port_103",
     "outer_diameter": 1.5,
     "hole_diameter": 1,
     "shape": "circle",
-    "port_hints": ["3"],
-    "x": 2.5399999187200026,
+    "port_hints": [
+      "3"
+    ],
+    "x": 2.54,
     "y": 18.5,
-    "layers": ["top", "bottom"]
+    "layers": [
+      "top",
+      "bottom"
+    ]
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_0",
     "pcb_component_id": "pcb_component_0",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -3.3500060000000076,
     "y": -14.05091295000011,
     "source_port_id": "source_port_0"
@@ -13549,7 +14592,9 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_1",
     "pcb_component_id": "pcb_component_0",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -3.0500319999999874,
     "y": -14.05091295000011,
     "source_port_id": "source_port_1"
@@ -13558,7 +14603,9 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_2",
     "pcb_component_id": "pcb_component_0",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -2.5499059999999645,
     "y": -14.05091295000011,
     "source_port_id": "source_port_2"
@@ -13567,7 +14614,9 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_3",
     "pcb_component_id": "pcb_component_0",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -2.249932000000058,
     "y": -14.05091295000011,
     "source_port_id": "source_port_3"
@@ -13576,7 +14625,9 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_4",
     "pcb_component_id": "pcb_component_0",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -1.7500600000000759,
     "y": -14.05091295000011,
     "source_port_id": "source_port_4"
@@ -13585,7 +14636,9 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_5",
     "pcb_component_id": "pcb_component_0",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -1.2499339999999393,
     "y": -14.05091295000011,
     "source_port_id": "source_port_5"
@@ -13594,7 +14647,9 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_6",
     "pcb_component_id": "pcb_component_0",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -0.7500619999999572,
     "y": -14.05091295000011,
     "source_port_id": "source_port_6"
@@ -13603,7 +14658,9 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_7",
     "pcb_component_id": "pcb_component_0",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -0.2499359999999342,
     "y": -14.05091295000011,
     "source_port_id": "source_port_7"
@@ -13612,7 +14669,9 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_8",
     "pcb_component_id": "pcb_component_0",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 0.2499359999999342,
     "y": -14.05091295000011,
     "source_port_id": "source_port_8"
@@ -13621,7 +14680,9 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_9",
     "pcb_component_id": "pcb_component_0",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 0.7500619999999572,
     "y": -14.05091295000011,
     "source_port_id": "source_port_9"
@@ -13630,7 +14691,9 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_10",
     "pcb_component_id": "pcb_component_0",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 1.2496799999998984,
     "y": -14.05091295000011,
     "source_port_id": "source_port_10"
@@ -13639,7 +14702,9 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_11",
     "pcb_component_id": "pcb_component_0",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 1.7500600000000759,
     "y": -14.05091295000011,
     "source_port_id": "source_port_11"
@@ -13648,7 +14713,9 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_12",
     "pcb_component_id": "pcb_component_0",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 2.5501600000000053,
     "y": -14.05091295000011,
     "source_port_id": "source_port_12"
@@ -13657,7 +14724,9 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_13",
     "pcb_component_id": "pcb_component_0",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 2.249932000000058,
     "y": -14.05091295000011,
     "source_port_id": "source_port_13"
@@ -13666,7 +14735,9 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_14",
     "pcb_component_id": "pcb_component_0",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 3.3500060000000076,
     "y": -14.05091295000011,
     "source_port_id": "source_port_14"
@@ -13675,7 +14746,9 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_15",
     "pcb_component_id": "pcb_component_0",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 3.050032000000101,
     "y": -14.05091295000011,
     "source_port_id": "source_port_15"
@@ -13683,45 +14756,67 @@
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_16",
-    "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": -1.7500000000000002,
-    "y": -11.5,
+    "pcb_component_id": "pcb_component_0",
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
+    "x": -4.32511199999999,
+    "y": -15.094262350000122,
     "source_port_id": "source_port_16"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_17",
-    "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": -1.2500000000000002,
-    "y": -11.5,
+    "pcb_component_id": "pcb_component_0",
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
+    "x": 4.32511199999999,
+    "y": -15.094262350000122,
     "source_port_id": "source_port_17"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_18",
-    "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": -0.7500000000000002,
-    "y": -11.5,
+    "pcb_component_id": "pcb_component_0",
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
+    "x": 4.32511199999999,
+    "y": -19.274086349999948,
     "source_port_id": "source_port_18"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_19",
-    "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": -0.2500000000000002,
-    "y": -11.5,
+    "pcb_component_id": "pcb_component_0",
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
+    "x": -4.32511199999999,
+    "y": -19.274086349999948,
     "source_port_id": "source_port_19"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_20",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": 0.24999999999999978,
+    "layers": [
+      "top"
+    ],
+    "x": -1.7500000000000002,
     "y": -11.5,
     "source_port_id": "source_port_20"
   },
@@ -13729,8 +14824,10 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_21",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": 0.7499999999999998,
+    "layers": [
+      "top"
+    ],
+    "x": -1.2500000000000002,
     "y": -11.5,
     "source_port_id": "source_port_21"
   },
@@ -13738,8 +14835,10 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_22",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": 1.2499999999999998,
+    "layers": [
+      "top"
+    ],
+    "x": -0.7500000000000002,
     "y": -11.5,
     "source_port_id": "source_port_22"
   },
@@ -13747,8 +14846,10 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_23",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": 1.7499999999999998,
+    "layers": [
+      "top"
+    ],
+    "x": -0.2500000000000002,
     "y": -11.5,
     "source_port_id": "source_port_23"
   },
@@ -13756,116 +14857,142 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_24",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": 3.5,
-    "y": -9.75,
+    "layers": [
+      "top"
+    ],
+    "x": 0.24999999999999978,
+    "y": -11.5,
     "source_port_id": "source_port_24"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_25",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": 3.5,
-    "y": -9.25,
+    "layers": [
+      "top"
+    ],
+    "x": 0.7499999999999998,
+    "y": -11.5,
     "source_port_id": "source_port_25"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_26",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": 3.5,
-    "y": -8.75,
+    "layers": [
+      "top"
+    ],
+    "x": 1.2499999999999998,
+    "y": -11.5,
     "source_port_id": "source_port_26"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_27",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": 3.5,
-    "y": -8.25,
+    "layers": [
+      "top"
+    ],
+    "x": 1.7499999999999998,
+    "y": -11.5,
     "source_port_id": "source_port_27"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_28",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 3.5,
-    "y": -7.75,
+    "y": -9.75,
     "source_port_id": "source_port_28"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_29",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 3.5,
-    "y": -7.25,
+    "y": -9.25,
     "source_port_id": "source_port_29"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_30",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 3.5,
-    "y": -6.75,
+    "y": -8.75,
     "source_port_id": "source_port_30"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_31",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 3.5,
-    "y": -6.25,
+    "y": -8.25,
     "source_port_id": "source_port_31"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_32",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": 1.7500000000000002,
-    "y": -4.5,
+    "layers": [
+      "top"
+    ],
+    "x": 3.5,
+    "y": -7.75,
     "source_port_id": "source_port_32"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_33",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": 1.2500000000000002,
-    "y": -4.5,
+    "layers": [
+      "top"
+    ],
+    "x": 3.5,
+    "y": -7.25,
     "source_port_id": "source_port_33"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_34",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": 0.7500000000000002,
-    "y": -4.5,
+    "layers": [
+      "top"
+    ],
+    "x": 3.5,
+    "y": -6.75,
     "source_port_id": "source_port_34"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_35",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": 0.2500000000000002,
-    "y": -4.5,
+    "layers": [
+      "top"
+    ],
+    "x": 3.5,
+    "y": -6.25,
     "source_port_id": "source_port_35"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_36",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": -0.24999999999999978,
+    "layers": [
+      "top"
+    ],
+    "x": 1.7500000000000002,
     "y": -4.5,
     "source_port_id": "source_port_36"
   },
@@ -13873,8 +15000,10 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_37",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": -0.7499999999999998,
+    "layers": [
+      "top"
+    ],
+    "x": 1.2500000000000002,
     "y": -4.5,
     "source_port_id": "source_port_37"
   },
@@ -13882,8 +15011,10 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_38",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": -1.2499999999999998,
+    "layers": [
+      "top"
+    ],
+    "x": 0.7500000000000002,
     "y": -4.5,
     "source_port_id": "source_port_38"
   },
@@ -13891,8 +15022,10 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_39",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": -1.7499999999999998,
+    "layers": [
+      "top"
+    ],
+    "x": 0.2500000000000002,
     "y": -4.5,
     "source_port_id": "source_port_39"
   },
@@ -13900,541 +15033,825 @@
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_40",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": -3.5,
-    "y": -6.25,
+    "layers": [
+      "top"
+    ],
+    "x": -0.24999999999999978,
+    "y": -4.5,
     "source_port_id": "source_port_40"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_41",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": -3.5,
-    "y": -6.75,
+    "layers": [
+      "top"
+    ],
+    "x": -0.7499999999999998,
+    "y": -4.5,
     "source_port_id": "source_port_41"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_42",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": -3.5,
-    "y": -7.25,
+    "layers": [
+      "top"
+    ],
+    "x": -1.2499999999999998,
+    "y": -4.5,
     "source_port_id": "source_port_42"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_43",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
-    "x": -3.5,
-    "y": -7.75,
+    "layers": [
+      "top"
+    ],
+    "x": -1.7499999999999998,
+    "y": -4.5,
     "source_port_id": "source_port_43"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_44",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -3.5,
-    "y": -8.25,
+    "y": -6.25,
     "source_port_id": "source_port_44"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_45",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -3.5,
-    "y": -8.75,
+    "y": -6.75,
     "source_port_id": "source_port_45"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_46",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -3.5,
-    "y": -9.25,
+    "y": -7.25,
     "source_port_id": "source_port_46"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_47",
     "pcb_component_id": "pcb_component_1",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -3.5,
-    "y": -9.75,
+    "y": -7.75,
     "source_port_id": "source_port_47"
   },
   {
     "type": "pcb_port",
     "pcb_port_id": "pcb_port_48",
+    "pcb_component_id": "pcb_component_1",
+    "layers": [
+      "top"
+    ],
+    "x": -3.5,
+    "y": -8.25,
+    "source_port_id": "source_port_48"
+  },
+  {
+    "type": "pcb_port",
+    "pcb_port_id": "pcb_port_49",
+    "pcb_component_id": "pcb_component_1",
+    "layers": [
+      "top"
+    ],
+    "x": -3.5,
+    "y": -8.75,
+    "source_port_id": "source_port_49"
+  },
+  {
+    "type": "pcb_port",
+    "pcb_port_id": "pcb_port_50",
+    "pcb_component_id": "pcb_component_1",
+    "layers": [
+      "top"
+    ],
+    "x": -3.5,
+    "y": -9.25,
+    "source_port_id": "source_port_50"
+  },
+  {
+    "type": "pcb_port",
+    "pcb_port_id": "pcb_port_51",
+    "pcb_component_id": "pcb_component_1",
+    "layers": [
+      "top"
+    ],
+    "x": -3.5,
+    "y": -9.75,
+    "source_port_id": "source_port_51"
+  },
+  {
+    "type": "pcb_port",
+    "pcb_port_id": "pcb_port_52",
     "pcb_component_id": "pcb_component_2",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -5.003428999999983,
     "y": 13.799591999999961,
-    "source_port_id": "source_port_48"
+    "source_port_id": "source_port_52"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_49",
+    "pcb_port_id": "pcb_port_53",
     "pcb_component_id": "pcb_component_2",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -4.996571000000017,
     "y": 12.200408000000039,
-    "source_port_id": "source_port_49"
+    "source_port_id": "source_port_53"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_50",
+    "pcb_port_id": "pcb_port_54",
     "pcb_component_id": "pcb_component_3",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -0.003428999999982758,
     "y": 13.799591999999961,
-    "source_port_id": "source_port_50"
+    "source_port_id": "source_port_54"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_51",
+    "pcb_port_id": "pcb_port_55",
     "pcb_component_id": "pcb_component_3",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 0.003428999999982758,
     "y": 12.200408000000039,
-    "source_port_id": "source_port_51"
+    "source_port_id": "source_port_55"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_52",
+    "pcb_port_id": "pcb_port_56",
     "pcb_component_id": "pcb_component_4",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 4.996571000000017,
     "y": 13.799591999999961,
-    "source_port_id": "source_port_52"
+    "source_port_id": "source_port_56"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_53",
+    "pcb_port_id": "pcb_port_57",
     "pcb_component_id": "pcb_component_4",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 5.003428999999983,
     "y": 12.200408000000039,
-    "source_port_id": "source_port_53"
+    "source_port_id": "source_port_57"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_54",
+    "pcb_port_id": "pcb_port_58",
     "pcb_component_id": "pcb_component_5",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -3.2499299999999494,
     "y": 4.249932000000058,
-    "source_port_id": "source_port_54"
+    "source_port_id": "source_port_58"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_55",
+    "pcb_port_id": "pcb_port_59",
     "pcb_component_id": "pcb_component_5",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 3.2499299999998357,
     "y": 4.249932000000058,
-    "source_port_id": "source_port_55"
+    "source_port_id": "source_port_59"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_56",
+    "pcb_port_id": "pcb_port_60",
     "pcb_component_id": "pcb_component_5",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -3.2499299999999494,
     "y": -0.249932000000058,
-    "source_port_id": "source_port_56"
+    "source_port_id": "source_port_60"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_57",
+    "pcb_port_id": "pcb_port_61",
     "pcb_component_id": "pcb_component_5",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 3.2499299999998357,
     "y": -0.249932000000058,
-    "source_port_id": "source_port_57"
+    "source_port_id": "source_port_61"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_58",
+    "pcb_port_id": "pcb_port_62",
     "pcb_component_id": "pcb_component_6",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 5,
     "y": 7.15,
-    "source_port_id": "source_port_58"
+    "source_port_id": "source_port_62"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_59",
+    "pcb_port_id": "pcb_port_63",
     "pcb_component_id": "pcb_component_6",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 5,
     "y": 8.85,
-    "source_port_id": "source_port_59"
+    "source_port_id": "source_port_63"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_60",
+    "pcb_port_id": "pcb_port_64",
     "pcb_component_id": "pcb_component_7",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -5.204748896376251e-17,
     "y": 7.15,
-    "source_port_id": "source_port_60"
+    "source_port_id": "source_port_64"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_61",
+    "pcb_port_id": "pcb_port_65",
     "pcb_component_id": "pcb_component_7",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": 5.204748896376251e-17,
     "y": 8.85,
-    "source_port_id": "source_port_61"
+    "source_port_id": "source_port_65"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_62",
+    "pcb_port_id": "pcb_port_66",
     "pcb_component_id": "pcb_component_8",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -5,
     "y": 7.15,
-    "source_port_id": "source_port_62"
+    "source_port_id": "source_port_66"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_63",
+    "pcb_port_id": "pcb_port_67",
     "pcb_component_id": "pcb_component_8",
-    "layers": ["top"],
+    "layers": [
+      "top"
+    ],
     "x": -5,
     "y": 8.85,
-    "source_port_id": "source_port_63"
+    "source_port_id": "source_port_67"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_64",
+    "pcb_port_id": "pcb_port_68",
     "pcb_component_id": "pcb_component_9",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 8.000000000000004,
     "y": 17.78,
-    "source_port_id": "source_port_64"
+    "source_port_id": "source_port_68"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_65",
+    "pcb_port_id": "pcb_port_69",
     "pcb_component_id": "pcb_component_9",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 8.000000000000004,
     "y": 15.240000000000002,
-    "source_port_id": "source_port_65"
+    "source_port_id": "source_port_69"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_66",
+    "pcb_port_id": "pcb_port_70",
     "pcb_component_id": "pcb_component_9",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 8.000000000000002,
     "y": 12.700000000000001,
-    "source_port_id": "source_port_66"
+    "source_port_id": "source_port_70"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_67",
+    "pcb_port_id": "pcb_port_71",
     "pcb_component_id": "pcb_component_9",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 8.000000000000002,
     "y": 10.16,
-    "source_port_id": "source_port_67"
+    "source_port_id": "source_port_71"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_68",
+    "pcb_port_id": "pcb_port_72",
     "pcb_component_id": "pcb_component_9",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 8.000000000000002,
     "y": 7.620000000000001,
-    "source_port_id": "source_port_68"
+    "source_port_id": "source_port_72"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_69",
+    "pcb_port_id": "pcb_port_73",
     "pcb_component_id": "pcb_component_9",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 8.000000000000002,
     "y": 5.080000000000002,
-    "source_port_id": "source_port_69"
+    "source_port_id": "source_port_73"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_70",
+    "pcb_port_id": "pcb_port_74",
     "pcb_component_id": "pcb_component_9",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 8,
     "y": 2.540000000000001,
-    "source_port_id": "source_port_70"
+    "source_port_id": "source_port_74"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_71",
+    "pcb_port_id": "pcb_port_75",
     "pcb_component_id": "pcb_component_9",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 8,
     "y": 0,
-    "source_port_id": "source_port_71"
+    "source_port_id": "source_port_75"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_72",
+    "pcb_port_id": "pcb_port_76",
     "pcb_component_id": "pcb_component_9",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 7.999999999999999,
     "y": -2.539999999999999,
-    "source_port_id": "source_port_72"
+    "source_port_id": "source_port_76"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_73",
+    "pcb_port_id": "pcb_port_77",
     "pcb_component_id": "pcb_component_9",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 7.999999999999999,
     "y": -5.079999999999998,
-    "source_port_id": "source_port_73"
+    "source_port_id": "source_port_77"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_74",
+    "pcb_port_id": "pcb_port_78",
     "pcb_component_id": "pcb_component_9",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 7.999999999999998,
     "y": -7.619999999999997,
-    "source_port_id": "source_port_74"
+    "source_port_id": "source_port_78"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_75",
+    "pcb_port_id": "pcb_port_79",
     "pcb_component_id": "pcb_component_9",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 7.999999999999998,
     "y": -10.16,
-    "source_port_id": "source_port_75"
+    "source_port_id": "source_port_79"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_76",
+    "pcb_port_id": "pcb_port_80",
     "pcb_component_id": "pcb_component_9",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 7.999999999999997,
     "y": -12.7,
-    "source_port_id": "source_port_76"
+    "source_port_id": "source_port_80"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_77",
+    "pcb_port_id": "pcb_port_81",
     "pcb_component_id": "pcb_component_9",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 7.999999999999997,
     "y": -15.240000000000002,
-    "source_port_id": "source_port_77"
+    "source_port_id": "source_port_81"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_78",
+    "pcb_port_id": "pcb_port_82",
     "pcb_component_id": "pcb_component_9",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 7.9999999999999964,
     "y": -17.78,
-    "source_port_id": "source_port_78"
+    "source_port_id": "source_port_82"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_79",
+    "pcb_port_id": "pcb_port_83",
     "pcb_component_id": "pcb_component_10",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -7.9999999999999964,
     "y": 17.78,
-    "source_port_id": "source_port_79"
+    "source_port_id": "source_port_83"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_80",
+    "pcb_port_id": "pcb_port_84",
     "pcb_component_id": "pcb_component_10",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -7.999999999999997,
     "y": 15.240000000000002,
-    "source_port_id": "source_port_80"
+    "source_port_id": "source_port_84"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_81",
+    "pcb_port_id": "pcb_port_85",
     "pcb_component_id": "pcb_component_10",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -7.999999999999997,
     "y": 12.700000000000001,
-    "source_port_id": "source_port_81"
+    "source_port_id": "source_port_85"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_82",
+    "pcb_port_id": "pcb_port_86",
     "pcb_component_id": "pcb_component_10",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -7.999999999999998,
     "y": 10.16,
-    "source_port_id": "source_port_82"
+    "source_port_id": "source_port_86"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_83",
+    "pcb_port_id": "pcb_port_87",
     "pcb_component_id": "pcb_component_10",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -7.999999999999998,
     "y": 7.620000000000001,
-    "source_port_id": "source_port_83"
+    "source_port_id": "source_port_87"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_84",
+    "pcb_port_id": "pcb_port_88",
     "pcb_component_id": "pcb_component_10",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -7.999999999999999,
     "y": 5.080000000000002,
-    "source_port_id": "source_port_84"
+    "source_port_id": "source_port_88"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_85",
+    "pcb_port_id": "pcb_port_89",
     "pcb_component_id": "pcb_component_10",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -7.999999999999999,
     "y": 2.540000000000001,
-    "source_port_id": "source_port_85"
+    "source_port_id": "source_port_89"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_86",
+    "pcb_port_id": "pcb_port_90",
     "pcb_component_id": "pcb_component_10",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -8,
     "y": 0,
-    "source_port_id": "source_port_86"
+    "source_port_id": "source_port_90"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_87",
+    "pcb_port_id": "pcb_port_91",
     "pcb_component_id": "pcb_component_10",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -8,
     "y": -2.539999999999999,
-    "source_port_id": "source_port_87"
+    "source_port_id": "source_port_91"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_88",
+    "pcb_port_id": "pcb_port_92",
     "pcb_component_id": "pcb_component_10",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -8.000000000000002,
     "y": -5.079999999999998,
-    "source_port_id": "source_port_88"
+    "source_port_id": "source_port_92"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_89",
+    "pcb_port_id": "pcb_port_93",
     "pcb_component_id": "pcb_component_10",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -8.000000000000002,
     "y": -7.619999999999997,
-    "source_port_id": "source_port_89"
+    "source_port_id": "source_port_93"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_90",
+    "pcb_port_id": "pcb_port_94",
     "pcb_component_id": "pcb_component_10",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -8.000000000000002,
     "y": -10.16,
-    "source_port_id": "source_port_90"
+    "source_port_id": "source_port_94"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_91",
+    "pcb_port_id": "pcb_port_95",
     "pcb_component_id": "pcb_component_10",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -8.000000000000002,
     "y": -12.7,
-    "source_port_id": "source_port_91"
+    "source_port_id": "source_port_95"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_92",
+    "pcb_port_id": "pcb_port_96",
     "pcb_component_id": "pcb_component_10",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -8.000000000000004,
     "y": -15.240000000000002,
-    "source_port_id": "source_port_92"
+    "source_port_id": "source_port_96"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_93",
+    "pcb_port_id": "pcb_port_97",
     "pcb_component_id": "pcb_component_10",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": -8.000000000000004,
     "y": -17.78,
-    "source_port_id": "source_port_93"
+    "source_port_id": "source_port_97"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_94",
+    "pcb_port_id": "pcb_port_98",
     "pcb_component_id": "pcb_component_11",
-    "layers": ["top", "inner1", "inner2", "bottom"],
-    "x": -2.5399999187200026,
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
+    "x": -2.54,
     "y": 20.5,
-    "source_port_id": "source_port_94"
+    "source_port_id": "source_port_98"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_95",
+    "pcb_port_id": "pcb_port_99",
     "pcb_component_id": "pcb_component_11",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 0,
     "y": 20.5,
-    "source_port_id": "source_port_95"
+    "source_port_id": "source_port_99"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_96",
+    "pcb_port_id": "pcb_port_100",
     "pcb_component_id": "pcb_component_11",
-    "layers": ["top", "inner1", "inner2", "bottom"],
-    "x": 2.5399999187200026,
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
+    "x": 2.54,
     "y": 20.5,
-    "source_port_id": "source_port_96"
+    "source_port_id": "source_port_100"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_97",
+    "pcb_port_id": "pcb_port_101",
     "pcb_component_id": "pcb_component_12",
-    "layers": ["top", "inner1", "inner2", "bottom"],
-    "x": -2.5399999187200026,
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
+    "x": -2.54,
     "y": 18.5,
-    "source_port_id": "source_port_97"
+    "source_port_id": "source_port_101"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_98",
+    "pcb_port_id": "pcb_port_102",
     "pcb_component_id": "pcb_component_12",
-    "layers": ["top", "inner1", "inner2", "bottom"],
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
     "x": 0,
     "y": 18.5,
-    "source_port_id": "source_port_98"
+    "source_port_id": "source_port_102"
   },
   {
     "type": "pcb_port",
-    "pcb_port_id": "pcb_port_99",
+    "pcb_port_id": "pcb_port_103",
     "pcb_component_id": "pcb_component_12",
-    "layers": ["top", "inner1", "inner2", "bottom"],
-    "x": 2.5399999187200026,
+    "layers": [
+      "top",
+      "inner1",
+      "inner2",
+      "bottom"
+    ],
+    "x": 2.54,
     "y": 18.5,
-    "source_port_id": "source_port_99"
+    "source_port_id": "source_port_103"
   },
   {
     "type": "cad_component",
@@ -14451,7 +15868,7 @@
     },
     "pcb_component_id": "pcb_component_0",
     "source_component_id": "source_component_0",
-    "model_obj_url": "https://modelcdn.tscircuit.com/easyeda_models/download?uuid=2a4bc2358b36497d9ab2a66ab6419ba3&pn=C165948&cachebust_origin=https%3A%2F%2Fsnippets.tscircuit.com"
+    "model_obj_url": "https://modelcdn.tscircuit.com/easyeda_models/download?uuid=2a4bc2358b36497d9ab2a66ab6419ba3&pn=C165948&cachebust_origin=https%3A%2F%2Ftscircuit.com"
   },
   {
     "type": "cad_component",
@@ -14485,7 +15902,7 @@
     },
     "pcb_component_id": "pcb_component_2",
     "source_component_id": "source_component_2",
-    "model_obj_url": "https://modelcdn.tscircuit.com/easyeda_models/download?uuid=d0740cb8891c49a88b6949cb978926f3&pn=C965799&cachebust_origin=https%3A%2F%2Fsnippets.tscircuit.com"
+    "model_obj_url": "https://modelcdn.tscircuit.com/easyeda_models/download?uuid=d0740cb8891c49a88b6949cb978926f3&pn=C965799&cachebust_origin=https%3A%2F%2Ftscircuit.com"
   },
   {
     "type": "cad_component",
@@ -14502,7 +15919,7 @@
     },
     "pcb_component_id": "pcb_component_3",
     "source_component_id": "source_component_3",
-    "model_obj_url": "https://modelcdn.tscircuit.com/easyeda_models/download?uuid=d0740cb8891c49a88b6949cb978926f3&pn=C965799&cachebust_origin=https%3A%2F%2Fsnippets.tscircuit.com"
+    "model_obj_url": "https://modelcdn.tscircuit.com/easyeda_models/download?uuid=d0740cb8891c49a88b6949cb978926f3&pn=C965799&cachebust_origin=https%3A%2F%2Ftscircuit.com"
   },
   {
     "type": "cad_component",
@@ -14519,7 +15936,7 @@
     },
     "pcb_component_id": "pcb_component_4",
     "source_component_id": "source_component_4",
-    "model_obj_url": "https://modelcdn.tscircuit.com/easyeda_models/download?uuid=d0740cb8891c49a88b6949cb978926f3&pn=C965799&cachebust_origin=https%3A%2F%2Fsnippets.tscircuit.com"
+    "model_obj_url": "https://modelcdn.tscircuit.com/easyeda_models/download?uuid=d0740cb8891c49a88b6949cb978926f3&pn=C965799&cachebust_origin=https%3A%2F%2Ftscircuit.com"
   },
   {
     "type": "cad_component",
@@ -14536,7 +15953,7 @@
     },
     "pcb_component_id": "pcb_component_5",
     "source_component_id": "source_component_5",
-    "model_obj_url": "https://modelcdn.tscircuit.com/easyeda_models/download?uuid=6ef04b62f1e945518af209609f65fa6f&pn=C110153&cachebust_origin=https%3A%2F%2Fsnippets.tscircuit.com"
+    "model_obj_url": "https://modelcdn.tscircuit.com/easyeda_models/download?uuid=6ef04b62f1e945518af209609f65fa6f&pn=C110153&cachebust_origin=https%3A%2F%2Ftscircuit.com"
   },
   {
     "type": "cad_component",
@@ -14657,4 +16074,4 @@
     "source_component_id": "source_component_12",
     "footprinter_string": "pinrow3"
   }
-]
+]
\ No newline at end of file
diff --git a/tests/repros/repro-4-arduino-nano.test.ts b/tests/repros/repro-4-arduino-nano.test.ts
index a8d5ee6..203063c 100644
--- a/tests/repros/repro-4-arduino-nano.test.ts
+++ b/tests/repros/repro-4-arduino-nano.test.ts
@@ -20,6 +20,11 @@ test("circuit json (arduino nano) -> dsn file", async () => {
   // image of usbc
   const usbcImage = dsnJson.library.images[0]
   expect(usbcImage.name).toBe("simple_chip:9.8502x6.7732_mm")
+  // pin number in the range of 1 to 20
+  usbcImage.pins.forEach((pin) => {
+    expect(pin.pin_number).toBeGreaterThanOrEqual(1)
+    expect(pin.pin_number).toBeLessThanOrEqual(20)
+  })
   expect(usbcImage.pins).toHaveLength(20)
   expect(usbcImage.pins[0].padstack_name).toBe(
     "RoundRect[T]Pad_299.9994x1299.9974_um",
@@ -35,5 +40,5 @@ test("circuit json (arduino nano) -> dsn file", async () => {
   // padstack length
   expect(dsnJson.library.padstacks.length).toBe(10)
   // net length
-  expect(dsnJson.network.nets.length).toBe(60)
+  expect(dsnJson.network.nets.length).toBe(63)
 })
diff --git a/tests/repros/repro2-motor-driver.test.ts b/tests/repros/repro2-motor-driver.test.ts
index 2ff309d..af21c01 100644
--- a/tests/repros/repro2-motor-driver.test.ts
+++ b/tests/repros/repro2-motor-driver.test.ts
@@ -28,6 +28,16 @@ test("circuit json (motor driver breakout) -> dsn file", async () => {
   // expect the image to have length 3
   expect(dsnJson.library.images.length).toBe(3)
 
+  // image chip
+  const chipImage = dsnJson.library.images[0]
+  expect(chipImage.name).toBe("simple_chip:7.4322x8.4741_mm")
+  expect(chipImage.pins).toHaveLength(24)
+  //pin number in the range of 1 to 24
+  chipImage.pins.forEach((pin) => {
+    expect(pin.pin_number).toBeGreaterThanOrEqual(1)
+    expect(pin.pin_number).toBeLessThanOrEqual(24)
+  })
+
   // expect the network to have length 1
   expect(dsnJson.network.nets.length).toBe(16)