diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-13 15:07:09 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-13 15:07:09 +0200 |
| commit | e634c9fa99916f795773b60b8884f479fb4e3d36 (patch) | |
| tree | 1aed91d4edc1e360b386199fef90a97b3b22b273 /src/modules/mavlink/mavlink_receiver.h | |
| parent | 85eed22150e4a24098554992a6d77bce6f1ddf31 (diff) | |
| parent | 54fc6aa6788a125b387926a45023844daa42ec48 (diff) | |
| download | px4-firmware-e634c9fa99916f795773b60b8884f479fb4e3d36.tar.gz px4-firmware-e634c9fa99916f795773b60b8884f479fb4e3d36.tar.bz2 px4-firmware-e634c9fa99916f795773b60b8884f479fb4e3d36.zip | |
Merge remote-tracking branch 'origin/master' into offboard2_externalsetpointmessages
Conflicts:
src/modules/mavlink/mavlink_receiver.cpp
Diffstat (limited to 'src/modules/mavlink/mavlink_receiver.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.h b/src/modules/mavlink/mavlink_receiver.h index e3b635dd2..ed47a3a63 100644 --- a/src/modules/mavlink/mavlink_receiver.h +++ b/src/modules/mavlink/mavlink_receiver.h @@ -58,6 +58,7 @@ #include <uORB/topics/vehicle_global_velocity_setpoint.h> #include <uORB/topics/position_setpoint_triplet.h> #include <uORB/topics/vehicle_vicon_position.h> +#include <uORB/topics/vision_position_estimate.h> #include <uORB/topics/vehicle_attitude_setpoint.h> #include <uORB/topics/vehicle_rates_setpoint.h> #include <uORB/topics/optical_flow.h> @@ -113,6 +114,7 @@ private: void handle_message_optical_flow(mavlink_message_t *msg); void handle_message_set_mode(mavlink_message_t *msg); void handle_message_vicon_position_estimate(mavlink_message_t *msg); + void handle_message_vision_position_estimate(mavlink_message_t *msg); void handle_message_quad_swarm_roll_pitch_yaw_thrust(mavlink_message_t *msg); void handle_message_set_position_target_local_ned(mavlink_message_t *msg); void handle_message_set_attitude_target(mavlink_message_t *msg); @@ -149,6 +151,7 @@ private: orb_advert_t _force_sp_pub; orb_advert_t _pos_sp_triplet_pub; orb_advert_t _vicon_position_pub; + orb_advert_t _vision_position_pub; orb_advert_t _telemetry_status_pub; orb_advert_t _rc_pub; orb_advert_t _manual_pub; |