Fix to pass Github checks

Add conditional directive for touch.h
MarlinFirmware · Apr 7, 2023 · 9b92dfa · 9b92dfa
1 parent 336374f
commit 9b92dfa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/Marlin/src/lcd/tft/tft.h b/Marlin/src/lcd/tft/tft.h
@@ -27,7 +27,10 @@
 #include "tft_string.h"
 #include "tft_image.h"
 #include "../tft_io/tft_io.h"
-#include "touch.h"
+
+#if ENABLED(TOUCH_SCREEN)
+  #include "touch.h"
+#endif
 
 #include "../../inc/MarlinConfig.h"
 
@@ -87,7 +90,9 @@ class TFT {
     static void add_bar(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color) { queue.add_bar(x, y, width, height, color); }
     static void add_rectangle(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint16_t color) { queue.add_rectangle(x, y, width, height, color); }
     static void draw_edit_screen_buttons(bool mode_keypad = false);
-    static void drawSimpleBtn(const char *label, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t color, uint16_t colorTxt, BTN_STYLE style, bool selected, TouchControlType touchType = BUTTON, intptr_t data = 0, int32_t index = 0);
+    #if ENABLED(TOUCH_SCREEN)
+      static void drawSimpleBtn(const char *label, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t color, uint16_t colorTxt, BTN_STYLE style, bool selected, TouchControlType touchType = BUTTON, intptr_t data = 0, int32_t index = 0);
+    #endif  
 };
 
 extern TFT tft;
diff --git a/Marlin/src/lcd/tft/touch.h b/Marlin/src/lcd/tft/touch.h
@@ -67,7 +67,7 @@ enum TouchControlType : uint16_t {
   MOVE_AXIS,
   STOP,
   BUTTON,
-  CALLBACK,
+  CALLBACK
 };
 
 typedef void (*screenFunc_t)();

diff --git a/Marlin/src/lcd/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -424,7 +424,7 @@ void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const va
   tft.draw_edit_screen_buttons();
 }
 
-void TFT::draw_edit_screen_buttons() {
+void TFT::draw_edit_screen_buttons(bool mode_keypad) {
   #if ENABLED(TOUCH_SCREEN)
     add_control(164, TFT_HEIGHT - 64, DECREASE, imgDecrease);
     add_control(796, TFT_HEIGHT - 64, INCREASE, imgIncrease);

diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -418,7 +418,7 @@ void MenuEditItemBase::draw_edit_screen(FSTR_P const fstr, const char * const va
   tft.draw_edit_screen_buttons();
 }
 
-void TFT::draw_edit_screen_buttons() {
+void TFT::draw_edit_screen_buttons(bool mode_keyboard) {
   #if ENABLED(TOUCH_SCREEN)
     add_control(64, TFT_HEIGHT - 64, DECREASE, imgDecrease);
     add_control(352, TFT_HEIGHT - 64, INCREASE, imgIncrease);