Browse Source

Remove return_to_status_ms hack, just use defer...

Scott Lahteine 7 years ago
parent
commit
9a4cf11835
1 changed files with 0 additions and 6 deletions
  1. 0
    6
      Marlin/src/lcd/ultralcd.cpp

+ 0
- 6
Marlin/src/lcd/ultralcd.cpp View File

3783
           assume_print_finished = millis() + 5000;
3783
           assume_print_finished = millis() + 5000;
3784
         }
3784
         }
3785
         last_sdfile_encoderPosition = encoderPosition;   // needed as a workaround for the 5s timer
3785
         last_sdfile_encoderPosition = encoderPosition;   // needed as a workaround for the 5s timer
3786
-        //defer_return_to_status = true;           // already done in lcd_reselect_last_file
3787
       #endif
3786
       #endif
3788
 
3787
 
3789
       const uint16_t fileCnt = card.getnrfilenames();
3788
       const uint16_t fileCnt = card.getnrfilenames();
4806
 
4805
 
4807
       // Return to Status Screen after a timeout
4806
       // Return to Status Screen after a timeout
4808
       if (currentScreen == lcd_status_screen || defer_return_to_status)
4807
       if (currentScreen == lcd_status_screen || defer_return_to_status)
4809
-        #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
4810
-          if (currentScreen != lcd_sdcard_menu)                // lcd_sdcard_menu() does not time out if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
4811
-            return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS;  // When the printer finishes a file, it will wait with the file selected for
4812
-        #else                                                  // a re-print.
4813
         return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS;
4808
         return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS;
4814
-        #endif
4815
       else if (ELAPSED(ms, return_to_status_ms))
4809
       else if (ELAPSED(ms, return_to_status_ms))
4816
         lcd_return_to_status();
4810
         lcd_return_to_status();
4817
 
4811
 

Loading…
Cancel
Save