From 618c77d03c6585150d140b7caacea9d33add1ec2 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 10 Feb 2016 01:41:09 +0000
Subject: [PATCH] filamentspool: Move ArmEnd commitid to outside

So letters aren't affected by backs of teeth
---
 filamentspool.scad | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/filamentspool.scad b/filamentspool.scad
index 73daad1..0a80d02 100644
--- 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])
 	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(){
-- 
2.30.2