X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=filamentspool.scad;h=4e69f42dbf6effc557838d7be9b7114c3f86962d;hb=04e4c2aa25e11210f6e1ffbf4fb34848d2bf30f1;hp=ad6906b6d2caa0184f3c85ec5eafaa771b6a1955;hpb=0fae08d297e0d29f2cb1443535af7a1b083b9cbd;p=reprap-play.git

diff --git a/filamentspool.scad b/filamentspool.scad
index ad6906b..4e69f42 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -11,8 +11,8 @@ function usedove() = selsz(true,false);
 num_arms = selsz(3,4);
 
 exteffrad = 70;
-hubeffrad = selsz(30, 60);
-hubbigrad = selsz(20, 50);
+hubeffrad = selsz(30, 50);
+hubbigrad = selsz(20, 45);
 hublwidth = selsz(3, 5);
 hubstemwidth = 2;
 hublthick = 10;
@@ -85,6 +85,7 @@ nondove_armhole_hole = 4;
 nondove_armhole_support = 7;
 nondove_armhole_wall = 4;
 nondove_armhole_slop = 0.5;
+nondove_armhole_slop_x = 0.5;
 
 include <doveclip.scad>
 include <cliphook.scad>
@@ -170,11 +171,11 @@ module FilamentCup() { ////toplevel
 
   gapy = prongwidth;
   dy = cupwidth/2 + gapy + overclipcupgap;
+  baselen = dy+cupwidth/2;
 
   translate([0, dy, 0])
     FilamentCupCup();
-  translate([0, -1, 0]);
-  cube([prongwidth, dy+1+cupwidth/2, prongthick]);
+  cube([prongwidth, baselen+1, prongthick]);
 
   midrad = cupwidth/2 + prongwidth/2;
 
@@ -194,7 +195,7 @@ module FilamentCup() { ////toplevel
       FilamentTeeth(fdia=fdia, h=teethh);
   }
   for (x = [-0.3, -1.3]) {
-    translate([cupheight + overclipcupnextgap*x, dy+cupwidth/2 + prongthick, 0])
+    translate([cupheight + overclipcupnextgap*x, baselen + prongthick, 0])
       rotate([0,0, 12 + fdia])
       FilamentTeeth(fdia=fdia, h=teethh);
   }      
@@ -276,7 +277,7 @@ module Hub(){ ////toplevel
 			+ nondove_armhole_hole/2 + nondove_armhole_support,
 			nondove_allwidth,
 			nondove_armhole_wall + totalheight]);
-		translate([hubeffrad,
+		translate([hubeffrad - nondove_armhole_slop_x,
 			   -nondove_allwidth/2
 			   + nondove_armhole_wall - nondove_armhole_slop,
 			   nondove_armhole_wall])
@@ -418,10 +419,10 @@ module FilamentCupPair(){ ////toplevel
 }
 
 //ArmEnd();
-//FilamentCup();
+FilamentCup();
 //FilamentCupPair();
 //CupSecuringClip();
-Hub();
+//Hub();
 //ArmExtender();
 //Axle();
 //AxleWasher();