From 372f93cc7a2e10bf81ef92328a85a15cc25d2fcc Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 29 Mar 2016 03:15:01 -0700 Subject: [PATCH] Rename "filenames" to "proc_filenames" --- Marlin/cardreader.cpp | 7 +++---- Marlin/cardreader.h | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/cardreader.cpp b/Marlin/cardreader.cpp index 9dd8a1246a..ec2cc73d10 100644 --- a/Marlin/cardreader.cpp +++ b/Marlin/cardreader.cpp @@ -318,9 +318,9 @@ void CardReader::openFile(char* name, bool read, bool replace_current/*=true*/) SERIAL_ECHOPGM("\" parent:\""); //store current filename and position - getAbsFilename(filenames[file_subcall_ctr]); + getAbsFilename(proc_filenames[file_subcall_ctr]); - SERIAL_ECHO(filenames[file_subcall_ctr]); + SERIAL_ECHO(proc_filenames[file_subcall_ctr]); SERIAL_ECHOPGM("\" pos"); SERIAL_ECHOLN(sdpos); filespos[file_subcall_ctr] = sdpos; @@ -607,7 +607,7 @@ void CardReader::printingHasFinished() { if (file_subcall_ctr > 0) { // Heading up to a parent file that called current as a procedure. file.close(); file_subcall_ctr--; - openFile(filenames[file_subcall_ctr], true, true); + openFile(proc_filenames[file_subcall_ctr], true, true); setIndex(filespos[file_subcall_ctr]); startFileprint(); } @@ -617,7 +617,6 @@ void CardReader::printingHasFinished() { if (SD_FINISHED_STEPPERRELEASE) { //finishAndDisableSteppers(); enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND)); - } autotempShutdown(); } } diff --git a/Marlin/cardreader.h b/Marlin/cardreader.h index 8bd53e551f..4e8446544a 100644 --- a/Marlin/cardreader.h +++ b/Marlin/cardreader.h @@ -83,11 +83,12 @@ private: Sd2Card card; SdVolume volume; SdFile file; + #define SD_PROCEDURE_DEPTH 1 #define MAXPATHNAMELENGTH (FILENAME_LENGTH*MAX_DIR_DEPTH + MAX_DIR_DEPTH + 1) uint8_t file_subcall_ctr; uint32_t filespos[SD_PROCEDURE_DEPTH]; - char filenames[SD_PROCEDURE_DEPTH][MAXPATHNAMELENGTH]; + char proc_filenames[SD_PROCEDURE_DEPTH][MAXPATHNAMELENGTH]; uint32_t filesize; millis_t next_autostart_ms; uint32_t sdpos;