Browse Source

Fix delayed_move_time elapsed test

Scott Lahteine 4 years ago
parent
commit
ca47dffa35
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      Marlin/src/MarlinCore.cpp
  2. 1
    1
      Marlin/src/module/motion.cpp

+ 1
- 1
Marlin/src/MarlinCore.cpp View File

655
 
655
 
656
   #if ENABLED(DUAL_X_CARRIAGE)
656
   #if ENABLED(DUAL_X_CARRIAGE)
657
     // handle delayed move timeout
657
     // handle delayed move timeout
658
-    if (delayed_move_time && ELAPSED(ms, delayed_move_time + 1000UL) && IsRunning()) {
658
+    if (delayed_move_time && ELAPSED(ms, delayed_move_time) && IsRunning()) {
659
       // travel moves have been received so enact them
659
       // travel moves have been received so enact them
660
       delayed_move_time = 0xFFFFFFFFUL; // force moves to be done
660
       delayed_move_time = 0xFFFFFFFFUL; // force moves to be done
661
       destination = current_position;
661
       destination = current_position;

+ 1
- 1
Marlin/src/module/motion.cpp View File

988
             if (delayed_move_time != 0xFFFFFFFFUL) {
988
             if (delayed_move_time != 0xFFFFFFFFUL) {
989
               current_position = destination;
989
               current_position = destination;
990
               NOLESS(raised_parked_position.z, destination.z);
990
               NOLESS(raised_parked_position.z, destination.z);
991
-              delayed_move_time = millis();
991
+              delayed_move_time = millis() + 1000UL;
992
               return true;
992
               return true;
993
             }
993
             }
994
           }
994
           }

Loading…
Cancel
Save