浏览代码

Rename "filenames" to "proc_filenames"

Scott Lahteine 9 年前
父节点
当前提交
372f93cc7a
共有 2 个文件被更改,包括 5 次插入5 次删除
  1. 3
    4
      Marlin/cardreader.cpp
  2. 2
    1
      Marlin/cardreader.h

+ 3
- 4
Marlin/cardreader.cpp 查看文件

318
       SERIAL_ECHOPGM("\" parent:\"");
318
       SERIAL_ECHOPGM("\" parent:\"");
319
 
319
 
320
       //store current filename and position
320
       //store current filename and position
321
-      getAbsFilename(filenames[file_subcall_ctr]);
321
+      getAbsFilename(proc_filenames[file_subcall_ctr]);
322
 
322
 
323
-      SERIAL_ECHO(filenames[file_subcall_ctr]);
323
+      SERIAL_ECHO(proc_filenames[file_subcall_ctr]);
324
       SERIAL_ECHOPGM("\" pos");
324
       SERIAL_ECHOPGM("\" pos");
325
       SERIAL_ECHOLN(sdpos);
325
       SERIAL_ECHOLN(sdpos);
326
       filespos[file_subcall_ctr] = sdpos;
326
       filespos[file_subcall_ctr] = sdpos;
607
   if (file_subcall_ctr > 0) { // Heading up to a parent file that called current as a procedure.
607
   if (file_subcall_ctr > 0) { // Heading up to a parent file that called current as a procedure.
608
     file.close();
608
     file.close();
609
     file_subcall_ctr--;
609
     file_subcall_ctr--;
610
-    openFile(filenames[file_subcall_ctr], true, true);
610
+    openFile(proc_filenames[file_subcall_ctr], true, true);
611
     setIndex(filespos[file_subcall_ctr]);
611
     setIndex(filespos[file_subcall_ctr]);
612
     startFileprint();
612
     startFileprint();
613
   }
613
   }
617
     if (SD_FINISHED_STEPPERRELEASE) {
617
     if (SD_FINISHED_STEPPERRELEASE) {
618
       //finishAndDisableSteppers();
618
       //finishAndDisableSteppers();
619
       enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
619
       enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
620
-    }
621
     autotempShutdown();
620
     autotempShutdown();
622
   }
621
   }
623
 }
622
 }

+ 2
- 1
Marlin/cardreader.h 查看文件

83
   Sd2Card card;
83
   Sd2Card card;
84
   SdVolume volume;
84
   SdVolume volume;
85
   SdFile file;
85
   SdFile file;
86
+
86
   #define SD_PROCEDURE_DEPTH 1
87
   #define SD_PROCEDURE_DEPTH 1
87
   #define MAXPATHNAMELENGTH (FILENAME_LENGTH*MAX_DIR_DEPTH + MAX_DIR_DEPTH + 1)
88
   #define MAXPATHNAMELENGTH (FILENAME_LENGTH*MAX_DIR_DEPTH + MAX_DIR_DEPTH + 1)
88
   uint8_t file_subcall_ctr;
89
   uint8_t file_subcall_ctr;
89
   uint32_t filespos[SD_PROCEDURE_DEPTH];
90
   uint32_t filespos[SD_PROCEDURE_DEPTH];
90
-  char filenames[SD_PROCEDURE_DEPTH][MAXPATHNAMELENGTH];
91
+  char proc_filenames[SD_PROCEDURE_DEPTH][MAXPATHNAMELENGTH];
91
   uint32_t filesize;
92
   uint32_t filesize;
92
   millis_t next_autostart_ms;
93
   millis_t next_autostart_ms;
93
   uint32_t sdpos;
94
   uint32_t sdpos;

正在加载...
取消
保存