sewing-table: Test: remove commitid (for perf)

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

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 045193c98bf7ae2d75cf0e9a95b15d295d897024..8dc10824e2fa81a396ae68a85719321b8ec01da9 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -123,6 +123,8 @@ 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;
 
@@ -181,8 +183,6 @@ module TileBase(botleft, topright){
       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]))
@@ -190,9 +190,12 @@ module TileBase(botleft, topright){
          translate(concat(botleft_post, [-1]))
            cube(concat(topright_post-botleft_post, [tile_th+2]));
        }
-       minkowski(){
-         Machine();
-         cube(max(test_edge, tile_hard_edge_hole_dist)*2, center=true);
+       shufflesz = max(test_edge, tile_hard_edge_hole_dist)*2;
+       hull(){ // poor man's minkowski
+         for (xs=[-1,1]) for (ys=[-1,1]) for (zs=[-1,1]) {
+           translate([xs,ys,zs] * shufflesz)
+             Machine();
+         }
        }
       }
     }
@@ -391,7 +394,7 @@ module Machine_Arm(){
   translate([0,0,-30]) linear_extrude(height=60) {
     translate(tile01_tr + [0, (-cutout_tile01_y + cutout_tile11_y)/2]) {
       intersection(){
-       translate([-100, -ysz/2])
+       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);
@@ -442,7 +445,9 @@ 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, 10 ]){
+    translate([ rearcurve_double_inrad,
+               0,
+               -rearcurve_double_inrad + 10 ]){
       rotate([180,0,0]) rotate([0,0,90]) linear_extrude(height=30){
        hull(){
          Machine_NewRearProfile();
@@ -492,7 +497,7 @@ module Machine_Curves(){ ////toplevel
     //%cube([20,20,20]);
     translate([ -reartablet_x,
                -1,
-               -reartablet_z])
+               -reartablet_z + tablet_z_slop])
       mirror([0,0,1])
       cube([ reartablet_x+1,
             reartablet_y+1,
@@ -551,17 +556,19 @@ 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){
+module FitTest_general(c0,sz, dobrace=false){
   c = Rectangle_corners(c0, sz);
   brace = [7,7,9];
   difference(){
     union(){
       Rectangle_TileBase(c);
-      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]);
+      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));
@@ -571,7 +578,7 @@ module FitTest_general(c0,sz){
 }
 
 module FitTest_Entire(){ ////toplevel
-  FitTest_general([-40,-80], [275,180]);
+  FitTest_general([-40,-80], [275,180], dobrace=true);
 }
 
 module FitTest_RearCurve(){ ////toplevel