From bd904f890f42c89ecdb402094ca704a003f54a57 Mon Sep 17 00:00:00 2001 From: Michael du Breuil Date: Thu, 13 Jun 2019 20:14:06 -0700 Subject: [PATCH] Copter: Update for AFS interface --- ArduCopter/Parameters.cpp | 2 +- ArduCopter/afs_copter.cpp | 4 ++-- ArduCopter/afs_copter.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ArduCopter/Parameters.cpp b/ArduCopter/Parameters.cpp index 60381ec6ce..9c01797e74 100644 --- a/ArduCopter/Parameters.cpp +++ b/ArduCopter/Parameters.cpp @@ -984,7 +984,7 @@ ParametersG2::ParametersG2(void) , proximity(copter.serial_manager) #endif #if ADVANCED_FAILSAFE == ENABLED - ,afs(copter.mode_auto.mission, copter.gps) + ,afs(copter.mode_auto.mission) #endif #if MODE_SMARTRTL_ENABLED == ENABLED ,smart_rtl() diff --git a/ArduCopter/afs_copter.cpp b/ArduCopter/afs_copter.cpp index 44c325df45..859c05291c 100644 --- a/ArduCopter/afs_copter.cpp +++ b/ArduCopter/afs_copter.cpp @@ -7,8 +7,8 @@ #if ADVANCED_FAILSAFE == ENABLED // Constructor -AP_AdvancedFailsafe_Copter::AP_AdvancedFailsafe_Copter(AP_Mission &_mission, const AP_GPS &_gps) : - AP_AdvancedFailsafe(_mission, _gps) +AP_AdvancedFailsafe_Copter::AP_AdvancedFailsafe_Copter(AP_Mission &_mission) : + AP_AdvancedFailsafe(_mission) {} diff --git a/ArduCopter/afs_copter.h b/ArduCopter/afs_copter.h index 5d600fdb74..ef6236465c 100644 --- a/ArduCopter/afs_copter.h +++ b/ArduCopter/afs_copter.h @@ -27,7 +27,7 @@ class AP_AdvancedFailsafe_Copter : public AP_AdvancedFailsafe { public: - AP_AdvancedFailsafe_Copter(AP_Mission &_mission, const AP_GPS &_gps); + AP_AdvancedFailsafe_Copter(AP_Mission &_mission); // called to set all outputs to termination state void terminate_vehicle(void);