X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=filamenttrestle.scad;h=8d17cf69f2f8a7dc1203364c7975898126937bf8;hp=b0ee2f97b58e4719acb73cb1611e32520ae93e2c;hb=e78af9df9bb6c435a8595a1a184b8090e7b90911;hpb=91f5ba0700d93ad98d2e460ab09c78f1117243f4

diff --git a/filamenttrestle.scad b/filamenttrestle.scad
index b0ee2f9..8d17cf6 100644
--- a/filamenttrestle.scad
+++ b/filamenttrestle.scad
@@ -5,12 +5,11 @@ trestleheight = 80; // fixme needs to be checked
 trestlebase = 80; // fixme needs to be checked
 
 include <doveclip.scad>
+include <axlepin.scad>
 
 spoolwidthgap = 2;
-barrady = 5;
-barradz = 7;
-guidewidth = 3;
-guiderad = 20;
+barrad = 7;
+barwasherrad = 20;
 
 legw = 12;
 plugl = 20;
@@ -54,27 +53,31 @@ module Plug(d=0){
 
 module Bar(){ ////toplevel
   spoolw = spoolwidth + spoolwidthgap*2;
-  barz = barradz * 0.5;
+  barz = barrad * 0.5;
   biggestw = spoolw + 50;
 
   intersection(){
     for (mir=[0,1]) {
       mirror([mir,0,0]) {
-	translate([0,0,barz]) {
-	  scale([1,barrady,barradz]) translate([-1,0,0])
-	    rotate([0,90,0]) cylinder(r=1, h=spoolw/2+2, $fn=30);
-	  translate([spoolw/2,0,0])
-	    rotate([0,90,0]) cylinder(r=guiderad, h=guidewidth, $fn=60);
-	}
-	translate([spoolw/2 + guidewidth, 0, 0])
+	translate([spoolw/2, 0, 0])
 	  Plug();
+	translate([-1, -50, -50])
+	  cube([spoolw/2+1.1, 100, 100]);
       }
     }
     translate([-biggestw/2, -50, 0])
       cube([biggestw, 100, 100]);
+    translate([0,0,barz]) {
+      translate([-100,0,0])
+	rotate([0,90,0]) cylinder(r=barrad, h=200, $fn=30);
+    }
   }
 }
 
+module FtAxlePin(){
+  AxlePin(barrad, (barrad + barwasherrad*2)/3 * 2);
+}
+
 module Trestle(){ ////toplevel
   legang = atan2(trestlebase/2, trestleheight);
   eplen = sqrt(trestleheight*trestleheight + trestlebase*trestlebase*0.25);
@@ -167,8 +170,9 @@ module TestKit(){ ////toplevel
 }
 
 //Bar();
+FtAxlePin();
 //Trestle();
 //Pin();
-TestKit();
+//TestKit();
 //Plug(d=1);
 //ExtenderPillars(80,12,8, baseweb=true);