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=27dd082680525fd4ae18caf791d23f7cc6946222;hp=8dff0175cffacb8f33dcd01b0b3d297a31bb073c;hb=ec1e26513776bab871a5531e5a03abd26e8c0a86;hpb=fb18d16dcdfc7c847372fd46dcced3705f1e37d7

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 8dff017..27dd082 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -30,38 +30,7 @@ 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,  ]
-			  ];
+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;
@@ -86,7 +55,7 @@ rearedge_len = 170;
 
 rearcurve_strt_len = 52;
 
-rearcurve_z_slop = 0.75;
+rearcurve_z_slop = -0.50;
 
 rearcurve_avoid_y = 35;
 
@@ -103,6 +72,15 @@ frontcurve_z_slop = 0.75;
 frontcurve_strt_len = 50;
 frontcurve_dualcurve_angle = 30;
 
+teststrapslots_at = [ [ 110, 70 ], [ 110, -35 ],
+		      [ 180, 90 ],
+		      [ 190, -80 ], // do not change index of this one
+		      [   0, 70 ],  [  0, -35 ],
+		      ];
+
+teststrap = [ 3, 5 ];
+teststrap_peg = [7.5, 3.5];
+
 // calculated
 
 TEST = false;
@@ -126,15 +104,13 @@ thehd_tl = [ -thehd_tr[0], thehd_tr[1] ];
 thehd_bl = -thehd_tr;
 thehd_br = -thehd_tl;
 
-tablet_z_slop = rearcurve_z_slop;
+tablet_z_slop = 0.25;
 
 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 )')
 
@@ -546,9 +522,33 @@ module Machine_Curves(){ ////toplevel
   }
 }
 
+module TestStrapSlots(){
+  pegwidth = teststrap_peg[0];
+  for (pos = teststrapslots_at) {
+    echo("TSS",pos);
+    translate(concat(pos,[0]))
+      for (mx = [0,1]) mirror([mx,0,0]) {
+	  translate([ pegwidth/2, -teststrap[1]/2, -20 ])
+	    cube(concat(teststrap,[40]));
+	}
+  }
+}
+
+module TestStrapPeg_any(l){ cube(concat([l],teststrap_peg)); }
+
+module TestStrapPeg_Short(){ ////toplevel
+  TestStrapPeg_any(35);
+}
+
+module TestStrapPeg_Long(){ ////toplevel
+  TestStrapPeg_any(60);
+}
+
 module Machine(){ ////toplevel
   Machine_Arm();
   Machine_Curves();
+  if (TEST)
+    TestStrapSlots();
 }
 
 module MachineEnvelope(){
@@ -771,7 +771,7 @@ module FitTest_general(c0,sz, dobrace=false, bracexx=0){
 }
 
 module FitTest_PairLink(cut=false){ ////toplevel
-  cy0=-55; cy1=85; cx=127;
+  cy0=-55; cy1=85; cx=132;
   bar = [10,10];
   legrad = 12;
   footrad_min = 1; footrad_max = 4; footrad_depth = 5;
@@ -797,7 +797,8 @@ module FitTest_PairLink(cut=false){ ////toplevel
 	    translate([0,0,-footrad_depth])
 	      cylinder(r= footrad_min, h=1);
 	  }
-	  translate([0,0,-10])
+	  if (cut)
+	    translate([0,0,-10])
 	    cylinder(r= footrad_min +
 		     adj_neg_slop * (footrad_max-footrad_min)/footrad_depth,
 		     h=20);
@@ -825,34 +826,40 @@ module FitTest_PairLink(cut=false){ ////toplevel
 
 module FitTest_RearCurve(){ ////toplevel
   difference(){
-    FitTest_general([110,0], [170,100]);
+    FitTest_general([100,0], [180,100]);
     FitTest_PairLink(true);
+    TestStrapSlots();
   }
 }
 
 module FitTest_FrontCurve(){ ////toplevel
-  p0 = [110,-80];
-  sz = [170,80];
+  p0 = [100,-80];
+  sz = [180,80];
   difference(){
     intersection() {
       Tile00();
       translate([0,0,-8]) linear_extrude(height=18) {
 	translate(p0) square(sz);
+	translate(teststrapslots_at[3])
+	  scale(2* [ teststrap_peg[0], teststrap[1] ])
+	  circle(r=1, $fn=20);
       }
     }
     FitTest_PairLink(true);
+    TestStrapSlots();
   }
 }
 
 module FitTest_Entire(){ ////toplevel
-  p0 = [-40,-80];
-  szrear = [270,180];
-  szfront = [250,szrear[1]];
+  p0 = [-33,-80];
+  szrear = [263,180];
+  szfront = [243,szrear[1]];
   difference(){
     FitTest_general(p0, szrear, dobrace=true, bracexx=0);
     FitTest_PairLink(true);
     translate(concat(p0,[0]) + [szfront[0],-10,-40])
       cube([100, -p0[1], 80]);
+    TestStrapSlots();
   }
   intersection(){
     FitTest_RearCurve();
@@ -866,8 +873,19 @@ module FitTest_EntireDemo(){ ////toplevel
   //%Tile00();
 }
 
+module FitTest_EndEnd(){ ////toplevel
+  p0 = [-32,-32];
+  sz = [188,113];
+  sz2 = [168,100];
+  difference(){
+    FitTest_general(p0, sz);
+    translate([ p0[0] -1, p0[1]+sz2[1], -10])
+      cube([ sz2[0] +1, 50, 20 ]);
+  }
+}
+
 module FitTest_PairDemo(){ ////toplevel
-  sh=[-100,-15,0];
+  sh=[-90,-15,0];
   translate(sh){
     FitTest_PairLink();
     %FitTest_FrontCurve();