josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename setroot() to cdroot() 

This way the name is the same as Marlin 2.1
This commit is contained in:
gudnimg 2023-10-01 14:41:36 +00:00 committed by Guðni Már Gilbert
parent e0eb8b8a24
commit 42855f9f13
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/cardreader.cpp
View File

@ -233,11 +233,11 @@ void CardReader::initsd(bool doPresort/* = true*/)
if (cardOK) if (cardOK)
{ {
setroot(doPresort); cdroot(doPresort);
} }
} }
void __attribute__((noinline)) CardReader::setroot(bool doPresort) void __attribute__((noinline)) CardReader::cdroot(bool doPresort)
{ {
workDir=root; workDir=root;
workDirDepth = 0; workDirDepth = 0;
@ -334,7 +334,7 @@ bool CardReader::diveSubfolder (const char *&fileName)
const char *dirname_start, *dirname_end; const char *dirname_start, *dirname_end;
if (fileName[0] == '/') // absolute path if (fileName[0] == '/') // absolute path
{ {
setroot(false); cdroot(false);
dirname_start = fileName + 1; dirname_start = fileName + 1;
while (*dirname_start) while (*dirname_start)
{ {

2
Firmware/cardreader.h
View File

@ -59,7 +59,7 @@ public:
void ls(ls_param params); void ls(ls_param params);
bool chdir(const char * relpath, bool doPresort); bool chdir(const char * relpath, bool doPresort);
void updir(); void updir();
void setroot(bool doPresort); void cdroot(bool doPresort);
#ifdef SDCARD_SORT_ALPHA #ifdef SDCARD_SORT_ALPHA
void presort(); void presort();