Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add "Trims" option to Reset special function #5278

Merged
merged 7 commits into from
Jul 28, 2024
Merged

feat: add "Trims" option to Reset special function #5278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2faa565
feat: SF reset trims (radio only)
Jul 10, 2024
ef83146
chore: cosmetics
Jul 10, 2024
69a5a07
feat: companion support
Jul 10, 2024
ce10904
feat: continued Companion support
Jul 11, 2024
7b0affd
define has only local scope so move from global scope and rename
elecpower Jul 12, 2024
c54728d
sf binary import shift +1 telemetry values
elecpower Jul 12, 2024
35f4d84
fix: remove trailing comma, add missed `TR_FSW_RESET_TRIMS`
pfeerick Jul 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions companion/src/firmwares/customfunctiondata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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
Expand All @@ -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;
}
Expand Down
1 change: 1 addition & 0 deletions companion/src/firmwares/edgetx/yaml_customfunctiondata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ static const YamlLookupTable resetLut = {
{ 2, "Tmr3" },
{ 3, "All" },
{ 4, "Tele" },
{ 5, "Trims" },
};

static const YamlLookupTable gvarModeLut = {
Expand Down
2 changes: 2 additions & 0 deletions companion/src/firmwares/opentx/opentxeeprom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions radio/src/dataconstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 7 additions & 0 deletions radio/src/functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 9 additions & 2 deletions radio/src/storage/yaml/yaml_datastructs_funcs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion radio/src/translations/cn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
8 changes: 5 additions & 3 deletions radio/src/translations/cz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion radio/src/translations/da.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
3 changes: 2 additions & 1 deletion radio/src/translations/de.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
3 changes: 2 additions & 1 deletion radio/src/translations/en.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
3 changes: 2 additions & 1 deletion radio/src/translations/es.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
5 changes: 3 additions & 2 deletions radio/src/translations/fi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
5 changes: 3 additions & 2 deletions radio/src/translations/fr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion radio/src/translations/he.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
3 changes: 2 additions & 1 deletion radio/src/translations/it.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
3 changes: 2 additions & 1 deletion radio/src/translations/jp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
7 changes: 4 additions & 3 deletions radio/src/translations/nl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
3 changes: 2 additions & 1 deletion radio/src/translations/pl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions radio/src/translations/pt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
3 changes: 2 additions & 1 deletion radio/src/translations/ru.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
3 changes: 2 additions & 1 deletion radio/src/translations/se.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")


Expand Down
8 changes: 5 additions & 3 deletions radio/src/translations/tw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
3 changes: 2 additions & 1 deletion radio/src/translations/ua.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
Loading