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=45694567c8e9474010d5d1fcd84d89883df27abb;hp=b4ec95486dd3a837aef686944e5b303e76b96ad6;hb=d1489b3e53832d6a8efa84061258c99e1ff575ac;hpb=464ea5bfb20555916aa523b6d2745805347b4245

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index b4ec954..4569456 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -58,6 +58,10 @@ rearcurve_rad_slop = 0.5;
 
 rearcurve_avoid_y = rearcurve_rad + 10;
 
+reartablet_z = 2.54;
+reartablet_x = 5 + 1;
+reartablet_y = 5;
+
 // calculated
 
 TEST = false;
@@ -347,39 +351,51 @@ module Machine_Arm(){
   }
 }
 
-module Machine_Rear(){
+module Machine_Rear(){ ////toplevel
   big_rad = rearcurve_total_len - rearcurve_strt_len + rearcurve_rad;
   small_rad = rearcurve_rad + rearcurve_rad_slop;
-  translate([ 250 + rearedge_len - cutout_l_end_y + big_rad,
+  translate([ 250 - cutout_l_end_x + rearedge_len,
 	      cutout_tile11_y,
 	      0 ]){
-    translate([ 0,
+    //%cube([20,20,20]);
+    translate([ -reartablet_x,
+	        -1,
+	        -reartablet_z])
+      mirror([0,0,1])
+      cube([ reartablet_x+1,
+	     reartablet_y+1,
+	     20 ]);
+    translate([ rearcurve_strt_len,
 		0,
-		-rearcurve_rad
-		]){
-      rotate([0,-90,0]){
-	rotate([0,0, 360/8/2])
-	  cylinder(r = small_rad, h= rearcurve_strt_len);
+		0 ]){
+      translate([ 0,
+		  0,
+		  -rearcurve_rad
+		  ]){
+	rotate([0,-90,0]){
+	  rotate([0,0, 360/8/2])
+	    cylinder(r = small_rad, h= rearcurve_strt_len);
+	}
       }
-    }
-    translate([ 0,
-		0,
-		big_rad - rearcurve_rad ]) {
-      intersection(){
-	rotate([90,0,0]){
-	  rotate_extrude(convexity=10) {
-	    translate([ big_rad,
-			0 ]) {
-	      hull(){
-		circle(r= small_rad);
-		translate([200,0])
+      translate([ 0,
+		  0,
+		  big_rad - rearcurve_rad ]) {
+	intersection(){
+	  rotate([90,0,0]){
+	    rotate_extrude(convexity=10) {
+	      translate([ big_rad,
+			  0 ]) {
+		hull(){
 		  circle(r= small_rad);
+		  translate([200,0])
+		    circle(r= small_rad);
+		}
 	      }
 	    }
 	  }
+	  mirror([0,0,1])
+	    cube([150,150,150]);
 	}
-	mirror([0,0,1])
-	  cube([150,150,150]);
       }
     }
   }
@@ -516,22 +532,24 @@ module Tile10(){ ////toplevel
   cnr_posts = Rectangle_corners2posts(c);
   cty = cutout_tile11_y;
   rcy = cty + rearcurve_avoid_y;
-  posts = [ cnr_posts[0] + [ 0,                              cty ],
-	    cnr_posts[1] + [ -rearedge_len + cutout_l_end_x, rcy ],
-	    cnr_posts[1] + [ 0,                              rcy ],
+  posts = [ cnr_posts[0] + [ 0,                             cty ],
+	    cnr_posts[1] + [ -sz[1] + rearedge_len - cutout_l_end_x, cty ],
+	    cnr_posts[1] + [ 0,                             rcy ],
 	    cnr_posts[2],
 	    cnr_posts[3] ];
+  rcs = [R_EDGE(c,2)];
   difference(){
     union(){
       Rectangle_TileBase(c);
       Posts(posts);
+      RoundEdge(R_EDGE(c,1));
       RoundEdge(R_EDGE(c,2));
-      //InterlockEdge(tile_01_11_cnr, c[3]);
-      //InterlockEdge(R_EDGE(c,3));
+      InterlockEdge(c[3], tile_11_10_cnr);
     }
-    //InterlockEdge(c[1], tile_01_00_cnr, 1);
+    RoundCornerCut(rcs);
     Machine();
   }
+  RoundCornerAdd(rcs);
 }
 
 module Demo(){ ////toplevel