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

Issue #552 Radio part done

Browse source
This commit is contained in:
Bertrand Songis 2014-01-22 15:15:56 +01:00
parent dddad5389a
commit b66fd75b50
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4933,11 +4933,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

@ -3129,7 +3129,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;
} }

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

@ -206,23 +206,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 ""Timer 2 ""All " 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")