From bb73c335a52f629ee75697e87efd5a4a70fc57a1 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 26 Aug 2024 12:24:09 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20Ender-3=20S1=20Plus=20buil?= =?UTF-8?q?d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/inc/Conditionals_LCD.h | 2 +- Marlin/src/lcd/extui/dgus_e3s1pro/DGUSSDCardHandler.h | 2 +- Marlin/src/lcd/extui/dgus_e3s1pro/config/DGUS_Data.h | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h index 78164ade7b..633efc1e2f 100644 --- a/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin/src/inc/Conditionals_LCD.h @@ -1206,7 +1206,7 @@ #if !HAS_MARLINUI_HD44780 #undef LCD_INFO_SCREEN_STYLE #endif -#if NONE(HAS_MARLINUI_U8GLIB, HAS_TFT_LVGL_UI) +#if NONE(HAS_MARLINUI_U8GLIB, HAS_TFT_LVGL_UI, DGUS_LCD_UI_E3S1PRO) #undef LCD_LANGUAGE #endif diff --git a/Marlin/src/lcd/extui/dgus_e3s1pro/DGUSSDCardHandler.h b/Marlin/src/lcd/extui/dgus_e3s1pro/DGUSSDCardHandler.h index 8844184271..22fb489496 100644 --- a/Marlin/src/lcd/extui/dgus_e3s1pro/DGUSSDCardHandler.h +++ b/Marlin/src/lcd/extui/dgus_e3s1pro/DGUSSDCardHandler.h @@ -22,7 +22,7 @@ #pragma once #include -#include "../../../sd/cardreader.h" +#include "../../../sd/SdFatConfig.h" #define DGUS_E3S1PRO_BASIC_SDCARD_MAX_FILES 20 #define DGUS_E3S1PRO_BASIC_SDCARD_FILES_PER_PAGE 5 diff --git a/Marlin/src/lcd/extui/dgus_e3s1pro/config/DGUS_Data.h b/Marlin/src/lcd/extui/dgus_e3s1pro/config/DGUS_Data.h index 237cec7795..05f9a1db43 100644 --- a/Marlin/src/lcd/extui/dgus_e3s1pro/config/DGUS_Data.h +++ b/Marlin/src/lcd/extui/dgus_e3s1pro/config/DGUS_Data.h @@ -23,6 +23,13 @@ #include +#include "../../../../inc/MarlinConfigPre.h" + +#ifndef LCD_LANGUAGE + #define LCD_LANGUAGE en + #warning "LCD_LANGUAGE not defined, defaulting to English." +#endif + namespace DGUS_Data { // RX constants