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=40ec1be2524399e6d80c9f0546707406d848ed0f;hp=e8f6b7a7c68a4e79ee2c6310a0a7200708d48609;hb=4982e66d15e9dcc3aec326dfe480cdec31aaaf91;hpb=e21fc4e825b97f960748962465d8fef8f51fa6df

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index e8f6b7a..40ec1be 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -1,6 +1,7 @@
 // -*- C -*-
 
 include <funcs.scad>
+include <commitid.scad>
 
 ply_th = 18;
 ply_hole_dia = 15;
@@ -23,14 +24,25 @@ interlock_dia = 10;
 
 ply_edge_hole_dist = ply_edge_min + ply_hole_dia/2;
 
-echo(str("HOLES IN PLY ctr dist from edge = ", ply_edge_hole_dist));
+echo(str("HOLES IN PLY ctr dist from PLY edge = ", ply_edge_hole_dist));
 
 hole_slop = (ply_hole_dia - post_dia)/2;
 tile_hard_edge_hole_dist = ply_edge_hole_dist + hole_slop;
+
+echo(str("HOLES IN PLY ctr dist from TILE HARD edge = ",
+	 tile_hard_edge_hole_dist));
+
+echo(str("HOLES IN PLY ctr dist from TILE ROUND edge = ",
+	 tile_hard_edge_hole_dist + round_edge_rad));
+
 thehd = [ tile_hard_edge_hole_dist, tile_hard_edge_hole_dist ];
+thehd_tr = thehd;
+thehd_tl = [ -thehd_tr[0], thehd_tr[1] ];
+thehd_bl = -thehd_tr;
+thehd_br = -thehd_tl;
 
 interlock_rad = interlock_dia/2;
-interlock_negative_rad = interlock_rad + 0.25;
+interlock_negative_rad = interlock_rad + 0.125;
 
 module Post(){
   mirror([0,0,1]) {
@@ -46,20 +58,28 @@ module Post(){
 
 module Posts(posts) {
   for (p= posts) {
-    translate([p[0], p[1], 0])
+    translate(concat(p, [0]))
       Post();
   }
 }
 
-module TileBase(botleft_post, topright_post){
-  botleft = botleft_post - thehd;
-  size = topright_post - botleft_post + thehd * 2;
-  mirror([0,0,1])
-    translate([botleft[0], botleft[1], 0])
-    cube([size[0], size[1], tile_th]);
+module TileBase(botleft, topright){
+  size = topright - botleft;
+  botleft_post = botleft + thehd_tr;
+  topright_post = topright + thehd_bl;
+  difference(){
+    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]]);
+  }
 }
 
-m4_dnl  INREFFRAME(left_post, right_post, morevars) { body; }
+m4_dnl  INREFFRAME(left_cnr, right_cnr, morevars) { body; }
 m4_define(`INREFFRAME',`
   length_vec = ($2) - ($1);
   length = dist2d([0,0], length_vec);
@@ -73,27 +93,26 @@ m4_define(`INREFFRAME',`
   multmatrix(m)
 ')
 
-m4_dnl  INREFFRAME(left_post, right_post, morevars)
+m4_dnl  INREFFRAME(left_cnr, right_cnr, morevars)
 m4_dnl    INREFFRAME_EDGE { body; }
 m4_define(`INREFFRAME_EDGE',`
-  translate([-thehd[1], -thehd[0], -round_edge_rad])
+  translate([0,0, -round_edge_rad])
 ')
 
-module RoundEdge(left_post, right_post) {
-  INREFFRAME(left_post, right_post,
-	      `tlength = length + thehd[1] * 2;') m4_dnl '
+module RoundEdge(left_cnr, right_cnr) {
+  INREFFRAME(left_cnr, right_cnr)
     INREFFRAME_EDGE {
     difference(){
       rotate([0,90,0])
-	cylinder(r= round_edge_rad, h= tlength, $fn=50);
+	cylinder(r= round_edge_rad, h= length, $fn=50);
       translate([-1, 0, -20])
-	cube([tlength+2, 20, 20]);
+	cube([length+2, 20, 20]);
     }
   }
 }
 
-module RoundLeftCorner(this_post, right_post) {
-  INREFFRAME(this_post, right_post) INREFFRAME_EDGE {
+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])
@@ -102,34 +121,81 @@ module RoundLeftCorner(this_post, right_post) {
   }
 }
 
-module InterlockCore(r) {
-  translate([0, -thehd[0], 1]){
+module InterlockLobePlan(r, ymir) {
+  dx = sqrt(3) * r;
+  $fn= 80;
+  translate([thehd[0], 0]){
+    mirror([0,ymir,0]){
+      circle(r=r);
+      difference(){
+	translate([-dx, -0.1])
+	  square([ dx*2, r/2 + 0.1 ]);
+	for (xi = [-1, 1]) {
+	  translate([ xi*dx, r ])
+	    circle(r=r);
+	}
+      }
+    }
+  }
+}
+
+module InterlockLobeCore(r, plusth, ymir) {
+  translate([0, 0, plusth]){
     mirror([0,0,1]){
-      linear_extrude(height=tile_th+2){
-	circle(r=r, $fn=40);
+      linear_extrude(height=tile_th+plusth*2, convexity=10){
+	InterlockLobePlan(r, ymir);
       }
     }
   }
 }
 
-module InterlockNegative(this_post, right_post) {
-  INREFFRAME(this_post, right_post)
-    InterlockCore(interlock_negative_rad);
+module InterlockLobe(this_cnr, right_cnr, negative=0) {
+  INREFFRAME(this_cnr, right_cnr)
+    InterlockLobeCore(negative ? interlock_negative_rad : interlock_rad,
+		  negative ? 1 : 0,
+		  negative ? 0 : 1);
 }
 
-module TestPiece1(){
+function TestPiece_holes2corners(holes) =
+  [ holes[0] + thehd_bl,
+    holes[1] + thehd_br,
+    holes[1] + thehd_tr,
+    holes[0] + thehd_tl ];
+
+module TestPiece1(){ ////toplevel
   holes = [ [-100, 0],
 	    [   0, 0]
 	    ];
+  corners = TestPiece_holes2corners(holes);
   difference(){
-    TileBase(holes[0], holes[1]);
-    InterlockNegative(holes[1], holes[1] + [0,1]);
-
+    TileBase(corners[0], corners[2]);
+    InterlockLobe(corners[1], corners[2], 1);
   }
   Posts(holes);
-  RoundEdge(holes[0], holes[1]);
-  RoundEdge(holes[0] + [ 0, 0.1 ], holes[0]);
-  RoundLeftCorner(holes[0], holes[1]);
+  RoundEdge(corners[0], corners[1]);
+  RoundEdge(corners[3], corners[0]);
+  RoundLeftCorner(corners[0], corners[1]);
+}
+
+module TestPiece2(){ ////toplevel
+  holes = [ [   0, 0],
+	    [  50, 0]
+	    ];
+  corners = TestPiece_holes2corners(holes);
+  TileBase(corners[0], corners[2]);
+  Posts(holes);
+  RoundEdge(corners[0], corners[1]);
+  InterlockLobe(corners[3], corners[0]);
 }
 
-TestPiece1();
+module Demo(){ ////toplevel
+  translate([ -thehd[0], 0 ])
+    color("blue")
+    TestPiece1();
+  translate([ +thehd[0], 0 ])
+    TestPiece2();
+}
+  
+//TestPiece1();
+//TestPiece2();
+//Demo();