fix: port numbers in order

tscircuit · Dec 8, 2024 · d0dd10d · d0dd10d · seveibar · Dec 8, 2024
1 parent d9471a3
commit d0dd10d
Show file tree

Hide file tree

Showing 5 changed files with 2,466 additions and 1,011 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
@@ -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,15 +121,28 @@ 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",
                 width: pad.width * 1000,
                 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
@@ -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) =>