X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=sewing-table.scad.m4;h=9f701f2061c3f70e5f172dcfc18eddb19c26e505;hb=bfbd832853d40c8064d604a8b13b90373fd62d73;hp=fa7116f6f7537ff6bb7106f4b04e1d8b0cf535a7;hpb=68091d5866fb235d9237298f6be0478263fc90fe;p=reprap-play.git

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index fa7116f..9f701f2 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;
 
@@ -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);
 	}
       }
     }
@@ -484,17 +484,24 @@ module TestDemo(){ ////toplevel
 }
 
 module PostTestPiece(){ ////toplevel
-  holes = [ [   0, 0] ];
-  holes_forcnrs = concat(holes, [ [1, 0] ]);
-  corners = TestPiece_holes2corners(holes_forcnrs);
+  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]);
-      Posts(holes);
       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) ];
+	Posts([ stride * [ (i % nrows),
+			   floor(i / nrows) ] ]);
+      }
     }
-    PostHoles(holes);
   }
 }