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

diff --git a/filamentspool.scad b/filamentspool.scad
index 37edb6b..b28ccac 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -1,22 +1,23 @@
 // -*- 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;
@@ -24,22 +25,22 @@ axlepadlen = 1.0;
 
 armend_length = 120;
 
-prongthick=selsz(5,5);
-prongwidth=selsz(5,5);
+prongthick=selsz(5,5,5);
+prongwidth=selsz(5,5,5);
 prongribwidth=3;
-prongribheight=selsz(0,4);
+prongribheight=selsz(0,4,4);
 ratchetstep=15;
 ratchettooth=3;
 ratchettoothheight=5;
 ratchettoothsmoothr=1;
 ratchettoothslope=0.75;
 overlap=0.5;
-cupwidth=selsz(40,50);
-cupheight=selsz(55,55);
+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;
 
@@ -48,25 +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*.75 + 20);
+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;
@@ -89,7 +90,7 @@ ratchetpawl=ratchetstep-ratchettooth-bigslop*2;
 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;