3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-29 23:07:42 +00:00
Code Issues Releases Wiki Activity

🩹 Followup for lchar_t

Browse Source
This commit is contained in:
Scott Lahteine 2022-07-02 18:29:52 -05:00
parent d956a6ba00
commit 2b6ce3006e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/fontutils.cpp
View File

@ -99,7 +99,7 @@ static inline bool utf8_is_start_byte_of_char(const uint8_t b) {
/* This function gets the character at the pstart position, interpreting UTF8 multibyte sequences /* This function gets the character at the pstart position, interpreting UTF8 multibyte sequences
and returns the pointer to the next character */ and returns the pointer to the next character */
const uint8_t* get_utf8_value_cb(const uint8_t *pstart, read_byte_cb_t cb_read_byte, lchar_t *pval) { const uint8_t* get_utf8_value_cb(const uint8_t *pstart, read_byte_cb_t cb_read_byte, lchar_t &pval) {
uint32_t val = 0; uint32_t val = 0;
const uint8_t *p = pstart; const uint8_t *p = pstart;
@ -158,7 +158,7 @@ const uint8_t* get_utf8_value_cb(const uint8_t *pstart, read_byte_cb_t cb_read_b
else else
for (; 0xFC < (0xFE & valcur); ) { p++; valcur = cb_read_byte(p); } for (; 0xFC < (0xFE & valcur); ) { p++; valcur = cb_read_byte(p); }
if (pval) *pval = val; pval = val;
return p; return p;
} }

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

@ -25,6 +25,8 @@
#include <stdint.h> #include <stdint.h>
#include "../fontutils.h"
extern const uint8_t ISO10646_1_5x7[]; extern const uint8_t ISO10646_1_5x7[];
extern const uint8_t font10x20[]; extern const uint8_t font10x20[];