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

Merge from 2.3

Browse Source
This commit is contained in:
Bertrand Songis
2019-12-05 09:29:11 +01:00
parent 19022414c9 b334e1845d
commit 4c484017a4
161 changed files with 3682 additions and 10305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/functions.cpp
+3 -3
View File
@@ -169,14 +169,14 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
if (param == 0)
newActiveFunctions |= 0x0F;
else if (param <= NUM_STICKS)
newActiveFunctions |= (1 << (param-1));
newActiveFunctions |= (1 << (param - 1));
else if (param == NUM_STICKS + 1)
newActiveFunctions |= (1 << FUNCTION_TRAINER_CHANNELS);
newActiveFunctions |= (1u << FUNCTION_TRAINER_CHANNELS);
break;
}
case FUNC_INSTANT_TRIM:
newActiveFunctions |= (1 << FUNCTION_INSTANT_TRIM);
newActiveFunctions |= (1u << FUNCTION_INSTANT_TRIM);
if (!isFunctionActive(FUNCTION_INSTANT_TRIM)) {
#if defined(COLORLCD)
#warning IS_INSTANT_TRIM_ALLOWED() is always false