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=58e58cbce376f80528986a29fd7c8f23d8cf4213;hb=50cad411fae12202d86992d4566485470006cbf1;hpb=623b89796237552288c97dca9f50273c280dee4b

diff --git a/filamenttrestle.scad b/filamenttrestle.scad
index 58e58cb..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 = 1.0;
-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 +
@@ -229,23 +230,19 @@ module HubEnd(){ ////toplevel
 }
 
 
-module TestTrestle(){ ////toplevel
-  intersection(){
-    Trestle();
-    translate([-50,-10,-1]) cube([100,100,100]);
-  }
-}
-
 module TestKit(){ ////toplevel
   translate([60,0,0]) mirror([1,0,0]) Pin();
   translate([60,15,0]) mirror([1,0,0]) Pin();
-  translate([0,40,0]) TestTrestle();
+  translate([0,40,0]) intersection(){
+    Trestle();
+    translate([-50,-10,-1]) cube([100,100,100]);
+  }
   intersection(){
     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(){