X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=sewing-table.scad.m4;h=cd994635c377a4a4282f3789fe1df4b44436eb39;hb=383164f155deaa70d0537fee742539d3cc0b7cd0;hp=91d4de9f58d6884f1a454a1683004b9b5059f292;hpb=dad2b403c31539a8a25bd4101159f761cf0242c4;p=reprap-play.git

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 91d4de9..cd99463 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -14,7 +14,7 @@ post_dia = 8;
 
 post_shorter = 1;
 
-screw_dia = 2.2;
+$screw_dia = 3.168;
 screw_big_dia = 3.6;
 screw_big_len = 4.0;
 
@@ -30,7 +30,7 @@ interlock_fine_lenslop = 1.0;
 
 demo_slop = 0.1;
 
-leg_height = 62;
+leg_height = 53.75 - 0.95;
 
 leg_hole_dia = 5 + 0.75;
 leg_big_dia = 37;
@@ -151,7 +151,7 @@ module Post(){
 	cylinder(r= post_dia/2, h= tile_th + ply_th - post_shorter);
 	translate([0,0, tile_th]) {
 	  cylinder(r= screw_big_dia/2, h= screw_big_len);
-	  cylinder(r= screw_dia/2, h= ply_th, $fn=20);
+	  cylinder(r= $screw_dia/2, h= ply_th, $fn=20);
 	}
       }
     }
@@ -483,6 +483,31 @@ module TestDemo(){ ////toplevel
     TestPiece2();
 }
 
+module PostTestPiece(){ ////toplevel
+  hole_sizes = [2.8, 3.0, 3.1, 3.134, 3.168, 3.2, 3.3, 3.5];
+  nholes = len(hole_sizes)*2;
+  nrows = 4;
+  stride = post_dia*1.5;
+  rect_sz = stride * [ nrows,
+		       ceil(nholes/nrows) ];
+  corners = Rectangle_corners(-stride * 0.5 * [1,1], rect_sz);
+  difference(){
+    union(){
+      TileBase(corners[0], corners[2]);
+      RoundEdge(corners[0], corners[1]);
+      InterlockEdge(corners[3], corners[0], 0, nlobes=1);
+      for (i= [ 0: nholes-1 ]) {
+	$screw_dia = hole_sizes[ floor(i/2) ];
+	translate(stride * [ (i % nrows),
+			     floor(i / nrows),
+			     0
+			     ])
+	  Posts([[0,0]]);
+      }
+    }
+  }
+}
+
 module Machine_NewRearProfile(){
   // figures copied out of xfig edit boxes
   // best not to edit the posbox size if poss - just move it
@@ -724,13 +749,21 @@ module Leg(){ ////toplevel
 	       h= (!TEST ? leg_height+2 : leg_height/2),
 	       $fn=30);
     mirror([0,0,1]) translate([0,0,leg_top_thick - 0.1])
-      cylinder(r= leg_midspc_dia/2,
-	       h=leg_height - leg_top_thick - leg_bot_thick + 0.2,
-	       $fn=30);
-    for (rot=[45: 360/leg_n_tubules : 359]) rotate(rot) {
-	mirror([0,0,1]) translate([ leg_tubule_pos_rad, 0, -1])
-	  cylinder(r= leg_tubule_dia/2, h=leg_height+2, $fn=20);
+      hull(){
+        cylinder(r= (!TEST ? leg_midspc_dia/2 : 0.1),
+		 h= leg_height - leg_top_thick - leg_bot_thick + 0.2,
+		 $fn=30);
+	if (TEST)
+	  cylinder(r= leg_midspc_dia/2,
+		   h= leg_height - leg_top_thick - leg_bot_thick
+		      + (!TEST ? 0.2 : -leg_midspc_dia/2),
+		   $fn=30);
       }
+    if (!TEST)
+      for (rot=[45: 360/leg_n_tubules : 359]) rotate(rot) {
+	  mirror([0,0,1]) translate([ leg_tubule_pos_rad, 0, -1])
+	    cylinder(r= leg_tubule_dia/2, h=leg_height+2, $fn=20);
+	}
   }
 }