X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=sewing-table.scad.m4;h=856035894f66a8a4878ad097b2880f87026fb19e;hb=30d469be9c3eefbc9a08c86007a44a9dba425adb;hp=dd3f0f1c25afbe190e30e1220049400435f92c4e;hpb=ba0bf7a28b79a5d928d746632d11f411037aeb23;p=reprap-play.git

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index dd3f0f1..8560358 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -19,6 +19,11 @@ screw_big_len = 4.0;
 round_edge_rad = 2.0;
 
 interlock_dia = 10;
+interlock_fine = 1.0;
+
+interlock_fine_lenslop = 1.0;
+
+demo_slop = 0.1;
 
 // calculated
 
@@ -121,11 +126,14 @@ module RoundLeftCorner(this_cnr, right_cnr) {
   }
 }
 
-module InterlockLobePlan(r, ymir) {
+module InterlockLobePlan(negative) {
+  r = negative ? interlock_negative_rad : interlock_rad;
+  ymir = negative ? 0 : 1;
+
   dx = sqrt(3) * r;
   $fn= 80;
   translate([thehd[0], 0]){
-    mirror([0,ymir,0]){
+    mirror([0,ymir]){
       circle(r=r);
       difference(){
 	translate([-dx, -0.1])
@@ -139,22 +147,34 @@ module InterlockLobePlan(r, ymir) {
   }
 }
 
-module InterlockLobeCore(negative=0) {
-  r = negative ? interlock_negative_rad : interlock_rad;
-  plusth = negative * 1.0;
-  ymir = negative ? 0 : 1;
-  translate([0, 0, plusth]){
-    mirror([0,0,1]){
-      linear_extrude(height=tile_th+plusth*2, convexity=10){
-	InterlockLobePlan(r, ymir);
-      }
+module InterlockEdgePlan(negative, nlobes, length) {
+  iadj = 0.1;
+
+  for (lobei = [ 0 : nlobes-1 ]) {
+    lobex = (length - thehd[0]*2) * (lobei ? lobei / (nlobes-1) : 0);
+    translate([lobex, 0, 0]) {
+      InterlockLobePlan(negative);
     }
   }
+
+  slotshorter = negative ? 0 : interlock_fine_lenslop;
+  mirror([0, negative])
+    translate([slotshorter, iadj])
+    square([length - slotshorter*2, interlock_fine + iadj*2]);
 }
 
-module InterlockLobe(this_cnr, right_cnr, negative=0) {
-  INREFFRAME(this_cnr, right_cnr)
-    InterlockLobeCore(negative);
+module InterlockEdge(left_cnr, right_cnr, negative=0, nlobes=2) {
+  plusth = negative * 1.0;
+
+  INREFFRAME(left_cnr, right_cnr) {
+    translate([0, 0, plusth]){
+      mirror([0,0,1]){
+	linear_extrude(height=tile_th+plusth*2, convexity=10){
+	  InterlockEdgePlan(negative, nlobes, length);
+	}
+      }
+    }
+  }
 }
 
 function TestPiece_holes2corners(holes) =
@@ -170,7 +190,7 @@ module TestPiece1(){ ////toplevel
   corners = TestPiece_holes2corners(holes);
   difference(){
     TileBase(corners[0], corners[2]);
-    InterlockLobe(corners[1], corners[2], 1);
+    InterlockEdge(corners[1], corners[2], 1, nlobes=1);
   }
   Posts(holes);
   RoundEdge(corners[0], corners[1]);
@@ -186,14 +206,14 @@ module TestPiece2(){ ////toplevel
   TileBase(corners[0], corners[2]);
   Posts(holes);
   RoundEdge(corners[0], corners[1]);
-  InterlockLobe(corners[3], corners[0]);
+  InterlockEdge(corners[3], corners[0], 0, nlobes=1);
 }
 
 module TestDemo(){ ////toplevel
   translate([ -thehd[0], 0 ])
     color("blue")
     TestPiece1();
-  translate([ +thehd[0], 0 ])
+  translate([ +thehd[0] + demo_slop, 0 ])
     TestPiece2();
 }
   
@@ -221,6 +241,7 @@ module Tile02(){ ////toplevel
   RoundEdge(c[0], c[1]);
   RoundEdge(c[3], c[0]);
   RoundLeftCorner(c[0], c[1]);
+  InterlockEdge(c[2], c[3], 0);
 }
 
 module Tile12(){ ////toplevel
@@ -230,6 +251,7 @@ module Tile12(){ ////toplevel
   posts = Rectangle_corners2posts(c);
   difference(){
     TileBase(c[0], c[2]);
+    InterlockEdge(c[0], c[1], 1);
   }
   Posts(posts);
   RoundEdge(c[2], c[3]);
@@ -238,8 +260,8 @@ module Tile12(){ ////toplevel
 }
 
 module Demo(){ ////toplevel
-  color("blue") Tile12();
-  color("red")  Tile02();
+  translate(demo_slop*[-2,1]) color("blue") Tile12();
+  translate(demo_slop*[-2,0]) color("red")  Tile02();
 }
   
 //TestPiece1();