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/mavlink/mavlink_main.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/mavlink/mavlink_main.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_main.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/mavlink/mavlink_main.h b/src/modules/mavlink/mavlink_main.h index 9b289c965..ce2d2b34a 100644 --- a/src/modules/mavlink/mavlink_main.h +++ b/src/modules/mavlink/mavlink_main.h @@ -57,7 +57,7 @@ #include <uORB/topics/vehicle_vicon_position.h> #include <uORB/topics/vehicle_attitude_setpoint.h> #include <uORB/topics/vehicle_rates_setpoint.h> -#include <uORB/topics/vehicle_control_mode.h> +#include <uORB/topics/position_setpoint_triplet.h> #include <uORB/topics/optical_flow.h> #include <uORB/topics/actuator_outputs.h> #include <uORB/topics/actuator_controls_effective.h> @@ -233,7 +233,7 @@ public: int get_sub; int airspeed_sub; int navigation_capabilities_sub; - int control_mode_sub; + int position_setpoint_triplet_sub; int rc_sub; int status_sub; int home_sub; @@ -252,12 +252,12 @@ public: struct navigation_capabilities_s nav_cap; /** Vehicle status */ struct vehicle_status_s v_status; - /** Vehicle control mode */ - struct vehicle_control_mode_s control_mode; /** RC channels */ struct rc_channels_s rc; /** Actuator armed state */ struct actuator_armed_s armed; + /** Position setpoint triplet */ + struct position_setpoint_triplet_s pos_sp_triplet; protected: /** |