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

feat: new SF GV Adjust mode to copy source (instead of %) value (#5406)

Browse Source
This commit is contained in:
philmoz
2024-08-16 08:32:12 +10:00
committed by GitHub
parent 6bf335166f
commit 7e7deb21dc
32 changed files with 96 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/customfunctiondata.cpp
+5 -2
View File
@@ -30,7 +30,7 @@ void CustomFunctionData::convert(RadioDataConversionState & cstate)
cstate.setComponent(tr("CFN"), 8);
cstate.setSubComp(nameToString(cstate.subCompIdx, (cstate.toModel() ? false : true)));
swtch.convert(cstate);
if (func == FuncVolume || func == FuncBacklight || func == FuncPlayValue || (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast && adjustMode == 1)) {
if (func == FuncVolume || func == FuncBacklight || func == FuncPlayValue || (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast && (adjustMode == FUNC_ADJUST_GVAR_SOURCE || adjustMode == FUNC_ADJUST_GVAR_SOURCERAW))) {
param = RawSource(param).convert(cstate.withComponentField("PARAM")).toValue();
}
}
@@ -190,6 +190,7 @@ QString CustomFunctionData::paramToString(const ModelData * model) const
case FUNC_ADJUST_GVAR_CONSTANT:
return QString("%1").arg(param);
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW:
case FUNC_ADJUST_GVAR_GVAR:
return RawSource(param).toString();
case FUNC_ADJUST_GVAR_INCDEC:
@@ -379,7 +380,9 @@ QString CustomFunctionData::gvarAdjustModeToString(const int value)
case FUNC_ADJUST_GVAR_CONSTANT:
return tr("Value");
case FUNC_ADJUST_GVAR_SOURCE:
return tr("Source");
return tr("Source (%)");
case FUNC_ADJUST_GVAR_SOURCERAW:
return tr("Source (value)");
case FUNC_ADJUST_GVAR_GVAR:
return tr("Global Variable");
case FUNC_ADJUST_GVAR_INCDEC:
companion/src/firmwares/customfunctiondata.h
+1
View File
@@ -81,6 +81,7 @@ enum GVarAdjustModes
{
FUNC_ADJUST_GVAR_CONSTANT,
FUNC_ADJUST_GVAR_SOURCE,
FUNC_ADJUST_GVAR_SOURCERAW,
FUNC_ADJUST_GVAR_GVAR,
FUNC_ADJUST_GVAR_INCDEC,
FUNC_ADJUST_GVAR_COUNT
companion/src/firmwares/edgetx/yaml_customfunctiondata.cpp
+5 -2
View File
@@ -105,6 +105,7 @@ static const YamlLookupTable resetLut = {
static const YamlLookupTable gvarModeLut = {
{ FUNC_ADJUST_GVAR_CONSTANT, "Cst" },
{ FUNC_ADJUST_GVAR_SOURCE, "Src" },
{ FUNC_ADJUST_GVAR_SOURCERAW, "SrcRaw" },
{ FUNC_ADJUST_GVAR_GVAR, "GVar" },
{ FUNC_ADJUST_GVAR_INCDEC, "IncDec" },
};
@@ -200,7 +201,8 @@ Node convert<CustomFunctionData>::encode(const CustomFunctionData& rhs)
def += std::to_string(rhs.param);
break;
case FUNC_ADJUST_GVAR_GVAR:
case FUNC_ADJUST_GVAR_SOURCE: {
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW: {
def += YamlRawSourceEncode(RawSource(rhs.param));
} break;
}
@@ -347,7 +349,8 @@ bool convert<CustomFunctionData>::decode(const Node& node,
def >> rhs.param;
break;
case FUNC_ADJUST_GVAR_GVAR:
case FUNC_ADJUST_GVAR_SOURCE: {
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW: {
std::string src_str;
getline(def, src_str, ',');
RawSource src;
companion/src/firmwares/modeldata.cpp
+1 -1
View File
@@ -768,7 +768,7 @@ int ModelData::updateReference()
if (!cfd->isEmpty()) {
updateSwitchRef(cfd->swtch);
if (cfd->func == FuncVolume || cfd->func == FuncBacklight || cfd->func == FuncPlayValue ||
(cfd->func >= FuncAdjustGV1 && cfd->func <= FuncAdjustGVLast && (cfd->adjustMode == FUNC_ADJUST_GVAR_GVAR || cfd->adjustMode == FUNC_ADJUST_GVAR_SOURCE))) {
(cfd->func >= FuncAdjustGV1 && cfd->func <= FuncAdjustGVLast && (cfd->adjustMode == FUNC_ADJUST_GVAR_GVAR || cfd->adjustMode == FUNC_ADJUST_GVAR_SOURCE || cfd->adjustMode == FUNC_ADJUST_GVAR_SOURCERAW))) {
updateSourceIntRef(cfd->param);
if (cfd->param == 0)
cfd->clear();
companion/src/firmwares/opentx/opentxeeprom.cpp
+4 -4
View File
@@ -1787,9 +1787,9 @@ class ArmCustomFunctionField: public TransformedField {
*((uint8_t *)(_param+2)) = fn.adjustMode;
*((uint8_t *)(_param+3)) = fn.func - FuncAdjustGV1;
unsigned int value;
if (fn.adjustMode == 1)
if (fn.adjustMode == FUNC_ADJUST_GVAR_SOURCE || fn.adjustMode == FUNC_ADJUST_GVAR_SOURCERAW)
sourcesConversionTable->exportValue(fn.param, (int &)value);
else if (fn.adjustMode == 2)
else if (fn.adjustMode == FUNC_ADJUST_GVAR_GVAR)
value = RawSource(fn.param).index;
else
value = fn.param;
@@ -1844,9 +1844,9 @@ class ArmCustomFunctionField: public TransformedField {
else if (fn.func >= FuncAdjustGV1 && fn.func <= FuncAdjustGVLast) {
fn.func = AssignFunc(fn.func + index);
fn.adjustMode = mode;
if (fn.adjustMode == 1)
if (fn.adjustMode == FUNC_ADJUST_GVAR_SOURCE || fn.adjustMode == FUNC_ADJUST_GVAR_SOURCERAW)
sourcesConversionTable->importValue(value, (int &)fn.param);
else if (fn.adjustMode == 2)
else if (fn.adjustMode == FUNC_ADJUST_GVAR_GVAR)
fn.param = RawSource(SOURCE_TYPE_GVAR, value + 1).toValue();
else
fn.param = (int16_t)value;
companion/src/modeledit/customfunctions.cpp
+3 -2
View File
@@ -697,13 +697,14 @@ void CustomFunctionsPanel::populateFuncParamCB(QComboBox *b, uint function, unsi
}
else if (function >= FuncAdjustGV1 && function <= FuncAdjustGVLast) {
switch (adjustmode) {
case 1:
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW:
b->setModel(tabFilterFactory->getItemModel(rawSourceInputsId));
b->setCurrentIndex(b->findData(value));
if (b->currentIndex() < 0 && value == 0)
b->setCurrentIndex(b->count() / 2); // '----' not in list so set to first positive value
break;
case 2:
case FUNC_ADJUST_GVAR_GVAR:
b->setModel(tabFilterFactory->getItemModel(rawSourceGVarsId));
b->setCurrentIndex(b->findData(value));
if (b->currentIndex() < 0 && value == 0)
radio/src/dataconstants.h
+1
View File
@@ -640,6 +640,7 @@ enum ResetFunctionParam {
enum AdjustGvarFunctionParam {
FUNC_ADJUST_GVAR_CONSTANT,
FUNC_ADJUST_GVAR_SOURCE,
FUNC_ADJUST_GVAR_SOURCERAW,
FUNC_ADJUST_GVAR_GVAR,
FUNC_ADJUST_GVAR_INCDEC,
};
radio/src/functions.cpp
+12 -5
View File
@@ -279,11 +279,18 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
trimGvar[CFN_PARAM(cfn) - MIXSRC_FIRST_TRIM] =
CFN_GVAR_INDEX(cfn);
} else {
SET_GVAR(CFN_GVAR_INDEX(cfn),
limit<int16_t>(MODEL_GVAR_MIN(CFN_GVAR_INDEX(cfn)),
calcRESXto100(getValue(CFN_PARAM(cfn))),
MODEL_GVAR_MAX(CFN_GVAR_INDEX(cfn))),
mixerCurrentFlightMode);
if (CFN_GVAR_MODE(cfn) == FUNC_ADJUST_GVAR_SOURCE)
SET_GVAR(CFN_GVAR_INDEX(cfn),
limit<int16_t>(MODEL_GVAR_MIN(CFN_GVAR_INDEX(cfn)),
calcRESXto100(getValue(CFN_PARAM(cfn))),
MODEL_GVAR_MAX(CFN_GVAR_INDEX(cfn))),
mixerCurrentFlightMode);
else
SET_GVAR(CFN_GVAR_INDEX(cfn),
limit<int16_t>(MODEL_GVAR_MIN(CFN_GVAR_INDEX(cfn)),
getValue(CFN_PARAM(cfn)),
MODEL_GVAR_MAX(CFN_GVAR_INDEX(cfn))),
mixerCurrentFlightMode);
}
break;
#endif
radio/src/gui/128x64/model_special_functions.cpp
+8
View File
@@ -92,6 +92,11 @@ void onAdjustGvarSourceLongEnterPress(const char * result)
CFN_PARAM(cfn) = 0;
storageDirty(EE_MODEL);
}
else if (result == STR_MIXSOURCERAW) {
CFN_GVAR_MODE(cfn) = FUNC_ADJUST_GVAR_SOURCERAW;
CFN_PARAM(cfn) = 0;
storageDirty(EE_MODEL);
}
else if (result == STR_GLOBALVAR) {
CFN_GVAR_MODE(cfn) = FUNC_ADJUST_GVAR_GVAR;
CFN_PARAM(cfn) = 0;
@@ -393,6 +398,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
drawGVarValue(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, CFN_GVAR_INDEX(cfn), val_displayed, attr|LEFT);
break;
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW:
val_max = MIXSRC_LAST_CH;
drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr);
if (active) {
@@ -436,6 +442,8 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
POPUP_MENU_ADD_ITEM(STR_CONSTANT);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_SOURCE)
POPUP_MENU_ADD_ITEM(STR_MIXSOURCE);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_SOURCERAW)
POPUP_MENU_ADD_ITEM(STR_MIXSOURCERAW);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_GVAR)
POPUP_MENU_ADD_ITEM(STR_GLOBALVAR);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_INCDEC)
radio/src/gui/212x64/model_special_functions.cpp
+8
View File
@@ -124,6 +124,11 @@ void onAdjustGvarSourceLongEnterPress(const char * result)
CFN_PARAM(cfn) = 0;
storageDirty(EE_MODEL);
}
else if (result == STR_MIXSOURCERAW) {
CFN_GVAR_MODE(cfn) = FUNC_ADJUST_GVAR_SOURCERAW;
CFN_PARAM(cfn) = 0;
storageDirty(EE_MODEL);
}
else if (result == STR_GLOBALVAR) {
CFN_GVAR_MODE(cfn) = FUNC_ADJUST_GVAR_GVAR;
CFN_PARAM(cfn) = 0;
@@ -372,6 +377,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
break;
}
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW:
val_max = MIXSRC_LAST_CH;
drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr);
if (active) {
@@ -403,6 +409,8 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
POPUP_MENU_ADD_ITEM(STR_CONSTANT);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_SOURCE)
POPUP_MENU_ADD_ITEM(STR_MIXSOURCE);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_SOURCERAW)
POPUP_MENU_ADD_ITEM(STR_MIXSOURCERAW);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_GVAR)
POPUP_MENU_ADD_ITEM(STR_GLOBALVAR);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_INCDEC)
radio/src/gui/colorlcd/model/special_functions.cpp
+4
View File
@@ -226,6 +226,7 @@ void FunctionLineButton::refresh()
formatNumberAsString(CFN_PARAM(cfn)).c_str());
break;
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW:
sprintf(s + strlen(s), " = %s", getSourceString(CFN_PARAM(cfn)));
break;
case FUNC_ADJUST_GVAR_GVAR:
@@ -532,6 +533,8 @@ void FunctionEditPage::updateSpecialFunctionOneWindow()
return std::string(STR_CONSTANT);
case FUNC_ADJUST_GVAR_SOURCE:
return std::string(STR_MIXSOURCE);
case FUNC_ADJUST_GVAR_SOURCERAW:
return std::string(STR_MIXSOURCERAW);
case FUNC_ADJUST_GVAR_GVAR:
return std::string(STR_GLOBALVAR);
case FUNC_ADJUST_GVAR_INCDEC:
@@ -549,6 +552,7 @@ void FunctionEditPage::updateSpecialFunctionOneWindow()
break;
}
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW:
addSourceChoice(line, STR_MIXSOURCE, cfn, MIXSRC_LAST_CH);
break;
case FUNC_ADJUST_GVAR_GVAR: {
radio/src/storage/yaml/yaml_datastructs_funcs.cpp
+3 -1
View File
@@ -1470,7 +1470,7 @@ static const char* const _func_sound_lookup[] = {
};
static const char* const _adjust_gvar_mode_lookup[] = {
"Cst", "Src", "GVar", "IncDec"
"Cst", "Src", "SrcRaw", "GVar", "IncDec"
};
static void r_customFn(void* user, uint8_t* data, uint32_t bitoffs,
@@ -1657,6 +1657,7 @@ static void r_customFn(void* user, uint8_t* data, uint32_t bitoffs,
CFN_PARAM(cfn) = yaml_str2int(val, l_sep);
break;
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW:
CFN_PARAM(cfn) = r_mixSrcRawEx(nullptr, val, l_sep);
break;
case FUNC_ADJUST_GVAR_GVAR: {
@@ -1842,6 +1843,7 @@ static bool w_customFn(void* user, uint8_t* data, uint32_t bitoffs,
if (!wf(opaque, str, strlen(str))) return false;
break;
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW:
if (!w_mixSrcRawExNoQuote(nullptr, CFN_PARAM(cfn), wf, opaque)) return false;
break;
case FUNC_ADJUST_GVAR_GVAR:
radio/src/translations.cpp
+1
View File
@@ -702,6 +702,7 @@ const char STR_COPY_TRIMS_TO_OFS[] = TR_COPY_TRIMS_TO_OFS;
const char STR_INCDEC[] = TR_INCDEC;
const char STR_GLOBALVAR[] = TR_GLOBALVAR;
const char STR_MIXSOURCE[] = TR_MIXSOURCE;
const char STR_MIXSOURCERAW[] = TR_MIXSOURCERAW;
const char STR_CONSTANT[] = TR_CONSTANT;
const char STR_TOP_BAR[] = TR_TOP_BAR;
const char STR_FLASH_ERASE[] = TR_FLASH_ERASE;
radio/src/translations.h
+1
View File
@@ -1096,6 +1096,7 @@ extern const char STR_COPY_TRIMS_TO_OFS[];
extern const char STR_INCDEC[];
extern const char STR_GLOBALVAR[];
extern const char STR_MIXSOURCE[];
extern const char STR_MIXSOURCERAW[];
extern const char STR_CONSTANT[];
extern const char STR_TOP_BAR[];
extern const char STR_FLASH_ERASE[];
radio/src/translations/cn.h
+2 -1
View File
@@ -943,7 +943,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("微调存为中点", "当前微调按钮值保存到中点")
#define TR_INCDEC "增减"
#define TR_GLOBALVAR "全局变量"
#define TR_MIXSOURCE "混控源"
#define TR_MIXSOURCE "输入源 (%)"
#define TR_MIXSOURCERAW "输入源 (数值)"
#define TR_CONSTANT "固定值"
#define TR_PREFLIGHT_POTSLIDER_CHECK "关闭","开启","自动"
#define TR_PREFLIGHT "初始检查"
radio/src/translations/cz.h
+2 -1
View File
@@ -959,7 +959,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("Trimy do subtrimu", "Kopírovat trimy do subtrimů")
#define TR_INCDEC "Zvětšit/Zmenšit"
#define TR_GLOBALVAR "Glob. proměnná"
#define TR_MIXSOURCE "Zdroje mixeru"
#define TR_MIXSOURCE "Zdroj (%)"
#define TR_MIXSOURCERAW "Zdroj (hodnota)"
#define TR_CONSTANT "Konstanta"
#define TR_PREFLIGHT_POTSLIDER_CHECK "Vyp","Zap","Auto"
#define TR_PREFLIGHT "Předletová kontrola"
radio/src/translations/da.h
+3 -2
View File
@@ -325,7 +325,7 @@
#define TR_SUBTYPE "Subtype"
#define TR_NOFREEEXPO "Ingen fri expo!"
#define TR_NOFREEMIXER "Ingen fri mix!"
#define TR_SOURCE "Kilde"
#define TR_SOURCE "Kilde"
#define TR_WEIGHT "Vægt"
#define TR_SIDE "Side"
#define TR_OFFSET "Offset"
@@ -947,7 +947,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("Kopi trim->subtrim", "Kopier trim til subtrim")
#define TR_INCDEC "Øg/sænk"
#define TR_GLOBALVAR TR("Global var", "Global variabel")
#define TR_MIXSOURCE "Mix kilde"
#define TR_MIXSOURCE "Kilde (%)"
#define TR_MIXSOURCERAW "Kilde (værdi)"
#define TR_CONSTANT "Konstant"
#define TR_PREFLIGHT_POTSLIDER_CHECK "Fra","Til","Auto"
#define TR_PREFLIGHT "Fly checkliste"
radio/src/translations/de.h
+2 -1
View File
@@ -947,7 +947,8 @@
#define TR_COPY_TRIMS_TO_OFS TR3("Copy Trim->Subtrim", "Kopiere Trimm zu Subtrim" , "Kopiere Trimmposition auf Subtrim") // "Trim to Subtrim"
#define TR_INCDEC "Inc/Decrement"
#define TR_GLOBALVAR "Global Var"
#define TR_MIXSOURCE "Mixer Quelle"
#define TR_MIXSOURCE "Quelle (%)"
#define TR_MIXSOURCERAW "Quelle (Wert)"
#define TR_CONSTANT "Konstant"
#define TR_PREFLIGHT_POTSLIDER_CHECK "Aus","Ein","Auto"
#define TR_PREFLIGHT "Vorflug-Checkliste"
radio/src/translations/en.h
+2 -1
View File
@@ -945,7 +945,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("Cpy trim->subtrim", "Copy trims to subtrim")
#define TR_INCDEC "Inc/Decrement"
#define TR_GLOBALVAR "Global var"
#define TR_MIXSOURCE "Mixer source"
#define TR_MIXSOURCE "Source (%)"
#define TR_MIXSOURCERAW "Source (value)"
#define TR_CONSTANT "Constant"
#define TR_PREFLIGHT_POTSLIDER_CHECK "OFF","ON","AUTO"
#define TR_PREFLIGHT "Pre-start Checks"
radio/src/translations/es.h
+2 -1
View File
@@ -944,7 +944,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("Copia trim->subtr", "Copia trims a subtrim")
#define TR_INCDEC "Inc/Decrement"
#define TR_GLOBALVAR "Var global"
#define TR_MIXSOURCE "Entrada mixer"
#define TR_MIXSOURCE "Fuente (%)"
#define TR_MIXSOURCERAW "Fuente (valor)"
#define TR_CONSTANT "Constante"
#define TR_PREFLIGHT_POTSLIDER_CHECK "Off","On","Auto"
#define TR_PREFLIGHT "Chequeos prevuelo"
radio/src/translations/fi.h
+2 -1
View File
@@ -957,7 +957,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("Cpy trim->subtrim", "Copy trims to subtrim")
#define TR_INCDEC "Inc/Decrement"
#define TR_GLOBALVAR "Global Var"
#define TR_MIXSOURCE "Mixer Source"
#define TR_MIXSOURCE "Source (%)"
#define TR_MIXSOURCERAW "Source (value)"
#define TR_CONSTANT "Constant"
#define TR_PREFLIGHT_POTSLIDER_CHECK "Off","On","Auto"
#define TR_PREFLIGHT "Preflight Checks"
radio/src/translations/fr.h
+2 -1
View File
@@ -948,7 +948,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("Cpy trim->subtrim", "Trim vers subtrim")
#define TR_INCDEC "Inc/décrémenter"
#define TR_GLOBALVAR "Var. globale"
#define TR_MIXSOURCE "Source mixeur"
#define TR_MIXSOURCE "Source (%)"
#define TR_MIXSOURCERAW "Source (valeur)"
#define TR_CONSTANT "Constante"
#define TR_PREFLIGHT_POTSLIDER_CHECK "Off","On","Auto"
#define TR_PREFLIGHT "Vérifs avant vol"
radio/src/translations/he.h
+2 -1
View File
@@ -946,7 +946,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("Cpy trim->subtrim", "Copy trims to subtrim")
#define TR_INCDEC "Inc/Decrement"
#define TR_GLOBALVAR "Global var"
#define TR_MIXSOURCE "מקור מיקסר"
#define TR_MIXSOURCE "מקור (%)"
#define TR_MIXSOURCERAW "מקור (ערך)"
#define TR_CONSTANT "Constant"
#define TR_PREFLIGHT_POTSLIDER_CHECK "כבוי","פועל","אוטומטי"
#define TR_PREFLIGHT "מצב הביקורת לשלט"
radio/src/translations/it.h
+2 -1
View File
@@ -941,7 +941,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("Cp. trim->subtrim", "Copia Trims su Subtrim")
#define TR_INCDEC "Inc/Decrementa"
#define TR_GLOBALVAR "Var Globale"
#define TR_MIXSOURCE "Sorgente Mixer"
#define TR_MIXSOURCE "Sorgente (%)"
#define TR_MIXSOURCERAW "Sorgente (valore)"
#define TR_CONSTANT "Constante"
#define TR_PREFLIGHT_POTSLIDER_CHECK "Off","On","Auto"
#define TR_PREFLIGHT "Controlli Prevolo"
radio/src/translations/jp.h
+2 -1
View File
@@ -946,7 +946,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("Cpy trim->subtrim", "トリムからサブトリムへコピー")
#define TR_INCDEC "増加/減少"
#define TR_GLOBALVAR "グローバル変数"
#define TR_MIXSOURCE "ミキサーソース"
#define TR_MIXSOURCE "ソース (%)"
#define TR_MIXSOURCERAW "ソース (値)"
#define TR_CONSTANT "変化なし"
#define TR_PREFLIGHT_POTSLIDER_CHECK "OFF","ON","自動"
#define TR_PREFLIGHT "飛行前チェック"
radio/src/translations/nl.h
+3 -2
View File
@@ -319,7 +319,7 @@
#define TR_SUBTYPE "Subtype"
#define TR_NOFREEEXPO "Geen vrije expo!"
#define TR_NOFREEMIXER "Geen vrije mixer!"
#define TR_SOURCE "Source"
#define TR_SOURCE "Source"
#define TR_WEIGHT "Gewicht"
#define TR_SIDE "Side"
#define TR_OFFSET "Offset"
@@ -943,7 +943,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("Cpy trim->subtrim", "Kopieer Trim naar Subtrim")
#define TR_INCDEC "Inc/Decrement"
#define TR_GLOBALVAR "Globale Var"
#define TR_MIXSOURCE "Mixer Bron"
#define TR_MIXSOURCE "Bron (%)"
#define TR_MIXSOURCERAW "Bron (waarde)"
#define TR_CONSTANT "Constant"
#define TR_PREFLIGHT_POTSLIDER_CHECK "Off","On","Auto"
#define TR_PREFLIGHT "Preflight Checks"
radio/src/translations/pl.h
+3 -2
View File
@@ -319,7 +319,7 @@
#define TR_SUBTYPE "Podtyp"
#define TR_NOFREEEXPO "BrakWoln.Expo!"
#define TR_NOFREEMIXER "BrakWoln.Mixów!"
#define TR_SOURCE "Źródło"
#define TR_SOURCE "Źródło"
#define TR_WEIGHT "Waga "
#define TR_SIDE "Strona"
#define TR_OFFSET "Ofset "
@@ -944,7 +944,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("Cpy trim->subtrim", "Skopiuj Trymery Do subtrymerów")
#define TR_INCDEC "Zwiększ/Zmnie"
#define TR_GLOBALVAR "Zm.Global."
#define TR_MIXSOURCE "Źródło Miks."
#define TR_MIXSOURCE "Źródło (%)"
#define TR_MIXSOURCERAW "Źródło (wartość)"
#define TR_CONSTANT "Stała "
#define TR_PREFLIGHT_POTSLIDER_CHECK "WYŁ","ZAŁ","Auto"
#define TR_PREFLIGHT "Pre-start Checks"
radio/src/translations/pt.h
+2 -1
View File
@@ -950,7 +950,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("Cpy trim->subtrim", "Copy trims to subtrim")
#define TR_INCDEC "Inc/Decrement"
#define TR_GLOBALVAR "Global var"
#define TR_MIXSOURCE "Mixer source"
#define TR_MIXSOURCE "Fonte (%)"
#define TR_MIXSOURCERAW "Fonte (valor)"
#define TR_CONSTANT "Constant"
#define TR_PREFLIGHT_POTSLIDER_CHECK "DESL","LIGA","AUTO"
#define TR_PREFLIGHT "pré-Checks"
radio/src/translations/ru.h
+2 -1
View File
@@ -949,7 +949,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("Коп трим->субтрим", "Коп тримы в субтрим")
#define TR_INCDEC "Увел/Умен"
#define TR_GLOBALVAR "Глоб переменная"
#define TR_MIXSOURCE "Источник микшера"
#define TR_MIXSOURCE "Источ (%)"
#define TR_MIXSOURCERAW "Источ (Значен)"
#define TR_CONSTANT "Постоянное значение"
#define TR_PREFLIGHT_POTSLIDER_CHECK "Выкл","Вкл","Авто"
#define TR_PREFLIGHT "Предстарт проверки"
radio/src/translations/se.h
+2 -1
View File
@@ -970,7 +970,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("Kop. trim->subtrim","Spara trimmar som subtrim")
#define TR_INCDEC "Öka/Minska"
#define TR_GLOBALVAR "Globala var"
#define TR_MIXSOURCE "Mixerkälla"
#define TR_MIXSOURCE "Källa (%)"
#define TR_MIXSOURCERAW "Källa (värde)"
#define TR_CONSTANT "Konstant"
#define TR_PREFLIGHT_POTSLIDER_CHECK "Av","På","Auto"
#define TR_PREFLIGHT "Startkontroller"
radio/src/translations/tw.h
+2 -1
View File
@@ -948,7 +948,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("微調存為中點", "當前微調按鈕值保存到中點")
#define TR_INCDEC "增減"
#define TR_GLOBALVAR "全局變量"
#define TR_MIXSOURCE "混控源"
#define TR_MIXSOURCE "輸入源 (%)"
#define TR_MIXSOURCERAW "輸入源 (數值)"
#define TR_CONSTANT "固定值"
#define TR_PREFLIGHT_POTSLIDER_CHECK "關閉","開啟","自動"
#define TR_PREFLIGHT "初始檢查"
radio/src/translations/ua.h
+2 -1
View File
@@ -949,7 +949,8 @@
#define TR_COPY_TRIMS_TO_OFS TR("Коп трим->субтрим", "Копіювати трим до субтрим")
#define TR_INCDEC "Збільш/Зменш"
#define TR_GLOBALVAR "Глобальна змінна"
#define TR_MIXSOURCE "Джерело мікшеру"
#define TR_MIXSOURCE "Джерело (%)"
#define TR_MIXSOURCERAW "Джерело (Значення)"
#define TR_CONSTANT "Постійна"
#define TR_PREFLIGHT_POTSLIDER_CHECK "OFF","ON","AUTO"
#define TR_PREFLIGHT "Стартові перевірки"