3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 13:56:24 +00:00
Code Issues Releases Wiki Activity

🐛 Fix FTDI Eve unicode and spinner dialog (#22468)

Browse Source
This commit is contained in:
Marcio T 2021-07-30 17:57:50 -06:00 committed by GitHub
parent 5ecef6e584
commit 39e5c86544
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
View File

@ -68,7 +68,7 @@
utf8_char_t FTDI::get_utf8_char_and_inc(const char *&c) { utf8_char_t FTDI::get_utf8_char_and_inc(const char *&c) {
utf8_char_t val = *(uint8_t*)c++; utf8_char_t val = *(uint8_t*)c++;
if ((val & 0xC0) == 0x80) if ((val & 0xC0) == 0xC0)
while ((*c & 0xC0) == 0x80) while ((*c & 0xC0) == 0x80)
val = (val << 8) | *(uint8_t*)c++; val = (val << 8) | *(uint8_t*)c++;
return val; return val;
@ -76,7 +76,7 @@
utf8_char_t FTDI::get_utf8_char_and_inc(char *&c) { utf8_char_t FTDI::get_utf8_char_and_inc(char *&c) {
utf8_char_t val = *(uint8_t*)c++; utf8_char_t val = *(uint8_t*)c++;
if ((val & 0xC0) == 0x80) if ((val & 0xC0) == 0xC0)
while ((*c & 0xC0) == 0x80) while ((*c & 0xC0) == 0x80)
val = (val << 8) | *(uint8_t*)c++; val = (val << 8) | *(uint8_t*)c++;
return val; return val;

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp
View File

@ -49,6 +49,7 @@ void SpinnerDialogBox::show(progmem_str message) {
void SpinnerDialogBox::hide() { void SpinnerDialogBox::hide() {
CommandProcessor cmd; CommandProcessor cmd;
cmd.stop().execute(); cmd.stop().execute();
GOTO_PREVIOUS();
} }
void SpinnerDialogBox::enqueueAndWait(progmem_str message, progmem_str commands) { void SpinnerDialogBox::enqueueAndWait(progmem_str message, progmem_str commands) {
@ -66,7 +67,6 @@ void SpinnerDialogBox::onIdle() {
if (mydata.auto_hide && !commandsInQueue()) { if (mydata.auto_hide && !commandsInQueue()) {
mydata.auto_hide = false; mydata.auto_hide = false;
hide(); hide();
GOTO_PREVIOUS();
} }
} }