Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 06:15:10 +03:00
Code Issues Wiki Activity

Merge pull request #578 from opentx/bsongis/Issue552_checkbox_for_reset_custom_function

Browse source 
Issue #552 fixed
This commit is contained in:
Andre Bernet 2014-01-23 11:25:01 -08:00
commit a9e8450578
13 changed files with 66 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

8
companion/src/helpers.cpp
View file

@ -420,6 +420,14 @@ void populateFuncParamCB(QComboBox *b, const ModelData & model, uint function, u
qs.append( QObject::tr("Timer2")); qs.append( QObject::tr("Timer2"));
qs.append( QObject::tr("All")); qs.append( QObject::tr("All"));
qs.append( QObject::tr("Telemetry")); qs.append( QObject::tr("Telemetry"));
int reCount = GetEepromInterface()->getCapability(RotaryEncoders);
if (reCount == 1) {
qs.append( QObject::tr("Rotary Encoder"));
}
else if (reCount == 2) {
qs.append( QObject::tr("REa"));
qs.append( QObject::tr("REb"));
}
b->addItems(qs); b->addItems(qs);
b->setCurrentIndex(value); b->setCurrentIndex(value);
} }

2
companion/src/modeledit/customfunctions.cpp
View file

@ -336,7 +336,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
else if (index==FuncReset) { else if (index==FuncReset) {
if (modified) model.funcSw[i].param = (uint8_t)fswtchParamT[i]->currentIndex(); if (modified) model.funcSw[i].param = (uint8_t)fswtchParamT[i]->currentIndex();
populateFuncParamCB(fswtchParamT[i], model, index, model.funcSw[i].param); populateFuncParamCB(fswtchParamT[i], model, index, model.funcSw[i].param);
widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM; widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM | CUSTOM_FUNCTION_ENABLE;
} }
else if (index==FuncVolume) { else if (index==FuncVolume) {
if (modified) model.funcSw[i].param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt(); if (modified) model.funcSw[i].param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt();

4
radio/src/gui/menu_model.cpp
View file

@ -4938,11 +4938,13 @@ void menuModelCustomFunctions(uint8_t event)
break; break;
case 3: case 3:
if (sd->swtch && (CFN_FUNC(sd) <= FUNC_INSTANT_TRIM if (sd->swtch && (CFN_FUNC(sd) <= FUNC_INSTANT_TRIM || CFN_FUNC(sd) == FUNC_RESET
#if defined(GVARS) #if defined(GVARS)
// TODO #define
|| CFN_FUNC(sd) >= FUNC_ADJUST_GV1 || CFN_FUNC(sd) >= FUNC_ADJUST_GV1
#endif #endif
#if defined(CPUARM) #if defined(CPUARM)
// TODO #define
|| CFN_FUNC(sd) == FUNC_VOLUME || CFN_FUNC(sd) == FUNC_VOLUME
#endif #endif
)) { )) {

2
radio/src/opentx.cpp
View file

@ -3135,7 +3135,7 @@ void evalFunctions()
} }
} }
} }
else if (CFN_FUNC(sd) <= FUNC_INSTANT_TRIM) { else if (CFN_FUNC(sd) <= FUNC_INSTANT_TRIM || CFN_FUNC(sd) == FUNC_RESET) {
active = false; active = false;
} }

14
radio/src/translations/cz.h.txt
View file

