Browse Source

Fix for MAX_VFAT_ENTRIES sanity check

pull/1/head
Scott Lahteine 7 years ago
parent
commit
9f89b5d876
  1. 7
      Marlin/src/inc/Conditionals_post.h
  2. 8
      Marlin/src/sd/SdFatConfig.h

7
Marlin/src/inc/Conditionals_post.h

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

8
Marlin/src/sd/SdFatConfig.h

@ -133,14 +133,6 @@
#define FILENAME_LENGTH 13 // Number of UTF-16 characters per entry
// Number of VFAT entries used. Each entry has 13 UTF-16 characters
#undef MAX_VFAT_ENTRIES
#if ENABLED(SCROLL_LONG_FILENAMES)
#define MAX_VFAT_ENTRIES (5)
#else
#define MAX_VFAT_ENTRIES (2)
#endif
// Total bytes needed to store a single long filename
#define LONG_FILENAME_LENGTH (FILENAME_LENGTH * MAX_VFAT_ENTRIES + 1)

Loading…
Cancel
Save