Pārlūkot izejas kodu

Merge pull request #8191 from thinkyhead/bf2_rearm_more

[2.0.x] Add SDCARD_SORT_ALPHA options for LPC1768
Scott Lahteine 7 gadus atpakaļ
vecāks
revīzija
b2bd77c40a
Revīzijas autora e-pasta adrese nav piesaistīta nevienam kontam
1 mainītis faili ar 16 papildinājumiem un 4 dzēšanām
  1. 16
    4
      Marlin/src/inc/Conditionals_post.h

+ 16
- 4
Marlin/src/inc/Conditionals_post.h Parādīt failu

@@ -1179,10 +1179,22 @@
1179 1179
   #undef SDSORT_USES_RAM
1180 1180
   #undef SDSORT_USES_STACK
1181 1181
   #undef SDSORT_CACHE_NAMES
1182
-  #define SDSORT_LIMIT       256    // Maximum number of sorted items (10-256). Costs 27 bytes each.
1183
-  #define SDSORT_USES_RAM    true   // Pre-allocate a static array for faster pre-sorting.
1184
-  #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
1185
-  #define SDSORT_CACHE_NAMES true   // Keep sorted items in RAM longer for speedy performance. Most expensive option.
1182
+  #define SDSORT_LIMIT       256
1183
+  #define SDSORT_USES_RAM    true
1184
+  #define SDSORT_USES_STACK  false
1185
+  #define SDSORT_CACHE_NAMES true
1186
+  #ifndef FOLDER_SORTING
1187
+    #define FOLDER_SORTING     -1
1188
+  #endif
1189
+  #ifndef SDSORT_GCODE
1190
+    #define SDSORT_GCODE       false
1191
+  #endif
1192
+  #ifndef SDSORT_DYNAMIC_RAM
1193
+    #define SDSORT_DYNAMIC_RAM false
1194
+  #endif
1195
+  #ifndef SDSORT_CACHE_VFATS
1196
+    #define SDSORT_CACHE_VFATS 2
1197
+  #endif
1186 1198
 #endif
1187 1199
 
1188 1200
 #endif // CONDITIONALS_POST_H

Notiek ielāde…
Atcelt
Saglabāt