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=82e37f6dfa82a7a161d6cade2837ab6d4088e812;hb=fbda336643dfb1929a1298531d3d096dfad7a50d;hpb=52ad853b220be3cd060c00c9ae74c8922b460506

diff --git a/filamenttrestle.scad b/filamenttrestle.scad
index 82e37f6..376a1ae 100644
--- a/filamenttrestle.scad
+++ b/filamenttrestle.scad
@@ -1,7 +1,8 @@
 // -*- C -*-
 
+spoolinnerdia = 32;
 spoolwidth = 88.0;
-spoolinnerrad = 39.8 / 2;
+spoolinnerrad = (spoolinnerdia - 0.2) / 2;
 spoolouterrad = spoolinnerrad + 61.5;
 
 include <doveclip.scad>
@@ -41,14 +42,14 @@ trestleplugd = 1;
 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 +
@@ -140,7 +141,7 @@ module Trestle(){ ////toplevel
       translate([-topblockw/2, -topblockbasedepth, 0])
 	cube([topblockw,
 	      topblockbasedepth + plugh + topblockthick
-	      + (pinmaxh - pinminh)*0.5 + pindh,
+	      + (pinmaxh - pinminh)*0.5,
 	      plugl]);
 
       translate([-trestlebase/2, -trestleheight, 0])
@@ -155,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();
@@ -240,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(){