1 files changed, 9 insertions, 14 deletions

diff --git a/another.scad b/another.scad
index 4a9fc01..8fd9356 100644
--- a/another.scad
+++ b/another.scad
@@ -49,3 +49,2 @@ module the_extruder(
  pf_smooth = true,
-         pf_guidelen = 3,                       // the length of ptfe guide before pushfit
 
@@ -67,2 +66,3 @@ module the_extruder(
  min_z_shell = 4*layer_height,                  // the very minimal shell thickness along z-axis.
+ min_xy_shell = 2*extrusion_width,
 
@@ -313,2 +313,3 @@ module the_extruder(
    // pushfit
+   pf_offset = mount_d/sqrt(2)/2+mount_screw_d;
    translate([0,0,filament_elevation])
@@ -316,3 +317,3 @@ module the_extruder(
    rotate([-90,0,0])
-   translate([0,0,mount_d/sqrt(2)/2+mount_screw_d+epsilon])
+   translate([0,0,pf_offset])
    rotate([0,0,180]) {
@@ -320,15 +321,9 @@ module the_extruder(
     mirror([0,0,1]) {
-     translate([0,0,-epsilon])
-     teardrop(d=filament_guide_d,h=pf_guidelen+epsilon,angle=225);
-     nl = 3.5; /* TODO: */
-     translate([0,0,pf_guidelen-1])
-     teardrop(d=filament_path_d,h=nl+2,angle=-225);
      fh = (filament_guide_d-filament_path_d)/2;
-     union() {
-      translate([0,0,pf_guidelen+nl])
-      cylinder(d1=filament_path_d,d2=filament_guide_d,h=fh,$fn=fnd*filament_guide_d);
-      translate([0,0,pf_guidelen+nl+fh-epsilon])
-      teardrop(d=filament_guide_d,h=gearbox_d/2,angle=225);
-     }
-    }
+     fo = pf_offset-(idler_d+idler_clearance)/2-fh;
+     translate([0,0,-1]) teardrop(d=filament_guide_d,h=fo-extrusion_width+1,angle=225);
+     translate([0,0,-1]) teardrop(d=filament_path_d,h=gearbox_d/2+1,angle=-225);
+     translate([0,0,fo+epsilon])
+     cylinder(d1=filament_path_d,d2=filament_guide_d,h=fh,$fn=fnd*filament_guide_d);
+    }//mirror
    }//rotate translate rotate translate rotate translate