Преглед изворни кода

Prevent SDCARD_SORT_ALPHA from exploding

Scott Lahteine пре 7 година
родитељ
комит
a7398a0459
31 измењених фајлова са 86 додато и 18 уклоњено
  1. 2
    0
      Marlin/Configuration_adv.h
  2. 10
    0
      Marlin/SanityCheck.h
  3. 1
    1
      Marlin/cardreader.h
  4. 2
    0
      Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
  5. 3
    1
      Marlin/example_configurations/Anet/A6/Configuration_adv.h
  6. 2
    0
      Marlin/example_configurations/Anet/A8/Configuration_adv.h
  7. 2
    0
      Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
  8. 2
    0
      Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
  9. 2
    0
      Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
  10. 2
    0
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  11. 6
    4
      Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
  12. 2
    0
      Marlin/example_configurations/Felix/Configuration_adv.h
  13. 6
    4
      Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h
  14. 2
    0
      Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
  15. 2
    0
      Marlin/example_configurations/Malyan/M150/Configuration_adv.h
  16. 2
    0
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  17. 2
    0
      Marlin/example_configurations/SCARA/Configuration_adv.h
  18. 2
    0
      Marlin/example_configurations/Sanguinololu/Configuration_adv.h
  19. 2
    0
      Marlin/example_configurations/TinyBoy2/Configuration_adv.h
  20. 2
    0
      Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
  21. 2
    0
      Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
  22. 6
    4
      Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
  23. 2
    0
      Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
  24. 2
    0
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  25. 2
    0
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  26. 2
    0
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  27. 2
    0
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  28. 6
    4
      Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
  29. 2
    0
      Marlin/example_configurations/makibox/Configuration_adv.h
  30. 2
    0
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  31. 2
    0
      Marlin/example_configurations/wt150/Configuration_adv.h

+ 2
- 0
Marlin/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

+ 10
- 0
Marlin/SanityCheck.h Прегледај датотеку

@@ -301,6 +301,16 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
301 301
       #error "SDSORT_CACHE_NAMES requires SDSORT_USES_RAM (which reads the directory into RAM)."
302 302
     #endif
303 303
   #endif
304
+
305
+  #if ENABLED(SDSORT_CACHE_NAMES) && DISABLED(SDSORT_DYNAMIC_RAM)
306
+    #if SDSORT_CACHE_VFATS < 2
307
+      #error "SDSORT_CACHE_VFATS must be 2 or greater!"
308
+    #elif SDSORT_CACHE_VFATS > MAX_VFAT_ENTRIES
309
+      #undef SDSORT_CACHE_VFATS
310
+      #define SDSORT_CACHE_VFATS MAX_VFAT_ENTRIES
311
+      #warning "SDSORT_CACHE_VFATS was reduced to MAX_VFAT_ENTRIES!"
312
+    #endif
313
+  #endif
304 314
 #endif
305 315
 
306 316
 /**

+ 1
- 1
Marlin/cardreader.h Прегледај датотеку

@@ -120,7 +120,7 @@ private:
120 120
           char **sortshort, **sortnames;
121 121
         #else
122 122
           char sortshort[SDSORT_LIMIT][FILENAME_LENGTH];
123
-          char sortnames[SDSORT_LIMIT][LONG_FILENAME_LENGTH];
123
+          char sortnames[SDSORT_LIMIT][SDSORT_CACHE_VFATS * FILENAME_LENGTH + 1];
124 124
         #endif
125 125
       #elif DISABLED(SDSORT_USES_STACK)
126 126
         char sortnames[SDSORT_LIMIT][LONG_FILENAME_LENGTH];

+ 2
- 0
Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

+ 3
- 1
Marlin/example_configurations/Anet/A6/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing
@@ -607,7 +609,7 @@
607 609
  */
608 610
 //#define BABYSTEPPING
609 611
 #if ENABLED(BABYSTEPPING)
610
-  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
612
+  //#define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
611 613
   #define BABYSTEP_INVERT_Z false    // Change if Z babysteps should go the other way
612 614
   #define BABYSTEP_MULTIPLICATOR 100 // Babysteps are very small. Increase for faster motion.
613 615
   //#define BABYSTEP_ZPROBE_OFFSET   // Enable to combine M851 and Babystepping

+ 2
- 0
Marlin/example_configurations/Anet/A8/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/Cartesio/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

+ 6
- 4
Marlin/example_configurations/Creality/CR-10/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES true   // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing
@@ -607,10 +609,10 @@
607 609
  */
608 610
 #define BABYSTEPPING
609 611
 #if ENABLED(BABYSTEPPING)
610
-  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
611
-  #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
612
-  #define BABYSTEP_MULTIPLICATOR 10 // Babysteps are very small. Increase for faster motion.
613
-  //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping
612
+  //#define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
613
+  #define BABYSTEP_INVERT_Z false    // Change if Z babysteps should go the other way
614
+  #define BABYSTEP_MULTIPLICATOR  10 // Babysteps are very small. Increase for faster motion.
615
+  //#define BABYSTEP_ZPROBE_OFFSET   // Enable to combine M851 and Babystepping
614 616
   #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
