From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 2 Jan 2017 13:30:47 +0000 (+0000)
Subject: Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=039b7c399df9bb3c1215dd52f5e80b9932febbd5;hp=de6a584419ddd96c0dc488519232ccdb23566c7d;p=reprap-play.git

Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play
---

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 0d1e813..018ab45 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -24,11 +24,22 @@ 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.125;
@@ -47,27 +58,29 @@ 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;
+module TileBase(botleft, topright){
+  size = topright - botleft;
+  botleft_post = botleft + thehd_tr;
+  topright_post = topright - thehd_bl;
+  echo(botleft_post, topright_post);
   difference(){
     mirror([0,0,1])
-      translate([botleft[0], botleft[1], 0])
-      cube([size[0], size[1], tile_th]);
-    translate( [ botleft_post[0], botleft_post[1], -tile_th ]
+      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
-			    + [0, thehd[0] ]
+			    + [0, thehd[1] ]
 			    + [-post_dia,-post_dia] );
   }
 }
 
-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);
@@ -81,27 +94,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])
@@ -113,7 +125,7 @@ module RoundLeftCorner(this_post, right_post) {
 module InterlockCore(r, plusth, ymir) {
   dx = sqrt(3) * r;
   $fn= 80;
-  translate([0, -thehd[0], plusth]){
+  translate([thehd[0], 0, plusth]){
     mirror([0,ymir,0]){
       mirror([0,0,1]){
 	linear_extrude(height=tile_th+plusth*2, convexity=10){
@@ -132,45 +144,53 @@ module InterlockCore(r, plusth, ymir) {
   }
 }
 
-module InterlockNegative(this_post, right_post) {
-  INREFFRAME(this_post, right_post)
+module InterlockNegative(this_cnr, right_cnr) {
+  INREFFRAME(this_cnr, right_cnr)
     InterlockCore(interlock_negative_rad, 1, 0);
 }
 
-module Interlock(this_post, right_post) {
-  INREFFRAME(this_post, right_post)
+module Interlock(this_cnr, right_cnr) {
+  INREFFRAME(this_cnr, right_cnr)
     InterlockCore(interlock_rad, 0, 1);
 }
 
+function TestPiece_holes2corners(holes) =
+  [ holes[0] + thehd_bl,
+    holes[1] + thehd_br,
+    holes[0] + thehd_tl,
+    holes[1] + thehd_tr ];
+
 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[3]);
+    InterlockNegative(corners[1], corners[3]);
   }
   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[2], corners[0]);
+  RoundLeftCorner(corners[0], corners[1]);
 }
 
 module TestPiece2(){ ////toplevel
   holes = [ [   0, 0],
 	    [  50, 0]
 	    ];
-  TileBase(holes[0], holes[1]);
+  corners = TestPiece_holes2corners(holes);
+  TileBase(corners[0], corners[3]);
   Posts(holes);
-  RoundEdge(holes[0], holes[1]);
-  Interlock(holes[0], holes[0] + [0, -1]);
+  RoundEdge(corners[0], corners[1]);
+  Interlock(corners[2], corners[0]);
 }
- 
-module Demo(){
-  translate([ -thehd[1], 0 ])
+
+module Demo(){ ////toplevel
+  translate([ -thehd[0], 0 ])
     color("blue")
     TestPiece1();
-  translate([ +thehd[1], 0 ])
+  translate([ +thehd[0], 0 ])
     TestPiece2();
 }