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

diff --combined filamentspool.scad
index b5a4817773303ba026bb7bbd94a5fafceb9655b5,873f87c39e14e7e7d696c48ccc16f8988738367d..4aae9c8e27fa0d648acee7669f6d2a9b57831122
--- 1/filamentspool.scad
--- 2/filamentspool.scad
+++ b/filamentspool.scad
@@@ -202,10 -202,6 +202,10 @@@ module ArmDoveClipPin(){ ////topleve
    DoveClipPin(h=doveclipheight);
  }
  
 +module TowerDoveClipPin(){ ////toplevel
 +  DoveClipPin(h=towercliph/2);
 +}
 +
  module Hub(){ ////toplevel
    difference(){
      cylinder($fn=60, h=hublthick, r=hubbigrad);
@@@ -265,7 -261,6 +265,6 @@@ module AxlePin(){ ////topleve
  module Axle(){ ////toplevel
    pillarswidth = DoveClipPairSane_width(towerclipcount);
  
- if(0)
    rotate([0,0, -( axleaxlefudgebend + atan(slop/hubaxlelen) ) ])
    translate([-axlehorizoffset, -axlevertheight, 0]) {
      rotate([0,0,-axletowerfudgebend])
@@@ -301,7 -296,7 +300,7 @@@
              rotate([0,90,0])
              cylinder($fn=60,
                       r = towercliph - shift,
-                      h = pillarswidth * 0.5); // fixme 0.5 is bogus
+                      h = pillarswidth);
            translate([-50, -joinbelowallow, -50])
              cube([100, joinbelowallow+50, 100]);
          }