Skip to content

Commit c34c918

Browse files
marciotvgadreau
authored andcommitted
Fix ExtUI SD sorting, compile issues
1 parent f58c40c commit c34c918

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

Marlin/src/HAL/STM32F1/MarlinSerial.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
*
2121
*/
2222

23+
#ifdef __STM32F1__
24+
2325
#include "../../inc/MarlinConfigPre.h"
2426
#include "MarlinSerial.h"
2527
#include <libmaple/usart.h>
@@ -91,3 +93,5 @@ static inline __always_inline void my_usart_irq(ring_buffer *rb, ring_buffer *wb
9193
#if SERIAL_PORT == 5 || SERIAL_PORT_2 == 5 || DGUS_SERIAL_PORT == 5
9294
DEFINE_HWSERIAL_UART_MARLIN(MSerial5, 5);
9395
#endif
96+
97+
#endif // __STM32F1__

Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ namespace ExtUI {
6161
if (AT_SCREEN(StatusScreen) || isPrintingFromMedia())
6262
StatusScreen::setStatusMessage(GET_TEXT_F(MSG_MEDIA_REMOVED));
6363

64-
if (AT_SCREEN(FilesScreen)) GOTO_SCREEN(StatusScreen)
64+
if (AT_SCREEN(FilesScreen)) GOTO_SCREEN(StatusScreen);
6565
}
6666

6767
void onMediaError() {

Marlin/src/lcd/extui/ui_api.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ namespace ExtUI {
10031003
bool FileList::seek(const uint16_t pos, const bool skip_range_check) {
10041004
#if ENABLED(SDSUPPORT)
10051005
if (!skip_range_check && (pos + 1) > count()) return false;
1006-
card.getfilename_sorted(pos);
1006+
card.getfilename_sorted(SD_ORDER(pos, count()));
10071007
return card.filename[0] != '\0';
10081008
#else
10091009
UNUSED(pos);

0 commit comments

Comments
 (0)