X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=filamentspool.scad;h=fe29eea1f926f91efcb8fe8c085ac610f63b789d;hp=195284dab509db3bfe141f4ae21af1935cc15ac1;hb=a75f4245977276aed475729d9c71faad2a0c528e;hpb=75708683390f494048afdec83a32744572dac32e

diff --git a/filamentspool.scad b/filamentspool.scad
index 195284d..fe29eea 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -158,7 +158,7 @@ channelslop=selsz(slop,0.75,slop);
 exteffrad = 70;
 hubeffrad = selsz(30, 82, 40);
 hubbigrad = selsz(20, 38, 38);
-hublwidth = selsz(3, 2.5, 4);
+hublwidth = selsz(3, 2.5, 3.0);
 hubstemwidth = 2;
 hublthick = 10;
 hubaxlerad = selsz(5, 28/2, 28/2);
@@ -284,56 +284,68 @@ module ArmEnd(length=armend_length){ ////toplevel
 		 -armendwallthick + totalwidth/2,
 		 -armendbasethick -1])
 	cylinder(r= nondove_armhole_hole/2, h=totalheight+2, $fn=10);
+      translate([-nondove_armbase, -armendwallthick, -armendbasethick])
+        rotate([90,0,0])
+	Commitid_BestCount([nondove_armbase, totalwidth]);
     }
   }
 
