Browse Source

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

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

2
ArduSub/GCS_Mavlink.cpp

@ -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

@ -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;

Loading…
Cancel
Save