circuit-json-to-lbrn 0.0.21 → 0.0.22

package/lib/element-handlers/addPlatedHole/addPillPlatedHole.ts

@@ -9,19 +9,22 @@ export const addPcbPlatedHolePill = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
     includeCopper,
     includeSoldermask,
     soldermaskMargin,
+    includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
   const centerY = platedHole.y + origin.y
   const rotation = (platedHole.ccw_rotation || 0) * (Math.PI / 180) // Convert degrees to radians
 
   // Add outer pill shape (copper) if drawing copper
+  // Plated holes go through all layers, so add to both top and bottom
   if (
     platedHole.outer_width > 0 &&
     platedHole.outer_height > 0 &&
@@ -34,14 +37,26 @@ export const addPcbPlatedHolePill = (
       height: platedHole.outer_height,
       rotation,
     })
-    project.children.push(
-      new ShapePath({
-        cutIndex: copperCutSetting.index,
-        verts: outer.verts,
-        prims: outer.prims,
-        isClosed: true,
-      }),
-    )
+    if (includeLayers.includes("top")) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: topCopperCutSetting.index,
+          verts: outer.verts,
+          prims: outer.prims,
+          isClosed: true,
+        }),
+      )
+    }
+    if (includeLayers.includes("bottom")) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: bottomCopperCutSetting.index,
+          verts: outer.verts,
+          prims: outer.prims,
+          isClosed: true,
+        }),
+      )
+    }
   }
 
   // Add soldermask opening if drawing soldermask

package/lib/element-handlers/addPlatedHole/addRotatedPillHoleWithRectPad.ts

@@ -10,13 +10,15 @@ export const addRotatedPillHoleWithRectPad = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
     includeCopper,
     includeSoldermask,
     soldermaskMargin,
+    includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
   const centerY = platedHole.y + origin.y
@@ -38,15 +40,28 @@ export const addRotatedPillHoleWithRectPad = (
     })
 
     // Add the rectangular pad if drawing copper
+    // Plated holes go through all layers, so add to both top and bottom
     if (includeCopper) {
-      project.children.push(
-        new ShapePath({
-          cutIndex: copperCutSetting.index,
-          verts: padPath.verts,
-          prims: padPath.prims,
-          isClosed: true,
-        }),
-      )
+      if (includeLayers.includes("top")) {
+        project.children.push(
+          new ShapePath({
+            cutIndex: topCopperCutSetting.index,
+            verts: padPath.verts,
+            prims: padPath.prims,
+            isClosed: true,
+          }),
+        )
+      }
+      if (includeLayers.includes("bottom")) {
+        project.children.push(
+          new ShapePath({
+            cutIndex: bottomCopperCutSetting.index,
+            verts: padPath.verts,
+            prims: padPath.prims,
+            isClosed: true,
+          }),
+        )
+      }
     }
 
     // Add soldermask opening if drawing soldermask

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

@@ -11,14 +11,33 @@ export const addCircleSmtPad = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
+    topNetGeoms,
+    bottomNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
     connMap,
     soldermaskMargin,
+    includeLayers,
   } = ctx
+
+  // Filter by layer - only process top and bottom layers
+  const padLayer = smtPad.layer || "top"
+  if (padLayer !== "top" && padLayer !== "bottom") {
+    return // Skip inner layers
+  }
+  if (!includeLayers.includes(padLayer)) {
+    return
+  }
+
+  // Select the correct cut setting and net geoms based on layer
+  const copperCutSetting =
+    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
+  const netGeoms = padLayer === "top" ? topNetGeoms : bottomNetGeoms
+
   const centerX = smtPad.x + origin.x
   const centerY = smtPad.y + origin.y
 
