circuit-json-to-lbrn 0.0.53 → 0.0.54

package/README.md

@@ -38,7 +38,7 @@ const defaultLbrn = convertCircuitJsonToLbrn(circuitJson)
 - `margin?: number` - Set the margin around the PCB
 - `traceMargin?: number` - Clearance margin around traces in mm (requires `includeCopper: true`)
 - `laserSpotSize?: number` - Laser spot size in mm for crosshatch spacing (default: `0.005`)
-- `laserProfile?: { copper?: { speed?: number; numPasses?: number; frequency?: number; pulseWidth?: number }; board?: { speed?: number; numPasses?: number; frequency?: number; pulseWidth?: number } }` - Custom laser cut settings for copper and board operations. Defaults from GitHub issue: copper (speed: 300 mm/s, numPasses: 100, frequency: 20 kHz, pulseWidth: 1 ns), board (speed: 20 mm/s, numPasses: 100, frequency: 20 kHz, pulseWidth: 1 ns). Allows per-user customization for different lasers/lenses.
+- `laserProfile?: { copper?: { speed?: number; numPasses?: number; frequency?: number; pulseWidth?: number }; board?: { speed?: number; numPasses?: number; frequency?: number; pulseWidth?: number } }` - Custom laser cut settings for copper and board operations. Defaults from GitHub issue: copper (speed: 300 mm/s, numPasses: 100, frequency: 20 kHz, pulseWidth: 1 ns), board (speed: 20 mm/s, numPasses: 100, frequency: 20 kHz, pulseWidth: 1 ns). Pulse width is specified in ns. Allows per-user customization for different lasers/lenses.
 - `includeLayers?: Array<"top" | "bottom">` - Specify which layers to include (default: `["top", "bottom"]`)
 
 ## Soldermask Support

package/dist/index.js

@@ -2774,13 +2774,13 @@ var convertCircuitJsonToLbrn = async (circuitJson, options = {}) => {
     speed: 300,
     numPasses: 100,
     frequency: 2e4,
-    pulseWidth: 1e-9
+    pulseWidth: 1
   };
   const defaultBoardSettings = {
     speed: 20,
     numPasses: 100,
     frequency: 2e4,
-    pulseWidth: 1e-9
+    pulseWidth: 1
   };
   const copperSettings = { ...defaultCopperSettings, ...laserProfile?.copper };
   const boardSettings = { ...defaultBoardSettings, ...laserProfile?.board };
@@ -2794,7 +2794,7 @@ var convertCircuitJsonToLbrn = async (circuitJson, options = {}) => {
     numPasses: copperSettings.numPasses,
     speed: copperSettings.speed,
     frequency: copperSettings.frequency,
-    pulseWidth: copperSettings.pulseWidth
+    qPulseWidth: copperSettings.pulseWidth
   });
   project.children.push(topCopperCutSetting);
   const bottomCopperCutSetting = new CutSetting({
@@ -2803,7 +2803,7 @@ var convertCircuitJsonToLbrn = async (circuitJson, options = {}) => {
     numPasses: copperSettings.numPasses,
     speed: copperSettings.speed,
     frequency: copperSettings.frequency,
-    pulseWidth: copperSettings.pulseWidth
+    qPulseWidth: copperSettings.pulseWidth
   });
   project.children.push(bottomCopperCutSetting);
   const throughBoardCutSetting = new CutSetting({
@@ -2812,7 +2812,7 @@ var convertCircuitJsonToLbrn = async (circuitJson, options = {}) => {
     numPasses: boardSettings.numPasses,
     speed: boardSettings.speed,
     frequency: boardSettings.frequency,
-    pulseWidth: boardSettings.pulseWidth
+    qPulseWidth: boardSettings.pulseWidth
   });
   project.children.push(throughBoardCutSetting);
   const soldermaskCutSetting = new CutSetting({

package/lib/index.ts

@@ -93,13 +93,13 @@ export const convertCircuitJsonToLbrn = async (
     speed: 300,
     numPasses: 100,
     frequency: 20000,
-    pulseWidth: 1e-9,
+    pulseWidth: 1,
   }
   const defaultBoardSettings = {
     speed: 20,
     numPasses: 100,
     frequency: 20000,
-    pulseWidth: 1e-9,
+    pulseWidth: 1,
   }
 
   // Merge user settings with defaults
@@ -121,7 +121,7 @@ export const convertCircuitJsonToLbrn = async (
     numPasses: copperSettings.numPasses,
     speed: copperSettings.speed,
     frequency: copperSettings.frequency,
-    pulseWidth: copperSettings.pulseWidth,
+    qPulseWidth: copperSettings.pulseWidth,
   })
   project.children.push(topCopperCutSetting)
 
@@ -131,7 +131,7 @@ export const convertCircuitJsonToLbrn = async (
     numPasses: copperSettings.numPasses,
     speed: copperSettings.speed,
     frequency: copperSettings.frequency,
-    pulseWidth: copperSettings.pulseWidth,
+    qPulseWidth: copperSettings.pulseWidth,
   })
   project.children.push(bottomCopperCutSetting)
 
@@ -141,7 +141,7 @@ export const convertCircuitJsonToLbrn = async (
     numPasses: boardSettings.numPasses,
     speed: boardSettings.speed,
     frequency: boardSettings.frequency,
-    pulseWidth: boardSettings.pulseWidth,
+    qPulseWidth: boardSettings.pulseWidth,
   })
   project.children.push(throughBoardCutSetting)
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-lbrn",
   "main": "dist/index.js",
-  "version": "0.0.53",
+  "version": "0.0.54",
   "type": "module",
   "scripts": {
     "start": "bun run site/index.html",
@@ -28,7 +28,7 @@
     "typescript": "^5"
   },
   "dependencies": {
-    "lbrnts": "^0.0.16",
+    "lbrnts": "^0.0.17",
     "manifold-3d": "^3.3.2"
   }
 }

