felix/Marlin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanups for SD_REPRINT_LAST_SELECTED_FILE

Browse Source
This commit is contained in:
Scott Lahteine
2017-10-26 23:54:01 -05:00
parent daa85f71e1
commit b0e282a74b
3 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Marlin/cardreader.cpp
View File

@@ -860,15 +860,6 @@ void CardReader::updir() {
#endif // SDCARD_SORT_ALPHA
#if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
typedef void (*screenFunc_t)();
extern void lcd_sdcard_menu();
extern void lcd_goto_screen(screenFunc_t screen, const uint32_t encoder = 0);
extern uint32_t saved_encoderPosition;
extern bool screen_changed, drawing_screen, defer_return_to_status;
void _lcd_synchronize(); // Not declared in any LCD header file. Probably, that should be changed.
#endif
void CardReader::printingHasFinished() {
stepper.synchronize();
file.close();
@@ -890,15 +881,7 @@ void CardReader::printingHasFinished() {
#endif
#if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT;
_lcd_synchronize();
safe_delay(50);
_lcd_synchronize();
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT;
drawing_screen = screen_changed = true;
lcd_goto_screen(lcd_sdcard_menu, saved_encoderPosition);
defer_return_to_status = true;
lcd_update();
lcd_reselect_last_file();
#endif
}
}