Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Housekeeping

Browse source
This commit is contained in:
elecpower 2021-03-03 07:24:43 +11:00
parent f0d4c88f03
commit 263d2854a7
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
companion/src/firmwares/customfunctiondata.cpp
View file

@ -178,8 +178,7 @@ QString CustomFunctionData::paramToString(const ModelData * model) const
return QString(CPN_STR_UNKNOWN_ITEM); return QString(CPN_STR_UNKNOWN_ITEM);
} }
else if (func == FuncVolume || func == FuncPlayValue || func == FuncBacklight) { else if (func == FuncVolume || func == FuncPlayValue || func == FuncBacklight) {
RawSource item(param); return RawSource(param).toString(model);
return item.toString(model);
} }
else if (func == FuncPlayPrompt || func == FuncPlayBoth) { else if (func == FuncPlayPrompt || func == FuncPlayBoth) {
if ( getCurrentFirmware()->getCapability(VoicesAsNumbers)) { if ( getCurrentFirmware()->getCapability(VoicesAsNumbers)) {
@ -192,16 +191,14 @@ QString CustomFunctionData::paramToString(const ModelData * model) const
else if (func >= FuncAdjustGV1 && func < FuncCount) { else if (func >= FuncAdjustGV1 && func < FuncCount) {
switch (adjustMode) { switch (adjustMode) {
case FUNC_ADJUST_GVAR_CONSTANT: case FUNC_ADJUST_GVAR_CONSTANT:
return tr("Value") + QString(" %1").arg(param); return gvarAdjustModeToString(adjustMode) + QString(" %1").arg(param);
case FUNC_ADJUST_GVAR_SOURCE: case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_GVAR: case FUNC_ADJUST_GVAR_GVAR:
return RawSource(param).toString(); return RawSource(param).toString();
case FUNC_ADJUST_GVAR_INCDEC: case FUNC_ADJUST_GVAR_INCDEC:
float val; const float val = param * model->gvarData[func - FuncAdjustGV1].multiplierGet();
QString unit; const QString unit = model->gvarData[func - FuncAdjustGV1].unitToString();
val = param * model->gvarData[func - FuncAdjustGV1].multiplierGet(); return gvarAdjustModeToString(adjustMode) + QString(": %1%2").arg(val).arg(unit);
unit = model->gvarData[func - FuncAdjustGV1].unitToString();
return tr("Increment") + QString(": %1%2").arg(val).arg(unit);
} }
} }
return ""; return "";
@ -347,7 +344,7 @@ QString CustomFunctionData::gvarAdjustModeToString(int value)
case FUNC_ADJUST_GVAR_SOURCE: case FUNC_ADJUST_GVAR_SOURCE:
return tr("Source"); return tr("Source");
case FUNC_ADJUST_GVAR_GVAR: case FUNC_ADJUST_GVAR_GVAR:
return tr("GVAR"); return tr("Global Variable");
case FUNC_ADJUST_GVAR_INCDEC: case FUNC_ADJUST_GVAR_INCDEC:
return tr("Increment"); return tr("Increment");
default: default: