Merge pull request #58 from AxTheB/master

[clinton/prusa3.git] / box_frame / x-end.scad

diff --git a/box_frame/x-end.scad b/box_frame/x-end.scad
index a07c71b..c8a5d06 100644 (file)
--- a/box_frame/x-end.scad
+++ b/box_frame/x-end.scad
@@ -14,7 +14,7 @@ use <y-drivetrain.scad>
 //height and width of the x blocks depend on x smooth rod radius
 x_box_height = 52 + 2 * bushing_xy[0];
 x_box_width = (bushing_xy[0] <= 4) ? 17.5 : bushing_xy[0] * 2 + 9.5;
-bearing_height = (bushing_z[2] > 30 ? x_box_height : (2 * bushing_z[2] + 8));
+bearing_height = max ((bushing_z[2] > 30 ? x_box_height : (2 * bushing_z[2] + 8)), x_box_height);
 
 module x_end_motor(){
 
@@ -43,7 +43,7 @@ module x_end_motor(){
                 // belt hole
                 translate([-30, 11, -0.25]) cube([11, 36, 24], center = true);
                 //motor mounting holes
-                translate([-28.5, 0, 0]) rotate([0, 0, 0])  rotate([0, 90, 0]) nema17(places=[1, 1, 0, 1], holes=true, shadow=5, $fn=7, h=8);
+                translate([-28.5, 0, 0]) rotate([0, 0, 0])  rotate([0, 90, 0]) nema17(places=[1, 1, 0, 1], holes=true, shadow=5, $fn=small_hole_segments, h=8);
             }
         }
         //smooth rod caps
@@ -84,7 +84,7 @@ module x_end_base(vfillet=[3, 3, 3, 3], thru=true, len=40, offset=0){
         translate([0, 0, 5 - bushing_xy[0]]) {  // m5 nut insert
             translate([0, 17, 0]) rotate([0, 0, 10]){
                 //rod
-                translate([0, 0, -1]) cylinder(h=(4.1 / 2 + 5), r=2.75);
+                translate([0, 0, -1]) cylinder(h=(4.1 / 2 + 5), r=2.75, $fn=32);
                 //nut
                 translate([0, 0, 9]) cylinder(r=4.6, h=14.1, center = true, $fn=6);
 
@@ -100,16 +100,16 @@ module x_end_idler(){
         x_end_base(len=45 + z_delta / 3, offset=-10 - z_delta / 3);
         // idler hole
         translate([-20, -15 - z_delta / 2, 30]) {
-            rotate([0, 90, 0]) cylinder(r=m4_diameter / 2, h=33, center=true, $fn=7);
+            rotate([0, 90, 0]) cylinder(r=m4_diameter / 2, h=33, center=true, $fn=small_hole_segments);
             translate([15 - 2 * single_wall_width, 0, 0]) rotate([90, 0, 90]) cylinder(r=m4_nut_diameter_horizontal / 2, h=3, $fn=6);
 
         }
-        translate([-6 - x_box_width, 11, 21.5]) cube([x_box_width + 1, 11, 17.5]);
+        #translate([-6 - x_box_width, 11, 29.5 - (max(idler_bearing[0], 16) / 2)]) cube([x_box_width + 1, 11, 1.5 + max(idler_bearing[0], 16)]);
     }
-        %translate([-14, -9, 22]) x_tensioner();
+        %translate([-14, -9, 30.5 - (max(idler_bearing[0], 16) / 2)]) x_tensioner();
 }
 
-module x_tensioner(len=62, idler_height=16) {
+module x_tensioner(len=62, idler_height=max(idler_bearing[0], 16)) {
         idlermount(len=len, rod=m4_diameter / 2, idler_height=idler_height, narrow_len=46, narrow_width=idler_width + 2 - single_wall_width);
 }