3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-23 12:04:19 +00:00
Code Issues Releases Wiki Activity

♻️ FOLDER_SORTING => SDSORT_FOLDERS

Browse Source
This commit is contained in:
Scott Lahteine 2024-01-30 21:57:20 -06:00
parent 73ed511eed
commit 20ee8dde8c
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Configuration_adv.h
View File

@ -1616,7 +1616,7 @@
// SD Card Sorting options // SD Card Sorting options
#if ENABLED(SDCARD_SORT_ALPHA) #if ENABLED(SDCARD_SORT_ALPHA)
#define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). Costs 27 bytes each. #define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). Costs 27 bytes each.
#define FOLDER_SORTING -1 // -1=above 0=none 1=below #define SDSORT_FOLDERS -1 // -1=above 0=none 1=below
#define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 G-code. #define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 G-code.
#define SDSORT_USES_RAM false // Pre-allocate a static array for faster pre-sorting. #define SDSORT_USES_RAM false // Pre-allocate a static array for faster pre-sorting.
#define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.) #define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)

4
Marlin/src/inc/Conditionals_post.h
View File

@ -3404,8 +3404,8 @@
#define SDSORT_USES_RAM true #define SDSORT_USES_RAM true
#define SDSORT_USES_STACK false #define SDSORT_USES_STACK false
#define SDSORT_CACHE_NAMES true #define SDSORT_CACHE_NAMES true
#ifndef FOLDER_SORTING #ifndef SDSORT_FOLDERS
#define FOLDER_SORTING -1 #define SDSORT_FOLDERS -1
#endif #endif
#ifndef SDSORT_GCODE #ifndef SDSORT_GCODE
#define SDSORT_GCODE false #define SDSORT_GCODE false

4
Marlin/src/sd/cardreader.cpp
View File

@ -157,7 +157,7 @@ CardReader::CardReader() {
sort_count = 0; sort_count = 0;
#if ENABLED(SDSORT_GCODE) #if ENABLED(SDSORT_GCODE)
sort_alpha = true; sort_alpha = true;
sort_folders = FOLDER_SORTING; sort_folders = SDSORT_FOLDERS;
//sort_reverse = false; //sort_reverse = false;
#endif #endif
#endif #endif
@ -1210,7 +1210,7 @@ void CardReader::cdroot() {
#if ENABLED(SDSORT_GCODE) #if ENABLED(SDSORT_GCODE)
sort_folders ? _SORT_CMP_DIR(sort_folders) : _SORT_CMP_NODIR() sort_folders ? _SORT_CMP_DIR(sort_folders) : _SORT_CMP_NODIR()
#else #else
_SORT_CMP_DIR(FOLDER_SORTING) _SORT_CMP_DIR(SDSORT_FOLDERS)
#endif #endif
#else #else
_SORT_CMP_NODIR() _SORT_CMP_NODIR()

5
Marlin/src/sd/cardreader.h
View File

@ -31,7 +31,10 @@ extern const char M23_STR[], M24_STR[];
#if ENABLED(SDSORT_DYNAMIC_RAM) #if ENABLED(SDSORT_DYNAMIC_RAM)
#define SD_RESORT 1 #define SD_RESORT 1
#endif #endif
#if FOLDER_SORTING || ENABLED(SDSORT_GCODE) #ifndef SDSORT_FOLDERS
#define SDSORT_FOLDERS 0
#endif
#if SDSORT_FOLDERS || ENABLED(SDSORT_GCODE)
#define HAS_FOLDER_SORTING 1 #define HAS_FOLDER_SORTING 1
#endif #endif
#endif #endif