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

Cache sdSort

This commit is contained in:
Alex Voinea 2020-03-04 20:40:56 +02:00
parent f35e553373
commit 7b19715c99
No known key found for this signature in database
GPG Key ID: F5034E7CFCF2F973
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Firmware/ultralcd.cpp
View File

@ -7231,6 +7231,7 @@ void lcd_sdcard_menu()
const char* scrollPointer; const char* scrollPointer;
uint16_t fileCnt; uint16_t fileCnt;
uint8_t row; uint8_t row;
uint8_t sdSort;
ShortTimer lcd_scrollTimer; ShortTimer lcd_scrollTimer;
} _menu_data_sdcard_t; } _menu_data_sdcard_t;
static_assert(sizeof(menu_data)>= sizeof(_menu_data_sdcard_t),"_menu_data_sdcard_t doesn't fit into menu_data"); static_assert(sizeof(menu_data)>= sizeof(_menu_data_sdcard_t),"_menu_data_sdcard_t doesn't fit into menu_data");
@ -7245,6 +7246,7 @@ void lcd_sdcard_menu()
card.presort(); card.presort();
} }
_md->fileCnt = card.getnrfilenames(); _md->fileCnt = card.getnrfilenames();
_md->sdSort = eeprom_read_byte((uint8_t*)EEPROM_SD_SORT);
_md->menuState = 1; _md->menuState = 1;
} //Begin the first menu state instantly. } //Begin the first menu state instantly.
case 1: //normal menu structure. case 1: //normal menu structure.
@ -7268,7 +7270,6 @@ void lcd_sdcard_menu()
_md->scrollPointer = NULL; //clear scrollPointer. Used for differentiating between a file/dir and another menu item that is selected. _md->scrollPointer = NULL; //clear scrollPointer. Used for differentiating between a file/dir and another menu item that is selected.
const uint8_t sdSort = eeprom_read_byte((uint8_t*)EEPROM_SD_SORT);
MENU_BEGIN(); MENU_BEGIN();
MENU_ITEM_BACK_P(_T(bMain?MSG_MAIN:MSG_BACK)); // i.e. default menu-item / menu-item after card insertion MENU_ITEM_BACK_P(_T(bMain?MSG_MAIN:MSG_BACK)); // i.e. default menu-item / menu-item after card insertion
card.getWorkDirName(); card.getWorkDirName();
@ -7290,7 +7291,7 @@ void lcd_sdcard_menu()
//load filename to memory. //load filename to memory.
#ifdef SDCARD_SORT_ALPHA #ifdef SDCARD_SORT_ALPHA
if (sdSort == SD_SORT_NONE) card.getfilename(nr); if (_md->sdSort == SD_SORT_NONE) card.getfilename(nr);
else card.getfilename_sorted(nr); else card.getfilename_sorted(nr);
#else #else
card.getfilename(nr); card.getfilename(nr);