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

diff --git a/filamenttrestle.scad b/filamenttrestle.scad
index e341e48..0f99442 100644
--- a/filamenttrestle.scad
+++ b/filamenttrestle.scad
@@ -12,8 +12,9 @@ barradz = 7;
 guidewidth = 3;
 guiderad = 20;
 
-plugl = 12;
-plugwmin = min(8, DoveClipPairSane_width(2));
+legw = 12;
+plugl = 16;
+plugwmin = 3;
 plugh = 10;
 plugslope = 0.5;
 plugwmax = plugwmin + plugh * plugslope * 2;
@@ -22,22 +23,28 @@ trestlelegw = 10;
 trestlebaseh = 10;
 trestleplugd = 1;
 
-topcylthick = 3;
-topcylbasedepth = 7;
+topblockthick = 4;
+topblockbasedepth = 4;
+
+pinbasew = 3;
+pinminh = 1.5;
+pinmaxh = 4.0;
+pindh = 1.0;
+pindwidth = 1.0;
 
 module Plug(d=0){
+  dw = d;
+  dh = d;
   a = atan(plugslope);
-  tdx = d * cos(a);
-  tdy = d * sin(a);
-  bdx = d / cos(a);
+  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([[-(plugwmax/2 + bdx),  0],
-	     [-(plugwmin/2 + tdx),  plugh + tdy],
-	     [+(plugwmin/2 + tdx),  plugh + tdy],
-	     [+(plugwmax/2 + bdx),  0]]);
+    polygon([[-(plugwmin/2 + bdx),  0],
+	     [-(plugwmax/2 + tdx),  plugh + tdy],
+	     [+(plugwmax/2 + tdx),  plugh + tdy],
+	     [+(plugwmin/2 + bdx),  0]]);
   }
-  translate([plugl + DoveClip_depth()*0.7 + d, 0, 0])
-    DoveClipPairSane(count=1, h=plugh-0.1);
 }
 
 module Bar(){
@@ -66,10 +73,10 @@ module Bar(){
 module Trestle(){
   legang = atan2(trestlebase/2, trestleheight);
   eplen = sqrt(trestleheight*trestleheight + trestlebase*trestlebase*0.25);
-  topcylr = max(plugwmax/2,
-		trestlelegw/2,
-		sqrt(plugwmin*2/4 + plugh*plugh)
-		) + topcylthick + trestleplugd;
+  topblockw = plugwmax + trestleplugd*2 + topblockthick*2;
+
+  pinholebasew = pinbasew + pindwidth*2;
+  pinholeh =     pinminh +  pindh;
 
   difference(){
     union(){
@@ -78,31 +85,43 @@ 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);
 	}
       }
-      intersection(){
-	cylinder(r=topcylr, h=plugl);
-	translate([-50, -topcylbasedepth, -1])
-	  cube([100, 50, plugl+2]);
-      }
+      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]);
 
     rotate([-90,-90,0])
       Plug(d=trestleplugd);
+
+    for (rot=[0,180]) {
+      translate([0,0,plugl/2]) rotate([0,rot,0]) translate([0,0,-plugl/2]) {
+	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]]);
+	  }
+	}
+      }
+    }
   }
 }
 
 //Bar();
-//Plug(d=1);
 Trestle();
+
+//Plug(d=1);
 //ExtenderPillars(80,12,8, baseweb=true);