Przeglądaj źródła

Polish up a little...

Scott Lahteine 10 lat temu
rodzic
commit
599530902d

+ 1
- 1
Marlin/Configuration_adv.h Wyświetl plik

290
 #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
290
 #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
291
 #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.
291
 #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.
292
 
292
 
293
-#define SDCARD_SORT_ALPHA // Sort in ASCII order by pre-reading the folder and making a lookup table!
293
+#define SDCARD_SORT_ALPHA // Sort SD file listings in ASCII order. Find additional options in cardreader.h
294
 #define SDCARD_RATHERRECENTFIRST  //reverse file order of sd card menu display. Its sorted practically after the file system block order.
294
 #define SDCARD_RATHERRECENTFIRST  //reverse file order of sd card menu display. Its sorted practically after the file system block order.
295
 // if a file is deleted, it frees a block. hence, the order is not purely chronological. To still have auto0.g accessible, there is again the option to do that.
295
 // if a file is deleted, it frees a block. hence, the order is not purely chronological. To still have auto0.g accessible, there is again the option to do that.
296
 // using:
296
 // using:

+ 7
- 4
Marlin/cardreader.h Wyświetl plik

4
 #ifdef SDSUPPORT
4
 #ifdef SDSUPPORT
5
 
5
 
6
 #define MAX_DIR_DEPTH 10          // Maximum folder depth
6
 #define MAX_DIR_DEPTH 10          // Maximum folder depth
7
-#define SORT_USES_RAM false       // Buffer while sorting, else re-read from SD
8
-#define SORT_USES_MORE_RAM false  // Always keep the directory in RAM
9
-#define SORT_LIMIT 64             // Maximum number of sorted items
10
-#define FOLDER_SORTING -1         // -1=above  0=none  1=below
7
+
8
+#ifdef SDCARD_SORT_ALPHA
9
+  #define SORT_USES_RAM false      // Buffer while sorting, else re-read from SD
10
+  #define SORT_USES_MORE_RAM false // Always keep the directory in RAM
11
+  #define SORT_LIMIT 256           // Maximum number of sorted items
12
+  #define FOLDER_SORTING -1        // -1=above  0=none  1=below
13
+#endif
11
 
14
 
12
 #include "SdFile.h"
15
 #include "SdFile.h"
13
 enum LsAction {LS_SerialPrint,LS_Count,LS_GetFilename};
16
 enum LsAction {LS_SerialPrint,LS_Count,LS_GetFilename};

+ 1
- 0
Marlin/example_configurations/SCARA/Configuration_adv.h Wyświetl plik

295
 #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
295
 #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
296
 #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.
296
 #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.
297
 
297
 
298
+#define SDCARD_SORT_ALPHA // Sort SD file listings in ASCII order. Find additional options in cardreader.h
298
 #define SDCARD_RATHERRECENTFIRST  //reverse file order of sd card menu display. Its sorted practically after the file system block order.
299
 #define SDCARD_RATHERRECENTFIRST  //reverse file order of sd card menu display. Its sorted practically after the file system block order.
299
 // if a file is deleted, it frees a block. hence, the order is not purely chronological. To still have auto0.g accessible, there is again the option to do that.
300
 // if a file is deleted, it frees a block. hence, the order is not purely chronological. To still have auto0.g accessible, there is again the option to do that.
300
 // using:
301
 // using:

+ 1
- 0
Marlin/example_configurations/delta/Configuration_adv.h Wyświetl plik

287
 #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
287
 #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
288
 #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.
288
 #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.
289
 
289
 
290
+#define SDCARD_SORT_ALPHA // Sort SD file listings in ASCII order. Find additional options in cardreader.h
290
 #define SDCARD_RATHERRECENTFIRST  //reverse file order of sd card menu display. Its sorted practically after the filesystem block order. 
291
 #define SDCARD_RATHERRECENTFIRST  //reverse file order of sd card menu display. Its sorted practically after the filesystem block order. 
291
 // if a file is deleted, it frees a block. hence, the order is not purely cronological. To still have auto0.g accessible, there is again the option to do that.
292
 // if a file is deleted, it frees a block. hence, the order is not purely cronological. To still have auto0.g accessible, there is again the option to do that.
292
 // using:
293
 // using:

+ 1
- 0
Marlin/example_configurations/makibox/Configuration_adv.h Wyświetl plik

291
 #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
291
 #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
292
 #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.
292
 #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.
293
 
293
 
294
+#define SDCARD_SORT_ALPHA // Sort SD file listings in ASCII order. Find additional options in cardreader.h
294
 #define SDCARD_RATHERRECENTFIRST  //reverse file order of sd card menu display. Its sorted practically after the file system block order.
295
 #define SDCARD_RATHERRECENTFIRST  //reverse file order of sd card menu display. Its sorted practically after the file system block order.
295
 // if a file is deleted, it frees a block. hence, the order is not purely chronological. To still have auto0.g accessible, there is again the option to do that.
296
 // if a file is deleted, it frees a block. hence, the order is not purely chronological. To still have auto0.g accessible, there is again the option to do that.
296
 // using:
297
 // using:

Ładowanie…
Anuluj
Zapisz