circuit-json-to-tscircuit 0.0.41 → 0.0.42

package/dist/{chunk-BA4FQZIF.js → chunk-UXTI3RT6.js}

@@ -529,6 +529,7 @@ var convertSmtPads = (circuitJson) => {
   const elementStrings = [];
   for (const smtPad of smtPads) {
     const commonAttrs = [];
+    const solderMaskAttrs = formatSolderMaskAttrs(smtPad);
     if (smtPad.port_hints !== void 0) {
       commonAttrs.push(`portHints={${JSON.stringify(smtPad.port_hints)}}`);
     }
@@ -541,85 +542,30 @@ var convertSmtPads = (circuitJson) => {
     if (smtPad.layer !== void 0) {
       commonAttrs.push(`layer="${smtPad.layer}"`);
     }
-    if (smtPad.is_covered_with_solder_mask !== void 0) {
-      commonAttrs.push(
-        `coveredWithSolderMask={${smtPad.is_covered_with_solder_mask}}`
-      );
-    }
-    if (smtPad.soldermask_margin !== void 0) {
-      commonAttrs.push(`solderMaskMargin="${mmStr6(smtPad.soldermask_margin)}"`);
-    }
     if (smtPad.shape === "circle") {
       elementStrings.push(
-        `<smtpad ${commonAttrs.join(" ")} radius="${mmStr6(smtPad.radius ?? 0)}" shape="circle" />`
+        `<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs} radius="${mmStr6(smtPad.radius ?? 0)}" shape="circle" />`
       );
     } else if (smtPad.shape === "rect") {
-      if (smtPad.rect_border_radius !== void 0) {
-        commonAttrs.push(
-          `rectBorderRadius="${mmStr6(smtPad.rect_border_radius)}"`
-        );
-      }
-      if (smtPad.corner_radius !== void 0) {
-        commonAttrs.push(`cornerRadius="${mmStr6(smtPad.corner_radius)}"`);
-      }
-      if (smtPad.soldermask_margin_left !== void 0) {
-        commonAttrs.push(
-          `solderMaskMarginLeft="${mmStr6(smtPad.soldermask_margin_left)}"`
-        );
-      }
-      if (smtPad.soldermask_margin_top !== void 0) {
-        commonAttrs.push(
-          `solderMaskMarginTop="${mmStr6(smtPad.soldermask_margin_top)}"`
-        );
-      }
-      if (smtPad.soldermask_margin_right !== void 0) {
-        commonAttrs.push(
-          `solderMaskMarginRight="${mmStr6(smtPad.soldermask_margin_right)}"`
-        );
-      }
-      if (smtPad.soldermask_margin_bottom !== void 0) {
-        commonAttrs.push(
-          `solderMaskMarginBottom="${mmStr6(smtPad.soldermask_margin_bottom)}"`
-        );
-      }
       elementStrings.push(
-        `<smtpad ${commonAttrs.join(" ")} width="${mmStr6(smtPad.width ?? 0)}" height="${mmStr6(smtPad.height ?? 0)}" shape="rect" />`
+        `<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs}${formatOptionalMmAttr("rectBorderRadius", smtPad.rect_border_radius)}${formatOptionalMmAttr("cornerRadius", smtPad.corner_radius)}${formatOptionalMmAttr("solderMaskMarginLeft", smtPad.soldermask_margin_left)}${formatOptionalMmAttr("solderMaskMarginTop", smtPad.soldermask_margin_top)}${formatOptionalMmAttr("solderMaskMarginRight", smtPad.soldermask_margin_right)}${formatOptionalMmAttr("solderMaskMarginBottom", smtPad.soldermask_margin_bottom)} width="${mmStr6(smtPad.width ?? 0)}" height="${mmStr6(smtPad.height ?? 0)}" shape="rect" />`
       );
     } else if (smtPad.shape === "pill") {
       elementStrings.push(
-        `<smtpad ${commonAttrs.join(" ")} width="${mmStr6(smtPad.width ?? 0)}" height="${mmStr6(smtPad.height ?? 0)}" radius="${mmStr6(smtPad.radius ?? 0)}" shape="pill" />`
+        `<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs} width="${mmStr6(smtPad.width ?? 0)}" height="${mmStr6(smtPad.height ?? 0)}" radius="${mmStr6(smtPad.radius ?? 0)}" shape="pill" />`
+      );
+    } else if (smtPad.shape === "rotated_pill") {
+      elementStrings.push(
+        `<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs} width="${mmStr6(smtPad.width ?? 0)}" height="${mmStr6(smtPad.height ?? 0)}" radius="${mmStr6(smtPad.radius ?? 0)}"${formatPcbRotationAttr(smtPad.ccw_rotation)} shape="pill" />`
       );
     } else if (smtPad.shape === "polygon") {
       elementStrings.push(
-        `<smtpad ${commonAttrs.join(" ")} shape="polygon" points={${JSON.stringify(smtPad.points)}} />`
+        `<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs} shape="polygon" points={${JSON.stringify(smtPad.points)}} />`
       );
     } else if (smtPad.shape === "rotated_rect") {
       const cornerRadius = smtPad.corner_radius ?? smtPad.rect_border_radius ?? void 0;
-      if (cornerRadius !== void 0) {
-        commonAttrs.push(`cornerRadius="${mmStr6(cornerRadius)}"`);
-      }
-      if (smtPad.soldermask_margin_left !== void 0) {
-        commonAttrs.push(
-          `solderMaskMarginLeft="${mmStr6(smtPad.soldermask_margin_left)}"`
-        );
-      }
-      if (smtPad.soldermask_margin_top !== void 0) {
-        commonAttrs.push(
-          `solderMaskMarginTop="${mmStr6(smtPad.soldermask_margin_top)}"`
-        );
-      }
-      if (smtPad.soldermask_margin_right !== void 0) {
-        commonAttrs.push(
-          `solderMaskMarginRight="${mmStr6(smtPad.soldermask_margin_right)}"`
-        );
-      }
-      if (smtPad.soldermask_margin_bottom !== void 0) {
-        commonAttrs.push(
-          `solderMaskMarginBottom="${mmStr6(smtPad.soldermask_margin_bottom)}"`
-        );
-      }
       elementStrings.push(
-        `<smtpad ${commonAttrs.join(" ")} width="${mmStr6(smtPad.width ?? 0)}" height="${mmStr6(smtPad.height ?? 0)}"${formatPcbRotationAttr(smtPad.ccw_rotation)} shape="rotated_rect" />`
+        `<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs}${formatOptionalMmAttr("cornerRadius", cornerRadius)}${formatOptionalMmAttr("solderMaskMarginLeft", smtPad.soldermask_margin_left)}${formatOptionalMmAttr("solderMaskMarginTop", smtPad.soldermask_margin_top)}${formatOptionalMmAttr("solderMaskMarginRight", smtPad.soldermask_margin_right)}${formatOptionalMmAttr("solderMaskMarginBottom", smtPad.soldermask_margin_bottom)} width="${mmStr6(smtPad.width ?? 0)}" height="${mmStr6(smtPad.height ?? 0)}"${formatPcbRotationAttr(smtPad.ccw_rotation)} shape="rotated_rect" />`
       );
     }
   }

package/dist/cli/main.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-BA4FQZIF.js";
+} from "../chunk-UXTI3RT6.js";
 
 // cli/main.ts
 import { Command } from "commander";
@@ -16,7 +16,7 @@ var package_default = {
     "./cli": "./dist/cli/main.js"
   },
   type: "module",
-  version: "0.0.40",
+  version: "0.0.41",
   scripts: {
     build: "tsup-node lib/index.ts cli/main.ts --format esm --dts",
     test: "bun test",

package/dist/lib/index.js

@@ -1,6 +1,6 @@
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-BA4FQZIF.js";
+} from "../chunk-UXTI3RT6.js";
 export {
   convertCircuitJsonToTscircuit
 };

package/lib/generate-footprint-tsx/convert-smt-pads.ts

@@ -1,7 +1,9 @@
 import { su } from "@tscircuit/soup-util"
 import { mmStr } from "@tscircuit/mm"
 import type { FootprintElementConverter } from "./converter-types"
+import { formatOptionalMmAttr } from "./footprint-tsx-attribute-formatters/format-optional-mm-attr"
 import { formatPcbRotationAttr } from "./footprint-tsx-attribute-formatters/format-pcb-rotation-attr"
+import { formatSolderMaskAttrs } from "./footprint-tsx-attribute-formatters/format-solder-mask-attrs"
 
 export const convertSmtPads: FootprintElementConverter = (circuitJson) => {
   const smtPads = su(circuitJson).pcb_smtpad.list()
@@ -9,6 +11,7 @@ export const convertSmtPads: FootprintElementConverter = (circuitJson) => {
 
   for (const smtPad of smtPads) {
     const commonAttrs: string[] = []
+    const solderMaskAttrs = formatSolderMaskAttrs(smtPad)
 
     if (smtPad.port_hints !== undefined) {
       commonAttrs.push(`portHints={${JSON.stringify(smtPad.port_hints)}}`)
@@ -22,88 +25,33 @@ export const convertSmtPads: FootprintElementConverter = (circuitJson) => {
     if (smtPad.layer !== undefined) {
       commonAttrs.push(`layer="${smtPad.layer}"`)
     }
-    if (smtPad.is_covered_with_solder_mask !== undefined) {
-      commonAttrs.push(
-        `coveredWithSolderMask={${smtPad.is_covered_with_solder_mask}}`,
-      )
-    }
-    if (smtPad.soldermask_margin !== undefined) {
-      commonAttrs.push(`solderMaskMargin="${mmStr(smtPad.soldermask_margin)}"`)
-    }
 
     if (smtPad.shape === "circle") {
       elementStrings.push(
-        `<smtpad ${commonAttrs.join(" ")} radius="${mmStr(smtPad.radius ?? 0)}" shape="circle" />`,
+        `<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs} radius="${mmStr(smtPad.radius ?? 0)}" shape="circle" />`,
       )
     } else if (smtPad.shape === "rect") {
-      if (smtPad.rect_border_radius !== undefined) {
-        commonAttrs.push(
-          `rectBorderRadius="${mmStr(smtPad.rect_border_radius)}"`,
-        )
-      }
-      if (smtPad.corner_radius !== undefined) {
-        commonAttrs.push(`cornerRadius="${mmStr(smtPad.corner_radius)}"`)
-      }
-      if (smtPad.soldermask_margin_left !== undefined) {
-        commonAttrs.push(
-          `solderMaskMarginLeft="${mmStr(smtPad.soldermask_margin_left)}"`,
-        )
-      }
-      if (smtPad.soldermask_margin_top !== undefined) {
-        commonAttrs.push(
-          `solderMaskMarginTop="${mmStr(smtPad.soldermask_margin_top)}"`,
-        )
-      }
-      if (smtPad.soldermask_margin_right !== undefined) {
-        commonAttrs.push(
-          `solderMaskMarginRight="${mmStr(smtPad.soldermask_margin_right)}"`,
-        )
-      }
-      if (smtPad.soldermask_margin_bottom !== undefined) {
-        commonAttrs.push(
-          `solderMaskMarginBottom="${mmStr(smtPad.soldermask_margin_bottom)}"`,
-        )
-      }
       elementStrings.push(
-        `<smtpad ${commonAttrs.join(" ")} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}" shape="rect" />`,
+        `<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs}${formatOptionalMmAttr("rectBorderRadius", smtPad.rect_border_radius)}${formatOptionalMmAttr("cornerRadius", smtPad.corner_radius)}${formatOptionalMmAttr("solderMaskMarginLeft", smtPad.soldermask_margin_left)}${formatOptionalMmAttr("solderMaskMarginTop", smtPad.soldermask_margin_top)}${formatOptionalMmAttr("solderMaskMarginRight", smtPad.soldermask_margin_right)}${formatOptionalMmAttr("solderMaskMarginBottom", smtPad.soldermask_margin_bottom)} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}" shape="rect" />`,
       )
     } else if (smtPad.shape === "pill") {
       elementStrings.push(
-        `<smtpad ${commonAttrs.join(" ")} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}" radius="${mmStr(smtPad.radius ?? 0)}" shape="pill" />`,
+        `<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}" radius="${mmStr(smtPad.radius ?? 0)}" shape="pill" />`,
+      )
+    } else if (smtPad.shape === "rotated_pill") {
+      elementStrings.push(
+        `<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}" radius="${mmStr(smtPad.radius ?? 0)}"${formatPcbRotationAttr(smtPad.ccw_rotation)} shape="pill" />`,
       )
     } else if (smtPad.shape === "polygon") {
       elementStrings.push(
-        `<smtpad ${commonAttrs.join(" ")} shape="polygon" points={${JSON.stringify(smtPad.points)}} />`,
+        `<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs} shape="polygon" points={${JSON.stringify(smtPad.points)}} />`,
       )
     } else if (smtPad.shape === "rotated_rect") {
       const cornerRadius =
         smtPad.corner_radius ?? smtPad.rect_border_radius ?? undefined
 
-      if (cornerRadius !== undefined) {
-        commonAttrs.push(`cornerRadius="${mmStr(cornerRadius)}"`)
-      }
-      if (smtPad.soldermask_margin_left !== undefined) {
-        commonAttrs.push(
-          `solderMaskMarginLeft="${mmStr(smtPad.soldermask_margin_left)}"`,
-        )
-      }
-      if (smtPad.soldermask_margin_top !== undefined) {
-        commonAttrs.push(
-          `solderMaskMarginTop="${mmStr(smtPad.soldermask_margin_top)}"`,
-        )
-      }
-      if (smtPad.soldermask_margin_right !== undefined) {
-        commonAttrs.push(
-          `solderMaskMarginRight="${mmStr(smtPad.soldermask_margin_right)}"`,
-        )
-      }
-      if (smtPad.soldermask_margin_bottom !== undefined) {
-        commonAttrs.push(
-          `solderMaskMarginBottom="${mmStr(smtPad.soldermask_margin_bottom)}"`,
-        )
-      }
       elementStrings.push(
-        `<smtpad ${commonAttrs.join(" ")} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}"${formatPcbRotationAttr(smtPad.ccw_rotation)} shape="rotated_rect" />`,
+        `<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs}${formatOptionalMmAttr("cornerRadius", cornerRadius)}${formatOptionalMmAttr("solderMaskMarginLeft", smtPad.soldermask_margin_left)}${formatOptionalMmAttr("solderMaskMarginTop", smtPad.soldermask_margin_top)}${formatOptionalMmAttr("solderMaskMarginRight", smtPad.soldermask_margin_right)}${formatOptionalMmAttr("solderMaskMarginBottom", smtPad.soldermask_margin_bottom)} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}"${formatPcbRotationAttr(smtPad.ccw_rotation)} shape="rotated_rect" />`,
       )
     }
   }

package/package.json

@@ -6,7 +6,7 @@
     "./cli": "./dist/cli/main.js"
   },
   "type": "module",
-  "version": "0.0.41",
+  "version": "0.0.42",
   "scripts": {
     "build": "tsup-node lib/index.ts cli/main.ts --format esm --dts",
     "test": "bun test",

package/tests/__snapshots__/test16-support-pcb-smtpad-shapes-pcb.snap.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="800" height="600" data-software-used-string="@tscircuit/core@0.0.1090"><style></style><rect class="boundary" x="0" y="0" fill="#000" width="800" height="600" data-type="pcb_background" data-pcb-layer="global"/><rect class="pcb-boundary" fill="none" stroke="#fff" stroke-width="0.3" x="127.27272727272725" y="27.272727272727252" width="545.4545454545455" height="545.4545454545455" data-type="pcb_boundary" data-pcb-layer="global"/><path class="pcb-board" d="M 127.27272727272725 572.7272727272727 L 672.7272727272727 572.7272727272727 L 672.7272727272727 27.272727272727252 L 127.27272727272725 27.272727272727252 Z" fill="none" stroke="rgba(255, 255, 255, 0.5)" stroke-width="2.7272727272727275" data-type="pcb_board" data-pcb-layer="board"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="-27.272727272727273" y="-8.181818181818182" width="54.54545454545455" height="16.363636363636363" transform="translate(372.72727272727275 354.54545454545456) rotate(-45)" data-type="pcb_smtpad" data-pcb-layer="bottom" rx="4.090909090909091" ry="4.090909090909091"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="443.6363636363636" y="328.6363636363636" width="49.09090909090909" height="24.545454545454547" data-type="pcb_smtpad" data-pcb-layer="bottom" rx="5.454545454545455" ry="5.454545454545455"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="-27.272727272727273" y="-8.181818181818182" width="54.54545454545455" height="16.363636363636363" transform="translate(372.72727272727275 354.54545454545456) rotate(-45)" data-type="pcb_smtpad" data-pcb-layer="bottom" rx="4.090909090909091" ry="4.090909090909091"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="443.6363636363636" y="328.6363636363636" width="49.09090909090909" height="24.545454545454547" data-type="pcb_smtpad" data-pcb-layer="bottom" rx="5.454545454545455" ry="5.454545454545455"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="406.8181818181818" y="234.54545454545453" width="40.90909090909091" height="21.81818181818182" rx="10.90909090909091" ry="10.90909090909091" data-type="pcb_smtpad" data-pcb-layer="top"/><polygon class="pcb-pad" fill="rgb(200, 52, 52)" points="400,300 427.27272727272725,300 413.6363636363636,272.72727272727275" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="406.8181818181818" y="234.54545454545453" width="40.90909090909091" height="21.81818181818182" rx="10.90909090909091" ry="10.90909090909091" data-type="pcb_smtpad" data-pcb-layer="top"/><polygon class="pcb-pad" fill="rgb(200, 52, 52)" points="400,300 427.27272727272725,300 413.6363636363636,272.72727272727275" data-type="pcb_smtpad" data-pcb-layer="top"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="600" data-software-used-string="@tscircuit/core@0.0.1322"><style></style><rect class="boundary" x="0" y="0" fill="#000" width="800" height="600" data-type="pcb_background" data-pcb-layer="global"/><rect class="pcb-boundary" fill="none" stroke="#fff" stroke-width="0.3" x="127.27272727272725" y="27.272727272727252" width="545.4545454545455" height="545.4545454545455" data-type="pcb_boundary" data-pcb-layer="global"/><path class="pcb-board" d="M 127.27272727272725 572.7272727272727 L 672.7272727272727 572.7272727272727 L 672.7272727272727 27.272727272727252 L 127.27272727272725 27.272727272727252 Z" fill="none" stroke="rgba(255, 255, 255, 0.5)" stroke-width="2.7272727272727275" data-type="pcb_board" data-pcb-layer="board"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="-27.272727272727273" y="-8.181818181818182" width="54.54545454545455" height="16.363636363636363" transform="translate(372.72727272727275 354.54545454545456) rotate(-45)" data-type="pcb_smtpad" data-pcb-layer="bottom" rx="4.090909090909091" ry="4.090909090909091"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="443.6363636363636" y="328.6363636363636" width="49.09090909090909" height="24.545454545454547" data-type="pcb_smtpad" data-pcb-layer="bottom" rx="5.454545454545455" ry="5.454545454545455"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="-27.272727272727273" y="-8.181818181818182" width="54.54545454545455" height="16.363636363636363" transform="translate(372.72727272727275 354.54545454545456) rotate(-45)" data-type="pcb_smtpad" data-pcb-layer="bottom" rx="4.090909090909091" ry="4.090909090909091"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="443.6363636363636" y="328.6363636363636" width="49.09090909090909" height="24.545454545454547" data-type="pcb_smtpad" data-pcb-layer="bottom" rx="5.454545454545455" ry="5.454545454545455"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="406.8181818181818" y="234.54545454545453" width="40.90909090909091" height="21.81818181818182" rx="10.90909090909091" ry="10.90909090909091" data-type="pcb_smtpad" data-pcb-layer="top"/><polygon class="pcb-pad" fill="rgb(200, 52, 52)" points="400,300 427.27272727272725,300 413.6363636363636,272.72727272727275" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="-30.000000000000004" y="-12.272727272727273" width="60.00000000000001" height="24.545454545454547" rx="12.272727272727273" ry="12.272727272727273" data-type="pcb_smtpad" data-pcb-layer="top" transform="translate(334.54545454545456 256.3636363636364) rotate(-30)"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="406.8181818181818" y="234.54545454545453" width="40.90909090909091" height="21.81818181818182" rx="10.90909090909091" ry="10.90909090909091" data-type="pcb_smtpad" data-pcb-layer="top"/><polygon class="pcb-pad" fill="rgb(200, 52, 52)" points="400,300 427.27272727272725,300 413.6363636363636,272.72727272727275" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="-30.000000000000004" y="-12.272727272727273" width="60.00000000000001" height="24.545454545454547" rx="12.272727272727273" ry="12.272727272727273" data-type="pcb_smtpad" data-pcb-layer="top" transform="translate(334.54545454545456 256.3636363636364) rotate(-30)"/></svg>

package/tests/test16-support-pcb-smtpad-shapes.test.tsx

@@ -18,6 +18,7 @@ test("test16 support pcb smtpad shapes", async () => {
     <smtpad portHints={["2"]} layer="top" coveredWithSolderMask={true} solderMaskMargin="0.06mm" shape="polygon" points={[{"x":0,"y":0},{"x":1,"y":0},{"x":0.5,"y":1}]} />
     <smtpad portHints={["3"]} pcbX="-1mm" pcbY="-2mm" layer="bottom" coveredWithSolderMask={true} solderMaskMargin="0.04mm" cornerRadius="0.15mm" solderMaskMarginLeft="0.01mm" solderMaskMarginTop="0.02mm" solderMaskMarginRight="0.03mm" solderMaskMarginBottom="0.05mm" width="2mm" height="0.6mm" pcbRotation="45deg" shape="rotated_rect" />
     <smtpad portHints={["4"]} pcbX="2.5mm" pcbY="-1.5mm" layer="bottom" coveredWithSolderMask={true} solderMaskMargin="0.05mm" rectBorderRadius="0.25mm" cornerRadius="0.2mm" solderMaskMarginLeft="0.11mm" solderMaskMarginTop="0.12mm" solderMaskMarginRight="0.13mm" solderMaskMarginBottom="0.14mm" width="1.8mm" height="0.9mm" shape="rect" />
+    <smtpad portHints={["5"]} pcbX="-2.4mm" pcbY="1.6mm" layer="top" coveredWithSolderMask={true} solderMaskMargin="0.07mm" width="2.2mm" height="0.9mm" radius="0.45mm" pcbRotation="30deg" shape="pill" />
           </footprint>}
         {...props}
       />
@@ -25,6 +26,7 @@ test("test16 support pcb smtpad shapes", async () => {
   `)
   expect(tscircuit).toContain(`pcbRotation="45deg"`)
   expect(tscircuit).toContain(`shape="rotated_rect"`)
+  expect(tscircuit).toContain(`pcbRotation="30deg"`)
 
   // The generator emits pcbRotation for consistency, but the current smtpad
   // runtime still expects ccwRotation for rotated_rect pads.
@@ -47,7 +49,7 @@ circuit.add(
     (elm): elm is PcbSmtPad => elm.type === "pcb_smtpad",
   )
 
-  expect(renderedSmtPads).toHaveLength(8)
+  expect(renderedSmtPads).toHaveLength(10)
   expect(renderedSmtPads).toEqual(
     expect.arrayContaining([
       expect.objectContaining({
@@ -66,6 +68,17 @@ circuit.add(
         is_covered_with_solder_mask: true,
         soldermask_margin: 0.05,
       }),
+      expect.objectContaining({
+        port_hints: ["5"],
+        layer: "top",
+        shape: "rotated_pill",
+        ccw_rotation: 30,
+        radius: 0.45,
+        width: 2.2,
+        height: 0.9,
+        is_covered_with_solder_mask: true,
+        soldermask_margin: 0.07,
+      }),
     ]),
   )
 
@@ -167,4 +180,20 @@ const circuitJson: any = [
     soldermask_margin_bottom: 0.14,
     port_hints: ["4"],
   },
+  {
+    type: "pcb_smtpad",
+    pcb_smtpad_id: "rotated_pill_pad",
+    pcb_component_id: "pcb_generic_component_0",
+    shape: "rotated_pill",
+    x: -2.4,
+    y: 1.6,
+    width: 2.2,
+    height: 0.9,
+    radius: 0.45,
+    ccw_rotation: 30,
+    layer: "top",
+    is_covered_with_solder_mask: true,
+    soldermask_margin: 0.07,
+    port_hints: ["5"],
+  },
 ]