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

Merge branch 'master' into change-profiles-with-programming

Browse source
This commit is contained in:
Darren Lines 2021-10-28 18:37:24 +01:00
commit 787e9a76b2
22 changed files with 325 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/programming/logic_condition.h
View file

@ -70,6 +70,7 @@ typedef enum {
LOGIC_CONDITION_RC_CHANNEL_OVERRIDE = 38,
LOGIC_CONDITION_SET_HEADING_TARGET = 39,
LOGIC_CONDITION_MODULUS = 40,
LOGIC_CONDITION_LOITER_OVERRIDE = 41,
LOGIC_CONDITION_SET_PROFILE = 42,
LOGIC_CONDITION_LAST = 43,
} logicOperation_e;
@ -121,7 +122,8 @@ typedef enum {
LOGIC_CONDITION_OPERAND_FLIGHT_CRSF_LQ, // 32
LOGIC_CONDITION_OPERAND_FLIGHT_CRSF_SNR, // 33
LOGIC_CONDITION_OPERAND_FLIGHT_GPS_VALID, // 0/1 // 34
LOGIC_CONDITION_OPERAND_FLIGHT_ACTIVE_PROFILE, //int // 35
LOGIC_CONDITION_OPERAND_FLIGHT_LOITER_RADIUS // 35
LOGIC_CONDITION_OPERAND_FLIGHT_ACTIVE_PROFILE, //int // 36
} logicFlightOperands_e;
@ -150,6 +152,7 @@ typedef enum {
LOGIC_CONDITION_GLOBAL_FLAG_OVERRIDE_THROTTLE = (1 << 6),
LOGIC_CONDITION_GLOBAL_FLAG_OVERRIDE_OSD_LAYOUT = (1 << 7),
LOGIC_CONDITION_GLOBAL_FLAG_OVERRIDE_RC_CHANNEL = (1 << 8),
LOGIC_CONDITION_GLOBAL_FLAG_OVERRIDE_LOITER_RADIUS = (1 << 9),
} logicConditionsGlobalFlags_t;
typedef enum {
@ -200,3 +203,4 @@ void logicConditionReset(void);
float getThrottleScale(float globalThrottleScale);
int16_t getRcCommandOverride(int16_t command[], uint8_t axis);
int16_t getRcChannelOverride(uint8_t channel, int16_t originalValue);
uint32_t getLoiterRadius(uint32_t loiterRadius);