circuit-json-to-kicad 0.0.17 → 0.0.19

package/dist/index.js

@@ -1349,7 +1349,7 @@ var AddNetsStage = class extends ConverterStage {
 };
 
 // lib/pcb/stages/AddFootprintsStage.ts
-import { Footprint, FpText } from "kicadts";
+import { Footprint } from "kicadts";
 import { applyToPoint as applyToPoint5 } from "transformation-matrix";
 
 // lib/pcb/stages/utils/CreateSmdPadFromCircuitJson.ts
@@ -1363,7 +1363,7 @@ function createSmdPadFromCircuitJson({
     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 relativeY = -(pcbPad.y - componentCenter.y);
   const layerMap = {
     top: "F.Cu",
     bottom: "B.Cu"
@@ -1403,7 +1403,7 @@ function createThruHolePadFromCircuitJson({
     return null;
   }
   const relativeX = platedHole.x - componentCenter.x;
-  const relativeY = platedHole.y - componentCenter.y;
+  const relativeY = -(platedHole.y - componentCenter.y);
   let padShape = "circle";
   let padSize;
   let drill;
@@ -1475,6 +1475,44 @@ function createThruHolePadFromCircuitJson({
   });
 }
 
+// lib/pcb/stages/utils/CreateFpTextFromCircuitJson.ts
+import { FpText, TextEffects as TextEffects4, TextEffectsFont as TextEffectsFont4 } from "kicadts";
+function createFpTextFromCircuitJson({
+  textElement,
+  componentCenter
+}) {
+  if (!textElement.text || !textElement.anchor_position) {
+    return null;
+  }
+  const relativePosition = {
+    x: textElement.anchor_position.x - componentCenter.x,
+    y: -(textElement.anchor_position.y - componentCenter.y)
+  };
+  const layerMap = {
+    top: "F.SilkS",
+    bottom: "B.SilkS"
+  };
+  const kicadLayer = layerMap[textElement.layer] || textElement.layer || "F.SilkS";
+  const fontSize = (textElement.font_size || 1) / 1.5;
+  const font = new TextEffectsFont4();
+  font.size = { width: fontSize, height: fontSize };
+  const textEffects = new TextEffects4({
+    font
+  });
+  const rotation = textElement.ccw_rotation || 0;
+  return new FpText({
+    type: "user",
+    text: textElement.text,
+    position: {
+      x: relativePosition.x,
+      y: relativePosition.y,
+      angle: rotation
+    },
+    layer: kicadLayer,
+    effects: textEffects
+  });
+}
+
 // lib/pcb/stages/AddFootprintsStage.ts
 var AddFootprintsStage = class extends ConverterStage {
   componentsProcessed = 0;
@@ -1509,23 +1547,19 @@ var AddFootprintsStage = class extends ConverterStage {
       at: [transformedPos.x, transformedPos.y, component.rotation || 0],
       uuid: crypto.randomUUID()
     });
-    const refText = new FpText({
-      type: "reference",
-      text: componentName,
-      position: [0, -1.5, 0],
-      layer: "F.SilkS",
-      uuid: crypto.randomUUID()
-    });
-    const valueText = new FpText({
-      type: "value",
-      text: footprintName,
-      position: [0, 1.5, 0],
-      layer: "F.Fab",
-      uuid: crypto.randomUUID()
-    });
     const fpTexts = footprint.fpTexts;
-    fpTexts.push(refText);
-    fpTexts.push(valueText);
+    const pcbSilkscreenTexts = this.ctx.db.pcb_silkscreen_text?.list().filter(
+      (text) => text.pcb_component_id === component.pcb_component_id
+    ) || [];
+    for (const textElement of pcbSilkscreenTexts) {
+      const fpText = createFpTextFromCircuitJson({
+        textElement,
+        componentCenter: component.center
+      });
+      if (fpText) {
+        fpTexts.push(fpText);
+      }
+    }
     footprint.fpTexts = fpTexts;
     const pcbPads = this.ctx.db.pcb_smtpad?.list().filter(
       (pad) => pad.pcb_component_id === component.pcb_component_id

package/package.json

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