filamenttrestle: define spoolinnerrad in terms of spoolinnerdia with some slop

[reprap-play.git] / filamenttrestle.scad

diff --git a/filamenttrestle.scad b/filamenttrestle.scad
index 58e58cbce376f80528986a29fd7c8f23d8cf4213..c44167eebc4424af782b01a359c9e90e2d338774 100644 (file)
--- a/filamenttrestle.scad
+++ b/filamenttrestle.scad
@@ -1,12 +1,15 @@
 // -*- C -*-
 
+spoolinnerdia = 40;
 spoolwidth = 88.0;
-spoolinnerrad = 39.8 / 2;
+spoolinnerrad = (spoolinnerdia - 0.2) / 2;
 spoolouterrad = spoolinnerrad + 61.5;
 
 include <doveclip.scad>
 include <axlepin.scad>
 
+echo(spoolinnerrad);
+
 spoolradclear = 10;
 spoolradslop = 2;
 
@@ -41,14 +44,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 +232,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(){
@@ -283,5 +282,5 @@ module Demo(){ ////toplevel
 //TestKit();
 //Plug(d=1);
 //ExtenderPillars(80,12,8, baseweb=true);
-//HubEnd();
+HubEnd();
 //Demo();