CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove 5s timer hack. Encoder pos is saved on print start!

Browse Source
This commit is contained in:
Scott Lahteine 2017-10-29 19:44:49 -05:00
parent 9a4cf11835
commit 12458cefc4
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Marlin/src/lcd/ultralcd.cpp
View File

@ -3775,16 +3775,6 @@ void kill_screen(const char* lcd_msg) {
void lcd_sdcard_menu() { void lcd_sdcard_menu() {
ENCODER_DIRECTION_MENUS(); ENCODER_DIRECTION_MENUS();
#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
lcdDrawUpdate = LCDVIEW_REDRAW_NOW; // have been active for 5 seconds. In this case, restore the previous
encoderPosition = last_sdfile_encoderPosition; // encoderPosition to the last selected item.
assume_print_finished = millis() + 5000;
}
last_sdfile_encoderPosition = encoderPosition; // needed as a workaround for the 5s timer
#endif
const uint16_t fileCnt = card.getnrfilenames(); const uint16_t fileCnt = card.getnrfilenames();
START_MENU(); START_MENU();
MENU_BACK(MSG_MAIN); MENU_BACK(MSG_MAIN);
@ -4744,18 +4734,13 @@ void lcd_update() {
// then we want to use 1/2 of the time only. // then we want to use 1/2 of the time only.
uint16_t bbr2 = planner.block_buffer_runtime() >> 1; uint16_t bbr2 = planner.block_buffer_runtime() >> 1;
if ( #if ENABLED(DOGLCD)
#if ENABLED(DOGLCD) #define IS_DRAWING drawing_screen
(lcdDrawUpdate || drawing_screen) && ( #else
!bbr2 || (bbr2 > max_display_update_time) #define IS_DRAWING false
#if ENABLED(SDSUPPORT) #endif
|| currentScreen == lcd_sdcard_menu
#endif if ((lcdDrawUpdate || IS_DRAWING) && (!bbr2 || bbr2 > max_display_update_time)) {
)
#else
lcdDrawUpdate && (!bbr2 || (bbr2 > max_display_update_time))
#endif
) {
#if ENABLED(DOGLCD) #if ENABLED(DOGLCD)
if (!drawing_screen) if (!drawing_screen)
#endif #endif