filamentspool: Reorg so axle hole is subtracted from whole hub (nfc)

[reprap-play.git] / filamentspool.scad

diff --git a/filamentspool.scad b/filamentspool.scad
index 3194112d489454c6a0166c983ef04bc42f3c0fca..5e52e627cd1926ccf825b7ecc9b3da75905b42e0 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -241,15 +241,14 @@ module Hub(){ ////toplevel
   xmax = hubbigrad-hublwidth/2;
   hole = hubeffrad - hubbigrad - DoveClip_depth() - hublwidth*2;
   holewidth = DoveClipPairSane_width() - hubstemwidth*2;
+  difference(){
+    union(){
   difference(){
     cylinder($fn=60, h=hublthick, r=hubbigrad);
     translate([0,0,-1])
       cylinder($fn=30, h=hublthick+2, r=(hubbigrad-hublwidth));
   }
-  difference(){
     cylinder(h=hubaxlelen, r=axlerad+hublwidth);
-    translate([0,0,-1]) cylinder($fn=60, h=hubaxlelen+2, r=axlerad);
-  }
   for (ang=[0,120,240])
     rotate([0,0,ang]) {
       difference() {
@@ -271,6 +270,9 @@ module Hub(){ ////toplevel
                 [xmax,hublthick-0.2], [xmin, hubaxlelen-0.2]]);
     }
 }
+    translate([0,0,-1]) cylinder($fn=60, h=hubaxlelen+2, r=axlerad);
+  }
+}
 
 module ArmExtender(){ ////toplevel
   DoveClipExtender(length=exteffrad-hubeffrad,