1
0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-23 02:35:31 +00:00

ExtUI patch followup

This commit is contained in:
Scott Lahteine 2019-09-24 20:21:22 -05:00
parent 4ff59d178d
commit ebc9a8a0b0

View File

@ -111,8 +111,7 @@ float MoveAxisScreen::getManualFeedrate(uint8_t axis, float increment_mm) {
// being held down, this allows enough margin for the planner to
// connect segments and even out the motion.
constexpr float manual_feedrate[XYZE] = MANUAL_FEEDRATE;
return min(manual_feedrate[axis] / 60, abs(increment_mm * TOUCH_REPEATS_PER_SECOND * 0.80));
return min(manual_feedrate[axis] / 60, abs(increment_mm * TOUCH_REPEATS_PER_SECOND * 0.80));
return min(manual_feedrate[axis] / 60.0f, abs(increment_mm * (TOUCH_REPEATS_PER_SECOND) * 0.80f));
}
void MoveAxisScreen::setManualFeedrate(ExtUI::axis_t axis, float increment_mm) {