From 1bc5be3bdfb27558d73d1f8aaea1e732f3f9efa9 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 11 Feb 2017 18:04:32 -0600 Subject: [PATCH] Cast DELTA_PRINTABLE_RADIUS to float in sq() Addressing #5625 --- Marlin/Marlin_main.cpp | 2 +- Marlin/ultralcd.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index f9ece0240..77fcd20d5 100755 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -2937,7 +2937,7 @@ bool position_is_reachable(float target[XYZ] return HYPOT2(dx - SCARA_OFFSET_X, dy - SCARA_OFFSET_Y) <= sq(L1 + L2); #endif #elif ENABLED(DELTA) - return HYPOT2(dx, dy) <= sq(DELTA_PRINTABLE_RADIUS); + return HYPOT2(dx, dy) <= sq((float)(DELTA_PRINTABLE_RADIUS)); #else const float dz = RAW_Z_POSITION(target[Z_AXIS]); return dx >= X_MIN_POS - 0.0001 && dx <= X_MAX_POS + 0.0001 diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index dc7bbba75..8af3cecf6 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1554,7 +1554,7 @@ KeepDrawing: // This assumes the center is 0,0 #if ENABLED(DELTA) if (axis != Z_AXIS) { - max = sqrt(sq(DELTA_PRINTABLE_RADIUS) - sq(current_position[Y_AXIS - axis])); + max = sqrt(sq((float)(DELTA_PRINTABLE_RADIUS)) - sq(current_position[Y_AXIS - axis])); min = -max; } #endif