package/site/main.tsx

@@ -102,11 +102,6 @@ function kHzToHz(khz: number): number {
   return khz * 1000
 }
 
-// Convert pulse width from ns to seconds
-function nsToSeconds(ns: number): number {
-  return ns * 1e-9
-}
-
 // Load Omni X 6W 150x150 preset
 function loadOmniX6W150x150Preset() {
   copperSpeedInput.value = "300"
@@ -188,13 +183,13 @@ function getConversionOptions() {
         speed: parseFloat(copperSpeedInput.value) || 300,
         numPasses: parseInt(copperNumPassesInput.value) || 100,
         frequency: kHzToHz(parseFloat(copperFrequencyInput.value) || 20),
-        pulseWidth: nsToSeconds(parseFloat(copperPulseWidthInput.value) || 1),
+        pulseWidth: parseFloat(copperPulseWidthInput.value) || 1,
       },
       board: {
         speed: parseFloat(boardSpeedInput.value) || 20,
         numPasses: parseInt(boardNumPassesInput.value) || 100,
         frequency: kHzToHz(parseFloat(boardFrequencyInput.value) || 20),
-        pulseWidth: nsToSeconds(parseFloat(boardPulseWidthInput.value) || 1),
+        pulseWidth: parseFloat(boardPulseWidthInput.value) || 1,
       },
     },
   }

package/tests/basics/laser-profile.test.ts

@@ -27,13 +27,13 @@ test("applies custom laserProfile settings", async () => {
         speed: 350,
         numPasses: 150,
         frequency: 25000,
-        pulseWidth: 2e-9,
+        pulseWidth: 2,
       },
       board: {
         speed: 25,
         numPasses: 120,
         frequency: 21000,
-        pulseWidth: 1.5e-9,
+        pulseWidth: 1.5,
       },
     },
   })
@@ -49,21 +49,21 @@ test("applies custom laserProfile settings", async () => {
   expect(topCopper.speed).toBe(350)
   expect(topCopper.numPasses).toBe(150)
   expect(topCopper.frequency).toBe(25000)
-  expect(topCopper.pulseWidth).toBe(2e-9)
+  expect(topCopper.qPulseWidth).toBe(2)
 
   // Verify bottom copper settings (same as top)
   const bottomCopper = cutSettings[1]!
   expect(bottomCopper.speed).toBe(350)
   expect(bottomCopper.numPasses).toBe(150)
   expect(bottomCopper.frequency).toBe(25000)
-  expect(bottomCopper.pulseWidth).toBe(2e-9)
+  expect(bottomCopper.qPulseWidth).toBe(2)
 
   // Verify through board settings
   const throughBoard = cutSettings[2]!
   expect(throughBoard.speed).toBe(25)
   expect(throughBoard.numPasses).toBe(120)
   expect(throughBoard.frequency).toBe(21000)
-  expect(throughBoard.pulseWidth).toBe(1.5e-9)
+  expect(throughBoard.qPulseWidth).toBe(1.5)
 })
 
 test("uses default laserProfile settings when not provided", async () => {
@@ -80,12 +80,12 @@ test("uses default laserProfile settings when not provided", async () => {
   expect(topCopper.speed).toBe(300)
   expect(topCopper.numPasses).toBe(100)
   expect(topCopper.frequency).toBe(20000)
-  expect(topCopper.pulseWidth).toBe(1e-9)
+  expect(topCopper.qPulseWidth).toBe(1)
 
   // Verify through board defaults
   const throughBoard = cutSettings[2]!
   expect(throughBoard.speed).toBe(20)
   expect(throughBoard.numPasses).toBe(100)
   expect(throughBoard.frequency).toBe(20000)
-  expect(throughBoard.pulseWidth).toBe(1e-9)
+  expect(throughBoard.qPulseWidth).toBe(1)
 })