1 files changed, 26 insertions, 13 deletions

diff --git a/another.scad b/another.scad
index 6af68b6..4c4af5c 100644
--- a/another.scad
+++ b/another.scad
@@ -39,16 +39,17 @@ module the_extruder(
  // 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,
 
  // empty spaces
          idler_travel = 3,                      // how far should idler travel when pressed
  idler_clearance=1,
  pulley_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
@@ -243,30 +244,42 @@ module the_extruder(
      }
     } // translate
     
     // pushfit bracket
     translate([0,0,filament_elevation])
     rotate([0,0,45]) translate([pulley_d/2,0,0])
     rotate([-90,0,0])
     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]) {
+     pfbl = pf_h(pf)+gearbox_d/2; //TODO:
+     if(pf_smooth) {
+      pfbd = pf_d(pf)+2*pf_shell;
       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]);
-      }
-     }
-    }
+       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-mounthole_depth/2-(bridges?layer_height:-epsilon)])