another: parametrize pushfit type

1 files changed, 5 insertions, 3 deletions

diff --git a/another.scad b/another.scad
index b7b6e3a..7c4bf37 100644
--- a/another.scad
+++ b/another.scad
@@ -33,12 +33,14 @@ module the_extruder(
  knob_indents = 12,
 
  // screw it
  mount_screw_d = 3, mount_screw_l = 20,
  mount_screwhead_d=6, mount_screwhead_h=3,
 
+ pf = pushfit_embeddest,
+
  // 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,
@@ -104,13 +106,13 @@ module the_extruder(
      }//place idler
      // filament path
      rotate([0,0,45]) translate([(pulley_d-filament_path_d)/2,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(pushfit_threaded);
+      pushfit(pf);
      }
     }//translate teeth
    }//translate pulley
   }//translate protrusion
  }//vitamins
 
@@ -201,13 +203,13 @@ module the_extruder(
     
     // 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:*/])
-    cylinder(r=min(body_h-filament_elevation,filament_elevation)/sin(60)-epsilon,h=10+gearbox_d/2/*TODO:*/,$fn=6);
+    cylinder(r=min(body_h-filament_elevation,filament_elevation)/sin(60)-epsilon,h=pf_h(pf)+gearbox_d/2/*TODO:*/,$fn=6);
    }//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=2*PI*protrusion_d);
    // mount screw holes
    for(zr=[0:90:359]) rotate([0,0,zr]) translate([mount_d/2,0,0]) {
@@ -222,13 +224,13 @@ module the_extruder(
    // pushfit threads
    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+epsilon])
    rotate([0,0,180]) {
-    pushfit(pushfit_threaded);
+    pushfit(pf);
     cylinder(d=filament_guide_d,h=gearbox_d,center=true,$fn=2*PI*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);
    }
    // pulley