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

Farm mode: cache filenames in the presort function

This commit is contained in:
Alex Voinea 2022-10-17 20:17:28 +02:00
parent e8bb19b3ea
commit e18bfce597
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/cardreader.cpp
View File

@ -803,7 +803,7 @@ void CardReader::presort() {
// Throw away old sort index // Throw away old sort index
flush_presort(); flush_presort();
if (farm_mode || IS_SD_INSERTED == false) return; //sorting is not used in farm mode if (IS_SD_INSERTED == false) return; //sorting is not used in farm mode
uint8_t sdSort = eeprom_read_byte((uint8_t*)EEPROM_SD_SORT); uint8_t sdSort = eeprom_read_byte((uint8_t*)EEPROM_SD_SORT);
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
@ -814,7 +814,7 @@ void CardReader::presort() {
// Never sort more than the max allowed // Never sort more than the max allowed
// If you use folders to organize, 20 may be enough // If you use folders to organize, 20 may be enough
if (fileCnt > SDSORT_LIMIT) { if (fileCnt > SDSORT_LIMIT) {
if (sdSort != SD_SORT_NONE) { if ((sdSort != SD_SORT_NONE) && !farm_mode) {
lcd_show_fullscreen_message_and_wait_P(_i("Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."));////MSG_FILE_CNT c=20 r=6 lcd_show_fullscreen_message_and_wait_P(_i("Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."));////MSG_FILE_CNT c=20 r=6
} }
fileCnt = SDSORT_LIMIT; fileCnt = SDSORT_LIMIT;
@ -833,7 +833,7 @@ void CardReader::presort() {
sort_entries[i] = position >> 5; sort_entries[i] = position >> 5;
} }
if ((fileCnt > 1) && (sdSort != SD_SORT_NONE)) { if ((fileCnt > 1) && (sdSort != SD_SORT_NONE) && !farm_mode) {
#ifdef SORTING_SPEEDTEST #ifdef SORTING_SPEEDTEST
LongTimer sortingSpeedtestTimer; LongTimer sortingSpeedtestTimer;