From 75fd6cb63048bbf711d9858aeeca899c99dab42d Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 8 Dec 2022 17:47:13 +1100 Subject: [PATCH] Rover: add support for mavlink in-progress message --- Rover/GCS_Mavlink.cpp | 4 ++-- Rover/GCS_Mavlink.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Rover/GCS_Mavlink.cpp b/Rover/GCS_Mavlink.cpp index eafa969d1e..acfa8699b9 100644 --- a/Rover/GCS_Mavlink.cpp +++ b/Rover/GCS_Mavlink.cpp @@ -608,7 +608,7 @@ bool GCS_MAVLINK_Rover::handle_guided_request(AP_Mission::Mission_Command &cmd) return rover.mode_guided.set_desired_location(cmd.content.location); } -MAV_RESULT GCS_MAVLINK_Rover::_handle_command_preflight_calibration(const mavlink_command_long_t &packet) +MAV_RESULT GCS_MAVLINK_Rover::_handle_command_preflight_calibration(const mavlink_command_long_t &packet, const mavlink_message_t &msg) { if (is_equal(packet.param6, 1.0f)) { if (rover.g2.windvane.start_direction_calibration()) { @@ -624,7 +624,7 @@ MAV_RESULT GCS_MAVLINK_Rover::_handle_command_preflight_calibration(const mavlin } } - return GCS_MAVLINK::_handle_command_preflight_calibration(packet); + return GCS_MAVLINK::_handle_command_preflight_calibration(packet, msg); } bool GCS_MAVLINK_Rover::set_home_to_current_location(bool _lock) { diff --git a/Rover/GCS_Mavlink.h b/Rover/GCS_Mavlink.h index 8f1bd02885..028c92f497 100644 --- a/Rover/GCS_Mavlink.h +++ b/Rover/GCS_Mavlink.h @@ -15,7 +15,7 @@ protected: uint8_t sysid_my_gcs() const override; bool sysid_enforce() const override; - MAV_RESULT _handle_command_preflight_calibration(const mavlink_command_long_t &packet) override; + MAV_RESULT _handle_command_preflight_calibration(const mavlink_command_long_t &packet, const mavlink_message_t &msg) override; MAV_RESULT handle_command_int_packet(const mavlink_command_int_t &packet) override; MAV_RESULT handle_command_long_packet(const mavlink_command_long_t &packet) override; MAV_RESULT handle_command_int_do_reposition(const mavlink_command_int_t &packet);