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

Reduce type warnings

Browse Source
This commit is contained in:
Scott Lahteine 2019-07-05 16:29:14 -05:00
parent 750a16ad38
commit 67e0238c89
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/lcd/dogm/ultralcd_DOGM.cpp
View File

@ -162,12 +162,12 @@ void MarlinUI::set_font(const MarlinFont font_nr) {
// Determine text space needed // Determine text space needed
#ifndef STRING_SPLASH_LINE2 #ifndef STRING_SPLASH_LINE2
constexpr uint8_t text_total_height = MENU_FONT_HEIGHT, constexpr uint8_t text_total_height = MENU_FONT_HEIGHT,
text_width_1 = (sizeof(STRING_SPLASH_LINE1) - 1) * (MENU_FONT_WIDTH), text_width_1 = uint8_t(sizeof(STRING_SPLASH_LINE1) - 1) * uint8_t(MENU_FONT_WIDTH),
text_width_2 = 0; text_width_2 = 0;
#else #else
constexpr uint8_t text_total_height = (MENU_FONT_HEIGHT) * 2, constexpr uint8_t text_total_height = uint8_t(MENU_FONT_HEIGHT) * 2,
text_width_1 = (sizeof(STRING_SPLASH_LINE1) - 1) * (MENU_FONT_WIDTH), text_width_1 = uint8_t(sizeof(STRING_SPLASH_LINE1) - 1) * uint8_t(MENU_FONT_WIDTH),
text_width_2 = (sizeof(STRING_SPLASH_LINE2) - 1) * (MENU_FONT_WIDTH); text_width_2 = uint8_t(sizeof(STRING_SPLASH_LINE2) - 1) * uint8_t(MENU_FONT_WIDTH);
#endif #endif
constexpr uint8_t text_max_width = _MAX(text_width_1, text_width_2), constexpr uint8_t text_max_width = _MAX(text_width_1, text_width_2),
rspace = width - (START_BMPWIDTH); rspace = width - (START_BMPWIDTH);