1 files changed, 7 insertions, 6 deletions

diff --git a/another.scad b/another.scad
index b80d0d0..a93d21a 100644
--- a/another.scad
+++ b/another.scad
@@ -9,24 +9,25 @@ include <pushfit_data.scad>;
 module the_extruder(
  // motor properties
  gearbox_d = 36,
          mount_d = 28,                          // the distance between opposite mounting holes
  mounthole_depth = 5,
          protrusion_d = 22, protrusion_h = 2.2,         // the dimensions of the protrusion on top of gearbox
  bore_d = 8, bore_l = 17.6,
  bore_dd = 7,
  // pulley properties
  pulley_d = 11.5, pulley_h=10,
          pulley_elevation = 1,                  // pulley elevation above the protrusion
          teeth_elevation = 7.5,                         // distance from the bottom of the pulley to its teeth
+ filament_offset = (8.25-(3.0+3.5)/2) - 11.5/2 + 1.75/2,
  // idler properties
          idler_d = 9.5, idler_h = 4, idler_id = 3,// idler dimensions: outer and inner diameters and height
  // spring properties
          spring_d = 10, spring_lc = 9.6,        // spring diameter and compressed length
  // filament path properties
  filament_d = 1.75,
  filament_path_d = 2,
          filament_guide_d = 4,                  // PTFE filament guide diameter
  // knob properties
  knob_h = 10,
  knob_bore_l = 4,
  knob_indent_d = 4,
@@ -112,25 +113,25 @@ module the_extruder(
     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,0,0]) {
+     rotate([0,0,45]) translate([pulley_d/2+filament_offset,0,0]) {
       rotate([90,0,0]) cylinder(d=filament_d,h=gearbox_d*2,center=true,$fn=15);
       rotate([-90,0,0])
       translate([0,0,mount_d/sqrt(2)/2+mount_screw_d])
       pushfit(pf);
      }
     }//translate teeth
    }//translate pulley
   }//translate protrusion
  }//vitamins
 
  module lever() {
   translate([0,0,protrusion_h+pulley_elevation+teeth_elevation]) {
@@ -143,30 +144,30 @@ module the_extruder(
       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,0,0]) rotate([90,0,0]) {
+     translate([-idler_d/2+filament_offset,0,0]) rotate([90,0,0]) {
       cylinder(d=filament_path_d,h=3*gearbox_d,center=true,$fn=30);
       translate([0,-filament_path_d/2/sqrt(2),0]) rotate([0,0,45])
       cube(size=[filament_path_d/2,filament_path_d/2,3*gearbox_d],center=true);
      }//rotate translate
-     translate([-idler_d/2,0,0])
+     translate([-idler_d/2+filament_offset,0,0])
      rotate([90,0,0])
      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);
      }
     }//place_idler
     
     // idler space and mounting hole
@@ -237,25 +238,25 @@ module the_extruder(
         translate([0,0,st_thickshell+st_nut_h+st_nut_h_tolerance+st_thinshell-epsilon])
         cylinder(d1=st_screw_d+st_screw_d_tolerance,d2=bigd,
          h=hf+epsilon, $fn=fnd*bigd);
         translate([0,0,st_thickshell+st_nut_h+st_nut_h_tolerance+st_thinshell+hf-epsilon])
         cylinder(d=bigd,h=fsw+1,$fn=fnd*bigd);
        }
       }
      }
     } // translate
     
     // pushfit bracket
     translate([0,0,filament_elevation])
-    rotate([0,0,45]) translate([pulley_d/2,0,0])
+    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
@@ -283,25 +284,25 @@ module the_extruder(
    // mount screw holes
    for(zr=[0:90:359]) rotate([0,0,zr]) translate([mount_d/2,0,0]) {
     translate([0,0,mount_screw_l-mounthole_depth/2-(bridges?layer_height:-epsilon)])
     mirror([0,0,1])
     cylinder(d=mount_screw_d+mount_screw_d_tolerance,
              h=mount_screw_l-mounthole_depth/2+1,
              $fn=fnd*(mount_screw_d+mount_screw_d_tolerance));
     translate([0,0,mount_screw_l-mounthole_depth/2])
     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,0,0])
+   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);
     cylinder(d=filament_guide_d,h=gearbox_d,center=true,$fn=fnd*filament_guide_d);
     translate([0,-filament_guide_d/2/sqrt(2),0])
     rotate([0,0,45])
     cube(size=[filament_guide_d/2,filament_guide_d/2,gearbox_d],center=true);
    }//rotate translate rotate translate rotate translate
    // pulley
    cylinder(d=pulley_d+pulley_clearance,h=body_h+1,$fn=fnd*(pulley_d+pulley_clearance));
    // leverspace
@@ -319,25 +320,25 @@ module the_extruder(
     r = x+idler_d/2+idler_clearance;
     cylinder(r=r,h=ls_h,center=true);
     translate([-r-1,0,-ls_h/2-1]) cube(size=[2*r+2,r+1,ls_h+2]);
    }
 
    // 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)
     /
     (
-     pulley_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])
     square([sqrt(pow(gearbox_d/2,2)+pow(longwing-lever_thickness/2,2))+1,
            ls_h]);
     translate([-mount_d/2,0,0])