Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 5014bee

Browse files
marciotmh-dm
authored andcommittedMay 15, 2022
🐛 Fix FTDI Eve unicode and spinner dialog (MarlinFirmware#22468)
1 parent c8e7164 commit 5014bee

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed
 

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@
6868

6969
utf8_char_t FTDI::get_utf8_char_and_inc(const char *&c) {
7070
utf8_char_t val = *(uint8_t*)c++;
71-
if ((val & 0xC0) == 0x80)
71+
if ((val & 0xC0) == 0xC0)
7272
while ((*c & 0xC0) == 0x80)
7373
val = (val << 8) | *(uint8_t*)c++;
7474
return val;
7575
}
7676

7777
utf8_char_t FTDI::get_utf8_char_and_inc(char *&c) {
7878
utf8_char_t val = *(uint8_t*)c++;
79-
if ((val & 0xC0) == 0x80)
79+
if ((val & 0xC0) == 0xC0)
8080
while ((*c & 0xC0) == 0x80)
8181
val = (val << 8) | *(uint8_t*)c++;
8282
return val;

‎Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/spinner_dialog_box.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ void SpinnerDialogBox::show(progmem_str message) {
4949
void SpinnerDialogBox::hide() {
5050
CommandProcessor cmd;
5151
cmd.stop().execute();
52+
GOTO_PREVIOUS();
5253
}
5354

5455
void SpinnerDialogBox::enqueueAndWait(progmem_str message, progmem_str commands) {
@@ -66,7 +67,6 @@ void SpinnerDialogBox::onIdle() {
6667
if (mydata.auto_hide && !commandsInQueue()) {
6768
mydata.auto_hide = false;
6869
hide();
69-
GOTO_PREVIOUS();
7070
}
7171
}
7272

0 commit comments

Comments
 (0)
Please sign in to comment.