1 files changed, 15 insertions, 1 deletions

diff --git a/another.scad b/another.scad
index 23243d9..4a9fc01 100644
--- a/another.scad
+++ b/another.scad
@@ -34,32 +34,33 @@ module the_extruder(
  knob_indent_d = 4,
  knob_indents = 12,
  // spring tensioner
  st_nut_d = 9, st_nut_h = 4,
  st_screw_d = 5,
  st_thickshell = 8*extrusion_width, st_thinshell = 4*extrusion_width,
 
  // screw it
  mount_screw_d = 3.1, mount_screw_l = 20,
  mount_screwhead_d=6, mount_screwhead_h=3,
  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
  spring_d_clearance=1,
          protrusion_tolerance_h=.5,             // horizontal tolerance for the motor protrusion
          protrusion_tolerance_v=.5,             // vertical tolerance for the motor protrusion
  mount_screw_d_tolerance=.4,
  idler_v_tolerance=.5,
  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,
 
@@ -303,33 +304,46 @@ module the_extruder(
    for(zr=[0:90:359]) rotate([0,0,zr]) translate([mount_d/2,0,0]) {
     translate([0,0,mount_screw_l-mount_depth-(bridges?layer_height:-epsilon)])
     mirror([0,0,1])
     cylinder(d=mount_screw_d+mount_screw_d_tolerance,
              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
    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])
    rotate([0,0,180]) {
     pushfit(pf);
-    mirror([0,1,0]) teardrop(d=filament_guide_d,h=gearbox_d,center=true);
+    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);
+     }
+    }
    }//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])
    translate([x,0,ls_z-ls_h/2])
    cylinder(d=idler_d+idler_clearance,h=ls_h,$fn=fnd*(idler_d+idler_clearance));
 
    // idler clearance
    a=cos(45)*(pulley_d+idler_d)/2;
    b=mount_d/2-a;
    x=sqrt(pow(a,2)+pow(b,2));
    translate([mount_d/2,0,ls_z])
    intersection() {
     r = x+idler_d/2+idler_clearance;