move pushfit a tiny bit closer

1 files changed, 5 insertions, 4 deletions

diff --git a/another.scad b/another.scad
index 0d67286..8334b11 100644
--- a/another.scad
+++ b/another.scad
@@ -98,24 +98,26 @@ module the_extruder(
  // finger and spring support
  fsw = gearbox_d-(gearbox_d-mount_d)/2-max(spring_lc,longwing_travel+(gearbox_d-mount_d)/2);
 
  mount_min_depth = mounthole_min_depth ? mounthole_min_depth : mounthole_depth-1;
  mount_max_depth = mounthole_max_depth ? mounthole_max_depth : mounthole_depth+1;
  filament_elevation=protrusion_h+pulley_elevation+teeth_elevation;
  ls_z = filament_elevation; // leverspace mid-z
  ls_h = lever_thickness+lever_v_clearance; // leverspace height
  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);
 
+ pf_offset = mount_d/sqrt(2)/2+mount_screw_d/2+min_xy_shell;
+
  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();
  }
@@ -151,25 +153,25 @@ 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/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])
+       translate([0,0,pf_offset])
        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() {
@@ -245,25 +247,25 @@ module the_extruder(
      hh=body_h-ls_z;
      translate([0,0,ls_z])
      mirror([0,1,0]) cube(size=[fsw,longwing+(st_split_w+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:*/]) {
+    translate([0,0,pf_offset-gearbox_d/2/*TODO:*/]) {
      pfbl = pf_h(pf)+gearbox_d/2; //TODO:
      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
     }//translate rotate translate rotate translate
    }//union (first child of difference)
@@ -273,25 +275,24 @@ module the_extruder(
    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,
              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,pf_offset])
    rotate([0,0,180]) {
     pushfit(pf);
     mirror([0,0,1]) {
      fh = 1.5* (filament_guide_d-filament_path_d)/2;
      fo = pf_offset -filament_path_d /*(idler_d+idler_clearance)/2*/-fh;
      translate([0,0,-1]) teardrop(d=filament_guide_d,h=fo/2,angle=225);
      translate([0,0,-1]) teardrop(d=filament_path_d,h=gearbox_d/2+1,angle=-225);
      translate([0,0,fo+epsilon])
@@ -312,25 +313,25 @@ module the_extruder(
     place_idler()
     cylinder(d=idler_d+idler_clearance,h=ls_h,$fn=fnd*(idler_d+idler_clearance));
     // lever space
     rotate([0,0,45])
     rotate_extrude(angle=-135+max(atan(2*fsw/gearbox_d-1),atan(gearbox_d/mount_d-1)))
     square([gearbox_d/2+1,ls_h]);
    }
 
    // back side cutout
    // XXX: this is somewhat ugly and potentially bugged,
    //      but I want to sleep.
    a0_ = atan(
-    (mount_d/sqrt(2)/2+mount_screw_d+pf_h(pf)+gearbox_d/2)
+    (pf_offset+pf_h(pf)+gearbox_d/2)
     /
     (
      pulley_d/2+filament_offset-
      (pf_d(pf)+2*pf_shell)/2/cos(30)
     )
    );
    a0 = -135 + ( (a0_>0) ? a0_ : 180+a0_ );
    a1 = atan((longwing-lever_thickness/2)/(gearbox_d/2));
    translate([0,0,ls_z]) difference() {
     rotate([0,0,-180+a0])
     rotate_extrude(angle=a1-a0)
     translate([0,-ls_h/2])