Merge pull request prusa3d#3305 from gudnimg/sd-card-lcdtimer-fix-gudni-v2

DRracer · web-flow · commit a7dfe4b5236d · 2021-11-19T07:23:21.000+01:00
Fix issue when the SD card is inserted and the file menu may sometimes close immediately due to a timeout
diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp
@@ -1030,7 +1030,6 @@ void CardReader::presort() {
 
 	lcd_update(2);
 	KEEPALIVE_STATE(NOT_BUSY);
-	lcd_timeoutToStatus.start();
 }
 
 void CardReader::flush_presort() {
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
@@ -8939,6 +8939,7 @@ void menu_lcd_lcdupdate_func(void)
 			LCD_MESSAGERPGM(_T(WELCOME_MSG));
 			bMain=false;                       // flag (i.e. 'fake parameter') for 'lcd_sdcard_menu()' function
 			menu_submenu(lcd_sdcard_menu);
+			lcd_timeoutToStatus.start();
 		}
 		else
 		{

Original file line number	Diff line number	Diff line change
`@@ -1030,7 +1030,6 @@ void CardReader::presort() {`
`1030`	`1030`
`1031`	`1031`	`lcd_update(2);`
`1032`	`1032`	`KEEPALIVE_STATE(NOT_BUSY);`
`1033`		`- lcd_timeoutToStatus.start();`
`1034`	`1033`	`}`
`1035`	`1034`
`1036`	`1035`	`void CardReader::flush_presort() {`
Original file line number	Diff line number	Diff line change
`@@ -8939,6 +8939,7 @@ void menu_lcd_lcdupdate_func(void)`
`8939`	`8939`	`LCD_MESSAGERPGM(_T(WELCOME_MSG));`
`8940`	`8940`	`bMain=false; // flag (i.e. 'fake parameter') for 'lcd_sdcard_menu()' function`
`8941`	`8941`	`menu_submenu(lcd_sdcard_menu);`
	`8942`	`+ lcd_timeoutToStatus.start();`
`8942`	`8943`	`}`
`8943`	`8944`	`else`
`8944`	`8945`	`{`