z-axis: make zmotor_delta_{x,y} use local coordinate system

[clinton/prusa3.git] / box_frame / inc / settings.scad

diff --git a/box_frame/inc/settings.scad b/box_frame/inc/settings.scad
index 3fa92aa..02ed98d 100644 (file)
--- a/box_frame/inc/settings.scad
+++ b/box_frame/inc/settings.scad
@@ -19,10 +19,13 @@ m3_nut_diameter_bigger = ((m3_nut_diameter / 2) / cos (180 / 6)) * 2;
 // deprecated
 i_am_box = (frame_type == frame_box);
 
-// shift smooth rod and leadscrew mounts together
+// shift smooth rod and leadscrew mounts simultaneously
 zaxis_delta_x = (frame_type == frame_alu) ? 5 : 0;
-zaxis_delta_y = (frame_type == frame_alu) ? 5 : 0;
+zaxis_delta_y = (frame_type == frame_alu) ? -5 : 0;
 
 // shift motor/leadscrew mount to clear bearings and x-rods
-zmotor_delta_x = ((frame_type == frame_alu) && (bushing_z[1] > 9)) ? 5 : 0;
-zmotor_delta_y = ((frame_type == frame_alu) && (bushing_xy[0] >= 5)) ? -3 : 0;
+// X/Y ARE SWITCHED FROM X-END CONFIGURATION BE WARNED
+// BONUS FUN: X (Y in x-end configuration) IS INVERTED!
+// fixed, but it was all a fucking tautology in the end whoops
+zmotor_delta_x = ((frame_type == frame_alu) && (bushing_z[1] > 9)) ? 3 : 0;
+zmotor_delta_y = ((frame_type == frame_alu) && (bushing_xy[0] >= 5)) ? 5 : 0;