From d03030e881e660e7fb9564792445f8a5c254a790 Mon Sep 17 00:00:00 2001 From: Matthias Grob Date: Mon, 20 Nov 2023 10:02:38 +0100 Subject: [PATCH] mavlink_receiver: ifdef guard for velocity limits Since this message is defined in development.xml and not yet common.xml and some targets use common.xml and the builds then failed. --- src/modules/mavlink/mavlink_receiver.cpp | 5 +++++ src/modules/mavlink/mavlink_receiver.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp index c80c46a1cd..4723dbc1be 100644 --- a/src/modules/mavlink/mavlink_receiver.cpp +++ b/src/modules/mavlink/mavlink_receiver.cpp @@ -323,9 +323,12 @@ MavlinkReceiver::handle_message(mavlink_message_t *msg) handle_message_gimbal_device_attitude_status(msg); break; +#if defined(MAVLINK_MSG_ID_SET_VELOCITY_LIMITS) // For now only defined if development.xml is used + case MAVLINK_MSG_ID_SET_VELOCITY_LIMITS: handle_message_set_velocity_limits(msg); break; +#endif default: break; @@ -1215,6 +1218,7 @@ MavlinkReceiver::handle_message_set_gps_global_origin(mavlink_message_t *msg) handle_request_message_command(MAVLINK_MSG_ID_GPS_GLOBAL_ORIGIN); } +#if defined(MAVLINK_MSG_ID_SET_VELOCITY_LIMITS) // For now only defined if development.xml is used void MavlinkReceiver::handle_message_set_velocity_limits(mavlink_message_t *msg) { mavlink_set_velocity_limits_t mavlink_set_velocity_limits; @@ -1227,6 +1231,7 @@ void MavlinkReceiver::handle_message_set_velocity_limits(mavlink_message_t *msg) velocity_limits.timestamp = hrt_absolute_time(); _velocity_limits_pub.publish(velocity_limits); } +#endif // MAVLINK_MSG_ID_SET_VELOCITY_LIMITS void MavlinkReceiver::handle_message_vision_position_estimate(mavlink_message_t *msg) diff --git a/src/modules/mavlink/mavlink_receiver.h b/src/modules/mavlink/mavlink_receiver.h index f617ccbaef..04aa8ca8ee 100644 --- a/src/modules/mavlink/mavlink_receiver.h +++ b/src/modules/mavlink/mavlink_receiver.h @@ -197,7 +197,9 @@ private: void handle_message_trajectory_representation_bezier(mavlink_message_t *msg); void handle_message_trajectory_representation_waypoints(mavlink_message_t *msg); void handle_message_utm_global_position(mavlink_message_t *msg); +#if defined(MAVLINK_MSG_ID_SET_VELOCITY_LIMITS) // For now only defined if development.xml is used void handle_message_set_velocity_limits(mavlink_message_t *msg); +#endif void handle_message_vision_position_estimate(mavlink_message_t *msg); void handle_message_gimbal_manager_set_attitude(mavlink_message_t *msg); void handle_message_gimbal_manager_set_manual_control(mavlink_message_t *msg);