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=27e25a91b13cdb97e25c206beec1c2a10521ff41;hb=37e6240dbeb35539d789f702ebb41d2cae072a6d;hpb=a2437025c9d05fe34012930959adb02992cf7eae

diff --git a/filamentclip.scad b/filamentclip.scad
index 27e25a9..e6d7afb 100644
--- a/filamentclip.scad
+++ b/filamentclip.scad
@@ -1,8 +1,9 @@
 include <cliphook.scad>
+include <filamentteeth.scad>
 
-rad=18;
+rad=19;
 h=3.5;
-w=1.5;
+w=2.5;
 
 looprad=2.5;
 loopw=w;
@@ -12,71 +13,41 @@ fdia=1.77;
 
 d=0.01;
 
-module FilamentClipTeeth(based=1.5, basew=4, teethw=1.5,
-			 stembendd=0.5,	stembendl=7, teethxl=1.5) {
-  gapw = fdia-stembendd*2;
-  teethbigw = gapw + teethw*2;
-
-  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);
 }
 
 module FilamentClip() {
-  k=1.5;
-  g=0.6;
-
-  rotate([0,0,-55]) {
-    translate([0,rad,0]) {
-      ClipHook(h=h, w=w, g=0.6, k=k, g=g, ye=-1.3);
+  rotate([0,0,-70]) {
+    translate([0,rad-1.5,0]) {
+      rotate([0,0,8])
+	our_ClipHook(ye=-1.3);
     }
   }
 
-  rotate([0,0,-30]) {
+  rotate([0,0,-35]) {
     translate([0,rad,0]) {
-      rotate([0,0,180]) ClipHook(h=h, w=w, g=g, k=k, ye=0.8);
+      rotate([0,0,180])
+	our_ClipHook(ye=0.8);
     }
   }
 
   linear_extrude(height=h) {
     assign($fn=80) {
-      FlatArc(0,0, rad-w/2,rad+w/2, 80,372);
+      FlatArc(0,0, rad-w/2,rad+w/2, 80,350);
     }
     assign($fn=30) {
       FlatArc(0,rad+looprad+w, looprad,looprad+loopw);
     }
   }
 
-  for (rot=[0,180]) {
-    rotate([0,0,rot])
-      translate([rad, 0, 0]) FilamentClipTeeth();
+  for (mir=[0,1]) {
+    mirror([mir,0,0])
+      rotate([0,0,-40])
+      translate([rad+w*0.3+teethw*0.3+fdia/2, 0, 0])
+      rotate([0,0,95])
+      FilamentTeeth(fdia=fdia, h=h);
   }
 }
 
 FilamentClip();
-