Commit 3460f29a authored by MagoKimbra's avatar MagoKimbra

Fix cardereader lcdstatus

parent 2df6d691
...@@ -264,7 +264,7 @@ void CardReader::getAbsFilename(char *t) { ...@@ -264,7 +264,7 @@ void CardReader::getAbsFilename(char *t) {
t[0] = 0; t[0] = 0;
} }
void CardReader::openFile(char* name, bool read, bool replace_current/*=true*/) { void CardReader::openFile(char* name, bool read, bool replace_current/*=true*/, bool lcd_status/*=true*/) {
if (!cardOK) return; if (!cardOK) return;
if (file.isOpen()) { //replacing current file by new file, or subfile call if (file.isOpen()) { //replacing current file by new file, or subfile call
if (!replace_current) { if (!replace_current) {
...@@ -342,7 +342,7 @@ void CardReader::openFile(char* name, bool read, bool replace_current/*=true*/) ...@@ -342,7 +342,7 @@ void CardReader::openFile(char* name, bool read, bool replace_current/*=true*/)
ECHO_EM(MSG_SD_FILE_SELECTED); ECHO_EM(MSG_SD_FILE_SELECTED);
getfilename(0, fname); getfilename(0, fname);
lcd_setstatus(longFilename[0] ? longFilename : fname); if(lcd_status) lcd_setstatus(longFilename[0] ? longFilename : fname);
} }
else { else {
ECHO_MV(MSG_SD_OPEN_FILE_FAIL, fname); ECHO_MV(MSG_SD_OPEN_FILE_FAIL, fname);
...@@ -353,6 +353,7 @@ void CardReader::openFile(char* name, bool read, bool replace_current/*=true*/) ...@@ -353,6 +353,7 @@ void CardReader::openFile(char* name, bool read, bool replace_current/*=true*/)
if (!file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) { if (!file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC)) {
ECHO_MV(MSG_SD_OPEN_FILE_FAIL, fname); ECHO_MV(MSG_SD_OPEN_FILE_FAIL, fname);
ECHO_PGM(".\n"); ECHO_PGM(".\n");
if(lcd_status) lcd_setstatus(fname);
} }
else { else {
saving = true; saving = true;
......
...@@ -18,7 +18,7 @@ public: ...@@ -18,7 +18,7 @@ public:
//this is to delay autostart and hence the initialisaiton of the sd card to some seconds after the normal init, so the device is available quick after a reset //this is to delay autostart and hence the initialisaiton of the sd card to some seconds after the normal init, so the device is available quick after a reset
void checkautostart(bool x); void checkautostart(bool x);
void openFile(char* name,bool read,bool replace_current=true); void openFile(char* name,bool read,bool replace_current=true,bool lcd_status=true);
void openLogFile(char* name); void openLogFile(char* name);
void removeFile(char* name); void removeFile(char* name);
void closeFile(bool store_location = false); void closeFile(bool store_location = false);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment