From 026e3ecaac7df98bdef466547027bfc0d4628444 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 14 Sep 2017 14:21:16 +0200 Subject: [PATCH] getter function for filesize --- Firmware/cardreader.cpp | 4 ++-- Firmware/cardreader.h | 3 +-- Firmware/ultralcd.cpp | 7 ++++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 59116f919..77c52a6b4 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -501,9 +501,9 @@ void CardReader::removeFile(char* name) } -void CardReader::getFileSize() +uint32_t CardReader::getFileSize() { - public_fileSize = filesize; + return filesize; } void CardReader::getStatus() diff --git a/Firmware/cardreader.h b/Firmware/cardreader.h index ec6c00728..dff3d263d 100644 --- a/Firmware/cardreader.h +++ b/Firmware/cardreader.h @@ -27,7 +27,7 @@ public: void release(); void startFileprint(); void pauseSDPrint(); - void getFileSize(); + uint32_t getFileSize(); void getStatus(); void printingHasFinished(); @@ -70,7 +70,6 @@ public: bool cardOK ; char filename[13]; uint16_t creationTime, creationDate; - uint32_t public_fileSize; char longFilename[LONG_FILENAME_LENGTH]; bool filenameIsDir; int lastnr; //last number of the autostart; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 955e2d68c..c49dfe1fc 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4967,10 +4967,11 @@ static void menu_action_function(menuFunc_t data) { static bool check_file(const char* filename) { bool result = false; + uint32_t filesize; card.openFile(filename, true); - card.getFileSize(); - if (card.public_fileSize > END_FILE_SECTION) { - card.setIndex((card.public_fileSize) - END_FILE_SECTION); + filesize = card.getFileSize(); + if (fileSize > END_FILE_SECTION) { + card.setIndex(filesize - END_FILE_SECTION); } while (!card.eof() && !result) {