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

diff --git a/filamentspool.scad b/filamentspool.scad
index 195284d..0a80d02 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -284,6 +284,9 @@ 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]);
     }
   }
 
@@ -317,23 +320,31 @@ module ArmEnd(length=armend_length){ ////toplevel
   }
 
   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]);
+    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]);
+	}
+      }
+    }
+    if (usedove()){
+      translate([0,0, -armendbasethick])
+	Commitid_BestCount_M([length/3, totalwidth]);
     }
   }
 }
@@ -366,7 +377,7 @@ module FilamentCupCup(){
   }
 }
 
-module FilamentCup() { ////toplevel
+module FilamentCupPositive() {
   FilamentCupHandle();
 
   gapy = prongwidth;
@@ -421,6 +432,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 +538,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),
+			  ]);
   }
 }