circuit-json-to-lbrn 0.0.8 → 0.0.10

package/lib/element-handlers/addSmtPad/addRectSmtPad.ts

@@ -4,23 +4,91 @@ import type { PcbSmtPadRect } from "circuit-json"
 import { ShapePath } from "lbrnts"
 
 export const addRectSmtPad = (smtPad: PcbSmtPadRect, ctx: ConvertContext) => {
-  const { project, copperCutSetting, connMap, netGeoms, origin } = ctx
+  const {
+    project,
+    copperCutSetting,
+    connMap,
+    netGeoms,
+    origin,
+    includeCopper,
+    includeSoldermask,
+  } = ctx
 
   const centerX = smtPad.x + origin.x
   const centerY = smtPad.y + origin.y
   const halfWidth = smtPad.width / 2
   const halfHeight = smtPad.height / 2
 
-  const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id)!
-
-  ctx.netGeoms
-    .get(netId)
-    ?.push(
-      new Box(
-        centerX - halfWidth,
-        centerY - halfHeight,
-        centerX + halfWidth,
-        centerY + halfHeight,
-      ),
+  const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id)
+
+  // Only add to netGeoms if drawing copper
+  if (includeCopper) {
+    if (netId) {
+      // Add to netGeoms to be merged with other elements on the same net
+      ctx.netGeoms
+        .get(netId)
+        ?.push(
+          new Box(
+            centerX - halfWidth,
+            centerY - halfHeight,
+            centerX + halfWidth,
+            centerY + halfHeight,
+          ),
+        )
+    } else {
+      // No net connection - draw directly
+      const verts = [
+        { x: centerX - halfWidth, y: centerY - halfHeight },
+        { x: centerX + halfWidth, y: centerY - halfHeight },
+        { x: centerX + halfWidth, y: centerY + halfHeight },
+        { x: centerX - halfWidth, y: centerY + halfHeight },
+        { x: centerX - halfWidth, y: centerY - halfHeight }, // Close the path
+      ]
+
+      const prims = [
+        { type: 0 },
+        { type: 0 },
+        { type: 0 },
+        { type: 0 },
+        { type: 0 },
+      ]
+
+      project.children.push(
+        new ShapePath({
+          cutIndex: copperCutSetting.index,
+          verts,
+          prims,
+          isClosed: true,
+        }),
+      )
+    }
+  }
+
+  // Add soldermask opening if drawing soldermask
+  if (includeSoldermask) {
+    const verts = [
+      { x: centerX - halfWidth, y: centerY - halfHeight },
+      { x: centerX + halfWidth, y: centerY - halfHeight },
+      { x: centerX + halfWidth, y: centerY + halfHeight },
+      { x: centerX - halfWidth, y: centerY + halfHeight },
+      { x: centerX - halfWidth, y: centerY - halfHeight }, // Close the path
+    ]
+
+    const prims = [
+      { type: 0 },
+      { type: 0 },
+      { type: 0 },
+      { type: 0 },
+      { type: 0 },
+    ]
+
+    project.children.push(
+      new ShapePath({
+        cutIndex: copperCutSetting.index,
+        verts,
+        prims,
+        isClosed: true,
+      }),
     )
+  }
 }

package/lib/element-handlers/addSmtPad/addRotatedPillSmtPad.ts

@@ -0,0 +1,64 @@
+import type { PcbSmtPadRotatedPill } from "circuit-json"
+import type { ConvertContext } from "../../ConvertContext"
+import { ShapePath } from "lbrnts"
+import { createPillPath } from "../../helpers/pillShape"
+import { pathToPolygon } from "../../helpers/pathToPolygon"
+
+export const addRotatedPillSmtPad = (
+  smtPad: PcbSmtPadRotatedPill,
+  ctx: ConvertContext,
+): void => {
+  const {
+    project,
+    copperCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+    connMap,
+  } = ctx
+  const centerX = smtPad.x + origin.x
+  const centerY = smtPad.y + origin.y
+
+  if (smtPad.width > 0 && smtPad.height > 0) {
+    const outer = createPillPath(
+      centerX,
+      centerY,
+      smtPad.width,
+      smtPad.height,
+      (smtPad.ccw_rotation ?? 0) * (Math.PI / 180),
+    )
+
+    // Add to netGeoms for copper (will be merged with traces)
+    if (includeCopper) {
+      const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id)
+      const polygon = pathToPolygon(outer.verts)
+
+      if (netId) {
+        // Add to netGeoms to be merged with other elements on the same net
+        ctx.netGeoms.get(netId)?.push(polygon)
+      } else {
+        // No net connection - draw directly
+        project.children.push(
+          new ShapePath({
+            cutIndex: copperCutSetting.index,
+            verts: outer.verts,
+            prims: outer.prims,
+            isClosed: true,
+          }),
+        )
+      }
+    }
+
+    // Add soldermask opening if drawing soldermask
+    if (includeSoldermask) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: copperCutSetting.index,
+          verts: outer.verts,
+          prims: outer.prims,
+          isClosed: true,
+        }),
+      )
+    }
+  }
+}

