X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=sewing-table.scad.m4;h=2995d9fc7f17d4f6aacfc7d62bc21693394e84bc;hp=4ef697ebbd1639f8480c28741b6574ca922a8d42;hb=913a28f5a8559ae38efb14faec2b630f91d713a9;hpb=529d7a551826e05253b412c4c8e29b56da19b774

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 4ef697e..2995d9f 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -30,6 +30,8 @@ demo_slop = 0.1;
 
 // calculated
 
+TEST = false;
+
 ply_edge_hole_dist = ply_edge_min + ply_hole_dia/2;
 
 echo(str("HOLES IN PLY ctr dist from PLY edge = ", ply_edge_hole_dist));
@@ -63,6 +65,13 @@ module Post(){
 	cylinder(r= screw_dia/2, h= ply_th, $fn=20);
       }
     }
+    if (TEST) {
+      tsz = tile_hard_edge_hole_dist - test_edge + 1;
+      translate([0,0, tile_th/2]) {
+	cube([post_dia, tsz*2, tile_th], center=true);
+	cube([tsz*2, post_dia, tile_th], center=true);
+      }
+    }
   }
 }
 
@@ -81,11 +90,23 @@ module TileBase(botleft, topright){
     mirror([0,0,1])
       translate(concat(botleft, [0]))
       cube(concat(size, [tile_th]));
-    translate( concat(botleft_post, [-tile_th])
-	       + 0.5 * [ post_dia, post_dia, 0 ] )
-      Commitid_BestCount_M( topright_post-botleft_post
-			    + [-post_dia,-post_dia]
-			    + [0, thehd[1]]);
+    if (!TEST) {
+      translate( concat(botleft_post, [ -tile_th ])
+		 + 0.5 * [ post_dia, post_dia, 0 ] )
+	Commitid_BestCount_M( topright_post-botleft_post
+			      + [-post_dia,-post_dia]
+			      + [0, thehd[1]]);
+    }
+    if (TEST) {
+      translate( concat(botleft + [thehd[0], 0], [0]) )
+	Commitid_BestCount([ size[0] - thehd[0]*2, thehd[1] ]);
+      mirror([0,0,1]) {
+	translate(concat(botleft + [test_edge,test_edge], [test_tile_th]))
+	  cube(concat(size - [test_edge,test_edge]*2, [tile_th]));
+	translate(concat(botleft_post, [-1]))
+	  cube(concat(topright_post-botleft_post, [tile_th+2]));
+      }
+    }
   }
 }
 
@@ -121,17 +142,9 @@ module RoundEdge(left_cnr, right_cnr) {
   }
 }
 
-module RoundLeftCorner(this_cnr, right_cnr) {
-  INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
-    difference(){
-      sphere(r= round_edge_rad, $fn=60);
-      translate([0,0, -20])
-	cube([20,20,20]);
-    }
-  }
-}
-
-module RoundCornerCut(this_cnr, right_cnr) {
+module RoundCornerCut(ci) {
+  this_cnr = ci[0];
+  right_cnr = ci[1];
   offr= round_cnr_rad - round_edge_rad;
   INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
     difference(){
@@ -142,7 +155,9 @@ module RoundCornerCut(this_cnr, right_cnr) {
   }
 }
 
-module RoundCornerAdd(this_cnr, right_cnr) {
+module RoundCornerAdd(ci) {
+  this_cnr = ci[0];
+  right_cnr = ci[1];
   bigr = round_cnr_rad - round_edge_rad;
   INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
     intersection(){
@@ -243,6 +258,7 @@ module TestPiece1(){ ////toplevel
 	    [   0, 0]
 	    ];
   corners = TestPiece_holes2corners(holes);
+  rcs = [corners[0], corners[1]];
   difference(){
     union(){
       TileBase(corners[0], corners[2]);
@@ -251,9 +267,9 @@ module TestPiece1(){ ////toplevel
       RoundEdge(corners[3], corners[0]);
     }
     InterlockEdge(corners[1], corners[2], 1, nlobes=1);
-    RoundCornerCut(corners[0], corners[1]);
+    RoundCornerCut(rcs);
   }
-  RoundCornerAdd(corners[0], corners[1]);
+  RoundCornerAdd(rcs);
 }
 
 module TestPiece2(){ ////toplevel
@@ -292,6 +308,7 @@ module Tile02(){ ////toplevel
   c0 = -sz;
   c = Rectangle_corners(c0, sz);
   posts = Rectangle_corners2posts(c);
+  rcs = [c[0], c[1]];
   difference(){
     union(){
       TileBase(c[0], c[2]);
@@ -301,9 +318,9 @@ module Tile02(){ ////toplevel
       InterlockEdge(c[2], c[3], 0);
     }
     InterlockEdge(c[1], c[2], 1);
-    RoundCornerCut(c[0], c[1]);
+    RoundCornerCut(rcs);
   }
-  RoundCornerAdd(c[0], c[1]);
+  RoundCornerAdd(rcs);
 }
 
 module Tile12(){ ////toplevel
@@ -311,16 +328,18 @@ module Tile12(){ ////toplevel
   c0 = [-sz[0], 0];
   c = Rectangle_corners(c0, sz);
   posts = Rectangle_corners2posts(c);
+  rcs = [c[2], c[3]];
   difference(){
     union(){
       TileBase(c[0], c[2]);
       RoundEdge(c[2], c[3]);
       RoundEdge(c[3], c[0]);
-      RoundLeftCorner(c[2], c[3]);
       Posts(posts);
     }
     InterlockEdge(c[0], c[1], 1);
+    RoundCornerCut(rcs);
   }
+  RoundCornerAdd(rcs);
 }
 
 module Demo(){ ////toplevel