0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Completed SORT_USES_MORE_RAM implementation

Browse source 
For the MORE_RAM option we need to buffer both the short and long
names, even though long names are sometimes redundant. Worst case, all
the names are max length. We can save some RAM by not storing these. We
could save more RAM by only storing the visible part of the long name.
This commit is contained in:
Scott Lahteine 2014-11-26 08:51:31 -08:00
parent 6901445592
commit eaa788e076
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Marlin/cardreader.cpp
View file

@ -203,6 +203,7 @@ void CardReader::startFileprint()
if(cardOK) if(cardOK)
{ {
sdprinting = true; sdprinting = true;
flush_presort();
} }
} }
@ -555,6 +556,7 @@ void CardReader::getfilename(const uint16_t nr)
{ {
#if defined(SDCARD_SORT_ALPHA) && SORT_USES_RAM && SORT_USES_MORE_RAM #if defined(SDCARD_SORT_ALPHA) && SORT_USES_RAM && SORT_USES_MORE_RAM
if (nr < sort_count) { if (nr < sort_count) {
strcpy(filename, sortshort[nr]);
strcpy(longFilename, sortnames[nr]); strcpy(longFilename, sortnames[nr]);
filenameIsDir = isDir[nr]; filenameIsDir = isDir[nr];
return; return;
@ -648,6 +650,7 @@ void CardReader::presort()
#if SORT_USES_RAM #if SORT_USES_RAM
#if SORT_USES_MORE_RAM #if SORT_USES_MORE_RAM
sortshort = (char**)calloc(fileCnt, sizeof(char*));
sortnames = (char**)calloc(fileCnt, sizeof(char*)); sortnames = (char**)calloc(fileCnt, sizeof(char*));
#else #else
char *sortnames[fileCnt]; char *sortnames[fileCnt];
@ -664,7 +667,6 @@ void CardReader::presort()
#endif #endif
#endif #endif
sort_count = fileCnt;
sort_order = new uint8_t[fileCnt]; sort_order = new uint8_t[fileCnt];
if (fileCnt > 1) { if (fileCnt > 1) {
@ -675,6 +677,9 @@ void CardReader::presort()
#if SORT_USES_RAM #if SORT_USES_RAM
getfilename(i); getfilename(i);
sortnames[i] = strdup(longFilename[0] ? longFilename : filename); sortnames[i] = strdup(longFilename[0] ? longFilename : filename);
#if SORT_USES_MORE_RAM
sortshort[i] = strdup(filename);
#endif
// char out[30]; // char out[30];
// sprintf_P(out, PSTR("---- %i %s %s"), i, filenameIsDir ? "D" : " ", sortnames[i]); // sprintf_P(out, PSTR("---- %i %s %s"), i, filenameIsDir ? "D" : " ", sortnames[i]);
// SERIAL_ECHOLN(out); // SERIAL_ECHOLN(out);
@ -729,20 +734,27 @@ void CardReader::presort()
sort_order[0] = 0; sort_order[0] = 0;
#if SORT_USES_RAM && SORT_USES_MORE_RAM #if SORT_USES_RAM && SORT_USES_MORE_RAM
sortnames = (char**)malloc(sizeof(char*)); sortnames = (char**)malloc(sizeof(char*));
sortshort = (char**)malloc(sizeof(char*));
isDir = (uint8_t*)malloc(sizeof(uint8_t)); isDir = (uint8_t*)malloc(sizeof(uint8_t));
getfilename(0); getfilename(0);
sortnames[0] = strdup(longFilename[0] ? longFilename : filename); sortnames[0] = strdup(longFilename[0] ? longFilename : filename);
sortshort[0] = strdup(filename);
isDir[0] = filenameIsDir; isDir[0] = filenameIsDir;
#endif #endif
} }
sort_count = fileCnt;
} }
} }
void CardReader::flush_presort() { void CardReader::flush_presort() {
if (sort_count > 0) { if (sort_count > 0) {
#if SORT_USES_RAM && SORT_USES_MORE_RAM #if SORT_USES_RAM && SORT_USES_MORE_RAM
for (uint8_t i=0; i<sort_count; ++i) free(sortnames[i]); for (uint8_t i=0; i<sort_count; ++i) {
free(sortshort[i]);
free(sortnames[i]);
}
free(sortshort);
free(sortnames); free(sortnames);
#endif #endif
delete sort_order; delete sort_order;
@ -774,6 +786,9 @@ void CardReader::printingHasFinished()
enquecommand_P(PSTR(SD_FINISHED_RELEASECOMMAND)); enquecommand_P(PSTR(SD_FINISHED_RELEASECOMMAND));
} }
autotempShutdown(); autotempShutdown();
#ifdef SDCARD_SORT_ALPHA
presort();
#endif
} }
} }
#endif //SDSUPPORT #endif //SDSUPPORT

1
Marlin/cardreader.h
View file

@ -73,6 +73,7 @@ private:
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 **sortnames; char **sortnames;
uint8_t *isDir; uint8_t *isDir;
#endif #endif