package/lib/element-handlers/addSmtPad/addRotatedRectSmtPad.ts

@@ -0,0 +1,68 @@
+import type { PcbSmtPadRotatedRect } from "circuit-json"
+import type { ConvertContext } from "../../ConvertContext"
+import { ShapePath } from "lbrnts"
+import { createRoundedRectPath } from "../../helpers/roundedRectShape"
+import { pathToPolygon } from "../../helpers/pathToPolygon"
+
+export const addRotatedRectSmtPad = (
+  smtPad: PcbSmtPadRotatedRect,
+  ctx: ConvertContext,
+): void => {
+  const {
+    project,
+    copperCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+    connMap,
+  } = ctx
+  const centerX = smtPad.x + origin.x
+  const centerY = smtPad.y + origin.y
+  const rotation = smtPad.ccw_rotation ?? 0
+  const borderRadius = smtPad.rect_border_radius ?? 0
+
+  if (smtPad.width > 0 && smtPad.height > 0) {
+    const outer = createRoundedRectPath(
+      centerX,
+      centerY,
+      smtPad.width,
+      smtPad.height,
+      borderRadius,
+      4,
+      rotation,
+    )
+
+    // Add to netGeoms for copper (will be merged with traces)
+    if (includeCopper) {
+      const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id)
+      const polygon = pathToPolygon(outer.verts)
+
+      if (netId) {
+        // Add to netGeoms to be merged with other elements on the same net
+        ctx.netGeoms.get(netId)?.push(polygon)
+      } else {
+        // No net connection - draw directly
+        project.children.push(
+          new ShapePath({
+            cutIndex: copperCutSetting.index,
+            verts: outer.verts,
+            prims: outer.prims,
+            isClosed: true,
+          }),
+        )
+      }
+    }
+
+    // Add soldermask opening if drawing soldermask
+    if (includeSoldermask) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: copperCutSetting.index,
+          verts: outer.verts,
+          prims: outer.prims,
+          isClosed: true,
+        }),
+      )
+    }
+  }
+}

package/lib/element-handlers/addSmtPad/index.ts

@@ -1,15 +1,33 @@
 import type { PcbSmtPad } from "circuit-json"
 import type { ConvertContext } from "../../ConvertContext"
 import { addRectSmtPad } from "./addRectSmtPad"
+import { addCircleSmtPad } from "./addCircleSmtPad"
+import { addPillSmtPad } from "./addPillSmtPad"
+import { addRotatedPillSmtPad } from "./addRotatedPillSmtPad"
+import { addPolygonSmtPad } from "./addPolygonSmtPad"
+import { addRotatedRectSmtPad } from "./addRotatedRectSmtPad"
 
 export const addSmtPad = (smtPad: PcbSmtPad, ctx: ConvertContext) => {
   switch (smtPad.shape) {
-    case "rect": {
-      addRectSmtPad(smtPad, ctx)
-      break
-    }
-    default: {
-      throw new Error(`Unknown smt pad shape: ${smtPad.shape}`)
-    }
+    case "rect":
+      return addRectSmtPad(smtPad, ctx)
+
+    case "circle":
+      return addCircleSmtPad(smtPad, ctx)
+
+    case "pill":
+      return addPillSmtPad(smtPad, ctx)
+
+    case "rotated_pill":
+      return addRotatedPillSmtPad(smtPad, ctx)
+
+    case "polygon":
+      return addPolygonSmtPad(smtPad, ctx)
+
+    case "rotated_rect":
+      return addRotatedRectSmtPad(smtPad, ctx)
+
+    default:
+      throw new Error(`Unknown smt pad shape: ${(smtPad as any).shape}`)
   }
 }

