X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=filamenttrestle.scad;h=376a1ae202903216dc8d871102147f74f7b30d46;hp=0435494e34255bcfe854d43054c500fd72fe26c8;hb=cd9506cd4f5fea2b670bf46cf45d937376e5e77f;hpb=a75533ab5b628721e14a68080e14c5836667659b

diff --git a/filamenttrestle.scad b/filamenttrestle.scad
index 0435494..376a1ae 100644
--- a/filamenttrestle.scad
+++ b/filamenttrestle.scad
@@ -1,8 +1,9 @@
 // -*- C -*-
 
-spoolwidth = 80; // fixme needs to be measured
-spoolinnerrad = 20; // fixme needs to be checked
-spoolouterrad = 60; // fixme needs to be checked
+spoolinnerdia = 32;
+spoolwidth = 88.0;
+spoolinnerrad = (spoolinnerdia - 0.2) / 2;
+spoolouterrad = spoolinnerrad + 61.5;
 
 include <doveclip.scad>
 include <axlepin.scad>
@@ -32,21 +33,23 @@ plugh = 10;
 plugslope = 0.5;
 plugwmax = plugwmin + plugh * plugslope * 2;
 
+trestlefoot = 15;
+
 trestlelegw = 10;
 trestlebaseh = 10;
 trestleplugd = 1;
 
-topblockthick = 4;
+topblockthick = 3;
 topblockbasedepth = 5;
 
-pinbasew = 5.0;
-pinminh = 1.5;
-pinmaxh = 4.5;
-pindh = 0.50;
-pindwidth = 0.75;
+pinbasew = 4.0;
+pinminh = 1.0;
+pinmaxh = 3.5;
+pindh = 1.75;
+pindwidth = 1.75;
 
-pintaperlen = plugwmax * 0.85;
-pinstraightlen = 17.5;
+pintaperlen = 20;
+pinstraightlen = 30-pintaperlen;
 
 spoolouterpad = AxlePin_holerad()*2 * 1.5;
 spoolbarlen = spoolwidth +
@@ -100,7 +103,7 @@ module Bar(){ ////toplevel
     }
     translate([0,0,barz]) {
       translate([-100,0,0])
-	rotate([0,90,0]) cylinder(r=axlerad, h=200, $fn=30);
+	rotate([0,90,0]) cylinder(r=axlerad, h=200, $fn=60);
     }
   }
 }
@@ -132,20 +135,20 @@ module Trestle(){ ////toplevel
 			    baseweb=true);
 
 	  translate([-trestlebase/2, -trestleheight, 0])
-	    cylinder(r=trestlelegw/2*1.2, h=plugl);
+	    cylinder(r=trestlelegw/2*1.2, h=trestlefoot);
 	}
       }
       translate([-topblockw/2, -topblockbasedepth, 0])
 	cube([topblockw,
 	      topblockbasedepth + plugh + topblockthick
-	      + (pinmaxh - pinminh)*0.6 + pindh,
+	      + (pinmaxh - pinminh)*0.5,
 	      plugl]);
 
       translate([-trestlebase/2, -trestleheight, 0])
 	ExtenderPillars(length=trestlebase, width=trestlebaseh*2, height=legw);
     }
     translate([-300, -trestleheight-50, -1])
-      cube([600, 50, plugl+2]);
+      cube([600, 50, 52]);
 
     rotate([-90,-90,0])
       Plug(d=trestleplugd);
@@ -153,7 +156,7 @@ module Trestle(){ ////toplevel
     for (rot=[0,180]) {
       translate([0,0,plugl/2]) rotate([0,rot,0]) translate([0,0,-plugl/2]) {
 	translate([0,
- 	           plugh + pindh - (pinmaxh - pinminh)*0.75,
+ 	           plugh - (pinmaxh - pinminh)*1.00,
 		   (plugl - pinholebasew*2)/3]) {
 	  translate([-(topblockw*0.25+1), 0, pinholebasew/2])
 	    rotate([-90,0,0]) %Pin();
@@ -238,8 +241,8 @@ module TestKit(){ ////toplevel
     translate([-60,10,0]) Bar();
     cube(50,center=true);
   }
-  translate([50,40, AxlePin_zoffset()]) FtAxlePin();
-  translate([0,-20,0]) AxleWasher();
+  %translate([50,40, AxlePin_zoffset()]) FtAxlePin();
+  %translate([0,-20,0]) AxleWasher();
 }
 
 module DemoSpool(){