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

Added EDGE switch to Logical Conditions

Browse source
This commit is contained in:
Darren Lines 2022-11-24 18:37:34 +00:00
parent 7e51f1ff5d
commit 1ca3527f92
3 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,7 +90,7 @@ static int logicConditionCompute(
logicOperation_e operation,
int32_t operandA,
int32_t operandB,
timeMs_t *timeout
uint8_t lcIndex
) {
int temporaryValue;
vtxDeviceCapability_t vtxDeviceCapability;
@ -164,9 +164,26 @@ static int logicConditionCompute(
break;
case LOGIC_CONDITION_EDGE:
if (operandA && timeout == 0) {
if (operandA && logicConditionStates[lcIndex].timeout == 0 && !(logicConditionStates[lcIndex].flags & LOGIC_CONDITION_FLAG_EDGE_SATISFIED)) {
if (operandB < 100) {
logicConditionStates[lcIndex].timeout = millis() + 100;
} else {
logicConditionStates[lcIndex].timeout = millis() + operandB;
}
logicConditionStates[lcIndex].flags |= LOGIC_CONDITION_FLAG_EDGE_SATISFIED;
return true;
} else if (logicConditionStates[lcIndex].timeout > 0) {
if (logicConditionStates[lcIndex].timeout < millis()) {
logicConditionStates[lcIndex].timeout = 0;
} else {
return true;
}
}
if (!operandA) {
logicConditionStates[lcIndex].flags &= ~LOGIC_CONDITION_FLAG_EDGE_SATISFIED;
}
return false;
break;
case LOGIC_CONDITION_GVAR_SET:
@ -433,7 +450,7 @@ void logicConditionProcess(uint8_t i) {
logicConditions(i)->operation,
operandAValue,
operandBValue,
&logicConditionStates[i].timeout,
i
);
logicConditionStates[i].value = newValue;