MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix delayed_move_time elapsed test

Browse Source
This commit is contained in:
Scott Lahteine 2021-01-03 22:22:21 -06:00 committed by Scott Lahteine
parent b1f0671541
commit bb747bcd62
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/MarlinCore.cpp
View File

@ -655,7 +655,7 @@ inline void manage_inactivity(const bool ignore_stepper_queue=false) {
#if ENABLED(DUAL_X_CARRIAGE) #if ENABLED(DUAL_X_CARRIAGE)
// handle delayed move timeout // 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 // travel moves have been received so enact them
delayed_move_time = 0xFFFFFFFFUL; // force moves to be done delayed_move_time = 0xFFFFFFFFUL; // force moves to be done
destination = current_position; destination = current_position;

2
Marlin/src/module/motion.cpp
View File

@ -988,7 +988,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
if (delayed_move_time != 0xFFFFFFFFUL) { if (delayed_move_time != 0xFFFFFFFFUL) {
current_position = destination; current_position = destination;
NOLESS(raised_parked_position.z, destination.z); NOLESS(raised_parked_position.z, destination.z);
delayed_move_time = millis(); delayed_move_time = millis() + 1000UL;
return true; return true;
} }
} }