move stuff around

1 files changed, 10 insertions, 8 deletions

diff --git a/another.scad b/another.scad
index 79cebdd..a3f5dc9 100644
--- a/another.scad
+++ b/another.scad
@@ -323,80 +323,82 @@ module the_extruder(
    rotate([0,0,45]) translate([pulley_d/2+filament_offset,0,0])
    rotate([-90,0,0])
    translate([0,0,pf_offset])
    rotate([0,0,180]) {
     pushfit(pf);
     mirror([0,0,1]) {
      fh = 1.5* (filament_guide_d-filament_path_d)/2;
      fo = pf_offset-(idler_d+idler_clearance)/2-fh;
      translate([0,0,-1]) teardrop(d=filament_guide_d,h=fo-extrusion_width+1,angle=225);
      translate([0,0,-1]) teardrop(d=filament_path_d,h=gearbox_d/2+1,angle=-225);
      translate([0,0,fo+epsilon])
      cylinder(d1=filament_path_d,d2=filament_guide_d,h=fh,$fn=fnd*filament_guide_d);
     }//mirror
    }//rotate translate rotate translate rotate translate
    // pulley
    cylinder(d=pulley_d+pulley_d_clearance,h=body_h+1,$fn=fnd*(pulley_d+pulley_d_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=fnd*(idler_d+idler_clearance));
 
    // idler clearance
    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+idler_clearance;
     cylinder(r=r,h=ls_h,center=true);
     translate([-r-1,0,-ls_h/2-1]) cube(size=[2*r+2,r+1,ls_h+2]);
    }
 
+   rotate([0,0,-45])
+   translate([0,0,ls_z-ls_h/2])
+   cube(size=[gearbox_d,gearbox_d,lever_thickness+lever_v_clearance]);
+   translate([0,0,ls_z-ls_h/2]) {
+    translate([mount_screwhead_d/2,0,0])
+    mirror([0,1,0])
+    cube(size=[gearbox_d,gearbox_d/2+1,lever_thickness+lever_v_clearance]);
+   }
+
    // back side cutout
    // XXX: this is somewhat ugly and potentially bugged,
    //      but I want to sleep.
    a0_ = atan(
     (mount_d/sqrt(2)/2+mount_screw_d+pf_h(pf)+gearbox_d/2)
     /
     (
      pulley_d/2+filament_offset-
      (pf_d(pf)+2*pf_shell)/2/cos(30)
     )
    );
    a0 = -135 + ( (a0_>0) ? a0_ : 180+a0_ );
    a1 = atan((longwing-lever_thickness/2)/(gearbox_d/2));
    translate([0,0,ls_z]) difference() {
     rotate([0,0,-180+a0])
     rotate_extrude(angle=a1-a0)
     translate([0,-ls_h/2])
     square([sqrt(pow(gearbox_d/2,2)+pow(longwing-lever_thickness/2,2))+1,
            ls_h]);
     translate([-mount_d/2,0,0])
     cylinder(d=gearbox_d-mount_d,h=ls_h+2,center=true,$fn=fnd*(gearbox_d-mount_d));
    }//difference translate
    
-   rotate([0,0,-45])
-   translate([0,0,ls_z-ls_h/2])
-   cube(size=[gearbox_d,gearbox_d,lever_thickness+lever_v_clearance]);
-   translate([0,0,ls_z-ls_h/2]) {
-    translate([mount_screwhead_d/2,0,0])
-    mirror([0,1,0])
-    cube(size=[gearbox_d,gearbox_d/2+1,lever_thickness+lever_v_clearance]);
-   }
    //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_d_clearance,h=body_h+1,$fn=fnd*(pulley_d+pulley_d_clearance));
    }