1 files changed, 1 insertions, 1 deletions

diff --git a/another.scad b/another.scad
index 2383276..55fda78 100644
--- a/another.scad
+++ b/another.scad
@@ -99,193 +99,193 @@ module the_extruder(
  mount_depth = mount_screw_l - (ls_z+ls_h/2+min_z_shell);
  body_h = max(protrusion_h+bore_l,mount_screw_l-mount_depth+mount_screwhead_h+min_z_shell,ls_z*2);
  echo("mount depth",mount_depth);
 
  module teardrop(r,d,h,center=false,angle=45) {
   dd = d ? d : (2*r);
   $fn = dd*fnd;
   cylinder(d=dd,h=h,center=center);
   if(angle>0) translate([0,0,center?-h/2:0])
    rotate([0,0,angle])
    cube(size=[d/2,d/2,h]);
  }
 
  module mirrorleft() {
   mirror([left?0:1,0,0]) children();
  }
  module place_idler() {
   rotate([0,0,45])
   translate([(pulley_d+idler_d)/2,0,0])
   children();
  }
  module finger_indent(d=lever_thickness,depth/*=1*/,r/*=15*/) {
   if(depth) {
    hh = (-4*pow(depth,2)+pow(d,2))/(8*depth);
    rr = depth+hh;
    translate([0,0,hh]) sphere(r=rr,$fn=fnr*rr);
   }else if(r) {
    hh=sqrt(pow(r,2)-pow(d,2)/4);
    translate([0,0,hh]) sphere(r=r,$fn=fnr*r);
   }
  }
 
  % if(vitamins) mirrorleft() {
   translate([0,0,-epsilon]) mirror([0,0,1]) cylinder(d=gearbox_d,h=1,$fn=60);
   for(zr=[0:90:359]) rotate([0,0,zr]) translate([mount_d/2,0,0])
    cylinder(d=mount_screw_d,h=20,$fn=30);
   translate([0,0,-epsilon]) cylinder(d=protrusion_d,h=protrusion_h,$fn=30);
   translate([0,0,protrusion_h]) {
    difference() {
     cylinder(d=bore_d,h=bore_l,$fn=30);
     translate([-bore_d/2-1,bore_dd-bore_d/2,-1])
     cube([bore_d+2,bore_d/2,bore_l+2]);
    }
    translate([0,0,pulley_elevation]) {
     cylinder(d=pulley_d,h=pulley_h,$fn=30);
     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/2-idler_filament_offset,0,0]) rotate([90,0,0]) {
        cylinder(d=filament_d,h=gearbox_d,center=false,$fn=15);
       }//rotate translate
       translate([pulley_d/2+filament_offset,0,0]) rotate([-90,0,0]) {
        cylinder(d=filament_d,h=gearbox_d,center=false,$fn=15);
        translate([0,0,mount_d/sqrt(2)/2+mount_screw_d])
        pushfit(pf);
       }//rotate translate
      }//rotate
     }//translate teeth
    }//translate pulley
   }//translate protrusion
  }//vitamins
 
  module lever() {
   translate([0,0,protrusion_h+pulley_elevation+teeth_elevation]) {
    difference() {
     union() {
      hull() {
       place_idler()
       cylinder(d=lsd,h=lever_thickness,center=true,$fn=60);
       translate([mount_d/2,0,0])
       cylinder(d=lsd,h=lever_thickness,center=true,$fn=60);
      }//hull
      hull() {
       translate([mount_d/2,0,0])
       cylinder(d=lsd,h=lever_thickness,center=true,$fn=60);
       translate([mount_d/2,-longwing,0]) rotate([0,90,0])
       cylinder(d=lever_thickness,h=lsd,center=true,$fn=60);
      }//hull
     }//union
  
     // filament path
     place_idler()
     translate([-idler_d/2-idler_filament_offset,0,0])
     rotate([90,0,0]) {
      mirror([0,1,0])
      teardrop(d=filament_path_d,h=3*gearbox_d,center=true);
      translate([0,0,
       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);
+      cylinder(d=2*filament_path_d,h=lsd*sqrt(2),$fn=2*filament_path_d*fnd);
      }//translate
     }//rotate translate place_idler
 
     // idler space and mounting hole
     place_idler() {
      difference() {
       cylinder(d=idler_d+idler_clearance*2,h=idler_h+idler_v_tolerance,center=true,$fn=60);
       if(supports) for(y=[-lsd/2+extrusion_width:(lsd-2*extrusion_width)/3:lsd/2-extrusion_width])
        translate([-lsd/2-1,y-extrusion_width/2,-idler_h/2-idler_v_tolerance/2-1])
        cube(size=[lsd+2,extrusion_width,idler_h+idler_v_tolerance+2]);
      }
      cylinder(d=idler_screw_d,h=lever_thickness+2,center=true,$fn=30);
      translate([0,0,lever_thickness/2-idler_screwhead_h])
      cylinder(d=idler_screwhead_d,h=idler_screwhead_h+1,$fn=fnd*idler_screwhead_d);
     }
     // mounting screw hole
     translate([mount_d/2,0,0])
     cylinder(d=mount_screw_d+mount_screw_d_tolerance,h=lever_thickness+2,center=true,$fn=fnd*mount_screw_d);
     
     // lever end
     translate([mount_d/2,0,0]) rotate([0,90,0]) {
      translate([0,-longwing,lsd/2]) finger_indent(d=lever_thickness-1,r=15);
      translate([0,-longwing,0])
      mirror([0,0,1])
      difference() {
       cylinder(d=spring_d+spring_d_clearance,h=lsd,$fn=fnd*(spring_d+spring_d_clearance));
       sphere(d=spring_d*3/4,$fn=fnd*spring_d*3/4);
      }
     }//rotate-translate
    }//difference
    // bridging patch
    if(bridges) place_idler()
    translate([0,0,lever_thickness/2-mount_screwhead_h])
    mirror([0,0,1])
    cylinder(d=mount_screwhead_d,h=layer_height);
   }//translate
  }//lever module
  
  module body() {
   difference() {
    union() {
     cylinder(d=gearbox_d,h=body_h,$fn=fnd*gearbox_d);
     // spring tensioner part
     translate([-gearbox_d/2,0,0]) hull() {
      translate([0,-longwing,ls_z])
      rotate([0,90,0])
      cylinder(d=lever_thickness,h=fsw,$fn=fnd*lever_thickness);
      hh=body_h-ls_z;
      translate([0,0,ls_z])
      mirror([0,1,0]) cube(size=[fsw,longwing+(st_thinshell+st_split_w_tolerance)/2+st_thickshell,body_h-ls_z]);
      hhh=ls_z;
      translate([0,0,0])
      mirror([0,1,0]) cube(size=[fsw,longwing-hhh+lever_thickness/sqrt(2),hhh+lever_thickness/2]);
     }//hull translate
     
     // pushfit bracket
     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-gearbox_d/2/*TODO:*/]) {
      pfbl = pf_h(pf)+gearbox_d/2; //TODO:
      if(pf_smooth) {
       pfbd = pf_d(pf)+2*pf_shell;
       hull() {
        cylinder(d=pfbd,h=pfbl,$fn=pfbd*fnd);
        translate([-epsilon/2,0,0]) {
         cube(size=[epsilon,filament_elevation,pfbl-filament_elevation+pfbd/2]);
         mirror([0,1,0])
         cube(size=[epsilon,body_h-filament_elevation,pfbl-body_h+filament_elevation+pfbd/2]);
        }//translate
       }//hull
      }else{
       pfb2a = pf_d(pf)+2*pf_shell; pfba = pfb2a/2;
       pfbd = pfb2a/cos(30);
       pfbs = pfb2a*tan(30);
       cylinder(d=pfbd,h=pfbl,$fn=6);
       translate([-pfbs/2,0,0]) {
        hull() {
         translate([0,-pfba,0]) cube(size=[pfbs,pfb2a,pfbl]);
         cube(size=[pfbs,filament_elevation,pfbl-filament_elevation+pfba]);
         mirror([0,1,0])
         cube(size=[pfbs,body_h-filament_elevation,pfbl-body_h+filament_elevation+pfba]);
        }//hull
       }//translate*/
      }//if(pf_smooth)
     }//translate rotate translate rotate translate
    }//union (first child of difference)
 
    // protrusion
    translate([0,0,-1])
    cylinder(d=protrusion_d+protrusion_tolerance_h,h=protrusion_h+protrusion_tolerance_v+1,$fn=fnd*(protrusion_d+protrusion_tolerance_h));
    // mount screw holes
    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,