diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-10-07 22:49:27 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-10-07 22:49:27 +0200 |
| commit | 4a8d20e2e562b69f3d2272d3e40db2b7a3e5152a (patch) | |
| tree | 05bb8ef2f9443110c0dfa0e3915ecc391dadf5c6 /src/modules/uORB/topics/vehicle_status.h | |
| parent | 8c6c08dcb5ce87e613cbf867571f219a60e1b813 (diff) | |
| parent | 91b4d85b46f1d4514fe1ce45553753eb011918c1 (diff) | |
| download | px4-firmware-4a8d20e2e562b69f3d2272d3e40db2b7a3e5152a.tar.gz px4-firmware-4a8d20e2e562b69f3d2272d3e40db2b7a3e5152a.tar.bz2 px4-firmware-4a8d20e2e562b69f3d2272d3e40db2b7a3e5152a.zip | |
Merged master into st24
Diffstat (limited to 'src/modules/uORB/topics/vehicle_status.h')
| -rw-r--r-- | src/modules/uORB/topics/vehicle_status.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h index 505039d90..a1b2667e3 100644 --- a/src/modules/uORB/topics/vehicle_status.h +++ b/src/modules/uORB/topics/vehicle_status.h @@ -218,6 +218,8 @@ struct vehicle_status_s { bool offboard_control_signal_lost; bool offboard_control_signal_weak; uint64_t offboard_control_signal_lost_interval; /**< interval in microseconds without an offboard control message */ + bool offboard_control_set_by_command; /**< true if the offboard mode was set by a mavlink command + and should not be overridden by RC */ /* see SYS_STATUS mavlink message for the following */ uint32_t onboard_control_sensors_present; |