MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow NULL prepend in lsDive

Browse Source
This commit is contained in:
Scott Lahteine 2018-03-15 22:13:59 -05:00
parent bc0e977229
commit ec30e8c9ef
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/cardreader.cpp
View File

@ -141,7 +141,7 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m
case LS_SerialPrint: case LS_SerialPrint:
createFilename(filename, p); createFilename(filename, p);
SERIAL_PROTOCOL(prepend); if (prepend) SERIAL_PROTOCOL(prepend);
SERIAL_PROTOCOL(filename); SERIAL_PROTOCOL(filename);
SERIAL_PROTOCOLCHAR(' '); SERIAL_PROTOCOLCHAR(' ');
SERIAL_PROTOCOLLN(p.fileSize); SERIAL_PROTOCOLLN(p.fileSize);
@ -164,7 +164,7 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m
void CardReader::ls() { void CardReader::ls() {
lsAction = LS_SerialPrint; lsAction = LS_SerialPrint;
root.rewind(); root.rewind();
lsDive("", root); lsDive(NULL, root);
} }
#if ENABLED(LONG_FILENAME_HOST_SUPPORT) #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
@ -199,7 +199,7 @@ void CardReader::ls() {
// Find the item, setting the long filename // Find the item, setting the long filename
diveDir.rewind(); diveDir.rewind();
lsDive("", diveDir, segment); lsDive(NULL, diveDir, segment);
// Print /LongNamePart to serial output // Print /LongNamePart to serial output
SERIAL_PROTOCOLCHAR('/'); SERIAL_PROTOCOLCHAR('/');
@ -603,7 +603,7 @@ void CardReader::getfilename(uint16_t nr, const char * const match/*=NULL*/) {
lsAction = LS_GetFilename; lsAction = LS_GetFilename;
nrFile_index = nr; nrFile_index = nr;
curDir->rewind(); curDir->rewind();
lsDive("", *curDir, match); lsDive(NULL, *curDir, match);
} }
uint16_t CardReader::getnrfilenames() { uint16_t CardReader::getnrfilenames() {
@ -611,7 +611,7 @@ uint16_t CardReader::getnrfilenames() {
lsAction = LS_Count; lsAction = LS_Count;
nrFiles = 0; nrFiles = 0;
curDir->rewind(); curDir->rewind();
lsDive("", *curDir); lsDive(NULL, *curDir);
//SERIAL_ECHOLN(nrFiles); //SERIAL_ECHOLN(nrFiles);
return nrFiles; return nrFiles;
} }