MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Cast DELTA_PRINTABLE_RADIUS to float in sq()

Browse Source 
Addressing #5625
This commit is contained in:
Scott Lahteine 2017-02-11 18:04:32 -06:00
parent 1e4d4e5915
commit 1bc5be3bdf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Marlin_main.cpp
View File

@ -2937,7 +2937,7 @@ bool position_is_reachable(float target[XYZ]
return HYPOT2(dx - SCARA_OFFSET_X, dy - SCARA_OFFSET_Y) <= sq(L1 + L2); return HYPOT2(dx - SCARA_OFFSET_X, dy - SCARA_OFFSET_Y) <= sq(L1 + L2);
#endif #endif
#elif ENABLED(DELTA) #elif ENABLED(DELTA)
return HYPOT2(dx, dy) <= sq(DELTA_PRINTABLE_RADIUS); return HYPOT2(dx, dy) <= sq((float)(DELTA_PRINTABLE_RADIUS));
#else #else
const float dz = RAW_Z_POSITION(target[Z_AXIS]); const float dz = RAW_Z_POSITION(target[Z_AXIS]);
return dx >= X_MIN_POS - 0.0001 && dx <= X_MAX_POS + 0.0001 return dx >= X_MIN_POS - 0.0001 && dx <= X_MAX_POS + 0.0001

2
Marlin/ultralcd.cpp
View File

@ -1554,7 +1554,7 @@ KeepDrawing:
// This assumes the center is 0,0 // This assumes the center is 0,0
#if ENABLED(DELTA) #if ENABLED(DELTA)
if (axis != Z_AXIS) { 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; min = -max;
} }
#endif #endif