filamentspool: Put ArmEnd dove commitid in right place y

[reprap-play.git] / filamentspool.scad

diff --git a/filamentspool.scad b/filamentspool.scad
index 73daad1187f37eb1526e25c322612ce83210111c..572487ca0bfd0a4146ff475433c70c07d4c0f1f7 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -320,30 +320,33 @@ 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(){