filamentspool: Move FilamentCup commitid to very outside, with new FilamentCupPositive

[reprap-play.git] / filamentspool.scad

diff --git a/filamentspool.scad b/filamentspool.scad
index 4890fa2d96fa3978881c3bd337ccd29774e5e6df..73daad1187f37eb1526e25c322612ce83210111c 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -349,14 +349,9 @@ module ArmEnd(length=armend_length){ ////toplevel
 module FilamentCupHandle(){
   pawlusewidth = ratchetpawl-ratchettoothsmoothr*2;
   mirror([0,1,0]) {
-    difference(){
-      union(){
-       cube([stalklength, stalkwidth, prongthick]);
-       translate([stalklength, stalkwidth/2, 0])
-         cylinder(r=stalkwidth/2, h=prongthick, $fn=20);
-      }
-      Commitid_BestCount([stalklength, stalkwidth]);
-    }
+    cube([stalklength, stalkwidth, prongthick]);
+    translate([stalklength, stalkwidth/2, 0])
+      cylinder(r=stalkwidth/2, h=prongthick, $fn=20);
     translate([ratchettoothsmoothr, stalkwidth, 0]) {
       minkowski(){
        cylinder($fn=20,r=ratchettoothsmoothr, h=1);
@@ -379,7 +374,7 @@ module FilamentCupCup(){
   }
 }
 
-module FilamentCup() { ////toplevel
+module FilamentCupPositive() {
   FilamentCupHandle();
 
   gapy = prongwidth;
@@ -434,6 +429,14 @@ module FilamentCup() { ////toplevel
   }      
 }
 
+module FilamentCup() { ////toplevel
+  difference(){
+    FilamentCupPositive();
+    translate([0, -stalkwidth, 0])
+      Commitid_BestCount_M([stalklength - stalkwidth, stalkwidth]);
+  }
+}
+
 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]]);