Browse Source

🐛 Fix E3V2 width/height defines (#22994)

ellensp 2 years ago
parent
commit
f62890d889
No account linked to committer's email address

+ 4
- 3
Marlin/src/lcd/e3v2/common/dwin_api.h View File

23
 
23
 
24
 #include "../../../inc/MarlinConfig.h"
24
 #include "../../../inc/MarlinConfig.h"
25
 
25
 
26
-#ifndef DWIN_WIDTH
26
+#if ENABLED(DWIN_MARLINUI_LANDSCAPE)
27
+  #define DWIN_WIDTH  480
28
+  #define DWIN_HEIGHT 272
29
+#else
27
   #define DWIN_WIDTH  272
30
   #define DWIN_WIDTH  272
28
-#endif
29
-#ifndef DWIN_HEIGHT
30
   #define DWIN_HEIGHT 480
31
   #define DWIN_HEIGHT 480
31
 #endif
32
 #endif
32
 
33
 

+ 0
- 3
Marlin/src/lcd/e3v2/creality/dwin_lcd.h View File

29
  * @brief    迪文屏控制操作函数
29
  * @brief    迪文屏控制操作函数
30
  ********************************************************************************/
30
  ********************************************************************************/
31
 
31
 
32
-#define DWIN_WIDTH  272
33
-#define DWIN_HEIGHT 480
34
-
35
 #include "../common/dwin_api.h"
32
 #include "../common/dwin_api.h"
36
 #include "../common/dwin_set.h"
33
 #include "../common/dwin_set.h"
37
 #include "../common/dwin_font.h"
34
 #include "../common/dwin_font.h"

+ 0
- 5
Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h View File

28
 
28
 
29
 #include "../../../inc/MarlinConfigPre.h"
29
 #include "../../../inc/MarlinConfigPre.h"
30
 
30
 
31
-#if ENABLED(DWIN_MARLINUI_LANDSCAPE)
32
-  #define DWIN_WIDTH  480
33
-  #define DWIN_HEIGHT 272
34
-#endif
35
-
36
 #include "../common/dwin_api.h"
31
 #include "../common/dwin_api.h"
37
 
32
 
38
 // Picture ID
33
 // Picture ID

Loading…
Cancel
Save