X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=filamentspool.scad;h=6c0db240c5370e84e18184db637004d42a25c185;hb=42b4f3ebfa2bb91a6c8446f3c33cdbc0a665c095;hp=a0381de00f2037b798b6fd4238507461a37701de;hpb=8b5b84f1d0510020f9656e979c84f4c834536404;p=reprap-play.git

diff --git a/filamentspool.scad b/filamentspool.scad
index a0381de..6c0db24 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -1,6 +1,6 @@
 // -*- C -*-
 
-fdia=1.75;
+fdia=2.85;
 
 slop=0.5;
 bigslop=slop*2;
@@ -18,17 +18,18 @@ 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;
 
@@ -39,11 +40,12 @@ teethgapx=4+fdia;
 
 prongstalkxwidth=3;
 
-stalklength=35;
+stalklength=selsz(35,55);
 overclipcupgap=5;
 overclipdepth=15;
 overcliproundr=2.0;
-overclipthick=0.5;
+overclipthick=1.0;
+overclipcupnextgap=20;
 
 overclipsmaller=-2.5;
 overclipbigger=0.0;
@@ -65,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;
@@ -129,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){
@@ -192,6 +201,8 @@ module CupSecuringClip(){ ////toplevel
       CupSecuringClipSolidSmooth(xrad=overclipthick, xdepth=0);
       translate([-wingswidth/2, -wingsize/2, 0])
 	cube([wingswidth, wingsize, wingthick]);
+      translate([-wingsize/2, -wingswidth/2, 0])
+	cube([wingsize, wingswidth, wingthick]);
     }
     translate([0,0,-0.1])
       CupSecuringClipSolidSmooth(xrad=0, xdepth=0.2);
@@ -202,6 +213,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);
@@ -245,23 +260,13 @@ 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])
@@ -297,7 +302,7 @@ if(0)
 	      rotate([0,90,0])
 	      cylinder($fn=60,
 		       r = towercliph - shift,
-		       h = pillarswidth * 0.5); // fixme 0.5 is bogus
+		       h = pillarswidth);
 	    translate([-50, -joinbelowallow, -50])
 	      cube([100, joinbelowallow+50, 100]);
 	  }
@@ -311,11 +316,41 @@ if(0)
   }
 }
 
+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
@@ -327,11 +362,21 @@ module TowerExtender(){ ////toplevel
 		   pillarw = towerpillarw);
 }
 
+module FilamentCupPair(){ ////toplevel
+  FilamentCup();
+  translate([cupheight + prongthick*3,
+	     cupwidth/2*1.7,
+	     0])
+    rotate([0,0,180]) FilamentCup();
+}
+
 //ArmEnd();
 //FilamentCup();
-//CupSecuringClip();
+//FilamentCupPair();
+CupSecuringClip();
 //Hub();
 //ArmExtender();
 //Axle();
 //AxleWasher();
 //AxlePin();
+//AxleFrictionWasher();