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

Make getfilename_sorted standard for listings

Browse Source
This commit is contained in:
Scott Lahteine 2018-10-29 13:54:04 -05:00
parent 5ead026967
commit f9b80e7217
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/extensible_ui/ui_api.cpp
View File

@ -570,11 +570,7 @@ namespace UI {
#endif #endif
pos; pos;
#if ENABLED(SDCARD_SORT_ALPHA)
card.getfilename_sorted(nr); card.getfilename_sorted(nr);
#else
card.getfilename(nr);
#endif
return card.filename && card.filename[0] != '\0'; return card.filename && card.filename[0] != '\0';
#endif #endif
} }

4
Marlin/src/lcd/menu/menu_sdcard.cpp
View File

@ -116,11 +116,7 @@ void menu_sdcard() {
#endif #endif
i; i;
#if ENABLED(SDCARD_SORT_ALPHA)
card.getfilename_sorted(nr); card.getfilename_sorted(nr);
#else
card.getfilename(nr);
#endif
if (card.filenameIsDir) if (card.filenameIsDir)
MENU_ITEM(sddirectory, MSG_CARD_MENU, card); MENU_ITEM(sddirectory, MSG_CARD_MENU, card);

2
Marlin/src/sd/cardreader.h
View File

@ -103,6 +103,8 @@ public:
FORCE_INLINE void setSortFolders(int i) { sort_folders = i; presort(); } FORCE_INLINE void setSortFolders(int i) { sort_folders = i; presort(); }
//FORCE_INLINE void setSortReverse(bool b) { sort_reverse = b; } //FORCE_INLINE void setSortReverse(bool b) { sort_reverse = b; }
#endif #endif
#else
FORCE_INLINE void getfilename_sorted(const uint16_t nr) { getfilename(nr); }
#endif #endif
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)