chiark / gitweb /
sewing-table: RoundCorner rework: correct centre
[reprap-play.git] / sewing-table.scad.m4
index 1edc2b7bb8e4f69e16119454a6a93aeeb6ca8c5b..3132b11658153ebe30aa0ce3356dd20d24974bae 100644 (file)
@@ -28,6 +28,81 @@ interlock_fine_lenslop = 1.0;
 
 demo_slop = 0.1;
 
+// cutout
+
+machine_rear_to_front = 85;
+
+machine_rear_profile = [
+                       [ -  0,  -0.00 ],
+                       [ -  2,  -0.10 ],
+                       [ -  4,  -0.20 ],
+                       [ -  5,  -0.30 ],
+                       [ -  6,  -0.40 ],
+                       [ -  7,  -0.50 ],
+                       [ -  8,  -0.75 ],
+                       [ - 10,  -1.50 ],
+                       [ - 12,  -2.25 ],
+                       [ - 14,  -3.25 ],
+                       [ - 16,  -4.25 ],
+                       [ - 18,  -5.75 ],
+                       [ - 20,  -8.00 ]
+                       ];
+
+machine_front_profile =  [
+                         [  128,  -3.70,  ],
+                         [  124,  -2.90,  ],
+                         [  120,  -2.45,  ],
+                         [  116,  -2.10,  ],
+                         [  112,  -1.80,  ],
+                         [  108,  -1.55,  ],
+                         [  104,  -1.25,  ],
+                         [  100,  -1.00,  ],
+                         [   96,  -0.80,  ],
+                         [   92,  -0.65,  ],
+                         [   88,  -0.55,  ],
+                         [   84,  -0.50,  ]
+                         ];
+
+cutout_l_end_y_front_slop = 0.5;
+cutout_l_end_y_rear_slop = 0.5;
+cutout_l_end_x_slop = 0.25;
+
+cutout_l_end_x = 22;
+cutout_l_end_y = machine_rear_to_front;
+cutout_l_end_curve = 1;
+cutout_l_end_y_total = cutout_l_end_y
+  + cutout_l_end_y_front_slop + cutout_l_end_y_rear_slop;
+
+tile02_tr = [-250, 0];
+tile01_tr = [  0, 0];
+
+cutout_tile01_y = 170 - 147 + cutout_l_end_y_front_slop;
+cutout_tile11_x = cutout_l_end_x + cutout_l_end_curve;
+cutout_tile11_y = cutout_l_end_y_total - cutout_tile01_y;
+
+// front and rear curves
+
+rearedge_len = 170;
+
+rearcurve_strt_len = 52;
+
+rearcurve_z_slop = 0.75;
+
+rearcurve_avoid_y = 35;
+
+rearcurve_double_inrad = 26.10 + 8.04;
+
+reartablet_z = 2.54;
+reartablet_x = 5 + 1;
+reartablet_y = 8;
+
+frontcurve_side_skew = 3.5 / 72;
+frontcurve_avoid_y = 70;
+frontcurve_z_slop = 0.75;
+
+frontcurve_strt_len = 60;
+frontcurve_dualcurve_angle = 90 - 65;
+
 // calculated
 
 TEST = false;
@@ -51,11 +126,18 @@ thehd_tl = [ -thehd_tr[0], thehd_tr[1] ];
 thehd_bl = -thehd_tr;
 thehd_br = -thehd_tl;
 
+tablet_z_slop = rearcurve_z_slop;
+
 interlock_rad = interlock_dia/2;
 interlock_negative_rad = interlock_rad + 0.125;
 
 interlock_sq_adj = 0.2; // arbitrary
 
