X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=tube-crossdrill-jig.scad;h=843a2a697123c8e10d87a0f882991cb80da2d8c2;hp=0b18eccd9269bb45729ce65a9c827dcbfce83b7b;hb=5e23e69b331496b565a584995d768c331f0176ab;hpb=7ac53be54265ee7ff2eaaf5e0bbaf7d585e94384

diff --git a/tube-crossdrill-jig.scad b/tube-crossdrill-jig.scad
index 0b18ecc..843a2a6 100644
--- a/tube-crossdrill-jig.scad
+++ b/tube-crossdrill-jig.scad
@@ -15,25 +15,26 @@ tubetubetopslop=1;
 
 boltholedia = 6.5 + 0.5;
 boltholeslotshorter = 6;
-mainframeholedia = 5 + 0.5;
+mainframeholedia = 5 + 1.0;
 
 // "slot" refers to the things in the base of the drill press stand
-backslotedgespace = 55;
-slotwidth = 11.5;
+backslotedgespace = 59;
+slotwidth = 11.5 - 0.5;
 backslotmid2screwhole = 17;
 slotplugheight = 5.5;
-slotplugshorterlen = 8;
-slotpluglongerlen = 18;
+slotplugshorterlen =10;
+slotpluglongerlen = 20;
 
-slotslope = 11.0 / 18.5;
+//slotslope = 11.0 / 18.5;
+slotslope = 1 / tan(51);
 
 // "keepslot" refers to the screws in the wooden jig block
 keepslotstartz = 20;
-keepslotlen = 25;
+keepslotlen = 18;
 keepslotx = backslotedgespace / 2;
 keepslotwidth = 4;
 
-mainframeextraside = 15;
+mainframeextraside = 12;
 mainframeextrafront = 15;
 
 rearwallstrengthwidth = 10;
@@ -41,22 +42,21 @@ keepslotclear = 10;
 
 // computed values
 
-mainframeholex = backslotedgespace/2 + slotwidth/sqrt(2) +
-  backslotmid2screwhole / sqrt(2);
-
-mainframeholey = -backslotmid2screwhole / sqrt(2);
-
-mainframemaxx = mainframeholex + mainframeextraside;
-mainframeminy = mainframeholey - mainframeextrafront;
-mainframemaxz = keepslotstartz + keepslotlen;
-
 slotslopediag = sqrt(1 + slotslope*slotslope);
 slotwidthx = slotwidth * slotslopediag;
 
 slotxperlen = slotslope / slotslopediag;
 slotyperlen =         1 / slotslopediag;
 
-echo(slotslope, slotslopediag, slotwidthx);
+mainframeholex = backslotedgespace/2 + slotpluglongerlen * slotxperlen
+  + 0.5 * slotwidth * slotyperlen;
+
+mainframeholey = -slotpluglongerlen * slotyperlen
+  + 0.5 * slotwidth * slotxperlen;
+
+mainframemaxx = mainframeholex + mainframeextraside;
+mainframeminy = mainframeholey - mainframeextrafront;
+mainframemaxz = keepslotstartz + keepslotlen;
 
 module MainFrame(){
   for (m=[0,1]) {