Skip to content

Commit 65c5120

Browse files
thinkyheadthinkyhead
committed
Update SD Sorting Options
MarlinFirmware/Marlin#26130
1 parent 036ccce commit 65c5120

321 files changed

Lines changed: 1031 additions & 710 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config/default/Configuration_adv.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,9 +1750,10 @@
17501750

17511751
// SD Card Sorting options
17521752
#if ENABLED(SDCARD_SORT_ALPHA)
1753+
#define SDSORT_REVERSE false // Default to sorting file names in reverse order.
17531754
#define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). Costs 27 bytes each.
1754-
#define FOLDER_SORTING -1 // -1=above 0=none 1=below
1755-
#define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 G-code.
1755+
#define SDSORT_FOLDERS -1 // -1=above 0=none 1=below
1756+
#define SDSORT_GCODE false // Enable G-code M34 to set sorting behaviors: M34 S<-1|0|1> F<-1|0|1>
17561757
#define SDSORT_USES_RAM false // Pre-allocate a static array for faster pre-sorting.
17571758
#define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
17581759
#define SDSORT_CACHE_NAMES false // Keep sorted items in RAM longer for speedy performance. Most expensive option.

‎config/examples/3DFabXYZ/Migbot/Configuration_adv.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,9 +1750,10 @@
17501750

17511751
// SD Card Sorting options
17521752
#if ENABLED(SDCARD_SORT_ALPHA)
1753+
#define SDSORT_REVERSE false // Default to sorting file names in reverse order.
17531754
#define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). Costs 27 bytes each.
1754-
#define FOLDER_SORTING -1 // -1=above 0=none 1=below
1755-
#define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 G-code.
1755+
#define SDSORT_FOLDERS -1 // -1=above 0=none 1=below
1756+
#define SDSORT_GCODE false // Enable G-code M34 to set sorting behaviors: M34 S<-1|0|1> F<-1|0|1>
17561757
#define SDSORT_USES_RAM false // Pre-allocate a static array for faster pre-sorting.
17571758
#define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
17581759
#define SDSORT_CACHE_NAMES false // Keep sorted items in RAM longer for speedy performance. Most expensive option.

‎config/examples/ADIMLab/Gantry v1/Configuration_adv.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,11 +1750,12 @@
17501750

17511751
// SD Card Sorting options
17521752
#if ENABLED(SDCARD_SORT_ALPHA)
1753+
#define SDSORT_REVERSE false // Default to sorting file names in reverse order.
17531754
#define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). Costs 27 bytes each.
1754-
#define FOLDER_SORTING -1 // -1=above 0=none 1=below
1755-
#define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 G-code.
1756-
#define SDSORT_USES_RAM true // Pre-allocate a static array for faster pre-sorting.
1757-
#define SDSORT_USES_STACK true // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
1755+
#define SDSORT_FOLDERS -1 // -1=above 0=none 1=below
1756+
#define SDSORT_GCODE false // Enable G-code M34 to set sorting behaviors: M34 S<-1|0|1> F<-1|0|1>
1757+
#define SDSORT_USES_RAM true // Pre-allocate a static array for faster pre-sorting.
1758+
#define SDSORT_USES_STACK true // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
17581759
#define SDSORT_CACHE_NAMES false // Keep sorted items in RAM longer for speedy performance. Most expensive option.
17591760
#define SDSORT_DYNAMIC_RAM false // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
17601761
#define SDSORT_CACHE_VFATS 2 // Maximum number of 13-byte VFAT entries to use for sorting.

‎config/examples/ADIMLab/Gantry v2/Configuration_adv.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,9 +1750,10 @@
17501750

17511751
// SD Card Sorting options
17521752
#if ENABLED(SDCARD_SORT_ALPHA)
1753+
#define SDSORT_REVERSE false // Default to sorting file names in reverse order.
17531754
#define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). Costs 27 bytes each.
1754-
#define FOLDER_SORTING -1 // -1=above 0=none 1=below
1755-
#define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 G-code.
1755+
#define SDSORT_FOLDERS -1 // -1=above 0=none 1=below
1756+
#define SDSORT_GCODE false // Enable G-code M34 to set sorting behaviors: M34 S<-1|0|1> F<-1|0|1>
17561757
#define SDSORT_USES_RAM false // Pre-allocate a static array for faster pre-sorting.
17571758
#define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
17581759
#define SDSORT_CACHE_NAMES false // Keep sorted items in RAM longer for speedy performance. Most expensive option.

‎config/examples/Alfawise/U20-bltouch/Configuration_adv.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1759,9 +1759,10 @@
17591759

17601760
// SD Card Sorting options
17611761
#if ENABLED(SDCARD_SORT_ALPHA)
1762+
#define SDSORT_REVERSE false // Default to sorting file names in reverse order.
17621763
#define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). Costs 27 bytes each.
1763-
#define FOLDER_SORTING -1 // -1=above 0=none 1=below
1764-
#define SDSORT_GCODE true // Allow turning sorting on/off with LCD and M34 G-code.
1764+
#define SDSORT_FOLDERS -1 // -1=above 0=none 1=below
1765+
#define SDSORT_GCODE true // Enable G-code M34 to set sorting behaviors: M34 S<-1|0|1> F<-1|0|1>
17651766
#define SDSORT_USES_RAM true // Pre-allocate a static array for faster pre-sorting.
17661767
#define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
17671768
#define SDSORT_CACHE_NAMES true // Keep sorted items in RAM longer for speedy performance. Most expensive option.

