Browse Source

Plane: avoidance no longer takes ahrs in constructor

master
Peter Barker 6 years ago committed by Andrew Tridgell
parent
commit
38e303389b
  1. 2
      ArduPlane/Plane.h
  2. 6
      ArduPlane/avoidance_adsb.h

2
ArduPlane/Plane.h

@ -673,7 +673,7 @@ private:
AP_ADSB adsb; AP_ADSB adsb;
// avoidance of adsb enabled vehicles (normally manned vheicles) // avoidance of adsb enabled vehicles (normally manned vheicles)
AP_Avoidance_Plane avoidance_adsb{ahrs, adsb}; AP_Avoidance_Plane avoidance_adsb{adsb};
// Outback Challenge Failsafe Support // Outback Challenge Failsafe Support
#if ADVANCED_FAILSAFE == ENABLED #if ADVANCED_FAILSAFE == ENABLED

6
ArduPlane/avoidance_adsb.h

@ -8,10 +8,8 @@
// functionality - for example, not doing anything while landed. // functionality - for example, not doing anything while landed.
class AP_Avoidance_Plane : public AP_Avoidance { class AP_Avoidance_Plane : public AP_Avoidance {
public: public:
AP_Avoidance_Plane(AP_AHRS &ahrs, class AP_ADSB &adsb)
: AP_Avoidance(ahrs, adsb) using AP_Avoidance::AP_Avoidance;
{
}
/* Do not allow copies */ /* Do not allow copies */
AP_Avoidance_Plane(const AP_Avoidance_Plane &other) = delete; AP_Avoidance_Plane(const AP_Avoidance_Plane &other) = delete;

Loading…
Cancel
Save