circuit-json-to-lbrn 0.0.29 → 0.0.31

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

@@ -17,7 +17,7 @@ export const addCircularHoleWithRectPad = (
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
@@ -63,8 +63,14 @@ export const addCircularHoleWithRectPad = (
 
   // Add soldermask opening if drawing soldermask
   if (includeSoldermask) {
-    const smPadWidth = padWidth + 2 * soldermaskMargin
-    const smPadHeight = padHeight + 2 * soldermaskMargin
+    const smPadWidth =
+      padWidth +
+      2 * globalCopperSoldermaskMarginAdjustment +
+      (platedHole.soldermask_margin ?? 0)
+    const smPadHeight =
+      padHeight +
+      2 * globalCopperSoldermaskMarginAdjustment +
+      (platedHole.soldermask_margin ?? 0)
     const smPadPath = createRoundedRectPath({
       centerX,
       centerY,

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

@@ -17,7 +17,7 @@ export const addHoleWithPolygonPad = (
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
 

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

@@ -16,7 +16,7 @@ export const addOvalPlatedHole = (
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
 
@@ -70,6 +70,9 @@ export const addOvalPlatedHole = (
     platedHole.outer_height > 0 &&
     includeSoldermask
   ) {
+    const soldermaskMargin =
+      globalCopperSoldermaskMarginAdjustment +
+      (platedHole.soldermask_margin ?? 0)
     const smWidth = platedHole.outer_width + 2 * soldermaskMargin
     const smHeight = platedHole.outer_height + 2 * soldermaskMargin
     const outer = createOvalPath({

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

@@ -17,7 +17,7 @@ export const addPillHoleWithRectPad = (
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
@@ -63,8 +63,14 @@ export const addPillHoleWithRectPad = (
 
     // Add soldermask opening if drawing soldermask
     if (includeSoldermask) {
-      const smPadWidth = padWidth + 2 * soldermaskMargin
-      const smPadHeight = padHeight + 2 * soldermaskMargin
+      const smPadWidth =
+        padWidth +
+        2 * globalCopperSoldermaskMarginAdjustment +
+        (platedHole.soldermask_margin ?? 0)
+      const smPadHeight =
+        padHeight +
+        2 * globalCopperSoldermaskMarginAdjustment +
+        (platedHole.soldermask_margin ?? 0)
       const smPadPath = createRoundedRectPath({
         centerX,
         centerY,

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

@@ -16,7 +16,7 @@ export const addPcbPlatedHolePill = (
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
@@ -65,8 +65,14 @@ export const addPcbPlatedHolePill = (
     platedHole.outer_height > 0 &&
     includeSoldermask
   ) {
-    const smWidth = platedHole.outer_width + 2 * soldermaskMargin
-    const smHeight = platedHole.outer_height + 2 * soldermaskMargin
+    const smWidth =
+      platedHole.outer_width +
+      2 * globalCopperSoldermaskMarginAdjustment +
+      (platedHole.soldermask_margin ?? 0)
+    const smHeight =
+      platedHole.outer_height +
+      2 * globalCopperSoldermaskMarginAdjustment +
+      (platedHole.soldermask_margin ?? 0)
     const outer = createPillPath({
       centerX,
       centerY,

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

@@ -17,7 +17,7 @@ export const addRotatedPillHoleWithRectPad = (
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
@@ -66,8 +66,14 @@ export const addRotatedPillHoleWithRectPad = (
 
     // Add soldermask opening if drawing soldermask
     if (includeSoldermask) {
-      const smPadWidth = padWidth + 2 * soldermaskMargin
-      const smPadHeight = padHeight + 2 * soldermaskMargin
+      const smPadWidth =
+        padWidth +
+        2 * globalCopperSoldermaskMarginAdjustment +
+        (platedHole.soldermask_margin ?? 0)
+      const smPadHeight =
+        padHeight +
+        2 * globalCopperSoldermaskMarginAdjustment +
+        (platedHole.soldermask_margin ?? 0)
       const smPadPath = createRoundedRectPath({
         centerX,
         centerY,

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

@@ -20,7 +20,7 @@ export const addCircleSmtPad = (
     includeCopper,
     includeSoldermask,
     connMap,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
 
@@ -73,7 +73,10 @@ export const addCircleSmtPad = (
 
     // Add soldermask opening if drawing soldermask
     if (includeSoldermask) {
-      const smRadius = outerRadius + soldermaskMargin
+      const smRadius =
+        outerRadius +
+        globalCopperSoldermaskMarginAdjustment +
+        (smtPad.soldermask_margin ?? 0)
       const outer = createCirclePath({
         centerX,
         centerY,

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

@@ -19,7 +19,7 @@ export const addPillSmtPad = (
     includeCopper,
     includeSoldermask,
     connMap,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
 
@@ -71,8 +71,14 @@ export const addPillSmtPad = (
 
     // Add soldermask opening if drawing soldermask
     if (includeSoldermask) {
-      const smWidth = smtPad.width + 2 * soldermaskMargin
-      const smHeight = smtPad.height + 2 * soldermaskMargin
+      const smWidth =
+        smtPad.width +
+        2 * globalCopperSoldermaskMarginAdjustment +
+        (smtPad.soldermask_margin ?? 0)
+      const smHeight =
+        smtPad.height +
+        2 * globalCopperSoldermaskMarginAdjustment +
+        (smtPad.soldermask_margin ?? 0)
       const smOuter = createPillPath({
         centerX,
         centerY,

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

@@ -20,7 +20,7 @@ export const addPolygonSmtPad = (
     includeCopper,
     includeSoldermask,
     connMap,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
 

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

@@ -15,7 +15,7 @@ export const addRectSmtPad = (smtPad: PcbSmtPadRect, ctx: ConvertContext) => {
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
 
@@ -85,8 +85,14 @@ export const addRectSmtPad = (smtPad: PcbSmtPadRect, ctx: ConvertContext) => {
 
   // Add soldermask opening if drawing soldermask
   if (includeSoldermask) {
-    const smHalfWidth = halfWidth + soldermaskMargin
-    const smHalfHeight = halfHeight + soldermaskMargin
+    const smHalfWidth =
+      halfWidth +
+      globalCopperSoldermaskMarginAdjustment +
+      (smtPad.soldermask_margin ?? 0)
+    const smHalfHeight =
+      halfHeight +
+      globalCopperSoldermaskMarginAdjustment +
+      (smtPad.soldermask_margin ?? 0)
 
     const verts = [
       { x: centerX - smHalfWidth, y: centerY - smHalfHeight },

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

@@ -19,7 +19,7 @@ export const addRotatedPillSmtPad = (
     includeCopper,
     includeSoldermask,
     connMap,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
 
@@ -72,8 +72,14 @@ export const addRotatedPillSmtPad = (
 
     // Add soldermask opening if drawing soldermask
     if (includeSoldermask) {
-      const smWidth = smtPad.width + 2 * soldermaskMargin
-      const smHeight = smtPad.height + 2 * soldermaskMargin
+      const smWidth =
+        smtPad.width +
+        2 * globalCopperSoldermaskMarginAdjustment +
+        (smtPad.soldermask_margin ?? 0)
+      const smHeight =
+        smtPad.height +
+        2 * globalCopperSoldermaskMarginAdjustment +
+        (smtPad.soldermask_margin ?? 0)
       const smOuter = createPillPath({
         centerX,
         centerY,

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

@@ -19,7 +19,7 @@ export const addRotatedRectSmtPad = (
     includeCopper,
     includeSoldermask,
     connMap,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
 
@@ -76,8 +76,14 @@ export const addRotatedRectSmtPad = (
 
     // Add soldermask opening if drawing soldermask
     if (includeSoldermask) {
-      const smWidth = smtPad.width + 2 * soldermaskMargin
-      const smHeight = smtPad.height + 2 * soldermaskMargin
+      const smWidth =
+        smtPad.width +
+        2 * globalCopperSoldermaskMarginAdjustment +
+        (smtPad.soldermask_margin ?? 0)
+      const smHeight =
+        smtPad.height +
+        2 * globalCopperSoldermaskMarginAdjustment +
+        (smtPad.soldermask_margin ?? 0)
       const smOuter = createRoundedRectPath({
         centerX,
         centerY,

package/lib/index.ts

@@ -25,7 +25,7 @@ export const convertCircuitJsonToLbrn = (
     margin?: number
     includeCopper?: boolean
     includeSoldermask?: boolean
-    soldermaskMargin?: number
+    globalCopperSoldermaskMarginAdjustment?: number
     includeLayers?: Array<"top" | "bottom">
     traceMargin?: number
     laserSpotSize?: number
@@ -57,7 +57,8 @@ export const convertCircuitJsonToLbrn = (
   const laserSpotSize = options.laserSpotSize ?? 0.005
   const includeCopper = options.includeCopper ?? true
   const includeSoldermask = options.includeSoldermask ?? false
-  const soldermaskMargin = options.soldermaskMargin ?? 0
+  const globalCopperSoldermaskMarginAdjustment =
+    options.globalCopperSoldermaskMarginAdjustment ?? 0
   const laserProfile = options.laserProfile
 
   // Default laser settings from GitHub issue
@@ -190,7 +191,7 @@ export const convertCircuitJsonToLbrn = (
     origin,
     includeCopper,
     includeSoldermask,
-    soldermaskMargin,
+    globalCopperSoldermaskMarginAdjustment,
     includeLayers,
     traceMargin,
     laserSpotSize,

package/package.json

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

package/site/index.html

@@ -104,7 +104,7 @@
              </label>
               <input
                 type="number"
-                id="soldermaskMargin"
+                id="globalCopperSoldermaskMarginAdjustment"
                 value="0"
                 step="0.001"
                 class="w-full px-4 py-2 bg-gray-700 border border-gray-600 rounded-lg text-white focus:outline-none focus:ring-2 focus:ring-blue-500"

package/site/main.tsx

@@ -36,8 +36,8 @@ const originYInput = document.getElementById("originY") as HTMLInputElement
 const traceMarginInput = document.getElementById(
   "traceMargin",
 ) as HTMLInputElement
-const soldermaskMarginInput = document.getElementById(
-  "soldermaskMargin",
+const globalCopperSoldermaskMarginAdjustmentInput = document.getElementById(
+  "globalCopperSoldermaskMarginAdjustment",
 ) as HTMLInputElement
 const laserSpotSizeInput = document.getElementById(
   "laserSpotSize",
@@ -162,7 +162,8 @@ function getConversionOptions() {
     },
     includeCopper: includeCopperInput.checked,
     includeSoldermask: includeSoldermaskInput.checked,
-    soldermaskMargin: parseFloat(soldermaskMarginInput.value) || 0,
+    globalCopperSoldermaskMarginAdjustment:
+      parseFloat(globalCopperSoldermaskMarginAdjustmentInput.value) || 0,
     includeLayers: [
       ...(includeTopLayerInput.checked ? ["top" as const] : []),
       ...(includeBottomLayerInput.checked ? ["bottom" as const] : []),