Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Peter Barker 2019-11-26 13:46:28 +11:00 committed by Andrew Tridgell
parent 46832e9dee
commit 5447992558
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduPlane/GCS_Mavlink.cpp
View File

@ -93,7 +93,7 @@ uint32_t GCS_Plane::custom_mode() const
return plane.control_mode->mode_number(); return plane.control_mode->mode_number();
} }
MAV_STATE GCS_MAVLINK_Plane::system_status() const MAV_STATE GCS_MAVLINK_Plane::vehicle_system_status() const
{ {
if (plane.control_mode == &plane.mode_initializing) { if (plane.control_mode == &plane.mode_initializing) {
return MAV_STATE_CALIBRATING; return MAV_STATE_CALIBRATING;

2
ArduPlane/GCS_Mavlink.h
View File

@ -55,7 +55,7 @@ private:
void packetReceived(const mavlink_status_t &status, const mavlink_message_t &msg) override; void packetReceived(const mavlink_status_t &status, const mavlink_message_t &msg) 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;
uint8_t radio_in_rssi() const; uint8_t radio_in_rssi() const;