Fixes for 10mm bushings

diff --git a/box_frame/x-carriage.scad b/box_frame/x-carriage.scad
index 48e7e05..f0c6dff 100644 (file)
--- a/box_frame/x-carriage.scad
+++ b/box_frame/x-carriage.scad
@@ -58,7 +58,7 @@ module x_carriage(){
             }
             //Ensure upper bearing can be inserted cleanly
             rotate([0, 0, 90]) {
-                linear_negative(bushing_carriage);
+                linear_negative(bushing_carriage, carriage_l);
             }
             //Same for lower bearing
             translate([xaxis_rod_distance, 0, 0]) rotate([0, 0, 90]) {

diff --git a/box_frame/x-end.scad b/box_frame/x-end.scad
index a07c71b..f35317b 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(){