filamentspool includes teeth

diff --git a/filamentspool.scad b/filamentspool.scad
index 65592f501de01f47b5c5b8b1604b9620c961a46b..14009e116cc8fc02f1ff6d3c771ef288cbb9c76d 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -1,4 +1,6 @@
 
+fdia=1.75;
+
 slop=0.5;
 bigslop=slop*2;
 
@@ -12,6 +14,9 @@ ratchettoothslope=0.75;
 overlap=0.5;
 cupbigrad=35;
 
+teethh=3;
+teethgapx=4+fdia;
+
 prongstalkxwidth=3;
 
 stalklength=40;
@@ -34,6 +39,7 @@ ratchetpawl=ratchetstep-ratchettooth-bigslop*2;
 
 include <doveclip.scad>
 include <cliphook.scad>
+include <filamentteeth.scad>
 
 channelwidth = prongthick + slop;
 channeldepth = prongwidth + ratchettoothheight;
@@ -105,7 +111,8 @@ module FilamentCup() {
   FilamentCupHandle();
 
   dx = cupbigrad + prongwidth;
-  dy = cupbigrad + prongwidth + overclipcupgap;
+  gapy = prongwidth;
+  dy = cupbigrad + gapy + overclipcupgap;
 
   translate([dx, dy, 0])
     FilamentCupCup();
@@ -118,10 +125,14 @@ module FilamentCup() {
   proptaken = propshift;
   echo(cupbigrad, dx, midrad, propshift, proptaken);
 
-  translate([propshift, -1, 0])
+  translate([propshift, -1, 0]) {
     cube([prongwidth,
          dy - sqrt(midrad*midrad - proptaken*proptaken),
          prongthick]);
+  }
+  translate([stalklength + overclipdepth, gapy, 0])
+    rotate([0,0,-(10 + fdia)])
+    FilamentTeeth(fdia=fdia, h=teethh);
 }
 
 module CupSecuringClipSolid(w,d,h1,h2){