screw-recess-test: tweaks

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

diff --git a/screw-recess-test.scad b/screw-recess-test.scad
index 222081b45a064f66891239e4ba639e77ac9801e5..5db4a56036cd9e4c52a4a845943abdb8c9eaaf54 100644 (file)
--- a/screw-recess-test.scad
+++ b/screw-recess-test.scad
@@ -36,17 +36,17 @@ module RecessedScrewCutout(shaftdia, recessdia, shaftlen,
 
 //              nom.   shaft
 //              shaft   slop
-screw_info_M2   = [2,   1.5];
-screw_info_M3   = [3,   1.5];
-screw_info_M4   = [4,   1.2];
+screw_info_M2   = [2,   1.2];
+screw_info_M3   = [3,   1.2];
+screw_info_M4   = [4,   1.1];
 screw_info_M5   = [5,   1.0];
-screw_info_M6   = [6,   0.9];
+screw_info_M6   = [6,   1.2];
 
 function screw_shaft_dia_nom(info)      = info[0];
 function screw_shaft_dia_use(info)      = info[0] + info[1];
-function screw_recess_dia_use(info)     = info[0] * 2.5;
-function screw_recess_depth(info)       = info[0] *  .65;
-function screw_recess_depth_allen(info) = info[0] * 1.20;
+function screw_recess_dia_use(info)     = info[0] * 2.50 + 1.0;
+function screw_recess_depth(info)       = info[0] * 1.00 + 0.50;
+function screw_recess_depth_allen(info) = info[0] * 1.55 + 0.50;
 
 function RecessedScrewCutoutStandard_totaldepth(info) =
   RecessedScrewCutout_totaldepth(screw_recess_dia_use(info),
@@ -80,14 +80,26 @@ tests = [
 
 function Test_blocksz(t) = screw_recess_dia_use(t) + 7;
 
-module OneTest(t){
+module OneTestCore(t, h, ymul){
   blocksz = Test_blocksz(t);
-  h = RecessedScrewCutoutStandard_totaldepth(t);
-  difference(){
-    translate([-blocksz/2, -blocksz/2, 0])
-      cube([blocksz, blocksz, h]);
+  translate([0, ymul * (blocksz*0.5 - 1.5), 0]) {
+    difference(){
+      translate([-blocksz/2, -blocksz/2, 0])
+       cube([blocksz, blocksz, h]);
+      child();
+    }
+  }
+}
+
+module OneTest(t){
+  h = RecessedScrewCutoutStandard_totaldepth(t) + 3;
+  ha = RecessedScrewCutoutStandardAllen_totaldepth(t) + 3;
+  OneTestCore(t, h, 1){
     RecessedScrewCutoutStandard(t, h+1);
   }
+  OneTestCore(t, ha, -1){
+    RecessedScrewCutoutStandardAllen(t, ha+1);
+  }
 }
 
 function Test_x(i) = i<=0 ? 0 :