From c4460a285cc661926b8d7ca95c241eb247fc8cf0 Mon Sep 17 00:00:00 2001 From: Tom Pittenger Date: Fri, 12 Aug 2016 13:10:38 -0700 Subject: [PATCH] Plane: remove adsb sensor library based avoidance adsb based avoidance has been moved to AP_Avoidance library --- ArduPlane/ArduPlane.cpp | 1 - ArduPlane/Plane.h | 1 - ArduPlane/adsb.cpp | 36 ------------------------------------ 3 files changed, 38 deletions(-) delete mode 100644 ArduPlane/adsb.cpp diff --git a/ArduPlane/ArduPlane.cpp b/ArduPlane/ArduPlane.cpp index c3b934dedb..0b670f5fb5 100644 --- a/ArduPlane/ArduPlane.cpp +++ b/ArduPlane/ArduPlane.cpp @@ -85,7 +85,6 @@ const AP_Scheduler::Task Plane::scheduler_tasks[] = { SCHED_TASK(terrain_update, 10, 200), SCHED_TASK(update_is_flying_5Hz, 5, 100), SCHED_TASK(dataflash_periodic, 50, 400), - SCHED_TASK(adsb_update, 10, 100), SCHED_TASK(button_update, 5, 100), }; diff --git a/ArduPlane/Plane.h b/ArduPlane/Plane.h index fe1da8436b..a01d7d899f 100644 --- a/ArduPlane/Plane.h +++ b/ArduPlane/Plane.h @@ -1027,7 +1027,6 @@ private: void update_logging1(void); void update_logging2(void); void terrain_update(void); - void adsb_update(void); void update_flight_mode(void); void stabilize(); void set_servos_idle(void); diff --git a/ArduPlane/adsb.cpp b/ArduPlane/adsb.cpp deleted file mode 100644 index a28e296b1d..0000000000 --- a/ArduPlane/adsb.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- -/* - * adsb.cpp - * Copyright (C) Tom Pittenger 2015 - * - * This file is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This file is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#include "Plane.h" - -/* - * this module deals with ADS-B handling for ArduPlane - * ADS-B is an RF based collision avoidance protocol to tell nearby aircraft your location - * https://en.wikipedia.org/wiki/Automatic_dependent_surveillance_%E2%80%93_broadcast - * - */ - -/* - handle periodic adsb database maintenance - */ -void Plane::adsb_update(void) -{ - adsb.update(); -} -