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

Fix UTF8 handling for Color UI (#19708)

Browse Source
This commit is contained in:
Victor Oliveira 2020-10-12 20:01:03 -03:00 committed by Scott Lahteine
parent 35c40bc376
commit 50410aaeaa
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Marlin/src/lcd/tft/tft_string.cpp
View File

@ -116,6 +116,17 @@ void TFT_String::add(uint8_t *string, int8_t index, uint8_t *itemString) {
eol(); eol();
} }
void TFT_String::add(uint8_t *string) {
wchar_t wchar;
while (*string) {
string = get_utf8_value_cb(string, read_byte, &wchar);
if (wchar > 255) wchar |= 0x0080;
uint8_t ch = uint8_t(wchar & 0x00FF);
add_character(ch);
}
eol();
}
void TFT_String::add_character(uint8_t character) { void TFT_String::add_character(uint8_t character) {
if (length < MAX_STRING_LENGTH) { if (length < MAX_STRING_LENGTH) {
data[length] = character; data[length] = character;

2
Marlin/src/lcd/tft/tft_string.h
View File

@ -85,7 +85,7 @@ class TFT_String {
static void set(); static void set();
static void add(uint8_t character) { add_character(character); eol(); } static void add(uint8_t character) { add_character(character); eol(); }
static void add(uint8_t *string) { while (*string) { add_character(*string++); } eol(); } static void add(uint8_t *string);
static void add(uint8_t *string, int8_t index, uint8_t *itemString = NULL); static void add(uint8_t *string, int8_t index, uint8_t *itemString = NULL);
static void set(uint8_t *string) { set(); add(string); }; static void set(uint8_t *string) { set(); add(string); };
static void set(uint8_t *string, int8_t index, const char *itemString = NULL) { set(); add(string, index, (uint8_t *)itemString); }; static void set(uint8_t *string, int8_t index, const char *itemString = NULL) { set(); add(string, index, (uint8_t *)itemString); };