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

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

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

2
APMrover2/GCS_Mavlink.cpp
View File

@ -58,7 +58,7 @@ uint32_t GCS_Rover::custom_mode() const
return rover.control_mode->mode_number(); return rover.control_mode->mode_number();
} }
MAV_STATE GCS_MAVLINK_Rover::system_status() const MAV_STATE GCS_MAVLINK_Rover::vehicle_system_status() const
{ {
if ((rover.failsafe.triggered != 0) || rover.failsafe.ekf) { if ((rover.failsafe.triggered != 0) || rover.failsafe.ekf) {
return MAV_STATE_CRITICAL; return MAV_STATE_CRITICAL;

2
APMrover2/GCS_Mavlink.h
View File

@ -43,7 +43,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;
int16_t vfr_hud_throttle() const override; int16_t vfr_hud_throttle() const override;