1 files changed, 8 insertions, 4 deletions

diff --git a/another.scad b/another.scad
index ed18874..51358ee 100644
--- a/another.scad
+++ b/another.scad
@@ -2,27 +2,26 @@ draft=true;
 layer_height=0.2; extrusion_width=0.4;
 epsilon=0.01;
 $fs=0.0125;
 
 use <pushfittery.scad>;
 include <pushfit_data.scad>;
+include <pulley_data.scad>;
 
 module the_extruder(
  // motor properties
  gearbox_d = 36,
          mount_d = 28,                          // the distance between opposite mounting holes
  mounthole_depth = 5,
  mounthole_min_depth = 3, mounthole_max_depth = 4,
          protrusion_d = 22, protrusion_h = 2.2,         // the dimensions of the protrusion on top of gearbox
  bore_d = 8, bore_l = 17.6,
  bore_dd = 7,
  // pulley properties
- pulley_d = 11.5, pulley_h=10,
+ pulley = pulley_e3d,
          pulley_elevation = 1,                  // pulley elevation above the protrusion
-         teeth_elevation = 7.5,                         // distance from the bottom of the pulley to its teeth
- filament_offset = (8.25-(3.0+3.5)/2) - 11.5/2 + 1.75/2,
  // 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,
@@ -49,13 +48,12 @@ module the_extruder(
  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_d_clearance=2,
  pulley_small_d_clearance=0.5,
          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,
@@ -74,13 +72,19 @@ module the_extruder(
  vitamins = true,
  bridges = true,
  debug = false,
  label = "another"
 ) {
  fnd = 2*PI; fnr = 2*fnd;
+ function lu(m,k) = m[search([k],m)[0]][1];
 
+ pulley_d = lu(pulley,"d");
+ pulley_h = lu(pulley,"h");
+ teeth_elevation = lu(pulley,"fe");
+ filament_offset = lu(pulley,"g")+filament_d/2;
+ pulley_d_clearance = lu(pulley,"ssrc")*2;
  idler_filament_offset = filament_path_d/2; // -filament_offset;
  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; // the diameter of lever thingie
  longwing=(mount_d+mount_screw_d+mount_screw_d_tolerance+spring_d+spring_d_clearance)/2+min_xy_shell;
  shortwing = let(a=mount_d/2,c=(pulley_d+idler_d)/2/sqrt(2))