X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=filamentspool.scad;h=a8955b89f329bc00f3e9ea868a7a4ff5e99c5bf8;hb=6c65bab2d987bf4bc91105db7b3c1eda81419c9e;hp=55da1ac7324eb27a81e7bf1aae1f0eab5ddc893b;hpb=8ff1b6abf7447220d5eeb5aaa94197e80449098d;p=reprap-play.git

diff --git a/filamentspool.scad b/filamentspool.scad
index 55da1ac..a8955b8 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -76,6 +76,7 @@ ratchetpawl=ratchetstep-ratchettooth-bigslop*2;
 include <doveclip.scad>
 include <cliphook.scad>
 include <filamentteeth.scad>
+include <axlepin.scad>
 
 channelwidth = prongthick + slop;
 channeldepth = prongwidth + ratchettoothheight;
@@ -253,17 +254,8 @@ module ArmExtender(){ ////toplevel
 		   hb=doveclipheight);
 }
 
-module AxlePin(){ ////toplevel
-  pinr = axlepinrad - slop;
-  intersection(){
-    translate([0, 0, pinr*0.7]) {
-      translate([0, -washerrad, 0]) rotate([-90,0,0])
-	cylinder(r=pinr, h=washerrad*2, $fn=10);
-      translate([-axlepintabrad, hubaxlerad, -axlepinrad])
-	cube([axlepintabrad*2, axlepinrad*2, axlepinrad*2]);
-    }
-    translate([-50,-50,0]) cube([100,100,50]);
-  }
+module FsAxlePin(){ ////toplevel
+  AxlePin(hubaxlerad, washerrad*2, axlepinrad, axlepintabrad, slop);
 }
 
 module Axle(){ ////toplevel
@@ -319,10 +311,7 @@ module Axle(){ ////toplevel
 }
 
 module washer(thick){
-  difference(){
-    cylinder(h=thick, r=washerrad);
-    translate([0,0,-1]) cylinder(h=washerthick+2, r=hubaxlerad+slop);
-  }
+  Washer(hubaxlerad, washerrad, thick, slop);
 }
 
 module AxleWasher(){ ////toplevel