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

feat: add a separate setting for selecting 'text language' when ALL_LANGS is set (#6960)

Browse Source
This commit is contained in:
philmoz
2026-01-08 12:34:22 +10:00
committed by GitHub
parent a3ccc87a88
commit 4f90a5e426
60 changed files with 352 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/storage/sdcard_common.cpp
+8 -10
View File
@@ -243,18 +243,16 @@ void storageReadAll()
}
#endif
for (uint8_t i = 0; languagePacks[i] != nullptr; i++) {
if (!strncmp(g_eeGeneral.ttsLanguage, languagePacks[i]->id, 2)) {
currentLanguagePackIdx = i;
currentLanguagePack = languagePacks[i];
if (g_eeGeneral.uiLanguage[0] == 0)
generalDefaultUILanguage();
currentLanguagePackIdx = getLanguageId(g_eeGeneral.ttsLanguage);
currentLanguagePack = languagePacks[currentLanguagePackIdx];
#if defined(ALL_LANGS)
currentLangStrings = langStrings[currentLanguagePackIdx];
extern void setLanguageFont(int n);
setLanguageFont(currentLanguagePackIdx);
uint8_t uiLangIdx = getLanguageId(g_eeGeneral.uiLanguage);
currentLangStrings = langStrings[uiLangIdx];
extern void setLanguageFont(int n);
setLanguageFont(uiLangIdx);
#endif
break;
}
}
#if defined(STORAGE_MODELSLIST)
// and reload the list
radio/src/storage/yaml/yaml_datastructs_128x64.cpp
+1
View File
@@ -343,6 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_f16.cpp
+1
View File
@@ -399,6 +399,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_gx12.cpp
+1
View File
@@ -367,6 +367,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_nb4p.cpp
+1
View File
@@ -392,6 +392,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_nv14.cpp
+1
View File
@@ -399,6 +399,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_pa01.cpp
+1
View File
@@ -422,6 +422,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_pl18.cpp
+1
View File
@@ -399,6 +399,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_pl18u.cpp
+1
View File
@@ -392,6 +392,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_st16.cpp
+1
View File
@@ -422,6 +422,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_t15.cpp
+1
View File
@@ -407,6 +407,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_t15pro.cpp
+1
View File
@@ -422,6 +422,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_t20.cpp
+1
View File
@@ -352,6 +352,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_tpro.cpp
+1
View File
@@ -352,6 +352,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_tx15.cpp
+1
View File
@@ -422,6 +422,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_x10.cpp
+1
View File
@@ -398,6 +398,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_x9d.cpp
+1
View File
@@ -343,6 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_x9dp2019.cpp
+1
View File
@@ -343,6 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_x9e.cpp
+1
View File
@@ -343,6 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_xlite.cpp
+1
View File
@@ -343,6 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),
radio/src/storage/yaml/yaml_datastructs_xlites.cpp
+1
View File
@@ -345,6 +345,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "jackMode", 2 ),
YAML_PADDING( 1 ),
YAML_STRING("ttsLanguage", 2),
YAML_STRING("uiLanguage", 2),
YAML_SIGNED_CUST( "beepVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "wavVolume", 4, r_5pos, w_5pos ),
YAML_SIGNED_CUST( "varioVolume", 4, r_5pos, w_5pos ),