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

Sub: move dummy methods into system.cpp

This commit is contained in:
Peter Barker 2019-11-04 11:52:06 +11:00 committed by Peter Barker
parent 54373a6703
commit 5a28aa9c1b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduSub/GCS_Mavlink.cpp
View File

@ -836,7 +836,3 @@ int32_t GCS_MAVLINK_Sub::global_position_int_relative_alt() const {
}
return GCS_MAVLINK::global_position_int_relative_alt();
}
// dummy method to avoid linking AFS
bool AP_AdvancedFailsafe::gcs_terminate(bool should_terminate, const char *reason) { return false; }
AP_AdvancedFailsafe *AP::advancedfailsafe() { return nullptr; }

6
ArduSub/system.cpp
View File

@ -302,3 +302,9 @@ bool Sub::should_log(uint32_t mask)
return false;
#endif
}
#include <AP_AdvancedFailsafe/AP_AdvancedFailsafe.h>
// dummy method to avoid linking AFS
bool AP_AdvancedFailsafe::gcs_terminate(bool should_terminate, const char *reason) { return false; }
AP_AdvancedFailsafe *AP::advancedfailsafe() { return nullptr; }