josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix subdir enter and exit

This commit is contained in:
Alex Voinea 2020-03-03 14:55:08 +02:00
parent 53e130fc6d
commit f69a68b966
No known key found for this signature in database
GPG Key ID: F5034E7CFCF2F973
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Firmware/ultralcd.cpp
View File

@ -7173,6 +7173,9 @@ static void lcd_sd_updir()
{ {
card.updir(); card.updir();
menu_top = 0; menu_top = 0;
lcd_encoder = 0;
lcd_scrollTimer.start();
menu_entering = 1;
} }
void lcd_print_stop() void lcd_print_stop()
@ -7279,6 +7282,8 @@ void lcd_sdcard_menu()
if (presort_flag == true) { if (presort_flag == true) {
presort_flag = false; presort_flag = false;
card.presort(); card.presort();
lcd_scrollTimer.start();
lcd_draw_update = 1;
} }
if (!lcd_scrollTimer.running()) lcd_scrollTimer.start(); if (!lcd_scrollTimer.running()) lcd_scrollTimer.start();
bool scrollEnter = lcd_scrollTimer.expired(500); bool scrollEnter = lcd_scrollTimer.expired(500);
@ -8672,6 +8677,8 @@ void menu_action_sddirectory(const char* filename)
MYSERIAL.println(dir_names[depth]); MYSERIAL.println(dir_names[depth]);
card.chdir(filename); card.chdir(filename);
lcd_encoder = 0; lcd_encoder = 0;
lcd_scrollTimer.start();
menu_entering = 1;
} }
/** LCD API **/ /** LCD API **/