circuit-json-to-gerber 0.0.69 → 0.0.71

package/dist/{chunk-ERVO7VGV.js → chunk-4OKFNZE6.js}

@@ -1112,7 +1112,17 @@ var define_aperture_template = defineGerberCommand({
       if (macro_name === "HORZPILL" || macro_name === "VERTPILL") {
         commandString += `${props.x_size.toFixed(6)}X${props.y_size.toFixed(6)}X${props.circle_diameter.toFixed(6)}X${props.circle_center_offset.toFixed(6)}`;
       } else if (macro_name === "ROUNDRECT") {
-        throw new Error("ROUNDRECT macro not implemented yet");
+        commandString += [
+          props.corner_radius,
+          props.corner_1_x,
+          props.corner_1_y,
+          props.corner_2_x,
+          props.corner_2_y,
+          props.corner_3_x,
+          props.corner_3_y,
+          props.corner_4_x,
+          props.corner_4_y
+        ].map((value) => value.toFixed(6)).join("X");
       }
       commandString += "*%";
       return commandString;
@@ -1270,7 +1280,7 @@ var defineCommonMacros = (glayer) => {
 0 $4 = Circle center offset
 0 21 = Center Line(Exposure, Width, Height, Center X, Center Y, Rotation)*
 0 1 = Circle(Exposure, Diameter, Center X, Center Y, Rotation)*
-21,1,$1,$2,0.0,0.0,0.0*
+21,1,$1-$3,$2,0.0,0.0,0.0*
 1,1,$3,0.0-$4,0.0*
 1,1,$3,$4,0.0*
 `.trim()
@@ -1284,12 +1294,12 @@ var defineCommonMacros = (glayer) => {
 0 $3 = Circle diameter (equal to width)*
 0 $4 = Circle center offset
 0 21 = Center Line(Exposure, Width, Height, Center X, Center Y, Rotation)*
-21,1,$1,$2,0.0,0.0,0.0*
+21,1,$1,$2-$3,0.0,0.0,0.0*
 1,1,$3,0.0,0.0-$4*
 1,1,$3,0.0,$4*
 `.trim()
     }).add("define_macro_aperture_template", {
-      macro_name: "RoundRect",
+      macro_name: "ROUNDRECT",
       template_code: `
 0 Rectangle with rounded corners*
 0 $1 Corner radius*
@@ -1355,6 +1365,26 @@ var getLayerRefFromGerberLayerName = (glayer_name) => {
   if (innerLayerMatch) return `inner${innerLayerMatch[1]}`;
   throw new Error(`Could not infer layer ref from ${glayer_name}`);
 };
+var getClampedRoundedRectCornerRadius = (width, height, cornerRadius) => {
+  if (typeof cornerRadius !== "number") return 0;
+  return Math.max(0, Math.min(cornerRadius, width / 2, height / 2));
+};
+var getRoundedRectApertureConfig = (width, height, cornerRadius) => {
+  const halfWidth = width / 2;
+  const halfHeight = height / 2;
+  return {
+    macro_name: "ROUNDRECT",
+    corner_radius: cornerRadius,
+    corner_1_x: -halfWidth + cornerRadius,
+    corner_1_y: halfHeight - cornerRadius,
+    corner_2_x: halfWidth - cornerRadius,
+    corner_2_y: halfHeight - cornerRadius,
+    corner_3_x: halfWidth - cornerRadius,
+    corner_3_y: -halfHeight + cornerRadius,
+    corner_4_x: -halfWidth + cornerRadius,
+    corner_4_y: -halfHeight + cornerRadius
+  };
+};
 function defineAperturesForLayer({
   glayer,
   circuitJson,
@@ -1408,6 +1438,16 @@ var REGION_APERTURE_CONFIG = {
   diameter: 1e-3
 };
 var getApertureConfigFromPcbSmtpad = (elm) => {
+  if (elm.shape === "rect" || elm.shape === "rotated_rect") {
+    const cornerRadius = getClampedRoundedRectCornerRadius(
+      elm.width,
+      elm.height,
+      "corner_radius" in elm ? elm.corner_radius : void 0
+    );
+    if (cornerRadius > 0) {
+      return getRoundedRectApertureConfig(elm.width, elm.height, cornerRadius);
+    }
+  }
   if (elm.shape === "rect") {
     return {
       standard_template_code: "R",
@@ -1428,27 +1468,15 @@ var getApertureConfigFromPcbSmtpad = (elm) => {
       y_size: elm.height
     };
   }
-  if (elm.shape === "pill") {
+  if (elm.shape === "pill" || elm.shape === "rotated_pill") {
     if (!("width" in elm && "height" in elm)) {
       throw new Error(
         "Invalid pill shape in getApertureConfigFromPcbSmtpad: missing dimensions"
       );
     }
-    if (elm.width >= elm.height) {
-      return {
-        macro_name: "HORZPILL",
-        x_size: elm.width,
-        y_size: elm.height,
-        circle_diameter: Math.min(elm.width, elm.height),
-        circle_center_offset: elm.width / 2
-      };
-    }
     return {
-      macro_name: "VERTPILL",
-      x_size: elm.width,
-      y_size: elm.height,
-      circle_diameter: Math.min(elm.width, elm.height),
-      circle_center_offset: elm.height / 2
+      standard_template_code: "C",
+      diameter: Math.min(elm.width, elm.height)
     };
   }
   if (elm.shape === "polygon") {
@@ -1461,6 +1489,18 @@ var getApertureConfigFromPcbSmtpadSoldermask = (elm) => {
   if ("soldermask_margin" in elm && typeof elm.soldermask_margin === "number") {
     soldermaskMargin = elm.soldermask_margin;
   }
+  if (elm.shape === "rect" || elm.shape === "rotated_rect") {
+    const width = elm.width + soldermaskMargin * 2;
+    const height = elm.height + soldermaskMargin * 2;
+    const cornerRadius = getClampedRoundedRectCornerRadius(
+      width,
+      height,
+      "corner_radius" in elm && typeof elm.corner_radius === "number" ? elm.corner_radius + soldermaskMargin : void 0
+    );
+    if (cornerRadius > 0) {
+      return getRoundedRectApertureConfig(width, height, cornerRadius);
+    }
+  }
   if (elm.shape === "rect") {
     return {
       standard_template_code: "R",
@@ -1481,7 +1521,7 @@ var getApertureConfigFromPcbSmtpadSoldermask = (elm) => {
       y_size: elm.height + soldermaskMargin * 2
     };
   }
-  if (elm.shape === "pill") {
+  if (elm.shape === "pill" || elm.shape === "rotated_pill") {
     if (!("width" in elm && "height" in elm)) {
       throw new Error(
         "Invalid pill shape in getApertureConfigFromPcbSmtpadSoldermask: missing dimensions"
@@ -1489,21 +1529,9 @@ var getApertureConfigFromPcbSmtpadSoldermask = (elm) => {
     }
     const width = elm.width + soldermaskMargin * 2;
     const height = elm.height + soldermaskMargin * 2;
-    if (width >= height) {
-      return {
-        macro_name: "HORZPILL",
-        x_size: width,
-        y_size: height,
-        circle_diameter: Math.min(width, height),
-        circle_center_offset: width / 2
-      };
-    }
     return {
-      macro_name: "VERTPILL",
-      x_size: width,
-      y_size: height,
-      circle_diameter: Math.min(width, height),
-      circle_center_offset: height / 2
+      standard_template_code: "C",
+      diameter: Math.min(width, height)
     };
   }
   if (elm.shape === "polygon") {
@@ -1573,7 +1601,7 @@ var getApertureConfigFromPcbSolderPaste = (elm) => {
         x_size: elm.width,
         y_size: elm.height,
         circle_diameter: Math.min(elm.width, elm.height),
-        circle_center_offset: elm.width / 2
+        circle_center_offset: (elm.width - elm.height) / 2
       };
     }
     return {
@@ -1581,7 +1609,7 @@ var getApertureConfigFromPcbSolderPaste = (elm) => {
       x_size: elm.width,
       y_size: elm.height,
       circle_diameter: Math.min(elm.width, elm.height),
-      circle_center_offset: elm.height / 2
+      circle_center_offset: (elm.height - elm.width) / 2
     };
   }
   throw new Error(`Unsupported shape ${elm.shape}`);
@@ -1610,7 +1638,7 @@ var getApertureConfigFromPcbPlatedHole = (elm) => {
         x_size: elm.outer_width,
         y_size: elm.outer_height,
         circle_diameter: Math.min(elm.outer_width, elm.outer_height),
-        circle_center_offset: elm.outer_width / 2
+        circle_center_offset: (elm.outer_width - elm.outer_height) / 2
       };
     }
     return {
@@ -1618,7 +1646,7 @@ var getApertureConfigFromPcbPlatedHole = (elm) => {
       x_size: elm.outer_width,
       y_size: elm.outer_height,
       circle_diameter: Math.min(elm.outer_width, elm.outer_height),
-      circle_center_offset: elm.outer_height / 2
+      circle_center_offset: (elm.outer_height - elm.outer_width) / 2
     };
   }
   const shape = elm.shape;
@@ -1668,7 +1696,7 @@ var getApertureConfigFromPcbPlatedHoleSoldermask = (elm) => {
         x_size: outerWidth,
         y_size: outerHeight,
         circle_diameter: Math.min(outerWidth, outerHeight),
-        circle_center_offset: outerWidth / 2
+        circle_center_offset: (outerWidth - outerHeight) / 2
       };
     }
     return {
@@ -1676,7 +1704,7 @@ var getApertureConfigFromPcbPlatedHoleSoldermask = (elm) => {
       x_size: outerWidth,
       y_size: outerHeight,
       circle_diameter: Math.min(outerWidth, outerHeight),
-      circle_center_offset: outerHeight / 2
+      circle_center_offset: (outerHeight - outerWidth) / 2
     };
   }
   const shape = elm.shape;
@@ -1864,7 +1892,7 @@ var findApertureNumber = (glayer, search_params) => {
 // package.json
 var package_default = {
   name: "circuit-json-to-gerber",
-  version: "0.0.68",
+  version: "0.0.70",
   main: "dist/index.js",
   type: "module",
   scripts: {
@@ -2097,6 +2125,55 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
     }).build()
   );
   const mfy = (y) => opts.flip_y_axis ? -y : y;
+  const renderPillFlash = ({
+    glayer,
+    x,
+    y,
+    width,
+    height,
+    rotationDegrees = 0
+  }) => {
+    const circleApertureConfig = {
+      standard_template_code: "C",
+      diameter: Math.min(width, height)
+    };
+    const apertureNumber = findApertureNumber(glayer, circleApertureConfig);
+    const gb = gerberBuilder().add("select_aperture", {
+      aperture_number: apertureNumber
+    });
+    const offset = Math.abs(width - height) / 2;
+    const rotationRadians = rotationDegrees * Math.PI / 180;
+    const cosTheta = Math.cos(rotationRadians);
+    const sinTheta = Math.sin(rotationRadians);
+    const rotateAndTranslate = (dx, dy) => ({
+      x: x + dx * cosTheta - dy * sinTheta,
+      y: y + dx * sinTheta + dy * cosTheta
+    });
+    if (offset <= 1e-9) {
+      gb.add("flash_operation", { x, y: mfy(y) });
+      glayer.push(...gb.build());
+      return;
+    }
+    const isHorizontal = width >= height;
+    const startRelative = isHorizontal ? { x: -offset, y: 0 } : { x: 0, y: -offset };
+    const endRelative = isHorizontal ? { x: offset, y: 0 } : { x: 0, y: offset };
+    const startPoint = rotateAndTranslate(startRelative.x, startRelative.y);
+    const endPoint = rotateAndTranslate(endRelative.x, endRelative.y);
+    gb.add("flash_operation", {
+      x: startPoint.x,
+      y: mfy(startPoint.y)
+    }).add("move_operation", {
+      x: startPoint.x,
+      y: mfy(startPoint.y)
+    }).add("plot_operation", {
+      x: endPoint.x,
+      y: mfy(endPoint.y)
+    }).add("flash_operation", {
+      x: endPoint.x,
+      y: mfy(endPoint.y)
+    });
+    glayer.push(...gb.build());
+  };
   const getRegionApertureNumber = (glayer) => findApertureNumber(glayer, REGION_APERTURE_CONFIG);
   const addClosedRegionFromPoints = ({
     target,
@@ -2550,6 +2627,28 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
         );
       } else if (element.type === "pcb_smtpad" && element.shape !== "polygon") {
         if (element.layer === layer && outerLayerRefs.includes(layer)) {
+          if (element.shape === "pill" || element.shape === "rotated_pill") {
+            const soldermaskMargin = typeof element.soldermask_margin === "number" ? element.soldermask_margin : 0;
+            const rotation2 = element.shape === "rotated_pill" && typeof element.ccw_rotation === "number" ? element.ccw_rotation : 0;
+            renderPillFlash({
+              glayer: glayers[getGerberLayerName(layer, "copper")],
+              x: element.x,
+              y: element.y,
+              width: element.width,
+              height: element.height,
+              rotationDegrees: rotation2
+            });
+            renderPillFlash({
+              glayer: glayers[getGerberLayerName(layer, "soldermask")],
+              x: element.x,
+              y: element.y,
+              width: element.width + soldermaskMargin * 2,
+              height: element.height + soldermaskMargin * 2,
+              rotationDegrees: rotation2
+            });
+            continue;
+          }
+          const rotation = element.shape === "rotated_rect" && typeof element.ccw_rotation === "number" ? element.ccw_rotation : 0;
           for (const { glayer, apertureConfig } of [
             {
               glayer: glayers[getGerberLayerName(layer, "copper")],
@@ -2564,13 +2663,13 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
             const gb = gerberBuilder().add("select_aperture", {
               aperture_number: apertureNumber
             });
-            if (element.shape === "rotated_rect" && element.ccw_rotation) {
+            if (rotation) {
               gb.add("load_rotation", {
-                rotation_degrees: element.ccw_rotation
+                rotation_degrees: rotation
               });
             }
             gb.add("flash_operation", { x: element.x, y: mfy(element.y) });
-            if (element.shape === "rotated_rect" && element.ccw_rotation) {
+            if (rotation) {
               gb.add("load_rotation", { rotation_degrees: 0 });
             }
             glayer.push(...gb.build());
@@ -3032,4 +3131,4 @@ export {
   stringifyGerberCommands,
   convertSoupToGerberCommands
 };
-//# sourceMappingURL=chunk-ERVO7VGV.js.map
+//# sourceMappingURL=chunk-4OKFNZE6.js.map