circuit-json-to-kicad 0.0.19 → 0.0.21

package/dist/index.js

@@ -1350,20 +1350,27 @@ var AddNetsStage = class extends ConverterStage {
 
 // lib/pcb/stages/AddFootprintsStage.ts
 import { Footprint } from "kicadts";
-import { applyToPoint as applyToPoint5 } from "transformation-matrix";
+import { applyToPoint as applyToPoint9 } from "transformation-matrix";
 
 // lib/pcb/stages/utils/CreateSmdPadFromCircuitJson.ts
 import { FootprintPad } from "kicadts";
+import { applyToPoint as applyToPoint5, rotate, identity } from "transformation-matrix";
 function createSmdPadFromCircuitJson({
   pcbPad,
   componentCenter,
-  padNumber
+  padNumber,
+  componentRotation = 0
 }) {
   if (!("x" in pcbPad && "y" in pcbPad)) {
     throw new Error("no support for polygon pads (or any pads w/o X/Y) yet");
   }
   const relativeX = pcbPad.x - componentCenter.x;
   const relativeY = -(pcbPad.y - componentCenter.y);
+  const rotationMatrix = componentRotation !== 0 ? rotate(componentRotation * Math.PI / 180) : identity();
+  const rotatedPos = applyToPoint5(rotationMatrix, {
+    x: relativeX,
+    y: relativeY
+  });
   const layerMap = {
     top: "F.Cu",
     bottom: "B.Cu"
@@ -1381,7 +1388,7 @@ function createSmdPadFromCircuitJson({
     number: String(padNumber),
     padType: "smd",
     shape: padShape,
-    at: [relativeX, relativeY, 0],
+    at: [rotatedPos.x, rotatedPos.y, 0],
     size: padSize,
     layers: [
       `${padLayer}`,
@@ -1394,16 +1401,23 @@ function createSmdPadFromCircuitJson({
 
 // lib/pcb/stages/utils/CreateThruHolePadFromCircuitJson.ts
 import { FootprintPad as FootprintPad2, PadDrill } from "kicadts";
+import { applyToPoint as applyToPoint6, rotate as rotate2, identity as identity2 } from "transformation-matrix";
 function createThruHolePadFromCircuitJson({
   platedHole,
   componentCenter,
-  padNumber
+  padNumber,
+  componentRotation = 0
 }) {
   if (!("x" in platedHole && "y" in platedHole)) {
     return null;
   }
   const relativeX = platedHole.x - componentCenter.x;
   const relativeY = -(platedHole.y - componentCenter.y);
+  const rotationMatrix = componentRotation !== 0 ? rotate2(componentRotation * Math.PI / 180) : identity2();
+  const rotatedPos = applyToPoint6(rotationMatrix, {
+    x: relativeX,
+    y: relativeY
+  });
   let padShape = "circle";
   let padSize;
   let drill;
@@ -1466,7 +1480,65 @@ function createThruHolePadFromCircuitJson({
     number: String(padNumber),
     padType: "thru_hole",
     shape: padShape,
-    at: [relativeX, relativeY, rotation],
+    at: [rotatedPos.x, rotatedPos.y, rotation],
+    size: padSize,
+    drill,
+    layers: ["*.Cu", "*.Mask"],
+    removeUnusedLayers: false,
+    uuid: crypto.randomUUID()
+  });
+}
+
+// lib/pcb/stages/utils/CreateNpthPadFromCircuitJson.ts
+import { FootprintPad as FootprintPad3, PadDrill as PadDrill2 } from "kicadts";
+import { applyToPoint as applyToPoint7, rotate as rotate3, identity as identity3 } from "transformation-matrix";
+function createNpthPadFromCircuitJson({
+  pcbHole,
+  componentCenter,
+  componentRotation = 0
+}) {
+  if (!("x" in pcbHole && "y" in pcbHole)) {
+    return null;
+  }
+  const relativeX = pcbHole.x - componentCenter.x;
+  const relativeY = -(pcbHole.y - componentCenter.y);
+  const rotationMatrix = componentRotation !== 0 ? rotate3(componentRotation * Math.PI / 180) : identity3();
+  const rotatedPos = applyToPoint7(rotationMatrix, {
+    x: relativeX,
+    y: relativeY
+  });
+  let padShape = "circle";
+  let padSize;
+  let drill;
+  if (pcbHole.hole_shape === "circle") {
+    padShape = "circle";
+    const diameter = pcbHole.hole_diameter;
+    padSize = [diameter, diameter];
+    drill = new PadDrill2({
+      diameter
+    });
+  } else if (pcbHole.hole_shape === "oval") {
+    padShape = "oval";
+    const width = pcbHole.hole_width;
+    const height = pcbHole.hole_height;
+    padSize = [width, height];
+    drill = new PadDrill2({
+      oval: true,
+      diameter: width,
+      width: height
+    });
+  } else {
+    padShape = "circle";
+    const diameter = pcbHole.hole_diameter || 1;
+    padSize = [diameter, diameter];
+    drill = new PadDrill2({ diameter });
+  }
+  return new FootprintPad3({
+    number: "",
+    // Non-plated holes have no pad number
+    padType: "np_thru_hole",
+    shape: padShape,
+    at: [rotatedPos.x, rotatedPos.y, 0],
     size: padSize,
     drill,
     layers: ["*.Cu", "*.Mask"],
@@ -1477,16 +1549,25 @@ function createThruHolePadFromCircuitJson({
 
 // lib/pcb/stages/utils/CreateFpTextFromCircuitJson.ts
 import { FpText, TextEffects as TextEffects4, TextEffectsFont as TextEffectsFont4 } from "kicadts";
+import { applyToPoint as applyToPoint8, rotate as rotate4, identity as identity4 } from "transformation-matrix";
 function createFpTextFromCircuitJson({
   textElement,
-  componentCenter
+  componentCenter,
+  componentRotation = 0
 }) {
   if (!textElement.text || !textElement.anchor_position) {
     return null;
   }
+  const relativeX = textElement.anchor_position.x - componentCenter.x;
+  const relativeY = -(textElement.anchor_position.y - componentCenter.y);
+  const rotationMatrix = componentRotation !== 0 ? rotate4(componentRotation * Math.PI / 180) : identity4();
+  const rotatedPos = applyToPoint8(rotationMatrix, {
+    x: relativeX,
+    y: relativeY
+  });
   const relativePosition = {
-    x: textElement.anchor_position.x - componentCenter.x,
-    y: -(textElement.anchor_position.y - componentCenter.y)
+    x: rotatedPos.x,
+    y: rotatedPos.y
   };
   const layerMap = {
     top: "F.SilkS",
@@ -1536,8 +1617,7 @@ var AddFootprintsStage = class extends ConverterStage {
     const component = this.pcbComponents[this.componentsProcessed];
     const sourceComponent = component.source_component_id ? this.ctx.db.source_component.get(component.source_component_id) : null;
     const footprintName = sourceComponent?.ftype || "Unknown";
-    const componentName = sourceComponent?.name || `Component_${this.componentsProcessed}`;
-    const transformedPos = applyToPoint5(c2kMatPcb, {
+    const transformedPos = applyToPoint9(c2kMatPcb, {
       x: component.center.x,
       y: component.center.y
     });
@@ -1554,7 +1634,8 @@ var AddFootprintsStage = class extends ConverterStage {
     for (const textElement of pcbSilkscreenTexts) {
       const fpText = createFpTextFromCircuitJson({
         textElement,
-        componentCenter: component.center
+        componentCenter: component.center,
+        componentRotation: component.rotation || 0
       });
       if (fpText) {
         fpTexts.push(fpText);
@@ -1570,7 +1651,8 @@ var AddFootprintsStage = class extends ConverterStage {
       const pad = createSmdPadFromCircuitJson({
         pcbPad,
         componentCenter: component.center,
-        padNumber
+        padNumber,
+        componentRotation: component.rotation || 0
       });
       fpPads.push(pad);
       padNumber++;
@@ -1582,13 +1664,27 @@ var AddFootprintsStage = class extends ConverterStage {
       const pad = createThruHolePadFromCircuitJson({
         platedHole,
         componentCenter: component.center,
-        padNumber
+        padNumber,
+        componentRotation: component.rotation || 0
       });
       if (pad) {
         fpPads.push(pad);
         padNumber++;
       }
     }
+    const pcbHoles = this.ctx.db.pcb_hole?.list().filter(
+      (hole) => hole.subcircuit_id === component.subcircuit_id
+    ) || [];
+    for (const pcbHole of pcbHoles) {
+      const pad = createNpthPadFromCircuitJson({
+        pcbHole,
+        componentCenter: component.center,
+        componentRotation: component.rotation || 0
+      });
+      if (pad) {
+        fpPads.push(pad);
+      }
+    }
     footprint.fpPads = fpPads;
     const footprints = kicadPcb.footprints;
     footprints.push(footprint);
@@ -1602,7 +1698,7 @@ var AddFootprintsStage = class extends ConverterStage {
 
 // lib/pcb/stages/AddTracesStage.ts
 import { Segment, SegmentNet } from "kicadts";
-import { applyToPoint as applyToPoint6 } from "transformation-matrix";
+import { applyToPoint as applyToPoint10 } from "transformation-matrix";
 var AddTracesStage = class extends ConverterStage {
   tracesProcessed = 0;
   pcbTraces = [];
@@ -1630,11 +1726,11 @@ var AddTracesStage = class extends ConverterStage {
     for (let i = 0; i < trace.route.length - 1; i++) {
       const startPoint = trace.route[i];
       const endPoint = trace.route[i + 1];
-      const transformedStart = applyToPoint6(c2kMatPcb, {
+      const transformedStart = applyToPoint10(c2kMatPcb, {
         x: startPoint.x,
         y: startPoint.y
       });
-      const transformedEnd = applyToPoint6(c2kMatPcb, {
+      const transformedEnd = applyToPoint10(c2kMatPcb, {
         x: endPoint.x,
         y: endPoint.y
       });
@@ -1668,7 +1764,7 @@ var AddTracesStage = class extends ConverterStage {
 
 // lib/pcb/stages/AddViasStage.ts
 import { Via, ViaNet } from "kicadts";
-import { applyToPoint as applyToPoint7 } from "transformation-matrix";
+import { applyToPoint as applyToPoint11 } from "transformation-matrix";
 var AddViasStage = class extends ConverterStage {
   viasProcessed = 0;
   pcbVias = [];
@@ -1689,7 +1785,7 @@ var AddViasStage = class extends ConverterStage {
       return;
     }
     const via = this.pcbVias[this.viasProcessed];
-    const transformedPos = applyToPoint7(c2kMatPcb, {
+    const transformedPos = applyToPoint11(c2kMatPcb, {
       x: via.x,
       y: via.y
     });
@@ -1716,7 +1812,7 @@ var AddViasStage = class extends ConverterStage {
 
 // lib/pcb/stages/AddGraphicsStage.ts
 import { GrLine } from "kicadts";
-import { applyToPoint as applyToPoint8 } from "transformation-matrix";
+import { applyToPoint as applyToPoint12 } from "transformation-matrix";
 var AddGraphicsStage = class extends ConverterStage {
   _step() {
     const { kicadPcb, c2kMatPcb } = this.ctx;
@@ -1733,11 +1829,11 @@ var AddGraphicsStage = class extends ConverterStage {
         const startPoint = path.route[i];
         const endPoint = path.route[i + 1];
         if (!startPoint || !endPoint) continue;
-        const transformedStart = applyToPoint8(c2kMatPcb, {
+        const transformedStart = applyToPoint12(c2kMatPcb, {
           x: startPoint.x,
           y: startPoint.y
         });
-        const transformedEnd = applyToPoint8(c2kMatPcb, {
+        const transformedEnd = applyToPoint12(c2kMatPcb, {
           x: endPoint.x,
           y: endPoint.y
         });
@@ -1778,7 +1874,7 @@ var AddGraphicsStage = class extends ConverterStage {
         ];
       }
       const transformedCorners = corners.map(
-        (corner) => applyToPoint8(c2kMatPcb, corner)
+        (corner) => applyToPoint12(c2kMatPcb, corner)
       );
       for (let i = 0; i < transformedCorners.length; i++) {
         const start = transformedCorners[i];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-kicad",
   "main": "dist/index.js",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "type": "module",
   "files": [
     "dist"