all sd sort files: initial version; sorting type switch not added to SD card menu itself

Firmware/Configuration.h

@@ -81,7 +81,7 @@
 #define EEPROM_POWER_COUNT       (EEPROM_UVLO_MESH_BED_LEVELING-17)
 #define EEPROM_DIR_DEPTH        (EEPROM_POWER_COUNT-1)
 #define EEPROM_DIRS  (EEPROM_DIR_DEPTH-80) //8 chars for each dir name, max 10 levels
-#define EEPROM_SD_SORT (EEPROM_CALIBRATION_STATUS_PINDA - 1) //0 -time, 1-alpha, 2-none
+#define EEPROM_SD_SORT (EEPROM_DIRS - 1) //0 -time, 1-alpha, 2-none
 
 //TMC2130 configuration
 #define EEPROM_TMC_AXIS_SIZE  //axis configuration block size

Firmware/cardreader.cpp

@@ -7,10 +7,20 @@
 
 #ifdef SDSUPPORT
 
-
+#define LONGEST_FILENAME (longFilename[0] ? longFilename : filename)
 
 CardReader::CardReader()
 {
+
+   #ifdef SDCARD_SORT_ALPHA
+     sort_count = 0;
+     #if SDSORT_GCODE
+       sort_alpha = true;
+     sort_folders = FOLDER_SORTING;
+     //sort_reverse = false;
+     #endif
+   #endif
+
    filesize = 0;
    sdpos = 0;
    sdprinting = false;
@@ -49,95 +59,100 @@ char *createFilename(char *buffer,const dir_t &p) //buffer>12characters
   return buffer;
 }
 
+/**
++* Dive into a folder and recurse depth-first to perform a pre-set operation lsAction:
++*   LS_Count       - Add +1 to nrFiles for every file within the parent
++*   LS_GetFilename - Get the filename of the file indexed by nrFiles
++*   LS_SerialPrint - Print the full path and size of each file to serial output
++*/
 
