X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=filamentspool.scad;h=4e69f42dbf6effc557838d7be9b7114c3f86962d;hb=04e4c2aa25e11210f6e1ffbf4fb34848d2bf30f1;hp=eb6e65cb61eddb31e65dc8033d2886933ce8fd4a;hpb=627b8cd7c421163a99e75ab26853f51573633099;p=reprap-play.git

diff --git a/filamentspool.scad b/filamentspool.scad
index eb6e65c..4e69f42 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -5,21 +5,23 @@ fdia=2.85;
 slop=0.5;
 bigslop=slop*2;
 
+function selsz(sm,lg) = fdia < 2 ? sm : lg;
+function usedove() = selsz(true,false);
+
+num_arms = selsz(3,4);
+
 exteffrad = 70;
-hubeffrad = 30;
-hubbigrad = 20;
-hublwidth = 3;
+hubeffrad = selsz(30, 50);
+hubbigrad = selsz(20, 45);
+hublwidth = selsz(3, 5);
 hubstemwidth = 2;
 hublthick = 10;
-hubaxlelen = 25;
-hubaxlerad = 5;
+hubaxlerad = selsz(5, 17/2);
 totalheightfromtower = 240;
 axletowerfudgebend = 0;
 axleaxlefudgebend = 3;
 axlepadlen = 1.0;
 
-function selsz(sm,lg) = fdia < 2 ? sm : lg;
-
 prongthick=selsz(5,7);
 prongwidth=selsz(5,7);
 ratchetstep=15;
@@ -44,9 +46,11 @@ stalklength=selsz(35,55);
 overclipcupgap=5;
 overclipdepth=15;
 overcliproundr=2.0;
-overclipthick=0.5;
+overclipthick=1.0;
 overclipcupnextgap=20;
 
+hubaxlelen = selsz(25, cupwidth);
+
 overclipsmaller=-2.5;
 overclipbigger=0.0;
 
@@ -75,6 +79,14 @@ frictionwasherextrapush = 1.0;
 
 ratchetpawl=ratchetstep-ratchettooth-bigslop*2;
 
+nondove_armbase = 100;
+nondove_armhole_x = 60;
+nondove_armhole_hole = 4;
+nondove_armhole_support = 7;
+nondove_armhole_wall = 4;
+nondove_armhole_slop = 0.5;
+nondove_armhole_slop_x = 0.5;
+
 include <doveclip.scad>
 include <cliphook.scad>
 include <filamentteeth.scad>
@@ -87,9 +99,21 @@ totalheight = channeldepth + armendbasethick;
 stalkwidth = prongwidth + prongstalkxwidth;
 
 module ArmEnd(length=120){ ////toplevel
-  translate([ratchettoothsmoothr, channelwidth/2, -armendbasethick]) {
-    rotate([0,0,-90])
-      DoveClipPairBase(h=doveclipheight);
+  if (usedove()) {
+    translate([ratchettoothsmoothr, channelwidth/2, -armendbasethick]) {
+      rotate([0,0,-90])
+	DoveClipPairBase(h=doveclipheight);
+    }
+  } else {
+    difference(){
+      translate([1, -armendwallthick, -armendbasethick])
+	mirror([1,0,0])
+	cube([nondove_armbase+1, totalwidth, totalheight]);
+      translate([-nondove_armbase + nondove_armhole_x,
+		 -armendwallthick + totalwidth/2,
+		 -armendbasethick -1])
+	cylinder(r= nondove_armhole_hole/2, h=totalheight+2, $fn=10);
+    }
   }
 
   difference(){
@@ -147,11 +171,11 @@ 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]);
 
   midrad = cupwidth/2 + prongwidth/2;
 
@@ -171,7 +195,7 @@ module FilamentCup() { ////toplevel
       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 + prongthick, 0])
       rotate([0,0, 12 + fdia])
       FilamentTeeth(fdia=fdia, h=teethh);
   }      
@@ -218,40 +242,64 @@ module TowerDoveClipPin(){ ////toplevel
 }
 
 module Hub(){ ////toplevel
-  difference(){
-    cylinder($fn=60, h=hublthick, r=hubbigrad);
-    translate([0,0,-1])
-      cylinder($fn=30, h=hublthick+2, r=(hubbigrad-hublwidth));
-  }
   axlerad = hubaxlerad + slop;
-  difference(){
-    cylinder(h=hubaxlelen, r=axlerad+hublwidth);
-    translate([0,0,-1]) cylinder($fn=60, h=hubaxlelen+2, r=axlerad);
-  }
+  xmin = axlerad+hublwidth/2;
+  xmax = hubbigrad-hublwidth/2;
   hole = hubeffrad - hubbigrad - DoveClip_depth() - hublwidth*2;
   holewidth = DoveClipPairSane_width() - hubstemwidth*2;
-  for (ang=[0,120,240])
-    rotate([0,0,ang]) {
-      difference() {
-	translate([hubeffrad,0,0])
-	  DoveClipPairSane(h=doveclipheight,
-			   baseextend = (hubeffrad - DoveClip_depth()
-					 - hubbigrad + hublwidth));
-	if (hole>hublwidth && holewidth > 2) {
-	  translate([hubbigrad + hublwidth, -holewidth/2, -1])
-	    cube([hole, holewidth, hublthick+2]);
-	}
+  nondove_allwidth = nondove_armhole_wall*2 + totalwidth;
+  difference(){
+    union(){
+      difference(){
+	cylinder($fn=60, h=hublthick, r=hubbigrad);
+	translate([0,0,-1])
+	  cylinder($fn=30, h=hublthick+2, r=(hubbigrad-hublwidth));
       }
+      cylinder(h=hubaxlelen, r=axlerad+hublwidth);
+      for (ang=[0 : 360/num_arms : 359])
+	rotate([0,0,ang]) {
+	  difference() {
+	    if (usedove()){
+	      translate([hubeffrad,0,0])
+		DoveClipPairSane(h=doveclipheight,
+				 baseextend = (hubeffrad - DoveClip_depth()
+					       - hubbigrad + hublwidth));
+	      if (hole>hublwidth && holewidth > 2) {
+		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);
+	      }
+	    }
+	  }
+	}
+      for (ang = [0 : 180/num_arms : 359])
+	rotate([0,0,ang]) rotate([90,0,0]) {
+	  translate([0,0,-hublwidth/2])
+	    linear_extrude(height=hublwidth)
+	    polygon([[xmin,0.05], [xmax,0.05],
+		     [xmax,hublthick-0.2], [xmin, hubaxlelen-0.2]]);
+	}
     }
-  xmin = axlerad+hublwidth/2;
-  xmax = hubbigrad-hublwidth/2;
-  for (ang = [0 : 60 : 359])
-    rotate([0,0,ang]) rotate([90,0,0]) {
-      translate([0,0,-hublwidth/2])
-	linear_extrude(height=hublwidth)
-	polygon([[xmin,0.05], [xmax,0.05],
-		 [xmax,hublthick-0.2], [xmin, hubaxlelen-0.2]]);
-    }
+    translate([0,0,-1]) cylinder($fn=60, h=hubaxlelen+2, r=axlerad);
+  }
 }
 
 module ArmExtender(){ ////toplevel
@@ -371,9 +419,9 @@ module FilamentCupPair(){ ////toplevel
 }
 
 //ArmEnd();
-//FilamentCup();
+FilamentCup();
 //FilamentCupPair();
-CupSecuringClip();
+//CupSecuringClip();
 //Hub();
 //ArmExtender();
 //Axle();