munge math

MarlinFirmware · Feb 10, 2022 · bbd8c6b · bbd8c6b
1 parent 8616120
commit bbd8c6b
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
@@ -76,14 +76,12 @@
 
     const int x_axis_home_dir = TOOL_X_HOME_DIR(active_extruder);
 
-    const float speed_ratio = homing_feedrate(X_AXIS) / homing_feedrate(Y_AXIS);
-    const float speed_ratio_inv = homing_feedrate(Y_AXIS) / homing_feedrate(X_AXIS);
-    const float length_ratio = max_length(X_AXIS) / max_length(Y_AXIS);
-    const bool length_r_less_than_speed_r = length_ratio < speed_ratio;
-
-    const float mlx = length_r_less_than_speed_r ? (max_length(Y_AXIS) * speed_ratio) : (max_length(X_AXIS));
-    const float mly = length_r_less_than_speed_r ? (max_length(Y_AXIS)) : (max_length(X_AXIS) * speed_ratio_inv);
-    const float fr_mm_s = SQRT(sq(homing_feedrate(X_AXIS)) + sq(homing_feedrate(Y_AXIS)));
+    const float hfx = homing_feedrate(X_AXIS), hfy = homing_feedrate(Y_AXIS),
+                ratio_xy = hfx / hfy, ratio_yx = hfy / hfx,
+                r_length = max_length(X_AXIS) / max_length(Y_AXIS),
+                mlx = r_length < ratio_xy ? max_length(Y_AXIS) * ratio_xy : max_length(X_AXIS),
+                mly = r_length > ratio_xy ? max_length(X_AXIS) * ratio_yx : max_length(Y_AXIS),
+                fr_mm_s = HYPOT(hfx, hfy);
 
     #if ENABLED(SENSORLESS_HOMING)
       sensorless_t stealth_states {