소스 검색

Fix undefined/unused, Touch UI (#17874)

Marcio T 4 년 전
부모
커밋
2a959cde6f
No account linked to committer's email address

+ 1
- 0
Marlin/src/lcd/dogm/ultralcd_DOGM.cpp 파일 보기

@@ -123,6 +123,7 @@ bool MarlinUI::detected() { return true; }
123 123
           custom_start_bmp
124 124
         #endif
125 125
       ;
126
+      TERN(CUSTOM_BOOTSCREEN_ANIMATED,,UNUSED(frame));
126 127
 
127 128
       u8g.drawBitmapP(left, top, CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH, CUSTOM_BOOTSCREEN_BMPHEIGHT, bmp);
128 129
 

+ 4
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/spi.cpp 파일 보기

@@ -32,7 +32,10 @@ namespace FTDI {
32 32
     #ifdef CLCD_SPI_BUS
33 33
       SPIClass EVE_SPI(CLCD_SPI_BUS);
34 34
     #endif
35
-    SPISettings SPI::spi_settings(SPI_FREQUENCY, MSBFIRST, SPI_MODE0);
35
+    #ifndef CLCD_HW_SPI_SPEED
36
+      #define CLCD_HW_SPI_SPEED 8000000 >> SPI_SPEED
37
+    #endif
38
+    SPISettings SPI::spi_settings(CLCD_HW_SPI_SPEED, MSBFIRST, SPI_MODE0);
36 39
   #endif
37 40
 
38 41
   void SPI::spi_init() {

+ 3
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_screen.cpp 파일 보기

@@ -78,7 +78,9 @@ void BaseScreen::onIdle() {
78 78
 }
79 79
 
80 80
 void BaseScreen::reset_menu_timeout() {
81
-  TERN_(LCD_TIMEOUT_TO_STATUS, last_interaction = millis());
81
+  #if LCD_TIMEOUT_TO_STATUS
82
+    last_interaction = millis();
83
+  #endif
82 84
 }
83 85
 
84 86
 #if LCD_TIMEOUT_TO_STATUS

+ 1
- 1
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/endstop_state_screen.cpp 파일 보기

@@ -96,7 +96,7 @@ void EndstopStatesScreen::onRedraw(draw_mode_t) {
96 96
   #else
97 97
     PIN_DISABLED(1, 4, GET_TEXT_F(MSG_RUNOUT_1), FIL_RUNOUT)
98 98
   #endif
99
-  #if ENABLED(FILAMENT_RUNOUT_SENSOR) && PIN_EXISTS(FIL_RUNOUT2)
99
+  #if ENABLED(FILAMENT_RUNOUT_SENSOR) && PIN_EXISTS(FIL_RUNOUT2) && EXTRUDERS > 1
100 100
     PIN_ENABLED (3, 4, GET_TEXT_F(MSG_RUNOUT_2), FIL_RUNOUT2, FIL_RUNOUT_INVERTING)
101 101
   #else
102 102
     PIN_DISABLED(3, 4, GET_TEXT_F(MSG_RUNOUT_2), FIL_RUNOUT2)

+ 1
- 4
Marlin/src/lcd/extui/ui_api.cpp 파일 보기

@@ -54,6 +54,7 @@
54 54
 #include "../../module/printcounter.h"
55 55
 #include "../../libs/duration_t.h"
56 56
 #include "../../HAL/shared/Delay.h"
57
+#include "../../sd/cardreader.h"
57 58
 
58 59
 #if ENABLED(PRINTCOUNTER)
59 60
   #include "../../core/utility.h"
@@ -68,10 +69,6 @@
68 69
   #include "../../feature/e_parser.h"
69 70
 #endif
70 71
 
71
-#if ENABLED(SDSUPPORT)
72
-  #include "../../sd/cardreader.h"
73
-#endif
74
-
75 72
 #if HAS_TRINAMIC_CONFIG
76 73
   #include "../../feature/tmc_util.h"
77 74
   #include "../../module/stepper/indirection.h"

+ 2
- 0
Marlin/src/module/motion.cpp 파일 보기

@@ -1514,6 +1514,8 @@ void backout_to_tmc_homing_phase(const AxisEnum axis) {
1514 1514
       // retrace by the amount computed in mmDelta.
1515 1515
       do_homing_move(axis, mmDelta, get_homing_bump_feedrate(axis));
1516 1516
     }
1517
+  #else
1518
+    UNUSED(axis);
1517 1519
   #endif
1518 1520
 }
1519 1521
 

+ 2
- 1
Marlin/src/sd/cardreader.h 파일 보기

@@ -23,6 +23,8 @@
23 23
 
24 24
 #include "../inc/MarlinConfig.h"
25 25
 
26
+#define IFSD(A,B) TERN(SDSUPPORT,A,B)
27
+
26 28
 #if ENABLED(SDSUPPORT)
27 29
 
28 30
 #if BOTH(SDCARD_SORT_ALPHA, SDSORT_DYNAMIC_RAM)
@@ -30,7 +32,6 @@
30 32
 #endif
31 33
 
32 34
 #define SD_ORDER(N,C) (TERN(SDCARD_RATHERRECENTFIRST, C - 1 - (N), N))
33
-#define IFSD(A,B) TERN(SDSUPPORT,A,B)
34 35
 
35 36
 #define MAX_DIR_DEPTH     10       // Maximum folder depth
36 37
 #define MAXDIRNAMELENGTH   8       // DOS folder name size

Loading…
취소
저장