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
@@ -44,13 +44,12 @@ module the_extruder(
  idler_screw_d = 3,
  idler_screwhead_d=6, idler_screwhead_h=3,
 
  pf = pushfit_embeddest,
  pf_shell = max(3*layer_height,3*extrusion_width),
  pf_smooth = true,
-         pf_guidelen = 3,                       // the length of ptfe guide before pushfit
 
  // empty spaces
          idler_travel = 3,                      // how far should idler travel when pressed
  idler_clearance=1,
  pulley_d_clearance=2,
          lever_v_clearance=.7,                  // vertical clearance for the lever
@@ -62,12 +61,13 @@ module the_extruder(
  knob_bore_d_tolerance=.6,
  st_nut_h_tolerance=.2,
  st_nut_d_tolerance=.2,/* TODO: make it st_nut_w_tolerance */
  st_screw_d_tolerance=.5,
 
  min_z_shell = 4*layer_height,                  // the very minimal shell thickness along z-axis.
+ min_xy_shell = 2*extrusion_width,
 
  what="lever",  // lever|body|knob|springpad|*
  left=false,
  vitamins = true,
  supports = false, bridges = true,
  tensioner = true,
@@ -308,32 +308,27 @@ module the_extruder(
              h=mount_screw_l-mount_depth+1,
              $fn=fnd*(mount_screw_d+mount_screw_d_tolerance));
     translate([0,0,mount_screw_l-mount_depth])
     cylinder(d=mount_screwhead_d,h=body_h+1,$fn=fnd*mount_screwhead_d);
    }//for
    // pushfit
+   pf_offset = mount_d/sqrt(2)/2+mount_screw_d;
    translate([0,0,filament_elevation])
    rotate([0,0,45]) translate([pulley_d/2+filament_offset,0,0])
    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]) {
     pushfit(pf);
     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
    // pulley
    cylinder(d=pulley_d+pulley_d_clearance,h=body_h+1,$fn=fnd*(pulley_d+pulley_d_clearance));
    // leverspace
    hull() for(x=[0,gearbox_d])
    rotate([0,0,45])