jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ui_api.cpp

Browse Source
This commit is contained in:
InsanityAutomation
2019-08-17 00:49:32 -04:00
parent 9975799c5f
commit 412e3aa1f6
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/lcd/extensible_ui/ui_api.cpp
+10 -1
View File
@@ -268,8 +268,11 @@ namespace ExtUI {
}
float getAxisPosition_mm(const extruder_t extruder) {
const uint8_t old_tool = active_extruder;
setActiveTool(extruder, true);
return flags.manual_motion ? destination[E_AXIS] : current_position[E_AXIS];
float pos = flags.manual_motion ? destination[E_AXIS] : current_position[E_AXIS];
setActiveTool(old_tool, true);
return pos;
}
void setAxisPosition_mm(const float position, const axis_t axis) {
@@ -316,6 +319,9 @@ namespace ExtUI {
}
#endif
constexpr float max_manual_feedrate[XYZE] = MANUAL_FEEDRATE;
setFeedrate_mm_s(max_manual_feedrate[axis]);
if (!flags.manual_motion) set_destination_from_current();
destination[axis] = clamp(position, min, max);
flags.manual_motion = true;
@@ -324,6 +330,8 @@ namespace ExtUI {
void setAxisPosition_mm(const float position, const extruder_t extruder) {
setActiveTool(extruder, true);
constexpr float max_manual_feedrate[XYZE] = MANUAL_FEEDRATE;
setFeedrate_mm_s(max_manual_feedrate[E_AXIS]);
if (!flags.manual_motion) set_destination_from_current();
destination[E_AXIS] = position;
flags.manual_motion = true;
@@ -365,6 +373,7 @@ namespace ExtUI {
#if EXTRUDERS > 1
const uint8_t e = extruder - E0;
if (e != active_extruder) tool_change(e, no_move);
active_extruder = e;
#else
UNUSED(extruder);
UNUSED(no_move);