diff --git a/companion/src/firmwares/customfunctiondata.cpp b/companion/src/firmwares/customfunctiondata.cpp index fc5d939a4..d9190c24b 100644 --- a/companion/src/firmwares/customfunctiondata.cpp +++ b/companion/src/firmwares/customfunctiondata.cpp @@ -284,7 +284,7 @@ QString CustomFunctionData::resetToString(const int value, const ModelData * mod if (value < step) { if (value < firmware->getCapability(Timers)) - return RawSource(SOURCE_TYPE_TIMER, value).toString(model); + return RawSource(SOURCE_TYPE_TIMER, value + 1).toString(model); else return QString(CPN_STR_UNKNOWN_ITEM); } @@ -295,18 +295,23 @@ QString CustomFunctionData::resetToString(const int value, const ModelData * mod if (value < ++step) return tr("Telemetry"); + if (value < ++step) + return tr("Trims"); + if (value < step + firmware->getCapability(Sensors)) - return RawSource(SOURCE_TYPE_TELEMETRY, 3 * (value - step + 1)).toString(model); + return RawSource(SOURCE_TYPE_TELEMETRY, 3 * (value - step) + 1).toString(model); return QString(CPN_STR_UNKNOWN_ITEM); } +#define RESET_SENSORS_START CPN_MAX_TIMERS + 3 // keep in sync with above + // static int CustomFunctionData::resetParamCount() { Firmware * firmware = getCurrentFirmware(); - return CPN_MAX_TIMERS + 2 + firmware->getCapability(Sensors); + return RESET_SENSORS_START + firmware->getCapability(Sensors); } // static @@ -320,10 +325,10 @@ bool CustomFunctionData::isResetParamAvailable(const int index, const ModelData else return false; } - else if (index < CPN_MAX_TIMERS + 2) + else if (index < RESET_SENSORS_START) return true; else if (model && index < resetParamCount()) - return model->sensorData[index - (CPN_MAX_TIMERS + 2)].isAvailable(); + return model->sensorData[index - (RESET_SENSORS_START)].isAvailable(); return false; } diff --git a/companion/src/firmwares/edgetx/yaml_customfunctiondata.cpp b/companion/src/firmwares/edgetx/yaml_customfunctiondata.cpp index 4a64ad22c..73220b183 100644 --- a/companion/src/firmwares/edgetx/yaml_customfunctiondata.cpp +++ b/companion/src/firmwares/edgetx/yaml_customfunctiondata.cpp @@ -98,6 +98,7 @@ static const YamlLookupTable resetLut = { { 2, "Tmr3" }, { 3, "All" }, { 4, "Tele" }, + { 5, "Trims" }, }; static const YamlLookupTable gvarModeLut = { diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp index aa2a14edd..58f80c672 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.cpp +++ b/companion/src/firmwares/opentx/opentxeeprom.cpp @@ -1855,6 +1855,8 @@ class ArmCustomFunctionField: public TransformedField { } else if (fn.func == FuncReset) { fn.param = value; + if (fn.param > 4) // EdgeTx 2.11 Trims inserted before telemetry + fn.param += 1; } else { fn.param = value; diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index 2700006f1..abfd5603b 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -630,6 +630,7 @@ enum ResetFunctionParam { FUNC_RESET_TIMER3, FUNC_RESET_FLIGHT, FUNC_RESET_TELEMETRY, + FUNC_RESET_TRIMS, FUNC_RESET_PARAM_FIRST_TELEM, FUNC_RESET_PARAM_LAST_TELEM = FUNC_RESET_PARAM_FIRST_TELEM + MAX_TELEMETRY_SENSORS, FUNC_RESET_PARAMS_COUNT SKIP, diff --git a/radio/src/functions.cpp b/radio/src/functions.cpp index 7b635e45f..ca7a1e86a 100644 --- a/radio/src/functions.cpp +++ b/radio/src/functions.cpp @@ -215,6 +215,13 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext case FUNC_RESET_TELEMETRY: telemetryReset(); break; + + case FUNC_RESET_TRIMS: { + for (uint8_t i = 0; i < keysGetMaxTrims(); i++) { + setTrimValue(mixerCurrentFlightMode, i, 0); + } + break; + } } if (CFN_PARAM(cfn) >= FUNC_RESET_PARAM_FIRST_TELEM) { uint8_t item = CFN_PARAM(cfn) - FUNC_RESET_PARAM_FIRST_TELEM; diff --git a/radio/src/storage/yaml/yaml_datastructs_funcs.cpp b/radio/src/storage/yaml/yaml_datastructs_funcs.cpp index 437bf7b26..0f99fa061 100644 --- a/radio/src/storage/yaml/yaml_datastructs_funcs.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_funcs.cpp @@ -1456,7 +1456,7 @@ static bool w_flightModes(const YamlNode* node, uint32_t val, } static const char* const _func_reset_param_lookup[] = { - "Tmr1","Tmr2","Tmr3","All","Tele" + "Tmr1","Tmr2","Tmr3","All","Tele","Trims" }; static const char* const _func_failsafe_lookup[] = { @@ -1545,6 +1545,13 @@ static void r_customFn(void* user, uint8_t* data, uint32_t bitoffs, && val[2] == 'l' && val[3] == 'e') { CFN_PARAM(cfn) = FUNC_RESET_TELEMETRY; + } else if (l_sep == 5 + && val[0] == 'T' + && val[1] == 'r' + && val[2] == 'i' + && val[3] == 'm' + && val[4] == 's') { + CFN_PARAM(cfn) = FUNC_RESET_TRIMS; } else { uint32_t sensor = yaml_str2uint(val, l_sep); CFN_PARAM(cfn) = sensor + FUNC_RESET_PARAM_FIRST_TELEM; @@ -1764,7 +1771,7 @@ static bool w_customFn(void* user, uint8_t* data, uint32_t bitoffs, case FUNC_RESET: if (CFN_PARAM(cfn) < FUNC_RESET_PARAM_FIRST_TELEM) { - // Tmr1,Tmr2,Tmr3,All + // Tmr1,Tmr2,Tmr3,All,Tele, Trims str = _func_reset_param_lookup[CFN_PARAM(cfn)]; } else { // sensor index diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index 6d111a878..1c208210a 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -115,12 +115,14 @@ #define TR_FSW_RESET_TELEM "回传参数" #if LCD_W >= 212 + #define TR_FSW_RESET_TRIMS "Trims" #define TR_FSW_RESET_TIMERS "计时器1","计时器2","计时器3" #else + #define TR_FSW_RESET_TRIMS "Trims" #define TR_FSW_RESET_TIMERS "计时1","计时2","计时3" #endif -#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("全部","飞行"),TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("全部","飞行"),TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Bp1","Beep1"),TR("Bp2","Beep2"),TR("Bp3","Beep3"),TR("Wrn1","Warn1"),TR("Wrn2","Warn2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Sirn","Siren"),"Ring",TR("SciF","SciFi"),TR("Robt","Robot"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk") diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index 9f26aec6a..3ca3b9c44 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -128,12 +128,14 @@ #define TR_FSW_RESET_TELEM TR("Telm","Telemetrie") #if LCD_W >= 212 - #define TR_FSW_RESET_TIMERS "Stopky1","Stopky2","Stopky3" + #define TR_FSW_RESET_TRIMS "Trims" +#define TR_FSW_RESET_TIMERS "Stopky1","Stopky2","Stopky3" #else - #define TR_FSW_RESET_TIMERS "Čas1","Čas2","Čas3" + #define TR_FSW_RESET_TRIMS "Trims" +#define TR_FSW_RESET_TIMERS "Čas1","Čas2","Čas3" #endif -#define TR_VFSWRESET TR_FSW_RESET_TIMERS,"Vše",TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,"Vše",TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Píp1","Pípnutí1"),TR("Píp2","Pípnutí2"),TR("Píp3","Pípnutí3"),TR("Var1","Varování1"),TR("Var2","Varování2"),TR("Chee","Cheep"),TR("Rata", "Ratata"),"Tick",TR("Sirn","Siréna"),"Ring",TR("SciF","SciFi"),TR("Robt","Robot"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk") #define LENGTH_UNIT_IMP "ft" diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index a40371762..8f50a1a76 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -124,10 +124,11 @@ #define TR_SF_LCD_TO_VIDEO "LCD to Video" #define TR_FSW_RESET_TELEM TR("Telm", "Telemetri") +#define TR_FSW_RESET_TRIMS "Trims" #define TR_FSW_RESET_TIMERS "Tid1","Tid2","Tid3" -#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("Alle","Flight"),TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("Alle","Flight"),TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Bi1","Bip1"),TR("Bi2","Bip2"),TR("Bi3","Bi3"),TR("Adv1","Advarsel1"),TR("Adv2","Advarsel2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Sirn","Sirene"),"Ring",TR("SciF","SciFi"),TR("Robt","Robot"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk") diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index 2c981b134..9b54be288 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -121,10 +121,11 @@ #define TR_SF_LCD_TO_VIDEO "LCD to Video" #define TR_FSW_RESET_TELEM TR("Telm","Telemetrie") +#define TR_FSW_RESET_TRIMS "Trims" #define TR_FSW_RESET_TIMERS "Tmr1","Tmr2","Tmr3" -#define TR_VFSWRESET TR_FSW_RESET_TIMERS,"All",TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,"All",TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Bp1","Piep1"),TR("Bp2","Piep2"),TR("Bp3","Piep3"),TR("Wrn1","Warn1"),TR("Wrn2","Warn2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Sirn","Siren"),"Ring",TR("SciF","SciFi"),TR("Robt","Robot"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk") diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index c63d967f6..e03dda3fd 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -122,9 +122,10 @@ #define TR_SF_LCD_TO_VIDEO "LCD to Video" #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") +#define TR_FSW_RESET_TRIMS "Trims" #define TR_FSW_RESET_TIMERS "Tmr1","Tmr2","Tmr3" -#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("All","Flight"),TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("All","Flight"),TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Bp1","Beep1"),TR("Bp2","Beep2"),TR("Bp3","Beep3"),TR("Wrn1","Warn1"),TR("Wrn2","Warn2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Sirn","Siren"),"Ring",TR("SciF","SciFi"),TR("Robt","Robot"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk") diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index 0b59a940a..4faf222b8 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -119,9 +119,10 @@ #define TR_SF_LCD_TO_VIDEO "LCD to Video" #define TR_FSW_RESET_TELEM TR("Telm", "Telemetría") +#define TR_FSW_RESET_TRIMS "Trims" #define TR_FSW_RESET_TIMERS "Tmr1","Tmr2","Tmr3" -#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("Todo","Vuelo"),TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("Todo","Vuelo"),TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Bp1","Beep1"),TR("Bp2","Beep2"),TR("Bp3","Beep3"),TR("Avs1","Aviso1"),TR("Avs2","Aviso2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Sirn","Siren"),"Ring",TR("SciF","SciFi"),TR("Robt","Robot"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk") diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index 3e0f04b90..59a40c254 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -124,9 +124,10 @@ #define TR_SF_LCD_TO_VIDEO "LCD to Video" #define TR_FSW_RESET_TELEM TR("Telm","Telemetry") -#define TR_FSW_RESET_TIMERS "Tmr1","Tmr2","Tmr3" +#define TR_FSW_RESET_TRIMS "Trims" +#define TR_FSW_RESET_TIMERS "Tmr1","Tmr2","Tmr3" -#define TR_VFSWRESET TR_FSW_RESET_TIMERS,"All",TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,"All",TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Bp1","Beep1"),TR("Bp2","Beep2"),TR("Bp3","Beep3"),TR("Wrn1","Warn1"),TR("Wrn2","Warn2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Sirn","Siren"),"Ring",TR("SciF","SciFi"),TR("Robt","Robot"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk") diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index bed552e74..41425b264 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -123,10 +123,11 @@ #define TR_SF_LCD_TO_VIDEO "LCD to Video" #define TR_FSW_RESET_TELEM TR("Télem.", "Télémétrie") -#define TR_FSW_RESET_TIMERS "Chr1","Chr2","Chr3" +#define TR_FSW_RESET_TRIMS "Trims" +#define TR_FSW_RESET_TIMERS "Chr1","Chr2","Chr3" -#define TR_VFSWRESET TR_FSW_RESET_TIMERS, "Tout", TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,"Tout",TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Bp1","Beep1"),TR("Bp2","Beep2"),TR("Bp3","Beep3"),TR("Wrn1","Warn1"),TR("Wrn2","Warn2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Sirn","Siren"),"Ring",TR("SciF","SciFi"),TR("Robt","Robot"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk") #if LCD_W >= 212 diff --git a/radio/src/translations/he.h b/radio/src/translations/he.h index 234554898..38fc65307 100644 --- a/radio/src/translations/he.h +++ b/radio/src/translations/he.h @@ -125,10 +125,11 @@ #define TR_SF_LCD_TO_VIDEO "LCD to Video" #define TR_FSW_RESET_TELEM TR("Telm", "טלמטריה") +#define TR_FSW_RESET_TRIMS "Trims" #define TR_FSW_RESET_TIMERS "שעון 1","שעון 2","שעון 3" -#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("All","Flight"),TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("All","Flight"),TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Bp1","Beep1"),TR("Bp2","Beep2"),TR("Bp3","Beep3"),TR("Wrn1","Warn1"),TR("Wrn2","Warn2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Sirn","Siren"),"Ring",TR("SciF","SciFi"),TR("Robt","Robot"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk") diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index ea4022162..3e48c4413 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -122,10 +122,11 @@ #define TR_SF_LCD_TO_VIDEO "LCD to Video" #define TR_FSW_RESET_TELEM TR("Telm", "Telemetria") +#define TR_FSW_RESET_TRIMS "Trims" #define TR_FSW_RESET_TIMERS "Tmr1","Tmr2","Tmr3" -#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("All","Tutto"),TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("All","Tutto"),TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Bp1","Beep1"),TR("Bp2","Beep2"),TR("Bp3","Beep3"),TR("Wrn1","Warn1"),TR("Wrn2","Warn2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Sirn","Siren"),"Ring",TR("SciF","SciFi"),TR("Robt","Robot"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk") diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index 99bd233cd..ef16e724b 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -122,9 +122,10 @@ #define TR_SF_LCD_TO_VIDEO "LCD to Video" #define TR_FSW_RESET_TELEM TR("Telm", "テレメトリー") +#define TR_FSW_RESET_TRIMS "Trims" #define TR_FSW_RESET_TIMERS "Tmr1","Tmr2","Tmr3" -#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("すべて","飛行時"),TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("すべて","飛行時"),TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Bp1","Beep1"),TR("Bp2","Beep2"),TR("Bp3","Beep3"),TR("Wrn1","Warn1"),TR("Wrn2","Warn2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Sirn","Siren"),"Ring",TR("SciF","SciFi"),TR("Robt","Robot"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk") diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index b917ef777..c658e806a 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -118,10 +118,11 @@ #define TR_SF_SET_SCREEN "Set Main Screen" #define TR_SF_LCD_TO_VIDEO "LCD to Video" -#define TR_FSW_RESET_TELEM TR("Telm", "Telemetrie") -#define TR_FSW_RESET_TIMERS "Tmr1","Tmr2","Tmr3" +#define TR_FSW_RESET_TELEM TR("Telm", "Telemetrie") +#define TR_FSW_RESET_TRIMS "Trims" +#define TR_FSW_RESET_TIMERS "Tmr1","Tmr2","Tmr3" -#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("All","Vliegdata"),TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("All","Vliegdata"),TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Bp1","Beep1"),TR("Bp2","Beep2"),TR("Bp3","Beep3"),TR("Wrn1","Warn1"),TR("Wrn2","Warn2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Sirn","Siren"),"Ring",TR("SciF","SciFi"),TR("Robt","Robot"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk") diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index 2213d1a13..ea140047d 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -118,10 +118,11 @@ #define TR_SF_LCD_TO_VIDEO "LCD to Video" #define TR_FSW_RESET_TELEM TR("Telm", "Telemetra") +#define TR_FSW_RESET_TRIMS "Trims" #define TR_FSW_RESET_TIMERS "Tmr1","Tmr2","Tmr3" -#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("All","Flight"),TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("All","Flight"),TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Bp1","Beep1"),TR("Bp2","Beep2"),TR("Bp3","Beep3"),TR("Ost1","Ostrz1"),TR("Ost2","Ostrz2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Syre","Syrena"),TR("Dzwo","Dzwone"),TR("Crck","Krytcz"),TR("Alrm","AlmZeg") #define LENGTH_UNIT_IMP "ft" diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index b3e1c7b5f..6e541df5e 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -125,9 +125,10 @@ #define TR_SF_LCD_TO_VIDEO "LCD to Video" #define TR_FSW_RESET_TELEM TR("Telm", "Telemetria") -#define TR_FSW_RESET_TIMERS "Tmr1","Tmr2","Tmr3" +#define TR_FSW_RESET_TRIMS "Trims" +#define TR_FSW_RESET_TIMERS "Tmr1","Tmr2","Tmr3" -#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("All","Flight"),TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("All","Flight"),TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Bp1","Bipe1"),TR("Bp2","Bipe2"),TR("Bp3","Bipe3"),TR("Wrn1","Avis1"),TR("Wrn2","Avis2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Sirn","Siren"),"Ring",TR("SciF","SciFi"),TR("Robt","Robô"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk") diff --git a/radio/src/translations/ru.h b/radio/src/translations/ru.h index bc5f7a8be..3c521f5e9 100644 --- a/radio/src/translations/ru.h +++ b/radio/src/translations/ru.h @@ -124,9 +124,10 @@ #define TR_SF_LCD_TO_VIDEO "LCD to Video" #define TR_FSW_RESET_TELEM TR("Телем", "Телеметрия") +#define TR_FSW_RESET_TRIMS "Trims" #define TR_FSW_RESET_TIMERS "Тмр1","Трм2","Трм3" -#define TR_VFSWRESET TR_FSW_RESET_TIMERS, TR("Все","Полетн"), TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS, TR("Все","Полетн"), TR_FSW_RESET_TELEM, TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Bp1","Beep1"),TR("Bp2","Beep2"),TR("Bp3","Beep3"),TR("Wrn1","Warn1"),TR("Wrn2","Warn2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Sirn","Siren"),"Ring",TR("SciF","SciFi"),TR("Robt","Robot"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk") diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index 011407b7a..1a31b1a67 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -128,9 +128,10 @@ #define TR_SF_LCD_TO_VIDEO "LCD to Video" #define TR_FSW_RESET_TELEM TR("Telm","Telemetri") +#define TR_FSW_RESET_TRIMS "Trims" #define TR_FSW_RESET_TIMERS "Tmr1","Tmr2","Tmr3" -#define TR_VFSWRESET TR_FSW_RESET_TIMERS,"Alla",TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,"Alla",TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Bp1","Beep1"),TR("Bp2","Beep2"),TR("Bp3","Beep3"),TR("Wrn1","Warn1"),TR("Wrn2","Warn2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Sirn","Siren"),"Ring",TR("SciF","SciFi"),TR("Robt","Robot"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk") diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index 62b3e9738..9e61186c0 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -120,12 +120,14 @@ #define TR_FSW_RESET_TELEM "回傳參數" #if LCD_W >= 212 - #define TR_FSW_RESET_TIMERS "計時器1","計時器2","計時器3" + #define TR_FSW_RESET_TRIMS "Trims" + #define TR_FSW_RESET_TIMERS "計時器1","計時器2","計時器3" #else - #define TR_FSW_RESET_TIMERS "計時1","計時2","計時3" + #define TR_FSW_RESET_TRIMS "Trims" +#define TR_FSW_RESET_TIMERS "計時1","計時2","計時3" #endif -#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("全部","飛行"),TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("全部","飛行"),TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Bp1","Beep1"),TR("Bp2","Beep2"),TR("Bp3","Beep3"),TR("Wrn1","Warn1"),TR("Wrn2","Warn2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Sirn","Siren"),"Ring",TR("SciF","SciFi"),TR("Robt","Robot"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk") diff --git a/radio/src/translations/ua.h b/radio/src/translations/ua.h index c6ef6f5bb..80b4f8a43 100644 --- a/radio/src/translations/ua.h +++ b/radio/src/translations/ua.h @@ -124,9 +124,10 @@ #define TR_SF_LCD_TO_VIDEO "LCD to Video" #define TR_FSW_RESET_TELEM TR("Телем", "Телеметрія") +#define TR_FSW_RESET_TRIMS "Trims" #define TR_FSW_RESET_TIMERS "Тмр1","Тмр2","Тмр3" -#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("Все","Політ"),TR_FSW_RESET_TELEM +#define TR_VFSWRESET TR_FSW_RESET_TIMERS,TR("Все","Політ"),TR_FSW_RESET_TELEM,TR_FSW_RESET_TRIMS #define TR_FUNCSOUNDS TR("Сг1","Синг.1"),TR("Сг2","Синг.2"),TR("Сг3","Синг.3"),TR("Wrn1","Warn1"),TR("Wrn2","Warn2"),TR("Chee","Cheep"),TR("Rata","Ratata"),"Tick",TR("Sirn","Siren"),"Ring",TR("SciF","SciFi"),TR("Robt","Robot"),TR("Chrp","Chirp"),"Tada",TR("Crck","Crickt"),TR("Alrm","AlmClk")