filamentspool: FilamentGuideSpacer: separate out slop (nfc)

diff --git a/filamentspool.scad b/filamentspool.scad
index 98819b24cb0ef3d4647ac16bc77282dfbe37a53a..99246c99094b49bf1c79a2ffedd30df0604632be 100644 (file)
--- a/filamentspool.scad
+++ b/filamentspool.scad
@@ -678,32 +678,37 @@ module StorArmHoleTest(){ ////toplevel
 
 //----- filament guide spacer -----
 
-guide_armdia = 15.0 + 0.75;
-guide_armwidth = 10.2 + 0.75;
+guide_armdia = 15.0;
+guide_armwidth = 10.2;
 
 guidefilclip_outerdia = 22.8;
 
+guidespacer_armslop = 0.75;
+
 guidespacer_prongprotrude = 4;
 guidespacer_thick = 1.6;
 guidespacer_len = 15.3 + 0.75;
 
 // calculated
 
-guidespacer_wingheight = (guidefilclip_outerdia - guide_armdia)/2;
+guidespacer_armdia = guide_armdia + guidespacer_armslop;
+guidespacer_armwidth = guide_armwidth + guidespacer_armslop;
+
+guidespacer_wingheight = (guidefilclip_outerdia - guidespacer_armdia)/2;
 
 module FilamentGuideArmTemplate(extra=0){
   intersection(){
-    circle(r= (guide_armdia/2) + extra);
-    square(center=true, [guide_armwidth+extra*2,
-                        guide_armdia + extra*2 + 10]);
+    circle(r= (guidespacer_armdia/2) + extra);
+    square(center=true, [guidespacer_armwidth+extra*2,
+                        guidespacer_armdia + extra*2 + 10]);
   }
 }
 
 module FilamentGuideSpacerInnerTemplate(){
   FilamentGuideArmTemplate();
-  translate([0, -guide_armdia/2])
-    square(center=true, [guide_armwidth - guidespacer_prongprotrude,
-                        guide_armdia]);
+  translate([0, -guidespacer_armdia/2])
+    square(center=true, [guidespacer_armwidth - guidespacer_prongprotrude,
+                        guidespacer_armdia]);
 }
 
 module FilamentGuideSpacer(){ ////toplevel
@@ -719,7 +724,7 @@ module FilamentGuideSpacer(){ ////toplevel
                for (t=[[0, guidespacer_wingheight],
                        [guidespacer_len-1, -guidespacer_wingheight]])
                  translate([0,0, t[0] + 0.5])
-                   cube([guidespacer_thick, guide_armdia + t[1]*2,
+                   cube([guidespacer_thick, guidespacer_armdia + t[1]*2,
                      1],
                         center=true);
              }