feat: add a separate setting for selecting 'text language' when ALL_LANGS is set (#6960)
This commit is contained in:
@@ -292,6 +292,7 @@ Node convert<GeneralSettings>::encode(const GeneralSettings& rhs)
|
||||
node["imperial"] = rhs.imperial;
|
||||
node["ppmunit"] = rhs.ppmunit;
|
||||
node["ttsLanguage"] = rhs.ttsLanguage;
|
||||
node["uiLanguage"] = rhs.uiLanguage;
|
||||
node["beepVolume"] = rhs.beepVolume + 2;
|
||||
node["wavVolume"] = rhs.wavVolume + 2;
|
||||
node["varioVolume"] = rhs.varioVolume + 2;
|
||||
@@ -573,6 +574,7 @@ bool convert<GeneralSettings>::decode(const Node& node, GeneralSettings& rhs)
|
||||
node["imperial"] >> rhs.imperial;
|
||||
node["ppmunit"] >> rhs.ppmunit;
|
||||
node["ttsLanguage"] >> rhs.ttsLanguage;
|
||||
node["uiLanguage"] >> rhs.uiLanguage;
|
||||
node["beepVolume"] >> ioffset_int(rhs.beepVolume, 2);
|
||||
node["wavVolume"] >> ioffset_int(rhs.wavVolume, 2);
|
||||
node["varioVolume"] >> ioffset_int(rhs.varioVolume, 2);
|
||||
|
||||
@@ -233,12 +233,14 @@ void GeneralSettings::init()
|
||||
internalModule = g.profile[g.sessionId()].defaultInternalModule();
|
||||
|
||||
QString lang = getCurrentFirmware()->getLanguage();
|
||||
if (lang.size() > 1)
|
||||
if (lang.size() > 1) {
|
||||
memcpy(ttsLanguage, lang.toLatin1().data(), 2);
|
||||
else {
|
||||
} else {
|
||||
ttsLanguage[0] = 'e';
|
||||
ttsLanguage[1] = 'n';
|
||||
}
|
||||
ttsLanguage[2] = 0;
|
||||
memcpy(uiLanguage, ttsLanguage, 3);
|
||||
|
||||
stickDeadZone = (IS_FLYSKY_NV14(board) || IS_FAMILY_PL18(board)) ? 2 : 0;
|
||||
setDefaultFavorites();
|
||||
|
||||
@@ -367,6 +367,7 @@ class GeneralSettings {
|
||||
unsigned int imperial;
|
||||
unsigned int ppmunit;
|
||||
char ttsLanguage[TTS_LANGUAGE_LEN + 1];
|
||||
char uiLanguage[TTS_LANGUAGE_LEN + 1];
|
||||
int beepVolume;
|
||||
int wavVolume;
|
||||
int varioVolume;
|
||||
|
||||
Reference in New Issue
Block a user