diff options
| author | Julian Oes <julian@oes.ch> | 2014-07-02 14:59:43 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-07-02 14:59:43 +0200 |
| commit | fdceb8b0620c347c9f7f477dbf295dcfff12012c (patch) | |
| tree | 4b41752c9cb81cb035034b3893872476495a3acd /src/modules/mavlink/mavlink_receiver.h | |
| parent | 40780e29164f323d4896d75d9f585434375d83b0 (diff) | |
| parent | 28a31708f98eefa4ceb04617f2da3dd7892c99fa (diff) | |
| download | px4-firmware-fdceb8b0620c347c9f7f477dbf295dcfff12012c.tar.gz px4-firmware-fdceb8b0620c347c9f7f477dbf295dcfff12012c.tar.bz2 px4-firmware-fdceb8b0620c347c9f7f477dbf295dcfff12012c.zip | |
Merge branch 'master' into navigator_rewrite_offboard2_merge
Conflicts:
mavlink/include/mavlink/v1.0/common/common.h
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 5d9364fcc..65ef884a2 100644 --- a/src/modules/mavlink/mavlink_receiver.h +++ b/src/modules/mavlink/mavlink_receiver.h @@ -71,6 +71,8 @@ #include <uORB/topics/airspeed.h> #include <uORB/topics/battery_status.h> +#include "mavlink_ftp.h" + class Mavlink; class MavlinkReceiver @@ -116,6 +118,7 @@ private: void handle_message_radio_status(mavlink_message_t *msg); void handle_message_manual_control(mavlink_message_t *msg); void handle_message_heartbeat(mavlink_message_t *msg); + void handle_message_request_data_stream(mavlink_message_t *msg); void handle_message_hil_sensor(mavlink_message_t *msg); void handle_message_hil_gps(mavlink_message_t *msg); void handle_message_hil_state_quaternion(mavlink_message_t *msg); |