X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=filamentspool.scad;h=ce70ce97deb146f1365d95ffda73c7333d24c895;hb=93e75099ed8f21131e5dfc83a9aaa6bfc7d39110;hp=032d476dcde397fb2b1f2bb84ac455fdfed095b5;hpb=313e5333fd734b5ad5aec1ad48749623f41b9950;p=reprap-play.git

diff --git a/filamentspool.scad b/filamentspool.scad
index 032d476..ce70ce9 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;
@@ -13,6 +13,9 @@ hubstemwidth = 2;
 hublthick = 10;
 hubaxlelen = 25;
 hubaxlerad = 5;
+totalheightfromtower = 240;
+axletowerfudgebend = 0;
+axleaxlefudgebend = 3;
 
 prongthick=5;
 prongwidth=5;
@@ -52,11 +55,14 @@ armendwallthick=2.5;
 armendbasethick=1.2;
 
 axlehorizoffset = 12.5;
-axlevertheight = 80;
+axlevertheight = 100;
 towercliph = 16;
 towerclipcount = 3;
 towerpillarw = 5;
 
+axlepinrad = 2;
+axlepintabrad = 5;
+
 washerthick = 1.2;
 washerrad = hubaxlerad + 7.5;
 
@@ -239,14 +245,25 @@ module ArmExtender(){ ////toplevel
 }
 
 module AxlePin(){ ////toplevel
-//  SplitPin();
+  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
   pillarswidth = DoveClipPairSane_width(towerclipcount);
 
 if(0)
+  rotate([0,0, -( axleaxlefudgebend + atan(slop/hubaxlelen) ) ])
   translate([-axlehorizoffset, -axlevertheight, 0]) {
+    rotate([0,0,-axletowerfudgebend])
     rotate([0,0,-90])
       DoveClipPairSane(h=towercliph, count=towerclipcount, baseextend=3);
     translate([0, DoveClip_depth(), 0])
@@ -263,27 +280,27 @@ if(0)
   joinbelowallow = 3;
 
   intersection(){
-    difference() {
-      translate([0, 0, shift])
-      %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 = 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])
-	cube([1,1,1]);
     }
     translate([-50,-50,0]) cube([100,100,100]);
   }
@@ -296,11 +313,20 @@ module AxleWasher(){ ////toplevel
   }
 }
 
+module TowerExtender(){ ////toplevel
+  l = totalheightfromtower - axlevertheight;
+  echo("TowerExtender",l);
+  DoveClipExtender(length = l,
+		   ha = towercliph, hb = towercliph,
+		   counta = towerclipcount, countb = towerclipcount,
+		   pillarw = towerpillarw);
+}
+
 //ArmEnd();
 //FilamentCup();
 //CupSecuringClip();
 //Hub();
 //ArmExtender();
-Axle();
+//Axle();
 //AxleWasher();
-//AxleSplitPin();
+//AxlePin();