move launchdetection lib to fw_pos_control_l1

This commit is contained in:
Daniel Agar
2018-02-04 18:15:57 +01:00
committed by Lorenz Meier
parent d646abcee7
commit 6a4ef78111
28 changed files with 10 additions and 32 deletions
+4 -2
View File
@@ -30,6 +30,9 @@
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
add_subdirectory(launchdetection)
px4_add_module(
MODULE modules__fw_pos_control_l1
MAIN fw_pos_control_l1
@@ -39,8 +42,7 @@ px4_add_module(
FixedwingPositionControl.cpp
Landingslope.cpp
DEPENDS
platforms__common
git_ecl
lib__ecl
launchdetection
)
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
@@ -56,12 +56,12 @@
#include <cfloat>
#include "Landingslope.hpp"
#include "launchdetection/LaunchDetector.h"
#include <drivers/drv_hrt.h>
#include <ecl/l1/ecl_l1_pos_controller.h>
#include <ecl/tecs/tecs.h>
#include <geo/geo.h>
#include <launchdetection/LaunchDetector.h>
#include <mathlib/mathlib.h>
#include <runway_takeoff/RunwayTakeoff.h>
#include <systemlib/perf_counter.h>
@@ -30,13 +30,8 @@
# POSSIBILITY OF SUCH DAMAGE.
#
############################################################################
px4_add_module(
MODULE lib__launchdetection
COMPILE_FLAGS
SRCS
LaunchDetector.cpp
CatapultLaunchMethod.cpp
DEPENDS
platforms__common
)
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
px4_add_library(launchdetection
LaunchDetector.cpp
CatapultLaunchMethod.cpp
)