Browse Source

Fix delayed_move_time elapsed test

vanilla_fb_2.0.x
Scott Lahteine 4 years ago
parent
commit
ca47dffa35
  1. 2
      Marlin/src/MarlinCore.cpp
  2. 2
      Marlin/src/module/motion.cpp

2
Marlin/src/MarlinCore.cpp

@ -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;

2
Marlin/src/module/motion.cpp

@ -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;
}
}

Loading…
Cancel
Save