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=ba93622aec8afda2cf3f54ac967703f76245ad30;hb=b543ceaee7db9f8be46530c1fe99fb23f910348c;hpb=4dcb6a646b9955cf74fc36db650629dbb51b4e29

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index ba93622..2995d9f 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -18,6 +18,8 @@ screw_big_len = 4.0;
 
 round_edge_rad = 2.0;
 
+round_cnr_rad = 10;
+
 interlock_dia = 10;
 interlock_fine = 0.66;
 
@@ -28,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));
@@ -61,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);
+      }
+    }
   }
 }
 
@@ -79,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]));
+      }
+    }
   }
 }
 
@@ -119,12 +142,34 @@ module RoundEdge(left_cnr, right_cnr) {
   }
 }
 
-module RoundLeftCorner(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(){
-      sphere(r= round_edge_rad, $fn=60);
-      translate([0,0, -20])
-	cube([20,20,20]);
+      cube(offr*2 - 0.1, center=true);
+      translate([offr, offr, 0])
+	cylinder(center=true, h=20, r= offr);
+    }
+  }
+}
+
+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(){
+      cube(bigr*2 + 0.1, center=true);
+      translate([bigr, bigr, 0])
+	rotate_extrude(convexity=10, $fn=50)
+	translate([bigr, 0])
+	difference(){
+	  circle(r= round_edge_rad, $fn=50);
+	  mirror([1,1])
+	    square([20,20]);
+        }
     }
   }
 }
@@ -213,16 +258,18 @@ module TestPiece1(){ ////toplevel
 	    [   0, 0]
 	    ];
   corners = TestPiece_holes2corners(holes);
+  rcs = [corners[0], corners[1]];
   difference(){
     union(){
       TileBase(corners[0], corners[2]);
       Posts(holes);
       RoundEdge(corners[0], corners[1]);
       RoundEdge(corners[3], corners[0]);
-      RoundLeftCorner(corners[0], corners[1]);
     }
     InterlockEdge(corners[1], corners[2], 1, nlobes=1);
+    RoundCornerCut(rcs);
   }
+  RoundCornerAdd(rcs);
 }
 
 module TestPiece2(){ ////toplevel
@@ -261,17 +308,19 @@ 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]);
       Posts(posts);
       RoundEdge(c[0], c[1]);
       RoundEdge(c[3], c[0]);
-      RoundLeftCorner(c[0], c[1]);
       InterlockEdge(c[2], c[3], 0);
     }
     InterlockEdge(c[1], c[2], 1);
+    RoundCornerCut(rcs);
   }
+  RoundCornerAdd(rcs);
 }
 
 module Tile12(){ ////toplevel
@@ -279,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