X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=filamentclip.scad;h=e6d7afbc86be990474b7100a68363b8d4a5aa73a;hp=5af0b52de7b4d5806ad7fa0d517f83e414034281;hb=457cf6af6a0931a6baef7c51e49f2ca6dd02c135;hpb=46c84923e13cb4398a20c3486762f89d0c1b5739

diff --git a/filamentclip.scad b/filamentclip.scad
index 5af0b52..e6d7afb 100644
--- a/filamentclip.scad
+++ b/filamentclip.scad
@@ -1,9 +1,9 @@
 include <cliphook.scad>
+include <filamentteeth.scad>
 
 rad=19;
 h=3.5;
 w=2.5;
-teethw=1.5;
 
 looprad=2.5;
 loopw=w;
@@ -13,43 +13,6 @@ fdia=1.77;
 
 d=0.01;
 
-module FilamentClipTeeth(teethw=teethw,
-			 stembendd=0.5,	stembendl=7, teethxl=1.5) {
-  gapw = fdia-stembendd*2;
-  teethbigw = gapw + teethw*2;
-  basew = fdia+teethw*2-stembendd*2;
-  based = basew/3;
-
-  translate([-based, -basew/2, 0]) cube([based, basew, h]);
-  difference() {
-    union() {
-      translate([-d, -teethbigw/2, 0])
-	cube([d+stembendl + teethw, teethbigw, h]);
-//  translate([
-//  stembigw = fdia + stembend
-//  translate([-d, -stemw, 
-      linear_extrude(height=h) {
-	translate([stembendl-fdia/2, 0]) circle(fdia/2+teethw, $fn=30);
-      }
-    }
-    translate([0,0,-1]) {
-      translate([0,-gapw/2])
-	cube([stembendl+teethxl+1, gapw, h+2]);
-      linear_extrude(height=h+2) {
-	translate([stembendl-fdia/2, 0]) circle(fdia/2, $fn=30);
-      }
-    }
-  }
-
-  for (mirr=[0:1]) {
-    mirror([0,mirr,0]) {
-      translate([stembendl + teethw, gapw/2, 0])
-	rotate([0,0,30])
-	cube([teethxl, teethw, h]);
-    }
-  }
-}
-
 module our_ClipHook(ye){
   ClipHook(h=h, w=w, g=0.6, k=1.5, g=0.6, ye=ye, cupcaph=0.5, cupcapg=0.8);
 }
@@ -83,7 +46,7 @@ module FilamentClip() {
       rotate([0,0,-40])
       translate([rad+w*0.3+teethw*0.3+fdia/2, 0, 0])
       rotate([0,0,95])
-      FilamentClipTeeth();
+      FilamentTeeth(fdia=fdia, h=h);
   }
 }