Browse Source

Merge branch 'MK3' into MK3_NEW_SD_COMPILATION

Alex Voinea 3 years ago
parent
commit
e52e68d4c1
3 changed files with 3 additions and 3 deletions
  1. 1 1
      Firmware/Marlin.h
  2. 1 1
      Firmware/Marlin_main.cpp
  3. 1 1
      Firmware/cardreader.h

+ 1 - 1
Firmware/Marlin.h

@@ -352,7 +352,7 @@ extern bool mesh_bed_run_from_menu;
 
 extern bool sortAlpha;
 
-extern char dir_names[3][9];
+extern char dir_names[][9];
 
 extern int8_t lcd_change_fil_state;
 // save/restore printing

+ 1 - 1
Firmware/Marlin_main.cpp

@@ -228,7 +228,7 @@ bool fan_state[2];
 int fan_edge_counter[2];
 int fan_speed[2];
 
-char dir_names[3][9];
+char dir_names[MAX_DIR_DEPTH][9];
 
 bool sortAlpha = false;
 

+ 1 - 1
Firmware/cardreader.h

@@ -3,7 +3,7 @@
 
 #ifdef SDSUPPORT
 
-#define MAX_DIR_DEPTH 10
+#define MAX_DIR_DEPTH 6
 
 #include "SdFile.h"
 enum LsAction {LS_SerialPrint,LS_SerialPrint_LFN,LS_Count,LS_GetFilename};