From 42855f9f13ca652d9f885058242781421070d15e Mon Sep 17 00:00:00 2001 From: gudnimg Date: Sun, 1 Oct 2023 14:41:36 +0000 Subject: [PATCH] Rename setroot() to cdroot() This way the name is the same as Marlin 2.1 --- Firmware/cardreader.cpp | 6 +++--- Firmware/cardreader.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 5c501a219..7afc5420d 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -233,11 +233,11 @@ void CardReader::initsd(bool doPresort/* = true*/) if (cardOK) { - setroot(doPresort); + cdroot(doPresort); } } -void __attribute__((noinline)) CardReader::setroot(bool doPresort) +void __attribute__((noinline)) CardReader::cdroot(bool doPresort) { workDir=root; workDirDepth = 0; @@ -334,7 +334,7 @@ bool CardReader::diveSubfolder (const char *&fileName) const char *dirname_start, *dirname_end; if (fileName[0] == '/') // absolute path { - setroot(false); + cdroot(false); dirname_start = fileName + 1; while (*dirname_start) { diff --git a/Firmware/cardreader.h b/Firmware/cardreader.h index f66722c11..472a3a05c 100644 --- a/Firmware/cardreader.h +++ b/Firmware/cardreader.h @@ -59,7 +59,7 @@ public: void ls(ls_param params); bool chdir(const char * relpath, bool doPresort); void updir(); - void setroot(bool doPresort); + void cdroot(bool doPresort); #ifdef SDCARD_SORT_ALPHA void presort();