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

Rebase to Marlin_v1

Browse Source
This commit is contained in:
Scott Lahteine
2014-12-17 23:07:36 -08:00
parent 4d61287807
commit f21cce0b28
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/cardreader.h
View File

@ -35,7 +35,7 @@ public:
void getStatus();
void printingHasFinished();
void getfilename(const uint16_t nr);
void getfilename(uint16_t nr, const char* const match=NULL);
uint16_t getnrfilenames();
void getAbsFilename(char *t);
@ -99,7 +99,7 @@ private:
LsAction lsAction; //stored for recursion.
uint16_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)