From f2910132684ad1ef72d1179a578f9a0730fe872f Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Tue, 26 Nov 2019 13:46:14 +1100 Subject: [PATCH] Tracker: rename system_status as it won't be called from base class --- AntennaTracker/GCS_Mavlink.cpp | 2 +- AntennaTracker/GCS_Mavlink.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AntennaTracker/GCS_Mavlink.cpp b/AntennaTracker/GCS_Mavlink.cpp index 059059b659..1c6d6c5886 100644 --- a/AntennaTracker/GCS_Mavlink.cpp +++ b/AntennaTracker/GCS_Mavlink.cpp @@ -67,7 +67,7 @@ uint32_t GCS_Tracker::custom_mode() const return tracker.control_mode; } -MAV_STATE GCS_MAVLINK_Tracker::system_status() const +MAV_STATE GCS_MAVLINK_Tracker::vehicle_system_status() const { if (tracker.control_mode == INITIALISING) { return MAV_STATE_CALIBRATING; diff --git a/AntennaTracker/GCS_Mavlink.h b/AntennaTracker/GCS_Mavlink.h index 4c3c0baf0b..978fe59769 100644 --- a/AntennaTracker/GCS_Mavlink.h +++ b/AntennaTracker/GCS_Mavlink.h @@ -42,7 +42,7 @@ private: void send_global_position_int() override; MAV_MODE base_mode() const override; - MAV_STATE system_status() const override; + MAV_STATE vehicle_system_status() const override; bool waypoint_receiving; };