‎config/examples/Alfawise/U20/Configuration_adv.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,9 +1750,10 @@
17501750

17511751
// SD Card Sorting options
17521752
#if ENABLED(SDCARD_SORT_ALPHA)
1753+
#define SDSORT_REVERSE false // Default to sorting file names in reverse order.
17531754
#define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). Costs 27 bytes each.
1754-
#define FOLDER_SORTING -1 // -1=above 0=none 1=below
1755-
#define SDSORT_GCODE true // Allow turning sorting on/off with LCD and M34 G-code.
1755+
#define SDSORT_FOLDERS -1 // -1=above 0=none 1=below
1756+
#define SDSORT_GCODE true // Enable G-code M34 to set sorting behaviors: M34 S<-1|0|1> F<-1|0|1>
17561757
#define SDSORT_USES_RAM true // Pre-allocate a static array for faster pre-sorting.
17571758
#define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
17581759
#define SDSORT_CACHE_NAMES true // Keep sorted items in RAM longer for speedy performance. Most expensive option.

‎config/examples/AliExpress/UM2pExt/Configuration_adv.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,9 +1750,10 @@
17501750

17511751
// SD Card Sorting options
17521752
#if ENABLED(SDCARD_SORT_ALPHA)
1753+
#define SDSORT_REVERSE false // Default to sorting file names in reverse order.
17531754
#define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). Costs 27 bytes each.
1754-
#define FOLDER_SORTING -1 // -1=above 0=none 1=below
1755-
#define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 G-code.
1755+
#define SDSORT_FOLDERS -1 // -1=above 0=none 1=below
1756+
#define SDSORT_GCODE false // Enable G-code M34 to set sorting behaviors: M34 S<-1|0|1> F<-1|0|1>
17561757
#define SDSORT_USES_RAM false // Pre-allocate a static array for faster pre-sorting.
17571758
#define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
17581759
#define SDSORT_CACHE_NAMES false // Keep sorted items in RAM longer for speedy performance. Most expensive option.

‎config/examples/Anet/A2/Configuration_adv.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,9 +1750,10 @@
17501750

17511751
// SD Card Sorting options
17521752
#if ENABLED(SDCARD_SORT_ALPHA)
1753+
#define SDSORT_REVERSE false // Default to sorting file names in reverse order.
17531754
#define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). Costs 27 bytes each.
1754-
#define FOLDER_SORTING -1 // -1=above 0=none 1=below
1755-
#define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 G-code.
1755+
#define SDSORT_FOLDERS -1 // -1=above 0=none 1=below
1756+
#define SDSORT_GCODE false // Enable G-code M34 to set sorting behaviors: M34 S<-1|0|1> F<-1|0|1>
17561757
#define SDSORT_USES_RAM false // Pre-allocate a static array for faster pre-sorting.
17571758
#define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
17581759
#define SDSORT_CACHE_NAMES false // Keep sorted items in RAM longer for speedy performance. Most expensive option.

‎config/examples/Anet/A2plus/Configuration_adv.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,9 +1750,10 @@
17501750

17511751
// SD Card Sorting options
17521752
#if ENABLED(SDCARD_SORT_ALPHA)
1753+
#define SDSORT_REVERSE false // Default to sorting file names in reverse order.
17531754
#define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). Costs 27 bytes each.
1754-
#define FOLDER_SORTING -1 // -1=above 0=none 1=below
1755-
#define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 G-code.
1755+
#define SDSORT_FOLDERS -1 // -1=above 0=none 1=below
1756+
#define SDSORT_GCODE false // Enable G-code M34 to set sorting behaviors: M34 S<-1|0|1> F<-1|0|1>
17561757
#define SDSORT_USES_RAM false // Pre-allocate a static array for faster pre-sorting.
17571758
#define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
17581759
#define SDSORT_CACHE_NAMES false // Keep sorted items in RAM longer for speedy performance. Most expensive option.

‎config/examples/Anet/A6/Configuration_adv.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,9 +1750,10 @@
17501750

17511751
// SD Card Sorting options
17521752
#if ENABLED(SDCARD_SORT_ALPHA)
1753+
#define SDSORT_REVERSE false // Default to sorting file names in reverse order.
17531754
#define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). Costs 27 bytes each.
1754-
#define FOLDER_SORTING -1 // -1=above 0=none 1=below
1755-
#define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 G-code.
1755+
#define SDSORT_FOLDERS -1 // -1=above 0=none 1=below
1756+
#define SDSORT_GCODE false // Enable G-code M34 to set sorting behaviors: M34 S<-1|0|1> F<-1|0|1>
17561757
#define SDSORT_USES_RAM false // Pre-allocate a static array for faster pre-sorting.
17571758
#define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
17581759
#define SDSORT_CACHE_NAMES false // Keep sorted items in RAM longer for speedy performance. Most expensive option.

0 commit comments

Comments
 (0)