@ -212,23 +212,23 @@
#define TR_VFSWFUNC "Zámek \0 ""Trenér \0 ""Insta-Trim\0" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Podsvětlení" TR_CFN_ADJUST_GVAR TR_CFN_TEST #define TR_VFSWFUNC "Zámek \0 ""Trenér \0 ""Insta-Trim\0" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Podsvětlení" TR_CFN_ADJUST_GVAR TR_CFN_TEST
#endif #endif
#define LEN_VFSWRESET "\005" #define LEN_VFSWRESET TR("\004", "\011")
#if defined(FRSKY) #if defined(FRSKY)
#define TR_FSW_RESET_TELEM "Telem" #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry")
#else #else
#define TR_FSW_RESET_TELEM #define TR_FSW_RESET_TELEM
#endif #endif
#if ROTARY_ENCODERS == 2 #if ROTARY_ENCODERS == 2
#define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") #define TR_FSW_RESET_ROTENC TR("REa\0""REb\0", "RotEnc A\0""RotEnc B\0")
#elif ROTARY_ENCODERS == 1 #elif ROTARY_ENCODERS == 1
#define TR_FSW_RESET_ROTENC TR("R.Enc", "RotEnc\0 ") #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ")
#else #else
#define TR_FSW_RESET_ROTENC #define TR_FSW_RESET_ROTENC
#endif #endif
#define TR_VFSWRESET "Tmr1\0""Tmr2\0""Vše\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC #define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC)
#define LEN_FUNCSOUNDS TR("\004", "\006") #define LEN_FUNCSOUNDS TR("\004", "\006")
#define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk")

12
radio/src/translations/de.h.txt
View file

@ -211,23 +211,23 @@
#define TR_VFSWFUNC "Sicher\0 ""Lehrer \0 ""Inst. Trim" TR_SOUND TR_HAPTIC "R\205cksetz.\0" TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "LCD Licht\0" TR_CFN_ADJUST_GVAR TR_CFN_TEST #define TR_VFSWFUNC "Sicher\0 ""Lehrer \0 ""Inst. Trim" TR_SOUND TR_HAPTIC "R\205cksetz.\0" TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "LCD Licht\0" TR_CFN_ADJUST_GVAR TR_CFN_TEST
#endif #endif
#define LEN_VFSWRESET TR("\005", "\011") #define LEN_VFSWRESET TR("\004", "\011")
#if defined(FRSKY) #if defined(FRSKY)
#define TR_FSW_RESET_TELEM TR("Telem", "Telemetrie ") //\200nderung #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry")
#else #else
#define TR_FSW_RESET_TELEM #define TR_FSW_RESET_TELEM
#endif #endif
#if ROTARY_ENCODERS == 2 #if ROTARY_ENCODERS == 2
#define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") #define TR_FSW_RESET_ROTENC TR("REa\0""REb\0", "RotEnc A\0""RotEnc B\0")
#elif ROTARY_ENCODERS == 1 #elif ROTARY_ENCODERS == 1
#define TR_FSW_RESET_ROTENC TR("R.Enc", "RotEnc\0 ") #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ")
#else #else
#define TR_FSW_RESET_ROTENC #define TR_FSW_RESET_ROTENC
#endif #endif
#define TR_VFSWRESET TR("Tmr1\0""Tmr2\0""Alle\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1 ""Timer 2 ""Alle Tmr." TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) #define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC)
#define LEN_FUNCSOUNDS TR("\004", "\006") #define LEN_FUNCSOUNDS TR("\004", "\006")
#define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Piep1\0""Piep2\0""Piep3\0""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Piep1\0""Piep2\0""Piep3\0""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk")

10
radio/src/translations/en.h
View file

@ -212,23 +212,23 @@
#define TR_VFSWFUNC "Safety\0 ""Trainer\0 ""Inst. Trim" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Backlight\0" TR_CFN_ADJUST_GVAR TR_CFN_TEST #define TR_VFSWFUNC "Safety\0 ""Trainer\0 ""Inst. Trim" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Backlight\0" TR_CFN_ADJUST_GVAR TR_CFN_TEST
#endif #endif
#define LEN_VFSWRESET TR("\005", "\011") #define LEN_VFSWRESET TR("\004", "\011")
#if defined(FRSKY) #if defined(FRSKY)
#define TR_FSW_RESET_TELEM TR("Telem", "Telemetry") #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry")
#else #else
#define TR_FSW_RESET_TELEM #define TR_FSW_RESET_TELEM
#endif #endif
#if ROTARY_ENCODERS == 2 #if ROTARY_ENCODERS == 2
#define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") #define TR_FSW_RESET_ROTENC TR("REa\0""REb\0", "RotEnc A\0""RotEnc B\0")
#elif ROTARY_ENCODERS == 1 #elif ROTARY_ENCODERS == 1
#define TR_FSW_RESET_ROTENC TR("R.Enc", "RotEnc\0 ") #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ")
#else #else
#define TR_FSW_RESET_ROTENC #define TR_FSW_RESET_ROTENC
#endif #endif
#define TR_VFSWRESET TR("Tmr1\0""Tmr2\0""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1 ""Timer 2 ""All " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) #define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC)
#define LEN_FUNCSOUNDS TR("\004", "\006") #define LEN_FUNCSOUNDS TR("\004", "\006")
#define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk")

