Revert "filamentspool: 3mm: Increase ArmEnd length"

[reprap-play.git] / filamentspool.scad

diff --git a/filamentspool.scad b/filamentspool.scad
index fb2f8a9711a2d36b8a1ec445c10b19e449386173..283dd1080986a0632541394f7a6bfe8b11d0d0d1 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -22,7 +22,9 @@ axletowerfudgebend = 0;
 axleaxlefudgebend = 3;
 axlepadlen = 1.0;
 
-prongthick=selsz(5,7);
+armend_length = 120;
+
+prongthick=selsz(5,5);
 prongwidth=selsz(5,5);
 prongribwidth=3;
 prongribheight=selsz(0,4);
@@ -32,8 +34,8 @@ 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);
 
@@ -83,14 +85,17 @@ 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>
 include <filamentteeth.scad>
@@ -102,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])
@@ -183,8 +188,8 @@ module FilamentCup() { ////toplevel
 
   translate([cupstrong_dx, prongwidth, 0]) {
     cube([prongwidth, baselen-prongwidth, prongthick]);
-    for (y = [0, .4, .7, 1])
-      translate([0, (baselen - prongwidth*2) * y, 0])
+    for (y = [0, .33, .67, 1])
+      translate([0, (baselen - prongwidth) * y, 0])
        cube([-cupstrong_dx + 1, prongwidth, prongthick]);
   }
   if (cupstrong_dx != 0) {
@@ -196,6 +201,11 @@ module FilamentCup() { ////toplevel
   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;
 
   propshift = stalklength - overclipdepth - prongthick + propxshift;