Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 00:35:18 +03:00
Code Issues Wiki Activity

I Add some reserve in custom functions to avoid to change EEPROM 15days

Browse source 
after the release ...
This commit is contained in:
Bertrand Songis 2014-02-22 14:00:01 +01:00
parent 7cf94ec204
commit a47ac42996
5 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
companion/src/eeprominterface.h
View file

@ -658,7 +658,8 @@ enum AssignFunc {
FuncBackgroundMusicPause, FuncBackgroundMusicPause,
FuncAdjustGV1, FuncAdjustGV1,
FuncAdjustGVLast = FuncAdjustGV1+C9X_MAX_GVARS-1, FuncAdjustGVLast = FuncAdjustGV1+C9X_MAX_GVARS-1,
FuncCount FuncCount,
FuncReserve = -1
}; };
class FuncSwData { // Function Switches data class FuncSwData { // Function Switches data

11
companion/src/firmwares/opentx/opentxeeprom.cpp
View file

@ -1319,7 +1319,9 @@ class CustomFunctionsConversionTable: public ConversionTable {
addConversion(FuncTrainerTHR, val++); addConversion(FuncTrainerTHR, val++);
addConversion(FuncTrainerAIL, val++); addConversion(FuncTrainerAIL, val++);
} }
addConversion(FuncInstantTrim, val++); addConversion(FuncInstantTrim, val++);
if (version >= 216) { if (version >= 216) {
addConversion(FuncReset, val++); addConversion(FuncReset, val++);
if (IS_ARM(board)) { if (IS_ARM(board)) {
@ -1330,14 +1332,21 @@ class CustomFunctionsConversionTable: public ConversionTable {
for (int i=0; i<MAX_GVARS(board, version); i++) for (int i=0; i<MAX_GVARS(board, version); i++)
addConversion(FuncAdjustGV1+i, val); addConversion(FuncAdjustGV1+i, val);
val++; val++;
if (IS_ARM(board)) if (IS_ARM(board)) {
addConversion(FuncVolume, val++); addConversion(FuncVolume, val++);
addConversion(FuncReserve, val++);
addConversion(FuncReserve, val++);
addConversion(FuncReserve, val++);
}
addConversion(FuncPlaySound, val++); addConversion(FuncPlaySound, val++);
addConversion(FuncPlayPrompt, val++); addConversion(FuncPlayPrompt, val++);
if (version >= 213 && !IS_ARM(board)) if (version >= 213 && !IS_ARM(board))
addConversion(FuncPlayBoth, val++); addConversion(FuncPlayBoth, val++);
addConversion(FuncPlayValue, val++); addConversion(FuncPlayValue, val++);
if (IS_ARM(board)) { if (IS_ARM(board)) {
addConversion(FuncReserve, val++);
addConversion(FuncReserve, val++);
addConversion(FuncReserve, val++);
addConversion(FuncBackgroundMusic, val++); addConversion(FuncBackgroundMusic, val++);
addConversion(FuncBackgroundMusicPause, val++); addConversion(FuncBackgroundMusicPause, val++);
} }

8
radio/src/gui/menus.cpp
View file

@ -1311,6 +1311,14 @@ bool isAssignableFunctionAvailable(int16_t function)
return false; return false;
#endif #endif
case FUNC_PLAY_DIFF:
case FUNC_RESERVE1:
case FUNC_RESERVE2:
case FUNC_RESERVE3:
case FUNC_RESERVE4:
case FUNC_RESERVE5:
return false;
default: default:
return true; return true;
} }

6
radio/src/myeeprom.h
View file

@ -732,6 +732,9 @@ enum Functions {
FUNC_ADJUST_GVAR, FUNC_ADJUST_GVAR,
#if defined(CPUARM) #if defined(CPUARM)
FUNC_VOLUME, FUNC_VOLUME,
FUNC_RESERVE1,
FUNC_RESERVE2,
FUNC_RESERVE3,
#endif #endif
// then the other functions // then the other functions
@ -743,6 +746,9 @@ enum Functions {
#endif #endif
FUNC_PLAY_VALUE, FUNC_PLAY_VALUE,
#if defined(CPUARM) #if defined(CPUARM)
FUNC_PLAY_DIFF,
FUNC_RESERVE4,
FUNC_RESERVE5,
FUNC_BACKGND_MUSIC, FUNC_BACKGND_MUSIC,
FUNC_BACKGND_MUSIC_PAUSE, FUNC_BACKGND_MUSIC_PAUSE,
#endif #endif

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

@ -224,8 +224,10 @@
#define TR_CFN_TEST #define TR_CFN_TEST
#endif #endif
#define TR_CFN_RESERVE "[reserve]\0"
#if defined(CPUARM) #if defined(CPUARM)
#define TR_VFSWFUNC "Safety\0 ""Trainer\0 ""Inst. Trim""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST #define TR_VFSWFUNC "Safety\0 ""Trainer\0 ""Inst. Trim""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST
#elif defined(PCBGRUVIN9X) #elif defined(PCBGRUVIN9X)
#define TR_VFSWFUNC "Safety\0 ""Trainer\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST #define TR_VFSWFUNC "Safety\0 ""Trainer\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST
#else #else