andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ExtUI patch followup

pull/1/head
Scott Lahteine 5 years ago
parent
4ff59d178d
commit
ebc9a8a0b0
1 changed files with 1 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/move_axis_screen.cpp

3
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/move_axis_screen.cpp
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 // 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) {

Write Preview
Loading…
Cancel
Save