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
@@ -15,48 +15,50 @@ module the_extruder(
  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
  // 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,
  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,
  protrusion_tolerance_h=.5,			// horizontal tolerance for the motor protrusion
  protrusion_tolerance_v=.5,			// vertical tolerance for the motor protrusion
  mount_screw_d_tolerance=.5,
  idler_v_tolerance=.5,
  knob_bore_d_tolerance=.6,
 
  what="lever",
  left=false,
  vitamins = true
 ) {
  lever_shell = mount_screwhead_h+0.5;
  lever_thickness=max(spring_d+layer_height*8,idler_h+idler_v_tolerance+2*lever_shell);
  lsd = idler_d-idler_clearance*2;
  longwing=gearbox_d/2+spring_d/2+lsd/2;
  h_ = (pulley_d+idler_d)/(2*sqrt(2));
  ri = sqrt( pow(h_,2) + pow(mount_d/2-h_,2) );
  spring_dl = idler_travel*longwing/ri;
 
@@ -86,49 +88,49 @@ module the_extruder(
 
  % if(vitamins) mirrorleft() {
   translate([0,0,-epsilon]) mirror([0,0,1]) cylinder(d=gearbox_d,h=1,$fn=60);
   for(zr=[0:90:359]) rotate([0,0,zr]) translate([mount_d/2,0,0])
    cylinder(d=mount_screw_d,h=20,$fn=30);
   translate([0,0,-epsilon]) cylinder(d=protrusion_d,h=protrusion_h,$fn=30);
   translate([0,0,protrusion_h]) {
    difference() {
     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_id,h=lever_thickness+2,center=true,$fn=30);
      }//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
 
  module lever() {
   translate([0,0,protrusion_h+pulley_elevation+teeth_elevation]) {
    difference() {
     union() {
      hull() {
       place_idler()
       cylinder(d=lsd,h=lever_thickness,center=true,$fn=60);
       translate([mount_d/2,0,0])
       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
  
@@ -183,70 +185,70 @@ module the_extruder(
     fsw = gearbox_d/2+mount_screwhead_d/2;
     translate([-gearbox_d/2,0,0]) difference() {
      union() {
       hull() {
        translate([0,-longwing,ls_z])
        rotate([0,90,0])
        cylinder(d=lever_thickness,h=fsw,$fn=2*PI*lever_thickness);
        hh=body_h-ls_z;
        translate([0,0,ls_z-lever_thickness/2])
        mirror([0,1,0]) cube(size=[fsw,longwing-hh+lever_thickness/sqrt(2),hh+lever_thickness/2]);
        hhh=ls_z;
        translate([0,0,0])
        mirror([0,1,0]) cube(size=[fsw,longwing-hhh+lever_thickness/sqrt(2),hhh+lever_thickness/2]);
       }
      }
      translate([0,-longwing,ls_z]) rotate([0,-90,0])
      finger_indent(d=lever_thickness-1,r=15);
     } // 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:*/])
-    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]) {
     translate([0,0,mount_screw_l-mounthole_depth/2-layer_height-1])
     mirror([0,0,1])
     cylinder(d=mount_screw_d+mount_screw_d_tolerance,
              h=mount_screw_l-mounthole_depth/2-layer_height+1,
 	     $fn=2*PI*mount_screw_d);
     translate([0,0,mount_screw_l-mounthole_depth/2])
     cylinder(d=mount_screwhead_d,h=body_h+1,$fn=2*PI*mount_screwhead_d);
    }//for
    // 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
    cylinder(d=pulley_d+pulley_clearance,h=body_h+1,$fn=2*PI*(pulley_d+pulley_clearance));
    // leverspace
    hull() for(x=[0,gearbox_d])
    rotate([0,0,45])
    translate([x,0,ls_z-ls_h/2])
    cylinder(d=idler_d+idler_clearance,h=ls_h,$fn=2*PI*idler_d);
    
    a=cos(45)*(pulley_d+idler_d)/2;
    b=mount_d/2-a;
    x=sqrt(pow(a,2)+pow(b,2));
    translate([mount_d/2,0,ls_z])
    intersection() {
     r = x+idler_d/2+1;/* TODO: */
     cylinder(r=r,h=ls_h,center=true);
     translate([-r-1,0,-1]) cube(size=[2*r+2,r+1,ls_h+2]);
    }
    
    rotate([0,0,-45])