-void CardReader::lsDive(const char *prepend, SdFile parent, const char * const match/*=NULL*/)
+void CardReader::lsDive(const char *prepend, SdFile parent, const char * const match/*=NULL*/) {
-{
 	dir_t p;
 	uint8_t cnt = 0;
- 
+		// Read the next entry from a directory
-  while (parent.readDir(p, longFilename) > 0)
+		while (parent.readDir(p, longFilename) > 0) {
-  {
+			// If the entry is a directory and the action is LS_SerialPrint
-    if( DIR_IS_SUBDIR(&p) && lsAction!=LS_Count && lsAction!=LS_GetFilename) // hence LS_SerialPrint
+			if (DIR_IS_SUBDIR(&p) && lsAction != LS_Count && lsAction != LS_GetFilename) {
-    {
+				// Get the short name for the item, which we know is a folder
-
+				char lfilename[FILENAME_LENGTH];
-      char path[13*2];
-      char lfilename[13];
 				createFilename(lfilename, p);
-      
+				// Allocate enough stack space for the full path to a folder, trailing slash, and nul
-      path[0]=0;
+				bool prepend_is_empty = (prepend[0] == '\0');
-      if(strlen(prepend)==0) //avoid leading / if already in prepend
+				int len = (prepend_is_empty ? 1 : strlen(prepend)) + strlen(lfilename) + 1 + 1;
-      {
+				char path[len];
-       strcat(path,"/");
+				// Append the FOLDERNAME12/ to the passed string.
-      }
+				// It contains the full path to the "parent" argument.
-      strcat(path,prepend);
+				// We now have the full path to the item in this folder.
-      strcat(path,lfilename);
+				strcpy(path, prepend_is_empty ? "/" : prepend); // root slash if prepend is empty
-      strcat(path,"/");
+				strcat(path, lfilename); // FILENAME_LENGTH-1 characters maximum
-      
+				strcat(path, "/");       // 1 character
 				// Serial.print(path);
-      
+				// Get a new directory object using the full path
+				// and dive recursively into it.
 				SdFile dir;
-      if(!dir.open(parent,lfilename, O_READ))
+				if (!dir.open(parent, lfilename, O_READ)) {
-      {
+					if (lsAction == LS_SerialPrint) {
-        if(lsAction==LS_SerialPrint)
+						//SERIAL_ECHO_START();
-        {
+						//SERIAL_ECHOPGM(MSG_SD_CANT_OPEN_SUBDIR);
-          SERIAL_ECHO_START;
+						//SERIAL_ECHOLN(lfilename);
-          SERIAL_ECHORPGM(MSG_SD_CANT_ENTER_SUBDIR);
-          SERIAL_ECHOLN(lfilename);
 					}
 				}
 				lsDive(path, dir);
-      //close done automatically by destructor of SdFile
+				// close() is done automatically by destructor of SdFile
-
-      
 			}
-    else
+			else {
-    {
+				uint8_t pn0 = p.name[0];
-      char pn0 = p.name[0];
 				if (pn0 == DIR_NAME_FREE) break;
-      if (pn0 == DIR_NAME_DELETED || pn0 == '.' || pn0 == '_') continue;
+				if (pn0 == DIR_NAME_DELETED || pn0 == '.') continue;
-      char lf0 = longFilename[0];
+				if (longFilename[0] == '.') continue;
-      if (lf0 == '.' || lf0 == '_') continue;
+				if (!DIR_IS_FILE_OR_SUBDIR(&p) || (p.attributes & DIR_ATT_HIDDEN)) continue;
-
-      if (!DIR_IS_FILE_OR_SUBDIR(&p)) continue;
-      // Ignore the files and directories with hidden or system attribute.
-      if ((p.attributes & (DIR_ATT_HIDDEN | DIR_ATT_SYSTEM)) != 0) continue;
 				filenameIsDir = DIR_IS_SUBDIR(&p);
-      
+				if (!filenameIsDir && (p.name[8] != 'G' || p.name[9] == '~')) continue;
-      
+				switch (lsAction) {
-      if(!filenameIsDir)
+					case LS_Count:
-      {
-        if(p.name[8]!='G') continue;
-        if(p.name[9]=='~') continue;
-      }
-      //if(cnt++!=nr) continue;
-      createFilename(filename,p);
-      if(lsAction==LS_SerialPrint)
-      {
-        SERIAL_PROTOCOL(prepend);
-        SERIAL_PROTOCOLLN(filename);
-      }
-      else if(lsAction==LS_Count)
-      {
 						nrFiles++;
-      } 
+						break;
-      else if(lsAction==LS_GetFilename)
+					
-      {
+					case LS_SerialPrint:
+						createFilename(filename, p);
+						SERIAL_PROTOCOL(prepend);
+						SERIAL_PROTOCOL(filename);
+						//SERIAL_PROTOCOLCHAR(' ');
+						SERIAL_PROTOCOLLN(p.fileSize);
+						break;
+				
+					case LS_GetFilename:
+						//SERIAL_ECHOPGM("File: ");				
+						createFilename(filename, p);
+						/*MYSERIAL.println(filename);
+						SERIAL_ECHOPGM("Write date: ");
+						writeDate = p.lastWriteDate;
+						MYSERIAL.println(writeDate);
+						writeTime = p.lastWriteTime;
+						SERIAL_ECHOPGM("Creation date: ");
+						MYSERIAL.println(p.creationDate);
+						SERIAL_ECHOPGM("Access date: ");
+						MYSERIAL.println(p.lastAccessDate);
+						SERIAL_ECHOLNPGM("");*/
+						creationDate = p.creationDate;
+						creationTime = p.creationTime;
+						//writeDate = p.lastAccessDate;
 						if (match != NULL) {
 							if (strcasecmp(match, filename) == 0) return;
 						}
 						else if (cnt == nrFiles) return;
 						cnt++;
-        
+						break;
-      }
 				}
 			}
+		} // while readDir
 }
 
 void CardReader::ls() 
 {
   lsAction=LS_SerialPrint;
-  if(lsAction==LS_Count)
+  //if(lsAction==LS_Count)
-  nrFiles=0;
+  //nrFiles=0;
 
   root.rewind();
   lsDive("",root);
@@ -185,6 +200,11 @@ void CardReader::initsd()
   }
   workDir=root;
   curDir=&root;
+
+  #ifdef SDCARD_SORT_ALPHA
+	presort();
+  #endif
+
   /*
   if(!workDir.openRoot(&volume))
   {
@@ -203,6 +223,9 @@ void CardReader::setroot()
   workDir=root;
   
   curDir=&workDir;
+  #ifdef SDCARD_SORT_ALPHA
+	  presort();
+  #endif
 }
 void CardReader::release()
 {
@@ -215,6 +238,9 @@ void CardReader::startFileprint()
   if(cardOK)
   {
     sdprinting = true;
+	#ifdef SDCARD_SORT_ALPHA
+		flush_presort();
+	#endif
   }
 }
 
@@ -458,6 +484,9 @@ void CardReader::removeFile(char* name)
       SERIAL_PROTOCOLPGM("File deleted:");
       SERIAL_PROTOCOLLN(fname);
       sdpos = 0;
+	  #ifdef SDCARD_SORT_ALPHA
+		  presort();
+	  #endif
     }
     else
     {
@@ -655,6 +684,267 @@ void CardReader::updir()
   }
 }
 
+#ifdef SDCARD_SORT_ALPHA
+
+/**
+* Get the name of a file in the current directory by sort-index
+*/
+void CardReader::getfilename_sorted(const uint16_t nr) {
+	getfilename(
+	#if SDSORT_GCODE
+		sort_alpha &&
+	#endif
+		(nr < sort_count) ? sort_order[nr] : nr
+	);
+}
+
+/**
+* Read all the files and produce a sort key
+*
+* We can do this in 3 ways...
+*  - Minimal RAM: Read two filenames at a time sorting along...
+*  - Some RAM: Buffer the directory just for this sort
+*  - Most RAM: Buffer the directory and return filenames from RAM
+*/
+void CardReader::presort() {
+
+	uint8_t sdSort = eeprom_read_byte((uint8_t*)EEPROM_SD_SORT);
+
+	if (sdSort == SD_SORT_NONE) return; //sd sort is turned off
+	#if !SDSORT_USES_RAM
+	lcd_set_progress();
+		#endif
+	lcd_implementation_clear();
+	lcd_print_at_PGM(0, 1, MSG_SORTING);
+
+	#if SDSORT_GCODE
+	if (!sort_alpha) return;
+	#endif
+
+	// Throw away old sort index
+	flush_presort();
+
+	// If there are files, sort up to the limit
+	uint16_t fileCnt = getnrfilenames();
+	if (fileCnt > 0) {
+
+		// Never sort more than the max allowed
+		// If you use folders to organize, 20 may be enough
+		if (fileCnt > SDSORT_LIMIT) fileCnt = SDSORT_LIMIT;
+
+		// Sort order is always needed. May be static or dynamic.
+		#if SDSORT_DYNAMIC_RAM
+		sort_order = new uint8_t[fileCnt];
+		#endif
+
+		// Use RAM to store the entire directory during pre-sort.
+		// SDSORT_LIMIT should be set to prevent over-allocation.
+		#if SDSORT_USES_RAM
+
+		// If using dynamic ram for names, allocate on the heap.
+		#if SDSORT_CACHE_NAMES
+		#if SDSORT_DYNAMIC_RAM
+		sortshort = new char*[fileCnt];
+		sortnames = new char*[fileCnt];
+		#endif
+		#elif SDSORT_USES_STACK
+		char sortnames[fileCnt][LONG_FILENAME_LENGTH];
+		uint16_t creation_time[SDSORT_LIMIT];
+		uint16_t creation_date[SDSORT_LIMIT];
+		#endif
+
+		// Folder sorting needs 1 bit per entry for flags.
+		#if HAS_FOLDER_SORTING
+		#if SDSORT_DYNAMIC_RAM
+		isDir = new uint8_t[(fileCnt + 7) >> 3];
+		#elif SDSORT_USES_STACK
+		uint8_t isDir[(fileCnt + 7) >> 3];
+		#endif
+		#endif
+
+		#else // !SDSORT_USES_RAM
+
+		// By default re-read the names from SD for every compare
+		// retaining only two filenames at a time. This is very
+		// slow but is safest and uses minimal RAM.
+		char name1[LONG_FILENAME_LENGTH + 1];
+		uint16_t creation_time_bckp;
+		uint16_t creation_date_bckp;
+
+		#endif
+
+		if (fileCnt > 1) {
+			// Init sort order.
+			for (uint16_t i = 0; i < fileCnt; i++) {
+				sort_order[i] = i;
+				// If using RAM then read all filenames now.
+				#if SDSORT_USES_RAM
+				getfilename(i);
+				#if SDSORT_DYNAMIC_RAM
+				// Use dynamic method to copy long filename
+				sortnames[i] = strdup(LONGEST_FILENAME);
+				#if SDSORT_CACHE_NAMES
+				// When caching also store the short name, since
+				// we're replacing the getfilename() behavior.
+				sortshort[i] = strdup(filename);
+				#endif
+				#else
+				// Copy filenames into the static array
+				strcpy(sortnames[i], LONGEST_FILENAME);
+				creation_time[i] = creationTime;
+				creation_date[i] = creationDate;
+				#if SDSORT_CACHE_NAMES
+				strcpy(sortshort[i], filename);
+				#endif
+				#endif
+				// char out[30];
+				// sprintf_P(out, PSTR("---- %i %s %s"), i, filenameIsDir ? "D" : " ", sortnames[i]);
+				// SERIAL_ECHOLN(out);
+				#if HAS_FOLDER_SORTING
+				const uint16_t bit = i & 0x07, ind = i >> 3;
+				if (bit == 0) isDir[ind] = 0x00;
+				if (filenameIsDir) isDir[ind] |= _BV(bit);
+				#endif
+				#endif
+			}
+			// Bubble Sort
+			uint16_t counter = 0;
+			for (uint16_t i = fileCnt; --i;) {
+				bool didSwap = false;
+
+				#if !SDSORT_USES_RAM //show progresss bar only if slow sorting method is used
+				int8_t percent = ((counter * 100) / (fileCnt - 1));
+				for (int column = 0; column < 20; column++) {
+					if (column < (percent / 5)) lcd_implementation_print_at(column, 2, "\x01"); //simple progress bar
+				}
+				counter++;
+				#endif
+
+				//MYSERIAL.println(int(i));
+				for (uint16_t j = 0; j < i; ++j) {
+					const uint16_t o1 = sort_order[j], o2 = sort_order[j + 1];
+					// Compare names from the array or just the two buffered names
+					#if SDSORT_USES_RAM
+						#define _SORT_CMP_NODIR() (strcasecmp(sortnames[o1], sortnames[o2]) > 0)
+						#define _SORT_CMP_TIME_NODIR() (((creation_date[o1] == creation_date[o2]) && (creation_time[o1] < creation_time[o2])) || \
+														(creation_date[o1] < creation_date [o2]))
+					#else
+						#define _SORT_CMP_NODIR() (strcasecmp(name1, name2) > 0) //true if lowercase(name1) > lowercase(name2)
+						#define _SORT_CMP_TIME_NODIR() (((creation_date_bckp == creationDate) && (creation_time_bckp < creationTime)) || \
+														(creation_date_bckp < creationDate))
+					#endif
+
+					#if HAS_FOLDER_SORTING
+					#if SDSORT_USES_RAM
+					// Folder sorting needs an index and bit to test for folder-ness.
+					const uint8_t ind1 = o1 >> 3, bit1 = o1 & 0x07,
+						ind2 = o2 >> 3, bit2 = o2 & 0x07;
+						#define _SORT_CMP_DIR(fs) \
+							  (((isDir[ind1] & _BV(bit1)) != 0) == ((isDir[ind2] & _BV(bit2)) != 0) \
+								? _SORT_CMP_NODIR() \
+								: (isDir[fs > 0 ? ind1 : ind2] & (fs > 0 ? _BV(bit1) : _BV(bit2))) != 0)
+						#define _SORT_CMP_TIME_DIR(fs) \
+							  (((isDir[ind1] & _BV(bit1)) != 0) == ((isDir[ind2] & _BV(bit2)) != 0) \
+								? _SORT_CMP_TIME_NODIR() \
+								: (isDir[fs > 0 ? ind1 : ind2] & (fs > 0 ? _BV(bit1) : _BV(bit2))) != 0)
+					#else
+						#define _SORT_CMP_DIR(fs) ((dir1 == filenameIsDir) ? _SORT_CMP_NODIR() : (fs > 0 ? dir1 : !dir1))
+						#define _SORT_CMP_TIME_DIR(fs) ((dir1 == filenameIsDir) ? _SORT_CMP_TIME_NODIR() : (fs > 0 ? dir1 : !dir1))
+					#endif
+					#endif
+
+					// The most economical method reads names as-needed
+					// throughout the loop. Slow if there are many.
+					#if !SDSORT_USES_RAM
+
+					getfilename(o1);
+					strcpy(name1, LONGEST_FILENAME); // save (or getfilename below will trounce it)
+					creation_date_bckp = creationDate;
+					creation_time_bckp = creationTime;
+					#if HAS_FOLDER_SORTING
+					bool dir1 = filenameIsDir;
+					#endif
+					getfilename(o2);
+					char *name2 = LONGEST_FILENAME; // use the string in-place
+
+					#endif // !SDSORT_USES_RAM
+
+													// Sort the current pair according to settings.
+					if (
+					#if HAS_FOLDER_SORTING
+					(sdSort == SD_SORT_TIME && _SORT_CMP_TIME_DIR(FOLDER_SORTING)) || (sdSort == SD_SORT_ALPHA && _SORT_CMP_DIR(FOLDER_SORTING))
+					#else
+						(sdSort == SD_SORT_TIME && _SORT_CMP_TIME_NODIR()) || (sdSort == SD_SORT_ALPHA && _SORT_CMP_NODIR())
+					#endif
+						)
+					{
+						sort_order[j] = o2;
+						sort_order[j + 1] = o1;
+						didSwap = true;
+						//SERIAL_ECHOLNPGM("did swap");
+					}
+				}
+				if (!didSwap) break;
+			} //end of bubble sort loop
+
+			  // Using RAM but not keeping names around
+			#if (SDSORT_USES_RAM && !SDSORT_CACHE_NAMES)
+			#if SDSORT_DYNAMIC_RAM
+			for (uint16_t i = 0; i < fileCnt; ++i) free(sortnames[i]);
+			#if HAS_FOLDER_SORTING
+			free(isDir);
+			#endif
+			#endif
+			#endif
+		}
+		else {
+			sort_order[0] = 0;
+		#if (SDSORT_USES_RAM && SDSORT_CACHE_NAMES)
+			getfilename(0);
+			#if SDSORT_DYNAMIC_RAM
+			sortnames = new char*[1];
+			sortnames[0] = strdup(LONGEST_FILENAME); // malloc
+			sortshort = new char*[1];
+			sortshort[0] = strdup(filename);         // malloc
+			isDir = new uint8_t[1];
+			#else
+			strcpy(sortnames[0], LONGEST_FILENAME);
+			strcpy(sortshort[0], filename);
+			#endif
+			isDir[0] = filenameIsDir ? 0x01 : 0x00;
+		#endif
+		}
+
+		sort_count = fileCnt;
+	}
+#if !SDSORT_USES_RAM //show progresss bar only if slow sorting method is used
+	for (int column = 0; column <= 19; column++)	lcd_implementation_print_at(column, 2, "\x01"); //simple progress bar	
+	delay(500);
+	lcd_set_arrows();
+	lcd_update(2);
+#endif
+}
+
+void CardReader::flush_presort() {
+	if (sort_count > 0) {
+		#if SDSORT_DYNAMIC_RAM
+		delete sort_order;
+		#if SDSORT_CACHE_NAMES
+		for (uint8_t i = 0; i < sort_count; ++i) {
+			free(sortshort[i]); // strdup
+			free(sortnames[i]); // strdup
+		}
+		delete sortshort;
+		delete sortnames;
+		#endif
+		#endif
+		sort_count = 0;
+	}
+}
+
+#endif // SDCARD_SORT_ALPHA
+
+
 
 void CardReader::printingHasFinished()
 {
@@ -678,6 +968,9 @@ void CardReader::printingHasFinished()
           //enquecommand_P(PSTR(SD_FINISHED_RELEASECOMMAND));
       }
       autotempShutdown();
+	  #ifdef SDCARD_SORT_ALPHA
+		  presort();
+	  #endif
     }
 }
 

Firmware/cardreader.h

@@ -43,6 +43,15 @@ public:
   void updir();
   void setroot();
 
+  #ifdef SDCARD_SORT_ALPHA
+     void presort();
+     void getfilename_sorted(const uint16_t nr);
+     #if SDSORT_GCODE
+	 FORCE_INLINE void setSortOn(bool b) { sort_alpha = b; presort(); }
+     FORCE_INLINE void setSortFolders(int i) { sort_folders = i; presort(); }
+     //FORCE_INLINE void setSortReverse(bool b) { sort_reverse = b; }
+	 #endif
+  #endif
 
   FORCE_INLINE bool isFileOpen() { return file.isOpen(); }
   FORCE_INLINE bool eof() { return sdpos>=filesize ;};
@@ -62,12 +71,59 @@ public:
   bool sdprinting ;  
   bool cardOK ;
   char filename[13];
+  uint16_t creationTime, creationDate;
   char longFilename[LONG_FILENAME_LENGTH];
   bool filenameIsDir;
   int lastnr; //last number of the autostart;
 private:
   SdFile root,*curDir,workDir,workDirParents[MAX_DIR_DEPTH];
   uint16_t workDirDepth;
+
+  // Sort files and folders alphabetically.
+#ifdef SDCARD_SORT_ALPHA
+  uint16_t sort_count;        // Count of sorted items in the current directory
+  #if SDSORT_GCODE
+  bool sort_alpha;          // Flag to enable / disable the feature
+  int sort_folders;         // Flag to enable / disable folder sorting
+							//bool sort_reverse;      // Flag to enable / disable reverse sorting
+  #endif
+
+							// By default the sort index is static
+  #if SDSORT_DYNAMIC_RAM
+  uint8_t *sort_order;
+  #else
+  uint8_t sort_order[SDSORT_LIMIT];
+  #endif
+  // Cache filenames to speed up SD menus.
+  #if SDSORT_USES_RAM
+
+  // If using dynamic ram for names, allocate on the heap.
+  #if SDSORT_CACHE_NAMES
+    #if SDSORT_DYNAMIC_RAM
+      char **sortshort, **sortnames;
+    #else
+      char sortshort[SDSORT_LIMIT][FILENAME_LENGTH];
+      char sortnames[SDSORT_LIMIT][FILENAME_LENGTH];
+    #endif
+  #elif !SDSORT_USES_STACK
+    char sortnames[SDSORT_LIMIT][FILENAME_LENGTH];
+    uint16_t creation_time[SDSORT_LIMIT];
+    uint16_t creation_date[SDSORT_LIMIT];
+  #endif
+
+  // Folder sorting uses an isDir array when caching items.
+  #if HAS_FOLDER_SORTING
+    #if SDSORT_DYNAMIC_RAM
+      uint8_t *isDir;
+    #elif (SDSORT_CACHE_NAMES) || !(SDSORT_USES_STACK)
+      uint8_t isDir[(SDSORT_LIMIT + 7) >> 3];
+    #endif
+  #endif
+
+  #endif // SDSORT_USES_RAM
+
+#endif // SDCARD_SORT_ALPHA
+
   Sd2Card card;
   SdVolume volume;
   SdFile file;

Firmware/language_en.h

@@ -370,3 +370,8 @@
 #define(length=20, lines=2) MSG_UNLOAD_SUCCESSFULL				"Repeat unloading filament?"
 #define(length=20, lines=2) MSG_FILE_INCOMPLETE					"File incomplete. Continue anyway?"
 
+#define(length=20, lines=4) MSG_DEFAULT_SETTINGS_LOADED			"Default settings loaded"
+#define(length=17, lines=1) MSG_SORT_TIME						"Sort: [Time]"
+#define(length=17, lines=1) MSG_SORT_ALPHA						"Sort: [Alphabet]"
+#define(length=17, lines=1) MSG_SORT_NONE						"Sort: [None]"
+#define(length=20, lines=1) MSG_SORTING							"Sorting files"

Firmware/ultralcd.cpp

@@ -3223,6 +3223,23 @@ void EEPROM_read(int pos, uint8_t* value, uint8_t size)
   } while (--size);
 }
 