10
radio/src/translations/es.h.txt
View file

@ -211,23 +211,23 @@
#define TR_VFSWFUNC "Seguro\0 ""Aprendiz\0 ""Inst. Trim" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Luz fondo\0" TR_CFN_ADJUST_GVAR TR_CFN_TEST #define TR_VFSWFUNC "Seguro\0 ""Aprendiz\0 ""Inst. Trim" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Luz fondo\0" TR_CFN_ADJUST_GVAR TR_CFN_TEST
#endif #endif
#define LEN_VFSWRESET TR("\005", "\011") #define LEN_VFSWRESET TR("\004", "\011")
#if defined(FRSKY) #if defined(FRSKY)
#define TR_FSW_RESET_TELEM TR("Telem", "Telemetria") #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry")
#else #else
#define TR_FSW_RESET_TELEM #define TR_FSW_RESET_TELEM
#endif #endif
#if ROTARY_ENCODERS == 2 #if ROTARY_ENCODERS == 2
#define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") #define TR_FSW_RESET_ROTENC TR("REa\0""REb\0", "RotEnc A\0""RotEnc B\0")
#elif ROTARY_ENCODERS == 1 #elif ROTARY_ENCODERS == 1
#define TR_FSW_RESET_ROTENC TR("R.Enc", "RotEnc\0 ") #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ")
#else #else
#define TR_FSW_RESET_ROTENC #define TR_FSW_RESET_ROTENC
#endif #endif
#define TR_VFSWRESET TR("Tmr1\0""Tmr2\0""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Reloj 1 ""Reloj 2 ""Todo " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) #define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC)
#define LEN_FUNCSOUNDS TR("\004", "\006") #define LEN_FUNCSOUNDS TR("\004", "\006")
#define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Avs1""Avs2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Aviso1""Aviso2""Cheep ""Ratata""Tick ""Sirena""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Avs1""Avs2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Aviso1""Aviso2""Cheep ""Ratata""Tick ""Sirena""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk")

10
radio/src/translations/fr.h.txt
View file

@ -211,23 +211,23 @@
#define TR_VFSWFUNC "Sécur.\0 ""Ecolage\0 ""Trim instant." TR_SOUND TR_HAPTIC "Remise à 0\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Rétroécl.\0 " TR_CFN_ADJUST_GVAR TR_CFN_TEST #define TR_VFSWFUNC "Sécur.\0 ""Ecolage\0 ""Trim instant." TR_SOUND TR_HAPTIC "Remise à 0\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Rétroécl.\0 " TR_CFN_ADJUST_GVAR TR_CFN_TEST
#endif #endif
#define LEN_VFSWRESET "\006" #define LEN_VFSWRESET TR("\004","\012")
#if defined(FRSKY) #if defined(FRSKY)
#define TR_FSW_RESET_TELEM "Télém." #define TR_FSW_RESET_TELEM TR("Télm","Télémesure")
#else #else
#define TR_FSW_RESET_TELEM #define TR_FSW_RESET_TELEM
#endif #endif
#if ROTARY_ENCODERS == 2 #if ROTARY_ENCODERS == 2
#define TR_FSW_RESET_ROTENC TR("ERa\0 ""ERb\0 ", "EncRot A\0""EncRot B\0") #define TR_FSW_RESET_ROTENC TR("ERa\0""ERb\0","Enc.Rot.A\0""Enc.Rot.B\0")
#elif ROTARY_ENCODERS == 1 #elif ROTARY_ENCODERS == 1
#define TR_FSW_RESET_ROTENC TR("Enc.r", "EncRot\0 ") #define TR_FSW_RESET_ROTENC TR("EncR", "Enc.Rot\0 ")
#else #else
#define TR_FSW_RESET_ROTENC #define TR_FSW_RESET_ROTENC
#endif #endif
#define TR_VFSWRESET "Timer1""Timer2""Timers" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC #define TR_VFSWRESET TR("Chr1""Chr2""Tout" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC,"Chrono 1\0 ""Chrono 2\0 ""Tout\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC)
#define LEN_FUNCSOUNDS TR("\004", "\006") #define LEN_FUNCSOUNDS TR("\004", "\006")
#define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk")

