Revert "filamentspool: 3mm: Increase ArmEnd length"

[reprap-play.git] / filamentspool.scad

diff --git a/filamentspool.scad b/filamentspool.scad
index 40e893d1dd85a9ebe885a2c472d103d9944e1e87..283dd1080986a0632541394f7a6bfe8b11d0d0d1 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -8,9 +8,11 @@ bigslop=slop*2;
 function selsz(sm,lg) = fdia < 2 ? sm : lg;
 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;
@@ -20,16 +22,22 @@ axletowerfudgebend = 0;
 axleaxlefudgebend = 3;
 axlepadlen = 1.0;
 
-prongthick=selsz(5,7);
-prongwidth=selsz(5,7);
+armend_length = 120;
+
+prongthick=selsz(5,5);
+prongwidth=selsz(5,5);
+prongribwidth=3;
+prongribheight=selsz(0,4);
 ratchetstep=15;
 ratchettooth=3;
 ratchettoothheight=5;
 ratchettoothsmoothr=1;
 ratchettoothslope=0.75;
 overlap=0.5;
-cupwidth=selsz(40,60);
-cupheight=selsz(55,75);
+cupwidth=selsz(40,50);
+cupheight=selsz(55,55);
+
+cupstrong_dx=selsz(0,-10);
 
 propxshift = 0;
 
@@ -77,9 +85,16 @@ 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;
+
+nondove_armbase = nondove_armhole_x + nondove_armhole_hole/2 +
+  nondove_armhole_support;
+echo(nondove_armbase);
 
 include <doveclip.scad>
 include <cliphook.scad>
@@ -92,7 +107,7 @@ totalwidth = armendwallthick*2 + channelwidth;
 totalheight = channeldepth + armendbasethick;
 stalkwidth = prongwidth + prongstalkxwidth;
 
-module ArmEnd(length=120){ ////toplevel
+module ArmEnd(length=armend_length){ ////toplevel
   if (usedove()) {
     translate([ratchettoothsmoothr, channelwidth/2, -armendbasethick]) {
       rotate([0,0,-90])
@@ -155,7 +170,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]);
   }
 }
@@ -165,11 +180,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;
 
@@ -184,12 +219,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);
   }      
@@ -241,6 +276,7 @@ module Hub(){ ////toplevel
   xmax = hubbigrad-hublwidth/2;
   hole = hubeffrad - hubbigrad - DoveClip_depth() - hublwidth*2;
   holewidth = DoveClipPairSane_width() - hubstemwidth*2;
+  nondove_allwidth = nondove_armhole_wall*2 + totalwidth;
   difference(){
     union(){
       difference(){
@@ -249,7 +285,7 @@ module Hub(){ ////toplevel
          cylinder($fn=30, h=hublthick+2, r=(hubbigrad-hublwidth));
       }
       cylinder(h=hubaxlelen, r=axlerad+hublwidth);
-      for (ang=[0,120,240])
+      for (ang=[0 : 360/num_arms : 359])
        rotate([0,0,ang]) {
          difference() {
            if (usedove()){
@@ -262,10 +298,28 @@ module Hub(){ ////toplevel
                  cube([hole, holewidth, hublthick+2]);
              }
            } else {
+             difference(){
+               translate([0,
+                          -nondove_allwidth/2,
+                          0])
+                 cube([hubeffrad + nondove_armhole_x
+                       + nondove_armhole_hole/2 + nondove_armhole_support,
+                       nondove_allwidth,
+                       nondove_armhole_wall + totalheight]);
+               translate([hubeffrad - nondove_armhole_slop_x,
+                          -nondove_allwidth/2
+                          + nondove_armhole_wall - nondove_armhole_slop,
+                          nondove_armhole_wall])
+                 cube([nondove_armhole_x + 50,
+                       totalwidth + nondove_armhole_slop*2,
+                       totalheight + 1]);
+               translate([hubeffrad + nondove_armhole_x, 0, -20])
+                  cylinder(r= nondove_armhole_hole/2, h=50, $fn=10);
+             }
            }
          }
        }
-      for (ang = [0 : 60 : 359])
+      for (ang = [0 : 180/num_arms : 359])
        rotate([0,0,ang]) rotate([90,0,0]) {
          translate([0,0,-hublwidth/2])
            linear_extrude(height=hublwidth)
@@ -394,10 +448,10 @@ module FilamentCupPair(){ ////toplevel
 }
 
 //ArmEnd();
-//FilamentCup();
+FilamentCup();
 //FilamentCupPair();
 //CupSecuringClip();
-Hub();
+//Hub();
 //ArmExtender();
 //Axle();
 //AxleWasher();