X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=filamentspool.scad;h=1fde13a18b0bedf1a49699dfed74a855240ca1a2;hb=1cce1757d30badb50d59ce8b7ba54995ec5543d0;hp=46fee725d8b9b4bc77de9d33c8fd3c316cd8ccbb;hpb=4568273e8d300c51b1e3fe508ea173a11e932fb9;p=reprap-play.git

diff --git a/filamentspool.scad b/filamentspool.scad
index 46fee72..1fde13a 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -32,13 +32,13 @@ overclipdepth=15;
 overcliproundr=2.0;
 overclipthick=0.5;
 
+overclipsmaller=-2.5;
+overclipbigger=0.0;
+
 wingspoke=3;
 wingsize=6;
 wingthick=3;
 
-overclipsmaller=-1.0;
-overclipbigger=2.0;
-
 armendwallthick=2.5;
 armendbasethick=1.2;
 
@@ -64,9 +64,11 @@ module ArmEnd(length=120){
     translate([0, -armendwallthick, -armendbasethick])
       cube([length, totalwidth, totalheight]);
     translate([-1, 0, 0])
+      cube([length+1 - ratchettooth, channelwidth, channeldepth+1]);
+    translate([-1, 0, ratchettoothheight])
       cube([length+2, channelwidth, channeldepth+1]);
   }
-  for (dx = [0 : ratchetstep : length - stalklength]) translate([dx,0,0]) {
+  for (dx = [0 : ratchetstep : length - ratchetstep]) translate([dx,0,0]) {
     translate([ratchettoothsmoothr+0.5, armendwallthick/2, 0]) minkowski(){
       rotate([90,0,0])
 	cylinder($fn=20, r=ratchettoothsmoothr, h=armendwallthick);
@@ -75,7 +77,7 @@ module ArmEnd(length=120){
 			[	0,	0,	1,	0	],
 			[	0,	0,	0,	1	]])
 	cube([ratchettooth - ratchettoothsmoothr*2,
-	      channelwidth, ratchettoothheight]);
+	      channelwidth, ratchettoothheight - ratchettoothsmoothr]);
     }
   }
 }
@@ -136,8 +138,8 @@ module FilamentCup() {
 	  dy - sqrt(midrad*midrad - proptaken*proptaken) - prongwidth/2,
 	  prongthick]);
   }
-  translate([stalklength + overclipdepth, gapy, 0])
-    rotate([0,0,-(10 + fdia)])
+  translate([0, overclipcupgap, 0])
+    rotate([0,0, 102 + fdia])
     FilamentTeeth(fdia=fdia, h=teethh);
 }