Bladeren bron

Fix ExtUI SD sorting, compile issues

Marcio Teixeira 4 jaren geleden
bovenliggende
commit
328d8b5952

+ 4
- 0
Marlin/src/HAL/STM32F1/MarlinSerial.cpp Bestand weergeven

@@ -20,6 +20,8 @@
20 20
  *
21 21
  */
22 22
 
23
+#ifdef __STM32F1__
24
+
23 25
 #include "../../inc/MarlinConfigPre.h"
24 26
 #include "MarlinSerial.h"
25 27
 #include <libmaple/usart.h>
@@ -91,3 +93,5 @@ static inline __always_inline void my_usart_irq(ring_buffer *rb, ring_buffer *wb
91 93
 #if SERIAL_PORT == 5 || SERIAL_PORT_2 == 5 || DGUS_SERIAL_PORT == 5
92 94
   DEFINE_HWSERIAL_UART_MARLIN(MSerial5, 5);
93 95
 #endif
96
+
97
+#endif // __STM32F1__

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/marlin_events.cpp Bestand weergeven

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

+ 1
- 1
Marlin/src/lcd/extui/ui_api.cpp Bestand weergeven

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

Laden…
Annuleren
Opslaan