From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 16 Sep 2012 21:41:36 +0000 (+0100)
Subject: Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play
X-Git-Tag: filamentspool-v2-release~778
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=commitdiff_plain;h=656032c27b8b8d0a5040a50e9bd4c16866024eeb;hp=-c

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

656032c27b8b8d0a5040a50e9bd4c16866024eeb
diff --combined filamentspool.scad
index b5a4817,873f87c..4aae9c8
--- a/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]);
  	  }