screw-recess-test: break out RecessedScrewCutout_totaldepth (nfc)

[reprap-play.git] / screw-recess-test.scad

diff --git a/screw-recess-test.scad b/screw-recess-test.scad
index 9e3a333a68ee217132bfb1d9cb5d2f986e2131a1..576c21682b508c0749edfa93a63211b30ff0121a 100644 (file)
--- a/screw-recess-test.scad
+++ b/screw-recess-test.scad
@@ -15,14 +15,20 @@ module RecessScrewCutout_RecessCylinder(recessdia,zbelow, h){
 RecessedScrewCutout_defaultrecessdepth_flat = -0.35;
 RecessedScrewCutout_defaultrecessdepth_hex = -0.70;
 
+function RecessedScrewCutout_recessdepth(recessdia, recessdepth_arg) =
+  recessdepth_arg >= 0 ? recessdepth_arg : -recessdepth_arg * recessdia;
+
+function RecessedScrewCutout_totaldepth(recessdia, recessdepth_arg) =
+  RecessedScrewCutout_recessdepth(recessdia, recessdepth_arg) +
+  + 0.5*recessdia + 0.1;
+
 module RecessedScrewCutout(shaftdia, recessdia, shaftlen,
-        recessdepth_arg=RecessedScrewCutout_defaultrecessdepth_flat,
-        zbelow=1) {
+        zbelow=1,
+        recessdepth_arg=RecessedScrewCutout_defaultrecessdepth_flat) {
   // pass recessdepth_arg=-1 for the default for flat heads
   // pass recessdepth_arg=-1 for the default for flat heads
-  recessdepth = recessdepth_arg >= 0 ? recessdepth_arg
-    : -recessdepth_arg * recessdia;
-  recesstopz = recessdepth + 0.5*recessdia + 0.1;
+  recessdepth = RecessedScrewCutout_recessdepth(recessdia, recessdepth_arg);
+  recesstopz = RecessedScrewCutout_totaldepth(recessdia, recessdepth_arg);
   xblocky = shaftdia + 0.1;
 
   translate([0,0,-zbelow]) cylinder(r=shaftdia/2, h=shaftlen+zbelow, $fn=20);