From 3ec227c02ed52b5be0c642337d50ae49245ba27c Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 31 Oct 2017 19:54:42 +0100 Subject: [PATCH 1/3] presort files when print is finished --- Firmware/cardreader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index be9c38ecd..6058215e6 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -1047,7 +1047,7 @@ void CardReader::printingHasFinished() } autotempShutdown(); #ifdef SDCARD_SORT_ALPHA - //presort(); + presort(); #endif } } From 6c8f30480970322b90d936f44ce0d06e2e79bae4 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 1 Nov 2017 14:18:39 +0100 Subject: [PATCH 2/3] dont flush presort at the beginning of the print --- Firmware/cardreader.cpp | 4 ++-- Firmware/ultralcd.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 6058215e6..edded2e02 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -246,7 +246,7 @@ void CardReader::startFileprint() { sdprinting = true; #ifdef SDCARD_SORT_ALPHA - flush_presort(); + // flush_presort(); #endif } } @@ -1047,7 +1047,7 @@ void CardReader::printingHasFinished() } autotempShutdown(); #ifdef SDCARD_SORT_ALPHA - presort(); + //if(!check_file) presort(); #endif } } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 958cee709..acbbac532 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4959,9 +4959,9 @@ void lcd_sdcard_menu() uint8_t sdSort = eeprom_read_byte((uint8_t*)EEPROM_SD_SORT); if (presort_flag == true) { - presort_flag = false; + presort_flag = false; card.presort(); - } + } if (lcdDrawUpdate == 0 && LCD_CLICKED == 0) //delay(100); return; // nothing to do (so don't thrash the SD card) From 6728e425cc17136f68ca6b2201e680f02950f0a6 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 3 Nov 2017 16:13:01 +0100 Subject: [PATCH 3/3] whitespace correction --- Firmware/ultralcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index acbbac532..958cee709 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4959,9 +4959,9 @@ void lcd_sdcard_menu() uint8_t sdSort = eeprom_read_byte((uint8_t*)EEPROM_SD_SORT); if (presort_flag == true) { - presort_flag = false; + presort_flag = false; card.presort(); - } + } if (lcdDrawUpdate == 0 && LCD_CLICKED == 0) //delay(100); return; // nothing to do (so don't thrash the SD card)