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

diff --git a/filamentspool.scad b/filamentspool.scad
index 55da1ac..c90701f 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -44,6 +44,7 @@ overclipcupgap=5;
 overclipdepth=15;
 overcliproundr=2.0;
 overclipthick=0.5;
+overclipcupnextgap=20;
 
 overclipsmaller=-2.5;
 overclipbigger=0.0;
@@ -76,12 +77,14 @@ ratchetpawl=ratchetstep-ratchettooth-bigslop*2;
 include <doveclip.scad>
 include <cliphook.scad>
 include <filamentteeth.scad>
+include <axlepin.scad>
 
 channelwidth = prongthick + slop;
 channeldepth = prongwidth + ratchettoothheight;
 totalwidth = armendwallthick*2 + channelwidth;
 totalheight = channeldepth + armendbasethick;
 stalkwidth = prongwidth + prongstalkxwidth;
+xstraight = cupbigrad * xstraightmul;
 
 module ArmEnd(length=120){ ////toplevel
   translate([ratchettoothsmoothr, channelwidth/2, -armendbasethick]) {
@@ -133,7 +136,6 @@ module FilamentCupHandle(){
 }
 
 module FilamentCupCup(){
-  xstraight = cupbigrad * xstraightmul;
   linear_extrude(height=prongthick) {
     FlatArc(0,0, cupbigrad,cupbigrad+prongwidth, 89,271, $fn=80);
   }
@@ -167,9 +169,11 @@ module FilamentCup() { ////toplevel
 	  dy - sqrt(midrad*midrad - proptaken*proptaken) - prongwidth/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);
+  }
 }
 
 module CupSecuringClipSolid(w,d,h1,h2){
@@ -253,17 +257,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 +314,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
@@ -367,8 +359,17 @@ module TowerExtender(){ ////toplevel
 		   pillarw = towerpillarw);
 }
 
+module FilamentCupPair(){ ////toplevel
+  FilamentCup();
+  translate([xstraight + cupbigrad + prongthick*3,
+	     cupbigrad*1.7,
+	     0])
+    rotate([0,0,180]) FilamentCup();
+}
+
 //ArmEnd();
 //FilamentCup();
+//FilamentCupPair();
 //CupSecuringClip();
 //Hub();
 //ArmExtender();