3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 22:08:02 +00:00
Code Issues Releases Wiki Activity

Comment return false in motion functions

Browse Source
This commit is contained in:
Scott Lahteine 2017-12-24 22:53:05 -06:00
parent 1bb5791e64
commit fb6b62a01b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/Marlin_main.cpp
View File

@ -13027,7 +13027,6 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
} }
else { else {
// Must already have been split on these border(s) // Must already have been split on these border(s)
// This should be a rare case.
buffer_line_to_destination(fr_mm_s); buffer_line_to_destination(fr_mm_s);
set_current_from_destination(); set_current_from_destination();
return; return;
@ -13096,7 +13095,6 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
} }
else { else {
// Must already have been split on these border(s) // Must already have been split on these border(s)
// This should be a rare case.
buffer_line_to_destination(fr_mm_s); buffer_line_to_destination(fr_mm_s);
set_current_from_destination(); set_current_from_destination();
return; return;
@ -13139,7 +13137,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
// If the move is only in Z/E don't split up the move // If the move is only in Z/E don't split up the move
if (!xdiff && !ydiff) { if (!xdiff && !ydiff) {
planner.buffer_line_kinematic(rtarget, _feedrate_mm_s, active_extruder); planner.buffer_line_kinematic(rtarget, _feedrate_mm_s, active_extruder);
return false; return false; // caller will update current_position
} }
// Fail if attempting move outside printable radius // Fail if attempting move outside printable radius
@ -13236,7 +13234,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
planner.buffer_line_kinematic(rtarget, _feedrate_mm_s, active_extruder); planner.buffer_line_kinematic(rtarget, _feedrate_mm_s, active_extruder);
#endif #endif
return false; return false; // caller will update current_position
} }
#else // !IS_KINEMATIC #else // !IS_KINEMATIC
@ -13257,7 +13255,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
return true; // all moves, including Z-only moves. return true; // all moves, including Z-only moves.
#elif ENABLED(SEGMENT_LEVELED_MOVES) #elif ENABLED(SEGMENT_LEVELED_MOVES)
segmented_line_to_destination(MMS_SCALED(feedrate_mm_s)); segmented_line_to_destination(MMS_SCALED(feedrate_mm_s));
return false; return false; // caller will update current_position
#else #else
/** /**
* For MBL and ABL-BILINEAR only segment moves when X or Y are involved. * For MBL and ABL-BILINEAR only segment moves when X or Y are involved.
@ -13276,7 +13274,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
#endif // HAS_MESH #endif // HAS_MESH
buffer_line_to_destination(MMS_SCALED(feedrate_mm_s)); buffer_line_to_destination(MMS_SCALED(feedrate_mm_s));
return false; return false; // caller will update current_position
} }
#endif // !IS_KINEMATIC #endif // !IS_KINEMATIC

2
Marlin/ubl_motion.cpp
View File

@ -616,6 +616,8 @@
} // segment loop } // segment loop
} // cell loop } // cell loop
return false; // caller will update current_position
} }
#endif // UBL_SEGMENTED #endif // UBL_SEGMENTED