12
radio/src/translations/it.h.txt
View file

@ -211,23 +211,23 @@
#define TR_VFSWFUNC "Blocco\0 ""Maestro \0 ""Trim Instant " TR_SOUND TR_HAPTIC "Azzera\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Retroillum.\0 " TR_CFN_ADJUST_GVAR TR_CFN_TEST #define TR_VFSWFUNC "Blocco\0 ""Maestro \0 ""Trim Instant " TR_SOUND TR_HAPTIC "Azzera\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Retroillum.\0 " TR_CFN_ADJUST_GVAR TR_CFN_TEST
#endif #endif
#define LEN_VFSWRESET "\006" #define LEN_VFSWRESET TR("\004", "\011")
#if defined(FRSKY) #if defined(FRSKY)
#define TR_FSW_RESET_TELEM "Telem." #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry")
#else #else
#define TR_FSW_RESET_TELEM #define TR_FSW_RESET_TELEM
#endif #endif
#if ROTARY_ENCODERS == 2 #if ROTARY_ENCODERS == 2
#define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") #define TR_FSW_RESET_ROTENC TR("REa\0""REb\0", "RotEnc A\0""RotEnc B\0")
#elif ROTARY_ENCODERS == 1 #elif ROTARY_ENCODERS == 1
#define TR_FSW_RESET_ROTENC TR("R.Enc", "RotEnc\0 ") #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ")
#else #else
#define TR_FSW_RESET_ROTENC #define TR_FSW_RESET_ROTENC
#endif #endif
#define TR_VFSWRESET "Timer1""Timer2""Tutto " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC #define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC)
#define LEN_FUNCSOUNDS TR("\004", "\006") #define LEN_FUNCSOUNDS TR("\004", "\006")
#define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk")

14
radio/src/translations/pl.h.txt
View file

@ -213,23 +213,23 @@
#define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim " TR_SOUND TR_HAPTIC "Reset " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Podświetl. " TR_CFN_ADJUST_GVAR TR_CFN_TEST #define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim " TR_SOUND TR_HAPTIC "Reset " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Podświetl. " TR_CFN_ADJUST_GVAR TR_CFN_TEST
#endif #endif
#define LEN_VFSWRESET "\005" #define LEN_VFSWRESET TR("\004", "\011")
#if defined(FRSKY) #if defined(FRSKY)
#define TR_FSW_RESET_TELEM "Telem" #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry")
#else #else
#define TR_FSW_RESET_TELEM #define TR_FSW_RESET_TELEM
#endif #endif
#if ROTARY_ENCODERS == 2 #if ROTARY_ENCODERS == 2
#define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") #define TR_FSW_RESET_ROTENC TR("REa\0""REb\0", "RotEnc A\0""RotEnc B\0")
#elif ROTARY_ENCODERS == 1 #elif ROTARY_ENCODERS == 1
#define TR_FSW_RESET_ROTENC TR("R.Enc", "RotEnc\0 ") #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ")
#else #else
#define TR_FSW_RESET_ROTENC #define TR_FSW_RESET_ROTENC
#endif #endif
#define TR_VFSWRESET "Tmr1\0""Tmr2\0""ALL\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC #define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC)
#define LEN_FUNCSOUNDS TR("\004", "\006") #define LEN_FUNCSOUNDS TR("\004", "\006")
#define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk")

