X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=filamenttrestle.scad;h=0f99442f9b21eee95b568422da46d747c4d93dbd;hb=d75298b3556ecdb4214396adfaeb8a4225905461;hp=1ef23fe477fca319dc8992b9672dadac100ebe00;hpb=9d7f5e67ca35ab63a97340aa2af4d6ee33afa8e0;p=reprap-play.git

diff --git a/filamenttrestle.scad b/filamenttrestle.scad
index 1ef23fe..0f99442 100644
--- a/filamenttrestle.scad
+++ b/filamenttrestle.scad
@@ -12,7 +12,8 @@ barradz = 7;
 guidewidth = 3;
 guiderad = 20;
 
-plugl = 12;
+legw = 12;
+plugl = 16;
 plugwmin = 3;
 plugh = 10;
 plugslope = 0.5;
@@ -22,18 +23,22 @@ trestlelegw = 10;
 trestlebaseh = 10;
 trestleplugd = 1;
 
-topcylthick = 3;
-topcylbasedepth = 4;
+topblockthick = 4;
+topblockbasedepth = 4;
 
-pindr = 0.5;
-pinholeminr = 1.0 + pindr;
-pinholemaxr = 1.5 + pindr;
+pinbasew = 3;
+pinminh = 1.5;
+pinmaxh = 4.0;
+pindh = 1.0;
+pindwidth = 1.0;
 
 module Plug(d=0){
-  a = -atan(plugslope);
-  tdx = d * cos(a);
-  tdy = d * sin(a);
-  bdx = d / cos(a);
+  dw = d;
+  dh = d;
+  a = atan(plugslope);
+  bdx = dw / cos(a);
+  tdy = dh;
+  tdx = bdx + dh * plugslope;
   translate([-d,0,0]) rotate([90,0,90]) linear_extrude(height=plugl+0.1+d*2){
     polygon([[-(plugwmin/2 + bdx),  0],
 	     [-(plugwmax/2 + tdx),  plugh + tdy],
@@ -68,7 +73,10 @@ module Bar(){
 module Trestle(){
   legang = atan2(trestlebase/2, trestleheight);
   eplen = sqrt(trestleheight*trestleheight + trestlebase*trestlebase*0.25);
-  topcylw = plugwmax + topcylthick*2;
+  topblockw = plugwmax + trestleplugd*2 + topblockthick*2;
+
+  pinholebasew = pinbasew + pindwidth*2;
+  pinholeh =     pinminh +  pindh;
 
   difference(){
     union(){
@@ -77,18 +85,18 @@ module Trestle(){
 	  rotate([0,0, -90-legang])
 	    ExtenderPillars(length=eplen+trestlelegw,
 			    width=trestlelegw,
-			    height=plugl,
+			    height=legw,
 			    baseweb=true);
 
 	  translate([-trestlebase/2, -trestleheight, 0])
 	    cylinder(r=trestlelegw/2*1.2, h=plugl);
 	}
       }
-      translate([-topcylw/2, -topcylbasedepth, 0])
-	cube([topcylw, topcylbasedepth + plugh + topcylthick, plugl]);
+      translate([-topblockw/2, -topblockbasedepth, 0])
+	cube([topblockw, topblockbasedepth + plugh + topblockthick, plugl]);
 
       translate([-trestlebase/2, -trestleheight, 0])
-	ExtenderPillars(length=trestlebase, width=trestlebaseh*2, height=plugl);
+	ExtenderPillars(length=trestlebase, width=trestlebaseh*2, height=legw);
     }
     translate([-300, -trestleheight-50, -1])
       cube([600, 50, plugl+2]);
@@ -98,12 +106,15 @@ module Trestle(){
 
     for (rot=[0,180]) {
       translate([0,0,plugl/2]) rotate([0,rot,0]) translate([0,0,-plugl/2]) {
-	translate([-(topcylw/2+1), plugh, plugl/4])
-	  rotate([0,90,0])
-	  cylinder(r1=pinholeminr, r2=pinholeminr, h=topcylw/2+2, $fn=20);
-	translate([0, plugh, plugl/4])
-	  rotate([0,90,0])
-	  cylinder(r1=pinholeminr, r2=pinholemaxr, h=topcylw/2+1, $fn=20);
+	translate([-(topblockw*0.25+1),
+ 	           plugh + pindh - (pinmaxh - pinminh)/2,
+		   (plugl - pinholebasew*2)/3]) rotate([0,90,0]) {
+	  linear_extrude(height = topblockw*1.0+2) {
+	    polygon([[-1.0 * pinholebasew, -0.01],
+		     [-0.5 * pinholebasew, pinholeh],
+		     [ 0                 , -0.01]]);
+	  }
+	}
       }
     }
   }