Merge branch 'master' of github.com:josefprusa/Prusa3

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

diff --git a/box_frame/x-end.scad b/box_frame/x-end.scad
index 4b68b36..c88be61 100644 (file)
--- a/box_frame/x-end.scad
+++ b/box_frame/x-end.scad
@@ -14,13 +14,14 @@ 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;
+echo(x_box_width);
 bearing_height = max ((bushing_z[2] > 30 ? x_box_height : (2 * bushing_z[2] + 8)), x_box_height);
 
 module x_end_motor(){
 
     mirror([0, 1, 0]) {
 
-        x_end_base([3, 3, min((bushing_xy[0] - 4) * 2, 3), 0], thru=false);
+        x_end_base([3, 3, min((bushing_xy[0] - 3) * 2, 3), 2], len=42, offset=-5, thru=false);
 
 
         translate([0, -z_delta - 2, 0]) difference(){
@@ -28,27 +29,28 @@ module x_end_motor(){
                 intersection() {
                     translate([-15, -34, 30]) cube([20, 60, x_box_height], center = true);
                     union() {
-                        translate([-13.75, -14 + z_delta / 2, 24]) cube_fillet([17.5, 14 + z_delta, 55], center = true, vertical=[0, 0, 3, 1.5], top=[0, 3, 6, 3], $fn=16);
-                        translate([-10, -34, 9]) intersection(){
+                        translate([-14, -16 + z_delta / 2, 24]) cube_fillet([17.5, 10.5 + z_delta, 55], center = true, vertical=[0, 0, 3, 3], top=[0, 3, 6, 3], $fn=16);
+                        //lower arm holding outer stepper screw
+                        translate([-10.25, -34, 9]) intersection(){
                             translate([0, 0, -5]) cube_fillet([10, 37, 28], center = true, vertical=[0, 0, 0, 0], top=[0, 3, 5, 3]);
                             translate([-10/2, 10, -26]) rotate([45, 0, 0]) cube_fillet([10, 60, 60], radius=2);
                         }
                     }
                 }
-                translate([-15.5, -32, 30.25]) rotate([90, 0, 0])  rotate([0, 90, 0]) nema17(places=[1, 0, 1, 1], h=11);
+                translate([-16, -32, 30.25]) rotate([90, 0, 0])  rotate([0, 90, 0]) nema17(places=[1, 0, 1, 1], h=11);
             }
 
             // motor screw holes
             translate([21-5, -21-11, 30.25]){
                 // belt hole
-                translate([-30, 11, -0.25]) cube([11, 36, 24], center = true);
+                    translate([-30, 11, -0.25]) cube_fillet([11, 36, 22], vertical=0, top=[0, 1, 0, 1], bottom=[0, 1, 0, 1], center = true, $fn=4);
                 //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=small_hole_segments, h=8);
+                translate([-29.5, 0, 0]) rotate([0, 0, 0])  rotate([0, 90, 0]) nema17(places=[1, 1, 0, 1], holes=true, shadow=5.5, $fn=small_hole_segments, h=8);
             }
         }
         //smooth rod caps
-        translate([-22, -10, 0]) cube([17, 2, 15]);
-        translate([-22, -10, 45]) cube([17, 2, 10]);
+        //translate([-22, -10, 0]) cube([17, 2, 15]);
+        //translate([-22, -10, 45]) cube([17, 2, 10]);
     }
 }
 
@@ -70,8 +72,9 @@ module x_end_base(vfillet=[3, 3, 3, 3], thru=true, len=40, offset=0){
         translate([z_delta, 0, 4 - bushing_xy[0]]) linear_negative(bushing_z, bearing_height);
 
         // belt hole
-        translate([-5.5 - 10 + 1.5, 22 - 9 + offset, 30]) cube([max(idler_width + 2, 11), 55, 27], center = true);
+        translate([-5.5 - 10 + 1.5, 22 - 9 + offset, 30]) cube_fillet([max(idler_width + 2, 11), 55, 27], center = true, vertical=0, top=[0, 1, 0, 1], bottom=[0, 1, 0, 1], $fn=4);
 
+        //smooth rods
         translate([-10 - bushing_xy[0], offset, 0]) {
             if(thru == true){
                 translate([0, -11, 6]) rotate([-90, 0, 0]) pushfit_rod(bushing_xy[0] * 2 + 0.2, 50);
@@ -84,7 +87,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=3, $fn=32);
+                translate([0, 0, -1]) cylinder(h=(4.1 / 2 + 5), r=3, $fn=32);
                 //nut
                 translate([0, 0, 9]) cylinder(r=4.6, h=14.1, center = true, $fn=6);
 
@@ -97,14 +100,14 @@ module x_end_base(vfillet=[3, 3, 3, 3], thru=true, len=40, offset=0){
 
 module x_end_idler(){
     difference() {
-        x_end_base(len=45 + z_delta / 3, offset=-10 - z_delta / 3);
+        x_end_base(len=48 + 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=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, 29.5 - (max(idler_bearing[0], 16) / 2)]) cube([x_box_width + 1, 11, 1.5 + max(idler_bearing[0], 16)]);
+        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, 30.5 - (max(idler_bearing[0], 16) / 2)]) x_tensioner();
 }
@@ -114,15 +117,16 @@ module x_tensioner(len=62, idler_height=max(idler_bearing[0], 16)) {
 }
 
 
-translate([-40, 0, 4 - bushing_xy[0]]) x_tensioner();
-mirror([1, 0, 0]) x_end_idler(thru=true);
-mirror([1, 0, 0]) translate([-50, 0, 0]) x_end_motor();
+*translate([-40, 0, 4 - bushing_xy[0]]) x_tensioner();
+translate([0, -80, 0]) mirror([1, 0, 0]) x_end_idler(thru=true);
+translate([-50, 0, 0]) mirror([1, 0, 0]) translate([-50, 0, 0])
+    x_end_motor();
 
 module pushfit_rod(diameter, length){
     cylinder(h = length, r=diameter/2, $fn=30);
-    translate([0, -diameter/4, length/2]) cube([diameter, diameter/2, length], center = true);
+    translate([0, -diameter/4, length/2]) cube_fillet([diameter, diameter/2, length], vertical = [0, 0, 1, 1], center = true, $fn=4);
 
-    translate([0, -diameter/2-1.2, length/2]) cube([diameter, 1, length], center = true);
+    translate([0, -diameter/2-1.2, length/2]) cube([diameter - 1, 1, length], center = true);
 }
 
 if (idler_bearing[3] == 1) {