Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

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

2
ArduSub/GCS_Mavlink.cpp
View File

@ -62,7 +62,7 @@ uint32_t GCS_Sub::custom_mode() const
return sub.control_mode; return sub.control_mode;
} }
MAV_STATE GCS_MAVLINK_Sub::system_status() const MAV_STATE GCS_MAVLINK_Sub::vehicle_system_status() const
{ {
// set system as critical if any failsafe have triggered // set system as critical if any failsafe have triggered
if (sub.any_failsafe_triggered()) { if (sub.any_failsafe_triggered()) {

2
ArduSub/GCS_Mavlink.h
View File

@ -50,7 +50,7 @@ private:
bool send_info(void); bool send_info(void);
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;