filamentspool: Reorg so axle hole is subtracted from whole hub: move some local varia...

diff --git a/filamentspool.scad b/filamentspool.scad
index 57cdce1a3792dcfb01add1b90dfd0bad8c46d7ed..3194112d489454c6a0166c983ef04bc42f3c0fca 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -236,18 +236,20 @@ module TowerDoveClipPin(){ ////toplevel
 }
 
 module Hub(){ ////toplevel
+  axlerad = hubaxlerad + slop;
+  xmin = axlerad+hublwidth/2;
+  xmax = hubbigrad-hublwidth/2;
+  hole = hubeffrad - hubbigrad - DoveClip_depth() - hublwidth*2;
+  holewidth = DoveClipPairSane_width() - hubstemwidth*2;
   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);
   }
-  hole = hubeffrad - hubbigrad - DoveClip_depth() - hublwidth*2;
-  holewidth = DoveClipPairSane_width() - hubstemwidth*2;
   for (ang=[0,120,240])
     rotate([0,0,ang]) {
       difference() {
@@ -261,8 +263,6 @@ module Hub(){ ////toplevel
        }
       }
     }
-  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])