sewing-table: working on test version

[reprap-play.git] / sewing-table.scad.m4

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 5a6aec036ea8e4c6841387de5f815e4e600e37e6..fb8313c4305c4205d7c65c709c859b98790f0128 100644 (file)
--- 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));
@@ -79,7 +83,7 @@ module TileBase(botleft, topright){
     mirror([0,0,1])
       translate(concat(botleft, [0]))
       cube(concat(size, [tile_th]));
-    translate( concat(botleft_post, [-tile_th])
+    translate( concat(botleft_post, [ TEST ? 0 : -tile_th])
               + 0.5 * [ post_dia, post_dia, 0 ] )
       Commitid_BestCount_M( topright_post-botleft_post
                            + [-post_dia,-post_dia]
@@ -119,12 +123,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]);
+        }
     }
   }
 }
@@ -160,7 +186,7 @@ module InterlockEdgePlan(negative, nlobes, length, dosquare=true) {
 
   if (dosquare) {
     iadj = 0;
-    slotshorter = negative ? 0 : interlock_fine_lenslop;
+    slotshorter = negative ? -0.1 : interlock_fine_lenslop;
     mirror([0, negative])
       translate([slotshorter, iadj])
       square([length - slotshorter*2, interlock_fine + iadj*2]);
@@ -214,13 +240,16 @@ module TestPiece1(){ ////toplevel
            ];
   corners = TestPiece_holes2corners(holes);
   difference(){
-    TileBase(corners[0], corners[2]);
+    union(){
+      TileBase(corners[0], corners[2]);
+      Posts(holes);
+      RoundEdge(corners[0], corners[1]);
+      RoundEdge(corners[3], corners[0]);
+    }
     InterlockEdge(corners[1], corners[2], 1, nlobes=1);
+    RoundCornerCut(corners[0], corners[1]);
   }
-  Posts(holes);
-  RoundEdge(corners[0], corners[1]);
-  RoundEdge(corners[3], corners[0]);
-  RoundLeftCorner(corners[0], corners[1]);
+  RoundCornerAdd(corners[0], corners[1]);
 }
 
 module TestPiece2(){ ////toplevel
@@ -259,15 +288,19 @@ module Tile02(){ ////toplevel
   c0 = -sz;
   c = Rectangle_corners(c0, sz);
   posts = Rectangle_corners2posts(c);
+  rcs = [c[0], c[1]];
   difference(){
-    TileBase(c[0], c[2]);
+    union(){
+      TileBase(c[0], c[2]);
+      Posts(posts);
+      RoundEdge(c[0], c[1]);
+      RoundEdge(c[3], c[0]);
+      InterlockEdge(c[2], c[3], 0);
+    }
     InterlockEdge(c[1], c[2], 1);
+    RoundCornerCut(rcs);
   }
-  Posts(posts);
-  RoundEdge(c[0], c[1]);
-  RoundEdge(c[3], c[0]);
-  RoundLeftCorner(c[0], c[1]);
-  InterlockEdge(c[2], c[3], 0);
+  RoundCornerAdd(rcs);
 }
 
 module Tile12(){ ////toplevel
@@ -275,14 +308,18 @@ module Tile12(){ ////toplevel
   c0 = [-sz[0], 0];
   c = Rectangle_corners(c0, sz);
   posts = Rectangle_corners2posts(c);
+  rcs = [c[2], c[3]];
   difference(){
-    TileBase(c[0], c[2]);
+    union(){
+      TileBase(c[0], c[2]);
+      RoundEdge(c[2], c[3]);
+      RoundEdge(c[3], c[0]);
+      Posts(posts);
+    }
     InterlockEdge(c[0], c[1], 1);
+    RoundCornerCut(rcs);
   }
-  Posts(posts);
-  RoundEdge(c[2], c[3]);
-  RoundEdge(c[3], c[0]);
-  RoundLeftCorner(c[2], c[3]);
+  RoundCornerAdd(rcs);
 }
 
 module Demo(){ ////toplevel