sewing-table: Interlock: move iadj to global; adjust interlock_fine (nfc)

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

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 813e1a24f2175282163e7a3b2620aa2952ed318a..7e6afbf7b3f378371e4d7b06ef7d1aefbf2ddd6e 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -19,7 +19,7 @@ screw_big_len = 4.0;
 round_edge_rad = 2.0;
 
 interlock_dia = 10;
-interlock_fine = 1.0;
+interlock_fine = 0.66;
 
 interlock_fine_lenslop = 1.0;
 
@@ -49,6 +49,8 @@ thehd_br = -thehd_tl;
 interlock_rad = interlock_dia/2;
 interlock_negative_rad = interlock_rad + 0.125;
 
+interlock_sq_adj = 0.2; // arbitrary
+
 module Post(){
   mirror([0,0,1]) {
     difference(){
@@ -148,8 +150,6 @@ module InterlockLobePlan(negative) {
 }
 
 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]) {
@@ -157,8 +157,9 @@ module InterlockEdgePlan(negative, nlobes, length) {
     }
   }
 
+  iadj = interlock_sq_adj;
   slotshorter = negative ? 0 : interlock_fine_lenslop;
-  mirror([0, negative, 1])
+  mirror([0, negative])
     translate([slotshorter, iadj])
     square([length - slotshorter*2, interlock_fine + iadj*2]);
 }
@@ -236,12 +237,13 @@ module Tile02(){ ////toplevel
   posts = Rectangle_corners2posts(c);
   difference(){
     TileBase(c[0], c[2]);
+    InterlockEdge(c[1], c[2], 1);
   }
   Posts(posts);
   RoundEdge(c[0], c[1]);
   RoundEdge(c[3], c[0]);
   RoundLeftCorner(c[0], c[1]);
-  InterlockEdge(c[2], c[3], 0, 2);
+  InterlockEdge(c[2], c[3], 0);
 }
 
 module Tile12(){ ////toplevel
@@ -251,6 +253,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]);