X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=filamentspool.scad;h=4e7b140920b6f4714c7afc8ecf23eab2f657ee54;hp=8dbf1bf3631764632bb07409907807940ef2d150;hb=2e64880bc363e365a6b89f779992192214431b8c;hpb=3dccb41a1fc9eb875f939d76fdba1f0cbc1f7f71

diff --git a/filamentspool.scad b/filamentspool.scad
index 8dbf1bf..4e7b140 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -1,3 +1,6 @@
+// -*- C -*-
+
+fdia=1.75;
 
 slop=0.5;
 bigslop=slop*2;
@@ -10,13 +13,31 @@ ratchettoothheight=5;
 ratchettoothsmoothr=1;
 ratchettoothslope=0.75;
 overlap=0.5;
-cupbigrad=35;
+cupbigrad=20;
+
+xstraightmul = 1.75;
+
+propxshift = 0;
+
+doveclipheight = 10;
+
+teethh=3;
+teethgapx=4+fdia;
 
 prongstalkxwidth=3;
 
-stalklength=40;
+stalklength=35;
 overclipcupgap=5;
-overclipheight=15;
+overclipdepth=15;
+overcliproundr=2.0;
+overclipthick=0.5;
+
+wingspoke=3;
+wingsize=6;
+wingthick=3;
+
+overclipsmaller=-1.0;
+overclipbigger=2.0;
 
 armendwallthick=2.5;
 armendbasethick=1.2;
@@ -25,6 +46,7 @@ ratchetpawl=ratchetstep-ratchettooth-bigslop*2;
 
 include <doveclip.scad>
 include <cliphook.scad>
+include <filamentteeth.scad>
 
 channelwidth = prongthick + slop;
 channeldepth = prongwidth + ratchettoothheight;
@@ -32,8 +54,6 @@ totalwidth = armendwallthick*2 + channelwidth;
 totalheight = channeldepth + armendbasethick;
 stalkwidth = prongwidth + prongstalkxwidth;
 
-doveclipheight = totalheight;
-
 module ArmEnd(length=120){
   translate([ratchettoothsmoothr, channelwidth/2, -armendbasethick]) {
     rotate([0,0,-90])
@@ -75,14 +95,14 @@ module FilamentCupHandle(){
 			[	0,	0,	0,	1	]])
 	  cube([pawlusewidth,
 		ratchettoothheight - ratchettoothsmoothr,
-		prongthick]);
+		prongthick - 1]);
       }
     }
   }
 }
 
 module FilamentCupCup(){
-  xstraight = cupbigrad;
+  xstraight = cupbigrad * xstraightmul;
   linear_extrude(height=prongthick) {
     FlatArc(0,0, cupbigrad,cupbigrad+prongwidth, 89,271, $fn=80);
   }
@@ -96,7 +116,8 @@ module FilamentCup() {
   FilamentCupHandle();
 
   dx = cupbigrad + prongwidth;
-  dy = cupbigrad + prongwidth + overclipcupgap;
+  gapy = prongwidth;
+  dy = cupbigrad + gapy + overclipcupgap;
 
   translate([dx, dy, 0])
     FilamentCupCup();
@@ -105,15 +126,55 @@ module FilamentCup() {
 
   midrad = cupbigrad + prongwidth/2;
 
-  propshift = stalklength - overclipheight - prongthick;
+  propshift = stalklength - overclipdepth - prongthick + propxshift;
   proptaken = propshift;
   echo(cupbigrad, dx, midrad, propshift, proptaken);
 
-  translate([propshift, -1, 0])
+  translate([propshift, -1, 0]) {
+    // something is wrong with the y calculation
     cube([prongwidth,
-	  dy - sqrt(midrad*midrad - proptaken*proptaken),
+	  dy - sqrt(midrad*midrad - proptaken*proptaken) - prongwidth/2,
 	  prongthick]);
+  }
+  translate([0, overclipcupgap, 0])
+    rotate([0,0, 102 + fdia])
+    FilamentTeeth(fdia=fdia, h=teethh);
+}
+
+module CupSecuringClipSolid(w,d,h1,h2){
+  rotate([0,-90,0]) translate([0,-h1/2,-w/2]) linear_extrude(height=w) {
+    polygon(points=[[0,0], [d,0], [d,h2], [0,h1]]);
+  }
+}
+
+module CupSecuringClipSolidSmooth(xrad=0, xdepth=0){
+  hbase = totalheight + prongstalkxwidth - overcliproundr*2;
+  minkowski(){
+    CupSecuringClipSolid(w=totalwidth,
+			 d=overclipdepth + xdepth,
+			 h1=hbase - overclipsmaller,
+			 h2=hbase + overclipbigger);
+    cylinder($fn=20, h=0.01, r=overcliproundr+xrad);
+  }
+}
+
+module CupSecuringClip(){
+  wingswidth = wingspoke*2 + overclipthick*2 + overcliproundr*2 + totalwidth;
+  difference(){
+    union(){
+      CupSecuringClipSolidSmooth(xrad=overclipthick, xdepth=0);
+      translate([-wingswidth/2, -wingsize/2, 0])
+	cube([wingswidth, wingsize, wingthick]);
+    }
+    translate([0,0,-0.1])
+      CupSecuringClipSolidSmooth(xrad=0, xdepth=5);
+  }
+}
+
+module ArmDoveClipPin(){
+  DoveClipPin(h=doveclipheight);
 }
 
 //ArmEnd();
-FilamentCup();
+//FilamentCup();
+//CupSecuringClip();