+#ifdef SDCARD_SORT_ALPHA
+static void lcd_sort_type_set() {
+	uint8_t sdSort;
+		EEPROM_read(EEPROM_SD_SORT, (uint8_t*)&sdSort, sizeof(sdSort));
+	switch (sdSort) {
+		case SD_SORT_TIME: sdSort = SD_SORT_ALPHA; break;
+		case SD_SORT_ALPHA: sdSort = SD_SORT_NONE; break;
+		default: sdSort = SD_SORT_TIME;
+	}
+	eeprom_update_byte((unsigned char *)EEPROM_SD_SORT, sdSort);
+	lcd_goto_menu(lcd_sdcard_menu, 1);
+	//lcd_update(2);
+	//delay(1000);	
+	card.presort();
+}
+#endif //SDCARD_SORT_ALPHA
+
 static void lcd_silent_mode_set() {
   SilentModeMenu = !SilentModeMenu;
   eeprom_update_byte((unsigned char *)EEPROM_SILENT, SilentModeMenu);
@@ -3278,6 +3295,16 @@ static void lcd_fsensor_state_set()
     
 }
 
+#if !SDSORT_USES_RAM
+void lcd_set_arrows() {
+	void lcd_set_custom_characters_arrows();
+}
+
+void lcd_set_progress() {
+	lcd_set_custom_characters_progress();
+}
+#endif
+
 void lcd_force_language_selection() {
   eeprom_update_byte((unsigned char *)EEPROM_LANG, LANG_ID_FORCE_SELECTION);
 }
