diff options
| author | Julian Oes <julian@oes.ch> | 2014-02-12 17:10:20 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-02-12 17:10:20 +0100 |
| commit | 3462054f73dda9303fcb1b2b5ba0a6f0882ddbd9 (patch) | |
| tree | 511c63dcc6aae5222c6685e3f1648b2d8f5b2c6b /src/modules/uORB/topics/vehicle_status.h | |
| parent | 76ae004e5c6c1dcc05f1eb784f6dc14cff2a3671 (diff) | |
| parent | 03cfb79b29a81443665208396ba8fc0ab67a021a (diff) | |
| download | px4-firmware-3462054f73dda9303fcb1b2b5ba0a6f0882ddbd9.tar.gz px4-firmware-3462054f73dda9303fcb1b2b5ba0a6f0882ddbd9.tar.bz2 px4-firmware-3462054f73dda9303fcb1b2b5ba0a6f0882ddbd9.zip | |
Merge remote-tracking branch 'px4/beta' into beta_mavlink
Conflicts:
src/modules/mavlink/mavlink.c
src/modules/mavlink/mavlink_receiver.h
src/modules/mavlink/orb_listener.c
Diffstat (limited to 'src/modules/uORB/topics/vehicle_status.h')
| -rw-r--r-- | src/modules/uORB/topics/vehicle_status.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h index a5988d3ba..5d40554fd 100644 --- a/src/modules/uORB/topics/vehicle_status.h +++ b/src/modules/uORB/topics/vehicle_status.h @@ -54,6 +54,8 @@ #include <stdbool.h> #include "../uORB.h" +#include <navigator/navigator_state.h> + /** * @addtogroup topics @{ */ @@ -206,6 +208,7 @@ struct vehicle_status_s bool rc_signal_found_once; bool rc_signal_lost; /**< true if RC reception lost */ + bool rc_input_blocked; /**< set if RC input should be ignored */ bool offboard_control_signal_found_once; bool offboard_control_signal_lost; |