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

Add STABILIZED_[YAW, ROLL, PITCH] for logic_condition

Browse source
This commit is contained in:
Jonas Elvedal Hole 2020-04-25 19:20:41 +02:00
parent 12c3278e71
commit 2205f73d23
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/common/logic_condition.c
View file

@ -40,6 +40,7 @@
#include "sensors/battery.h"
#include "sensors/pitotmeter.h"
#include "flight/imu.h"
#include "flight/pid.h"
#include "navigation/navigation.h"
#include "navigation/navigation_private.h"
@ -330,7 +331,19 @@ static int logicConditionGetFlightOperandValue(int operand) {
case LOGIC_CONDITION_OPERAND_FLIGHT_IS_FAILSAFE: // 0/1
return (failsafePhase() == FAILSAFE_RX_LOSS_MONITORING) ? 1 : 0;
break;
break;
case LOGIC_CONDITION_OPERAND_FLIGHT_STABILIZED_YAW: //
return axisPID[YAW];
break;
case LOGIC_CONDITION_OPERAND_FLIGHT_STABILIZED_ROLL: //
return axisPID[ROLL];
break;
case LOGIC_CONDITION_OPERAND_FLIGHT_STABILIZED_PITCH: //
return axisPID[PITCH];
break;
default:
return 0;

3
src/main/common/logic_condition.h
View file

@ -90,6 +90,9 @@ typedef enum {
LOGIC_CONDITION_OPERAND_FLIGHT_IS_WP, // 0/1 // 23
LOGIC_CONDITION_OPERAND_FLIGHT_IS_LANDING, // 0/1 // 24
LOGIC_CONDITION_OPERAND_FLIGHT_IS_FAILSAFE, // 0/1 // 25
LOGIC_CONDITION_OPERAND_FLIGHT_STABILIZED_YAW, // 26
LOGIC_CONDITION_OPERAND_FLIGHT_STABILIZED_ROLL, // 27
LOGIC_CONDITION_OPERAND_FLIGHT_STABILIZED_PITCH, // 28
} logicFlightOperands_e;
typedef enum {