1 files changed, 18 insertions, 4 deletions

diff --git a/another.scad b/another.scad
index 342d70c..2ea5417 100644
--- a/another.scad
+++ b/another.scad
@@ -43,6 +43,7 @@ module the_extruder(
  idler_screwhead_d=6, idler_screwhead_h=3,
 
  pf = pushfit_embeddest,
+ pf_shell = max(3*layer_height,3*extrusion_width),
 
  // empty spaces
          idler_travel = 3,                      // how far should idler travel when pressed
@@ -244,10 +245,23 @@ module the_extruder(
     
     // pushfit bracket
     translate([0,0,filament_elevation])
-    rotate([0,0,45]) translate([pulley_d/2,0,0])
+    rotate([0,0,45]) translate([(pulley_d-filament_path_d)/2,0,0])
     rotate([-90,0,0])
-    translate([0,0,mount_d/sqrt(2)/2+mount_screw_d-gearbox_d/2/*TODO:*/])
-    cylinder(r=min(body_h-filament_elevation,filament_elevation)/sin(60)-epsilon,h=pf_h(pf)+gearbox_d/2/*TODO:*/,$fn=6);
+    translate([0,0,mount_d/sqrt(2)/2+mount_screw_d-gearbox_d/2/*TODO:*/]) {
+     pfb2a = pf_d(pf)+2*pf_shell; pfba = pfb2a/2;
+     pfbd = pfb2a/cos(30);
+     pfbs = pfb2a*tan(30);
+     pfbl = pf_h(pf)+gearbox_d/2/*TODO:*/;
+     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]);
+      }
+     }
+    }
    }//union (first child of difference)
 
    // protrusion
@@ -265,7 +279,7 @@ module the_extruder(
    }//for
    // pushfit
    translate([0,0,filament_elevation])
-   rotate([0,0,45]) translate([pulley_d/2,0,0])
+   rotate([0,0,45]) translate([(pulley_d-filament_path_d)/2,0,0])
    rotate([-90,0,0])
    translate([0,0,mount_d/sqrt(2)/2+mount_screw_d+epsilon])
    rotate([0,0,180]) {