3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 13:56:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #8114 from thinkyhead/bf1_print_sd_file_again

Browse Source 
[1.1.x] Cleanup for SD Print Again
This commit is contained in:
Scott Lahteine 2017-10-29 19:09:34 -05:00 committed by GitHub
commit 25e86a520d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 27 deletions
Show Stats 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 #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() { void CardReader::printingHasFinished() {
stepper.synchronize(); stepper.synchronize();
file.close(); file.close();
@ -890,15 +881,7 @@ void CardReader::printingHasFinished() {
#endif #endif
#if ENABLED(SD_REPRINT_LAST_SELECTED_FILE) #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT; lcd_reselect_last_file();
_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();
#endif #endif
} }
} }

27
Marlin/ultralcd.cpp
View File

@ -3755,22 +3755,37 @@ void kill_screen(const char* lcd_msg) {
* "Print from SD" submenu * "Print from SD" submenu
* *
*/ */
#if ENABLED(SD_REPRINT_LAST_SELECTED_FILE) #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
uint32_t saved_encoderPosition = 0; uint32_t last_sdfile_encoderPosition = 0;
static millis_t assume_print_finished = 0;
void lcd_reselect_last_file() {
// Some of this is a hack to force the screen update to work.
// TODO: Fix the real issue that causes this!
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, last_sdfile_encoderPosition);
defer_return_to_status = true;
lcd_update();
}
#endif #endif
void lcd_sdcard_menu() { void lcd_sdcard_menu() {
ENCODER_DIRECTION_MENUS(); ENCODER_DIRECTION_MENUS();
#if ENABLED(SD_REPRINT_LAST_SELECTED_FILE) #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
static millis_t assume_print_finished = 0;
if (ELAPSED(millis(), assume_print_finished)) { // if the printer has been busy printing, lcd_sdcard_menu() should not if (ELAPSED(millis(), assume_print_finished)) { // if the printer has been busy printing, lcd_sdcard_menu() should not
lcdDrawUpdate = LCDVIEW_REDRAW_NOW; // have been active for 5 seconds. In this case, restore the previous lcdDrawUpdate = LCDVIEW_REDRAW_NOW; // have been active for 5 seconds. In this case, restore the previous
encoderPosition = saved_encoderPosition; // encoderPosition to the last selected item. encoderPosition = last_sdfile_encoderPosition; // encoderPosition to the last selected item.
assume_print_finished = millis() + 5000; assume_print_finished = millis() + 5000;
} }
saved_encoderPosition = encoderPosition; last_sdfile_encoderPosition = encoderPosition; // needed as a workaround for the 5s timer
defer_return_to_status = true; //defer_return_to_status = true; // already done in lcd_reselect_last_file
#endif #endif
const uint16_t fileCnt = card.getnrfilenames(); const uint16_t fileCnt = card.getnrfilenames();
@ -4422,7 +4437,7 @@ void kill_screen(const char* lcd_msg) {
void menu_action_sdfile(const char* filename, char* longFilename) { void menu_action_sdfile(const char* filename, char* longFilename) {
#if ENABLED(SD_REPRINT_LAST_SELECTED_FILE) #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
saved_encoderPosition = encoderPosition; // Save which file was selected for later use last_sdfile_encoderPosition = encoderPosition; // Save which file was selected for later use
#endif #endif
UNUSED(longFilename); UNUSED(longFilename);
card.openAndPrintFile(filename); card.openAndPrintFile(filename);

4
Marlin/ultralcd.h
View File

@ -205,4 +205,8 @@ void lcd_reset_status();
float lcd_probe_pt(const float &lx, const float &ly); float lcd_probe_pt(const float &lx, const float &ly);
#endif #endif
#if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
void lcd_reselect_last_file();
#endif
#endif // ULTRALCD_H #endif // ULTRALCD_H