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