pandemic-counter: fix toplevels, fix no terrorist

[reprap-play.git] / filamentspool.scad

diff --git a/filamentspool.scad b/filamentspool.scad
index b88a8b0c1d17f2636206c9ff950e0ea817124cc8..c90701f5154a1297e37ddf06b88980dd3729ebd1 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -44,6 +44,7 @@ overclipcupgap=5;
 overclipdepth=15;
 overcliproundr=2.0;
 overclipthick=0.5;
+overclipcupnextgap=20;
 
 overclipsmaller=-2.5;
 overclipbigger=0.0;
@@ -65,6 +66,8 @@ axlepinrad = 2;
 axlepintabrad = 5;
 
 washerthick = 1.2;
+washerthinthick = 0.8;
+washerverythinthick = 0.4;
 washerrad = hubaxlerad + 7.5;
 frictionwasherarmwidth = 3;
 frictionwasherextrapush = 1.0;
@@ -74,12 +77,14 @@ ratchetpawl=ratchetstep-ratchettooth-bigslop*2;
 include <doveclip.scad>
 include <cliphook.scad>
 include <filamentteeth.scad>
+include <axlepin.scad>
 
 channelwidth = prongthick + slop;
 channeldepth = prongwidth + ratchettoothheight;
 totalwidth = armendwallthick*2 + channelwidth;
 totalheight = channeldepth + armendbasethick;
 stalkwidth = prongwidth + prongstalkxwidth;
+xstraight = cupbigrad * xstraightmul;
 
 module ArmEnd(length=120){ ////toplevel
   translate([ratchettoothsmoothr, channelwidth/2, -armendbasethick]) {
@@ -131,7 +136,6 @@ module FilamentCupHandle(){
 }
 
 module FilamentCupCup(){
-  xstraight = cupbigrad * xstraightmul;
   linear_extrude(height=prongthick) {
     FlatArc(0,0, cupbigrad,cupbigrad+prongwidth, 89,271, $fn=80);
   }
@@ -165,9 +169,11 @@ module FilamentCup() { ////toplevel
          dy - sqrt(midrad*midrad - proptaken*proptaken) - prongwidth/2,
          prongthick]);
   }
-  translate([0, overclipcupgap, 0])
-    rotate([0,0, 102 + fdia])
-    FilamentTeeth(fdia=fdia, h=teethh);
+  for (y = [overclipcupgap, overclipcupgap+overclipcupnextgap]) {
+    translate([0, y, 0])
+      rotate([0,0, 102 + fdia])
+      FilamentTeeth(fdia=fdia, h=teethh);
+  }
 }
 
 module CupSecuringClipSolid(w,d,h1,h2){
@@ -251,17 +257,8 @@ module ArmExtender(){ ////toplevel
                   hb=doveclipheight);
 }
 
-module AxlePin(){ ////toplevel
-  pinr = axlepinrad - slop;
-  intersection(){
-    translate([0, 0, pinr*0.7]) {
-      translate([0, -washerrad, 0]) rotate([-90,0,0])
-       cylinder(r=pinr, h=washerrad*2, $fn=10);
-      translate([-axlepintabrad, hubaxlerad, -axlepinrad])
-       cube([axlepintabrad*2, axlepinrad*2, axlepinrad*2]);
-    }
-    translate([-50,-50,0]) cube([100,100,50]);
-  }
+module FsAxlePin(){ ////toplevel
+  AxlePin(hubaxlerad, washerrad*2, axlepinrad, axlepintabrad, slop);
 }
 
 module Axle(){ ////toplevel
@@ -316,11 +313,20 @@ module Axle(){ ////toplevel
   }
 }
 
+module washer(thick){
+  Washer(hubaxlerad, washerrad, thick, slop);
+}
+
 module AxleWasher(){ ////toplevel
-  difference(){
-    cylinder(h=washerthick, r=washerrad);
-    translate([0,0,-1]) cylinder(h=washerthick+2, r=hubaxlerad+slop);
-  }
+  washer(thick=washerthick);
+}
+
+module AxleThinWasher(){ ////toplevel
+  washer(thick=washerthinthick);
+}
+
+module AxleVeryThinWasher(){ ////toplevel
+  washer(thick=washerverythinthick);
 }
 
 module AxleFrictionWasher(){ ////toplevel
@@ -353,8 +359,17 @@ module TowerExtender(){ ////toplevel
                   pillarw = towerpillarw);
 }
 
+module FilamentCupPair(){ ////toplevel
+  FilamentCup();
+  translate([xstraight + cupbigrad + prongthick*3,
+            cupbigrad*1.7,
+            0])
+    rotate([0,0,180]) FilamentCup();
+}
+
 //ArmEnd();
 //FilamentCup();
+//FilamentCupPair();
 //CupSecuringClip();
 //Hub();
 //ArmExtender();