circuit-json-to-kicad 0.0.16 → 0.0.18

package/dist/index.js

@@ -1349,8 +1349,133 @@ var AddNetsStage = class extends ConverterStage {
 };
 
 // lib/pcb/stages/AddFootprintsStage.ts
-import { Footprint, FpText, FootprintPad } from "kicadts";
+import { Footprint, FpText } from "kicadts";
 import { applyToPoint as applyToPoint5 } from "transformation-matrix";
+
+// lib/pcb/stages/utils/CreateSmdPadFromCircuitJson.ts
+import { FootprintPad } from "kicadts";
+function createSmdPadFromCircuitJson({
+  pcbPad,
+  componentCenter,
+  padNumber
+}) {
+  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 layerMap = {
+    top: "F.Cu",
+    bottom: "B.Cu"
+  };
+  const padLayer = layerMap[pcbPad.layer] || "F.Cu";
+  const padShape = pcbPad.shape === "circle" ? "circle" : "rect";
+  const padSize = pcbPad.shape === "circle" ? [
+    "radius" in pcbPad ? pcbPad.radius * 2 : 0.5,
+    "radius" in pcbPad ? pcbPad.radius * 2 : 0.5
+  ] : [
+    "width" in pcbPad ? pcbPad.width : 0.5,
+    "height" in pcbPad ? pcbPad.height : 0.5
+  ];
+  return new FootprintPad({
+    number: String(padNumber),
+    padType: "smd",
+    shape: padShape,
+    at: [relativeX, relativeY, 0],
+    size: padSize,
+    layers: [
+      `${padLayer}`,
+      `${padLayer === "F.Cu" ? "F" : "B"}.Paste`,
+      `${padLayer === "F.Cu" ? "F" : "B"}.Mask`
+    ],
+    uuid: crypto.randomUUID()
+  });
+}
+
+// lib/pcb/stages/utils/CreateThruHolePadFromCircuitJson.ts
+import { FootprintPad as FootprintPad2, PadDrill } from "kicadts";
+function createThruHolePadFromCircuitJson({
+  platedHole,
+  componentCenter,
+  padNumber
+}) {
+  if (!("x" in platedHole && "y" in platedHole)) {
+    return null;
+  }
+  const relativeX = platedHole.x - componentCenter.x;
+  const relativeY = -(platedHole.y - componentCenter.y);
+  let padShape = "circle";
+  let padSize;
+  let drill;
+  let rotation = 0;
+  if (platedHole.shape === "circle") {
+    padShape = "circle";
+    padSize = [platedHole.outer_diameter, platedHole.outer_diameter];
+    drill = new PadDrill({
+      diameter: platedHole.hole_diameter
+    });
+  } else if (platedHole.shape === "pill" || platedHole.shape === "oval") {
+    padShape = "oval";
+    padSize = [
+      platedHole.outer_width,
+      platedHole.outer_height
+    ];
+    drill = new PadDrill({
+      oval: true,
+      diameter: platedHole.hole_width,
+      width: platedHole.hole_height
+    });
+  } else if (platedHole.shape === "pill_hole_with_rect_pad") {
+    padShape = "rect";
+    padSize = [
+      platedHole.rect_pad_width,
+      platedHole.rect_pad_height
+    ];
+    drill = new PadDrill({
+      oval: true,
+      diameter: platedHole.hole_width,
+      width: platedHole.hole_height
+    });
+  } else if (platedHole.shape === "circular_hole_with_rect_pad") {
+    padShape = "rect";
+    padSize = [
+      platedHole.rect_pad_width,
+      platedHole.rect_pad_height
+    ];
+    drill = new PadDrill({
+      diameter: platedHole.hole_diameter
+    });
+  } else if (platedHole.shape === "rotated_pill_hole_with_rect_pad") {
+    padShape = "rect";
+    padSize = [
+      platedHole.rect_pad_width,
+      platedHole.rect_pad_height
+    ];
+    drill = new PadDrill({
+      oval: true,
+      diameter: platedHole.hole_width,
+      width: platedHole.hole_height
+    });
+    rotation = platedHole.rect_ccw_rotation || 0;
+  } else {
+    padShape = "circle";
+    padSize = [1.6, 1.6];
+    drill = new PadDrill({ diameter: 0.8 });
+  }
+  return new FootprintPad2({
+    number: String(padNumber),
+    padType: "thru_hole",
+    shape: padShape,
+    at: [relativeX, relativeY, rotation],
+    size: padSize,
+    drill,
+    layers: ["*.Cu", "*.Mask"],
+    removeUnusedLayers: false,
+    uuid: crypto.randomUUID()
+  });
+}
+
+// lib/pcb/stages/AddFootprintsStage.ts
 var AddFootprintsStage = class extends ConverterStage {
   componentsProcessed = 0;
   pcbComponents = [];
@@ -1408,40 +1533,28 @@ var AddFootprintsStage = class extends ConverterStage {
     const fpPads = footprint.fpPads;
     let padNumber = 1;
     for (const pcbPad of pcbPads) {
-      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 - component.center.x;
-      const relativeY = pcbPad.y - component.center.y;
-      const layerMap = {
-        top: "F.Cu",
-        bottom: "B.Cu"
-      };
-      const padLayer = layerMap[pcbPad.layer] || "F.Cu";
-      const padShape = pcbPad.shape === "circle" ? "circle" : "rect";
-      const padSize = pcbPad.shape === "circle" ? [
-        "radius" in pcbPad ? pcbPad.radius * 2 : 0.5,
-        "radius" in pcbPad ? pcbPad.radius * 2 : 0.5
-      ] : [
-        "width" in pcbPad ? pcbPad.width : 0.5,
-        "height" in pcbPad ? pcbPad.height : 0.5
-      ];
-      const pad = new FootprintPad({
-        number: String(padNumber),
-        padType: "smd",
-        shape: padShape,
-        at: [relativeX, relativeY, 0],
-        size: padSize,
-        layers: [
-          `${padLayer}`,
-          `${padLayer === "F.Cu" ? "F" : "B"}.Paste`,
-          `${padLayer === "F.Cu" ? "F" : "B"}.Mask`
-        ],
-        uuid: crypto.randomUUID()
+      const pad = createSmdPadFromCircuitJson({
+        pcbPad,
+        componentCenter: component.center,
+        padNumber
       });
       fpPads.push(pad);
       padNumber++;
     }
+    const pcbPlatedHoles = this.ctx.db.pcb_plated_hole?.list().filter(
+      (hole) => hole.pcb_component_id === component.pcb_component_id
+    ) || [];
+    for (const platedHole of pcbPlatedHoles) {
+      const pad = createThruHolePadFromCircuitJson({
+        platedHole,
+        componentCenter: component.center,
+        padNumber
+      });
+      if (pad) {
+        fpPads.push(pad);
+        padNumber++;
+      }
+    }
     footprint.fpPads = fpPads;
     const footprints = kicadPcb.footprints;
     footprints.push(footprint);
@@ -1569,7 +1682,47 @@ var AddViasStage = class extends ConverterStage {
 
 // lib/pcb/stages/AddGraphicsStage.ts
 import { GrLine } from "kicadts";
+import { applyToPoint as applyToPoint9 } from "transformation-matrix";
+
+// lib/pcb/stages/utils/CreateGrTextFromCircuitJson.ts
+import { GrText, TextEffects as TextEffects4, TextEffectsFont as TextEffectsFont4 } from "kicadts";
 import { applyToPoint as applyToPoint8 } from "transformation-matrix";
+function createGrTextFromCircuitJson({
+  textElement,
+  transformationMatrix
+}) {
+  if (!textElement.text || !textElement.anchor_position) {
+    return null;
+  }
+  const transformedPosition = applyToPoint8(transformationMatrix, {
+    x: textElement.anchor_position.x,
+    y: textElement.anchor_position.y
+  });
+  const layerMap = {
+    top: "F.SilkS",
+    bottom: "B.SilkS"
+  };
+  const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.SilkS";
+  const fontSize = (textElement.font_size || 1) / 2;
+  const font = new TextEffectsFont4();
+  font.size = { width: fontSize, height: fontSize };
+  const textEffects = new TextEffects4({
+    font
+  });
+  const rotation = textElement.ccw_rotation || 0;
+  return new GrText({
+    text: textElement.text,
+    position: {
+      x: transformedPosition.x,
+      y: transformedPosition.y,
+      angle: rotation
+    },
+    layer: kicadLayer,
+    effects: textEffects
+  });
+}
+
+// lib/pcb/stages/AddGraphicsStage.ts
 var AddGraphicsStage = class extends ConverterStage {
   _step() {
     const { kicadPcb, c2kMatPcb } = this.ctx;
@@ -1586,11 +1739,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 = applyToPoint9(c2kMatPcb, {
           x: startPoint.x,
           y: startPoint.y
         });
-        const transformedEnd = applyToPoint8(c2kMatPcb, {
+        const transformedEnd = applyToPoint9(c2kMatPcb, {
           x: endPoint.x,
           y: endPoint.y
         });
@@ -1610,6 +1763,18 @@ var AddGraphicsStage = class extends ConverterStage {
         kicadPcb.graphicLines = graphicLines;
       }
     }
+    const pcbSilkscreenTexts = this.ctx.db.pcb_silkscreen_text?.list() || [];
+    for (const textElement of pcbSilkscreenTexts) {
+      const grText = createGrTextFromCircuitJson({
+        textElement,
+        transformationMatrix: c2kMatPcb
+      });
+      if (grText) {
+        const graphicTexts = kicadPcb.graphicTexts || [];
+        graphicTexts.push(grText);
+        kicadPcb.graphicTexts = graphicTexts;
+      }
+    }
     const pcbBoards = this.ctx.db.pcb_board?.list() || [];
     if (pcbBoards.length > 0) {
       const board = pcbBoards[0];
@@ -1631,7 +1796,7 @@ var AddGraphicsStage = class extends ConverterStage {
         ];
       }
       const transformedCorners = corners.map(
-        (corner) => applyToPoint8(c2kMatPcb, corner)
+        (corner) => applyToPoint9(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.16",
+  "version": "0.0.18",
   "type": "module",
   "files": [
     "dist"