Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-13 11:29:56 +03:00
Code Issues Wiki Activity

Merge branch 'release_7.1.0' into master_7.1.0

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2024-03-19 09:11:11 +01:00
commit ae5869c0bc
19 changed files with 413 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -483,8 +483,9 @@ static int logicConditionCompute(
}
break;
#ifdef LED_PIN
#ifdef USE_LED_STRIP
case LOGIC_CONDITION_LED_PIN_PWM:
if (operandA >=0 && operandA <= 100) {
ledPinStartPWM((uint8_t)operandA);
} else {
@ -768,7 +769,7 @@ static int logicConditionGetFlightOperandValue(int operand) {
case LOGIC_CONDITION_OPERAND_FLIGHT_IS_LANDING: // 0/1
#ifdef USE_FW_AUTOLAND
return ((navGetCurrentStateFlags() & NAV_CTL_LAND) || isFwLandInProgess()) ? 1 : 0;
return ((navGetCurrentStateFlags() & NAV_CTL_LAND) || FLIGHT_MODE(NAV_FW_AUTOLAND)) ? 1 : 0;
#else
return ((navGetCurrentStateFlags() & NAV_CTL_LAND)) ? 1 : 0;
#endif