feat: enable Companion simulator to switch UI language at runtime (#6510)

This commit is contained in:
philmoz
2025-11-03 09:57:09 +10:00
committed by GitHub
parent 8f96ec079b
commit 1931514140
318 changed files with 269720 additions and 389341 deletions
+1 -1
View File
@@ -38,7 +38,7 @@ void menuCommonCalibOptions(event_t event)
uint8_t k = i + menuVerticalOffset;
LcdFlags attr = (sub == k) ? INVERS : 0;
lcdDrawTextIndented(y, STR_CHAR_STICK);
lcdDrawTextIndented(y, CHAR_STICK);
lcdDrawText(lcdNextPos, y, analogGetCanonicalName(ADC_INPUT_MAIN, i), 0);
bool stickInversion = getStickInversion(i);
lcdDrawChar(LCD_W / 3 * 2, y, stickInversion ? 127 : 126, attr);
@@ -287,7 +287,7 @@ void drawGVarName(coord_t x, coord_t y, int8_t idx, LcdFlags flags)
void editStickHardwareSettings(coord_t x, coord_t y, int idx, event_t event,
LcdFlags flags, uint8_t old_editMode)
{
lcdDrawTextIndented(y, STR_CHAR_STICK);
lcdDrawTextIndented(y, CHAR_STICK);
lcdDrawText(lcdNextPos, y, analogGetCanonicalName(ADC_INPUT_MAIN, idx), 0);
if (analogHasCustomLabel(ADC_INPUT_MAIN, idx) || (flags && s_editMode > 0))
@@ -600,7 +600,7 @@ void drawSource(coord_t x, coord_t y, mixsrc_t idx, LcdFlags att)
const char* s = getSourceString(idx);
#if LCD_W < 212
if (idx >= MIXSRC_FIRST_TELEM && idx <= MIXSRC_LAST_TELEM)
s += strlen(STR_CHAR_TELEMETRY);
s += strlen(CHAR_TELEMETRY);
#endif
lcdDrawText(x, y, s, att);
}
+393 -14
View File
@@ -20,6 +20,7 @@
*/
#include "fonts.h"
#include "debug.h"
/*
Strings in EdgeTX are encoded using UTF8. Latin characters are single byte in the range 32 - 127.
@@ -47,7 +48,25 @@
(7) - uses the 5x7 Language font characters (not bold)
*/
const unsigned char font_5x7[] = {
#if !defined(BOOT)
const uint8_t font_3x5[] = {
#include "font_03x05.lbm"
};
const uint8_t font_5x7_B[] = {
#include "font_05x07_B_compressed.lbm"
};
const uint8_t font_22x38_num[] = {
#include "font_22x38_num.lbm"
};
#endif
#if !defined(ALL_LANGS) || defined(BOOT)
const uint8_t font_5x7[] = {
#include "font_05x07.lbm"
#include "font_05x07_extra.lbm"
#if defined(TRANSLATIONS_DE)
@@ -78,11 +97,8 @@ const unsigned char font_5x7[] = {
};
#if !defined(BOOT)
const unsigned char font_5x7_B[] = {
#include "font_05x07_B_compressed.lbm"
};
const unsigned char font_10x14[] = {
const uint8_t font_10x14[] = {
#include "font_10x14_compressed.lbm"
#include "font_10x14_extra.lbm"
#if defined(TRANSLATIONS_DE)
@@ -112,11 +128,7 @@ const unsigned char font_10x14[] = {
#endif
};
const unsigned char font_3x5[] = {
#include "font_03x05.lbm"
};
const unsigned char font_4x6[] = {
const uint8_t font_4x6[] = {
#include "font_04x06.lbm"
#include "font_04x06_extra.lbm"
#if defined(TRANSLATIONS_DE)
@@ -146,7 +158,7 @@ const unsigned char font_4x6[] = {
#endif
};
const unsigned char font_8x10[] = {
const uint8_t font_8x10[] = {
#include "font_08x10.lbm"
#if defined(TRANSLATIONS_DE)
#include "font_de_08x10.lbm"
@@ -175,8 +187,375 @@ const unsigned char font_8x10[] = {
#endif
};
const unsigned char font_22x38_num[] = {
#include "font_22x38_num.lbm"
#endif // !defined(BOOT)
#else
const uint8_t en_font_4x6[] = {
#include "font_04x06.lbm"
#include "font_04x06_extra.lbm"
};
const uint8_t en_font_5x7[] = {
#include "font_05x07.lbm"
#include "font_05x07_extra.lbm"
};
const uint8_t en_font_8x10[] = {
#include "font_08x10.lbm"
};
const uint8_t en_font_10x14[] = {
#include "font_10x14_compressed.lbm"
#include "font_10x14_extra.lbm"
};
#endif // !defined(BOOT)
const uint8_t cz_font_4x6[] = {
#include "font_04x06.lbm"
#include "font_04x06_extra.lbm"
#include "font_cz_04x06.lbm"
};
const uint8_t cz_font_5x7[] = {
#include "font_05x07.lbm"
#include "font_05x07_extra.lbm"
#include "font_cz_05x07.lbm"
};
const uint8_t cz_font_8x10[] = {
#include "font_08x10.lbm"
#include "font_cz_08x10.lbm"
};
const uint8_t cz_font_10x14[] = {
#include "font_10x14_compressed.lbm"
#include "font_10x14_extra.lbm"
#include "font_cz_10x14.lbm"
};
const uint8_t da_font_4x6[] = {
#include "font_04x06.lbm"
#include "font_04x06_extra.lbm"
#include "font_da_04x06.lbm"
};
const uint8_t da_font_5x7[] = {
#include "font_05x07.lbm"
#include "font_05x07_extra.lbm"
#include "font_da_05x07.lbm"
};
const uint8_t da_font_8x10[] = {
#include "font_08x10.lbm"
#include "font_da_08x10.lbm"
};
const uint8_t da_font_10x14[] = {
#include "font_10x14_compressed.lbm"
#include "font_10x14_extra.lbm"
#include "font_da_10x14.lbm"
};
const uint8_t de_font_4x6[] = {
#include "font_04x06.lbm"
#include "font_04x06_extra.lbm"
#include "font_de_04x06.lbm"
};
const uint8_t de_font_5x7[] = {
#include "font_05x07.lbm"
#include "font_05x07_extra.lbm"
#include "font_de_05x07.lbm"
};
const uint8_t de_font_8x10[] = {
#include "font_08x10.lbm"
#include "font_de_08x10.lbm"
};
const uint8_t de_font_10x14[] = {
#include "font_10x14_compressed.lbm"
#include "font_10x14_extra.lbm"
#include "font_de_10x14.lbm"
};
const uint8_t es_font_4x6[] = {
#include "font_04x06.lbm"
#include "font_04x06_extra.lbm"
#include "font_es_04x06.lbm"
};
const uint8_t es_font_5x7[] = {
#include "font_05x07.lbm"
#include "font_05x07_extra.lbm"
#include "font_es_05x07.lbm"
};
const uint8_t es_font_8x10[] = {
#include "font_08x10.lbm"
#include "font_es_08x10.lbm"
};
const uint8_t es_font_10x14[] = {
#include "font_10x14_compressed.lbm"
#include "font_10x14_extra.lbm"
#include "font_es_10x14.lbm"
};
const uint8_t fi_font_4x6[] = {
#include "font_04x06.lbm"
#include "font_04x06_extra.lbm"
#include "font_fi_04x06.lbm"
};
const uint8_t fi_font_5x7[] = {
#include "font_05x07.lbm"
#include "font_05x07_extra.lbm"
#include "font_fi_05x07.lbm"
};
const uint8_t fi_font_8x10[] = {
#include "font_08x10.lbm"
#include "font_fi_08x10.lbm"
};
const uint8_t fi_font_10x14[] = {
#include "font_10x14_compressed.lbm"
#include "font_10x14_extra.lbm"
#include "font_fi_10x14.lbm"
};
const uint8_t fr_font_4x6[] = {
#include "font_04x06.lbm"
#include "font_04x06_extra.lbm"
#include "font_fr_04x06.lbm"
};
const uint8_t fr_font_5x7[] = {
#include "font_05x07.lbm"
#include "font_05x07_extra.lbm"
#include "font_fr_05x07.lbm"
};
const uint8_t fr_font_8x10[] = {
#include "font_08x10.lbm"
#include "font_fr_08x10.lbm"
};
const uint8_t fr_font_10x14[] = {
#include "font_10x14_compressed.lbm"
#include "font_10x14_extra.lbm"
#include "font_fr_10x14.lbm"
};
const uint8_t it_font_4x6[] = {
#include "font_04x06.lbm"
#include "font_04x06_extra.lbm"
#include "font_it_04x06.lbm"
};
const uint8_t it_font_5x7[] = {
#include "font_05x07.lbm"
#include "font_05x07_extra.lbm"
#include "font_it_05x07.lbm"
};
const uint8_t it_font_8x10[] = {
#include "font_08x10.lbm"
#include "font_it_08x10.lbm"
};
const uint8_t it_font_10x14[] = {
#include "font_10x14_compressed.lbm"
#include "font_10x14_extra.lbm"
#include "font_it_10x14.lbm"
};
const uint8_t pl_font_4x6[] = {
#include "font_04x06.lbm"
#include "font_04x06_extra.lbm"
#include "font_pl_04x06.lbm"
};
const uint8_t pl_font_5x7[] = {
#include "font_05x07.lbm"
#include "font_05x07_extra.lbm"
#include "font_pl_05x07.lbm"
};
const uint8_t pl_font_8x10[] = {
#include "font_08x10.lbm"
#include "font_pl_08x10.lbm"
};
const uint8_t pl_font_10x14[] = {
#include "font_10x14_compressed.lbm"
#include "font_10x14_extra.lbm"
#include "font_pl_10x14.lbm"
};
const uint8_t pt_font_4x6[] = {
#include "font_04x06.lbm"
#include "font_04x06_extra.lbm"
#include "font_pt_04x06.lbm"
};
const uint8_t pt_font_5x7[] = {
#include "font_05x07.lbm"
#include "font_05x07_extra.lbm"
#include "font_pt_05x07.lbm"
};
const uint8_t pt_font_8x10[] = {
#include "font_08x10.lbm"
#include "font_pt_08x10.lbm"
};
const uint8_t pt_font_10x14[] = {
#include "font_10x14_compressed.lbm"
#include "font_10x14_extra.lbm"
#include "font_pt_10x14.lbm"
};
const uint8_t ru_font_4x6[] = {
#include "font_04x06.lbm"
#include "font_04x06_extra.lbm"
#include "font_ru_04x06.lbm"
};
const uint8_t ru_font_5x7[] = {
#include "font_05x07.lbm"
#include "font_05x07_extra.lbm"
#include "font_ru_05x07.lbm"
};
const uint8_t ru_font_8x10[] = {
#include "font_08x10.lbm"
#include "font_ru_08x10.lbm"
};
const uint8_t ru_font_10x14[] = {
#include "font_10x14_compressed.lbm"
#include "font_10x14_extra.lbm"
#include "font_ru_10x14.lbm"
};
const uint8_t se_font_4x6[] = {
#include "font_04x06.lbm"
#include "font_04x06_extra.lbm"
#include "font_se_04x06.lbm"
};
const uint8_t se_font_5x7[] = {
#include "font_05x07.lbm"
#include "font_05x07_extra.lbm"
#include "font_se_05x07.lbm"
};
const uint8_t se_font_8x10[] = {
#include "font_08x10.lbm"
#include "font_se_08x10.lbm"
};
const uint8_t se_font_10x14[] = {
#include "font_10x14_compressed.lbm"
#include "font_10x14_extra.lbm"
#include "font_se_10x14.lbm"
};
const uint8_t ua_font_4x6[] = {
#include "font_04x06.lbm"
#include "font_04x06_extra.lbm"
#include "font_ua_04x06.lbm"
};
const uint8_t ua_font_5x7[] = {
#include "font_05x07.lbm"
#include "font_05x07_extra.lbm"
#include "font_ua_05x07.lbm"
};
const uint8_t ua_font_8x10[] = {
#include "font_08x10.lbm"
#include "font_ua_08x10.lbm"
};
const uint8_t ua_font_10x14[] = {
#include "font_10x14_compressed.lbm"
#include "font_10x14_extra.lbm"
#include "font_ua_10x14.lbm"
};
const uint8_t* const font4x6table[] = {
en_font_4x6,
cz_font_4x6,
da_font_4x6,
de_font_4x6,
en_font_4x6,
es_font_4x6,
fi_font_4x6,
fr_font_4x6,
en_font_4x6,
en_font_4x6,
it_font_4x6,
en_font_4x6,
en_font_4x6,
en_font_4x6,
pl_font_4x6,
pt_font_4x6,
ru_font_4x6,
se_font_4x6,
en_font_4x6,
en_font_4x6,
ua_font_4x6,
};
const uint8_t* const font5x7table[] = {
en_font_5x7,
cz_font_5x7,
da_font_5x7,
de_font_5x7,
en_font_5x7,
es_font_5x7,
fi_font_5x7,
fr_font_5x7,
en_font_5x7,
en_font_5x7,
it_font_5x7,
en_font_5x7,
en_font_5x7,
en_font_5x7,
pl_font_5x7,
pt_font_5x7,
ru_font_5x7,
se_font_5x7,
en_font_5x7,
en_font_5x7,
ua_font_5x7,
};
const uint8_t* const font8x10table[] = {
en_font_8x10,
cz_font_8x10,
da_font_8x10,
de_font_8x10,
en_font_8x10,
es_font_8x10,
fi_font_8x10,
fr_font_8x10,
en_font_8x10,
en_font_8x10,
it_font_8x10,
en_font_8x10,
en_font_8x10,
en_font_8x10,
pl_font_8x10,
pt_font_8x10,
ru_font_8x10,
se_font_8x10,
en_font_8x10,
en_font_8x10,
ua_font_8x10,
};
const uint8_t* const font10x14table[] = {
en_font_10x14,
cz_font_10x14,
da_font_10x14,
de_font_10x14,
en_font_10x14,
es_font_10x14,
fi_font_10x14,
fr_font_10x14,
en_font_10x14,
en_font_10x14,
it_font_10x14,
en_font_10x14,
en_font_10x14,
en_font_10x14,
pl_font_10x14,
pt_font_10x14,
ru_font_10x14,
se_font_10x14,
en_font_10x14,
en_font_10x14,
ua_font_10x14,
};
const uint8_t* font_4x6 = en_font_4x6;
const uint8_t* font_5x7 = en_font_5x7;
const uint8_t* font_8x10 = en_font_8x10;
const uint8_t* font_10x14 = en_font_10x14;
void setLanguageFont(int n)
{
font_4x6 = font4x6table[n];
font_5x7 = font5x7table[n];
font_8x10 = font8x10table[n];
font_10x14 = font10x14table[n];
extern void setLanguageUTF(int n);
setLanguageUTF(n);
}
#endif
+21 -7
View File
@@ -21,6 +21,8 @@
#pragma once
#include <stdint.h>
constexpr int FONT_BASE_START = 0x20;
constexpr int FONT_SYMS_START = 0x80;
constexpr int FONT_LANG_START = 0x95;
@@ -32,10 +34,22 @@ constexpr int FONT_SYMS_CNT = 21; // Max # of extra symbols (based on 5x7
constexpr int FONT_SYMS_CNT_4x6 = 4; // # of extra symbols in 4x6 font (adjust if font is changed)
constexpr int FONT_SYMS_CNT_10x14 = 4; // # of extra symbols in 10x14 font (adjust if font is changed)
extern const unsigned char font_5x7[];
extern const unsigned char font_5x7_B[];
extern const unsigned char font_3x5[];
extern const unsigned char font_4x6[];
extern const unsigned char font_8x10[];
extern const unsigned char font_10x14[];
extern const unsigned char font_22x38_num[];
extern const uint8_t font_3x5[];
extern const uint8_t font_5x7_B[];
extern const uint8_t font_22x38_num[];
#if !defined(ALL_LANGS) || defined(BOOT)
extern const uint8_t font_4x6[];
extern const uint8_t font_5x7[];
extern const uint8_t font_8x10[];
extern const uint8_t font_10x14[];
#else
extern const uint8_t* font_4x6;
extern const uint8_t* font_5x7;
extern const uint8_t* font_8x10;
extern const uint8_t* font_10x14;
#endif
+3 -3
View File
@@ -24,8 +24,8 @@
#include "hal/adc_driver.h"
#include "input_mapping.h"
#define _STR_MAX(x) "/" #x
#define STR_MAX(x) _STR_MAX(x)
#define _STRING_MAX(x) "/" #x
#define STRING_MAX(x) _STRING_MAX(x)
uint8_t getExposCount()
{
@@ -365,7 +365,7 @@ void menuModelExposAll(event_t event)
}
lcdDrawNumber(FW*strlen(STR_MENUINPUTS)+FW+FW/2, 0, getExposCount(), RIGHT);
lcdDrawText(FW*strlen(STR_MENUINPUTS)+FW+FW/2, 0, STR_MAX(MAX_EXPOS));
lcdDrawText(FW*strlen(STR_MENUINPUTS)+FW+FW/2, 0, STRING_MAX(MAX_EXPOS));
#if LCD_DEPTH > 1
// Value
+3 -3
View File
@@ -25,8 +25,8 @@
#include "input_mapping.h"
#include "mixes.h"
#define _STR_MAX(x) "/" #x
#define STR_MAX(x) _STR_MAX(x)
#define _STRING_MAX(x) "/" #x
#define STRING_MAX(x) _STRING_MAX(x)
bool reachMixesLimit()
{
@@ -280,7 +280,7 @@ void menuModelMixAll(event_t event)
}
lcdDrawNumber(FW*strlen(STR_MIXES)+FW/2, 0, getMixCount(), 0);
lcdDrawText(lcdNextPos, 0, STR_MAX(MAX_MIXERS));
lcdDrawText(lcdNextPos, 0, STRING_MAX(MAX_MIXERS));
// Value
uint8_t index = mixAddress(s_currIdx)->destCh;
@@ -22,9 +22,6 @@
#include "edgetx.h"
#include "usb_joystick.h"
#define _STR_MAX(x) "/" #x
#define STR_MAX(x) _STR_MAX(x)
#if LCD_W >= 212
#define MODE_POS 5*FW
#define SUBMODE_POS MODE_POS+2*FW
@@ -148,7 +148,7 @@ extern void menuCFSColor(coord_t y, RGBLedColor& color, const char* title, LcdFl
static void menuRadioCFSOne(event_t event)
{
std::string s(STR_CHAR_SWITCH);
std::string s(CHAR_SWITCH);
s += switchGetDefaultName(swIndex);
int config = g_eeGeneral.switchType(swIndex);
@@ -662,7 +662,7 @@ void menuRadioHardware(event_t event)
// draw hw name
LcdFlags flags = menuHorizontalPosition < 0 ? attr : 0;
lcdDrawText(INDENT_WIDTH, y, STR_CHAR_POT, flags);
lcdDrawText(INDENT_WIDTH, y, CHAR_POT, flags);
lcdDrawText(lcdNextPos, y, adcGetInputLabel(ADC_INPUT_FLEX, idx), flags);
// draw custom name
@@ -696,7 +696,7 @@ void menuRadioHardware(event_t event)
int config = g_eeGeneral.switchType(index);
LcdFlags flags = menuHorizontalPosition < 0 ? attr : 0;
lcdDrawText(INDENT_WIDTH, y, STR_CHAR_SWITCH, flags);
lcdDrawText(INDENT_WIDTH, y, CHAR_SWITCH, flags);
lcdDrawText(lcdNextPos, y, switchGetDefaultName(index), flags);
if (switchIsFlex(index)) {
@@ -752,7 +752,7 @@ void menuRadioHardware(event_t event)
int index = k - ITEM_RADIO_HARDWARE_CFS;
int config = g_eeGeneral.switchType(index);
lcdDrawText(INDENT_WIDTH, y, STR_CHAR_SWITCH, attr);
lcdDrawText(INDENT_WIDTH, y, CHAR_SWITCH, attr);
lcdDrawText(lcdNextPos, y, switchGetDefaultName(index), attr);
lcdDrawText(HW_SETTINGS_COLUMN2, y, STR_SWTYPES[config]);
+123 -117
View File
@@ -25,148 +25,146 @@
#include "definitions.h"
#include "translations/translations.h"
#define FR_LUT L'é', L'è', L'à', L'î', L'ç'
#define FR_SUB_LUT L'Â', L'A', L'À', L'A', L'Ê', L'E', L'É', L'E', L'È', L'E'
#define DA_LUT L'å', L'æ', L'ø', L'Å', L'Æ', L'Ø'
#define DE_LUT L'Ä', L'ä', L'Ö', L'ö', L'Ü', L'ü', L'ß'
#define CZ_LUT L'á', L'č', L'é', L'ě', L'í', L'ó', L'ř', L'š', L'ú', L'ů', L'ý', L'Á', L'Í', L'Ř', L'Ý', L'ž', L'É', L'ň'
#define CZ_SUB_LUT L'Ě', L'ě', L'Š', L'š', L'Č', L'č', L'Ž', L'ž', L'Ú', L'ú', L'Ů', L'ů', L'Ó', L'ó', L'Ň', L'ň'
#define ES_LUT L'Ñ', L'ñ', L'Á', L'á', L'É', L'é', L'Í', L'í', L'Ó', L'ó', L'ú'
#define PT_LUT L'Á', L'á', L'Â', L'â', L'Ã', L'ã', L'À', L'à', L'Ç', L'ç', L'É', L'é', L'Ê', L'ê', L'Í', L'í', L'Ó', L'ó', L'Ô', L'ô', L'Õ', L'õ', L'Ú', L'ú'
#define FI_LUT L'å', L'ä', L'ö', L'Å', L'Ä', L'Ö'
#define IT_LUT L'à', L'ù'
#define PL_LUT L'ą', L'ć', L'ę', L'ł', L'ń', L'ó', L'ś', L'ż', L'ź', L'Ą', L'Ć', L'Ę', L'Ł', L'Ń', L'Ó', L'Ś', L'Ż', L'Ź'
#define RU_LUT L'А', L'Б', L'В', L'Г', L'Д', L'Е', L'Ж', L'З', L'И', L'Й', L'К', L'Л', L'М', L'Н', \
L'О', L'П', L'Р', L'С', L'Т', L'У', L'Ф', L'Х', L'Ц', L'Ч', L'Ш', L'Щ', L'Ъ', L'Ы', \
L'Ь', L'Э', L'Ю', L'Я', L'а', L'б', L'в', L'г', L'д', L'е', L'ж', L'з', L'и', L'й', \
L'к', L'л', L'м', L'н', L'о', L'п', L'р', L'с', L'т', L'у', L'ф', L'х', L'ц', L'ч', \
L'ш', L'щ', L'ъ', L'ы', L'ь', L'э', L'ю', L'я'
#define UA_LUT L'Б', L'Г', L'Ґ', L'Д', L'Є', L'Ж', L'З', L'И', L'Ї', L'Й', L'Л', L'П', L'У', L'Ф', \
L'Ц', L'Ч', L'Ш', L'Щ', L'Ь', L'Ю', L'Я', L'б', L'в', L'г', L'ґ', L'д', L'є', L'ж', \
L'з', L'и', L'ї', L'й', L'к', L'л', L'м', L'н', L'п', L'т', L'ф', L'ц', L'ч', L'ш', \
L'щ', L'ь', L'ю', L'я'
#define UA_SUB_LUT L'А', L'A', L'а', L'a', L'В', L'B', L'С', L'C', L'с', L'c', L'Е', L'E', L'е', L'e', L'Н', L'H', \
L'К', L'K', L'М', L'M', L'І', L'I', L'і', L'i', L'О', L'O', L'о', L'o', L'о', L'o', L'Р', L'P', \
L'р', L'p', L'Т', L'T', L'Х', L'X', L'х', L'x', L'у', L'y'
#define SE_LUT L'å', L'ä', L'ö', L'Å', L'Ä', L'Ö'
#if !defined(ALL_LANGS) || defined(BOOT)
#if defined(TRANSLATIONS_FR)
static uint16_t _utf8_lut[] = {
L'é', L'è', L'à', L'î', L'ç',
};
static const uint16_t _utf8_lut[] = { FR_LUT };
#define UTF8_SUBS_LUT
static uint16_t _utf8_substitution_lut[] = {
L'Â', L'A',
L'À', L'A',
L'Ê', L'E',
L'É', L'E',
L'È', L'E',
/* Existing but virtually unsused
L'Ä', L'A',
L'Ë', L'E',
L'Ï', L'I',
L'Ö', L'O',
L'Ü', L'U',
L'Û', L'U',
L'Ù', L'U',
*/
};
static const uint16_t _utf8_substitution_lut[] = { FR_SUB_LUT };
#elif defined(TRANSLATIONS_DA)
static uint16_t _utf8_lut[] = {
L'å', L'æ', L'ø', L'Å', L'Æ', L'Ø',
};
static const uint16_t _utf8_lut[] = { DA_LUT };
#elif defined(TRANSLATIONS_DE)
static uint16_t _utf8_lut[] = {
L'Ä', L'ä', L'Ö', L'ö', L'Ü', L'ü', L'ß',
};
static const uint16_t _utf8_lut[] = { DE_LUT };
#elif defined(TRANSLATIONS_CZ)
static uint16_t _utf8_lut[] = {
L'á', L'č', L'é', L'ě', L'í', L'ó', L'ř',
L'š', L'ú', L'ů', L'ý', L'Á', L'Í', L'Ř',
L'Ý', L'ž', L'É', L'ň',
};
static const uint16_t _utf8_lut[] = { CZ_LUT };
#define UTF8_SUBS_LUT
static uint16_t _utf8_substitution_lut[] = {
L'Ě', L'ě',
L'Š', L'š',
L'Č', L'č',
L'Ž', L'ž',
L'Ú', L'ú',
L'Ů', L'ů',
L'Ó', L'ó',
L'Ň', L'ň',
};
static const uint16_t _utf8_substitution_lut[] = { CZ_SUB_LUT };
#elif defined(TRANSLATIONS_ES) && !defined(BOOT)
static uint16_t _utf8_lut[] = {
L'Ñ', L'ñ', L'Á', L'á', L'É', L'é', L'Í',
L'í', L'Ó', L'ó', L'ú',
};
static const uint16_t _utf8_lut[] = { ES_LUT };
#elif defined(TRANSLATIONS_PT)
static uint16_t _utf8_lut[] = {
L'Á', L'á', L'Â', L'â', L'Ã', L'ã', L'À',
L'à', L'Ç', L'ç', L'É', L'é', L'Ê', L'ê',
L'Í', L'í', L'Ó', L'ó', L'Ô', L'ô', L'Õ',
L'õ', L'Ú', L'ú',
};
static const uint16_t _utf8_lut[] = { PT_LUT };
#elif defined(TRANSLATIONS_FI) && !defined(BOOT)
static uint16_t _utf8_lut[] = {
L'å', L'ä', L'ö', L'Å', L'Ä', L'Ö',
};
static const uint16_t _utf8_lut[] = { FI_LUT };
#elif defined(TRANSLATIONS_IT)
static uint16_t _utf8_lut[] = {
L'à', L'ù',
};
static const uint16_t _utf8_lut[] = { IT_LUT };
#elif defined(TRANSLATIONS_PL)
static uint16_t _utf8_lut[] = {
L'ą', L'ć', L'ę', L'ł', L'ń', L'ó', L'ś',
L'ż', L'ź', L'Ą', L'Ć', L'Ę', L'Ł', L'Ń',
L'Ó', L'Ś', L'Ż', L'Ź',
};
static const uint16_t _utf8_lut[] = { PL_LUT };
#elif defined(TRANSLATIONS_RU) && !defined(BOOT)
static uint16_t _utf8_lut[] = {
L'А', L'Б', L'В', L'Г', L'Д', L'Е', L'Ж',
L'З', L'И', L'Й', L'К', L'Л', L'М', L'Н',
L'О', L'П', L'Р', L'С', L'Т', L'У', L'Ф',
L'Х', L'Ц', L'Ч', L'Ш', L'Щ', L'Ъ', L'Ы',
L'Ь', L'Э', L'Ю', L'Я', L'а', L'б', L'в',
L'г', L'д', L'е', L'ж', L'з', L'и', L'й',
L'к', L'л', L'м', L'н', L'о', L'п', L'р',
L'с', L'т', L'у', L'ф', L'х', L'ц', L'ч',
L'ш', L'щ', L'ъ', L'ы', L'ь', L'э', L'ю',
L'я',
};
static const uint16_t _utf8_lut[] = { RU_LUT };
#elif defined(TRANSLATIONS_UA) && !defined(BOOT)
static const uint16_t _utf8_lut[] = { UA_LUT };
#define UTF8_SUBS_LUT
// Warning, albeit the following table looks useless
// It does translate Cyrillic to Latin
static uint16_t _utf8_substitution_lut[] = {
L'А', L'A',
L'а', L'a',
L'В', L'B',
L'С', L'C',
L'с', L'c',
L'Е', L'E',
L'е', L'e',
L'Н', L'H',
L'К', L'K',
L'М', L'M',
L'І', L'I',
L'і', L'i',
L'О', L'O',
L'о', L'o',
L'о', L'o',
L'Р', L'P',
L'р', L'p',
L'Т', L'T',
L'Х', L'X',
L'х', L'x',
L'у', L'y'
};
static uint16_t _utf8_lut[] = {
L'Б', L'Г', L'Ґ', L'Д', L'Є', L'Ж', L'З',
L'И', L'Ї', L'Й', L'Л', L'П', L'У', L'Ф',
L'Ц', L'Ч', L'Ш', L'Щ', L'Ь', L'Ю', L'Я',
L'б', L'в', L'г', L'ґ', L'д', L'є', L'ж',
L'з', L'и', L'ї', L'й', L'к', L'л', L'м',
L'н', L'п', L'т', L'ф', L'ц', L'ч', L'ш',
L'щ', L'ь', L'ю', L'я'
};
static const uint16_t _utf8_substitution_lut[] = { UA_SUB_LUT };
#elif defined(TRANSLATIONS_SE)
static uint16_t _utf8_lut[] = {
L'å', L'ä', L'ö', L'Å', L'Ä', L'Ö',
};
static const uint16_t _utf8_lut[] = { SE_LUT};
#else
#define NO_UTF8_LUT
#endif
#else
static const uint16_t fr_utf8_lut[] = { FR_LUT, 0 };
static const uint16_t fr_utf8_substitution_lut[] = { FR_SUB_LUT, 0 };
static const uint16_t da_utf8_lut[] = { DA_LUT, 0 };
static const uint16_t de_utf8_lut[] = { DE_LUT, 0 };
static const uint16_t cz_utf8_lut[] = { CZ_LUT, 0 };
static const uint16_t cz_utf8_substitution_lut[] = { CZ_SUB_LUT, 0 };
static const uint16_t es_utf8_lut[] = { ES_LUT, 0 };
static const uint16_t pt_utf8_lut[] = { PT_LUT, 0 };
static const uint16_t fi_utf8_lut[] = { FI_LUT, 0 };
static const uint16_t it_utf8_lut[] = { IT_LUT, 0 };
static const uint16_t pl_utf8_lut[] = { PL_LUT, 0 };
static const uint16_t ru_utf8_lut[] = { RU_LUT, 0 };
static const uint16_t ua_utf8_lut[] = { UA_LUT, 0 };
static const uint16_t ua_utf8_substitution_lut[] = { UA_SUB_LUT, 0 };
static const uint16_t se_utf8_lut[] = { SE_LUT, 0 };
struct LangUtf {
const uint16_t* lut;
const uint16_t* substitution_lut;
};
static const LangUtf langUtf[] = {
{ nullptr, nullptr },
{ cz_utf8_lut, cz_utf8_substitution_lut },
{ da_utf8_lut, nullptr },
{ de_utf8_lut, nullptr },
{ nullptr, nullptr },
{ es_utf8_lut, nullptr },
{ fi_utf8_lut, nullptr },
{ fr_utf8_lut, fr_utf8_substitution_lut },
{ nullptr, nullptr },
{ nullptr, nullptr },
{ it_utf8_lut, nullptr },
{ nullptr, nullptr },
{ nullptr, nullptr },
{ nullptr, nullptr },
{ pl_utf8_lut, nullptr },
{ pt_utf8_lut, nullptr },
{ ru_utf8_lut, nullptr },
{ se_utf8_lut, nullptr },
{ nullptr, nullptr },
{ nullptr, nullptr },
{ ua_utf8_lut, ua_utf8_substitution_lut },
};
static const uint16_t* _utf8_lut = nullptr;
static const uint16_t* _utf8_substitution_lut = nullptr;
void setLanguageUTF(int n)
{
_utf8_lut = langUtf[n].lut;
_utf8_substitution_lut = langUtf[n].substitution_lut;
}
#define UTF8_SUBS_LUT
#endif
#if !defined(NO_UTF8_LUT)
#if !defined(ALL_LANGS) || defined(BOOT)
#define MAX_TRANSLATED_CHARS 107
static_assert(sizeof(_utf8_lut) / sizeof(_utf8_lut[0]) <= MAX_TRANSLATED_CHARS, "Number of translated chars exceeds the limit");
#endif
static unsigned char lookup_utf8_mapping(wchar_t w)
{
for (uint32_t i=0; i < DIM(_utf8_lut); i++) {
#if !defined(ALL_LANGS) || defined(BOOT)
for (int i=0; i < DIM(_utf8_lut); i++) {
if (w == _utf8_lut[i])
return FONT_LANG_START + (uint8_t)i;
}
#else
if (_utf8_lut == nullptr) return w;
for (int i=0; _utf8_lut[i]; i++) {
if (w == _utf8_lut[i])
return FONT_LANG_START + (uint8_t)i;
}
#endif
return 0x20; // return 'space' for unknown chars
}
#endif
@@ -174,10 +172,18 @@ static unsigned char lookup_utf8_mapping(wchar_t w)
#if defined(UTF8_SUBS_LUT)
static uint16_t lookup_utf8_substitution(wchar_t w)
{
for (uint32_t i=0; i < DIM(_utf8_substitution_lut); i+=2) {
#if !defined(ALL_LANGS) || defined(BOOT)
for (int i=0; i < DIM(_utf8_substitution_lut); i+=2) {
if (w == _utf8_substitution_lut[i])
return _utf8_substitution_lut[i+1];
}
#else
if (!_utf8_substitution_lut) return w;
for (int i=0; _utf8_substitution_lut[i]; i+=2) {
if (w == _utf8_substitution_lut[i])
return _utf8_substitution_lut[i+1];
}
#endif
return w;
}
#endif
@@ -205,9 +211,9 @@ unsigned char map_utf8_char(const char*& s, uint8_t& len)
return (unsigned char)w;
}
if(w == L'≥')
return STR_CHAR_BW_GREATEREQUAL;
return CHAR_BW_GREATEREQUAL;
if(w == L'°')
return STR_CHAR_BW_DEGREE;
return CHAR_BW_DEGREE;
#if defined(UTF8_SUBS_LUT)
auto w_map = lookup_utf8_substitution(w);
if (w_map> FONT_LANG_START)
+4 -4
View File
@@ -54,12 +54,12 @@ static void sdReadTextFile(const char * filename, char lines[TEXT_VIEWER_LINES][
else if (c != '\\' && escape > 0 && escape < sizeof(escape_chars)) {
escape_chars[escape - 1] = c;
if (escape == 2 && !strncmp(escape_chars, "up", 2)) {
lines[current_line-menuVerticalOffset][line_length++] = STR_CHAR_UP[0];
c = STR_CHAR_UP[1];
lines[current_line-menuVerticalOffset][line_length++] = CHAR_UP[0];
c = CHAR_UP[1];
}
else if (escape == 2 && !strncmp(escape_chars, "dn", 2)) {
lines[current_line-menuVerticalOffset][line_length++] = STR_CHAR_DOWN[0];
c = STR_CHAR_DOWN[1];
lines[current_line-menuVerticalOffset][line_length++] = CHAR_DOWN[0];
c = CHAR_DOWN[1];
}
else if (escape == 3) {
int val = atoi(escape_chars);