sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🩹 Fix and clean up E3V2 draw (#24013)

Browse Source
This commit is contained in:
InsanityAutomation
2022-04-09 20:19:14 -04:00
committed by GitHub
parent 6567e0e0aa
commit 02f5e2de9c
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/e3v2/common/dwin_api.cpp
View File

@@ -235,7 +235,6 @@ void DWIN_Frame_AreaMove(uint8_t mode, uint8_t dir, uint16_t dis,
// rlimit: To limit the drawn string length // rlimit: To limit the drawn string length
void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit/*=0xFFFF*/) { void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor, uint16_t x, uint16_t y, const char * const string, uint16_t rlimit/*=0xFFFF*/) {
DWIN_Draw_Rectangle(1, bColor, x, y, x + (fontWidth(size) * strlen_P(string)), y + fontHeight(size)); DWIN_Draw_Rectangle(1, bColor, x, y, x + (fontWidth(size) * strlen_P(string)), y + fontHeight(size));
DWIN_UpdateLCD();
constexpr uint8_t widthAdjust = 0; constexpr uint8_t widthAdjust = 0;
size_t i = 0; size_t i = 0;
DWIN_Byte(i, 0x11); DWIN_Byte(i, 0x11);
@@ -250,7 +249,6 @@ void DWIN_Draw_String(bool bShow, uint8_t size, uint16_t color, uint16_t bColor,
DWIN_Word(i, y); DWIN_Word(i, y);
DWIN_Text(i, string, rlimit); DWIN_Text(i, string, rlimit);
DWIN_Send(i); DWIN_Send(i);
DWIN_UpdateLCD();
} }
// Draw a positive integer // Draw a positive integer
@@ -297,7 +295,6 @@ void DWIN_Draw_IntValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_t
#endif #endif
DWIN_Send(i); DWIN_Send(i);
DWIN_UpdateLCD();
} }
// Draw a floating point number // Draw a floating point number
@@ -332,7 +329,6 @@ void DWIN_Draw_FloatValue(uint8_t bShow, bool zeroFill, uint8_t zeroMode, uint8_
DWIN_Byte(i, fvalue[0]); DWIN_Byte(i, fvalue[0]);
*/ */
DWIN_Send(i); DWIN_Send(i);
DWIN_UpdateLCD();
} }
// Draw a floating point number // Draw a floating point number

1
Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
View File

@@ -181,7 +181,6 @@ void MarlinUI::draw_status_message(const bool blink) {
dwin_font.solid = true; dwin_font.solid = true;
dwin_font.fg = Color_White; dwin_font.fg = Color_White;
dwin_font.bg = Color_Bg_Black; dwin_font.bg = Color_Bg_Black;
DWIN_Draw_Box(1, Color_Bg_Black, 0, (LCD_PIXEL_HEIGHT - (STAT_FONT_HEIGHT) - 1), 272, STAT_FONT_HEIGHT + 1);
lcd_moveto_xy(0, LCD_PIXEL_HEIGHT - (STAT_FONT_HEIGHT) - 1); lcd_moveto_xy(0, LCD_PIXEL_HEIGHT - (STAT_FONT_HEIGHT) - 1);
constexpr uint8_t max_status_chars = (LCD_PIXEL_WIDTH) / (STAT_FONT_WIDTH); constexpr uint8_t max_status_chars = (LCD_PIXEL_WIDTH) / (STAT_FONT_WIDTH);