sewing-table: JIG: Introduce, currently just like TEST

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

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index a8cd185a96a1064cd0e44e3d074fc47d186a574f..a4c9fca9cab81c70ee4cc7581a828c91a106b08d 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -34,11 +34,9 @@ machine_rear_to_front = 84 + 0.25 - 1.4;
 
 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_new_x_slop = 1.4 - 1.95;
 cutout_l_end_y_total = cutout_l_end_y
   + cutout_l_end_y_front_slop + cutout_l_end_y_rear_slop;
@@ -47,7 +45,6 @@ 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
@@ -86,6 +83,7 @@ teststrap_peg = [7.5, 3.5];
 // calculated
 
 TEST = false;
+JIG = false;
 
 ply_edge_hole_dist = ply_edge_min + ply_hole_dia/2;
 
@@ -125,7 +123,7 @@ module Post(){
        cylinder(r= screw_dia/2, h= ply_th, $fn=20);
       }
     }
-    if (TEST) {
+    if (TEST || JIG) {
       translate([0,0, tile_th/2]) {
        cube([post_dia,      POST_TCROSSSZ, tile_th], center=true);
        cube([POST_TCROSSSZ, post_dia,      tile_th], center=true);
@@ -149,7 +147,7 @@ module TileBase(botleft, topright){
     mirror([0,0,1])
       translate(concat(botleft, [0]))
       cube(concat(size, [tile_th]));
-    if (!TEST) {
+    if (!(TEST || JIG)) {
       cidsz = topright_post-botleft_post
        + [-post_dia,-post_dia]
        + [0, thehd[1]];
@@ -160,7 +158,7 @@ module TileBase(botleft, topright){
                 + 0.5 * concat( cidsz - cidszr, [ 0 ]) )
        Commitid_BestCount_M(cidszr);
     }
-    if (TEST) {
+    if ((TEST || JIG)) {
       crossoff = tile_hard_edge_hole_dist + POST_TCROSSSZ/2;
       cidsz = [ thehd[0], size[1] - 2*crossoff ];
       cidszr = [ cidsz[0], min(cidsz[1], 50) ];
@@ -411,24 +409,6 @@ module TestDemo(){ ////toplevel
     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_NewRearProfile(){
   // figures copied out of xfig edit boxes
   // best not to edit the posbox size if poss - just move it
@@ -622,7 +602,7 @@ module TestStrapPeg_Long(){ ////toplevel
 module Machine(){ ////toplevel
   Machine_NewArm();
   Machine_Curves();
-  if (TEST)
+  if (TEST || JIG)
     TestStrapSlots();
 }
 
@@ -949,9 +929,9 @@ module FitTest_EntireDemo(){ ////toplevel
 }
 
 module FitTest_EndEnd(){ ////toplevel
-  p0 = [-32,-32];
-  sz = [188,113];
-  sz2 = [168,100];
+  p0 = [-30,-32];
+  sz = [156,81] - p0;
+  sz2 = [136,68] - p0;
   difference(){
     FitTest_general(p0, sz);
     translate([ p0[0] -1, p0[1]+sz2[1], -10])