1 files changed, 6 insertions, 5 deletions
diff --git a/another.scad b/another.scad
index 7a3b0ac..da5f695 100644
--- a/another.scad
+++ b/another.scad
@@ -28,64 +28,65 @@ module the_extruder(
         filament_guide_d = 4,                  // PTFE filament guide diameter
 // knob properties
 knob_h = 10,
 knob_bore_l = 4,
 knob_indent_d = 4,
 knob_indents = 12,
 // spring tensioner
 st_nut_d = 9, st_nut_h = 4,
 st_screw_d = 5,
 st_thickshell = 8*extrusion_width, st_thinshell = 4*extrusion_width,
 // 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,
 // 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=.4,
 idler_v_tolerance=.5,
 knob_bore_d_tolerance=.6,
 st_nut_h_tolerance=.2,
 st_nut_d_tolerance=.2,/* TODO: make it st_nut_w_tolerance */
+ st_screw_d_tolerance=.3,
 what="lever",  // lever|body|knob|springpad|*
 left=false,
 vitamins = true,
 supports = false, bridges = true,
 tensioner = true,
 debug = false
 ) {
 fnd = 2*PI; fnr = 2*fnd;
 lever_shell = mount_screwhead_h+0.5;
 lever_thickness=max(spring_d+spring_d_clearance+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;
 filament_elevation=protrusion_h+pulley_elevation+teeth_elevation;
 ls_z = filament_elevation; // leverspace mid-z
 body_h = max(protrusion_h+bore_l,mount_screw_l-mounthole_depth/2+mount_screwhead_h,ls_z*2);
 ls_h = lever_thickness+lever_v_clearance; // leverspace height
 module mirrorleft() {
  mirror([left?0:1,0,0]) children();
 }
 module place_idler() {
  rotate([0,0,45])
  translate([(pulley_d+idler_d)/2,0,0])
  children();
 }
 module finger_indent(d=lever_thickness,depth/*=1*/,r/*=15*/) {
@@ -187,69 +188,69 @@ module the_extruder(
   mirror([0,0,1])
   cylinder(d=mount_screwhead_d,h=layer_height);
  }//translate
 }//lever module
 
 module body() {
  difference() {
   union() {
   cylinder(d=gearbox_d,h=body_h,$fn=fnd*gearbox_d);
    // finger and spring support
    fsw = gearbox_d-(gearbox_d-mount_d)/2-spring_lc;
    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=fnd*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]) {
      if(!tensioner) finger_indent(d=lever_thickness-1,r=15); else {
       mirror([0,0,1]) {
        translate([0,0,st_thickshell])
        hull() for(o=[0,spring_d]) translate([0,-o,0])
        rotate([0,0,30])
        cylinder(d=st_nut_d+st_nut_d_tolerance,h=st_nut_h+st_nut_h_tolerance,$fn=6);
-        translate([0,0,-1]) cylinder(d=st_screw_d,h=fsw+2,$fn=fnd*st_screw_d);
+        translate([0,0,-1]) cylinder(d=st_screw_d+st_screw_d_tolerance,h=fsw+2,$fn=fnd*(st_screw_d+st_screw_d_tolerance));
        bigd = spring_d+spring_d_clearance;
-        hf = (bigd-st_screw_d)/2;
+        hf = (bigd-st_screw_d-st_screw_d_tolerance)/2;
        translate([0,0,st_thickshell+st_nut_h+st_nut_h_tolerance+st_thinshell-epsilon])
-        cylinder(d1=st_screw_d,d2=bigd,
+        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([-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);
   }//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)])
    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])
@@ -306,78 +307,78 @@ module the_extruder(
   //translate([-mount_d/2,-longwing,filament_elevation])
   if(!tensioner) /* XXX: this seems to be bullshit, but it's so old, that it's historical bullshit */
   translate([mount_d/2,-longwing,filament_elevation])
   rotate([0,-90,0]) difference() {
    cylinder(d=spring_d+spring_d_clearance,h=spring_lc+spring_dl,$fn=fnd*(spring_d+spring_d_clearance));
    translate([0,0,spring_lc+spring_dl]) sphere(d=spring_d*3/4,$fn=fnd*spring_d*3/4);
   }
  }//difference
  if(supports) intersection() {
   difference() {
    translate([0,0,ls_z-ls_h/2-epsilon])
    cylinder(d=gearbox_d,h=ls_h+2*epsilon,$fn=fnd*gearbox_d);
    cylinder(d=pulley_d+pulley_clearance,h=body_h+1,$fn=fnd*(pulley_d+pulley_clearance));
   }
   // supports
   // TODO: hardcoded stuff below…
   if(false) { // parallel
    for(y=[-gearbox_d:4:gearbox_d])
     translate([0,y-extrusion_width/2,0])
     cube(size=[gearbox_d,extrusion_width,body_h]);
   }else{ // radial
    for(zr=[-65:(65+50)/7:50])
     rotate([0,0,zr]) translate([0,-extrusion_width/2,0])
     cube(size=[gearbox_d,extrusion_width,body_h]);
   }
  }
 }//body module
 module springpad() {
-  smalld=st_screw_d+2*extrusion_width;
+  smalld=st_screw_d+st_screw_d_tolerance+2*extrusion_width;
  bigd = spring_d+spring_d_clearance/2;
  hf = (bigd-smalld)/2;
  translate([-gearbox_d/2+st_thickshell+st_nut_h+st_nut_h_tolerance+st_thinshell+1,-longwing,filament_elevation])
  rotate([0,90,0]) difference() {
   union() {
    cylinder(d1=smalld,d2=bigd,h=hf,$fn=fnd*bigd);
    translate([0,0,hf-epsilon])
    cylinder(d=bigd,h=hf*2,$fn=fnd*bigd);
    translate([0,0,3*hf])
    sphere(d=spring_d*3/4,$fn=fnd*spring_d*3/4);
   }
   translate([0,0,-epsilon])
-   cylinder(d=st_screw_d,h=2*hf+epsilon,$fn=fnd*st_screw_d);
+   cylinder(d=st_screw_d+st_screw_d_tolerance,h=2*hf+epsilon,$fn=fnd*(st_screw_d+st_screw_d_tolerance));
  }
 }
 module knob() {
  ch = knob_indent_d/2;
  translate([0,0,body_h+epsilon]) {
   mirror([0,0,1]) translate([0,0,-epsilon]) {
    difference() {
     cylinder(d=pulley_d,h=knob_bore_l,$fn=fnd*pulley_d);
     translate([0,0,-1]) difference() {
      cylinder(d=bore_d+knob_bore_d_tolerance,h=knob_bore_l+2);
      translate([-bore_d/2-1,bore_dd-bore_d/2+knob_bore_d_tolerance/2,-1])
      cube([bore_d+2,bore_d/2,knob_bore_l+4]);
     }
    }
   }
   difference() {
    union() {
     cylinder(d1=gearbox_d-2*ch,d2=gearbox_d,h=ch+epsilon,$fn=fnd*gearbox_d);
     translate([0,0,ch])
     cylinder(d=gearbox_d,h=knob_h-2*ch+epsilon,$fn=fnd*gearbox_d);
     translate([0,0,knob_h-ch])
     cylinder(d1=gearbox_d,d2=gearbox_d-2*ch,h=ch,$fn=fnd*gearbox_d);
    }
    for(a=[0:360/knob_indents:359]) rotate([0,0,a])
     translate([0,gearbox_d/2,-1])
     cylinder(d=knob_indent_d,h=knob_h+2,$fn=fnd*knob_indent_d);
   }
  }
 }//knob module
 module debug() {