Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 09:45:21 +03:00
Code Issues Wiki Activity

Edge detection only on "Reset Flight", commit 6bc6e074e1 introduced unnecessary change in behavior for Reset Timer (fix #5036)

Browse source
This commit is contained in:
Andre Bernet 2017-06-25 17:40:54 +02:00
parent fb1098c16e
commit a587f8b825
1 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/functions.cpp
View file

@ -330,7 +330,6 @@ void evalFunctions()
break; break;
case FUNC_RESET: case FUNC_RESET:
if (!(functionsContext.activeSwitches & switch_mask)) {
switch (CFN_PARAM(cfn)) { switch (CFN_PARAM(cfn)) {
case FUNC_RESET_TIMER1: case FUNC_RESET_TIMER1:
case FUNC_RESET_TIMER2: case FUNC_RESET_TIMER2:
@ -340,11 +339,13 @@ void evalFunctions()
timerReset(CFN_PARAM(cfn)); timerReset(CFN_PARAM(cfn));
break; break;
case FUNC_RESET_FLIGHT: case FUNC_RESET_FLIGHT:
if (!(functionsContext.activeSwitches & switch_mask)) {
#if defined(CPUARM) #if defined(CPUARM)
mainRequestFlags |= (1 << REQUEST_FLIGHT_RESET); // on systems with threads flightReset() must not be called from the mixers thread! mainRequestFlags |= (1 << REQUEST_FLIGHT_RESET); // on systems with threads flightReset() must not be called from the mixers thread!
#else #else
flightReset(); flightReset();
#endif // defined(CPUARM) #endif // defined(CPUARM)
}
break; break;
#if defined(TELEMETRY_FRSKY) #if defined(TELEMETRY_FRSKY)
case FUNC_RESET_TELEMETRY: case FUNC_RESET_TELEMETRY:
@ -369,7 +370,6 @@ void evalFunctions()
} }
} }
#endif #endif
}
break; break;
#if defined(CPUARM) #if defined(CPUARM)