From 2e3a7fc5b6fb643cf6ddf6750a8f71f26f19d596 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sat, 5 May 2018 18:30:09 +1000 Subject: [PATCH] Plane: remove rcmap member from AP_AdvancedFailsafe --- ArduPlane/Plane.h | 4 ++-- ArduPlane/afs_plane.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ArduPlane/Plane.h b/ArduPlane/Plane.h index 090c097d1e..8d6d953f27 100644 --- a/ArduPlane/Plane.h +++ b/ArduPlane/Plane.h @@ -123,7 +123,7 @@ class AP_AdvancedFailsafe_Plane : public AP_AdvancedFailsafe { public: - AP_AdvancedFailsafe_Plane(AP_Mission &_mission, const AP_GPS &_gps, const RCMapper &_rcmap); + AP_AdvancedFailsafe_Plane(AP_Mission &_mission, const AP_GPS &_gps); // called to set all outputs to termination state void terminate_vehicle(void); @@ -629,7 +629,7 @@ private: AP_Avoidance_Plane avoidance_adsb{ahrs, adsb}; // Outback Challenge Failsafe Support - AP_AdvancedFailsafe_Plane afs {mission, gps, rcmap}; + AP_AdvancedFailsafe_Plane afs {mission, gps}; /* meta data to support counting the number of circles in a loiter diff --git a/ArduPlane/afs_plane.cpp b/ArduPlane/afs_plane.cpp index 85f5a185f9..e60de0a697 100644 --- a/ArduPlane/afs_plane.cpp +++ b/ArduPlane/afs_plane.cpp @@ -5,8 +5,8 @@ #include "Plane.h" // Constructor -AP_AdvancedFailsafe_Plane::AP_AdvancedFailsafe_Plane(AP_Mission &_mission, const AP_GPS &_gps, const RCMapper &_rcmap) : - AP_AdvancedFailsafe(_mission, _gps, _rcmap) +AP_AdvancedFailsafe_Plane::AP_AdvancedFailsafe_Plane(AP_Mission &_mission, const AP_GPS &_gps) : + AP_AdvancedFailsafe(_mission, _gps) {}