12
radio/src/translations/pt.h.txt
View file

@ -211,23 +211,23 @@
#define TR_VFSWFUNC "Seguro\0 ""Aprendiz\0 ""Ajuste Rapido" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Backlight\0 " TR_CFN_ADJUST_GVAR TR_CFN_TEST #define TR_VFSWFUNC "Seguro\0 ""Aprendiz\0 ""Ajuste Rapido" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Backlight\0 " TR_CFN_ADJUST_GVAR TR_CFN_TEST
#endif #endif
#define LEN_VFSWRESET "\006" #define LEN_VFSWRESET TR("\004", "\011")
#if defined(FRSKY) #if defined(FRSKY)
#define TR_FSW_RESET_TELEM "Telem." #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry")
#else #else
#define TR_FSW_RESET_TELEM #define TR_FSW_RESET_TELEM
#endif #endif
#if ROTARY_ENCODERS == 2 #if ROTARY_ENCODERS == 2
#define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") #define TR_FSW_RESET_ROTENC TR("REa\0""REb\0", "RotEnc A\0""RotEnc B\0")
#elif ROTARY_ENCODERS == 1 #elif ROTARY_ENCODERS == 1
#define TR_FSW_RESET_ROTENC TR("R.Enc", "RotEnc\0 ") #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ")
#else #else
#define TR_FSW_RESET_ROTENC #define TR_FSW_RESET_ROTENC
#endif #endif
#define TR_VFSWRESET "Tempo1""Tempo2""Todo " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC #define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC)
#define LEN_FUNCSOUNDS TR("\004", "\006") #define LEN_FUNCSOUNDS TR("\004", "\006")
#define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Avis1 ""Avis2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Avis1 ""Avis2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk")

12
radio/src/translations/se.h.txt
View file

@ -211,23 +211,23 @@
#define TR_VFSWFUNC "Säkra\0 ""Trainer\0 ""Sätt Trim\0" TR_SOUND TR_HAPTIC "Nollställ\0" TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Belysning\0" TR_CFN_ADJUST_GVAR TR_CFN_TEST #define TR_VFSWFUNC "Säkra\0 ""Trainer\0 ""Sätt Trim\0" TR_SOUND TR_HAPTIC "Nollställ\0" TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Belysning\0" TR_CFN_ADJUST_GVAR TR_CFN_TEST
#endif #endif
#define LEN_VFSWRESET TR("\005", "\011") #define LEN_VFSWRESET TR("\004", "\011")
#if defined(FRSKY) #if defined(FRSKY)
#define TR_FSW_RESET_TELEM TR("Telem", "Telemetri") #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry")
#else #else
#define TR_FSW_RESET_TELEM #define TR_FSW_RESET_TELEM
#endif #endif
#if ROTARY_ENCODERS == 2 #if ROTARY_ENCODERS == 2
#define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") #define TR_FSW_RESET_ROTENC TR("REa\0""REb\0", "RotEnc A\0""RotEnc B\0")
#elif ROTARY_ENCODERS == 1 #elif ROTARY_ENCODERS == 1
#define TR_FSW_RESET_ROTENC TR("R.Enc", "RotEnc\0 ") #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ")
#else #else
#define TR_FSW_RESET_ROTENC #define TR_FSW_RESET_ROTENC
#endif #endif
#define TR_VFSWRESET TR("Tmr1\0""Tmr2\0""Allt\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1 ""Timer 2 ""Allt " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) #define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC)
#define LEN_FUNCSOUNDS TR("\004", "\006") #define LEN_FUNCSOUNDS TR("\004", "\006")
#define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk")