MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

🐛 Fix E3V2 width/height defines (#22994)

Browse Source
This commit is contained in:
ellensp 2021-10-22 17:57:30 +13:00 committed by Scott Lahteine
parent c9718e1ec0
commit e852732ea8
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/src/lcd/e3v2/common/dwin_api.h
View File

@ -23,10 +23,11 @@
#include "../../../inc/MarlinConfig.h" #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 #define DWIN_WIDTH 272
#endif
#ifndef DWIN_HEIGHT
#define DWIN_HEIGHT 480 #define DWIN_HEIGHT 480
#endif #endif

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

@ -29,9 +29,6 @@
* @brief 迪文屏控制操作函数 * @brief 迪文屏控制操作函数
********************************************************************************/ ********************************************************************************/
#define DWIN_WIDTH 272
#define DWIN_HEIGHT 480
#include "../common/dwin_api.h" #include "../common/dwin_api.h"
#include "../common/dwin_set.h" #include "../common/dwin_set.h"
#include "../common/dwin_font.h" #include "../common/dwin_font.h"

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

@ -28,11 +28,6 @@
#include "../../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
#if ENABLED(DWIN_MARLINUI_LANDSCAPE)
#define DWIN_WIDTH 480
#define DWIN_HEIGHT 272
#endif
#include "../common/dwin_api.h" #include "../common/dwin_api.h"
// Picture ID // Picture ID