sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Followup fixes to ExtUI (#15068)

Browse Source
This commit is contained in:
Marcio Teixeira
2019-08-28 03:23:13 -06:00
committed by Scott Lahteine
parent 081e4506ca
commit 0f386d06a1
8 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/extensible_ui/ui_api.cpp
View File

@ -320,7 +320,7 @@ namespace ExtUI {
#endif
constexpr float max_manual_feedrate[XYZE] = MANUAL_FEEDRATE;
setFeedrate_mm_s(MMM_MMS(max_manual_feedrate[axis]));
setFeedrate_mm_s(MMM_TO_MMS(max_manual_feedrate[axis]));
if (!flags.manual_motion) set_destination_from_current();
destination[axis] = clamp(position, min, max);
@ -331,7 +331,7 @@ namespace ExtUI {
setActiveTool(extruder, true);
constexpr float max_manual_feedrate[XYZE] = MANUAL_FEEDRATE;
setFeedrate_mm_s(MMM_MMS(max_manual_feedrate[E_AXIS]));
setFeedrate_mm_s(MMM_TO_MMS(max_manual_feedrate[E_AXIS]));
if (!flags.manual_motion) set_destination_from_current();
destination[E_AXIS] = position;
flags.manual_motion = true;