X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=filamenttrestle.scad;h=409a1a2f1661b324106f2495d0d00ecde069f680;hp=e8417b0bed4c0389c97a79ea1fdc68b0d6cfeb44;hb=fca6d3de1919af79525ecb45c3fe2530a2b72aab;hpb=eb8c3d2a7a8ca86e9aa552a53b7ecf3c07b27fa4

diff --git a/filamenttrestle.scad b/filamenttrestle.scad
index e8417b0..409a1a2 100644
--- a/filamenttrestle.scad
+++ b/filamenttrestle.scad
@@ -1,7 +1,7 @@
 // -*- C -*-
 
 spoolwidth = 80; // fixme needs to be measured
-spoolinnerrad = 25; // fixme needs to be checked
+spoolinnerrad = 20; // fixme needs to be checked
 spoolouterrad = 60; // fixme needs to be checked
 
 include <doveclip.scad>
@@ -10,19 +10,19 @@ include <axlepin.scad>
 spoolradclear = 10;
 spoolradslop = 2;
 
-spoolinnerslop = 4.5;
+spoolinnerslop = 3;
 axleslop = 0.5;
 
 axlerad = 7;
 barwasherrad = 17;
 
-hubbasethick = 6;
-hubmainthick = 20;
-hubbaseweb = 2;
-hubbasestalkwidth = 6;
+hubbasethick = 4;
+hubmainthick = 15;
+hubbaseweb = 1.2;
+hubbasestalkwidth = 4;
 hubwalls = 2.5;
 hubpillarw = 4;
-hubbaserad = spoolinnerrad + 15;
+hubbaserad = spoolinnerrad + 10;
 hubmainrad = spoolinnerrad - spoolradslop;
 
 legw = 12;
@@ -46,7 +46,7 @@ pindh = 0.50;
 pindwidth = 0.75;
 
 pintaperlen = plugwmax * 0.85;
-pinstraightlen = 10;
+pinstraightlen = 17.5;
 
 spoolouterpad = AxlePin_holerad()*2 * 1.5;
 spoolbarlen = spoolwidth +
@@ -100,7 +100,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);
     }
   }
 }
@@ -159,7 +159,7 @@ module Trestle(){ ////toplevel
 	    rotate([-90,0,0]) %Pin();
 	  translate([-(topblockw+1), 0, 0]) {
 	    rotate([0,90,0]) {
-	      linear_extrude(height = topblockw*1.0+2) {
+	      linear_extrude(height = topblockw*2.0+2) {
 		polygon([[-1.0 * pinholebasew, -0.01],
 			 [-0.5 * pinholebasew, pinholeh],
 			 [ 0                 , -0.01]]);
@@ -228,16 +228,18 @@ module HubEnd(){ ////toplevel
 
 
 module TestKit(){ ////toplevel
-  translate([30,0,0]) Pin();
-  translate([30,30,0]) Pin();
+  translate([60,0,0]) mirror([1,0,0]) Pin();
+  translate([60,15,0]) mirror([1,0,0]) Pin();
   translate([0,40,0]) intersection(){
     Trestle();
     translate([-50,-10,-1]) cube([100,100,100]);
   }
   intersection(){
-    translate([-60,0,0]) Bar();
+    translate([-60,10,0]) Bar();
     cube(50,center=true);
   }
+  translate([50,40, AxlePin_zoffset()]) FtAxlePin();
+  translate([0,-20,0]) AxleWasher();
 }
 
 module DemoSpool(){
@@ -248,7 +250,7 @@ module DemoSpool(){
     }
 }
 
-module Demo(){
+module Demo(){ ////toplevel
   color("blue") Bar();
   for (mir=[0,1]) {
     mirror([mir,0,0]) {
@@ -276,4 +278,4 @@ module Demo(){
 //Plug(d=1);
 //ExtenderPillars(80,12,8, baseweb=true);
 //HubEnd();
-Demo();
+//Demo();