|
@@ -157,7 +157,7 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m
|
157
|
157
|
|
158
|
158
|
case LS_SerialPrint:
|
159
|
159
|
createFilename(filename, p);
|
160
|
|
- SERIAL_PROTOCOL_P(port, prepend);
|
|
160
|
+ if (prepend) SERIAL_PROTOCOL_P(port, prepend);
|
161
|
161
|
SERIAL_PROTOCOL_P(port, filename);
|
162
|
162
|
SERIAL_PROTOCOLCHAR_P(port, ' ');
|
163
|
163
|
SERIAL_PROTOCOLLN_P(port, p.fileSize);
|
|
@@ -184,7 +184,7 @@ void CardReader::ls(
|
184
|
184
|
) {
|
185
|
185
|
lsAction = LS_SerialPrint;
|
186
|
186
|
root.rewind();
|
187
|
|
- lsDive("", root
|
|
187
|
+ lsDive(NULL, root
|
188
|
188
|
#if NUM_SERIAL > 1
|
189
|
189
|
, NULL, port
|
190
|
190
|
#endif
|
|
@@ -227,7 +227,7 @@ void CardReader::ls(
|
227
|
227
|
|
228
|
228
|
// Find the item, setting the long filename
|
229
|
229
|
diveDir.rewind();
|
230
|
|
- lsDive("", diveDir, segment
|
|
230
|
+ lsDive(NULL, diveDir, segment
|
231
|
231
|
#if NUM_SERIAL > 1
|
232
|
232
|
, port
|
233
|
233
|
#endif
|
|
@@ -322,7 +322,7 @@ void CardReader::openAndPrintFile(const char *name) {
|
322
|
322
|
void CardReader::startFileprint() {
|
323
|
323
|
if (cardOK) {
|
324
|
324
|
sdprinting = true;
|
325
|
|
- #if ENABLED(SDCARD_SORT_ALPHA)
|
|
325
|
+ #if SD_RESORT
|
326
|
326
|
flush_presort();
|
327
|
327
|
#endif
|
328
|
328
|
}
|
|
@@ -639,7 +639,7 @@ void CardReader::getfilename(uint16_t nr, const char * const match/*=NULL*/) {
|
639
|
639
|
lsAction = LS_GetFilename;
|
640
|
640
|
nrFile_index = nr;
|
641
|
641
|
curDir->rewind();
|
642
|
|
- lsDive("", *curDir, match);
|
|
642
|
+ lsDive(NULL, *curDir, match);
|
643
|
643
|
}
|
644
|
644
|
|
645
|
645
|
uint16_t CardReader::getnrfilenames() {
|
|
@@ -647,7 +647,7 @@ uint16_t CardReader::getnrfilenames() {
|
647
|
647
|
lsAction = LS_Count;
|
648
|
648
|
nrFiles = 0;
|
649
|
649
|
curDir->rewind();
|
650
|
|
- lsDive("", *curDir);
|
|
650
|
+ lsDive(NULL, *curDir);
|
651
|
651
|
//SERIAL_ECHOLN(nrFiles);
|
652
|
652
|
return nrFiles;
|
653
|
653
|
}
|