package/lib/helpers/pathToPolygon.ts

@@ -0,0 +1,14 @@
+import { Polygon, point } from "@flatten-js/core"
+
+export interface Point {
+  x: number
+  y: number
+}
+
+/**
+ * Convert an array of points to a Polygon
+ */
+export const pathToPolygon = (verts: Point[]): Polygon => {
+  const points = verts.map((v) => point(v.x, v.y))
+  return new Polygon(points)
+}

package/lib/index.ts

@@ -21,6 +21,8 @@ export const convertCircuitJsonToLbrn = (
     includeSilkscreen?: boolean
     origin?: { x: number; y: number }
     margin?: number
+    includeCopper?: boolean
+    includeSoldermask?: boolean
   } = {},
 ): LightBurnProject => {
   const db = cju(circuitJson)
@@ -62,6 +64,8 @@ export const convertCircuitJsonToLbrn = (
     connMap,
     netGeoms: new Map(),
     origin,
+    includeCopper: options.includeCopper ?? true,
+    includeSoldermask: options.includeSoldermask ?? false,
   }
 
   for (const net of Object.keys(connMap.netMap)) {
@@ -112,42 +116,45 @@ export const convertCircuitJsonToLbrn = (
   // }
 
   // Create a union of all the net geoms, and add to project
-  for (const net of Object.keys(connMap.netMap)) {
-    const netGeoms = ctx.netGeoms.get(net)!
+  // Only do this when including copper
+  if (ctx.includeCopper) {
+    for (const net of Object.keys(connMap.netMap)) {
+      const netGeoms = ctx.netGeoms.get(net)!
 
-    if (netGeoms.length === 0) {
-      continue
-    }
+      if (netGeoms.length === 0) {
+        continue
+      }
 
-    let union = netGeoms[0]!
-    if (union instanceof Box) {
-      union = new Polygon(union)
-    }
-    for (const geom of netGeoms.slice(1)) {
-      if (geom instanceof Polygon) {
-        union = BooleanOperations.unify(union, geom)
-      } else if (geom instanceof Box) {
-        union = BooleanOperations.unify(union, new Polygon(geom))
+      let union = netGeoms[0]!
+      if (union instanceof Box) {
+        union = new Polygon(union)
+      }
+      for (const geom of netGeoms.slice(1)) {
+        if (geom instanceof Polygon) {
+          union = BooleanOperations.unify(union, geom)
+        } else if (geom instanceof Box) {
+          union = BooleanOperations.unify(union, new Polygon(geom))
+        }
       }
-    }
 
-    // DEBUGGING ONLY!!!
-    // if (netGeoms.length > 1) {
-    //   writeDebugSvg(net, union)
-    // }
-
-    for (const island of union.splitToIslands()) {
-      // Convert the polygon to verts and prims
-      const { verts, prims } = polygonToShapePathData(island)
-
-      project.children.push(
-        new ShapePath({
-          cutIndex: copperCutSetting.index,
-          verts,
-          prims,
-          isClosed: false,
-        }),
-      )
+      // DEBUGGING ONLY!!!
+      // if (netGeoms.length > 1) {
+      //   writeDebugSvg(net, union)
+      // }
+
+      for (const island of union.splitToIslands()) {
+        // Convert the polygon to verts and prims
+        const { verts, prims } = polygonToShapePathData(island)
+
+        project.children.push(
+          new ShapePath({
+            cutIndex: copperCutSetting.index,
+            verts,
+            prims,
+            isClosed: false,
+          }),
+        )
+      }
     }
   }
   return project

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-lbrn",
   "main": "dist/index.js",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "type": "module",
   "scripts": {
     "start": "bun run site/index.html",
@@ -19,7 +19,7 @@
     "bun-match-svg": "^0.0.14",
     "circuit-json": "^0.0.316",
     "circuit-json-to-connectivity-map": "^0.0.22",
-    "circuit-to-svg": "^0.0.271",
+    "circuit-to-svg": "^0.0.283",
     "schematic-symbols": "^0.0.202",
     "stack-svgs": "^0.0.1",
     "tsup": "^8.5.1"