bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge branch 'Marlin_v1' into revert-1154-sd_sorting

Browse Source 
Conflicts:
	Marlin/cardreader.cpp
	Marlin/cardreader.h
This commit is contained in:
daid
2014-12-18 23:13:50 +01:00
parent ab355a90d3 7458bfe297
commit 17de96ace7
457 changed files with 135015 additions and 2649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/cardreader.h
View File

@ -28,7 +28,7 @@ public:
void getStatus();
void printingHasFinished();
void getfilename(const uint8_t nr);
void getfilename(uint16_t nr, const char* const match=NULL);
uint16_t getnrfilenames();
void getAbsFilename(char *t);
@ -77,7 +77,7 @@ private:
LsAction lsAction; //stored for recursion.
int16_t nrFiles; //counter for the files in the current directory and recycled as position counter for getting the nrFiles'th name in the directory.
char* diveDirName;
void lsDive(const char *prepend,SdFile parent);
void lsDive(const char *prepend, SdFile parent, const char * const match=NULL);
};
extern CardReader card;
#define IS_SD_PRINTING (card.sdprinting)