CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expand on More RAM concept, address minor bugs

Browse Source
This commit is contained in:
Scott Lahteine 2014-11-24 20:26:27 -08:00
parent 8196b36ad9
commit b6ffea612a
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Marlin/cardreader.h
View File

@ -46,11 +46,7 @@ public:
#ifdef SDCARD_SORT_ALPHA #ifdef SDCARD_SORT_ALPHA
void presort(); void presort();
void flush_presort(); void flush_presort();
<<<<<<< HEAD
void getfilename_sorted(const uint16_t nr); void getfilename_sorted(const uint16_t nr);
=======
void getfilename_sorted(const uint8_t nr);
>>>>>>> SD Card Alpha Sorting
#endif #endif
@ -64,37 +60,22 @@ public:
public: public:
bool saving; bool saving;
bool logging; bool logging;
<<<<<<< HEAD
bool sdprinting; bool sdprinting;
bool cardOK; bool cardOK;
char filename[FILENAME_LENGTH]; char filename[FILENAME_LENGTH];
char longFilename[LONG_FILENAME_LENGTH]; char longFilename[LONG_FILENAME_LENGTH];
=======
bool sdprinting ;
bool cardOK;
char filename[FILENAME_LENGTH];
char diveFilename[LONG_FILENAME_LENGTH];
>>>>>>> SD Card Alpha Sorting
bool filenameIsDir; bool filenameIsDir;
int lastnr; //last number of the autostart; int lastnr; //last number of the autostart;
private: private:
SdFile root,*curDir,workDir,workDirParents[MAX_DIR_DEPTH]; SdFile root,*curDir,workDir,workDirParents[MAX_DIR_DEPTH];
uint16_t workDirDepth; uint16_t workDirDepth;
#ifdef SDCARD_SORT_ALPHA #ifdef SDCARD_SORT_ALPHA
<<<<<<< HEAD
uint16_t sort_count; uint16_t sort_count;
uint8_t *sort_order; uint8_t *sort_order;
#if SORT_USES_MORE_RAM #if SORT_USES_MORE_RAM
char **sortshort; char **sortshort;
char **sortnames; char **sortnames;
uint8_t *isDir; uint8_t *isDir;
=======
#if SORT_USES_MORE_RAM
uint16_t sort_count;
char **sortnames;
#else
uint8_t sort_order[SORT_LIMIT];
>>>>>>> SD Card Alpha Sorting
#endif #endif
#endif #endif
Sd2Card card; Sd2Card card;