🐛 Fix E3V2 width/height defines (MarlinFirmware#22994)

CR30-Users · Oct 22, 2021 · e852732 · e852732
1 parent c9718e1
commit e852732
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.h b/Marlin/src/lcd/e3v2/common/dwin_api.h
@@ -23,10 +23,11 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#ifndef DWIN_WIDTH
+#if ENABLED(DWIN_MARLINUI_LANDSCAPE)
+  #define DWIN_WIDTH  480
+  #define DWIN_HEIGHT 272
+#else
   #define DWIN_WIDTH  272
-#endif
-#ifndef DWIN_HEIGHT
   #define DWIN_HEIGHT 480
 #endif
 

diff --git a/Marlin/src/lcd/e3v2/creality/dwin_lcd.h b/Marlin/src/lcd/e3v2/creality/dwin_lcd.h
@@ -29,9 +29,6 @@
  * @brief    迪文屏控制操作函数
  ********************************************************************************/
 
-#define DWIN_WIDTH  272
-#define DWIN_HEIGHT 480
-
 #include "../common/dwin_api.h"
 #include "../common/dwin_set.h"
 #include "../common/dwin_font.h"

diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
@@ -28,11 +28,6 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if ENABLED(DWIN_MARLINUI_LANDSCAPE)
-  #define DWIN_WIDTH  480
-  #define DWIN_HEIGHT 272
-#endif
-
 #include "../common/dwin_api.h"
 
 // Picture ID