X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=filamentspool.scad;h=7fea79e44cd2e90a7d6db1ea014bf1e16fb1a9c8;hb=def77fb71642d2f4d30d962c2fd0859142633022;hp=058cd2c346103fee25d13fafd20aae33d2a8bb90;hpb=fd4a2f3b996c08d66953764f9e07c76e3d4e6ea2;p=reprap-play.git

diff --git a/filamentspool.scad b/filamentspool.scad
index 058cd2c..7fea79e 100644
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -1,6 +1,6 @@
 // -*- C -*-
 
-fdia=1.75;
+fdia=2.85;
 
 slop=0.5;
 bigslop=slop*2;
@@ -19,17 +19,18 @@ axleaxlefudgebend = 3;
 axlepadlen = 1.0;
 
 function selsz(sm,lg) = fdia < 2 ? sm : lg;
+function usedove() = selsz(true,false);
 
-prongthick=5;
-prongwidth=5;
+prongthick=selsz(5,7);
+prongwidth=selsz(5,7);
 ratchetstep=15;
 ratchettooth=3;
 ratchettoothheight=5;
 ratchettoothsmoothr=1;
 ratchettoothslope=0.75;
 overlap=0.5;
-cupwidth=40;
-cupheight=55;
+cupwidth=selsz(40,60);
+cupheight=selsz(55,75);
 
 propxshift = 0;
 
@@ -40,11 +41,11 @@ teethgapx=4+fdia;
 
 prongstalkxwidth=3;
 
-stalklength=35;
+stalklength=selsz(35,55);
 overclipcupgap=5;
 overclipdepth=15;
 overcliproundr=2.0;
-overclipthick=0.5;
+overclipthick=1.0;
 overclipcupnextgap=20;
 
 overclipsmaller=-2.5;
@@ -75,6 +76,10 @@ frictionwasherextrapush = 1.0;
 
 ratchetpawl=ratchetstep-ratchettooth-bigslop*2;
 
+nondove_armbase = 100;
+nondove_armhole_x = 60;
+nondove_armhole_hole = 4;
+
 include <doveclip.scad>
 include <cliphook.scad>
 include <filamentteeth.scad>
@@ -87,9 +92,21 @@ totalheight = channeldepth + armendbasethick;
 stalkwidth = prongwidth + prongstalkxwidth;
 
 module ArmEnd(length=120){ ////toplevel
-  translate([ratchettoothsmoothr, channelwidth/2, -armendbasethick]) {
-    rotate([0,0,-90])
-      DoveClipPairBase(h=doveclipheight);
+  if (usedove()) {
+    translate([ratchettoothsmoothr, channelwidth/2, -armendbasethick]) {
+      rotate([0,0,-90])
+	DoveClipPairBase(h=doveclipheight);
+    }
+  } else {
+    difference(){
+      translate([1, -armendwallthick, -armendbasethick])
+	mirror([1,0,0])
+	cube([nondove_armbase+1, totalwidth, totalheight]);
+      translate([-nondove_armbase + nondove_armhole_x,
+		 -armendwallthick + totalwidth/2,
+		 -armendbasethick -1])
+	cylinder(r= nondove_armhole_hole/2, h=totalheight+2, $fn=10);
+    }
   }
 
   difference(){
@@ -201,6 +218,8 @@ module CupSecuringClip(){ ////toplevel
       CupSecuringClipSolidSmooth(xrad=overclipthick, xdepth=0);
       translate([-wingswidth/2, -wingsize/2, 0])
 	cube([wingswidth, wingsize, wingthick]);
+      translate([-wingsize/2, -wingswidth/2, 0])
+	cube([wingsize, wingswidth, wingthick]);
     }
     translate([0,0,-0.1])
       CupSecuringClipSolidSmooth(xrad=0, xdepth=0.2);
@@ -370,7 +389,7 @@ module FilamentCupPair(){ ////toplevel
 
 //ArmEnd();
 //FilamentCup();
-FilamentCupPair();
+//FilamentCupPair();
 //CupSecuringClip();
 //Hub();
 //ArmExtender();