bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 Updated string macros

Browse Source
This commit is contained in:
Scott Lahteine
2021-09-25 02:27:07 -05:00
parent dc4d2165f2
commit 262cd757fc
51 changed files with 237 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/lcd/e3v2/creality/dwin.cpp
View File

@ -363,7 +363,7 @@ void Draw_Title(const char * const title) {
DWIN_Draw_String(false, DWIN_FONT_HEAD, Color_White, Color_Bg_Blue, 14, 4, (char*)title);
}
void Draw_Title(const __FlashStringHelper * title) {
void Draw_Title(FSTR_P title) {
DWIN_Draw_String(false, DWIN_FONT_HEAD, Color_White, Color_Bg_Blue, 14, 4, (char*)title);
}
@ -439,7 +439,7 @@ void Draw_Menu_Line(const uint8_t line, const uint8_t icon=0, const char * const
DWIN_Draw_Line(Line_Color, 16, MBASE(line) + 33, 256, MBASE(line) + 34);
}
void Draw_Menu_LineF(const uint8_t line, const uint8_t icon=0, const __FlashStringHelper *label=nullptr, bool more=false) {
void Draw_Menu_LineF(const uint8_t line, const uint8_t icon=0, FSTR_P label=nullptr, bool more=false) {
Draw_Menu_Line(line, icon, (char*)label, more);
}
@ -589,7 +589,7 @@ void say_steps_per_mm_en(const uint8_t row) {
void DWIN_Draw_Label(const uint8_t row, char *string) {
DWIN_Draw_String(true, font8x16, Color_White, Color_Bg_Black, LBLX, MBASE(row), string);
}
void DWIN_Draw_Label(const uint8_t row, const __FlashStringHelper *title) {
void DWIN_Draw_Label(const uint8_t row, FSTR_P title) {
DWIN_Draw_Label(row, (char*)title);
}