josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'MK3' into MK3_NEW_SD_COMPILATION

This commit is contained in:
Alex Voinea 2021-02-03 18:30:36 +02:00
parent 4c977cc335 0bda4504c1
commit e52e68d4c1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin.h
View File

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

2
Firmware/Marlin_main.cpp
View File

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

2
Firmware/cardreader.h
View File

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