From d8d9adb1fd51ba36c7e8deed3bbd5e394d3be100 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Sun, 12 Jan 2014 15:10:15 +0100 Subject: [PATCH] OP-1122 OP-1158 remove unused flightplan.h (fixes conflict with new FlightPlan uavobject) --- flight/modules/FlightPlan/flightplan.c | 1 - flight/modules/FlightPlan/inc/flightplan.h | 36 ---------------------- 2 files changed, 37 deletions(-) delete mode 100644 flight/modules/FlightPlan/inc/flightplan.h diff --git a/flight/modules/FlightPlan/flightplan.c b/flight/modules/FlightPlan/flightplan.c index 0341263cb..b53b76ec9 100644 --- a/flight/modules/FlightPlan/flightplan.c +++ b/flight/modules/FlightPlan/flightplan.c @@ -31,7 +31,6 @@ #include -#include "flightplan.h" #include "flightplanstatus.h" #include "flightplancontrol.h" #include "flightplansettings.h" diff --git a/flight/modules/FlightPlan/inc/flightplan.h b/flight/modules/FlightPlan/inc/flightplan.h deleted file mode 100644 index dc51cca7f..000000000 --- a/flight/modules/FlightPlan/inc/flightplan.h +++ /dev/null @@ -1,36 +0,0 @@ -/** - ****************************************************************************** - * @addtogroup OpenPilotModules OpenPilot Modules - * @{ - * @addtogroup FlightPlan Flight Plan Module - * @brief Executes flight plan scripts in Python - * @{ - * - * @file flightplan.c - * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. - * @brief Executes flight plan scripts in Python - * - * @see The GNU Public License (GPL) Version 3 - * - *****************************************************************************/ -/* - * This program 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 program 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, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#ifndef FLIGHTPLAN_H -#define FLIGHTPLAN_H - -int32_t FlightPlanInitialize(); - -#endif // FLIGHTPLAN_H