From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 16 Sep 2012 13:16:07 +0000 (+0100)
Subject: Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play
X-Git-Tag: filamentspool-v2-release~822
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=commitdiff_plain;h=2f3192186dfa30aba68ad655ac22fc63ca819f3a;hp=fcd425d28e0fd254673250e4c5d13db7b98aab48

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

diff --git a/filamentspool.scad b/filamentspool.scad
index 487d853..04e5c09 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -225,4 +225,5 @@ module Hub(){ ////toplevel
 //ArmEnd();
 //FilamentCup();
 //CupSecuringClip();
-//Hub();
+
+Hub();
diff --git a/tower-base.scad b/tower-base.scad
index fe06db2..0e097e9 100644
--- a/tower-base.scad
+++ b/tower-base.scad
@@ -126,23 +126,27 @@ module towerbase() {
   }
 }
 
-intersection(){
- translate([0,0,-50]) towerbase();
- translate([-100,-100,0]) cube([200,200,32]);
-}
+if (towerbase_demo) {
+  intersection(){
+    translate([0,0,-50]) towerbase();
+    translate([-100,-100,0]) cube([200,200,32]);
+  }
 
-intersection(){
- translate([40,0,-60]) towerbase();
- translate([-100,-100,0]) cube([200,200,32]);
-}
+  intersection(){
+    translate([40,0,-60]) towerbase();
+    translate([-100,-100,0]) cube([200,200,32]);
+  }
 
-translate([60,-90,0]) {
-  DoveClipPairSane(h=clippairy, count=3);
-  mirror([1,0,0]) translate([DoveClip_depth()-0.1,0,0]) cube([20,8,6]);
-}
+  translate([60,-90,0]) {
+    DoveClipPairSane(h=clippairy, count=3);
+    mirror([1,0,0]) translate([DoveClip_depth()-0.1,0,0]) cube([20,8,6]);
+  }
 
-for (x=[0,20,40]) {
-  translate([x,-50,0]) DoveClipPin(h=clippairy);
-  translate([x+10,-50,0]) DoveClipPin(h=clippairy/2);
-  translate([x+10,-30,0]) DoveClipPin(h=clippairy/2);
+  for (x=[0,20,40]) {
+    translate([x,-50,0]) DoveClipPin(h=clippairy);
+    translate([x+10,-50,0]) DoveClipPin(h=clippairy/2);
+    translate([x+10,-30,0]) DoveClipPin(h=clippairy/2);
+  }
+} else {
+  towerbase();
 }