+first_front = machine_front_profile[len(machine_front_profile)-1];
+
+m4_define(`POST_TCROSSSZ',
+          `2*( tile_hard_edge_hole_dist - test_edge + 1 )')
+
 module Post(){
   mirror([0,0,1]) {
     difference(){
@@ -66,10 +148,9 @@ module Post(){
       }
     }
     if (TEST) {
-      tsz = tile_hard_edge_hole_dist - test_edge + 1;
       translate([0,0, tile_th/2]) {
-       cube([post_dia, tsz*2, tile_th], center=true);
-       cube([tsz*2, post_dia, tile_th], center=true);
+       cube([post_dia,      POST_TCROSSSZ, tile_th], center=true);
+       cube([POST_TCROSSSZ, post_dia,      tile_th], center=true);
       }
     }
   }
@@ -91,20 +172,34 @@ module TileBase(botleft, topright){
       translate(concat(botleft, [0]))
       cube(concat(size, [tile_th]));
     if (!TEST) {
+      cidsz = topright_post-botleft_post
+       + [-post_dia,-post_dia]
+       + [0, thehd[1]];
+      cidszr = [ min(cidsz[0],50), min(cidsz[1],50) ];
+      echo("CID",cidsz,cidszr);
       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]]);
+                + 0.5 * [ post_dia, post_dia, 0 ]
+                + 0.5 * concat( cidsz - cidszr, [ 0 ]) )
+       Commitid_BestCount_M(cidszr);
     }
     if (TEST) {
-      translate( concat(botleft + [thehd[0], 0], [0]) )
-       Commitid_BestCount([ size[0] - thehd[0]*2, thehd[1] ]);
-      mirror([0,0,1]) {
-       translate(concat(botleft + [test_edge,test_edge], [test_tile_th]))
-         cube(concat(size - [test_edge,test_edge]*2, [tile_th]));
-       translate(concat(botleft_post, [-1]))
-         cube(concat(topright_post-botleft_post, [tile_th+2]));
+      crossoff = tile_hard_edge_hole_dist + POST_TCROSSSZ/2;
+      cidsz = [ thehd[0], size[1] - 2*crossoff ];
+      cidszr = [ cidsz[0], min(cidsz[1], 50) ];
+      translate( concat(botleft + [0, crossoff] + (cidsz-cidszr)/2, [0]) )
+       Commitid_BestCount(cidszr);
+      difference(){
+       mirror([0,0,1]) {
+         translate(concat(botleft + [test_edge,test_edge], [test_tile_th]))
+           cube(concat(size - [test_edge,test_edge]*2, [tile_th]));
+         translate(concat(botleft_post, [-1]))
+           cube(concat(topright_post-botleft_post, [tile_th+2]));
+       }
+       shufflesz = max(test_edge, tile_hard_edge_hole_dist)*2;
+       minkowski(){
+         MachineEnvelope();
+         cube(shufflesz, center=true);
+       }
       }
     }
   }
@@ -142,28 +237,62 @@ module RoundEdge(left_cnr, right_cnr) {
   }
 }
 
