From f1457034e24aa75d9f331e2e3107d3e9ecd2d952 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 1 Feb 2024 12:56:52 +1100 Subject: [PATCH] GCS_MAVLink: provide and use base-method implementation for guided mode request --- libraries/GCS_MAVLink/GCS.h | 2 +- libraries/GCS_MAVLink/GCS_Dummy.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/GCS_MAVLink/GCS.h b/libraries/GCS_MAVLink/GCS.h index 0f4b42cb0368c0..87a76c3823f3f3 100644 --- a/libraries/GCS_MAVLink/GCS.h +++ b/libraries/GCS_MAVLink/GCS.h @@ -1014,7 +1014,7 @@ class GCS_MAVLINK void send_distance_sensor(const class AP_RangeFinder_Backend *sensor, const uint8_t instance) const; - virtual bool handle_guided_request(AP_Mission::Mission_Command &cmd) = 0; + virtual bool handle_guided_request(AP_Mission::Mission_Command &cmd) { return false; }; virtual void handle_change_alt_request(AP_Mission::Mission_Command &cmd) {}; void handle_common_mission_message(const mavlink_message_t &msg); diff --git a/libraries/GCS_MAVLink/GCS_Dummy.h b/libraries/GCS_MAVLink/GCS_Dummy.h index d14d52fb7aa634..e40968ca82231e 100644 --- a/libraries/GCS_MAVLink/GCS_Dummy.h +++ b/libraries/GCS_MAVLink/GCS_Dummy.h @@ -25,7 +25,6 @@ class GCS_MAVLINK_Dummy : public GCS_MAVLINK uint32_t telem_delay() const override { return 0; } bool try_send_message(enum ap_message id) override { return true; } - bool handle_guided_request(AP_Mission::Mission_Command &cmd) override { return true; } uint8_t sysid_my_gcs() const override { return 1; } protected: