diff --git a/Ender-3 Firmware (Marlin)/Ender-3 (includes power failure resume- Chinese)/Marlin/SdBaseFile.cpp b/Ender-3 Firmware (Marlin)/Ender-3 (includes power failure resume- Chinese)/Marlin/SdBaseFile.cpp index dbcf77f..be04ab1 100644 --- a/Ender-3 Firmware (Marlin)/Ender-3 (includes power failure resume- Chinese)/Marlin/SdBaseFile.cpp +++ b/Ender-3 Firmware (Marlin)/Ender-3 (includes power failure resume- Chinese)/Marlin/SdBaseFile.cpp @@ -294,7 +294,7 @@ bool SdBaseFile::getFilename(char* name) { return true; } //------------------------------------------------------------------------------ -void SdBaseFile::getpos(fpos_t* pos) { +void SdBaseFile::getpos(filepos_t* pos) { pos->position = curPosition_; pos->cluster = curCluster_; } @@ -925,7 +925,7 @@ bool SdBaseFile::openRoot(SdVolume* vol) { * \return The byte if no error and not at eof else -1; */ int SdBaseFile::peek() { - fpos_t pos; + filepos_t pos; getpos(&pos); int c = read(); if (c >= 0) setpos(&pos); @@ -1492,7 +1492,7 @@ bool SdBaseFile::seekSet(uint32_t pos) { return false; } //------------------------------------------------------------------------------ -void SdBaseFile::setpos(fpos_t* pos) { +void SdBaseFile::setpos(filepos_t* pos) { curPosition_ = pos->position; curCluster_ = pos->cluster; } diff --git a/Ender-3 Firmware (Marlin)/Ender-3 (includes power failure resume- Chinese)/Marlin/SdBaseFile.h b/Ender-3 Firmware (Marlin)/Ender-3 (includes power failure resume- Chinese)/Marlin/SdBaseFile.h index dea299a..923a391 100644 --- a/Ender-3 Firmware (Marlin)/Ender-3 (includes power failure resume- Chinese)/Marlin/SdBaseFile.h +++ b/Ender-3 Firmware (Marlin)/Ender-3 (includes power failure resume- Chinese)/Marlin/SdBaseFile.h @@ -31,16 +31,16 @@ #include "SdVolume.h" //------------------------------------------------------------------------------ /** - * \struct fpos_t + * \struct filepos_t * \brief internal type for istream * do not use in user apps */ -struct fpos_t { +struct filepos_t { /** stream position */ uint32_t position; /** cluster for position */ uint32_t cluster; - fpos_t() : position(0), cluster(0) {} + filepos_t() : position(0), cluster(0) {} }; // use the gnu style oflag in open() @@ -196,11 +196,11 @@ class SdBaseFile { /** get position for streams * \param[out] pos struct to receive position */ - void getpos(fpos_t* pos); + void getpos(filepos_t* pos); /** set position for streams * \param[out] pos struct with value for new position */ - void setpos(fpos_t* pos); + void setpos(filepos_t* pos); //---------------------------------------------------------------------------- bool close(); bool contiguousRange(uint32_t* bgnBlock, uint32_t* endBlock); diff --git a/Ender-3 Firmware (Marlin)/Ender-3 (includes power failure resume- English)/Marlin/SdBaseFile.cpp b/Ender-3 Firmware (Marlin)/Ender-3 (includes power failure resume- English)/Marlin/SdBaseFile.cpp index dbcf77f..be04ab1 100644 --- a/Ender-3 Firmware (Marlin)/Ender-3 (includes power failure resume- English)/Marlin/SdBaseFile.cpp +++ b/Ender-3 Firmware (Marlin)/Ender-3 (includes power failure resume- English)/Marlin/SdBaseFile.cpp @@ -294,7 +294,7 @@ bool SdBaseFile::getFilename(char* name) { return true; } //------------------------------------------------------------------------------ -void SdBaseFile::getpos(fpos_t* pos) { +void SdBaseFile::getpos(filepos_t* pos) { pos->position = curPosition_; pos->cluster = curCluster_; } @@ -925,7 +925,7 @@ bool SdBaseFile::openRoot(SdVolume* vol) { * \return The byte if no error and not at eof else -1; */ int SdBaseFile::peek() { - fpos_t pos; + filepos_t pos; getpos(&pos); int c = read(); if (c >= 0) setpos(&pos); @@ -1492,7 +1492,7 @@ bool SdBaseFile::seekSet(uint32_t pos) { return false; } //------------------------------------------------------------------------------ -void SdBaseFile::setpos(fpos_t* pos) { +void SdBaseFile::setpos(filepos_t* pos) { curPosition_ = pos->position; curCluster_ = pos->cluster; } diff --git a/Ender-3 Firmware (Marlin)/Ender-3 (includes power failure resume- English)/Marlin/SdBaseFile.h b/Ender-3 Firmware (Marlin)/Ender-3 (includes power failure resume- English)/Marlin/SdBaseFile.h index dea299a..923a391 100644 --- a/Ender-3 Firmware (Marlin)/Ender-3 (includes power failure resume- English)/Marlin/SdBaseFile.h +++ b/Ender-3 Firmware (Marlin)/Ender-3 (includes power failure resume- English)/Marlin/SdBaseFile.h @@ -31,16 +31,16 @@ #include "SdVolume.h" //------------------------------------------------------------------------------ /** - * \struct fpos_t + * \struct filepos_t * \brief internal type for istream * do not use in user apps */ -struct fpos_t { +struct filepos_t { /** stream position */ uint32_t position; /** cluster for position */ uint32_t cluster; - fpos_t() : position(0), cluster(0) {} + filepos_t() : position(0), cluster(0) {} }; // use the gnu style oflag in open() @@ -196,11 +196,11 @@ class SdBaseFile { /** get position for streams * \param[out] pos struct to receive position */ - void getpos(fpos_t* pos); + void getpos(filepos_t* pos); /** set position for streams * \param[out] pos struct with value for new position */ - void setpos(fpos_t* pos); + void setpos(filepos_t* pos); //---------------------------------------------------------------------------- bool close(); bool contiguousRange(uint32_t* bgnBlock, uint32_t* endBlock);