jscad-electronics 0.0.181 → 0.0.183

package/dist/vanilla.d.ts

@@ -28,12 +28,13 @@ type NemaMotorProps = NemaMotorModelPropsInput & {
     bodyColor?: string;
     capColor?: string;
     shaftColor?: string;
+    screwColor?: string;
 };
 type NemaFrameMotorProps = Omit<NemaMotorProps, "nemaSize">;
 /** Mounting face at Z=0, body along -Z, shaft along +Z; all lengths in mm.
  * Parameters follow the modelprinter NEMA contract; JSCAD builds all geometry.
  */
-declare function NemaMotor({ bodyColor, capColor, shaftColor, ...props }: NemaMotorProps): react_jsx_runtime.JSX.Element;
+declare function NemaMotor({ bodyColor, capColor, shaftColor, screwColor, ...props }: NemaMotorProps): react_jsx_runtime.JSX.Element;
 declare const NEMA8: (props: NemaFrameMotorProps) => react_jsx_runtime.JSX.Element;
 declare const NEMA17: (props: NemaFrameMotorProps) => react_jsx_runtime.JSX.Element;
 declare const NEMA23: (props: NemaFrameMotorProps) => react_jsx_runtime.JSX.Element;

package/dist/vanilla.js

@@ -527,12 +527,34 @@ function createNemaMotorSections(input) {
   add("frontCap", front, -holeDepth, 0, holes);
   add("frontCap", front, -p.frontCapLength, -holeDepth);
   add("body", core, -p.bodyLength + p.rearCapLength, -p.frontCapLength);
-  add(
-    "rearCap",
-    p.mountingHoleThrough ? core : front,
-    -p.bodyLength,
-    -p.bodyLength + p.rearCapLength
-  );
+  if (p.backFace === "plain") {
+    add(
+      "rearCap",
+      p.mountingHoleThrough ? core : front,
+      -p.bodyLength,
+      -p.bodyLength + p.rearCapLength
+    );
+  } else {
+    const halfPitch = p.backFaceHoleSpacing / 2;
+    const rearHoles = [-halfPitch, halfPitch].flatMap(
+      (x) => [-halfPitch, halfPitch].map(
+        (y) => circle(p.backFaceHoleDiameter / 2, x, y)
+      )
+    );
+    add(
+      "rearCap",
+      front,
+      -p.bodyLength,
+      -p.bodyLength + p.backFaceHoleDepth,
+      rearHoles
+    );
+    add(
+      "rearCap",
+      front,
+      -p.bodyLength + p.backFaceHoleDepth,
+      -p.bodyLength + p.rearCapLength
+    );
+  }
   add("pilot", circle(p.pilotDiameter / 2), 0, p.pilotLength);
   const r = p.shaftDiameter / 2;
   const round = circle(r);
@@ -561,30 +583,54 @@ function NemaMotor({
   bodyColor = "#242830",
   capColor = "#aeb5bd",
   shaftColor = "#b8bec6",
+  screwColor = "#626b78",
   ...props
 }) {
-  return /* @__PURE__ */ jsx(Fragment2, { children: createNemaMotorSections(props).map((section, index) => {
-    const outline = jscad2.geometries.geom2.fromPoints(section.outline);
-    const profile = section.holes.length ? jscad2.booleans.subtract(
-      outline,
-      ...section.holes.map((h2) => jscad2.geometries.geom2.fromPoints(h2))
-    ) : outline;
-    const geometry = jscad2.transforms.translate(
-      [0, 0, section.zMin],
-      jscad2.extrusions.extrudeLinear(
-        { height: section.zMax - section.zMin },
-        profile
-      )
-    );
-    return /* @__PURE__ */ jsx(
-      Colorize,
-      {
-        color: section.name === "body" ? bodyColor : section.name === "shaft" ? shaftColor : capColor,
-        children: /* @__PURE__ */ jsx(Custom, { geometry })
-      },
-      `${section.name}-${index}`
-    );
-  }) });
+  const p = resolveNemaMotorProps(props);
+  const screw = p.backFace === "screws" ? jscad2.transforms.rotateX(
+    Math.PI,
+    createHexSocketBoltGeom({
+      metricSize: p.backFaceScrewSize,
+      length: p.backFaceHoleDepth,
+      showThreads: false
+    })
+  ) : void 0;
+  const halfPitch = p.backFaceHoleSpacing / 2;
+  return /* @__PURE__ */ jsxs(Fragment2, { children: [
+    createNemaMotorSections(p).map((section, index) => {
+      const outline = jscad2.geometries.geom2.fromPoints(section.outline);
+      const profile = section.holes.length ? jscad2.booleans.subtract(
+        outline,
+        ...section.holes.map((h2) => jscad2.geometries.geom2.fromPoints(h2))
+      ) : outline;
+      const geometry = jscad2.transforms.translate(
+        [0, 0, section.zMin],
+        jscad2.extrusions.extrudeLinear(
+          { height: section.zMax - section.zMin },
+          profile
+        )
+      );
+      return /* @__PURE__ */ jsx(
+        Colorize,
+        {
+          color: section.name === "body" ? bodyColor : section.name === "shaft" ? shaftColor : capColor,
+          children: /* @__PURE__ */ jsx(Custom, { geometry })
+        },
+        `${section.name}-${index}`
+      );
+    }),
+    screw && [-halfPitch, halfPitch].flatMap(
+      (x) => [-halfPitch, halfPitch].map((y) => /* @__PURE__ */ jsx(Colorize, { color: screwColor, children: /* @__PURE__ */ jsx(
+        Custom,
+        {
+          geometry: jscad2.transforms.translate(
+            [x, y, -p.bodyLength],
+            screw
+          )
+        }
+      ) }, `rear-screw-${x}-${y}`))
+    )
+  ] });
 }
 var NEMA8 = (props) => /* @__PURE__ */ jsx(NemaMotor, { ...props, nemaSize: 8 });
 var NEMA17 = (props) => /* @__PURE__ */ jsx(NemaMotor, { ...props, nemaSize: 17 });