Skip to content

Commit

Permalink
Fix delayed_move_time elapsed test
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Jan 4, 2021
1 parent 548d560 commit ca47dff
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Marlin/src/MarlinCore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {

#if ENABLED(DUAL_X_CARRIAGE)
// handle delayed move timeout
if (delayed_move_time && ELAPSED(ms, delayed_move_time + 1000UL) && IsRunning()) {
if (delayed_move_time && ELAPSED(ms, delayed_move_time) && IsRunning()) {
// travel moves have been received so enact them
delayed_move_time = 0xFFFFFFFFUL; // force moves to be done
destination = current_position;
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/module/motion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
if (delayed_move_time != 0xFFFFFFFFUL) {
current_position = destination;
NOLESS(raised_parked_position.z, destination.z);
delayed_move_time = millis();
delayed_move_time = millis() + 1000UL;
return true;
}
}
Expand Down

0 comments on commit ca47dff

Please sign in to comment.