Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-15 04:15:38 +03:00
Code Issues Wiki Activity

Merge branch 'master' into release_5.1.0

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2022-08-22 20:59:25 +02:00
commit 509f00debc
596 changed files with 1610 additions and 318719 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/programming/logic_condition.c
View file

@ -56,7 +56,7 @@
#include "io/vtx.h"
#include "drivers/vtx_common.h"
PG_REGISTER_ARRAY_WITH_RESET_FN(logicCondition_t, MAX_LOGIC_CONDITIONS, logicConditions, PG_LOGIC_CONDITIONS, 3);
PG_REGISTER_ARRAY_WITH_RESET_FN(logicCondition_t, MAX_LOGIC_CONDITIONS, logicConditions, PG_LOGIC_CONDITIONS, 4);
EXTENDED_FASTRAM uint64_t logicConditionsGlobalFlags;
EXTENDED_FASTRAM int logicConditionValuesByType[LOGIC_CONDITION_LAST];
@ -684,6 +684,10 @@ static int logicConditionGetFlightModeOperandValue(int operand) {
return IS_RC_MODE_ACTIVE(BOXUSER2);
break;
case LOGIC_CONDITION_OPERAND_FLIGHT_MODE_USER3:
return IS_RC_MODE_ACTIVE(BOXUSER3);
break;
default:
return 0;
break;
@ -862,4 +866,4 @@ bool isFlightAxisRateOverrideActive(uint8_t axis) {
} else {
return false;
}
}
}