X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=filamentspool.scad;h=361b2bc0177d52d01d2c6ec5b8012624270880c2;hb=00246dd5867e65d8007d5934c209b5a60c14bb36;hp=4952aece509d11c0345c8df00311f32827ec89be;hpb=2bb8b4bdf0c7635b478fa5bcf74f9040fcc0d4d9;p=reprap-play.git

diff --git a/filamentspool.scad b/filamentspool.scad
index 4952aec..361b2bc 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -1,20 +1,22 @@
 // -*- C -*-
 
 fdia=2.85;
-lightduty=false;
+lightduty=true;
 
 slop=0.5;
 bigslop=slop*2;
 
 function selsz(sm,lt,lg) = fdia < 2 ? sm : lightduty ? lt : lg;
-function usedove() = selsz(true,false,false);
+function usedove() = selsz(true,true,false);
 
-num_arms = selsz(3,4,4);
+num_arms = selsz(3,3,4);
+
+channelslop=selsz(slop,slop,slop);
 
 exteffrad = 70;
-hubeffrad = selsz(30, 40, 40);
+hubeffrad = selsz(30, 82, 40);
 hubbigrad = selsz(20, 38, 38);
-hublwidth = selsz(3, 4, 4);
+hublwidth = selsz(3, 2.5, 4);
 hubstemwidth = 2;
 hublthick = 10;
 hubaxlerad = selsz(5, 28/2, 28/2);
@@ -25,20 +27,20 @@ axlepadlen = 1.0;
 
 armend_length = 120;
 
-prongthick=selsz(5,5,5);
-prongwidth=selsz(5,5,5);
+prongthick=selsz(5,4,5);
+prongwidth=selsz(5,4,5);
 prongribwidth=3;
-prongribheight=selsz(0,4,4);
+prongribheight=selsz(0,0,4);
 ratchetstep=15;
 ratchettooth=3;
 ratchettoothheight=5;
 ratchettoothsmoothr=1;
 ratchettoothslope=0.75;
 overlap=0.5;
-cupwidth=selsz(40,50,50);
-cupheight=selsz(55,55,55);
+cupwidth=selsz(40,25,50);
+cupheight=selsz(55,25,55);
 
-cupstrong_dx=selsz(0,-10,-10);
+cupstrong_dx=selsz(0,0,-10);
 
 propxshift = -6;
 
@@ -49,14 +51,14 @@ teethgapx=4+fdia;
 
 prongstalkxwidth=3;
 
-stalklength=selsz(35,55,55);
+stalklength=selsz(35,25,55);
 overclipcupgap=5;
 overclipdepth=15;
 overcliproundr=2.0;
 overclipthick=1.0;
-overclipcupnextgap=20;
+overclipcupnextgap=selsz(20,15,20);
 
-hubaxlelen = selsz(25, 87.5, 87.5);
+hubaxlelen = selsz(25, 62.5, 87.5);
 echo(hubaxlelen);
 
 overclipsmaller=-2.5;
@@ -66,8 +68,8 @@ wingspoke=2.5;
 wingsize=6;
 wingthick=3;
 
-armendwallthick=2.5;
-armendbasethick=1.2;
+armendwallthick=selsz(2.5, 1.8, 2.5);
+armendbasethick=selsz(1.2, 1.2, 1.2);
 
 axlehorizoffset = 12.5;
 axlevertheight = 100;
@@ -103,7 +105,7 @@ include <cliphook.scad>
 include <filamentteeth.scad>
 include <axlepin.scad>
 
-channelwidth = prongthick + slop;
+channelwidth = prongthick + channelslop;
 channeldepth = prongwidth + ratchettoothheight;
 totalwidth = armendwallthick*2 + channelwidth;
 totalheight = channeldepth + armendbasethick;
@@ -289,8 +291,8 @@ module Hub(){ ////toplevel
       cylinder(h=hubaxlelen, r=axlerad+hublwidth);
       for (ang=[0 : 360/num_arms : 359])
 	rotate([0,0,ang]) {
-	  difference() {
-	    if (usedove()){
+	  if (usedove()){
+	    difference() {
 	      translate([hubeffrad,0,0])
 		DoveClipPairSane(h=doveclipheight,
 				 baseextend = (hubeffrad - DoveClip_depth()
@@ -299,25 +301,25 @@ module Hub(){ ////toplevel
 		translate([hubbigrad + hublwidth, -holewidth/2, -1])
 		  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);
-	      }
+	    }
+	  } 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);
 	    }
 	  }
 	}
@@ -449,6 +451,12 @@ module FilamentCupPair(){ ////toplevel
     rotate([0,0,180]) FilamentCup();
 }
 
+module Demo(){
+  translate([-hubeffrad-30,50,0]) Hub();
+  ArmEnd();
+  translate([0,50,0]) FilamentCup();
+}
+
 //ArmEnd();
 //FilamentCup();
 //FilamentCupPair();
@@ -459,3 +467,4 @@ module FilamentCupPair(){ ////toplevel
 //AxleWasher();
 //AxlePin();
 //AxleFrictionWasher();
+//Demo();