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

diff --git a/filamenttrestle.scad b/filamenttrestle.scad
index dd0b01c..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,18 +10,19 @@ include <axlepin.scad>
 spoolradclear = 10;
 spoolradslop = 2;
 
-spoolinnerslop = 2;
+spoolinnerslop = 3;
 axleslop = 0.5;
 
 axlerad = 7;
 barwasherrad = 17;
 
-hubbasethick = 6;
-hubmainthick = 20;
-hubbaseweb = 2;
-hubbasestalkwidth = 6;
-hubwalls = 3;
-hubbaserad = spoolinnerrad + 15;
+hubbasethick = 4;
+hubmainthick = 15;
+hubbaseweb = 1.2;
+hubbasestalkwidth = 4;
+hubwalls = 2.5;
+hubpillarw = 4;
+hubbaserad = spoolinnerrad + 10;
 hubmainrad = spoolinnerrad - spoolradslop;
 
 legw = 12;
@@ -45,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 +
@@ -99,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);
     }
   }
 }
@@ -158,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]]);
@@ -202,10 +203,13 @@ module HubEnd(){ ////toplevel
 	  translate([hubmainrad - hubwalls/2, -hubbasestalkwidth/2, 0])
 	    cube([hubbaserad - (hubmainrad - hubwalls/2),
 		  hubbasestalkwidth, hubbasethick]);
+	  ExtenderPillar(length = hubmainrad-hubwalls/2,
+			 height = hubbasethick + hubmainthick,
+			 pillarw = hubpillarw);
 	}
       }
       cylinder(r=axlerad+hubwalls, h=thick);
-      cylinder(r=hubmainrad-0.1, h=hubwebthick);
+      cylinder(r=hubmainrad-0.1, h=hubbaseweb);
       difference(){
 	cylinder(r=hubmainrad, h=thick, $fn=100);
 	translate([0,0,-1])
@@ -224,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(){
@@ -244,14 +250,20 @@ module DemoSpool(){
     }
 }
 
-module Demo(){
-  Bar();
+module Demo(){ ////toplevel
+  color("blue") Bar();
   for (mir=[0,1]) {
     mirror([mir,0,0]) {
-      translate([spoolbarlen/2,0,0]) rotate([90,0,90]) Trestle();
-      translate([spoolwidth/2 + hubbasethick + spoolinnerslop/4, 0, barz])
+      color("red") translate([spoolbarlen/2,0,0])
+	rotate([90,0,90]) Trestle();
+      color("orange")
+	translate([spoolwidth/2 + hubbasethick + spoolinnerslop*2/3, 0, barz])
 	rotate([0,90,0]) AxleWasher();
-      translate([axlepin_x, 0, barz]) rotate([90,0,90]) FtAxlePin();
+      color("orange") translate([axlepin_x, 0, barz])
+	rotate([90,0,90]) FtAxlePin();
+      color("cyan")
+	translate([spoolwidth/2 + hubbasethick + spoolinnerslop*1/3, 0, barz])
+	rotate([0,-90,0]) HubEnd();
     }
   }
   %translate([0,0,barz]) DemoSpool();
@@ -265,5 +277,5 @@ module Demo(){
 //TestKit();
 //Plug(d=1);
 //ExtenderPillars(80,12,8, baseweb=true);
-HubEnd();
+//HubEnd();
 //Demo();