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

Update do_select_screen for general use (#13800)

Browse Source
This commit is contained in:
Scott Lahteine
2019-04-24 10:13:44 -05:00
committed by GitHub
parent 63f6ad3fd2
commit 5051909c3c
16 changed files with 144 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Marlin/src/lcd/ultralcd.cpp
View File

@ -192,24 +192,39 @@ millis_t next_button_update_ms;
#endif
void wrap_string(uint8_t y, const char * const string) {
uint8_t x = LCD_WIDTH;
void _wrap_string(uint8_t &x, uint8_t &y, const char * const string, read_byte_cb_t cb_read_byte) {
SETCURSOR(x, y);
if (string) {
uint8_t *p = (uint8_t*)string;
for (;;) {
if (x >= LCD_WIDTH) {
x = 0;
SETCURSOR(0, y++);
}
wchar_t ch;
p = get_utf8_value_cb(p, read_byte_ram, &ch);
p = get_utf8_value_cb(p, cb_read_byte, &ch);
if (!ch) break;
lcd_put_wchar(ch);
x++;
if (x >= LCD_WIDTH) {
x = 0; y++;
SETCURSOR(0, y);
}
}
}
}
void MarlinUI::draw_select_screen_prompt(PGM_P const pref, const char * const string/*=NULL*/, PGM_P const suff/*=NULL*/) {
const uint8_t plen = utf8_strlen_P(pref), slen = suff ? utf8_strlen_P(suff) : 0;
uint8_t x = 0, y = 0;
if (!string && plen + slen <= LCD_WIDTH) {
x = (LCD_WIDTH - plen - slen) / 2;
y = LCD_HEIGHT > 3 ? 1 : 0;
}
wrap_string_P(x, y, pref);
if (string) {
if (x) { x = 0; y++; } // Move to the start of the next line
wrap_string(x, y, string);
}
if (suff) wrap_string_P(x, y, suff);
}
#endif // HAS_LCD_MENU
void MarlinUI::init() {