X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=filamentspool.scad;h=b28ccac1a847d01aa6aa25deb917ded9d06715ff;hb=74ac2b5d5bd692c2601a3ab174ae4d53c5102501;hp=f021f5c0c0fd7c2c64cd27f9f7b98a4d1189ce6f;hpb=a4959541e46253b6a0d48784745a144d17bba452;p=reprap-play.git

diff --git a/filamentspool.scad b/filamentspool.scad
index f021f5c..b28ccac 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -1,41 +1,46 @@
 // -*- C -*-
 
 fdia=2.85;
+lightduty=false;
 
 slop=0.5;
 bigslop=slop*2;
 
-function selsz(sm,lg) = fdia < 2 ? sm : lg;
-function usedove() = selsz(true,false);
+function selsz(sm,lt,lg) = fdia < 2 ? sm : lightduty ? lt : lg;
+function usedove() = selsz(true,false,false);
 
-num_arms = selsz(3,4);
+num_arms = selsz(3,4,4);
 
 exteffrad = 70;
-hubeffrad = selsz(30, 50);
-hubbigrad = selsz(20, 45);
-hublwidth = selsz(3, 5);
+hubeffrad = selsz(30, 40, 40);
+hubbigrad = selsz(20, 38, 38);
+hublwidth = selsz(3, 4, 4);
 hubstemwidth = 2;
 hublthick = 10;
-hubaxlerad = selsz(5, 17/2);
+hubaxlerad = selsz(5, 28/2, 28/2);
 totalheightfromtower = 240;
 axletowerfudgebend = 0;
 axleaxlefudgebend = 3;
 axlepadlen = 1.0;
 
-prongthick=selsz(5,7);
-prongwidth=selsz(5,7);
+armend_length = 120;
+
+prongthick=selsz(5,5,5);
+prongwidth=selsz(5,5,5);
+prongribwidth=3;
+prongribheight=selsz(0,4,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,50);
+cupheight=selsz(55,55,55);
 
-cupstrong_dx=selsz(0,-10);
+cupstrong_dx=selsz(0,-10,-10);
 
-propxshift = 0;
+propxshift = -6;
 
 doveclipheight = 10;
 
@@ -44,24 +49,25 @@ teethgapx=4+fdia;
 
 prongstalkxwidth=3;
 
-stalklength=selsz(35,55);
+stalklength=selsz(35,55,55);
 overclipcupgap=5;
 overclipdepth=15;
 overcliproundr=2.0;
 overclipthick=1.0;
-overclipcupnextgap=20;
+overclipcupnextgap=selsz(20,20,20);
 
-hubaxlelen = selsz(25, cupwidth);
+hubaxlelen = selsz(25, 87.5, 87.5);
+echo(hubaxlelen);
 
 overclipsmaller=-2.5;
 overclipbigger=0.0;
 
-wingspoke=3;
+wingspoke=2.5;
 wingsize=6;
 wingthick=3;
 
-armendwallthick=2.5;
-armendbasethick=1.2;
+armendwallthick=selsz(2.5, 2.5, 2.5);
+armendbasethick=selsz(1.2, 1.2, 1.2);
 
 axlehorizoffset = 12.5;
 axlevertheight = 100;
@@ -81,14 +87,17 @@ frictionwasherextrapush = 1.0;
 
 ratchetpawl=ratchetstep-ratchettooth-bigslop*2;
 
-nondove_armbase = 100;
-nondove_armhole_x = 60;
-nondove_armhole_hole = 4;
+nondove_armhole_x = 32;
+nondove_armhole_hole = 4 + 0.8;
 nondove_armhole_support = 7;
-nondove_armhole_wall = 4;
+nondove_armhole_wall = 3.2;
 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>
@@ -100,7 +109,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])
@@ -163,7 +172,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]);
   }
 }
@@ -181,8 +190,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) {
@@ -191,6 +200,14 @@ module FilamentCup() { ////toplevel
       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;
 
   propshift = stalklength - overclipdepth - prongthick + propxshift;
@@ -209,7 +226,7 @@ module FilamentCup() { ////toplevel
       FilamentTeeth(fdia=fdia, h=teethh);
   }
   for (x = [-0.3, -1.3]) {
-    translate([cupheight + overclipcupnextgap*x, baselen + prongthick, 0])
+    translate([cupheight + overclipcupnextgap*x, baselen + prongwidth, 0])
       rotate([0,0, 12 + fdia])
       FilamentTeeth(fdia=fdia, h=teethh);
   }      
@@ -433,7 +450,7 @@ module FilamentCupPair(){ ////toplevel
 }
 
 //ArmEnd();
-FilamentCup();
+//FilamentCup();
 //FilamentCupPair();
 //CupSecuringClip();
 //Hub();