From 048de70ee6d6a480d353eb3406b4cae1a3899af5 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Sun, 3 Jan 2021 12:27:05 -0500 Subject: [PATCH] Fix mesh screen include --- Marlin/src/inc/Conditionals_LCD.h | 5 ----- Marlin/src/inc/Conditionals_post.h | 5 +++++ .../extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_screen.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h index 388adb1809..79b65e7a9b 100644 --- a/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin/src/inc/Conditionals_LCD.h @@ -1045,11 +1045,6 @@ #define INVERT_E_DIR false #endif -// Fallback SPI Speed for SD -#if ENABLED(SDSUPPORT) && !defined(SD_SPI_SPEED) - #define SD_SPI_SPEED SPI_FULL_SPEED -#endif - /** * This setting is also used by M109 when trying to calculate * a ballpark safe margin to prevent wait-forever situation. diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 388caa9eb1..d14d9cd1ab 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -2713,6 +2713,11 @@ #define HAS_FOLDER_SORTING 1 #endif +// Fallback SPI Speed for SD +#if ENABLED(SDSUPPORT) && !defined(SD_SPI_SPEED) + #define SD_SPI_SPEED SPI_FULL_SPEED +#endif + #if HAS_WIRED_LCD // Get LCD character width/height, which may be overridden by pins, configs, etc. #ifndef LCD_WIDTH diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_screen.cpp index 2ed602a809..4ce477148f 100644 --- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_screen.cpp +++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_screen.cpp @@ -21,7 +21,7 @@ #include "../config.h" -#if BOTH(TOUCH_UI_FTDI_EVE, AUTO_BED_LEVELING_UBL) +#if BOTH(TOUCH_UI_FTDI_EVE, HAS_MESH) #include "screens.h" #include "screen_data.h"