X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=filamentspool.scad;h=b84856a032affe6d4a8f3e90a87a9788bda9e1fb;hb=786d945b418b1fb369f8457732149569ff5ee866;hp=89f3cfb3a0ac97e069efddde6a57a01fd7fb87d7;hpb=9169e69946bbfa33f9a4bbc1b83f2ec2c8e86437;p=reprap-play.git

diff --git a/filamentspool.scad b/filamentspool.scad
index 89f3cfb..b84856a 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -1,6 +1,6 @@
 // -*- C -*-
 
-fdia=1.75;
+fdia=2.85;
 
 slop=0.5;
 bigslop=slop*2;
@@ -13,18 +13,23 @@ hubstemwidth = 2;
 hublthick = 10;
 hubaxlelen = 25;
 hubaxlerad = 5;
+totalheightfromtower = 240;
+axletowerfudgebend = 0;
+axleaxlefudgebend = 3;
+axlepadlen = 1.0;
 
-prongthick=5;
-prongwidth=5;
+function selsz(sm,lg) = fdia < 2 ? sm : lg;
+
+prongthick=selsz(5,7);
+prongwidth=selsz(5,7);
 ratchetstep=15;
 ratchettooth=3;
 ratchettoothheight=5;
 ratchettoothsmoothr=1;
 ratchettoothslope=0.75;
 overlap=0.5;
-cupbigrad=20;
-
-xstraightmul = 1.75;
+cupwidth=selsz(40,60);
+cupheight=selsz(55,75);
 
 propxshift = 0;
 
@@ -40,6 +45,7 @@ overclipcupgap=5;
 overclipdepth=15;
 overcliproundr=2.0;
 overclipthick=0.5;
+overclipcupnextgap=20;
 
 overclipsmaller=-2.5;
 overclipbigger=0.0;
@@ -52,7 +58,7 @@ armendwallthick=2.5;
 armendbasethick=1.2;
 
 axlehorizoffset = 12.5;
-axlevertheight = 80;
+axlevertheight = 100;
 towercliph = 16;
 towerclipcount = 3;
 towerpillarw = 5;
@@ -61,13 +67,18 @@ axlepinrad = 2;
 axlepintabrad = 5;
 
 washerthick = 1.2;
+washerthinthick = 0.8;
+washerverythinthick = 0.4;
 washerrad = hubaxlerad + 7.5;
+frictionwasherarmwidth = 3;
+frictionwasherextrapush = 1.0;
 
 ratchetpawl=ratchetstep-ratchettooth-bigslop*2;
 
 include <doveclip.scad>
 include <cliphook.scad>
 include <filamentteeth.scad>
+include <axlepin.scad>
 
 channelwidth = prongthick + slop;
 channeldepth = prongwidth + ratchettoothheight;
@@ -125,43 +136,45 @@ module FilamentCupHandle(){
 }
 
 module FilamentCupCup(){
-  xstraight = cupbigrad * xstraightmul;
-  linear_extrude(height=prongthick) {
-    FlatArc(0,0, cupbigrad,cupbigrad+prongwidth, 89,271, $fn=80);
-  }
   for (my=[0,1]) mirror([0,my,0]) {
-    translate([0,cupbigrad,0])
-      cube([xstraight, prongwidth, prongthick]);
+    translate([0,cupwidth/2,0])
+      cube([cupheight + prongwidth, prongwidth, prongthick]);
   }
 }
 
 module FilamentCup() { ////toplevel
   FilamentCupHandle();
 
-  dx = cupbigrad + prongwidth;
   gapy = prongwidth;
-  dy = cupbigrad + gapy + overclipcupgap;
+  dy = cupwidth/2 + gapy + overclipcupgap;
 
-  translate([dx, dy, 0])
+  translate([0, dy, 0])
     FilamentCupCup();
   translate([0, -1, 0]);
-  cube([prongwidth, dy+1, prongthick]);
+  cube([prongwidth, dy+1+cupwidth/2, prongthick]);
 
-  midrad = cupbigrad + prongwidth/2;
+  midrad = cupwidth/2 + prongwidth/2;
 
   propshift = stalklength - overclipdepth - prongthick + propxshift;
   proptaken = propshift;
-  echo(cupbigrad, dx, midrad, propshift, proptaken);
+  echo(midrad, propshift, proptaken);
 
   translate([propshift, -1, 0]) {
     // something is wrong with the y calculation
     cube([prongwidth,
-	  dy - sqrt(midrad*midrad - proptaken*proptaken) - prongwidth/2,
+	  gapy+2,
 	  prongthick]);
   }
-  translate([0, overclipcupgap, 0])
-    rotate([0,0, 102 + fdia])
-    FilamentTeeth(fdia=fdia, h=teethh);
+  for (y = [overclipcupgap, overclipcupgap+overclipcupnextgap]) {
+    translate([0, y, 0])
+      rotate([0,0, 102 + fdia])
+      FilamentTeeth(fdia=fdia, h=teethh);
+  }
+  for (x = [-0.3, -1.3]) {
+    translate([cupheight + overclipcupnextgap*x, dy+cupwidth/2 + prongthick, 0])
+      rotate([0,0, 12 + fdia])
+      FilamentTeeth(fdia=fdia, h=teethh);
+  }      
 }
 
 module CupSecuringClipSolid(w,d,h1,h2){
@@ -198,6 +211,10 @@ module ArmDoveClipPin(){ ////toplevel
   DoveClipPin(h=doveclipheight);
 }
 
+module TowerDoveClipPin(){ ////toplevel
+  DoveClipPin(h=towercliph/2);
+}
+
 module Hub(){ ////toplevel
   difference(){
     cylinder($fn=60, h=hublthick, r=hubbigrad);
@@ -241,24 +258,16 @@ 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
   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])
@@ -268,7 +277,7 @@ if(0)
 		      pillarw=towerpillarw);
   }
 
