melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow NULL prepend in lsDive

Browse Source
This commit is contained in:
Scott Lahteine 2018-03-13 23:00:31 -05:00
parent 1e946d681d
commit 2168d6ac25
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/src/sd/cardreader.cpp
View File

@ -157,7 +157,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_P(port, prepend); if (prepend) SERIAL_PROTOCOL_P(port, prepend);
SERIAL_PROTOCOL_P(port, filename); SERIAL_PROTOCOL_P(port, filename);
SERIAL_PROTOCOLCHAR_P(port, ' '); SERIAL_PROTOCOLCHAR_P(port, ' ');
SERIAL_PROTOCOLLN_P(port, p.fileSize); SERIAL_PROTOCOLLN_P(port, p.fileSize);
@ -184,7 +184,7 @@ void CardReader::ls(
) { ) {
lsAction = LS_SerialPrint; lsAction = LS_SerialPrint;
root.rewind(); root.rewind();
lsDive("", root lsDive(NULL, root
#if NUM_SERIAL > 1 #if NUM_SERIAL > 1
, NULL, port , NULL, port
#endif #endif
@ -227,7 +227,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
#if NUM_SERIAL > 1 #if NUM_SERIAL > 1
, port , port
#endif #endif
@ -322,7 +322,7 @@ void CardReader::openAndPrintFile(const char *name) {
void CardReader::startFileprint() { void CardReader::startFileprint() {
if (cardOK) { if (cardOK) {
sdprinting = true; sdprinting = true;
#if ENABLED(SDCARD_SORT_ALPHA) #if SD_RESORT
flush_presort(); flush_presort();
#endif #endif
} }
@ -639,7 +639,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() {
@ -647,7 +647,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;
} }