diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-10-05 13:17:32 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-10-05 13:17:32 +0200 |
| commit | 7f9a231b4014bce4ad44c4eb61bfa0e7efeb73fa (patch) | |
| tree | 1fee14fa887b396a76581ed643f16abe4cf0d1aa /src/modules/mavlink/mavlink_receiver.h | |
| parent | 9bda573151ae1b5fa87686ee58596ea14e052941 (diff) | |
| parent | 80ed01a5b4324ab13b88dca0b0c8e5ea4f8841ce (diff) | |
| download | px4-firmware-7f9a231b4014bce4ad44c4eb61bfa0e7efeb73fa.tar.gz px4-firmware-7f9a231b4014bce4ad44c4eb61bfa0e7efeb73fa.tar.bz2 px4-firmware-7f9a231b4014bce4ad44c4eb61bfa0e7efeb73fa.zip | |
Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Conflicts:
src/modules/navigator/navigator.h
src/modules/navigator/navigator_main.cpp
Diffstat (limited to 'src/modules/mavlink/mavlink_receiver.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_receiver.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.h b/src/modules/mavlink/mavlink_receiver.h index 8b616abd0..e5f2c6a73 100644 --- a/src/modules/mavlink/mavlink_receiver.h +++ b/src/modules/mavlink/mavlink_receiver.h @@ -113,6 +113,7 @@ private: void handle_message_command_long(mavlink_message_t *msg); void handle_message_command_int(mavlink_message_t *msg); void handle_message_optical_flow(mavlink_message_t *msg); + void handle_message_hil_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); @@ -145,6 +146,7 @@ private: orb_advert_t _battery_pub; orb_advert_t _cmd_pub; orb_advert_t _flow_pub; + orb_advert_t _range_pub; orb_advert_t _offboard_control_sp_pub; orb_advert_t _global_vel_sp_pub; orb_advert_t _att_sp_pub; |