Browse Source

Fix for MAX_VFAT_ENTRIES sanity check

Scott Lahteine 7 years ago
parent
commit
9f89b5d876
2 changed files with 7 additions and 8 deletions
  1. 7
    0
      Marlin/src/inc/Conditionals_post.h
  2. 0
    8
      Marlin/src/sd/SdFatConfig.h

+ 7
- 0
Marlin/src/inc/Conditionals_post.h View File

@@ -1162,6 +1162,13 @@
1162 1162
   #define NOT_A_PIN 0 // For PINS_DEBUGGING
1163 1163
 #endif
1164 1164
 
1165
+// Number of VFAT entries used. Each entry has 13 UTF-16 characters
1166
+#if ENABLED(SCROLL_LONG_FILENAMES)
1167
+  #define MAX_VFAT_ENTRIES (5)
1168
+#else
1169
+  #define MAX_VFAT_ENTRIES (2)
1170
+#endif
1171
+
1165 1172
 // Force SDCARD_SORT_ALPHA to be enabled for Graphical LCD on LPC1768
1166 1173
 // because of a bug in the shared SPI implementation. (See #8122)
1167 1174
 #if defined(TARGET_LPC1768) && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)

+ 0
- 8
Marlin/src/sd/SdFatConfig.h View File

@@ -133,14 +133,6 @@
133 133
 
134 134
 #define FILENAME_LENGTH 13 // Number of UTF-16 characters per entry
135 135
 
136
-// Number of VFAT entries used. Each entry has 13 UTF-16 characters
137
-#undef MAX_VFAT_ENTRIES
138
-#if ENABLED(SCROLL_LONG_FILENAMES)
139
-  #define MAX_VFAT_ENTRIES (5)
140
-#else
141
-  #define MAX_VFAT_ENTRIES (2)
142
-#endif
143
-
144 136
 // Total bytes needed to store a single long filename
145 137
 #define LONG_FILENAME_LENGTH (FILENAME_LENGTH * MAX_VFAT_ENTRIES + 1)
146 138
 

Loading…
Cancel
Save