-  for (otherside=[0,1]) {
-    for (circum = [300:100:1500]) {
-      assign(rad = circum / tau)
-	assign(fn = str("filamentspool-number-n",circum,".dxf"))
-	assign(rotateoffset = [0, totalwidth/2, 0])
-	assign(xlen = rad - real_exteffrad) {
-	if (xlen >= numbers_tick_width/2
-	    + (otherside ? numbers_height_allow : 0) &&
-	    xlen <= length - (otherside ? 0 : numbers_height_allow))
-	  translate([xlen, -armendwallthick,
-		     -armendbasethick + (totalheight - numbers_tick_len)/2])
-	  translate(rotateoffset)
-	  rotate([0,0, otherside*180])
-	  translate(-rotateoffset){
-	    translate([-numbers_tick_width/2, -1, 0])
-	      cube([numbers_tick_width, numbers_relief+1, numbers_tick_len]);
-	    translate([numbers_tick_width/2 + numbers_tick_linespc,
-		       1,
-		       numbers_tick_len])
-	      rotate([90,0,0])
-	      rotate([0,0,-90])
-	      linear_extrude(height= numbers_relief+1)
-	      //    scale(templatescale)
-	      import(file=fn, convexity=100);
-	  }
+  difference(){
+    union(){
+      difference(){
+	translate([0, -armendwallthick, -armendbasethick])
+	  cube([length, totalwidth, totalheight]);
+	translate([-1, 0, 0])
+	  cube([length+1 - ratchettooth, channelwidth, channeldepth+1]);
+	translate([-1, 0, ratchettoothheight])
+	  cube([length+2, channelwidth, channeldepth+1]);
+      }
+      for (dx = [0 : ratchetstep : length - ratchetstep]) translate([dx,0,0]) {
+	translate([ratchettoothsmoothr+0.5, armendwallthick/2, 0]) minkowski(){
+	  rotate([90,0,0])
+	    cylinder($fn=20, r=ratchettoothsmoothr, h=armendwallthick);
+	  multmatrix([	[	1, 0, ratchettoothslope, 0	],
+			    [	0,	1,	0,	0	],
+			    [	0,	0,	1,	0	],
+			    [	0,	0,	0,	1	]])
+	    cube([ratchettooth - ratchettoothsmoothr*2,
+		  channelwidth, ratchettoothheight - ratchettoothsmoothr]);
+	}
       }
     }
-  }
 
-  difference(){
-    translate([0, -armendwallthick, -armendbasethick])
-      cube([length, totalwidth, totalheight]);
-    translate([-1, 0, 0])
-      cube([length+1 - ratchettooth, channelwidth, channeldepth+1]);
-    translate([-1, 0, ratchettoothheight])
-      cube([length+2, channelwidth, channeldepth+1]);
-  }
-  for (dx = [0 : ratchetstep : length - ratchetstep]) translate([dx,0,0]) {
-    translate([ratchettoothsmoothr+0.5, armendwallthick/2, 0]) minkowski(){
-      rotate([90,0,0])
-	cylinder($fn=20, r=ratchettoothsmoothr, h=armendwallthick);
-      multmatrix([	[	1, 0, ratchettoothslope, 0	],
-			[	0,	1,	0,	0	],
-			[	0,	0,	1,	0	],
-			[	0,	0,	0,	1	]])
-	cube([ratchettooth - ratchettoothsmoothr*2,
-	      channelwidth, ratchettoothheight - ratchettoothsmoothr]);
+    for (otherside=[0,1]) {
+      for (circum = [300:100:1500]) {
+	assign(rad = circum / tau)
+	  assign(fn = str("filamentspool-number-n",circum,".dxf"))
+	  assign(rotateoffset = [0, totalwidth/2, 0])
+	  assign(xlen = rad - real_exteffrad) {
+	  if (xlen >= numbers_tick_width/2
+	      + (otherside ? numbers_height_allow : 0) &&
+	      xlen <= length - (otherside ? 0 : numbers_height_allow))
+	    translate([xlen, -armendwallthick,
+		       -armendbasethick + (totalheight - numbers_tick_len)/2])
+	    translate(rotateoffset)
+	    rotate([0,0, otherside*180])
+	    translate(-rotateoffset){
+	      translate([-numbers_tick_width/2, -1, 0])
+		cube([numbers_tick_width, numbers_relief+1, numbers_tick_len]);
+	      translate([numbers_tick_width/2 + numbers_tick_linespc,
+			 1,
+			 numbers_tick_len])
+		rotate([90,0,0])
+		rotate([0,0,-90])
+		linear_extrude(height= numbers_relief+1)
+		//    scale(templatescale)
+		import(file=fn, convexity=100);
+	    }
+	}
+      }
+    }
+
+    if (usedove()){
+      translate([0, -armendwallthick, -armendbasethick])
+	Commitid_BestCount_M([length/3, totalwidth]);
     }
   }
 }
@@ -366,7 +378,7 @@ module FilamentCupCup(){
   }
 }
 
-module FilamentCup() { ////toplevel
+module FilamentCupPositive() {
   FilamentCupHandle();
 
   gapy = prongwidth;
@@ -421,6 +433,14 @@ module FilamentCup() { ////toplevel
   }      
 }
 
+module FilamentCup() { ////toplevel
+  difference(){
+    FilamentCupPositive();
+    translate([0, -stalkwidth, 0])
+      Commitid_BestCount_M([stalklength - stalkwidth, stalkwidth]);
+  }
+}
+
 module CupSecuringClipSolid(w,d,h1,h2){
   rotate([0,-90,0]) translate([0,-h1/2,-w/2]) linear_extrude(height=w) {
     polygon(points=[[0,0], [d,0], [d,h2], [0,h1]]);
@@ -519,14 +539,15 @@ module Hub(){ ////toplevel
     }
     translate([0,0,-1]) cylinder($fn=60, h=hubaxlelen+2, r=axlerad);
 
-    translate([hubbigrad - hublwidth,
-	       -DoveClipPairSane_width()/2,
-	       0])
-      Commitid_BestCount_M([(usedove()
-			      ? hubeffrad - DoveClip_depth()
-			      : hubeffrad)-
-			     (hubbigrad - hublwidth),
-			     DoveClipPairSane_width()]);
+    rotate([0,0, selsz(0,0,45)])
+      translate([axlerad+hublwidth,
+		 -hublwidth/2,
+		 0])
+      rotate([90,0,0])
+      Commitid_BestCount([(hubbigrad-hublwidth) - (axlerad+hublwidth),
+			  hublthick +
+			  hublwidth/2 * hubaxlelen/(hubbigrad-axlerad),
+			  ]);
   }
 }