@@ -5178,7 +5205,6 @@ void getFileDescription(char *name, char *description) {
 
 void lcd_sdcard_menu()
 {
-
   int tempScrool = 0;
   if (lcdDrawUpdate == 0 && LCD_CLICKED == 0)
     //delay(100);
@@ -5201,22 +5227,24 @@ void lcd_sdcard_menu()
   {
     if (_menuItemNr == _lineNr)
     {
-#ifndef SDCARD_RATHERRECENTFIRST
+		const uint16_t nr = (sdSort == SD_SORT_NONE) ? (fileCnt - 1 - i) : i;
-      card.getfilename(i);
+		/*#ifdef SDCARD_RATHERRECENTFIRST
-#else
+			#ifndef SDCARD_SORT_ALPHA
-      card.getfilename(fileCnt - 1 - i);
+				fileCnt - 1 -
 			#endif
+		#endif
+		i;*/
+		#ifdef SDCARD_SORT_ALPHA
+			if (sdSort == SD_SORT_NONE) card.getfilename(nr);
+			else card.getfilename_sorted(nr);
+		#else
+			 card.getfilename(nr);
+		#endif
+			
 		if (card.filenameIsDir)
-      {
 			MENU_ITEM(sddirectory, MSG_CARD_MENU, card.filename, card.longFilename);
-      } else {
+		else
-
 			MENU_ITEM(sdfile, MSG_CARD_MENU, card.filename, card.longFilename);
-
-
-
-
-      }
     } else {
       MENU_ITEM_DUMMY();
     }

Firmware/ultralcd.h

@@ -238,6 +238,9 @@ void extr_unload_all();
 void extr_unload_used();
 void extr_unload();
 static char snmm_stop_print_menu();
+#ifdef SDCARD_SORT_ALPHA
+ static void lcd_sort_type_set();
+#endif
 static float count_e(float layer_heigth, float extrusion_width, float extrusion_length);
 static void lcd_babystep_z();
 
@@ -272,6 +275,11 @@ void display_loading();
 
 void lcd_service_mode_show_result();
 
+#if !SDSORT_USES_RAM
+ void lcd_set_arrows();
+ void lcd_set_progress();
+#endif
+
 void lcd_wizard();
 void lcd_wizard(int state);
 

Firmware/ultralcd_implementation_hitachi_HD44780.h

@@ -462,6 +462,21 @@ void lcd_set_custom_characters_arrows()
     lcd.createChar(1, arrdown);
 }
 
+void lcd_set_custom_characters_progress()
+ {
+  byte progress[8] = {
+	B11111,
+	B11111,
+	B11111,
+	B11111,
+	B11111,
+	B11111,
+	B11111,
+	B11111,
+  };
+  lcd.createChar(1, progress);
+ }
+
 void lcd_set_custom_characters_nextpage()
  {