diff options
| author | Julian Oes <julian@oes.ch> | 2014-06-20 18:18:39 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-06-20 18:18:39 +0200 |
| commit | 4e08457afec89e41bb14fb09293c885f988bfd0c (patch) | |
| tree | 9ad5c352c75efcdabc4a0f3c9c6325cbda5f074a /src/modules/mavlink/mavlink_receiver.h | |
| parent | e0c78e51e3a5768014c73bed5cd087830d602227 (diff) | |
| parent | 9d18da4433773cfa02bec1d33fdb34e4d03d1442 (diff) | |
| download | px4-firmware-4e08457afec89e41bb14fb09293c885f988bfd0c.tar.gz px4-firmware-4e08457afec89e41bb14fb09293c885f988bfd0c.tar.bz2 px4-firmware-4e08457afec89e41bb14fb09293c885f988bfd0c.zip | |
Merge remote-tracking branch 'px4/pr/1058' into navigator_rewrite_offboard
Conflicts:
src/modules/commander/commander.cpp
src/modules/commander/state_machine_helper.cpp
src/modules/mavlink/mavlink_receiver.cpp
src/modules/mavlink/mavlink_receiver.h
src/modules/uORB/topics/vehicle_status.h
Diffstat (limited to 'src/modules/mavlink/mavlink_receiver.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.h b/src/modules/mavlink/mavlink_receiver.h index cd1dab365..5d9364fcc 100644 --- a/src/modules/mavlink/mavlink_receiver.h +++ b/src/modules/mavlink/mavlink_receiver.h @@ -36,6 +36,7 @@ * MAVLink 1.0 uORB listener definition * * @author Lorenz Meier <lm@inf.ethz.ch> + * @author Anton Babushkin <anton.babushkin@me.com> */ #pragma once @@ -44,6 +45,7 @@ #include <uORB/uORB.h> #include <uORB/topics/sensor_combined.h> #include <uORB/topics/rc_channels.h> +#include <uORB/topics/vehicle_control_mode.h> #include <uORB/topics/vehicle_attitude.h> #include <uORB/topics/vehicle_gps_position.h> #include <uORB/topics/vehicle_global_position.h> @@ -53,6 +55,7 @@ #include <uORB/topics/offboard_control_setpoint.h> #include <uORB/topics/vehicle_command.h> #include <uORB/topics/vehicle_local_position_setpoint.h> +#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/vehicle_attitude_setpoint.h> @@ -121,6 +124,7 @@ private: mavlink_status_t status; struct vehicle_local_position_s hil_local_pos; + struct vehicle_control_mode_s _control_mode; orb_advert_t _global_pos_pub; orb_advert_t _local_pos_pub; orb_advert_t _attitude_pub; @@ -135,12 +139,17 @@ private: orb_advert_t _cmd_pub; orb_advert_t _flow_pub; orb_advert_t _offboard_control_sp_pub; + orb_advert_t _local_pos_sp_pub; + orb_advert_t _global_vel_sp_pub; + orb_advert_t _att_sp_pub; + orb_advert_t _rates_sp_pub; orb_advert_t _vicon_position_pub; orb_advert_t _telemetry_status_pub; orb_advert_t _rc_pub; orb_advert_t _manual_pub; hrt_abstime _telemetry_heartbeat_time; bool _radio_status_available; + int _control_mode_sub; int _hil_frames; uint64_t _old_timestamp; bool _hil_local_proj_inited; |