Fix utf-8 (Cyrillic) on DOGLCD

See MarlinFirmware#27097
thinkyhead · May 18, 2024 · 429af69 · 429af69
1 parent 2fd7c2b
commit 429af69
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Marlin/src/lcd/lcdprint.cpp b/Marlin/src/lcd/lcdprint.cpp
@@ -50,7 +50,6 @@ lcd_uint_t expand_u8str_P(char * const outstr, PGM_P const ptpl, const int8_t in
   int8_t n = maxlen;
   while (n > 0) {
     lchar_t wc;
-    uint8_t *psc = (uint8_t *)p;
     p = get_utf8_value_cb(p, read_byte_rom, wc);
     if (!wc) break;
     if (wc == '{' || wc == '~' || wc == '*') {
@@ -90,9 +89,15 @@ lcd_uint_t expand_u8str_P(char * const outstr, PGM_P const ptpl, const int8_t in
     }
     else {
       if (wc == '@')
-        *o++ = AXIS_CHAR(ind);
+        *o = AXIS_CHAR(ind);
+      else if (wc > 255 && prop == 2) {
+        // Wide glyph support incomplete
+        *((uint16_t*)o) = wc;
+        ++o;
+      }
       else
-        while (psc != p) *o++ = read_byte_rom(psc++);
+        *o = wc;
+      ++o;
       *o = '\0';
       n--;
     }