X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=filamentspool.scad;h=28645b474b2d9783433d393045fb7d49278edb57;hb=528a7b926fb029bafc59473f3a68bdb29666491a;hp=2f99631b4c21c01a80ce4a95cd404145403c3b25;hpb=0d337c3d534bd3d64fe36712269d6454aa696bb6;p=reprap-play.git

diff --git a/filamentspool.scad b/filamentspool.scad
index 2f99631..28645b4 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;
@@ -22,8 +22,10 @@ axletowerfudgebend = 0;
 axleaxlefudgebend = 3;
 axlepadlen = 1.0;
 
-prongthick=selsz(5,7);
-prongwidth=selsz(5,7);
+prongthick=selsz(5,5);
+prongwidth=selsz(5,5);
+prongribwidth=3;
+prongribheight=selsz(0,4);
 ratchetstep=15;
 ratchettooth=3;
 ratchettoothheight=5;
@@ -33,6 +35,8 @@ overlap=0.5;
 cupwidth=selsz(40,60);
 cupheight=selsz(55,75);
 
+cupstrong_dx=selsz(0,-10);
+
 propxshift = 0;
 
 doveclipheight = 10;
@@ -80,13 +84,15 @@ frictionwasherextrapush = 1.0;
 ratchetpawl=ratchetstep-ratchettooth-bigslop*2;
 
 nondove_armbase = 100;
-nondove_armhole_x = 60;
+nondove_armhole_x = 32;
 nondove_armhole_hole = 4;
 nondove_armhole_support = 7;
 nondove_armhole_wall = 4;
 nondove_armhole_slop = 0.5;
 nondove_armhole_slop_x = 0.5;
 
+echo(nondove_armbase);
+
 include <doveclip.scad>
 include <cliphook.scad>
 include <filamentteeth.scad>
@@ -161,7 +167,7 @@ module FilamentCupHandle(){
 
 module FilamentCupCup(){
   for (my=[0,1]) mirror([0,my,0]) {
-    translate([0,cupwidth/2,0])
+    translate([0, cupwidth/2, 0])
       cube([cupheight + prongwidth, prongwidth, prongthick]);
   }
 }
@@ -171,11 +177,31 @@ 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]);
+
+  translate([cupstrong_dx, prongwidth, 0]) {
+    cube([prongwidth, baselen-prongwidth, prongthick]);
+    for (y = [0, .33, .67, 1])
+      translate([0, (baselen - prongwidth) * y, 0])
+	cube([-cupstrong_dx + 1, prongwidth, prongthick]);
+  }
+  if (cupstrong_dx != 0) {
+    rotate([0,0,45])
+      translate([-prongwidth*.55, -prongwidth*2.1, 0])
+      cube([prongwidth*(2.65), prongwidth*4.2, prongthick]);
+  }
+
+  translate([0, -0.2, 0])
+    cube([prongribwidth, baselen, prongthick + prongribheight]);
+
+  if (prongribheight > 0) {
+    translate([-prongwidth, baselen, 0])
+      cube([cupheight/2, prongwidth + prongribheight, prongribwidth]);
+  }
 
   midrad = cupwidth/2 + prongwidth/2;
 
@@ -190,12 +216,12 @@ module FilamentCup() { ////toplevel
 	  prongthick]);
   }
   for (y = [overclipcupgap, overclipcupgap+overclipcupnextgap]) {
-    translate([0, y, 0])
+    translate([cupstrong_dx, y + prongwidth, 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])
+    translate([cupheight + overclipcupnextgap*x, baselen + prongwidth, 0])
       rotate([0,0, 12 + fdia])
       FilamentTeeth(fdia=fdia, h=teethh);
   }      
@@ -419,10 +445,10 @@ module FilamentCupPair(){ ////toplevel
 }
 
 //ArmEnd();
-//FilamentCup();
+FilamentCup();
 //FilamentCupPair();
 //CupSecuringClip();
-Hub();
+//Hub();
 //ArmExtender();
 //Axle();
 //AxleWasher();