@@ -33,7 +52,7 @@ export const addCircleSmtPad = (
 
       if (netId) {
         // Add to netGeoms to be merged with other elements on the same net
-        ctx.netGeoms.get(netId)?.push(polygon)
+        netGeoms.get(netId)?.push(polygon)
       } else {
         // No net connection - draw directly
         const outer = createCirclePath({

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

@@ -10,14 +10,33 @@ export const addPillSmtPad = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
+    topNetGeoms,
+    bottomNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
     connMap,
     soldermaskMargin,
+    includeLayers,
   } = ctx
+
+  // Filter by layer - only process top and bottom layers
+  const padLayer = smtPad.layer || "top"
+  if (padLayer !== "top" && padLayer !== "bottom") {
+    return // Skip inner layers
+  }
+  if (!includeLayers.includes(padLayer)) {
+    return
+  }
+
+  // Select the correct cut setting and net geoms based on layer
+  const copperCutSetting =
+    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
+  const netGeoms = padLayer === "top" ? topNetGeoms : bottomNetGeoms
+
   const centerX = smtPad.x + origin.x
   const centerY = smtPad.y + origin.y
 
@@ -36,7 +55,7 @@ export const addPillSmtPad = (
 
       if (netId) {
         // Add to netGeoms to be merged with other elements on the same net
-        ctx.netGeoms.get(netId)?.push(polygon)
+        netGeoms.get(netId)?.push(polygon)
       } else {
         // No net connection - draw directly
         project.children.push(

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

@@ -11,15 +11,33 @@ export const addPolygonSmtPad = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
+    topNetGeoms,
+    bottomNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
     connMap,
     soldermaskMargin,
+    includeLayers,
   } = ctx
 
+  // Filter by layer - only process top and bottom layers
+  const padLayer = smtPad.layer || "top"
+  if (padLayer !== "top" && padLayer !== "bottom") {
+    return // Skip inner layers
+  }
+  if (!includeLayers.includes(padLayer)) {
+    return
+  }
+
+  // Select the correct cut setting and net geoms based on layer
+  const copperCutSetting =
+    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
+  const netGeoms = padLayer === "top" ? topNetGeoms : bottomNetGeoms
+
   // Create the polygon pad
   if (smtPad.points.length >= 3) {
     const pad = createPolygonPathFromOutline({
@@ -35,7 +53,7 @@ export const addPolygonSmtPad = (
 
       if (netId) {
         // Add to netGeoms to be merged with other elements on the same net
-        ctx.netGeoms.get(netId)?.push(polygon)
+        netGeoms.get(netId)?.push(polygon)
       } else {
         // No net connection - draw directly
         project.children.push(

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

@@ -6,16 +6,28 @@ import { ShapePath } from "lbrnts"
 export const addRectSmtPad = (smtPad: PcbSmtPadRect, ctx: ConvertContext) => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
     connMap,
-    netGeoms,
+    topNetGeoms,
+    bottomNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
     soldermaskMargin,
+    includeLayers,
   } = ctx
 
+  // Filter by layer - only process top and bottom layers
+  const padLayer = smtPad.layer || "top"
+  if (padLayer !== "top" && padLayer !== "bottom") {
+    return // Skip inner layers
+  }
+  if (!includeLayers.includes(padLayer)) {
+    return
+  }
+
   const centerX = smtPad.x + origin.x
   const centerY = smtPad.y + origin.y
   const halfWidth = smtPad.width / 2
@@ -23,11 +35,16 @@ export const addRectSmtPad = (smtPad: PcbSmtPadRect, ctx: ConvertContext) => {
 
   const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id)
 
+  // Select the correct cut setting and net geoms based on layer
+  const copperCutSetting =
+    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
+  const netGeoms = padLayer === "top" ? topNetGeoms : bottomNetGeoms
+
   // 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
+      netGeoms
         .get(netId)
         ?.push(
           new Box(

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

@@ -10,14 +10,33 @@ export const addRotatedPillSmtPad = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
+    topNetGeoms,
+    bottomNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
     connMap,
     soldermaskMargin,
+    includeLayers,
   } = ctx
+
+  // Filter by layer - only process top and bottom layers
+  const padLayer = smtPad.layer || "top"
+  if (padLayer !== "top" && padLayer !== "bottom") {
+    return // Skip inner layers
+  }
+  if (!includeLayers.includes(padLayer)) {
+    return
+  }
+
+  // Select the correct cut setting and net geoms based on layer
+  const copperCutSetting =
+    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
+  const netGeoms = padLayer === "top" ? topNetGeoms : bottomNetGeoms
+
   const centerX = smtPad.x + origin.x
   const centerY = smtPad.y + origin.y
 
@@ -37,7 +56,7 @@ export const addRotatedPillSmtPad = (
 
       if (netId) {
         // Add to netGeoms to be merged with other elements on the same net
-        ctx.netGeoms.get(netId)?.push(polygon)
+        netGeoms.get(netId)?.push(polygon)
       } else {
         // No net connection - draw directly
         project.children.push(

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

@@ -10,14 +10,33 @@ export const addRotatedRectSmtPad = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
+    topNetGeoms,
+    bottomNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
     connMap,
     soldermaskMargin,
+    includeLayers,
   } = ctx
+
+  // Filter by layer - only process top and bottom layers
+  const padLayer = smtPad.layer || "top"
+  if (padLayer !== "top" && padLayer !== "bottom") {
+    return // Skip inner layers
+  }
+  if (!includeLayers.includes(padLayer)) {
+    return
+  }
+
+  // Select the correct cut setting and net geoms based on layer
+  const copperCutSetting =
+    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
+  const netGeoms = padLayer === "top" ? topNetGeoms : bottomNetGeoms
+
   const centerX = smtPad.x + origin.x
   const centerY = smtPad.y + origin.y
   const rotation = (smtPad.ccw_rotation ?? 0) * (Math.PI / 180)
@@ -41,7 +60,7 @@ export const addRotatedRectSmtPad = (
 
       if (netId) {
         // Add to netGeoms to be merged with other elements on the same net
-        ctx.netGeoms.get(netId)?.push(polygon)
+        netGeoms.get(netId)?.push(polygon)
       } else {
         // No net connection - draw directly
         project.children.push(

package/lib/index.ts

@@ -27,6 +27,7 @@ export const convertCircuitJsonToLbrn = (
     includeCopper?: boolean
     includeSoldermask?: boolean
     soldermaskMargin?: number
+    includeLayers?: Array<"top" | "bottom">
   } = {},
 ): LightBurnProject => {
   const db = cju(circuitJson)
@@ -35,16 +36,27 @@ export const convertCircuitJsonToLbrn = (
     formatVersion: "1",
   })
 
-  const copperCutSetting = new CutSetting({
+  // Default to all layers if not specified
+  const includeLayers = options.includeLayers ?? ["top", "bottom"]
+
+  const topCopperCutSetting = new CutSetting({
     index: 0,
-    name: "Cut Copper",
+    name: "Cut Top Copper",
     numPasses: 12,
     speed: 100,
   })
-  project.children.push(copperCutSetting)
+  project.children.push(topCopperCutSetting)
 
-  const throughBoardCutSetting = new CutSetting({
+  const bottomCopperCutSetting = new CutSetting({
     index: 1,
+    name: "Cut Bottom Copper",
+    numPasses: 12,
+    speed: 100,
+  })
+  project.children.push(bottomCopperCutSetting)
+
+  const throughBoardCutSetting = new CutSetting({
+    index: 2,
     name: "Cut Through Board",
     numPasses: 3,
     speed: 50,
@@ -52,14 +64,14 @@ export const convertCircuitJsonToLbrn = (
   project.children.push(throughBoardCutSetting)
 
   const soldermaskCutSetting = new CutSetting({
-    type: "Scan", // Use Scan mode to fill the pad shapes for Kapton tape cutting
-    index: 2,
+    type: "Scan", // Use Scan mode to fill pad shapes for Kapton tape cutting
+    index: 3,
     name: "Cut Soldermask",
     numPasses: 1,
     speed: 150,
     scanOpt: "individual", // Scan each shape individually
     interval: 0.18, // Distance between cross-hatch lines
-    angle: 45, // Angle of the cross-hatch lines
+    angle: 45, // Angle of cross-hatch lines
     crossHatch: true,
   })
   project.children.push(soldermaskCutSetting)
@@ -76,19 +88,23 @@ export const convertCircuitJsonToLbrn = (
   const ctx: ConvertContext = {
     db,
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     throughBoardCutSetting,
     soldermaskCutSetting,
     connMap,
-    netGeoms: new Map(),
+    topNetGeoms: new Map(),
+    bottomNetGeoms: new Map(),
     origin,
     includeCopper: options.includeCopper ?? true,
     includeSoldermask: options.includeSoldermask ?? false,
     soldermaskMargin: options.soldermaskMargin ?? 0,
+    includeLayers,
   }
 
   for (const net of Object.keys(connMap.netMap)) {
-    ctx.netGeoms.set(net, [])
+    ctx.topNetGeoms.set(net, [])
+    ctx.bottomNetGeoms.set(net, [])
   }
 
   for (const smtpad of db.pcb_smtpad.list()) {
@@ -149,42 +165,77 @@ export const convertCircuitJsonToLbrn = (
   // Create a union of all the net geoms, and add to project
   // Only do this when including copper
   if (ctx.includeCopper) {
-    for (const net of Object.keys(connMap.netMap)) {
-      const netGeoms = ctx.netGeoms.get(net)!
+    // Process top layer
+    if (includeLayers.includes("top")) {
+      for (const net of Object.keys(connMap.netMap)) {
+        const netGeoms = ctx.topNetGeoms.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))
+          }
+        }
+
+        for (const island of union.splitToIslands()) {
+          // Convert the polygon to verts and prims
+          const { verts, prims } = polygonToShapePathData(island)
+
+          project.children.push(
+            new ShapePath({
+              cutIndex: topCopperCutSetting.index,
+              verts,
+              prims,
+              isClosed: false,
+            }),
+          )
         }
       }
+    }
+
+    // Process bottom layer
+    if (includeLayers.includes("bottom")) {
+      for (const net of Object.keys(connMap.netMap)) {
+        const netGeoms = ctx.bottomNetGeoms.get(net)!
 
-      // 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,
-          }),
-        )
+        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))
+          }
+        }
+
+        for (const island of union.splitToIslands()) {
+          // Convert the polygon to verts and prims
+          const { verts, prims } = polygonToShapePathData(island)
+
+          project.children.push(
+            new ShapePath({
+              cutIndex: bottomCopperCutSetting.index,
+              verts,
+              prims,
+              isClosed: false,
+            }),
+          )
+        }
       }
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-lbrn",
   "main": "dist/index.js",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "type": "module",
   "scripts": {
     "start": "bun run site/index.html",