From f9b80e7217d70c3d36edaf2601bc380ba02fce23 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 29 Oct 2018 13:54:04 -0500 Subject: [PATCH] Make getfilename_sorted standard for listings --- Marlin/src/lcd/extensible_ui/ui_api.cpp | 6 +----- Marlin/src/lcd/menu/menu_sdcard.cpp | 6 +----- Marlin/src/sd/cardreader.h | 2 ++ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Marlin/src/lcd/extensible_ui/ui_api.cpp b/Marlin/src/lcd/extensible_ui/ui_api.cpp index b11e5f8ef2..f9963076a3 100644 --- a/Marlin/src/lcd/extensible_ui/ui_api.cpp +++ b/Marlin/src/lcd/extensible_ui/ui_api.cpp @@ -570,11 +570,7 @@ namespace UI { #endif pos; - #if ENABLED(SDCARD_SORT_ALPHA) - card.getfilename_sorted(nr); - #else - card.getfilename(nr); - #endif + card.getfilename_sorted(nr); return card.filename && card.filename[0] != '\0'; #endif } diff --git a/Marlin/src/lcd/menu/menu_sdcard.cpp b/Marlin/src/lcd/menu/menu_sdcard.cpp index 7b7eba8143..1384ce515a 100644 --- a/Marlin/src/lcd/menu/menu_sdcard.cpp +++ b/Marlin/src/lcd/menu/menu_sdcard.cpp @@ -116,11 +116,7 @@ void menu_sdcard() { #endif i; - #if ENABLED(SDCARD_SORT_ALPHA) - card.getfilename_sorted(nr); - #else - card.getfilename(nr); - #endif + card.getfilename_sorted(nr); if (card.filenameIsDir) MENU_ITEM(sddirectory, MSG_CARD_MENU, card); diff --git a/Marlin/src/sd/cardreader.h b/Marlin/src/sd/cardreader.h index a92196f986..b3c754cc9a 100644 --- a/Marlin/src/sd/cardreader.h +++ b/Marlin/src/sd/cardreader.h @@ -103,6 +103,8 @@ public: FORCE_INLINE void setSortFolders(int i) { sort_folders = i; presort(); } //FORCE_INLINE void setSortReverse(bool b) { sort_reverse = b; } #endif + #else + FORCE_INLINE void getfilename_sorted(const uint16_t nr) { getfilename(nr); } #endif #if ENABLED(POWER_LOSS_RECOVERY)