Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play

[reprap-play.git] / filamentspool.scad

diff --git a/filamentspool.scad b/filamentspool.scad
index 929994f2b86859887923a63d594e7a6ff527b18c..04e5c09a1c57150cb90e7fda7774344d04cb755a 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -62,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);
@@ -122,7 +122,7 @@ module FilamentCupCup(){
   }
 }
 
-module FilamentCup() {
+module FilamentCup() { ////toplevel
   FilamentCupHandle();
 
   dx = cupbigrad + prongwidth;
@@ -168,7 +168,7 @@ module CupSecuringClipSolidSmooth(xrad=0, xdepth=0){
   }
 }
 
-module CupSecuringClip(){
+module CupSecuringClip(){ ////toplevel
   wingswidth = wingspoke*2 + overclipthick*2 + overcliproundr*2 + totalwidth;
   difference(){
     union(){
@@ -181,19 +181,20 @@ 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 + bigslop;
+  axlerad = hubaxlerad + slop;
   difference(){
     cylinder(h=hubaxlelen, r=axlerad+hublwidth);
-    translate([0,0,-1]) cylinder(h=hubaxlelen+2, r=axlerad);
+    translate([0,0,-1]) cylinder($fn=60, h=hubaxlelen+2, r=axlerad);
   }
   hole = hubeffrad - hubbigrad - DoveClip_depth() - hublwidth*2;
   holewidth = DoveClip_width() - hubstemwidth*2;
@@ -216,7 +217,8 @@ module Hub(){
     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]]);
     }
 }