X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=screw-recess-test.scad;h=09eb0766763886f3a72d03842620de06e41c211b;hp=a5dab4fdf184c5d9a66c0c7abc3ac7433f0969c9;hb=529d7a551826e05253b412c4c8e29b56da19b774;hpb=38661e143fa550f5472c72fd76f1aacf7fe4f577

diff --git a/screw-recess-test.scad b/screw-recess-test.scad
index a5dab4f..09eb076 100644
--- 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,20 +80,32 @@ tests = [
 
 function Test_blocksz(t) = screw_recess_dia_use(t) + 7;
 
-module OneTestCore(t, h){
+module OneTestCore(t, h, ymul, labelnumber=false){
   blocksz = Test_blocksz(t);
-  difference(){
-    translate([-blocksz/2, -blocksz/2, 0])
-      cube([blocksz, blocksz, h]);
-    child();
+  translate([0, ymul * (blocksz*0.5 - 1.5), 0]) {
+    difference(){
+      translate([-blocksz/2, -blocksz/2, 0])
+	cube([blocksz, blocksz, h]);
+      child();
+    }
+    if (labelnumber) {
+      rotate([90,0,0])
+	translate([-blocksz/4,blocksz/5, blocksz/2-1])
+	linear_extrude(height=0.3+1)
+      import(file=str("screw-recess-test-number-s",t[0],".dxf"), convexity=100);
+    }
   }
 }
 
 module OneTest(t){
-  h = RecessedScrewCutoutStandard_totaldepth(t);
-  OneTestCore(t, h){
+  h = RecessedScrewCutoutStandard_totaldepth(t) + 3;
+  ha = RecessedScrewCutoutStandardAllen_totaldepth(t) + 3;
+  OneTestCore(t, h, 1){
     RecessedScrewCutoutStandard(t, h+1);
   }
+  OneTestCore(t, ha, -1, true){
+    RecessedScrewCutoutStandardAllen(t, ha+1);
+  }
 }
 
 function Test_x(i) = i<=0 ? 0 :