diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-11 10:33:11 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-11 10:33:11 +0200 |
| commit | 8bbaacb1e9381c29a83e0ecf37de6df3018bd38d (patch) | |
| tree | 712af7080cdb82c244018419c2af692b0a73bf04 /src/modules/mavlink/mavlink_receiver.h | |
| parent | 7bc0e26734a0319295e488e413db8f618b9b621c (diff) | |
| parent | 5abdacc9079e4ebe5f2e3d855f3c5241adecef37 (diff) | |
| download | px4-firmware-8bbaacb1e9381c29a83e0ecf37de6df3018bd38d.tar.gz px4-firmware-8bbaacb1e9381c29a83e0ecf37de6df3018bd38d.tar.bz2 px4-firmware-8bbaacb1e9381c29a83e0ecf37de6df3018bd38d.zip | |
Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Conflicts:
src/modules/mavlink/mavlink_main.cpp
src/modules/mavlink/mavlink_main.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_receiver.h b/src/modules/mavlink/mavlink_receiver.h index a2ed4264f..e3b635dd2 100644 --- a/src/modules/mavlink/mavlink_receiver.h +++ b/src/modules/mavlink/mavlink_receiver.h @@ -114,8 +114,8 @@ private: void handle_message_set_mode(mavlink_message_t *msg); void handle_message_vicon_position_estimate(mavlink_message_t *msg); void handle_message_quad_swarm_roll_pitch_yaw_thrust(mavlink_message_t *msg); - void handle_message_local_ned_position_setpoint_external(mavlink_message_t *msg); - void handle_message_attitude_setpoint_external(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); 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); |