mirror of
https://github.com/iNavFlight/inav.git
synced 2025-07-26 01:35:35 +03:00
Ability to read current waypoint index as part of LC
This commit is contained in:
parent
283c33b097
commit
f565b9ae4d
3 changed files with 28 additions and 0 deletions
|
@ -111,6 +111,24 @@ IPF can be edited using INAV Configurator user interface, of via CLI
|
||||||
| 23 | IS_WP | boolean `0`/`1` |
|
| 23 | IS_WP | boolean `0`/`1` |
|
||||||
| 24 | IS_LANDING | boolean `0`/`1` |
|
| 24 | IS_LANDING | boolean `0`/`1` |
|
||||||
| 25 | IS_FAILSAFE | boolean `0`/`1` |
|
| 25 | IS_FAILSAFE | boolean `0`/`1` |
|
||||||
|
| 26 | STABILIZED_ROLL | Roll PID controller output `[-500:500]` |
|
||||||
|
| 27 | STABILIZED_PITCH | Pitch PID controller output `[-500:500]` |
|
||||||
|
| 28 | STABILIZED_YAW | Yaw PID controller output `[-500:500]` |
|
||||||
|
| 29 | ACTIVE_WAYPOINT_INDEX | Indexed from `1`. To verify WP is in progress, use `IS_WP` |
|
||||||
|
| 30 | ACTIVE_WAYPOINT_ACTION | See ACTIVE_WAYPOINT_ACTION paragraph |
|
||||||
|
|
||||||
|
##### ACTIVE_WAYPOINT_ACTION
|
||||||
|
|
||||||
|
| Action | Value |
|
||||||
|
|---- |---- |
|
||||||
|
| WAYPOINT | 1 |
|
||||||
|
| HOLD_TIME | 3 |
|
||||||
|
| RTH | 4 |
|
||||||
|
| SET_POI | 5 |
|
||||||
|
| JUMP | 6 |
|
||||||
|
| SET_HEAD | 7 |
|
||||||
|
| LAND | 8 |
|
||||||
|
|
||||||
|
|
||||||
#### FLIGHT_MODE
|
#### FLIGHT_MODE
|
||||||
|
|
||||||
|
|
|
@ -466,6 +466,14 @@ static int logicConditionGetFlightOperandValue(int operand) {
|
||||||
return axisPID[PITCH];
|
return axisPID[PITCH];
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case LOGIC_CONDITION_OPERAND_FLIGHT_WAYPOINT_INDEX:
|
||||||
|
return NAV_Status.activeWpNumber;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case LOGIC_CONDITION_OPERAND_FLIGHT_WAYPOINT_ACTION:
|
||||||
|
return NAV_Status.activeWpAction;
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return 0;
|
return 0;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -110,6 +110,8 @@ typedef enum {
|
||||||
LOGIC_CONDITION_OPERAND_FLIGHT_STABILIZED_ROLL, // 26
|
LOGIC_CONDITION_OPERAND_FLIGHT_STABILIZED_ROLL, // 26
|
||||||
LOGIC_CONDITION_OPERAND_FLIGHT_STABILIZED_PITCH, // 27
|
LOGIC_CONDITION_OPERAND_FLIGHT_STABILIZED_PITCH, // 27
|
||||||
LOGIC_CONDITION_OPERAND_FLIGHT_STABILIZED_YAW, // 28
|
LOGIC_CONDITION_OPERAND_FLIGHT_STABILIZED_YAW, // 28
|
||||||
|
LOGIC_CONDITION_OPERAND_FLIGHT_WAYPOINT_INDEX, // 29
|
||||||
|
LOGIC_CONDITION_OPERAND_FLIGHT_WAYPOINT_ACTION, // 30
|
||||||
} logicFlightOperands_e;
|
} logicFlightOperands_e;
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue