X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=filamentspool.scad;h=89f3cfb3a0ac97e069efddde6a57a01fd7fb87d7;hp=fe85c8f6fd7cae4f037a6842c77948bae73782a4;hb=9b824b304dfc50b89172ec9dbf53b0076e526097;hpb=7eedab3e04eae517f990017b5af5a3cd2afcf6dd

diff --git a/filamentspool.scad b/filamentspool.scad
index fe85c8f..89f3cfb 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -5,7 +5,7 @@ fdia=1.75;
 slop=0.5;
 bigslop=slop*2;
 
-exteffrad = 85;
+exteffrad = 70;
 hubeffrad = 30;
 hubbigrad = 20;
 hublwidth = 3;
@@ -57,6 +57,9 @@ towercliph = 16;
 towerclipcount = 3;
 towerpillarw = 5;
 
+axlepinrad = 2;
+axlepintabrad = 5;
+
 washerthick = 1.2;
 washerrad = hubaxlerad + 7.5;
 
@@ -65,7 +68,6 @@ ratchetpawl=ratchetstep-ratchettooth-bigslop*2;
 include <doveclip.scad>
 include <cliphook.scad>
 include <filamentteeth.scad>
-include <splitpin.scad>
 
 channelwidth = prongthick + slop;
 channeldepth = prongwidth + ratchettoothheight;
@@ -239,8 +241,17 @@ module ArmExtender(){ ////toplevel
 		   hb=doveclipheight);
 }
 
-module AxleSplitPin(){ ////toplevel
-  SplitPin();
+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 Axle(){ ////toplevel
@@ -257,34 +268,34 @@ if(0)
 		      pillarw=towerpillarw);
   }
 
-  axleclearlen = hubaxlelen + slop*2 + washerthick;
-  axlerad = hubaxlerad+slop;
+  axleclearlen = hubaxlelen + slop*3 + washerthick*2;
+  axlerad = hubaxlerad-slop;
   bump = axlerad * 0.2;
   shift = axlerad-bump;
   joinbelowallow = 3;
 
   intersection(){
-    difference() {
-      translate([0, 0, shift])
-      union(){
-	translate([-1, 0, 0])
-	  rotate([0,90,0])
-	  cylinder(r = axlerad, h = 1 + axleclearlen + 6);
-	mirror([1,0,0]) rotate([0,90,0])
-	  cylinder(r = washerrad, h = 3);
-if(0)
-	intersection(){
+    translate([0, 0, shift]) {
+      difference() {
+	union(){
+	  translate([-1, 0, 0])
+	    rotate([0,90,0])
+	    cylinder(r = axlerad, h = 1 + axleclearlen + 3 + 2);
 	  mirror([1,0,0]) rotate([0,90,0])
-	    cylinder(r = towercliph - shift,
-		     h = pillarswidth/2 + axlehorizoffset);
-	  translate([-50, -joinbelowallow, -50])
-	    cube([100, joinbelowallow+50, 100]);
+	    cylinder(r = washerrad, h = 3);
+if(0)
+	  intersection(){
+	    mirror([1,0,0]) rotate([0,90,0])
+	      cylinder(r = towercliph - shift,
+		       h = pillarswidth/2 + axlehorizoffset);
+	    translate([-50, -joinbelowallow, -50])
+	      cube([100, joinbelowallow+50, 100]);
+	  }
 	}
+	rotate([90,0,0])
+	translate([axleclearlen + axlepinrad/2, 0, -25])
+	  cylinder(r=axlepinrad, h=50);
       }
-      translate([axleclearlen, 0, 0])
-	mirror([0,0,1])
-	rotate([0,0,90])
-	SplitPinCavity();
     }
     translate([-50,-50,0]) cube([100,100,100]);
   }
@@ -304,3 +315,4 @@ module AxleWasher(){ ////toplevel
 //ArmExtender();
 //Axle();
 //AxleWasher();
+//AxlePin();