-module RoundCornerCut(ci) {
-  // ci should be [this_cnr, right_cnr]
-  // where right_cnr is to the right (ie, anticlockwise)
+m4_define(`ROUNDCORNER_VARS',`
   this_cnr = ci[0];
   right_cnr = ci[1];
-  offr= round_cnr_rad - round_edge_rad;
-  INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
-    difference(){
-      cube(offr*2 - 0.1, center=true);
-      translate([offr, offr, 0])
-       cylinder(center=true, h=20, r= offr);
+  left_cnr = ci[2];
+  bigr= round_cnr_rad - round_edge_rad;
+  l_uvec = unitvector2d(left_cnr - this_cnr);
+  r_uvec = unitvector2d(right_cnr - this_cnr);
+  lp1 = left_cnr  + clockwise2d(l_uvec) * bigr;
+  lp2 = this_cnr  + clockwise2d(l_uvec) * bigr;
+  lp3 = this_cnr  - clockwise2d(r_uvec) * bigr;
+  lp4 = right_cnr - clockwise2d(r_uvec) * bigr;
+  ctr = line_intersection_2d(lp1,lp2,lp3,lp4)
+')
+
+module RoundCorner_selector(ci, adj) {
+  ROUNDCORNER_VARS;
+  echo("RCS",l_uvec,ctr);
+  union(){
+    INREFFRAME(this_cnr, right_cnr) {
+      cube(bigr*2 + adj, center=true);
+    }
+  }
+  %translate(concat(ctr,[0])) circle(1);
+  if(0){
+  union(){
+    INREFFRAME(this_cnr, right_cnr) {
+//      %translate([ -bigr,-bigr,0 ])
+//     cube([bigr*2 + adj, bigr*3, bigr*2]);
+    }
+  }
+  union(){
+    INREFFRAME(this_cnr, left_cnr) {
+      %translate([ -bigr,-bigr,0 ])
+      cube(bigr*2 + adj);
+    }
+  }}
+}
+
+module RoundCornerCut(ci) {
+  // ci should be [this_cnr, right_cnr, left_cnr]
+  // where right_cnr is to the right (ie, anticlockwise)
+  ROUNDCORNER_VARS;
+  difference(){
+    RoundCorner_selector(ci, -0.1);
+    INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
+      translate([bigr, bigr, 0])
+       cylinder(center=true, h=20, r= bigr);
     }
   }
 }
 
 module RoundCornerAdd(ci) {
-  this_cnr = ci[0];
-  right_cnr = ci[1];
-  bigr = round_cnr_rad - round_edge_rad;
-  INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
-    intersection(){
-      cube(bigr*2 + 0.1, center=true);
+  ROUNDCORNER_VARS;
+  intersection(){
+    RoundCorner_selector(ci, +0.1);
+    INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
       translate([bigr, bigr, 0])
        rotate_extrude(convexity=10, $fn=50)
        translate([bigr, 0])
@@ -292,7 +421,166 @@ module TestDemo(){ ////toplevel
   translate([ +thehd[0] + demo_slop, 0 ])
     TestPiece2();
 }
+
+module Machine_Arm(){
+  ysz = cutout_l_end_y_total;
+  // assume the round end is arc of a circle
+  chordlen = dist2d([0,0], [ cutout_l_end_y, cutout_l_end_curve ]);
+  endrad = cutout_l_end_y / cutout_l_end_curve * chordlen;
   
+  translate([0,0,-30]) linear_extrude(height=60) {
+    translate(tile01_tr + [0, (-cutout_tile01_y + cutout_tile11_y)/2]) {
+      intersection(){
+       translate([-50, -ysz/2])
+         square([400, ysz]);
+       translate([ endrad - cutout_tile11_x - cutout_l_end_x_slop, 0 ])
+         circle(r=endrad, $fa=0.01,$fd=5);
+      }
+    }
+  }
+}
+
+module Machine_Profile(){
+  first_rear = machine_rear_profile[0];
+  below_point = 0.5 * ( first_rear + first_front ) + [ 0, -10 ];
+  pol = concat( machine_rear_profile,
+               [ below_point ],
+               machine_front_profile);
+  skew_angle = atan2( first_front[1] - first_rear[1],
+                     first_front[0] - first_rear[0] );
+  //echo(below_point, pol, skew_angle);
+  hull(){
+    for (z=[0,-40]) {
+      translate([0,z]) {
+       //scale([1,5])
+       rotate([0,0, -skew_angle ]){
+         //translate( - first_front )
+         polygon(pol);
+       }
+      }
+    }
+  }
+}
+
+module Machine_NewRearProfile(){
+  // figures copied out of xfig edit boxes
+  // best not to edit the posbox size if poss - just move it
+  posbox = 10 * ([7.2333,-14.1267] - [-16.2289,40.0289]); // box, Green
+  sideline = -10 * ([-6.2400,13.5600] - [-2.4467,28.2556]); // line, Blue
+  scaleline = 10 * dist2d([-1.1911,-20.4800], [-11.2600,4.0578]); // Green2
+  scaleline_mm = 12+5+10+5+3;
+  sh = -[abs(posbox[0]), abs(posbox[1])];
+  rot = atan2(-sideline[0], sideline[1]);
+  sc = scaleline_mm / scaleline;
+  //echo("SH",sh,rot,sc);
+  scale(sc) rotate(rot) translate(sh){
+    import("sewing-table-rear-profile.dxf", convexity=10); // spline, Pink3
+  }
+}
+
+module Machine_NewRearCurve(){
+  slant = atan2(4,210-10);
+  //echo("SL",slant);
+  translate([0,0, rearcurve_double_inrad]) rotate([slant,0,0]){
+    translate([ rearcurve_double_inrad,
+               0,
+               -rearcurve_double_inrad + 10 ]){
+      rotate([180,0,0]) rotate([0,0,90]) linear_extrude(height=30){
+       hull(){
+         Machine_NewRearProfile();
+         translate([0,-100]) Machine_NewRearProfile();
+       }
+      }
+    }
+    rotate([0,90,0]) rotate([90,0,0]) {
+      intersection(){
+       rotate_extrude(convexity=10, $fn=64)
+         rotate(90)
+         translate([ 0, -rearcurve_double_inrad ])
+         Machine_NewRearProfile();
+       translate([0,0,-500])
+         cube([500,500,1000]);
+      }
+    }
+    translate([1,0,-rearcurve_double_inrad])
+      rotate([0,-90,0]) rotate([0,0,-90])
+      linear_extrude(height= rearcurve_strt_len + 1)
+      Machine_NewRearProfile();
+  }
+}
+
+module Machine_RearProfile(){ ////toplevel
+  intersection(){
+    Machine_Profile();
+    translate([ -200 + machine_rear_to_front/2, -100 ]) {
+      square([200,200]);
+    }
+  }
+}
+
+module Machine_FrontProfile(){
+  intersection(){
+    Machine_Profile();
+    translate([ machine_rear_to_front/2, -100 ]) {
+      square([200,200]);
+    }
+  }
+}
+
+module Machine_Curves(){ ////toplevel
+  translate([ tile01_tr[0] - cutout_l_end_x + rearedge_len,
+             cutout_tile11_y,
+             0 ]){
+    //%cube([20,20,20]);
+    translate([ -reartablet_x,
+               -1,
+               -reartablet_z + tablet_z_slop])
+      mirror([0,0,1])
+      cube([ reartablet_x+1,
+            reartablet_y+1,
+            20 ]);
+  }
+  translate([ tile01_tr[0] - cutout_l_end_x + rearedge_len,
+             cutout_tile11_y,
+             frontcurve_z_slop ]){
+    translate([ 0, -first_front[0] , 0 ])
+      multmatrix([[1, -frontcurve_side_skew, 0, 0],
+                 [0,  1,   0, 0],
+                 [0,  0,   1, 0],
+                 [0,  0,   0, 1]])
+      translate([ 0, first_front[0] , 0 ])
+      mirror([1,0,0]){
+      rotate([0,-90,0])rotate([0,0,-90]){
+       linear_extrude(height= 200)
+         Machine_FrontProfile();
+      }
+    }
+    translate([ rearcurve_strt_len,
+               0,
+               rearcurve_z_slop ]){
+      Machine_NewRearCurve();
+    }
+  }
+}
+
+module Machine(){ ////toplevel
+  Machine_Arm();
+  Machine_Curves();
+}
+
+module MachineEnvelope(){
+  // used for testing
+  p_arm_bl = [-cutout_tile11_x, -cutout_tile01_y];
+  y_arm_t  = cutout_tile11_y;
+  p_crv_fl = p_arm_bl + [rearedge_len, -frontcurve_avoid_y];
+  y_crv_b  = y_arm_t + rearcurve_avoid_y;
+
+  translate([0,0,-50]) linear_extrude(height= 100){
+    translate(p_arm_bl) square([400, y_arm_t] - p_arm_bl);
+    translate(p_crv_fl) square([400, y_crv_b] - p_crv_fl);
+  }
+}
+
 function Rectangle_corners(c0, sz) =
   // returns the corners of a rectangle from c0 to c0+sz
   // if sz is positive, the corners are anticlockwise starting with c0
@@ -307,6 +595,10 @@ function Rectangle_corners2posts(c) =
     c[2] + thehd_bl,
     c[3] + thehd_br ];
 
+module Rectangle_TileBase(c) { TileBase(c[0], c[2]); }
+
+function Posts_interpolate_one(c0,c1) = [c0, (c0+c1)/2, c1];
+
 m4_dnl   R_EDGE(c,ix)
 m4_dnl        c is from Rectangle_corners and
 m4_dnl        ix is a corner number
@@ -314,15 +606,44 @@ m4_dnl    expands to two comma-separated corners:
 m4_dnl    that denoted by ix, and the next one anticlockwise
 m4_define(`R_EDGE',`$1[$2],$1[(($2)+1)%4]')
 
+module FitTest_general(c0,sz, dobrace=false){
+  c = Rectangle_corners(c0, sz);
+  brace = [7,7,9];
+  difference(){
+    union(){
+      Rectangle_TileBase(c);
+      if (dobrace) {
+       translate(concat(c0, [-brace[2] + 0.1])){
+         difference(){
+           cube(concat(sz,[brace[2]]) - [5,0,0]);
+           translate(brace + [0,0, -25])
+             cube(concat(sz, [50]) - brace*2 + [10,0,0]);
+         }
+       }
+      }
+      RoundEdge(R_EDGE(c,1));
+    }
+    Machine();
+  }
+}
+
+module FitTest_Entire(){ ////toplevel
+  FitTest_general([-40,-80], [275,180], dobrace=true);
+}
+
+module FitTest_RearCurve(){ ////toplevel
+  FitTest_general([110,0], [170,100]);
+}
+
 module Tile02(){ ////toplevel
   sz = [100,170];
-  c0 = -sz;
+  c0 = tile02_tr + -sz;
   c = Rectangle_corners(c0, sz);
   posts = Rectangle_corners2posts(c);
-  rcs = [c[0], c[1]];
+  rcs = [R_EDGE(c,0)];
   difference(){
     union(){
-      TileBase(c[0], c[2]);
+      Rectangle_TileBase(c);
       Posts(posts);
       RoundEdge(R_EDGE(c,0));
       RoundEdge(R_EDGE(c,3));
@@ -336,28 +657,194 @@ module Tile02(){ ////toplevel
 
 module Tile12(){ ////toplevel
   sz = [100,250];
-  c0 = [-sz[0], 0];
+  c0 = tile02_tr + [-sz[0], 0];
   c = Rectangle_corners(c0, sz);
   posts = Rectangle_corners2posts(c);
-  rcs = [c[3], c[0]];
+  rcs = [R_EDGE(c,3)];
   difference(){
     union(){
-      TileBase(c[0], c[2]);
+      Rectangle_TileBase(c);
+      Posts(posts);
       RoundEdge(R_EDGE(c,2));
       RoundEdge(R_EDGE(c,3));
-      Posts(posts);
     }
     InterlockEdge(R_EDGE(c,0), 1);
+    InterlockEdge(R_EDGE(c,1), 1);
+    RoundCornerCut(rcs);
+  }
+  RoundCornerAdd(rcs);
+}
+
+tile_01_11_cnr = tile01_tr + [-cutout_tile11_x, 0];
+tile_11_10_cnr = tile01_tr + [0, cutout_tile11_y];
+tile_01_00_cnr = tile01_tr - [0, cutout_tile01_y];
+
+module Tile11(){ ////toplevel
+  sz = [250,250];
+  c0 = tile01_tr + [-sz[0],0];
+  c = Rectangle_corners(c0, sz);
+  cnr_posts = Rectangle_corners2posts(c);
+  posts = concat(
+                Posts_interpolate_one(cnr_posts[0],
+                                      cnr_posts[1] - [cutout_tile11_x, 0]),
+                [ cnr_posts[1] + [0, cutout_tile11_y],
+                  cnr_posts[2],
+                  cnr_posts[3]
+                  ]);
+  difference(){
+    union(){
+      Rectangle_TileBase(c);
+      Posts(posts);
+      RoundEdge(R_EDGE(c,2));
+      InterlockEdge(R_EDGE(c,3));
+    }
+    InterlockEdge(c[0], tile_01_11_cnr, 1);
+    InterlockEdge(tile_11_10_cnr, c[2], 1);
+    Machine();
+  }
+}    
+
+module Tile01(){ ////toplevel
+  sz = [250,170];
+  c0 = tile01_tr + -sz;
+  c = Rectangle_corners(c0, sz);
+  cnr_posts = Rectangle_corners2posts(c);
+  posts = concat(
+                Posts_interpolate_one(R_EDGE(cnr_posts,0)),
+                [ cnr_posts[2] + [0, -cutout_tile01_y] ],
+                Posts_interpolate_one(cnr_posts[2] - [cutout_tile11_x, 0],
+                                      cnr_posts[3])
+                );
+  difference(){
+    union(){
+      Rectangle_TileBase(c);
+      Posts(posts);
+      RoundEdge(R_EDGE(c,0));
+      InterlockEdge(tile_01_11_cnr, c[3]);
+      InterlockEdge(R_EDGE(c,3));
+    }
+    InterlockEdge(c[1], tile_01_00_cnr, 1);
+    Machine();
+  }
+}    
+
+module Tile10(){ ////toplevel
+  sz = [250,250];
+  c0 = tile01_tr + [0,0];
+  c = Rectangle_corners(c0, sz);
+  cnr_posts = Rectangle_corners2posts(c);
+  cty = cutout_tile11_y;
+  rcy = cty + rearcurve_avoid_y;
+  posts = [ cnr_posts[0] + [ 0,                             cty ],
+           cnr_posts[1] + [ -sz[0] + 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(c[3], tile_11_10_cnr);
+    }
     RoundCornerCut(rcs);
+    Machine();
   }
   RoundCornerAdd(rcs);
 }
 
+module Tile00(){ ////toplevel
+  sz = [250,170];
+  c0 = tile01_tr + [0,-sz[1]];
+  c = Rectangle_corners(c0, sz);
+
+  // the edge c[1]..c[2] needs a diagonal chunk, from c1bis to c2bis
+  c2bis = [ -cutout_l_end_x + rearedge_len + frontcurve_strt_len, c[2][1] ];
+  c1bis = [ c[1][0],
+           c[2][1] -
+           (c[2][0] - c2bis[0]) * tan(90 - frontcurve_dualcurve_angle) ];
+
+  cnr_posts = Rectangle_corners2posts(c);
+  cty = cutout_tile01_y;
+  rcy = cty + frontcurve_avoid_y;
+  posts = [ cnr_posts[0],
+           cnr_posts[1],
+           cnr_posts[2] + [ 0,                             -rcy ],
+           cnr_posts[2] + [ -sz[0] + rearedge_len - cutout_l_end_x, -cty ],
+           cnr_posts[3] + [ 0,                             -cty ]
+           ];
+  rcs = [R_EDGE(c,1)];
+  difference(){
+    union(){
+      difference(){
+       union(){
+         Rectangle_TileBase(c);
+         Posts(posts);
+         RoundEdge(R_EDGE(c,0));
+         RoundEdge(c[1], c1bis);
+         InterlockEdge(tile_01_00_cnr, c[0]);
+       }
+       RoundCornerCut(rcs);
+       translate([0,0,-20]) linear_extrude(height=40) {
+         polygon([ c1bis, c1bis + [50,0], c2bis + [50,0], c2bis ]);
+       }
+      }
+      RoundEdge(c1bis, c2bis);
+    }
+    Machine();
+  }
+  RoundCornerAdd(rcs);
+  RoundCornerAdd([c1bis,c2bis,c[1]]);
+}
+
+module FitTest_FrontCurve(){ ////toplevel
+  p0 = [110,-80];
+  sz = [170,80];
+  intersection() {
+    Tile00();
+    translate([0,0,-8]) linear_extrude(height=18) {
+      translate(p0) square(sz);
+    }
+  }
+}
+
+module RoundCornerDemo_plat(cnr){
+  mirror([0,0,1]) linear_extrude(height=1) polygon(cnr);
+}
+
+module RoundCornerDemo(){ ////toplevel
+  cnr = [ [0,0], [15,0], [-10,12] ];
+  translate([0,25,0]) RoundCornerDemo_plat(cnr);
+  translate([25,0,0]) RoundCornerAdd(cnr);
+  translate([-25,0,0]) RoundCornerCut(cnr);
+  translate([0,-25,0]) RoundCorner_selector(cnr, 0);
+  difference(){
+    RoundCornerDemo_plat(cnr);
+    RoundCornerCut(cnr);
+  }
+  RoundCornerAdd(cnr);
+}
+
 module Demo(){ ////toplevel
   translate(demo_slop*[-2,1]) color("blue") Tile12();
   translate(demo_slop*[-2,0]) color("red")  Tile02();
+  translate(demo_slop*[-2,1]) color("orange") Tile11();
+  translate(demo_slop*[-2,0]) color("purple") Tile01();
+  translate(demo_slop*[-3,1]) color("blue")   Tile10();
+  translate(demo_slop*[-3,0]) color("red")    Tile00();
+  %Machine();
 }
   
 //TestPiece1();
 //TestPiece2();
 //Demo();
+
+//Machine_Profile();
+//Machine_NewRearProfile();
+//Machine_NewRearCurve();
+//Machine_Curves();
+//Machine();
+//FitTest();
+//MachineEnvelope();