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

Copter: GCS_MAVLink now uses Mission singleton

Browse Source
This commit is contained in:
Peter Barker 2018-12-13 12:02:10 +11:00 committed by Randy Mackay
parent a102a0352c
commit 8ac5ee02ea
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ArduCopter/GCS_Mavlink.cpp
View File

@ -1469,15 +1469,6 @@ bool GCS_MAVLINK_Copter::accept_packet(const mavlink_status_t &status, mavlink_m
return (msg.sysid == copter.g.sysid_my_gcs); return (msg.sysid == copter.g.sysid_my_gcs);
} }
AP_Mission *GCS_MAVLINK_Copter::get_mission()
{
#if MODE_AUTO_ENABLED == ENABLED
return &copter.mode_auto.mission;
#else
return nullptr;
#endif
}
AP_AdvancedFailsafe *GCS_MAVLINK_Copter::get_advanced_failsafe() const AP_AdvancedFailsafe *GCS_MAVLINK_Copter::get_advanced_failsafe() const
{ {
#if ADVANCED_FAILSAFE == ENABLED #if ADVANCED_FAILSAFE == ENABLED

1
ArduCopter/GCS_Mavlink.h
View File

@ -16,7 +16,6 @@ protected:
bool accept_packet(const mavlink_status_t &status, mavlink_message_t &msg) override; bool accept_packet(const mavlink_status_t &status, mavlink_message_t &msg) override;
AP_Mission *get_mission() override;
AP_Rally *get_rally() const override; AP_Rally *get_rally() const override;
MAV_RESULT handle_flight_termination(const mavlink_command_long_t &packet) override; MAV_RESULT handle_flight_termination(const mavlink_command_long_t &packet) override;
AP_AdvancedFailsafe *get_advanced_failsafe() const override; AP_AdvancedFailsafe *get_advanced_failsafe() const override;