Browse Source

Tracker: rename system_status as it won't be called from base class

master
Peter Barker 5 years ago committed by Randy Mackay
parent
commit
f291013268
  1. 2
      AntennaTracker/GCS_Mavlink.cpp
  2. 2
      AntennaTracker/GCS_Mavlink.h

2
AntennaTracker/GCS_Mavlink.cpp

@ -67,7 +67,7 @@ uint32_t GCS_Tracker::custom_mode() const
return tracker.control_mode; 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) { if (tracker.control_mode == INITIALISING) {
return MAV_STATE_CALIBRATING; return MAV_STATE_CALIBRATING;

2
AntennaTracker/GCS_Mavlink.h

@ -42,7 +42,7 @@ private:
void send_global_position_int() override; void send_global_position_int() override;
MAV_MODE base_mode() const override; MAV_MODE base_mode() const override;
MAV_STATE system_status() const override; MAV_STATE vehicle_system_status() const override;
bool waypoint_receiving; bool waypoint_receiving;
}; };

Loading…
Cancel
Save