1 files changed, 6 insertions, 6 deletions

diff --git a/another.scad b/another.scad
index 2ea5417..be0c887 100644
--- a/another.scad
+++ b/another.scad
@@ -117,13 +117,13 @@ module the_extruder(
     translate([0,0,teeth_elevation]) {
      place_idler() {
       cylinder(d=idler_d,h=idler_h,center=true,$fn=30);
       cylinder(d=idler_screw_d,h=lever_thickness+2,center=true,$fn=30);
      }//place idler
      // filament path
-     rotate([0,0,45]) translate([(pulley_d-filament_path_d)/2,0,0]) {
+     rotate([0,0,45]) translate([pulley_d/2,0,0]) {
       rotate([90,0,0]) cylinder(d=filament_d,h=gearbox_d*2,center=true,$fn=15);
       rotate([-90,0,0])
       translate([0,0,mount_d/sqrt(2)/2+mount_screw_d])
       pushfit(pf);
      }
     }//translate teeth
@@ -148,21 +148,21 @@ module the_extruder(
       cylinder(d=lever_thickness,h=lsd,center=true,$fn=60);
      }//hull
     }//union
  
     // filament path
     place_idler() {
-     translate([-(idler_d+filament_path_d)/2,0,0]) rotate([90,0,0]) {
+     translate([-idler_d/2,0,0]) rotate([90,0,0]) {
       cylinder(d=filament_path_d,h=3*gearbox_d,center=true,$fn=30);
       translate([0,-filament_path_d/2/sqrt(2),0]) rotate([0,0,45])
       cube(size=[filament_path_d/2,filament_path_d/2,3*gearbox_d],center=true);
      }//rotate translate
-     translate([-(idler_d+filament_path_d)/2,0,0])
+     translate([-idler_d/2,0,0])
      rotate([90,0,0])
      translate([0,0,
-      sqrt(2)*(mount_d-pulley_d+filament_path_d+lsd)/2
+      sqrt(2)*(mount_d-pulley_d+lsd)/2
      ]) {
       cylinder(d1=filament_path_d,d2=2*filament_path_d,
                h=filament_path_d,$fn=2*filament_path_d*fnd);
       translate([0,0,filament_path_d-epsilon])
       cylinder(d=2*filament_path_d,h=lsd,$fn=2*filament_path_d*fnd);
      }
@@ -242,13 +242,13 @@ module the_extruder(
       }
      }
     } // translate
     
     // pushfit bracket
     translate([0,0,filament_elevation])
-    rotate([0,0,45]) translate([(pulley_d-filament_path_d)/2,0,0])
+    rotate([0,0,45]) translate([pulley_d/2,0,0])
     rotate([-90,0,0])
     translate([0,0,mount_d/sqrt(2)/2+mount_screw_d-gearbox_d/2/*TODO:*/]) {
      pfb2a = pf_d(pf)+2*pf_shell; pfba = pfb2a/2;
      pfbd = pfb2a/cos(30);
      pfbs = pfb2a*tan(30);
      pfbl = pf_h(pf)+gearbox_d/2/*TODO:*/;
@@ -276,13 +276,13 @@ module the_extruder(
 	     $fn=fnd*(mount_screw_d+mount_screw_d_tolerance));
     translate([0,0,mount_screw_l-mounthole_depth/2])
     cylinder(d=mount_screwhead_d,h=body_h+1,$fn=fnd*mount_screwhead_d);
    }//for
    // pushfit
    translate([0,0,filament_elevation])
-   rotate([0,0,45]) translate([(pulley_d-filament_path_d)/2,0,0])
+   rotate([0,0,45]) translate([pulley_d/2,0,0])
    rotate([-90,0,0])
    translate([0,0,mount_d/sqrt(2)/2+mount_screw_d+epsilon])
    rotate([0,0,180]) {
     pushfit(pf);
     cylinder(d=filament_guide_d,h=gearbox_d,center=true,$fn=fnd*filament_guide_d);
     translate([0,-filament_guide_d/2/sqrt(2),0])