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
@@ -5,6 +5,7 @@ $fs=0.0125;
 
 use <pushfittery.scad>;
 include <pushfit_data.scad>;
+include <pulley_data.scad>;
 
 module the_extruder(
  // motor properties
@@ -16,10 +17,8 @@ module the_extruder(
  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
@@ -52,7 +51,6 @@ module the_extruder(
  // 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,
@@ -77,7 +75,13 @@ module the_extruder(
  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);