-  axleclearlen = hubaxlelen + slop*3 + washerthick*2;
+  axleclearlen = hubaxlelen + slop*4 + washerthick*2 + axlepadlen;
   axlerad = hubaxlerad-slop;
   bump = axlerad * 0.2;
   shift = axlerad-bump;
@@ -280,39 +289,92 @@ if(0)
 	union(){
 	  translate([-1, 0, 0])
 	    rotate([0,90,0])
-	    cylinder(r = axlerad, h = 1 + axleclearlen + 3 + 2);
+	    cylinder($fn=60,
+		     r = axlerad,
+		     h = 1 + axleclearlen + axlepinrad*2 + 2);
 	  mirror([1,0,0]) rotate([0,90,0])
-	    cylinder(r = washerrad, h = 3);
-if(0)
+	    cylinder(r = axlerad*1.75, h = 3);
 	  intersection(){
-	    mirror([1,0,0]) rotate([0,90,0])
-	      cylinder(r = towercliph - shift,
-		       h = pillarswidth/2 + axlehorizoffset);
+	    mirror([1,0,0])
+	      translate([axlehorizoffset - pillarswidth/2, 0, 0])
+	      rotate([0,90,0])
+	      cylinder($fn=60,
+		       r = towercliph - shift,
+		       h = pillarswidth);
 	    translate([-50, -joinbelowallow, -50])
 	      cube([100, joinbelowallow+50, 100]);
 	  }
 	}
 	rotate([90,0,0])
 	translate([axleclearlen + axlepinrad/2, 0, -25])
-	  cylinder(r=axlepinrad, h=50);
+	  cylinder(r = axlepinrad + slop, h=50);
       }
     }
     translate([-50,-50,0]) cube([100,100,100]);
   }
 }
 
+module washer(thick){
+  Washer(hubaxlerad, washerrad, thick, slop);
+}
+
 module AxleWasher(){ ////toplevel
+  washer(thick=washerthick);
+}
+
+module AxleThinWasher(){ ////toplevel
+  washer(thick=washerthinthick);
+}
+
+module AxleVeryThinWasher(){ ////toplevel
+  washer(thick=washerverythinthick);
+}
+
+module AxleFrictionWasher(){ ////toplevel
   difference(){
     cylinder(h=washerthick, r=washerrad);
     translate([0,0,-1]) cylinder(h=washerthick+2, r=hubaxlerad+slop);
   }
+  frarmr = hubbigrad;
+  frarmw = frictionwasherarmwidth;
+  frarmpawlr = hublwidth;
+  frarmpawlpush = slop*4 + frictionwasherextrapush;
+  for (ang=[0,180]) rotate([0,0,ang]) {
+    translate([washerrad-1, -frarmw/2, 0])
+      cube([frarmr - washerrad + 1, frarmw, washerthick]);
+    intersection(){
+      translate([frarmr - frarmpawlr, -50, 0])
+	cube([frarmpawlr, 100, 50]);
+      rotate([0,90,0])
+	cylinder(h = 50, r = frarmpawlpush, $fn=36);
+    }
+  }
+}
+
+module TowerExtender(){ ////toplevel
+  l = totalheightfromtower - axlevertheight;
+  echo("TowerExtender",l);
+  DoveClipExtender(length = l,
+		   ha = towercliph, hb = towercliph,
+		   counta = towerclipcount, countb = towerclipcount,
+		   pillarw = towerpillarw);
+}
+
+module FilamentCupPair(){ ////toplevel
+  FilamentCup();
+  translate([cupheight + prongthick*3,
+	     cupwidth/2*1.7,
+	     0])
+    rotate([0,0,180]) FilamentCup();
 }
 
 //ArmEnd();
 //FilamentCup();
+FilamentCupPair();
 //CupSecuringClip();
 //Hub();
 //ArmExtender();
 //Axle();
 //AxleWasher();
 //AxlePin();
+//AxleFrictionWasher();