piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix greater or equal char for B&W radios

Browse Source 
add support for three byte UTF-8 sequences to utf-8 converter
This commit is contained in:
gagarinlg
2022-06-11 15:38:08 +02:00
committed by Raphael Coeffic
parent 7e5d8ee7ac
commit 32c1789c73
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/common/stdlcd/utf8.cpp
+18 -5
View File
@@ -73,16 +73,29 @@ static unsigned char lookup_utf8_mapping(wchar_t w)
unsigned char map_utf8_char(const char*& s, uint8_t& len)
{
unsigned char c = *s;
if ((c & 0xC0) == 0xC0) {
wchar_t w = (c & 0x1F) << 6;
uint8_t c = *s;
if (((c & 0xE0) == 0xC0) || ((c & 0xF0) == 0xE0)) {
if (!len) return 0;
len--; s++; c = *s;
w |= c & 0x3F;
wchar_t w = 0;
if((c & 0xE0) == 0xC0) // two byte sequence
{
w = (c & 0x1F) << 6;
len--; s++; c = *s;
w |= c & 0x3F;
} else if ((c & 0xF0) == 0xE0) { // three byte sequence
w = (c & 0x0F) << 12;
len--; s++; c = *s;
if (!len) return 0;
w |= (c & 0x3F) << 6;
len--; s++; c = *s;
w |= c & 0x3F;
}
// TODO: use constants
if (w >= 0x80 && w <= 0x94) { // extra chars
return (unsigned char)w;
}
if(w == L'≥')
return '}';
#if !defined(NO_UTF8_LUT)
return lookup_utf8_mapping(w);
#else