piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

chore(radio): remove EEPROM macros and related code (#5461)

Browse Source
This commit is contained in:
philmoz
2024-08-22 10:32:16 +10:00
committed by GitHub
parent 8cfa5b4846
commit e0ec49d84e
83 changed files with 27 additions and 3177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/functions.cpp
-41
View File
@@ -311,7 +311,6 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
}
#endif
#if defined(SDCARD)
case FUNC_PLAY_SOUND:
case FUNC_PLAY_TRACK:
case FUNC_PLAY_VALUE:
@@ -352,51 +351,12 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
newActiveFunctions |= (1 << FUNCTION_BACKGND_MUSIC_PAUSE);
break;
#else
case FUNC_PLAY_SOUND:
case FUNC_PLAY_TRACK:
case FUNC_PLAY_BOTH:
case FUNC_PLAY_VALUE: {
tmr10ms_t tmr10ms = get_tmr10ms();
uint8_t repeatParam = CFN_PLAY_REPEAT(cfn);
if (!functionsContext.lastFunctionTime[i] ||
(CFN_FUNC(cfn) == FUNC_PLAY_BOTH &&
active !=
(bool)(functionsContext.activeSwitches & switch_mask)) ||
(repeatParam &&
(signed)(tmr10ms - functionsContext.lastFunctionTime[i]) >=
1000 * repeatParam)) {
functionsContext.lastFunctionTime[i] = tmr10ms;
uint8_t param = CFN_PARAM(cfn);
if (CFN_FUNC(cfn) == FUNC_PLAY_SOUND) {
AUDIO_PLAY(AU_SPECIAL_SOUND_FIRST + param);
} else if (CFN_FUNC(cfn) == FUNC_PLAY_VALUE) {
PLAY_VALUE(param, PLAY_INDEX);
} else {
#if defined(GVARS)
if (CFN_FUNC(cfn) == FUNC_PLAY_TRACK && param > 250)
param = GVAR_VALUE(
param - 251,
getGVarFlightMode(mixerCurrentFlightMode, param - 251));
#endif
PUSH_CUSTOM_PROMPT(active ? param : param + 1, PLAY_INDEX);
}
}
if (!active) {
// PLAY_BOTH would change activeFnSwitches otherwise
switch_mask = 0;
}
break;
}
#endif
#if defined(VARIO)
case FUNC_VARIO:
newActiveFunctions |= (1u << FUNCTION_VARIO);
break;
#endif
#if defined(SDCARD)
case FUNC_LOGS:
if (CFN_PARAM(cfn)) {
newActiveFunctions |= (1u << FUNCTION_LOGS);
@@ -404,7 +364,6 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
cfn); // logging period is 0..25.5s in 100ms increments
}
break;
#endif
case FUNC_BACKLIGHT: {
newActiveFunctions |= (1u << FUNCTION_BACKLIGHT);