615 617
   #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
616 618
                                         // Note: Extra time may be added to mitigate controller latency.

+ 2
- 0
Marlin/example_configurations/Felix/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

+ 6
- 4
Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing
@@ -607,10 +609,10 @@
607 609
  */
608 610
 #define BABYSTEPPING
609 611
 #if ENABLED(BABYSTEPPING)
610
-  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
611
-  #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
612
-  #define BABYSTEP_MULTIPLICATOR 2 // Babysteps are very small. Increase for faster motion.
613
-  //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping
612
+  //#define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
613
+  #define BABYSTEP_INVERT_Z false    // Change if Z babysteps should go the other way
614
+  #define BABYSTEP_MULTIPLICATOR   2 // Babysteps are very small. Increase for faster motion.
615
+  //#define BABYSTEP_ZPROBE_OFFSET   // Enable to combine M851 and Babystepping
614 616
   #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
615 617
   #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
616 618
                                         // Note: Extra time may be added to mitigate controller latency.

+ 2
- 0
Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/Malyan/M150/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/RigidBot/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/SCARA/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/Sanguinololu/Configuration_adv.h Прегледај датотеку

@@ -506,6 +506,8 @@
506 506
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
507 507
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
508 508
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
509
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
510
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
509 511
   #endif
510 512
 
511 513
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/TinyBoy2/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/Velleman/K8200/Configuration_adv.h Прегледај датотеку

@@ -530,6 +530,8 @@
530 530
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
531 531
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
532 532
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
533
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
534
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
533 535
   #endif
534 536
 
535 537
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/Velleman/K8400/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

+ 6
- 4
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h Прегледај датотеку

@@ -519,6 +519,8 @@
519 519
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
520 520
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
521 521
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
522
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
523
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
522 524
   #endif
523 525
 
524 526
   // Show a progress bar on HD44780 LCDs for SD printing
@@ -609,10 +611,10 @@
609 611
  */
610 612
 //#define BABYSTEPPING
611 613
 #if ENABLED(BABYSTEPPING)
612
-  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
613
-  #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
614
-  #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
615
-  //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping
614
+  //#define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
615
+  #define BABYSTEP_INVERT_Z false    // Change if Z babysteps should go the other way
616
+  #define BABYSTEP_MULTIPLICATOR   1 // Babysteps are very small. Increase for faster motion.
617
+  //#define BABYSTEP_ZPROBE_OFFSET   // Enable to combine M851 and Babystepping
616 618
   //#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
617 619
   #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
618 620
                                         // Note: Extra time may be added to mitigate controller latency.

+ 2
- 0
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h Прегледај датотеку

@@ -519,6 +519,8 @@
519 519
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
520 520
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
521 521
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
522
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
523
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
522 524
   #endif
523 525
 
524 526
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/delta/generic/Configuration_adv.h Прегледај датотеку

@@ -519,6 +519,8 @@
519 519
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
520 520
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
521 521
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
522
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
523
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
522 524
   #endif
523 525
 
524 526
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h Прегледај датотеку

@@ -519,6 +519,8 @@
519 519
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
520 520
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
521 521
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
522
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
523
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
522 524
   #endif
523 525
 
524 526
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h Прегледај датотеку

@@ -524,6 +524,8 @@
524 524
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
525 525
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
526 526
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
527
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
528
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
527 529
   #endif
528 530
 
529 531
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h Прегледај датотеку

@@ -519,6 +519,8 @@
519 519
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
520 520
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
521 521
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
522
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
523
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
522 524
   #endif
523 525
 
524 526
   // Show a progress bar on HD44780 LCDs for SD printing

+ 6
- 4
Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing
@@ -607,10 +609,10 @@
607 609
  */
608 610
 #define BABYSTEPPING
609 611
 #if ENABLED(BABYSTEPPING)
610
-  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
611
-  #define BABYSTEP_INVERT_Z false  // Change if Z babysteps should go the other way
612
-  #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion.
613
-  //#define BABYSTEP_ZPROBE_OFFSET // Enable to combine M851 and Babystepping
612
+  //#define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
613
+  #define BABYSTEP_INVERT_Z false    // Change if Z babysteps should go the other way
614
+  #define BABYSTEP_MULTIPLICATOR   1 // Babysteps are very small. Increase for faster motion.
615
+  //#define BABYSTEP_ZPROBE_OFFSET   // Enable to combine M851 and Babystepping
614 616
   #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
615 617
   #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
616 618
                                         // Note: Extra time may be added to mitigate controller latency.

+ 2
- 0
Marlin/example_configurations/makibox/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

+ 2
- 0
Marlin/example_configurations/wt150/Configuration_adv.h Прегледај датотеку

@@ -517,6 +517,8 @@
517 517
     #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
518 518
     #define SDSORT_CACHE_NAMES false  // Keep sorted items in RAM longer for speedy performance. Most expensive option.
519 519
     #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
520
+    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
521
+                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
520 522
   #endif
521 523
 
522 524
   // Show a progress bar on HD44780 LCDs for SD printing

Loading…
Откажи
Сачувај