filamentspool: Put ArmEnd dove commitid in right place y

[reprap-play.git] / filamentspool.scad

diff --git a/filamentspool.scad b/filamentspool.scad
index 4890fa2d96fa3978881c3bd337ccd29774e5e6df..572487ca0bfd0a4146ff475433c70c07d4c0f1f7 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -320,43 +320,41 @@ module ArmEnd(length=armend_length){ ////toplevel
   }
 
   difference(){
-    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]);
-
+    union(){
+      difference(){
+       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 - ratchetstep]) translate([dx,0,0]) {
+       translate([ratchettoothsmoothr+0.5, armendwallthick/2, 0]) minkowski(){
+         rotate([90,0,0])
+           cylinder($fn=20, r=ratchettoothsmoothr, h=armendwallthick);
+         multmatrix([  [       1, 0, ratchettoothslope, 0      ],
+                           [   0,      1,      0,      0       ],
+                           [   0,      0,      1,      0       ],
+                           [   0,      0,      0,      1       ]])
+           cube([ratchettooth - ratchettoothsmoothr*2,
+                 channelwidth, ratchettoothheight - ratchettoothsmoothr]);
+       }
+      }
+    }
     if (usedove()){
-      translate([0,0, -armendbasethick])
+      translate([0, -armendwallthick, -armendbasethick])
        Commitid_BestCount_M([length/3, totalwidth]);
     }
   }
-  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);
-      multmatrix([     [       1, 0, ratchettoothslope, 0      ],
-                       [       0,      1,      0,      0       ],
-                       [       0,      0,      1,      0       ],
-                       [       0,      0,      0,      1       ]])
-       cube([ratchettooth - ratchettoothsmoothr*2,
-             channelwidth, ratchettoothheight - ratchettoothsmoothr]);
-    }
-  }
 }
 
 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 +377,7 @@ module FilamentCupCup(){
   }
 }
 
-module FilamentCup() { ////toplevel
+module FilamentCupPositive() {
   FilamentCupHandle();
 
   gapy = prongwidth;
@@ -434,6 +432,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]]);