mirror of
https://github.com/iNavFlight/inav.git
synced 2025-07-24 08:45:31 +03:00
Merge branch 'master' into MrD_Enhance-programming-options-for-waypoint-missions
This commit is contained in:
commit
ba8da95562
61 changed files with 1877 additions and 357 deletions
|
@ -76,7 +76,12 @@ typedef enum {
|
|||
LOGIC_CONDITION_MAX = 44,
|
||||
LOGIC_CONDITION_FLIGHT_AXIS_ANGLE_OVERRIDE = 45,
|
||||
LOGIC_CONDITION_FLIGHT_AXIS_RATE_OVERRIDE = 46,
|
||||
LOGIC_CONDITION_LAST = 47,
|
||||
LOGIC_CONDITION_EDGE = 47,
|
||||
LOGIC_CONDITION_DELAY = 48,
|
||||
LOGIC_CONDITION_TIMER = 49,
|
||||
LOGIC_CONDITION_DELTA = 50,
|
||||
LOGIC_CONDITION_APPROX_EQUAL = 51,
|
||||
LOGIC_CONDITION_LAST = 52,
|
||||
} logicOperation_e;
|
||||
|
||||
typedef enum logicOperandType_s {
|
||||
|
@ -181,7 +186,8 @@ typedef enum {
|
|||
} logicConditionsGlobalFlags_t;
|
||||
|
||||
typedef enum {
|
||||
LOGIC_CONDITION_FLAG_LATCH = 1 << 0,
|
||||
LOGIC_CONDITION_FLAG_LATCH = 1 << 0,
|
||||
LOGIC_CONDITION_FLAG_TIMEOUT_SATISFIED = 1 << 1,
|
||||
} logicConditionFlags_e;
|
||||
|
||||
typedef struct logicOperand_s {
|
||||
|
@ -202,7 +208,9 @@ PG_DECLARE_ARRAY(logicCondition_t, MAX_LOGIC_CONDITIONS, logicConditions);
|
|||
|
||||
typedef struct logicConditionState_s {
|
||||
int value;
|
||||
int32_t lastValue;
|
||||
uint8_t flags;
|
||||
timeMs_t timeout;
|
||||
} logicConditionState_t;
|
||||
|
||||
typedef struct rcChannelOverride_s {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue