mirror of
https://github.com/opentx/opentx.git
synced 2025-07-19 06:15:10 +03:00
Rename of "SafetyCH" to "OverrideCH" was not done in companion - UPDATE SERVER SCRIPT!
This commit is contained in:
parent
3c360618b9
commit
4fd40c154e
3 changed files with 4 additions and 4 deletions
|
@ -724,7 +724,7 @@ QString FuncSwData::funcToString()
|
||||||
{
|
{
|
||||||
ModelData model;
|
ModelData model;
|
||||||
if (func >= FuncSafetyCh1 && func <= FuncSafetyCh32)
|
if (func >= FuncSafetyCh1 && func <= FuncSafetyCh32)
|
||||||
return QObject::tr("Safety %1").arg(RawSource(SOURCE_TYPE_CH, func).toString(model));
|
return QObject::tr("Override %1").arg(RawSource(SOURCE_TYPE_CH, func).toString(model));
|
||||||
else if (func == FuncTrainer)
|
else if (func == FuncTrainer)
|
||||||
return QObject::tr("Trainer");
|
return QObject::tr("Trainer");
|
||||||
else if (func == FuncTrainerRUD)
|
else if (func == FuncTrainerRUD)
|
||||||
|
|
|
@ -580,7 +580,7 @@ int OpenTxFirmware::getCapability(const Capability capability)
|
||||||
else
|
else
|
||||||
return 16;
|
return 16;
|
||||||
case SafetyChannelCustomFunction:
|
case SafetyChannelCustomFunction:
|
||||||
return id.contains("nosafetych") ? 0 : 1;
|
return id.contains("noovveridech") ? 0 : 1;
|
||||||
case LogicalSwitches:
|
case LogicalSwitches:
|
||||||
if (IS_ARM(board))
|
if (IS_ARM(board))
|
||||||
return 32;
|
return 32;
|
||||||
|
@ -1051,7 +1051,7 @@ void addOpenTxCommonOptions(OpenTxFirmware * firmware)
|
||||||
{
|
{
|
||||||
firmware->addOption("ppmus", QObject::tr("Channel values displayed in us"));
|
firmware->addOption("ppmus", QObject::tr("Channel values displayed in us"));
|
||||||
firmware->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
|
firmware->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
|
||||||
firmware->addOption("nosafetych", QObject::tr("No SafetyCH functions available"));
|
firmware->addOption("nooverridech", QObject::tr("No OverrideCH functions available"));
|
||||||
Option fai_options[] = { { "faichoice", QObject::tr("Possibility to enable FAI MODE at field") }, { "faimode", QObject::tr("FAI MODE always enabled") }, { NULL } };
|
Option fai_options[] = { { "faichoice", QObject::tr("Possibility to enable FAI MODE at field") }, { "faimode", QObject::tr("FAI MODE always enabled") }, { NULL } };
|
||||||
firmware->addOptions(fai_options);
|
firmware->addOptions(fai_options);
|
||||||
}
|
}
|
||||||
|
|
|
@ -267,7 +267,7 @@
|
||||||
#if defined(SAFETY_CHANNEL_FUNCTION) && LCD_W >= 212
|
#if defined(SAFETY_CHANNEL_FUNCTION) && LCD_W >= 212
|
||||||
#define TR_CFN_SAFETY "Override\0 "
|
#define TR_CFN_SAFETY "Override\0 "
|
||||||
#elif defined(SAFETY_CHANNEL_FUNCTION)
|
#elif defined(SAFETY_CHANNEL_FUNCTION)
|
||||||
#define TR_CFN_SAFETY "Safety\0 "
|
#define TR_CFN_SAFETY "Overr.\0 "
|
||||||
#else
|
#else
|
||||||
#define TR_CFN_SAFETY "---\0 "
|
#define TR_CFN_SAFETY "---\0 "
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue