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

[reprap-play.git] / filamentspool.scad

diff --git a/filamentspool.scad b/filamentspool.scad
index a0381de00f2037b798b6fd4238507461a37701de..4aae9c8e27fa0d648acee7669f6d2a9b57831122 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -202,6 +202,10 @@ module ArmDoveClipPin(){ ////toplevel
   DoveClipPin(h=doveclipheight);
 }
 
+module TowerDoveClipPin(){ ////toplevel
+  DoveClipPin(h=towercliph/2);
+}
+
 module Hub(){ ////toplevel
   difference(){
     cylinder($fn=60, h=hublthick, r=hubbigrad);
@@ -261,7 +265,6 @@ module AxlePin(){ ////toplevel
 module Axle(){ ////toplevel
   pillarswidth = DoveClipPairSane_width(towerclipcount);
 
-if(0)
   rotate([0,0, -( axleaxlefudgebend + atan(slop/hubaxlelen) ) ])
   translate([-axlehorizoffset, -axlevertheight, 0]) {
     rotate([0,0,-axletowerfudgebend])
@@ -297,7 +300,7 @@ if(0)
              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]);
          }