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

diff --combined filamentspool.scad
index 487d853b0645b524d5d6ca1f7dc8a0f8aa016b39,4c930fddb2d2b203084111a7449923fa97dad396..04e5c09a1c57150cb90e7fda7774344d04cb755a
--- 1/filamentspool.scad
--- 2/filamentspool.scad
+++ b/filamentspool.scad
@@@ -62,7 -62,7 +62,7 @@@ totalwidth = armendwallthick*2 + channe
  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 +122,7 @@@ module FilamentCupCup()
    }
  }
  
 -module FilamentCup() {
 +module FilamentCup() { ////toplevel
    FilamentCupHandle();
  
    dx = cupbigrad + prongwidth;
@@@ -168,7 -168,7 +168,7 @@@ module CupSecuringClipSolidSmooth(xrad=
    }
  }
  
 -module CupSecuringClip(){
 +module CupSecuringClip(){ ////toplevel
    wingswidth = wingspoke*2 + overclipthick*2 + overcliproundr*2 + totalwidth;
    difference(){
      union(){
@@@ -181,11 -181,11 +181,11 @@@
    }
  }
  
 -module ArmDoveClipPin(){
 +module ArmDoveClipPin(){ ////toplevel
    DoveClipPin(h=doveclipheight);
  }
  
 -module Hub(){
 +module Hub(){ ////toplevel
    difference(){
      cylinder($fn=60, h=hublthick, r=hubbigrad);
      translate([0,0,-1])
@@@ -225,4 -225,5 +225,5 @@@
  //ArmEnd();
  //FilamentCup();
  //CupSecuringClip();
- //Hub();
+ 
+ Hub();