From 3d5a6cb0745b0a3af738e9f0ea8329d02046a31f 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 7250071de1..07ac14b736 100644 --- a/AntennaTracker/GCS_Mavlink.cpp +++ b/AntennaTracker/GCS_Mavlink.cpp @@ -68,7 +68,7 @@ uint32_t GCS_Tracker::custom_mode() const return (uint32_t)tracker.mode->number(); } -MAV_STATE GCS_MAVLINK_Tracker::system_status() const +MAV_STATE GCS_MAVLINK_Tracker::vehicle_system_status() const { if (tracker.mode == &tracker.mode_initialising) { return MAV_STATE_CALIBRATING; diff --git a/AntennaTracker/GCS_Mavlink.h b/AntennaTracker/GCS_Mavlink.h index 23223a8990..98578eeb80 100644 --- a/AntennaTracker/GCS_Mavlink.h +++ b/AntennaTracker/GCS_Mavlink.h @@ -43,7 +43,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; };