screw-recess-test: abolish blockxy (nfc)

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

diff --git a/screw-recess-test.scad b/screw-recess-test.scad
index 8176878fb2815337598bae9b0fdd759945a311f1..50bcd5aee114c3390b032bf0f88dd2cad97455e4 100644 (file)
--- a/screw-recess-test.scad
+++ b/screw-recess-test.scad
@@ -15,21 +15,25 @@ module RecessScrewCutout_RecessCylinder(recessdia,zbelow, h){
 RecessedScrewCutout_defaultrecessdepth_flat = -0.35;
 RecessedScrewCutout_defaultrecessdepth_hex = -0.70;
 
-module RecessedScrewCutout(shaftdia, recessdia,
-        recessdepth_arg=RecessedScrewCutout_defaultrecessdepth_flat,
-        zbelow=1) {
+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,
+        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;
-  xblocky = shaftdia + 0.1;
+  recessdepth = RecessedScrewCutout_recessdepth(recessdia, recessdepth_arg);
+  recesstopz = RecessedScrewCutout_totaldepth(recessdia, recessdepth_arg);
 
-  translate([0,0,-zbelow]) cylinder(r=shaftdia/2, h=shaftz+1+zbelow, $fn=20);
+  translate([0,0,-zbelow]) cylinder(r=shaftdia/2, h=shaftlen+zbelow, $fn=20);
   RecessScrewCutout_RecessCylinder(recessdia,zbelow, recessdepth);
   intersection(){
-    translate([-recessdia*1.5, -xblocky/2, -zbelow])
-      cube([recessdia*3, xblocky, recesstopz+2+zbelow]);
+    cube([recessdia + 1, shaftdia + 0.1, recesstopz*2 + 1], center=true);
     translate([0, -recessdia, recesstopz])
       rotate([0,135,0]) cube([recessdia, recessdia*2, 10]);
     RecessScrewCutout_RecessCylinder(recessdia,zbelow, recesstopz+1);
@@ -45,7 +49,8 @@ module Test(){
 
 module Hole(){
     RecessedScrewCutout(tests[0][0],
-                       tests[0][1]);
+                       tests[0][1],
+                       shaftz+1);
 }
 
 //Test();