filamentspool: 3mm: Hub non-dove version prep (nfc if dove)

[reprap-play.git] / filamentspool.scad

diff --git a/filamentspool.scad b/filamentspool.scad
index 57cdce1a3792dcfb01add1b90dfd0bad8c46d7ed..40e893d1dd85a9ebe885a2c472d103d9944e1e87 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -236,40 +236,45 @@ module TowerDoveClipPin(){ ////toplevel
 }
 
 module Hub(){ ////toplevel
-  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);
-  }
+  xmin = axlerad+hublwidth/2;
+  xmax = hubbigrad-hublwidth/2;
   hole = hubeffrad - hubbigrad - DoveClip_depth() - hublwidth*2;
   holewidth = DoveClipPairSane_width() - hubstemwidth*2;
-  for (ang=[0,120,240])
-    rotate([0,0,ang]) {
-      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]);
-       }
+  difference(){
+    union(){
+      difference(){
+       cylinder($fn=60, h=hublthick, r=hubbigrad);
+       translate([0,0,-1])
+         cylinder($fn=30, h=hublthick+2, r=(hubbigrad-hublwidth));
       }
+      cylinder(h=hubaxlelen, r=axlerad+hublwidth);
+      for (ang=[0,120,240])
+       rotate([0,0,ang]) {
+         difference() {
+           if (usedove()){
+             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]);
+             }
+           } else {
+           }
+         }
+       }
+      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.05], [xmax,0.05],
+                    [xmax,hublthick-0.2], [xmin, hubaxlelen-0.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.05], [xmax,0.05],
-                [xmax,hublthick-0.2], [xmin, hubaxlelen-0.2]]);
-    }
+    translate([0,0,-1]) cylinder($fn=60, h=hubaxlelen+2, r=axlerad);
+  }
 }
 
 module ArmExtender(){ ////toplevel