screw-recess-test: abolish spurious column in tests array

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

diff --git a/screw-recess-test.scad b/screw-recess-test.scad
index 5079008c20140580141d991f5b4f6f8bc4f97475..3378d90388749d9922d91b1322957ebd1f54137d 100644 (file)
--- a/screw-recess-test.scad
+++ b/screw-recess-test.scad
@@ -1,45 +1,68 @@
 // -*- C -*-
 
-cubez = 12;
-
-shaftz = cubez;
-recessz = 5;
+module RecessScrewCutout_RecessCylinder(recessdia,zbelow, h){
+  translate([0,0,-zbelow]) cylinder(r=recessdia/2, h=h+1, $fn=40);
+}
 
-tests = [[4 + 0.5,  10 + 1.0]];
+RecessedScrewCutout_defaultrecessdepth_flat = -0.30;
+RecessedScrewCutout_defaultrecessdepth_hex = -0.60;
 
-cubexy = 20;
+function RecessedScrewCutout_recessdepth(recessdia,
+        recessdepth_arg=RecessedScrewCutout_defaultrecessdepth_flat) =
+  recessdepth_arg >= 0 ? recessdepth_arg : -recessdepth_arg * recessdia;
 
-module RecessScrewCutout_RecessCylinder(recessdia, h){
-  translate([0,0,-1]) cylinder(r=recessdia/2, h=h+1, $fn=40);
-}
+function RecessedScrewCutout_totaldepth(recessdia,
+        recessdepth_arg=RecessedScrewCutout_defaultrecessdepth_flat) =
+  RecessedScrewCutout_recessdepth(recessdia, recessdepth_arg) +
+  + 0.5*recessdia + 0.1;
 
-module RecessedScrewCutout(shaftdia, recessdia) {
-  recesstopz = recessz + 0.5*recessdia + 0.1;
-  xblocky = shaftdia + 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 = RecessedScrewCutout_recessdepth(recessdia, recessdepth_arg);
+  recesstopz = RecessedScrewCutout_totaldepth(recessdia, recessdepth_arg);
 
-  translate([0,0,-1]) cylinder(r=shaftdia/2, h=shaftz+2, $fn=20);
-  RecessScrewCutout_RecessCylinder(recessdia, recessz);
+  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, -1])
-      cube([recessdia*3, xblocky, recesstopz+3]);
+    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, recesstopz+1);
+    RecessScrewCutout_RecessCylinder(recessdia,zbelow, recesstopz+1);
   }
 }
 
-module Test(){
+//        shaftdia  recessdia
+tests = [[2 + 0.5,   4 + 1.0 ],
+        [3 + 0.5,   6 + 1.0 ],
+        [4 + 0.5,   8 + 1.0 ],
+        [5 + 0.5,  10 + 1.0 ],
+        [6 + 0.5,  12 + 1.0 ]];
+
+module OneTest(t){
+  blocksz = t[1] + 7;
+  h = RecessedScrewCutout_totaldepth(t[1]) + 3;
   difference(){
-    translate([-cubexy/2, -cubexy/2, 0])
-      cube([cubexy,cubexy,cubez]);
+    translate([-blocksz/2, -blocksz/2, 0])
+      cube([blocksz, blocksz, h]);
+    RecessedScrewCutout(t[0],t[1], h+1);
   }
 }
 
-module Hole(){
-    RecessedScrewCutout(tests[0][0],
-                       tests[0][1],
-                       -1);
+function Test_x(i) = i<=0 ? 0 :
+  Test_x(i-1) + tests[i-1][1]*0.5 + tests[i][1]*0.5 + 4.5;
+
+module Tests(){
+  for (i = [0:len(tests)-1]) {
+    echo(i, Test_x(i));
+    translate([Test_x(i), 0, 0])
+      OneTest(tests[i]);
+  }
 }
 
-//Test();
-Hole();
+//OneTest(tests[1]);
+Tests();
+//Hole();
+//Holes();