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

Fix ExtUI SD sorting, compile issues

Browse Source
This commit is contained in:
Marcio Teixeira
2020-09-08 14:31:20 -06:00
committed by Scott Lahteine
parent 2af9e2f759
commit ba6659f6be
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp
View File

@ -61,7 +61,7 @@ namespace ExtUI {
if (AT_SCREEN(StatusScreen) || isPrintingFromMedia())
StatusScreen::setStatusMessage(GET_TEXT_F(MSG_MEDIA_REMOVED));
if (AT_SCREEN(FilesScreen)) GOTO_SCREEN(StatusScreen)
if (AT_SCREEN(FilesScreen)) GOTO_SCREEN(StatusScreen);
}
void onMediaError() {

2
Marlin/src/lcd/extui/ui_api.cpp
View File

@ -1003,7 +1003,7 @@ namespace ExtUI {
bool FileList::seek(const uint16_t pos, const bool skip_range_check) {
#if ENABLED(SDSUPPORT)
if (!skip_range_check && (pos + 1) > count()) return false;
card.getfilename_sorted(pos);
card.getfilename_sorted(SD_ORDER(pos, count()));
return card.filename[0] != '\0';
#else
UNUSED(pos);