X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=filamentspool.scad;h=487d853b0645b524d5d6ca1f7dc8a0f8aa016b39;hb=fcd425d28e0fd254673250e4c5d13db7b98aab48;hp=769dffd5f19b8a9af88dd1746eaf0255497dc245;hpb=074bb8d5787f8b2b50408d1725542a5caaabd665;p=reprap-play.git

diff --git a/filamentspool.scad b/filamentspool.scad
index 769dffd..487d853 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -5,9 +5,10 @@ fdia=1.75;
 slop=0.5;
 bigslop=slop*2;
 
-hubeffrad = 30;
+hubeffrad = 30; // + 55;
 hubbigrad = 20;
 hublwidth = 3;
+hubstemwidth = 2;
 hublthick = 10;
 hubaxlelen = 25;
 hubaxlerad = 5;
@@ -61,7 +62,7 @@ totalwidth = armendwallthick*2 + channelwidth;
 totalheight = channeldepth + armendbasethick;
 stalkwidth = prongwidth + prongstalkxwidth;
 
-module ArmEnd(length=120){
+module ArmEnd(length=120){ ////toplevel
   translate([ratchettoothsmoothr, channelwidth/2, -armendbasethick]) {
     rotate([0,0,-90])
       DoveClipPairBase(h=doveclipheight);
@@ -121,7 +122,7 @@ module FilamentCupCup(){
   }
 }
 
-module FilamentCup() {
+module FilamentCup() { ////toplevel
   FilamentCupHandle();
 
   dx = cupbigrad + prongwidth;
@@ -167,7 +168,7 @@ module CupSecuringClipSolidSmooth(xrad=0, xdepth=0){
   }
 }
 
-module CupSecuringClip(){
+module CupSecuringClip(){ ////toplevel
   wingswidth = wingspoke*2 + overclipthick*2 + overcliproundr*2 + totalwidth;
   difference(){
     union(){
@@ -180,35 +181,48 @@ module CupSecuringClip(){
   }
 }
 
-module ArmDoveClipPin(){
+module ArmDoveClipPin(){ ////toplevel
   DoveClipPin(h=doveclipheight);
 }
 
-module Hub(){
+module Hub(){ ////toplevel
   difference(){
-    cylinder(h=hublthick, r=hubbigrad);
-    translate([0,0,-1]) cylinder(h=hublthick+2, r=(hubbigrad-hublwidth));
+    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=hubaxlerad+hublwidth);
-    translate([0,0,-1]) cylinder(h=hubaxlelen+2, r=hubaxlerad);
+    cylinder(h=hubaxlelen, r=axlerad+hublwidth);
+    translate([0,0,-1]) cylinder($fn=60, h=hubaxlelen+2, r=axlerad);
   }
+  hole = hubeffrad - hubbigrad - DoveClip_depth() - hublwidth*2;
+  holewidth = DoveClip_width() - hubstemwidth*2;
   for (ang=[0,120,240])
     rotate([0,0,ang]) {
-      translate([hubbigrad,0,0])
-	rotate([0,0,90])
-	DoveClipPairBase(baseextend=hublwidth, h=doveclipheight);
+      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]);
+	}
+      }
     }
-  xmin = hubaxlerad+hublwidth/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], [xmax,0], [xmax,hublthick], [xmin,hubaxlelen]]);
+	polygon([[xmin,0.05], [xmax,0.05],
+		 [xmax,hublthick-0.2], [xmin, hubaxlelen-0.2]]);
     }
 }
 
 //ArmEnd();
 //FilamentCup();
 //CupSecuringClip();
+//Hub();