Browse Source

Allow NULL prepend in lsDive

Scott Lahteine 7 years ago
parent
commit
2168d6ac25
1 changed files with 6 additions and 6 deletions
  1. 6
    6
      Marlin/src/sd/cardreader.cpp

+ 6
- 6
Marlin/src/sd/cardreader.cpp View File

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

Loading…
Cancel
Save